Avoid internal BitOperations in XxHash for .NET 6 build

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 f4174ba..d425770 100644 (file)
--- a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
+++ b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
@@ -13,7 +13,6 @@ System.IO.Hashing.Crc32
 System.IO.Hashing.XxHash32</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="System\IO\Hashing\BitOperations.cs" />
     <Compile Include="System\IO\Hashing\Crc32.cs" />
     <Compile Include="System\IO\Hashing\Crc32.Table.cs" />
     <Compile Include="System\IO\Hashing\Crc64.cs" />
@@ -30,6 +29,7 @@ System.IO.Hashing.XxHash32</PackageDescription>
     <Reference Include="System.Runtime" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <Compile Include="System\IO\Hashing\BitOperations.cs" />
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>

diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/BitOperations.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/BitOperations.cs
index 9e0c984..01abfbb 100644 (file)
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/BitOperations.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/BitOperations.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace System.IO.Hashing
+namespace System.Numerics
 {
     internal static class BitOperations
     {

diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.State.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.State.cs
index 72aa582..5a75c35 100644 (file)
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.State.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.State.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers.Binary;
 using System.Diagnostics;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 // Implemented from the specification at

diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.State.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.State.cs
index 42f66a9..ecb289a 100644 (file)
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.State.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.State.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers.Binary;
 using System.Diagnostics;
+using System.Numerics;
 
 // Implemented from the specification at
 // https://github.com/Cyan4973/xxHash/blob/f9155bd4c57e2270a4ffbb176485e5d713de1c9b/doc/xxhash_spec.md