diff --git a/eng/packaging.targets b/eng/packaging.targets
index 9fe4b569e5f70..6bcf86dc9f2e3 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -10,7 +10,7 @@
true
true
- $([MSBuild]::Subtract($(MajorVersion), 1)).0.0
+ 6.0.0
AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(PackDependsOn)
diff --git a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
index acfa86bb798d8..079a554ac9db2 100644
--- a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
+++ b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
@@ -4,8 +4,8 @@
enable
$(NetCoreAppCurrent);netstandard2.0;net461
true
-
- true
+ true
+ 1
Provides non-cryptographic hash algorithms, such as CRC-32.
Commonly Used Types:
diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
index d6db9bae19b2e..792a5bbbffb8d 100644
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
@@ -215,7 +215,7 @@ private static int StaticHash(ReadOnlySpan source, Span destination,
int totalLength = source.Length;
State state = new State((uint)seed);
- while (source.Length > StripeSize)
+ while (source.Length >= StripeSize)
{
state.ProcessStripe(source);
source = source.Slice(StripeSize);
diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
index 990ed77d64de2..367c6213c25fe 100644
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
@@ -215,7 +215,7 @@ private static int StaticHash(ReadOnlySpan source, Span destination,
int totalLength = source.Length;
State state = new State((ulong)seed);
- while (source.Length > StripeSize)
+ while (source.Length >= StripeSize)
{
state.ProcessStripe(source);
source = source.Slice(StripeSize);
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
index eed5aec365b3e..9ec9262dd1c5d 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
@@ -36,6 +36,8 @@ public static IEnumerable