Updated dependencies

NLog · Dec 5, 2017 · 7f6950e · 7f6950e
1 parent f5ddd31
commit 7f6950e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj b/NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;netcoreapp2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net461</TargetFrameworks>
     <AssemblyName>NLog.Web.AspNetCore.Tests</AssemblyName>
     <AssemblyVersion>1.2.3.0</AssemblyVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' and '$(TargetFramework)' != 'net461' ">
     <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE1</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp1.1' ">
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'net461' ">
     <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE2</DefineConstants>
   </PropertyGroup>
-
-
-
   <ItemGroup>
     <ProjectReference Include="..\NLog.Web.AspNetCore\NLog.Web.AspNetCore.csproj" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
@@ -31,14 +26,14 @@
     -->
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' and '$(TargetFramework)' != 'net461'  ">
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="1.1.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'net461'  ">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

diff --git 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
@@ -5,7 +5,7 @@
     <AssemblyTitle>NLog.Web.AspNetCore</AssemblyTitle>
 
     <Authors>Julian Verdurmen</Authors>
-    <TargetFrameworks>netstandard1.3;netstandard1.5;net451;net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;net451;net461;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>NLog.Web.AspNetCore</AssemblyName>
     <AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
@@ -14,14 +14,11 @@
     <PackageId>NLog.Web.AspNetCore</PackageId>
     <PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC</PackageTags>
     <PackageReleaseNotes>
-
-      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 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>4.5.0-rc1</Version>
+    <Version>4.5.0-beta04</Version>
     <RootNamespace>NLog.Web</RootNamespace>
   </PropertyGroup>
 
@@ -61,8 +58,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc3" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -75,6 +71,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="1.1.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
@@ -84,8 +81,4 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>