Merge pull request #488 from NLog/release/4.8.6

Release 4.8.6
NLog · Sep 30, 2019 · 370e553 · 370e553
2 parents 536ad5e + d2ff2da
commit 370e553
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -4,6 +4,9 @@ See also [releases](https://github.com/NLog/NLog.Web/releases) and [milestones](
 
 Date format: (year/month/day)
 
+### v4.8.6-aspnetcore (2019/09/30)
+- [#487](https://github.com/NLog/NLog.Web/pull/487) Fixed: Mixing AddDebug() with a file based NLog configuration no longer works (@snakefoot)
+
 ### v4.8.5 aspnetcore (2019/07/02)
 - [#459](https://github.com/NLog/NLog.Web/pull/459) Fixed double logging when mixing UseNLog with AddNLog (@snakefoot)
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.8.5.{build}
+version: 4.8.6.{build}
 clone_folder: c:\projects\nlogweb
 configuration: Release
 image: Visual Studio 2017
@@ -22,7 +22,7 @@ skip_tags: true
 
 build_script:
 - ps: |
-    $versionPrefix = "4.8.5"
+    $versionPrefix = "4.8.6"
     $versionSuffix = ""
     $versionBuild = $versionPrefix + "." + ${env:APPVEYOR_BUILD_NUMBER}
     $versionNuget = $versionPrefix
@@ -41,12 +41,12 @@ build_script:
         throw "Exec: $ErrorMessage"
     }
 
-deploy:
-- provider: NuGet
-  api_key:
-    secure: DtVDH1ZfIR8E2oDLeSPxfn0WFXw3MCv4WhLkkQQl9LfEHswb5sdxdCYodNKhrKik
-  on:
-    branch: master
+# deploy:
+# - provider: NuGet
+#   api_key:
+#     secure: DtVDH1ZfIR8E2oDLeSPxfn0WFXw3MCv4WhLkkQQl9LfEHswb5sdxdCYodNKhrKik
+#   on:
+#     branch: master
 test_script:
   - nuget.exe install OpenCover -ExcludeVersion -DependencyVersion Ignore
   - OpenCover\tools\OpenCover.Console.exe -register:user -returntargetcode -target:"%xunit20%\xunit.console.x86.exe" -targetargs:"\"c:\projects\nlogweb\tests\NLog.Web.Tests\bin\Release\net452\NLog.Web.Tests.dll\" -appveyor -noshadow"  -returntargetcode -filter:"+[NLog.Web]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -oldstyle -output:coverage.xml

diff --git a/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -19,8 +19,7 @@ Supported platforms:
     <PackageId>NLog.Web.AspNetCore</PackageId>
     <PackageTags>logging;log;NLog;web;aspnet;aspnetcore;MVC;Microsoft.Extensions.Logging;httpcontext;session</PackageTags>
     <PackageReleaseNotes>
-- Fixed double logging when mixing UseNLog with AddNLog (@snakefoot)
-- Updated nuget-package description to make it easier to discover (@snakefoot)
+- Fixed: Mixing AddDebug() with a file based NLog configuration no longer works (@snakefoot)
     </PackageReleaseNotes>
     <PackageIconUrl>https://nlog-project.org/N.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/NLog/NLog.Web</PackageProjectUrl>