From b8306a3bf7b96664f097b4a42db33ae7eb2c1ef4 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 10 Jan 2020 21:50:48 +1100
Subject: [PATCH] Use single constant definitions.

---
 Directory.Build.props                         | 34 ++++++++++++++++++-
 .../ImageSharp.Drawing.csproj                 | 32 -----------------
 src/ImageSharp/ImageSharp.csproj              | 32 -----------------
 3 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index efe4cc966..9fcdf1396 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,10 +29,42 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
+  <!--
+    https://apisof.net/
+    +===================+================+===================+==============================+======================+==========================+
+    | Target Framework  | SUPPORTS_MATHF | SUPPORTS_HASHCODE | SUPPORTS_EXTENDED_INTRINSICS | SUPPORTS_SPAN_STREAM | SUPPORTS_ENCODING_STRING |
+    +===================+================+===================+==============================+======================+==========================+
+    | netcoreapp3.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
+    | netcoreapp2.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
+    | netcoreapp2.0     |       Y        |         N         |               N              |          N           |            N             |
+    | netstandard2.1    |       Y        |         N         |               N              |          Y           |            Y             |
+    | netstandard2.0    |       N        |         N         |               N              |          N           |            N             |
+    | netstandard1.3    |       N        |         N         |               N              |          N           |            N             |
+    | net472            |       N        |         N         |               Y              |          N           |            N             |
+    +===================+================+===================+==============================+======================+==========================+
+    -->
+
+  <!-- TODO: Include additional targets to TargetFrameworks -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-  
+
   <!--TODO: Check what this is testing for and why does it fail?-->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
index 4f05bc66e..c4e3224bb 100644
--- a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
+++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -12,38 +12,6 @@
     <TargetFrameworks>netcoreapp2.1;netstandard2.0;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
 
-  <!--
-    https://apisof.net/
-    +===================+================+===================+==============================+======================+==========================+
-    | Target Framework  | SUPPORTS_MATHF | SUPPORTS_HASHCODE | SUPPORTS_EXTENDED_INTRINSICS | SUPPORTS_SPAN_STREAM | SUPPORTS_ENCODING_STRING |
-    +===================+================+===================+==============================+======================+==========================+
-    | netcoreapp3.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
-    | netcoreapp2.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
-    | netcoreapp2.0     |       Y        |         N         |               N              |          N           |            N             |
-    | netstandard2.1    |       Y        |         N         |               N              |          Y           |            Y             |
-    | netstandard2.0    |       N        |         N         |               N              |          N           |            N             |
-    | netstandard1.3    |       N        |         N         |               N              |          N           |            N             |
-    | net472            |       N        |         N         |               Y              |          N           |            N             |
-    +===================+================+===================+==============================+======================+==========================+
-    -->
-
-  <!-- TODO: Include additional targets to TargetFrameworks -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
-  </PropertyGroup>
-  
   <ItemGroup>
     <PackageReference Include="SixLabors.Fonts" />
     <PackageReference Include="SixLabors.Shapes" />
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index caa9141d7..d86da5dcd 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -19,38 +19,6 @@
     <RootNamespace>SixLabors.ImageSharp</RootNamespace>
   </PropertyGroup>
 
-  <!--
-    https://apisof.net/
-    +===================+================+===================+==============================+======================+==========================+
-    | Target Framework  | SUPPORTS_MATHF | SUPPORTS_HASHCODE | SUPPORTS_EXTENDED_INTRINSICS | SUPPORTS_SPAN_STREAM | SUPPORTS_ENCODING_STRING |
-    +===================+================+===================+==============================+======================+==========================+
-    | netcoreapp3.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
-    | netcoreapp2.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
-    | netcoreapp2.0     |       Y        |         N         |               N              |          N           |            N             |
-    | netstandard2.1    |       Y        |         N         |               N              |          Y           |            Y             |
-    | netstandard2.0    |       N        |         N         |               N              |          N           |            N             |
-    | netstandard1.3    |       N        |         N         |               N              |          N           |            N             |
-    | net472            |       N        |         N         |               Y              |          N           |            N             |
-    +===================+================+===================+==============================+======================+==========================+
-    -->
-  
-  <!-- TODO: Include additional targets to TargetFrameworks -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\..\shared-infrastructure\**\*.cs" />
   </ItemGroup>