Add new target frameworks

.github/workflows/build-and-test.yml

@@ -16,14 +16,18 @@ jobs:
             matrix:
                 options:
                     - os: ubuntu-latest
-                      framework: netcoreapp2.1
+                      framework: netcoreapp3.1
                       runtime: -x64
                       codecov: false
                     # - os: windows-latest
-                    #   framework: netcoreapp2.1
+                    #   framework: netcoreapp3.1
                     #   runtime: -x64
                     #   codecov: true
                     # - os: windows-latest
+                    #   framework: netcoreapp2.1
+                    #   runtime: -x64
+                    #   codecov: false
+                    # - os: windows-latest
                     #   framework: net472
                     #   runtime: -x64
                     #   codecov: false

Directory.Build.props

@@ -31,22 +31,21 @@
 
   <!--
     https://apisof.net/
-    +===================+================+===================+==============================+======================+==========================+
+    +===================+=======+==========+=====================+=============+=================+====================+
-    | Target Framework  | SUPPORTS_MATHF | SUPPORTS_HASHCODE | SUPPORTS_EXTENDED_INTRINSICS | SUPPORTS_SPAN_STREAM | SUPPORTS_ENCODING_STRING |
+    | SUPPORTS          | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS |
-    +===================+================+===================+==============================+======================+==========================+
+    +===================+=======+==========+=====================+=============+=================+====================+
-    | netcoreapp3.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
+    | netcoreapp3.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |
-    | netcoreapp2.1     |       Y        |         Y         |               Y              |          Y           |            Y             |
+    | netcoreapp2.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        N           |
-    | netcoreapp2.0     |       Y        |         N         |               N              |          N           |            N             |
+    | netcoreapp2.0     |   Y   |    N     |         N           |      N      |        N        |        N           |
-    | netstandard2.1    |       Y        |         N         |               N              |          Y           |            Y             |
+    | netstandard2.1    |   Y   |    Y     |         N           |      Y      |        Y        |        N           |
-    | netstandard2.0    |       N        |         N         |               N              |          N           |            N             |
+    | netstandard2.0    |   N   |    N     |         N           |      N      |        N        |        N           |
-    | netstandard1.3    |       N        |         N         |               N              |          N           |            N             |
+    | netstandard1.3    |   N   |    N     |         N           |      N      |        N        |        N           |
-    | net472            |       N        |         N         |               Y              |          N           |            N             |
+    | net472            |   N   |    N     |         Y           |      N      |        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>
+    <DefineConstants>$(DefineConstants);MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
     <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
@@ -55,7 +54,7 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
     <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>

src/ImageSharp/Common/Helpers/TestHelpers.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 namespace SixLabors.ImageSharp.Common.Helpers
@@ -13,14 +13,18 @@ namespace SixLabors.ImageSharp.Common.Helpers
         /// Only intended to be used in tests!
         /// </summary>
         internal const string ImageSharpBuiltAgainst =
-#if NET472
+#if NETCOREAPP3_1
-            "netfx4.7.2";
+            "netcoreapp3.1";
 #elif NETCOREAPP2_1
             "netcoreapp2.1";
+#elif NETSTANDARD2_1
+            "netstandard2.1";
+#elif NETSTANDARD2_0
+            "netstandard2.0";
 #elif NETSTANDARD1_3
             "netstandard1.3";
 #else
-            "netstandard2.0";
+            "net472";
 #endif
     }
-}
+}

src/ImageSharp/ImageSharp.csproj

@@ -10,7 +10,7 @@
     <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
     <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
 
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
 
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

tests/ImageSharp.Benchmarks/Config.cs

@@ -21,6 +21,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             {
                 this.Add(
                     Job.Default.With(ClrRuntime.Net472).WithLaunchCount(1).WithWarmupCount(3).WithIterationCount(3),
+                    Job.Default.With(CoreRuntime.Core31).WithLaunchCount(1).WithWarmupCount(3).WithIterationCount(3),
                     Job.Default.With(CoreRuntime.Core21).WithLaunchCount(1).WithWarmupCount(3).WithIterationCount(3)
                 );
             }

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>ImageSharp.Benchmarks</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SixLabors.ImageSharp.Benchmarks</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <!--Used to hide test project from dotnet test-->
   </PropertyGroup>

tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj

@@ -8,7 +8,7 @@
     <Prefer32Bit>false</Prefer32Bit>
     <RootNamespace>SixLabors.ImageSharp.Sandbox46</RootNamespace>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <StartupObject>SixLabors.ImageSharp.Sandbox46.Program</StartupObject>
     <!--Used to hide test project from dotnet test-->
     <IsTestProject>false</IsTestProject>

tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs

@@ -172,7 +172,7 @@ namespace SixLabors.ImageSharp.Tests
             }
 
             private static bool ShouldSkipBitmapTest =>
-                !TestEnvironment.Is64BitProcess || TestHelpers.ImageSharpBuiltAgainst != "netcoreapp2.1";
+                !TestEnvironment.Is64BitProcess || (TestHelpers.ImageSharpBuiltAgainst != "netcoreapp3.1" && TestHelpers.ImageSharpBuiltAgainst != "netcoreapp2.1");
         }
     }
 }

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net462;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DebugSymbols>True</DebugSymbols>
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>

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

@@ -33,29 +33,6 @@ namespace SixLabors.ImageSharp.Tests
             Assert.True(Directory.Exists(path));
         }
 
-        ///// <summary>
-        ///// We need this test to make sure that the netcoreapp2.1 test execution actually covers the netcoreapp2.1 build configuration of ImageSharp.
-        ///// </summary>
-        //[Fact]
-        //public void ImageSharpAssemblyUnderTest_MatchesExpectedTargetFramework()
-        //{
-        //    this.Output.WriteLine("NetCoreVersion: " + TestEnvironment.NetCoreVersion);
-        //    this.Output.WriteLine("ImageSharpBuiltAgainst: " + TestHelpers.ImageSharpBuiltAgainst);
-
-        //    if (string.IsNullOrEmpty(TestEnvironment.NetCoreVersion))
-        //    {
-        //        this.Output.WriteLine("Not running under .NET Core!");
-        //    }
-        //    else if (TestEnvironment.NetCoreVersion.StartsWith("2.1"))
-        //    {
-        //        Assert.Equal("netcoreapp2.1", TestHelpers.ImageSharpBuiltAgainst);
-        //    }
-        //    else
-        //    {
-        //        Assert.Equal("netstandard2.0", TestHelpers.ImageSharpBuiltAgainst);
-        //    }
-        //}
-
         [Fact]
         public void SolutionDirectoryFullPath()
         {