Remove System.IO.Hashing dependency from Nrbf (#103700)

* Revert "Add System.IO.Hashing dependency to windowsdesktop transport pack (#103695)" This reverts commit 153296b. * Remove System.IO.Hashing dependency from Nrbf * Use HashCode
dotnet · Jun 19, 2024 · 063255a · 063255a
1 parent 7934e64
commit 063255a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
@@ -233,7 +233,6 @@
       System.Diagnostics.PerformanceCounter;
       System.DirectoryServices;
       System.Formats.Nrbf;
-      System.IO.Hashing;
       System.IO.Packaging;
       System.Resources.Extensions;
       System.Security.Cryptography.Pkcs;

diff --git a/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj b/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj
@@ -9,7 +9,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Hashing\ref\System.IO.Hashing.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\ref\System.Reflection.Metadata.csproj" />
   </ItemGroup>
 

diff --git a/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj b/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj
@@ -17,7 +17,6 @@ System.Formats.Nrbf.NrbfDecoder</PackageDescription>
     <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)\System.IO.Hashing\src\System.IO.Hashing.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
@@ -26,5 +25,6 @@ System.Formats.Nrbf.NrbfDecoder</PackageDescription>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresDynamicCodeAttribute.cs"
          Link="System\Diagnostics\CodeAnalysis\RequiresDynamicCodeAttribute.cs" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/SerializationRecordId.cs b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/SerializationRecordId.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Formats.Nrbf.Utils;
 using System.IO;
-using System.IO.Hashing;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -45,14 +44,5 @@ internal static SerializationRecordId Decode(BinaryReader reader)
     public override bool Equals(object? obj) => obj is SerializationRecordId other && Equals(other);
 
     /// <inheritdoc />
-    public override int GetHashCode()
-    {
-        int id = _id;
-#if NET
-        Span<int> integers = new(ref id);
-#else
-        Span<int> integers = stackalloc int[1] { id };
-#endif
-        return (int)XxHash32.HashToUInt32(MemoryMarshal.AsBytes(integers));
-    }
+    public override int GetHashCode() => HashCode.Combine(_id);
 }