diff --git a/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj b/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj index e0de77851..4791c456a 100644 --- a/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj +++ b/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj @@ -1,21 +1,16 @@  - netcoreapp1.1;netcoreapp2;net461 + netcoreapp1.1;netcoreapp2.0;net461 NLog.Web.AspNetCore.Tests 1.2.3.0 - - + $(DefineConstants);ASP_NET_CORE;ASP_NET_CORE1 - - 2.0.0 + $(DefineConstants);ASP_NET_CORE;ASP_NET_CORE2 - - - @@ -31,14 +26,14 @@ --> - + - - + + diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AssemblyVersionLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AssemblyVersionLayoutRenderer.cs index f1ac83895..c42b5734b 100644 --- a/NLog.Web.AspNetCore/LayoutRenderers/AssemblyVersionLayoutRenderer.cs +++ b/NLog.Web.AspNetCore/LayoutRenderers/AssemblyVersionLayoutRenderer.cs @@ -65,9 +65,6 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent) private static string GetAssemblyVersion() { -#if ASP_NET_CORE && NETSTANDARD1_3 - return PlatformServices.Default.Application.ApplicationVersion; -#else var assembly = Assembly.GetEntryAssembly(); #if !ASP_NET_CORE @@ -79,7 +76,6 @@ private static string GetAssemblyVersion() var version = assembly?.GetName().Version.ToString(); return version; -#endif } #if !ASP_NET_CORE diff --git a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj index f6b55ddcb..a561af0e3 100644 --- a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj +++ b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj @@ -5,7 +5,7 @@ NLog.Web.AspNetCore Julian Verdurmen - netstandard1.3;netstandard1.5;net451;net461;netstandard2.0 + netstandard1.5;net451;net461;netstandard2.0 true NLog.Web.AspNetCore NLog.snk @@ -14,14 +14,11 @@ NLog.Web.AspNetCore logging;log;session;NLog;web;aspnet;aspnetcore;MVC - - RC 1: Fixed ${callsite} in ASP.NET Core 2, support .NET 4.6.1 + ASP.NET Core 2 (NLogBuilder) - - Beta 4: updated dependencies + Beta 4: updated/removed dependencies Beta 3 - - Fixed ${callsite} in ASP.NET Core 2 when before using UseNLog() + - Fixed ${callsite} in Asp.Net Core 2 when before using UseNLog() Beta 2 - Better compatiblity with NLog.Web.AspNetCore 4.4 @@ -49,7 +46,7 @@ false false True - 4.5.0-rc1 + 4.5.0-beta04 NLog.Web @@ -61,8 +58,7 @@ - - + @@ -75,6 +71,7 @@ + @@ -84,8 +81,4 @@ - - - -