diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 8db7027b..f71cd0fa 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,12 +1,21 @@
## Change Log
-### v4.6-aspnetcore & aspnet4 (2018/08/05)
+See also [releases](https://github.com/NLog/NLog.Web/releases) and [milestones](https://github.com/NLog/NLog.Web/milestones).
+
+Date format: (year/month/day)
+### v4.7-aspnetcore & aspnet4 (2018/09/22)
+- [#315](https://github.com/NLog/NLog.Web/pull/315) Added ${configsetting} for reading appsettings.json etc - via NLog.Extensions.Logging (@304NotModified) (ASP.NET Core only)
+- [#313](https://github.com/NLog/NLog.Web/pull/313) Added ${aspnet-request-form} (@DrewBrasher)
+- [#317](https://github.com/NLog/NLog.Web/pull/317) Make separators layoutable for (${aspnet-request-querystring} and ${aspnet-request-cookie}) (@304NotModified)
+- [#314](https://github.com/NLog/NLog.Web/pull/314) Better missing HttpContext reporting & Skip null-check of HttpContextAccessor.HttpContext in DoAppend (@snakefoot)
+- [#312](https://github.com/NLog/NLog.Web/pull/312) Removed dependency on Microsoft.AspNetCore.Http.Extensions (@snakefoot) ASP.NET Core only)
+
+### v4.6-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)
@@ -20,11 +29,9 @@
- [#273](https://github.com/nlog/nlog.web/pull/273) Added public method to configure the NLog ServiceLocator (@snakefoot)
- [#272](https://github.com/nlog/nlog.web/pull/272) Improved registration of hidden assemblies for callsite handling (@snakefoot)
-
### v4.5.1-aspnetcore (2018/04/02)
- [#268](https://github.com/nlog/nlog.web/pull/268) Improved ConfigureNLog for better out-of-the-box experience (@snakefoot)
-
### v4.5.0-aspnetcore (2018/03/27)
- [#257](https://github.com/nlog/nlog.web/pull/257) ConfigureNLog should not be used together with UseNLog (@snakefoot)
- [#256](https://github.com/nlog/nlog.web/pull/256) ASP.NET Core2 Example - Updated with NLog.LogManager.Shutdown() (@snakefoot)
@@ -73,7 +80,6 @@
- [#152](https://github.com/nlog/nlog.web/pull/152) Run test for asp.net core on full and core framework, fix unit test build (#152) (@johnkors)
- [#150](https://github.com/nlog/nlog.web/pull/150) Update vulnerable dependency (#150) (@johnkors)
-
### v4.5.0-aspnet4 (2017/05/14)
#### Features
diff --git a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
index d9bd79fa..1604f3c6 100644
--- a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
+++ b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -5,7 +5,7 @@
netstandard1.5;net451;net461;netstandard2.0
- 4.6
+ 4.7
$(VersionPrefix)$(VersionSuffix)
$(Version)
@@ -30,10 +30,11 @@ Supported platforms:
NLog.Web.AspNetCore
logging;log;session;NLog;web;aspnet;aspnetcore;MVC;httpcontext
-- 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
-
+- Added ${aspnet-request-form} (@DrewBrasher)
+- Added ${configsetting} for reading appsettings.json etc - via NLog.Extensions.Logging (@304NotModified)
+- Make separators layoutable for (${aspnet-request-querystring} and ${aspnet-request-cookie}) (@304NotModified)
+- Better missing httpcontext reporting & Skip null-check of HttpContextAccessor.HttpContext in DoAppend (@snakefoot)
+- Removed dependency on Microsoft.AspNetCore.Http.Extensions (@snakefoot)
http://nlog-project.org/N.png
https://github.com/NLog/NLog.Web
diff --git a/NLog.Web/NLog.Web.nuspec b/NLog.Web/NLog.Web.nuspec
index 0554f0c4..f031ef3c 100644
--- a/NLog.Web/NLog.Web.nuspec
+++ b/NLog.Web/NLog.Web.nuspec
@@ -15,9 +15,9 @@ This package is for ASP.NET 3.5+
For ASP.NET Core: Check https://www.nuget.org/packages/NLog.Web.AspNetCore
-- 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
+- Added ${aspnet-request-form} (@DrewBrasher)
+- Make separators layoutable for (${aspnet-request-querystring} and ${aspnet-request-cookie}) (@304NotModified)
+- Better missing HttpContext reporting & Skip null-check of HttpContextAccessor.HttpContext in DoAppend (@snakefoot)
Copyright 2014-2018
nlog log target layoutrenderer web asp.net httpcontext
diff --git a/appveyor.yml b/appveyor.yml
index 8a6cc658..358fe230 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.6.0.{build}
+version: 4.7.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.6.0.{build}' #NLog.Web
- assembly_informational_version: '4.6.0' #NLog.Web
+ assembly_file_version: '4.7.0.{build}' #NLog.Web
+ assembly_informational_version: '4.7.0' #NLog.Web
nuget:
project_feed: true
matrix:
@@ -20,7 +20,7 @@ build:
build_script:
- cmd: >-
- call build_aspnet.bat -nuget_version=4.6.0 # NLog.Web package
+ call build_aspnet.bat -nuget_version=4.7.0 # NLog.Web package
call build_aspnetcore.bat # update NLog.Web.AspNetCore.csproj for version number