diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 75cd813c..c3923f95 100644 --- 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.4 (2022/09/01) + +- **NLog.Web.AspNetCore** + - [#865](https://github.com/NLog/NLog.Web/pull/865) Added embedded resource ILLink.Descriptors.xml (#865) (@snakefoot) + - [#865](https://github.com/NLog/NLog.Web/pull/865) Updated NLog.Extensions.Logging to v5.0.4 (#865) (@snakefoot) + +- **NLog.Web** + - [#865](https://github.com/NLog/NLog.Web/pull/865) Updated dependency NLog v5.0.4 (#863) (@snakefoot) + ### Version 5.1.2 (2022/09/01) - **NLog.Web.AspNetCore** diff --git a/build.ps1 b/build.ps1 index 24110348..ffd62f70 100644 --- a/build.ps1 +++ b/build.ps1 @@ -2,7 +2,7 @@ # creates NuGet package at \artifacts dotnet --version -$versionPrefix = "5.1.2" # Also update version for minor versions in appveyor.yml +$versionPrefix = "5.1.4" # 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/src/NLog.Web.AspNetCore/ILLink.Descriptors.xml b/src/NLog.Web.AspNetCore/ILLink.Descriptors.xml new file mode 100644 index 00000000..00ab55ba --- /dev/null +++ b/src/NLog.Web.AspNetCore/ILLink.Descriptors.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj index 03deb6f0..0269f1e5 100644 --- a/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj +++ b/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj @@ -21,6 +21,8 @@ Supported platforms: NLog.Web.AspNetCore logging;log;NLog;web;aspnet;aspnetcore;MVC;Microsoft.Extensions.Logging;httpcontext +- 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) @@ -76,7 +78,7 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout- $(DefineConstants);ASP_NET_CORE;ASP_NET_CORE3 - + @@ -100,6 +102,13 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout- + + + + ILLink.Descriptors.xml + + + true diff --git a/src/NLog.Web/NLog.Web.csproj b/src/NLog.Web/NLog.Web.csproj index 19caf96e..611734e7 100644 --- 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- - +