From 630ff6f9774504efe524e5deb598ea6a6a01efd2 Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Mon, 27 Aug 2018 07:58:38 -0700
Subject: [PATCH] [SL.Core] Cleanup AssemblyInfo add SUPPORT_MATHF symbol

---
 src/SixLabors.Core/MathF.cs                   |  2 +-
 src/SixLabors.Core/Properties/AssemblyInfo.cs | 29 -------------------
 src/SixLabors.Core/SixLabors.Core.csproj      | 29 ++++++++-----------
 3 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/src/SixLabors.Core/MathF.cs b/src/SixLabors.Core/MathF.cs
index 1329dbdae..b0d760ade 100644
--- a/src/SixLabors.Core/MathF.cs
+++ b/src/SixLabors.Core/MathF.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 
-#if NETCOREAPP2_0 || NETCOREAPP2_1
+#if SUPPORTS_MATHF
 [assembly: TypeForwardedTo(typeof(System.MathF))]
 #else
 namespace System
diff --git a/src/SixLabors.Core/Properties/AssemblyInfo.cs b/src/SixLabors.Core/Properties/AssemblyInfo.cs
index 96a40f6f6..5402a1af1 100644
--- a/src/SixLabors.Core/Properties/AssemblyInfo.cs
+++ b/src/SixLabors.Core/Properties/AssemblyInfo.cs
@@ -1,37 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Reflection;
-using System.Resources;
 using System.Runtime.CompilerServices;
 
-// 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("SixLabors.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Six Labors")]
-[assembly: AssemblyProduct("SixLabors.Core")]
-[assembly: AssemblyCopyright("Copyright (c) Six Labors and contributors.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
-[assembly: AssemblyInformationalVersion("0.1.0-alpha02")]
-
 // Ensure the internals can be tested.
 [assembly: InternalsVisibleTo("SixLabors.Core.Tests")]
 
diff --git a/src/SixLabors.Core/SixLabors.Core.csproj b/src/SixLabors.Core/SixLabors.Core.csproj
index 8215664dc..b03eac761 100644
--- a/src/SixLabors.Core/SixLabors.Core.csproj
+++ b/src/SixLabors.Core/SixLabors.Core.csproj
@@ -16,16 +16,7 @@
         <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/SixLabors/Core</RepositoryUrl>
-        <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-        <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
-        <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-        <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-        <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-        <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+        <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
         <DebugType Condition="$(codecov) == 'true'">full</DebugType>
         <RootNamespace>SixLabors</RootNamespace>
     </PropertyGroup>
@@ -34,24 +25,28 @@
         <CodeAnalysisRuleSet>..\SixLabors.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
 
+    <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp2')) ">
+      <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+    </PropertyGroup>
+        
     <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
+       <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
         <PrivateAssets>All</PrivateAssets>
       </PackageReference>
     
+        <AdditionalFiles Include="..\..\stylecop.json" />
+    </ItemGroup>
+ 
+    <ItemGroup>
        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
     </ItemGroup>  
 
-    <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1'">
+    <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
         <PackageReference Include="System.Buffers" Version="4.5.0" />
         <PackageReference Include="System.Memory" Version="4.5.1" />
     </ItemGroup>
   
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1'">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
         <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     </ItemGroup>
 </Project>
\ No newline at end of file