Merge pull request #15 from stefannikolei/net50

add net50

Author: JimBobSquarePants

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

@@ -12,6 +12,18 @@ jobs:
         strategy:
             matrix:
                 options:
+                    - os: ubuntu-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: false
+                    - os: macos-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: false
+                    - os: windows-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: true
                     - os: ubuntu-latest
                       framework: netcoreapp3.1
                       runtime: -x64

README.md

@@ -156,7 +156,7 @@ To include internals like `Guard.cs`, `MathF`, and `HashCode` into your project
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========+============|
     | SUPPORTS          | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS | CODECOVERAGE | HOTPATH | CREATESPAN |
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========|============|
-    | netcoreapp3.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |    Y    |      Y     |
+    | >=netcoreapp3.1   |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |    Y    |      Y     |
     | netcoreapp2.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        N           |      Y       |    N    |      Y     |
     | netcoreapp2.0     |   Y   |    N     |         N           |      N      |        N        |        N           |      Y       |    N    |      Y     |
     | netstandard2.1    |   Y   |    Y     |         N           |      Y      |        Y        |        N           |      Y       |    N    |      Y     |
@@ -166,7 +166,7 @@ To include internals like `Guard.cs`, `MathF`, and `HashCode` into your project
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========|============|
     -->
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','netcoreapp3.1'))">
     <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>

msbuild/props/SixLabors.Global.props

@@ -102,7 +102,7 @@
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========+============|
     | SUPPORTS          | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS | CODECOVERAGE | HOTPATH | CREATESPAN |
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========|============|
-    | netcoreapp3.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |    Y    |      Y     |
+    | >=netcoreapp3.1   |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |    Y    |      Y     |
     | netcoreapp2.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        N           |      Y       |    N    |      Y     |
     | netcoreapp2.0     |   Y   |    N     |         N           |      N      |        N        |        N           |      Y       |    N    |      Y     |
     | netstandard2.1    |   Y   |    Y     |         N           |      Y      |        Y        |        N           |      Y       |    N    |      Y     |
@@ -152,7 +152,7 @@
         <DefineConstants>$(DefineConstants);SUPPORTS_CREATESPAN</DefineConstants>
       </PropertyGroup>
     </When>
-    <When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','netcoreapp3.1'))">
       <!--NETCORE 3.1. NET5.0, and future versions will fallback to this as the closest target.-->
       <PropertyGroup>
         <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>

tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netcoreapp2.0;net472;net46</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netcoreapp2.0;net472;net46</TargetFrameworks>
     <AssemblyName>SharedInfrastructure.Tests</AssemblyName>
     <RootNamespace>SharedInfrastructure.Tests</RootNamespace>
   </PropertyGroup>