update nlog

ownerer · Jun 2, 2017 · c5c206d · c5c206d
1 parent dd64678
commit c5c206d
Show file tree

Hide file tree

Showing 34 changed files with 262 additions and 28 deletions.
diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.csproj b/Emby.Common.Implementations/Emby.Common.Implementations.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>

diff --git a/Emby.Common.Implementations/packages.config b/Emby.Common.Implementations/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.4.9" targetFramework="net46" />
+  <package id="NLog" version="4.4.10" targetFramework="net46" />
   <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
   <package id="SimpleInjector" version="4.0.7" targetFramework="net462" />

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\SharedVersion.cs">
+      <Link>Properties\SharedVersion.cs</Link>
+    </Compile>
     <Compile Include="Activity\ActivityLogEntryPoint.cs" />
     <Compile Include="Activity\ActivityManager.cs" />
     <Compile Include="Activity\ActivityRepository.cs" />

diff --git 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.*")]
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -50,7 +50,7 @@
       <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>

diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.9" targetFramework="net46" />
+  <package id="NLog" version="4.4.10" targetFramework="net46" />
   <package id="ServiceStack.Text" version="4.5.8" targetFramework="net46" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net46" />
   <package id="SimpleInjector" version="4.0.7" targetFramework="net46" />

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -78,7 +78,7 @@
       <HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>

diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" />
-  <package id="NLog" version="4.4.9" targetFramework="net462" />
+  <package id="NLog" version="4.4.10" targetFramework="net462" />
   <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
   <package id="SimpleInjector" version="4.0.7" targetFramework="net462" />

diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.701</version>
+        <version>3.0.702</version>
         <title>Emby.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.701</version>
+        <version>3.0.702</version>
         <title>Emby.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.701" />
+            <dependency id="MediaBrowser.Common" version="3.0.702" />
         </dependencies>
     </metadata>
     <files>

diff --git a/packages/NLog.4.4.10/NLog.4.4.10.nupkg b/packages/NLog.4.4.10/NLog.4.4.10.nupkg
diff --git a/...ges/NLog.4.4.9/lib/MonoAndroid10/NLog.dll → ...es/NLog.4.4.10/lib/MonoAndroid10/NLog.dll b/...ges/NLog.4.4.9/lib/MonoAndroid10/NLog.dll → ...es/NLog.4.4.10/lib/MonoAndroid10/NLog.dll
diff --git a/...ges/NLog.4.4.9/lib/MonoAndroid10/NLog.xml → ...es/NLog.4.4.10/lib/MonoAndroid10/NLog.xml b/...ges/NLog.4.4.9/lib/MonoAndroid10/NLog.xml → ...es/NLog.4.4.10/lib/MonoAndroid10/NLog.xml
@@ -8920,7 +8920,7 @@
             <param name="value">Object value</param>
             <returns>Object value converted to string</returns>
         </member>
-        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode@)">
+        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode)">
             <summary>
             Converts object value to invariant format (understood by JavaScript)
             </summary>
@@ -11898,6 +11898,11 @@
             Gets or sets the option to render the empty object value {}
             </summary>
         </member>
+        <member name="P:NLog.Layouts.JsonLayout.IncludeMdc">
+            <summary>
+            Gets or sets a value indicating whether to include contents of the <see cref="T:NLog.MappedDiagnosticsContext"/> dictionary.
+            </summary>
+        </member>
         <member name="P:NLog.Layouts.JsonLayout.IncludeAllProperties">
             <summary>
             Gets or sets the option to include all properties from the log events
@@ -18346,11 +18351,12 @@
             Serialized value.
             </returns>
         </member>
-        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.Boolean,System.Boolean@)">
+        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.TypeCode,System.Boolean,System.Boolean@)">
             <summary>
             Converts object value into JSON escaped string
             </summary>
             <param name="value">Object value</param>
+            <param name="objTypeCode">Object TypeCode</param>
             <param name="escapeUnicode">Should non-ascii characters be encoded</param>
             <param name="encodeString">Should string be JSON encoded with quotes</param>
             <returns>Object value converted to JSON escaped string</returns>

diff --git a/...ges/NLog.4.4.9/lib/Xamarin.iOS10/NLog.dll → ...es/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll b/...ges/NLog.4.4.9/lib/Xamarin.iOS10/NLog.dll → ...es/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll
diff --git a/...ges/NLog.4.4.9/lib/Xamarin.iOS10/NLog.xml → ...es/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml b/...ges/NLog.4.4.9/lib/Xamarin.iOS10/NLog.xml → ...es/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml
@@ -8850,7 +8850,7 @@
             <param name="value">Object value</param>
             <returns>Object value converted to string</returns>
         </member>
-        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode@)">
+        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode)">
             <summary>
             Converts object value to invariant format (understood by JavaScript)
             </summary>
@@ -11798,6 +11798,11 @@
             Gets or sets the option to render the empty object value {}
             </summary>
         </member>
+        <member name="P:NLog.Layouts.JsonLayout.IncludeMdc">
+            <summary>
+            Gets or sets a value indicating whether to include contents of the <see cref="T:NLog.MappedDiagnosticsContext"/> dictionary.
+            </summary>
+        </member>
         <member name="P:NLog.Layouts.JsonLayout.IncludeAllProperties">
             <summary>
             Gets or sets the option to include all properties from the log events
@@ -18246,11 +18251,12 @@
             Serialized value.
             </returns>
         </member>
-        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.Boolean,System.Boolean@)">
+        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.TypeCode,System.Boolean,System.Boolean@)">
             <summary>
             Converts object value into JSON escaped string
             </summary>
             <param name="value">Object value</param>
+            <param name="objTypeCode">Object TypeCode</param>
             <param name="escapeUnicode">Should non-ascii characters be encoded</param>
             <param name="encodeString">Should string be JSON encoded with quotes</param>
             <returns>Object value converted to JSON escaped string</returns>

diff --git a/packages/NLog.4.4.10/lib/net35/NLog.dll b/packages/NLog.4.4.10/lib/net35/NLog.dll
diff --git a/packages/NLog.4.4.9/lib/net35/NLog.xml → packages/NLog.4.4.10/lib/net35/NLog.xml b/packages/NLog.4.4.9/lib/net35/NLog.xml → packages/NLog.4.4.10/lib/net35/NLog.xml
@@ -9262,7 +9262,7 @@
             <param name="value">Object value</param>
             <returns>Object value converted to string</returns>
         </member>
-        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode@)">
+        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode)">
             <summary>
             Converts object value to invariant format (understood by JavaScript)
             </summary>
@@ -12422,6 +12422,11 @@
             Gets or sets the option to render the empty object value {}
             </summary>
         </member>
+        <member name="P:NLog.Layouts.JsonLayout.IncludeMdc">
+            <summary>
+            Gets or sets a value indicating whether to include contents of the <see cref="T:NLog.MappedDiagnosticsContext"/> dictionary.
+            </summary>
+        </member>
         <member name="P:NLog.Layouts.JsonLayout.IncludeAllProperties">
             <summary>
             Gets or sets the option to include all properties from the log events
@@ -19741,6 +19746,11 @@
             to initialize logging.
             </summary>
         </member>
+        <member name="M:NLog.Targets.DatabaseTarget.SetConnectionType">
+            <summary>
+            Set the <see cref="P:NLog.Targets.DatabaseTarget.ConnectionType"/> to use it for opening connections to the database.
+            </summary>
+        </member>
         <member name="M:NLog.Targets.DatabaseTarget.CloseTarget">
             <summary>
             Closes the target and releases any unmanaged resources.
@@ -20109,11 +20119,12 @@
             Serialized value.
             </returns>
         </member>
-        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.Boolean,System.Boolean@)">
+        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.TypeCode,System.Boolean,System.Boolean@)">
             <summary>
             Converts object value into JSON escaped string
             </summary>
             <param name="value">Object value</param>
+            <param name="objTypeCode">Object TypeCode</param>
             <param name="escapeUnicode">Should non-ascii characters be encoded</param>
             <param name="encodeString">Should string be JSON encoded with quotes</param>
             <returns>Object value converted to JSON escaped string</returns>
@@ -20273,6 +20284,16 @@
             </summary>
             <remarks><value>MaxMessageLength</value> cannot be zero or negative</remarks>
         </member>
+        <member name="P:NLog.Targets.EventLogTarget.MaxKilobytes">
+            <summary>
+            Gets or sets the maximum Event log size in kilobytes.
+
+            If <c>null</c>, the value won't be set. 
+
+            Default is 512 Kilobytes as specified by Eventlog API
+            </summary>
+            <remarks><value>MaxKilobytes</value> cannot be less than 64 or greater than 4194240 or not a multiple of 64. If <c>null</c>, use the default value</remarks>
+        </member>
         <member name="P:NLog.Targets.EventLogTarget.OnOverflow">
             <summary>
             Gets or sets the action to take if the message is larger than the <see cref="P:NLog.Targets.EventLogTarget.MaxMessageLength"/> option.

diff --git a/packages/NLog.4.4.10/lib/net40/NLog.dll b/packages/NLog.4.4.10/lib/net40/NLog.dll
diff --git a/packages/NLog.4.4.9/lib/net40/NLog.xml → packages/NLog.4.4.10/lib/net40/NLog.xml b/packages/NLog.4.4.9/lib/net40/NLog.xml → packages/NLog.4.4.10/lib/net40/NLog.xml
@@ -9264,7 +9264,7 @@
             <param name="value">Object value</param>
             <returns>Object value converted to string</returns>
         </member>
-        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode@)">
+        <member name="M:NLog.Internal.XmlHelper.XmlConvertToString(System.Object,System.TypeCode)">
             <summary>
             Converts object value to invariant format (understood by JavaScript)
             </summary>
@@ -10490,6 +10490,41 @@
             </summary>
             <docgen category='Rendering Options' order='10' />
         </member>
+        <member name="T:NLog.LayoutRenderers.NdlcLayoutRenderer">
+            <summary>
+            <see cref="T:NLog.NestedDiagnosticsLogicalContext"/> Renderer (Async scope)
+            </summary>
+        </member>
+        <member name="M:NLog.LayoutRenderers.NdlcLayoutRenderer.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.NdlcLayoutRenderer"/> class.
+            </summary>
+        </member>
+        <member name="M:NLog.LayoutRenderers.NdlcLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
+            <summary>
+            Renders the specified Nested Logical Context item and appends it to the specified <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+            <param name="builder">The <see cref="T:System.Text.StringBuilder"/> to append the rendered data to.</param>
+            <param name="logEvent">Logging event.</param>
+        </member>
+        <member name="P:NLog.LayoutRenderers.NdlcLayoutRenderer.TopFrames">
+            <summary>
+            Gets or sets the number of top stack frames to be rendered.
+            </summary>
+            <docgen category='Rendering Options' order='10' />
+        </member>
+        <member name="P:NLog.LayoutRenderers.NdlcLayoutRenderer.BottomFrames">
+            <summary>
+            Gets or sets the number of bottom stack frames to be rendered.
+            </summary>
+            <docgen category='Rendering Options' order='10' />
+        </member>
+        <member name="P:NLog.LayoutRenderers.NdlcLayoutRenderer.Separator">
+            <summary>
+            Gets or sets the separator to be used for concatenating nested logical context output.
+            </summary>
+            <docgen category='Rendering Options' order='10' />
+        </member>
         <member name="T:NLog.LayoutRenderers.NewLineLayoutRenderer">
             <summary>
             A newline literal.
@@ -12454,6 +12489,16 @@
             Gets or sets the option to render the empty object value {}
             </summary>
         </member>
+        <member name="P:NLog.Layouts.JsonLayout.IncludeMdc">
+            <summary>
+            Gets or sets a value indicating whether to include contents of the <see cref="T:NLog.MappedDiagnosticsContext"/> dictionary.
+            </summary>
+        </member>
+        <member name="P:NLog.Layouts.JsonLayout.IncludeMdlc">
+            <summary>
+            Gets or sets a value indicating whether to include contents of the <see cref="T:NLog.MappedDiagnosticsLogicalContext"/> dictionary.
+            </summary>
+        </member>
         <member name="P:NLog.Layouts.JsonLayout.IncludeAllProperties">
             <summary>
             Gets or sets the option to include all properties from the log events
@@ -18353,6 +18398,36 @@
             Reverts the stack to original item count.
             </summary>
         </member>
+        <member name="T:NLog.NestedDiagnosticsLogicalContext">
+            <summary>
+            Async version of <see cref="T:NLog.NestedDiagnosticsContext"/> - a logical context structure that keeps a stack
+            Allows for maintaining scope across asynchronous tasks and call contexts.
+            </summary>
+        </member>
+        <member name="M:NLog.NestedDiagnosticsLogicalContext.Push``1(``0)">
+            <summary>
+            Pushes the specified value on current stack
+            </summary>
+            <param name="value">The value to be pushed.</param>
+            <returns>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.</returns>
+        </member>
+        <member name="M:NLog.NestedDiagnosticsLogicalContext.Pop">
+            <summary>
+            Pops the top message off the current stack
+            </summary>
+            <returns>The top message which is no longer on the stack.</returns>
+        </member>
+        <member name="M:NLog.NestedDiagnosticsLogicalContext.Clear">
+            <summary>
+            Clears current stack.
+            </summary>
+        </member>
+        <member name="M:NLog.NestedDiagnosticsLogicalContext.GetAllObjects">
+            <summary>
+            Gets all objects on the stack. The objects are not removed from the stack.
+            </summary>
+            <returns>Array of objects on the stack.</returns>
+        </member>
         <member name="T:NLog.NLogConfigurationException">
             <summary>
             Exception thrown during NLog configuration.
@@ -19962,6 +20037,11 @@
             to initialize logging.
             </summary>
         </member>
+        <member name="M:NLog.Targets.DatabaseTarget.SetConnectionType">
+            <summary>
+            Set the <see cref="P:NLog.Targets.DatabaseTarget.ConnectionType"/> to use it for opening connections to the database.
+            </summary>
+        </member>
         <member name="M:NLog.Targets.DatabaseTarget.CloseTarget">
             <summary>
             Closes the target and releases any unmanaged resources.
@@ -20330,11 +20410,12 @@
             Serialized value.
             </returns>
         </member>
-        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.Boolean,System.Boolean@)">
+        <member name="M:NLog.Targets.DefaultJsonSerializer.JsonStringEncode(System.Object,System.TypeCode,System.Boolean,System.Boolean@)">
             <summary>
             Converts object value into JSON escaped string
             </summary>
             <param name="value">Object value</param>
+            <param name="objTypeCode">Object TypeCode</param>
             <param name="escapeUnicode">Should non-ascii characters be encoded</param>
             <param name="encodeString">Should string be JSON encoded with quotes</param>
             <returns>Object value converted to JSON escaped string</returns>
@@ -20494,6 +20575,16 @@
             </summary>
             <remarks><value>MaxMessageLength</value> cannot be zero or negative</remarks>
         </member>
+        <member name="P:NLog.Targets.EventLogTarget.MaxKilobytes">
+            <summary>
+            Gets or sets the maximum Event log size in kilobytes.
+
+            If <c>null</c>, the value won't be set. 
+
+            Default is 512 Kilobytes as specified by Eventlog API
+            </summary>
+            <remarks><value>MaxKilobytes</value> cannot be less than 64 or greater than 4194240 or not a multiple of 64. If <c>null</c>, use the default value</remarks>
+        </member>
         <member name="P:NLog.Targets.EventLogTarget.OnOverflow">
             <summary>
             Gets or sets the action to take if the message is larger than the <see cref="P:NLog.Targets.EventLogTarget.MaxMessageLength"/> option.

diff --git a/packages/NLog.4.4.10/lib/net45/NLog.dll b/packages/NLog.4.4.10/lib/net45/NLog.dll