diff --git a/src/OpenSource.Data.HashFunction.BernsteinHash/OpenSource.Data.HashFunction.BernsteinHash.csproj b/src/OpenSource.Data.HashFunction.BernsteinHash/OpenSource.Data.HashFunction.BernsteinHash.csproj
index 8c314d9..a8140f4 100644
--- a/src/OpenSource.Data.HashFunction.BernsteinHash/OpenSource.Data.HashFunction.BernsteinHash.csproj
+++ b/src/OpenSource.Data.HashFunction.BernsteinHash/OpenSource.Data.HashFunction.BernsteinHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.BernsteinHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.BernsteinHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Blake2/OpenSource.Data.HashFunction.Blake2.csproj b/src/OpenSource.Data.HashFunction.Blake2/OpenSource.Data.HashFunction.Blake2.csproj
index ad09ed6..f12a49b 100644
--- a/src/OpenSource.Data.HashFunction.Blake2/OpenSource.Data.HashFunction.Blake2.csproj
+++ b/src/OpenSource.Data.HashFunction.Blake2/OpenSource.Data.HashFunction.Blake2.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Blake2</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.Blake2</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.BuzHash/OpenSource.Data.HashFunction.BuzHash.csproj b/src/OpenSource.Data.HashFunction.BuzHash/OpenSource.Data.HashFunction.BuzHash.csproj
index 28bc1f2..565fd9c 100644
--- a/src/OpenSource.Data.HashFunction.BuzHash/OpenSource.Data.HashFunction.BuzHash.csproj
+++ b/src/OpenSource.Data.HashFunction.BuzHash/OpenSource.Data.HashFunction.BuzHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.BuzHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.BuzHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.CRC/OpenSource.Data.HashFunction.CRC.csproj b/src/OpenSource.Data.HashFunction.CRC/OpenSource.Data.HashFunction.CRC.csproj
index f619751..bbdc0e0 100644
--- a/src/OpenSource.Data.HashFunction.CRC/OpenSource.Data.HashFunction.CRC.csproj
+++ b/src/OpenSource.Data.HashFunction.CRC/OpenSource.Data.HashFunction.CRC.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.CRC</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.CRC</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.CityHash/OpenSource.Data.HashFunction.CityHash.csproj b/src/OpenSource.Data.HashFunction.CityHash/OpenSource.Data.HashFunction.CityHash.csproj
index 896ea24..be2d1e4 100644
--- a/src/OpenSource.Data.HashFunction.CityHash/OpenSource.Data.HashFunction.CityHash.csproj
+++ b/src/OpenSource.Data.HashFunction.CityHash/OpenSource.Data.HashFunction.CityHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.CityHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.CityHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Core/OpenSource.Data.HashFunction.Core.csproj b/src/OpenSource.Data.HashFunction.Core/OpenSource.Data.HashFunction.Core.csproj
index 677919a..868d6de 100644
--- a/src/OpenSource.Data.HashFunction.Core/OpenSource.Data.HashFunction.Core.csproj
+++ b/src/OpenSource.Data.HashFunction.Core/OpenSource.Data.HashFunction.Core.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Core</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.Core</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.ELF64/OpenSource.Data.HashFunction.ELF64.csproj b/src/OpenSource.Data.HashFunction.ELF64/OpenSource.Data.HashFunction.ELF64.csproj
index cbf0afa..89bf2bd 100644
--- a/src/OpenSource.Data.HashFunction.ELF64/OpenSource.Data.HashFunction.ELF64.csproj
+++ b/src/OpenSource.Data.HashFunction.ELF64/OpenSource.Data.HashFunction.ELF64.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.ELF64</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.ELF64</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.FNV/OpenSource.Data.HashFunction.FNV.csproj b/src/OpenSource.Data.HashFunction.FNV/OpenSource.Data.HashFunction.FNV.csproj
index 97cd6a1..dc24213 100644
--- a/src/OpenSource.Data.HashFunction.FNV/OpenSource.Data.HashFunction.FNV.csproj
+++ b/src/OpenSource.Data.HashFunction.FNV/OpenSource.Data.HashFunction.FNV.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.FNV</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.FNV</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.FarmHash/OpenSource.Data.HashFunction.FarmHash.csproj b/src/OpenSource.Data.HashFunction.FarmHash/OpenSource.Data.HashFunction.FarmHash.csproj
index 1d7f257..75ce574 100644
--- a/src/OpenSource.Data.HashFunction.FarmHash/OpenSource.Data.HashFunction.FarmHash.csproj
+++ b/src/OpenSource.Data.HashFunction.FarmHash/OpenSource.Data.HashFunction.FarmHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.FarmHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.FarmHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Interfaces/OpenSource.Data.HashFunction.Interfaces.csproj b/src/OpenSource.Data.HashFunction.Interfaces/OpenSource.Data.HashFunction.Interfaces.csproj
index 9e4add3..2cb684e 100644
--- a/src/OpenSource.Data.HashFunction.Interfaces/OpenSource.Data.HashFunction.Interfaces.csproj
+++ b/src/OpenSource.Data.HashFunction.Interfaces/OpenSource.Data.HashFunction.Interfaces.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Interfaces</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.Interfaces</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Jenkins/OpenSource.Data.HashFunction.Jenkins.csproj b/src/OpenSource.Data.HashFunction.Jenkins/OpenSource.Data.HashFunction.Jenkins.csproj
index 7571bf2..39d914e 100644
--- a/src/OpenSource.Data.HashFunction.Jenkins/OpenSource.Data.HashFunction.Jenkins.csproj
+++ b/src/OpenSource.Data.HashFunction.Jenkins/OpenSource.Data.HashFunction.Jenkins.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Jenkins</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.Jenkins</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.MetroHash/OpenSource.Data.HashFunction.MetroHash.csproj b/src/OpenSource.Data.HashFunction.MetroHash/OpenSource.Data.HashFunction.MetroHash.csproj
index 36a53d2..081d0b2 100644
--- a/src/OpenSource.Data.HashFunction.MetroHash/OpenSource.Data.HashFunction.MetroHash.csproj
+++ b/src/OpenSource.Data.HashFunction.MetroHash/OpenSource.Data.HashFunction.MetroHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.MetroHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.MetroHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.MurmurHash/OpenSource.Data.HashFunction.MurmurHash.csproj b/src/OpenSource.Data.HashFunction.MurmurHash/OpenSource.Data.HashFunction.MurmurHash.csproj
index cb07706..2266180 100644
--- a/src/OpenSource.Data.HashFunction.MurmurHash/OpenSource.Data.HashFunction.MurmurHash.csproj
+++ b/src/OpenSource.Data.HashFunction.MurmurHash/OpenSource.Data.HashFunction.MurmurHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.MurmurHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.MurmurHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Pearson/OpenSource.Data.HashFunction.Pearson.csproj b/src/OpenSource.Data.HashFunction.Pearson/OpenSource.Data.HashFunction.Pearson.csproj
index f176b0c..3cbb445 100644
--- a/src/OpenSource.Data.HashFunction.Pearson/OpenSource.Data.HashFunction.Pearson.csproj
+++ b/src/OpenSource.Data.HashFunction.Pearson/OpenSource.Data.HashFunction.Pearson.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Pearson</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.Pearson</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.SpookyHash/OpenSource.Data.HashFunction.SpookyHash.csproj b/src/OpenSource.Data.HashFunction.SpookyHash/OpenSource.Data.HashFunction.SpookyHash.csproj
index 245edbb..a435b8f 100644
--- a/src/OpenSource.Data.HashFunction.SpookyHash/OpenSource.Data.HashFunction.SpookyHash.csproj
+++ b/src/OpenSource.Data.HashFunction.SpookyHash/OpenSource.Data.HashFunction.SpookyHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.SpookyHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.SpookyHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
diff --git a/src/OpenSource.Data.HashFunction.Test/Core/IHashFunction_Extensions_Tests.cs b/src/OpenSource.Data.HashFunction.Test/Core/IHashFunction_Extensions_Tests.cs
index 2f9c41d..bd5b996 100644
--- a/src/OpenSource.Data.HashFunction.Test/Core/IHashFunction_Extensions_Tests.cs
+++ b/src/OpenSource.Data.HashFunction.Test/Core/IHashFunction_Extensions_Tests.cs
@@ -296,7 +296,7 @@ public void IHashFunction_Extensions_ComputeHash_WithDesiredBits_ushort()
                     BitConverter.GetBytes(value));
             }
 
-#if !NETCOREAPP1_1
+#if !NET6_0_OR_GREATER
 
             [Fact]
             public void IHashFunction_Extensions_ComputeHash_WithDesiredBits_TModel()
diff --git a/src/OpenSource.Data.HashFunction.Test/OpenSource.Data.HashFunction.Test.csproj b/src/OpenSource.Data.HashFunction.Test/OpenSource.Data.HashFunction.Test.csproj
index 8ea5c5b..eb0b9ef 100644
--- a/src/OpenSource.Data.HashFunction.Test/OpenSource.Data.HashFunction.Test.csproj
+++ b/src/OpenSource.Data.HashFunction.Test/OpenSource.Data.HashFunction.Test.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.Test</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>OpenSource.Data.HashFunction.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>
@@ -14,7 +14,6 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>$(PackageIdPrefix).Data.HashFunction.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
diff --git a/src/OpenSource.Data.HashFunction.xxHash/OpenSource.Data.HashFunction.xxHash.csproj b/src/OpenSource.Data.HashFunction.xxHash/OpenSource.Data.HashFunction.xxHash.csproj
index c4c8c83..9bc8b39 100644
--- a/src/OpenSource.Data.HashFunction.xxHash/OpenSource.Data.HashFunction.xxHash.csproj
+++ b/src/OpenSource.Data.HashFunction.xxHash/OpenSource.Data.HashFunction.xxHash.csproj
@@ -6,7 +6,7 @@
     <AssemblyTitle>Data.HashFunction.xxHash</AssemblyTitle>
     <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Data.HashFunction Developers</Authors>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>OpenSource.Data.HashFunction.xxHash</AssemblyName>
     <AssemblyOriginatorKeyFile>../Data.HashFunction.Production.snk</AssemblyOriginatorKeyFile>