Merge pull request #308 from NLog/release/4.6

Version 4.6

CHANGELOG.MD

@@ -1,5 +1,12 @@
 ## Change Log
 
+### v4.5.4-aspnetcore & aspnet4 (2018/08/05)
+
+- [#306](https://github.com/nlog/nlog.web/pull/306) Inherits AssemblyVersionLayoutRenderer from NLog implementation, so it has all NLog's features  (@alexangas)
+- [#307](https://github.com/nlog/nlog.web/pull/307) Added "ValuesOnly" property to Cookie and QueryString layout renderers + support for multivalue cookie keys in ASP.NET core (@alexangas)
+- [#303](https://github.com/nlog/nlog.web/pull/303) Improve error-handling during startup / shutdown for all layout renders using httpcontext
+
+
 ### v4.5.4-aspnetcore (2018/05/10)
 - [#285](https://github.com/nlog/nlog.web/pull/285) Update NLog dependency (@304NotModified)
 

NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj

@@ -5,7 +5,7 @@
 
     <TargetFrameworks>netstandard1.5;net451;net461;netstandard2.0</TargetFrameworks>
 
-    <VersionPrefix>4.5.4</VersionPrefix>
+    <VersionPrefix>4.6</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Version>$(VersionPrefix)$(VersionSuffix)</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
@@ -28,10 +28,11 @@ Supported platforms:
     <Copyright>Copyright (c) 2015-$(CurrentYear) NLog Project - http://nlog-project.org/ </Copyright>
     <AssemblyName>NLog.Web.AspNetCore</AssemblyName>
     <PackageId>NLog.Web.AspNetCore</PackageId>
-    <PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC</PackageTags>
+    <PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC;httpcontext</PackageTags>
     <PackageReleaseNotes>
-4.5.4:  
-- Update NLog dependency
+- Inherits AssemblyVersionLayoutRenderer from NLog implementation, so it has all NLog's features  (@alexangas)
+- Added "ValuesOnly" property to Cookie and QueryString layout renderers + support for multivalue cookie keys in ASP.NET core (@alexangas)
+- Improve error-handling during startup / shutdown for all layout renders using httpcontext
 
     </PackageReleaseNotes>
     <PackageIconUrl>http://nlog-project.org/N.png</PackageIconUrl>

NLog.Web/NLog.Web.nuspec

@@ -15,10 +15,11 @@ This package is for ASP.NET 3.5+
 
 For ASP.NET Core: Check https://www.nuget.org/packages/NLog.Web.AspNetCore</description>
     <releaseNotes>
-- Add Assembly file version to NLog.Web        
-- Updated dependencies    
+- Inherits AssemblyVersionLayoutRenderer from NLog implementation, so it has all NLog's features  (@alexangas)
+- Added "ValuesOnly" property to Cookie and QueryString layout renderers + support for multivalue cookie keys in ASP.NET core (@alexangas)
+- Improve error-handling during startup / shutdown for all layout renders using httpcontext   
     </releaseNotes>
     <copyright>Copyright 2014-2018</copyright>
-    <tags>nlog log target layoutrenderer web asp.net</tags>
+    <tags>nlog log target layoutrenderer web asp.net httpcontext</tags>
   </metadata>
 </package>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.5.0.{build}
+version: 4.6.0.{build}
 clone_folder: c:\projects\nlogweb
 configuration: Release
 image: Visual Studio 2017
@@ -7,8 +7,8 @@ assembly_info:
   patch: true
   file: '**\AssemblyInfo.cs'
   assembly_version: '4.0.0'
-  assembly_file_version: '4.5.3.{build}' #NLog.Web
-  assembly_informational_version: '4.5.3' #NLog.Web
+  assembly_file_version: '4.6.0.{build}' #NLog.Web
+  assembly_informational_version: '4.6.0' #NLog.Web
 nuget:
   project_feed: true
 matrix:
@@ -20,7 +20,7 @@ build:
 
 build_script:
 - cmd: >-
-    call build_aspnet.bat -nuget_version=4.5.3 # NLog.Web package
+    call build_aspnet.bat -nuget_version=4.6.0 # NLog.Web package
 
     call build_aspnetcore.bat # update NLog.Web.AspNetCore.csproj for version number