Merge pull request #250 from snakefoot/master

Removed System.ValueTuple as dependency for .NET Core app 1, add file version to assembly
NLog · Feb 22, 2018 · 51e9f3e · 51e9f3e
2 parents b9caa94 + 5bddeaa
commit 51e9f3e
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 43 deletions.
diff --git a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -1,16 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Extend NLog with targets and layout renderers for websites and webapplications on the ASP.NET Core platform.</Description>
-    <AssemblyTitle>NLog.Web.AspNetCore</AssemblyTitle>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
 
-    <Authors>Julian Verdurmen</Authors>
     <TargetFrameworks>netstandard1.5;net451;net461;netstandard2.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <VersionPrefix>4.5.0</VersionPrefix>
+    <VersionSuffix>-rc3</VersionSuffix>
+    <Version>$(VersionPrefix)$(VersionSuffix)</Version>
+    <InformationalVersion>$(Version)</InformationalVersion>
+    <FileVersion>$(VersionPrefix).0</FileVersion>
+    <FileVersion Condition="'$(APPVEYOR_BUILD_NUMBER)' != ''">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</FileVersion>
+
+    <Product>NLog.Web.AspNetCore v$(Version)</Product>
+    <Description>Extend NLog with targets and layout renderers for websites and webapplications on the ASP.NET Core platform.</Description>
+    <Authors>Julian Verdurmen</Authors>
+    <Company>NLog</Company>
+    <CurrentYear>$([System.DateTime]::Now.ToString(yyyy))</CurrentYear>
+    <Copyright>Copyright (c) 2015-$(CurrentYear) NLog Project - http://nlog-project.org/ </Copyright>
     <AssemblyName>NLog.Web.AspNetCore</AssemblyName>
-    <AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>NLog.Web.AspNetCore</PackageId>
     <PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC</PackageTags>
     <PackageReleaseNotes>
@@ -50,22 +58,34 @@
     <PackageLicenseUrl>http://raw.github.com/NLog/NLog.Web/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/NLog/NLog.Web</RepositoryUrl>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>4.5.0-rc3</Version>
+
+    <SignAssembly>true</SignAssembly>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+
     <RootNamespace>NLog.Web</RootNamespace>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'net461' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Title>NLog.Web.AspNetCore for .NET Framework 4.5.1</Title>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE1</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Title>NLog.Web.AspNetCore for .NET Framework 4.6.1</Title>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE2</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+    <Title>NLog.Web.AspNetCore for NetStandard 1.5</Title>
+    <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE1</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Title>NLog.Web.AspNetCore for NetStandard 2.0</Title>
     <DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE2</DefineConstants>
   </PropertyGroup>
 
@@ -83,7 +103,6 @@
     <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' ">
@@ -93,4 +112,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <AssemblyTitle>$(Title)</AssemblyTitle>
+  </PropertyGroup>
+
 </Project>
diff --git a/NLog.Web.AspNetCore/Properties/AssemblyInfo.cs b/NLog.Web.AspNetCore/Properties/AssemblyInfo.cs
@@ -2,21 +2,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("NLog.Web.AspNetCore")]
-[assembly: AssemblyProduct("NLog.Web for ASP.NET Core")]
-
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-
-[assembly: AssemblyCopyright("Copyright © NLog 2015-2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("4.0.0.0")] //fixed
-
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.

diff --git a/NLog.Web/NLog.Web.csproj b/NLog.Web/NLog.Web.csproj
@@ -85,7 +85,7 @@
     <Compile Include="..\NLog.Web.AspNetCore\Targets\AspNetTrace.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\Targets\Wrappers\AspNetBufferingTargetWrapper.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\Internal\RequestAccessorExtension.cs" />
-    <Compile Include="Properties\AssemblyInfo-test.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="NLog.snk" />

diff --git a/NLog.Web/Properties/AssemblyInfo-test.cs → NLog.Web/Properties/AssemblyInfo.cs b/NLog.Web/Properties/AssemblyInfo-test.cs → NLog.Web/Properties/AssemblyInfo.cs
@@ -5,21 +5,16 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-#if DNX
-[assembly: AssemblyTitle("NLog.Web.ASPNET5")]
-[assembly: AssemblyProduct("NLog.Web for ASP.NET Core")]
-#else
 [assembly: AssemblyTitle("NLog.Web")]
 [assembly: AssemblyProduct("NLog.Web")]
-#endif
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-
-[assembly: AssemblyCopyright("Copyright © NLog 2015-2017")]
+[assembly: AssemblyCopyright("Copyright © NLog 2015-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("4.0.0.0")] //fixed
+[assembly: AssemblyFileVersion("1.0.0.0")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,3 @@
-version: 4.5.0.{build}
 clone_folder: c:\projects\nlogweb
 configuration: Release
 image: Visual Studio 2017
@@ -7,7 +6,7 @@ assembly_info:
   patch: true
   file: '**\AssemblyInfo.cs'
   assembly_version: '4.0.0'
-  assembly_file_version: '{version}'
+  assembly_file_version: '4.5.1.{build}' #NLog.Web
   assembly_informational_version: '4.5.1' #NLog.Web
 nuget:
   project_feed: true