Merge pull request #232 from NLog/update-deps

Updated dependencies
NLog · Dec 5, 2017 · e9b2d7c · e9b2d7c
2 parents 8ad6d8e + f7faa1e
commit e9b2d7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
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>
@@ -61,8 +61,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 +74,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 +84,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>