Merge pull request #144 from snakefoot/master

homiedopie · web-flow · commit be4898a0779f · 2024-01-31T12:41:08.000+08:00
Updated NLog.Targets.Stackify to NLog v4.7.15
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,5 @@ packages/
 **/obj/*
 BuildOutput/
 *.pfx
-*.snk
+*.snk
+/.vs
diff --git a/Src/NLog.Targets.Stackify/NLog.Targets.Stackify.csproj b/Src/NLog.Targets.Stackify/NLog.Targets.Stackify.csproj
@@ -15,7 +15,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>2.1.8-beta</Version>
+    <Version>2.2.13</Version>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
@@ -26,7 +26,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
-    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog" Version="4.7.15" />
   </ItemGroup>
   
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
diff --git a/Src/NLog.Targets.Stackify/StackifyTarget.cs b/Src/NLog.Targets.Stackify/StackifyTarget.cs
@@ -133,7 +133,7 @@ protected override void Write(AsyncLogEventInfo logEvent)
             }
             catch (Exception ex)
             {
-                InternalLogger.Error("StackifyTarget: Failed to send");
+                InternalLogger.Error(ex, "StackifyTarget: Failed to send");
                 logEvent.Continuation(ex);  // Signal failure to NLog
                 StackifyAPILogger.Log(ex.ToString());
             }
diff --git a/Src/NLog.Web.Stackify/NLog.Web.Stackify.csproj b/Src/NLog.Web.Stackify/NLog.Web.Stackify.csproj
@@ -15,7 +15,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>2.1.1</Version>
+    <Version>2.2.13</Version>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
@@ -25,13 +25,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
-    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog" Version="4.7.15" />
   </ItemGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>NETCORE</DefineConstants>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' ">
     <DefineConstants>NETFULL</DefineConstants>
   </PropertyGroup>
@@ -40,10 +40,10 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
-    <PackageReference Include="NLog.Web" Version="4.8.0" />
+    <PackageReference Include="NLog.Web" Version="4.14.0" />
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/CoreWebApp/nlogfile.txt b/samples/CoreWebApp/nlogfile.txt

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ protected override void Write(AsyncLogEventInfo logEvent)`
`133`	`133`	`}`
`134`	`134`	`catch (Exception ex)`
`135`	`135`	`{`
`136`		`- InternalLogger.Error("StackifyTarget: Failed to send");`
	`136`	`+ InternalLogger.Error(ex, "StackifyTarget: Failed to send");`
`137`	`137`	`logEvent.Continuation(ex); // Signal failure to NLog`
`138`	`138`	`StackifyAPILogger.Log(ex.ToString());`
`139`	`139`	`}`