From 2749a25d78c02c2931552766cbb3549c3d81a55f Mon Sep 17 00:00:00 2001
From: AlexNDRmac <AlexNDR.mac@gmail.com>
Date: Thu, 12 Nov 2020 16:52:56 +0200
Subject: [PATCH] Move package to build props

---
 .github/workflows/build-and-test.yml                     | 4 ++++
 src/ImageSharp/ImageSharp.csproj                         | 8 --------
 tests/Directory.Build.targets                            | 2 ++
 tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj | 2 --
 tests/ImageSharp.Tests/ImageSharp.Tests.csproj           | 2 --
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c8f3997946..b618e1e657 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,6 +18,10 @@ jobs:
                       framework: netcoreapp3.1
                       runtime: -x64
                       codecov: true
+                    - os: macos-latest
+                      framework: netcoreapp3.1
+                      runtime: -x64
+                      codecov: false
                     - os: windows-latest
                       framework: netcoreapp3.1
                       runtime: -x64
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index a5e6bbbc7d..c3d9618c8c 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -28,14 +28,6 @@
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
   </ItemGroup>
 
-  <!-- Enable support for using libgdiplus on macOS -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) AND $([MSBuild]::IsOSPlatform('OSX'))">
-    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2')) AND $([MSBuild]::IsOSPlatform('OSX'))">
-    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
-  </ItemGroup>
-
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) OR '$(TargetFramework)' == 'net472'">
     <PackageReference Include="System.Numerics.Vectors" />
     <PackageReference Include="System.Buffers" />
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 1f699c9dd1..76759948b2 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -35,6 +35,8 @@
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Update="Moq" Version="4.14.6" />
     <PackageReference Update="Pfim" Version="0.9.1" />
+    <!-- Enable support for using libgdiplus on macOS -->
+    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
     <PackageReference Update="SharpZipLib" Version="1.3.0" />
     <PackageReference Update="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Update="xunit" Version="2.4.1" />
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
index 627e281f6f..e8ad660adf 100644
--- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
+++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -26,8 +26,6 @@
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
     <PackageReference Include="Colourful" />
     <PackageReference Include="Pfim" />
-    <!-- Enable support for using libgdiplus on macOS -->
-    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
     <PackageReference Include="SharpZipLib" />
     <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index d96d33a5ad..07ade97d5d 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -22,8 +22,6 @@
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Moq" />
-    <!-- Enable support for using libgdiplus on macOS -->
-    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
     <PackageReference Include="SharpZipLib" />
     <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>