diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.csproj b/Emby.Common.Implementations/Emby.Common.Implementations.csproj index bf52ff0c7e..567f295261 100644 --- a/Emby.Common.Implementations/Emby.Common.Implementations.csproj +++ b/Emby.Common.Implementations/Emby.Common.Implementations.csproj @@ -32,7 +32,7 @@ - ..\packages\NLog.4.4.9\lib\net45\NLog.dll + ..\packages\NLog.4.4.10\lib\net45\NLog.dll ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll diff --git a/Emby.Common.Implementations/packages.config b/Emby.Common.Implementations/packages.config index ec0fc45bcf..9cc054db07 100644 --- a/Emby.Common.Implementations/packages.config +++ b/Emby.Common.Implementations/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 14d9763252..df70680f15 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -31,6 +31,9 @@ 4 + + Properties\SharedVersion.cs + diff --git a/Emby.Server.Implementations/Properties/AssemblyInfo.cs b/Emby.Server.Implementations/Properties/AssemblyInfo.cs index ed7f9631fa..28ffcbac64 100644 --- a/Emby.Server.Implementations/Properties/AssemblyInfo.cs +++ b/Emby.Server.Implementations/Properties/AssemblyInfo.cs @@ -25,6 +25,4 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +// [assembly: AssemblyVersion("1.0.*")] \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 8199cf2c4e..f515f5a684 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -50,7 +50,7 @@ ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll - ..\packages\NLog.4.4.9\lib\net45\NLog.dll + ..\packages\NLog.4.4.10\lib\net45\NLog.dll ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index 0e846ac8ff..4f1b09ac85 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -1,7 +1,7 @@  - + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 637474380b..32b93db00d 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -78,7 +78,7 @@ ..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll - ..\packages\NLog.4.4.9\lib\net45\NLog.dll + ..\packages\NLog.4.4.10\lib\net45\NLog.dll ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 4d4bde09f9..db675a9014 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 23fbb9bc32..0b988ddabb 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.701 + 3.0.702 Emby.Common Emby Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 8f59afce34..18128c7b18 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.701 + 3.0.702 Emby.Server.Core Emby Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Emby Server. Copyright © Emby 2013 - + diff --git a/packages/NLog.4.4.10/NLog.4.4.10.nupkg b/packages/NLog.4.4.10/NLog.4.4.10.nupkg new file mode 100644 index 0000000000..e69bf0e3bb Binary files /dev/null and b/packages/NLog.4.4.10/NLog.4.4.10.nupkg differ diff --git a/packages/NLog.4.4.9/lib/MonoAndroid10/NLog.dll b/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll similarity index 50% rename from packages/NLog.4.4.9/lib/MonoAndroid10/NLog.dll rename to packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll index 76515bfec0..db059eb883 100644 Binary files a/packages/NLog.4.4.9/lib/MonoAndroid10/NLog.dll and b/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/MonoAndroid10/NLog.xml b/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/MonoAndroid10/NLog.xml rename to packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml index 2b91724947..d5831a3a14 100644 --- a/packages/NLog.4.4.9/lib/MonoAndroid10/NLog.xml +++ b/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml @@ -8920,7 +8920,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -11898,6 +11898,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -18346,11 +18351,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string diff --git a/packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.dll b/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll similarity index 51% rename from packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.dll rename to packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll index 5136d91145..16224f448d 100644 Binary files a/packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.dll and b/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.xml b/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.xml rename to packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml index d0793df4f0..213b9e197c 100644 --- a/packages/NLog.4.4.9/lib/Xamarin.iOS10/NLog.xml +++ b/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml @@ -8850,7 +8850,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -11798,6 +11798,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -18246,11 +18251,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string diff --git a/packages/NLog.4.4.10/lib/net35/NLog.dll b/packages/NLog.4.4.10/lib/net35/NLog.dll new file mode 100644 index 0000000000..70d312610a Binary files /dev/null and b/packages/NLog.4.4.10/lib/net35/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/net35/NLog.xml b/packages/NLog.4.4.10/lib/net35/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/net35/NLog.xml rename to packages/NLog.4.4.10/lib/net35/NLog.xml index 948930562e..0f4f52104f 100644 --- a/packages/NLog.4.4.9/lib/net35/NLog.xml +++ b/packages/NLog.4.4.10/lib/net35/NLog.xml @@ -9262,7 +9262,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -12422,6 +12422,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -19741,6 +19746,11 @@ to initialize logging. + + + Set the to use it for opening connections to the database. + + Closes the target and releases any unmanaged resources. @@ -20109,11 +20119,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string @@ -20273,6 +20284,16 @@ MaxMessageLength cannot be zero or negative + + + Gets or sets the maximum Event log size in kilobytes. + + If null, the value won't be set. + + Default is 512 Kilobytes as specified by Eventlog API + + MaxKilobytes cannot be less than 64 or greater than 4194240 or not a multiple of 64. If null, use the default value + Gets or sets the action to take if the message is larger than the option. diff --git a/packages/NLog.4.4.10/lib/net40/NLog.dll b/packages/NLog.4.4.10/lib/net40/NLog.dll new file mode 100644 index 0000000000..717560f8a6 Binary files /dev/null and b/packages/NLog.4.4.10/lib/net40/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/net40/NLog.xml b/packages/NLog.4.4.10/lib/net40/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/net40/NLog.xml rename to packages/NLog.4.4.10/lib/net40/NLog.xml index ad6c9b5604..d6344a84b7 100644 --- a/packages/NLog.4.4.9/lib/net40/NLog.xml +++ b/packages/NLog.4.4.10/lib/net40/NLog.xml @@ -9264,7 +9264,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -10490,6 +10490,41 @@ + + + Renderer (Async scope) + + + + + Initializes a new instance of the class. + + + + + Renders the specified Nested Logical Context item and appends it to the specified . + + The to append the rendered data to. + Logging event. + + + + Gets or sets the number of top stack frames to be rendered. + + + + + + Gets or sets the number of bottom stack frames to be rendered. + + + + + + Gets or sets the separator to be used for concatenating nested logical context output. + + + A newline literal. @@ -12454,6 +12489,16 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -18353,6 +18398,36 @@ Reverts the stack to original item count. + + + Async version of - a logical context structure that keeps a stack + Allows for maintaining scope across asynchronous tasks and call contexts. + + + + + Pushes the specified value on current stack + + The value to be pushed. + An instance of the object that implements IDisposable that returns the stack to the previous level when IDisposable.Dispose() is called. To be used with C# using() statement. + + + + Pops the top message off the current stack + + The top message which is no longer on the stack. + + + + Clears current stack. + + + + + Gets all objects on the stack. The objects are not removed from the stack. + + Array of objects on the stack. + Exception thrown during NLog configuration. @@ -19962,6 +20037,11 @@ to initialize logging. + + + Set the to use it for opening connections to the database. + + Closes the target and releases any unmanaged resources. @@ -20330,11 +20410,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string @@ -20494,6 +20575,16 @@ MaxMessageLength cannot be zero or negative + + + Gets or sets the maximum Event log size in kilobytes. + + If null, the value won't be set. + + Default is 512 Kilobytes as specified by Eventlog API + + MaxKilobytes cannot be less than 64 or greater than 4194240 or not a multiple of 64. If null, use the default value + Gets or sets the action to take if the message is larger than the option. diff --git a/packages/NLog.4.4.10/lib/net45/NLog.dll b/packages/NLog.4.4.10/lib/net45/NLog.dll new file mode 100644 index 0000000000..f571d2c8f5 Binary files /dev/null and b/packages/NLog.4.4.10/lib/net45/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/net45/NLog.xml b/packages/NLog.4.4.10/lib/net45/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/net45/NLog.xml rename to packages/NLog.4.4.10/lib/net45/NLog.xml index 2a6ab9853f..ecde8d585b 100644 --- a/packages/NLog.4.4.9/lib/net45/NLog.xml +++ b/packages/NLog.4.4.10/lib/net45/NLog.xml @@ -9368,7 +9368,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -10615,6 +10615,41 @@ + + + Renderer (Async scope) + + + + + Initializes a new instance of the class. + + + + + Renders the specified Nested Logical Context item and appends it to the specified . + + The to append the rendered data to. + Logging event. + + + + Gets or sets the number of top stack frames to be rendered. + + + + + + Gets or sets the number of bottom stack frames to be rendered. + + + + + + Gets or sets the separator to be used for concatenating nested logical context output. + + + A newline literal. @@ -12579,6 +12614,16 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -18535,6 +18580,36 @@ Reverts the stack to original item count. + + + Async version of - a logical context structure that keeps a stack + Allows for maintaining scope across asynchronous tasks and call contexts. + + + + + Pushes the specified value on current stack + + The value to be pushed. + An instance of the object that implements IDisposable that returns the stack to the previous level when IDisposable.Dispose() is called. To be used with C# using() statement. + + + + Pops the top message off the current stack + + The top message which is no longer on the stack. + + + + Clears current stack. + + + + + Gets all objects on the stack. The objects are not removed from the stack. + + Array of objects on the stack. + Exception thrown during NLog configuration. @@ -20144,6 +20219,11 @@ to initialize logging. + + + Set the to use it for opening connections to the database. + + Closes the target and releases any unmanaged resources. @@ -20512,11 +20592,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string @@ -20676,6 +20757,16 @@ MaxMessageLength cannot be zero or negative + + + Gets or sets the maximum Event log size in kilobytes. + + If null, the value won't be set. + + Default is 512 Kilobytes as specified by Eventlog API + + MaxKilobytes cannot be less than 64 or greater than 4194240 or not a multiple of 64. If null, use the default value + Gets or sets the action to take if the message is larger than the option. diff --git a/packages/NLog.4.4.10/lib/sl4/NLog.dll b/packages/NLog.4.4.10/lib/sl4/NLog.dll new file mode 100644 index 0000000000..db28642432 Binary files /dev/null and b/packages/NLog.4.4.10/lib/sl4/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/sl4/NLog.xml b/packages/NLog.4.4.10/lib/sl4/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/sl4/NLog.xml rename to packages/NLog.4.4.10/lib/sl4/NLog.xml index 33c4004617..a6c7129d2e 100644 --- a/packages/NLog.4.4.9/lib/sl4/NLog.xml +++ b/packages/NLog.4.4.10/lib/sl4/NLog.xml @@ -7042,7 +7042,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -9411,6 +9411,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -14124,11 +14129,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string diff --git a/packages/NLog.4.4.10/lib/sl5/NLog.dll b/packages/NLog.4.4.10/lib/sl5/NLog.dll new file mode 100644 index 0000000000..766acbd336 Binary files /dev/null and b/packages/NLog.4.4.10/lib/sl5/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/sl5/NLog.xml b/packages/NLog.4.4.10/lib/sl5/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/sl5/NLog.xml rename to packages/NLog.4.4.10/lib/sl5/NLog.xml index 220bfd1af1..41ad981732 100644 --- a/packages/NLog.4.4.9/lib/sl5/NLog.xml +++ b/packages/NLog.4.4.10/lib/sl5/NLog.xml @@ -7042,7 +7042,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -9411,6 +9411,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -14214,11 +14219,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string diff --git a/packages/NLog.4.4.10/lib/wp8/NLog.dll b/packages/NLog.4.4.10/lib/wp8/NLog.dll new file mode 100644 index 0000000000..0d10649d52 Binary files /dev/null and b/packages/NLog.4.4.10/lib/wp8/NLog.dll differ diff --git a/packages/NLog.4.4.9/lib/wp8/NLog.xml b/packages/NLog.4.4.10/lib/wp8/NLog.xml similarity index 99% rename from packages/NLog.4.4.9/lib/wp8/NLog.xml rename to packages/NLog.4.4.10/lib/wp8/NLog.xml index 1f5bf11ec6..4ae7eb77d6 100644 --- a/packages/NLog.4.4.9/lib/wp8/NLog.xml +++ b/packages/NLog.4.4.10/lib/wp8/NLog.xml @@ -7092,7 +7092,7 @@ Object value Object value converted to string - + Converts object value to invariant format (understood by JavaScript) @@ -9600,6 +9600,11 @@ Gets or sets the option to render the empty object value {} + + + Gets or sets a value indicating whether to include contents of the dictionary. + + Gets or sets the option to include all properties from the log events @@ -14088,11 +14093,12 @@ Serialized value. - + Converts object value into JSON escaped string Object value + Object TypeCode Should non-ascii characters be encoded Should string be JSON encoded with quotes Object value converted to JSON escaped string diff --git a/packages/NLog.4.4.9/NLog.4.4.9.nupkg b/packages/NLog.4.4.9/NLog.4.4.9.nupkg deleted file mode 100644 index 32c20332fb..0000000000 Binary files a/packages/NLog.4.4.9/NLog.4.4.9.nupkg and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/net35/NLog.dll b/packages/NLog.4.4.9/lib/net35/NLog.dll deleted file mode 100644 index f42b519b72..0000000000 Binary files a/packages/NLog.4.4.9/lib/net35/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/net40/NLog.dll b/packages/NLog.4.4.9/lib/net40/NLog.dll deleted file mode 100644 index 3ac1fc921d..0000000000 Binary files a/packages/NLog.4.4.9/lib/net40/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/net45/NLog.dll b/packages/NLog.4.4.9/lib/net45/NLog.dll deleted file mode 100644 index 95ef34cf7e..0000000000 Binary files a/packages/NLog.4.4.9/lib/net45/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/sl4/NLog.dll b/packages/NLog.4.4.9/lib/sl4/NLog.dll deleted file mode 100644 index 66a0304d8f..0000000000 Binary files a/packages/NLog.4.4.9/lib/sl4/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/sl5/NLog.dll b/packages/NLog.4.4.9/lib/sl5/NLog.dll deleted file mode 100644 index 0ef1c81a01..0000000000 Binary files a/packages/NLog.4.4.9/lib/sl5/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.9/lib/wp8/NLog.dll b/packages/NLog.4.4.9/lib/wp8/NLog.dll deleted file mode 100644 index 5bfb1237eb..0000000000 Binary files a/packages/NLog.4.4.9/lib/wp8/NLog.dll and /dev/null differ