Merge branch 'master' into webp

.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

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" />

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
     <PackageReference Include="Colourful" />
     <PackageReference Include="Pfim" />
-    <PackageReference Include="SharpZipLib"  />
+    <PackageReference Include="SharpZipLib" />
     <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 

tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs

@@ -355,6 +355,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         }
 
         [Theory]
+        [PlatformSpecific(~TestPlatforms.OSX)]
         [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)]
         public void ResizeFromSourceRectangle<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
@@ -437,6 +438,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         }
 
         [Theory]
+        [PlatformSpecific(~TestPlatforms.OSX)]
         [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)]
         public void ResizeWithBoxPadMode<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
@@ -547,6 +549,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         }
 
         [Theory]
+        [PlatformSpecific(~TestPlatforms.OSX)]
         [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)]
         public void ResizeWithPadMode<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>

tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs

@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.Tests
         [InlineData("lol/foobar.webp", typeof(WebPEncoder))]
         public void GetReferenceEncoder_ReturnsCorrectEncoders_Windows(string fileName, Type expectedEncoderType)
         {
-            if (TestEnvironment.IsLinux)
+            if (!TestEnvironment.IsWindows)
             {
                 return;
             }
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests
         [InlineData("lol/foobar.webp", typeof(WebPDecoder))]
         public void GetReferenceDecoder_ReturnsCorrectDecoders_Windows(string fileName, Type expectedDecoderType)
         {
-            if (TestEnvironment.IsLinux)
+            if (!TestEnvironment.IsWindows)
             {
                 return;
             }