Version 5.1.5 (#876)

NLog · Oct 25, 2022 · 92c4be5 · 92c4be5
1 parent 6d83153
commit 92c4be5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -4,6 +4,15 @@ See also [releases](https://github.com/NLog/NLog.Web/releases) and [milestones](
 
 Date format: (year/month/day)
 
+### Version 5.1.5 (2022/10/26)
+
+- **NLog.Web.AspNetCore**
+  - [#875](https://github.com/NLog/NLog.Web/pull/875) Introduced NET6 since LTS (#875) (@snakefoot)
+  - [#875](https://github.com/NLog/NLog.Web/pull/875) Updated NLog.Extensions.Logging to v5.1.0 (#875) (@snakefoot)
+
+- **NLog.Web**
+  - [#875](https://github.com/NLog/NLog.Web/pull/875) Updated dependency NLog v5.0.5 (#875) (@snakefoot)
+
 ### Version 5.1.4 (2022/09/01)
 
 - **NLog.Web.AspNetCore**

diff --git a/build.ps1 b/build.ps1
@@ -2,7 +2,7 @@
 # creates NuGet package at \artifacts
 dotnet --version
 
-$versionPrefix = "5.1.4" # Also update version for minor versions in appveyor.yml 
+$versionPrefix = "5.1.5" # Also update version for minor versions in appveyor.yml 
 $versionSuffix = ""
 $versionFile = $versionPrefix + "." + ${env:APPVEYOR_BUILD_NUMBER}
 if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {

diff --git a/examples/ASP.NET 4.6.1/Visual Studio 2017/ASP.NET 4.6.1 - VS2017/packages.config b/examples/ASP.NET 4.6.1/Visual Studio 2017/ASP.NET 4.6.1 - VS2017/packages.config
@@ -12,7 +12,7 @@
   <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.1.2" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
-  <package id="NLog" version="5.0.2" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>
diff --git a/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <Product>NLog.Web.AspNetCore v$(VersionPrefix)</Product>
     <Description>
 NLog LoggerProvider for Microsoft.Extensions.Logging and ASP.NET Core platform. Adds helpers and layout renderers for websites and web applications.
@@ -21,11 +21,8 @@ Supported platforms:
     <PackageId>NLog.Web.AspNetCore</PackageId>
     <PackageTags>logging;log;NLog;web;aspnet;aspnetcore;MVC;Microsoft.Extensions.Logging;httpcontext</PackageTags>
     <PackageReleaseNotes>
-- Added embedded resource ILLink.Descriptors.xml (#865) (@snakefoot)
-- Updated NLog.Extensions.Logging to v5.0.4 (#865) (@snakefoot)
-- Loading NLog.config from ContentRootPath as last fallback (#861) (@snakefoot)
-- Updated Microsoft.AspNetCore.Abstractions to match Microsoft.AspNetCore.Http (#858) (@snakefoot)
-- Updated NLog.Extensions.Logging to v5.0.3 (#863) (@snakefoot)
+- Introduced Introduced NET6 since LTS (@snakefoot)
+- Updated NLog.Extensions.Logging to v5.1.0 (@snakefoot)
 
 List of major changes in NLog 5.0: https://nlog-project.org/2022/05/16/nlog-5-0-finally-ready.html
 
@@ -78,7 +75,7 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout-
     <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE3</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="NLog.Extensions.Logging" Version="5.0.4" />
+	<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
     <!-- Fixed to 2.1.0 as 2.1 is Long Term Supported (LTS) and only supported version for .NET Framework 4.6.1 -->

diff --git a/src/NLog.Web.AspNetCore/NLogRequestLoggingMiddleware.cs b/src/NLog.Web.AspNetCore/NLogRequestLoggingMiddleware.cs
@@ -64,7 +64,7 @@ private bool LogHttpRequest(HttpContext httpContext, Exception exception)
             {
                 if (exception != null)
                 {
-                    _logger.Log(logLevel, 0, exception, "HttpRequest Exception", Array.Empty<object>());
+                    _logger.Log(logLevel, 0, exception, "HttpRequest Exception");
                 }
                 else
                 {
@@ -73,12 +73,12 @@ private bool LogHttpRequest(HttpContext httpContext, Exception exception)
                         case Microsoft.Extensions.Logging.LogLevel.Trace:
                         case Microsoft.Extensions.Logging.LogLevel.Debug:
                         case Microsoft.Extensions.Logging.LogLevel.Information:
-                            _logger.Log(logLevel, 0, null, "HttpRequest Completed", Array.Empty<object>());
+                            _logger.Log(logLevel, 0, null, "HttpRequest Completed");
                             break;
                         case Microsoft.Extensions.Logging.LogLevel.Warning:
                         case Microsoft.Extensions.Logging.LogLevel.Error:
                         case Microsoft.Extensions.Logging.LogLevel.Critical:
-                            _logger.Log(logLevel, 0, null, "HttpRequest Failure", Array.Empty<object>());
+                            _logger.Log(logLevel, 0, null, "HttpRequest Failure");
                             break;
                     }
                 }

diff --git a/src/NLog.Web/NLog.Web.csproj b/src/NLog.Web/NLog.Web.csproj
@@ -51,7 +51,7 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout-
     <DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>