From 03aa2fb77588fb0db96f6981992f202fc2e0629d Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 16 Jan 2020 21:29:22 +1100 Subject: [PATCH] Add new target frameworks --- .github/workflows/build-and-test.yml | 8 ++++-- Directory.Build.props | 27 +++++++++---------- src/ImageSharp/Common/Helpers/TestHelpers.cs | 14 ++++++---- src/ImageSharp/ImageSharp.csproj | 2 +- tests/ImageSharp.Benchmarks/Config.cs | 1 + .../ImageSharp.Benchmarks.csproj | 2 +- .../ImageSharp.Sandbox46.csproj | 2 +- .../Image/ImageTests.WrapMemory.cs | 2 +- .../ImageSharp.Tests/ImageSharp.Tests.csproj | 2 +- .../Tests/TestEnvironmentTests.cs | 23 ---------------- 10 files changed, 34 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0cc3f9644..2fc6f0b38 100644 --- a/.github/workflows/build-and-test.yml +++ b/.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 diff --git a/Directory.Build.props b/Directory.Build.props index dcdc62a52..02f7b7721 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,22 +31,21 @@ - - $(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING + $(DefineConstants);MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS; $(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING @@ -55,7 +54,7 @@ $(DefineConstants);SUPPORTS_MATHF; - $(DefineConstants);SUPPORTS_MATHF;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING + $(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING $(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS diff --git a/src/ImageSharp/Common/Helpers/TestHelpers.cs b/src/ImageSharp/Common/Helpers/TestHelpers.cs index d330233c4..c6574e4b5 100644 --- a/src/ImageSharp/Common/Helpers/TestHelpers.cs +++ b/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! /// internal const string ImageSharpBuiltAgainst = -#if NET472 - "netfx4.7.2"; +#if NETCOREAPP3_1 + "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 } -} \ No newline at end of file +} diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj index 5e64adf53..f13989acd 100644 --- a/src/ImageSharp/ImageSharp.csproj +++ b/src/ImageSharp/ImageSharp.csproj @@ -10,7 +10,7 @@ $(packageversion) 0.0.1 - netcoreapp2.1;netstandard2.0;netstandard1.3;net472 + netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472 true true diff --git a/tests/ImageSharp.Benchmarks/Config.cs b/tests/ImageSharp.Benchmarks/Config.cs index 018a2e02b..cb4fcbba1 100644 --- a/tests/ImageSharp.Benchmarks/Config.cs +++ b/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) ); } diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj index 70c5481da..34f517500 100644 --- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj +++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj @@ -5,7 +5,7 @@ ImageSharp.Benchmarks Exe SixLabors.ImageSharp.Benchmarks - netcoreapp2.1;net472 + netcoreapp3.1;netcoreapp2.1;net472 false diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj index 7afe33fb5..e89b28dc1 100644 --- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj +++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj @@ -8,7 +8,7 @@ false SixLabors.ImageSharp.Sandbox46 win7-x64 - netcoreapp2.1;net472 + netcoreapp3.1;netcoreapp2.1;net472 SixLabors.ImageSharp.Sandbox46.Program false diff --git a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs index 63c2e57c8..04d05f6dc 100644 --- a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs +++ b/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"); } } } diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj index 743c2eee0..41e6749be 100644 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp2.1;net462;net472 + netcoreapp3.1;netcoreapp2.1;net472 True True SixLabors.ImageSharp.Tests diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs index 567a1b030..07523f617 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs @@ -33,29 +33,6 @@ namespace SixLabors.ImageSharp.Tests Assert.True(Directory.Exists(path)); } - ///// - ///// We need this test to make sure that the netcoreapp2.1 test execution actually covers the netcoreapp2.1 build configuration of ImageSharp. - ///// - //[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() {