Merge branch 'fix-build'

Author: angularsen

UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props

@@ -23,8 +23,8 @@
     <RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
     <!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath>..\Artifacts\$(MSBuildProjectName)</OutputPath>
+    <NoWarn>CS0618</NoWarn>
   </PropertyGroup>
   <!-- NuGet references that work for both signed and unsigned -->
   <ItemGroup>

UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Signed.csproj

@@ -12,6 +12,7 @@
     <DefineConstants>SIGNED</DefineConstants>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\UnitsNet.snk</AssemblyOriginatorKeyFile>
+    <AssemblyName>UnitsNet.Serialization.JsonNet.Signed</AssemblyName>
   </PropertyGroup>
 
   <!-- Signed project references, will also generate the corresponding nuget dependencies -->

UnitsNet.Tests/UnitsNet.Tests.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <RootNamespace>UnitsNet.Tests</RootNamespace>
     <OutputPath>..\Artifacts\$(MSBuildProjectName)</OutputPath>
+    <NoWarn>CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

UnitsNet/UnitsNet.Common.props

@@ -15,7 +15,6 @@
     <PackageLicenseUrl>https://github.com/angularsen/UnitsNet/blob/master/LICENSE</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>unit units quantity quantities measurement si metric imperial abbreviation abbreviations convert conversion parse immutable</PackageTags>
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath>..\Artifacts\$(MSBuildProjectName)</OutputPath>
   </PropertyGroup>
 
@@ -26,6 +25,7 @@
     <RootNamespace>UnitsNet</RootNamespace>
     <!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+    <NoWarn>CS0618,CS0809</NoWarn>
   </PropertyGroup>
 
   <!-- NuGet references that work for both signed and unsigned -->

UnitsNet/UnitsNet.NetStandard10.Signed.csproj

@@ -12,6 +12,7 @@
     <DefineConstants>SIGNED</DefineConstants>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\UnitsNet.snk</AssemblyOriginatorKeyFile>
+    <AssemblyName>UnitsNet.Signed</AssemblyName>
   </PropertyGroup>
 
 </Project>