Use HashCode from Microsoft.Bcl.HashCode

Bouke · Bouke · commit a33fa8f8b96f · 2024-07-16T15:49:59.000+02:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -20,6 +20,7 @@
 	<PackageVersion Include="System.Memory" Version="4.5.5" />
 	<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
 	<PackageVersion Include="xunit" Version="2.8.1" />
+    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj
@@ -124,12 +124,13 @@
     <ProjectReference Include="..\SuperLinq\SuperLinq.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
-    <PackageReference Include="System.Memory" PrivateAssets="All" />
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>SuperLinq.Async.Test</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
+	<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
+		<PackageReference Include="Microsoft.Bcl.HashCode" />
+		<PackageReference Include="System.Memory" PrivateAssets="All" />
+		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+			<_Parameter1>SuperLinq.Async.Test</_Parameter1>
+		</AssemblyAttribute>
+	</ItemGroup>
 
   <PropertyGroup Label="SourceGenerator">
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
diff --git a/Source/SuperLinq/KeyValuePairEqualityComparer.cs b/Source/SuperLinq/KeyValuePairEqualityComparer.cs
@@ -48,12 +48,8 @@ public bool Equals(KeyValuePair<TKey, TValue> x, KeyValuePair<TKey, TValue> y) =
 			&& _valueComparer.Equals(x.Value, y.Value);
 
 		public int GetHashCode(KeyValuePair<TKey, TValue> obj) =>
-#if NETCOREAPP
 			HashCode.Combine(
 				_keyComparer.GetHashCode(obj.Key!),
 				_valueComparer.GetHashCode(obj.Value!));
-#else
-			_keyComparer.GetHashCode(obj.Key) * 397 ^ _valueComparer.GetHashCode(obj.Value);
-#endif
 	}
 }
diff --git a/Source/SuperLinq/SuperLinq.csproj b/Source/SuperLinq/SuperLinq.csproj
@@ -165,6 +165,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Bcl.HashCode" />
     <PackageReference Include="System.Memory" PrivateAssets="All" />
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>SuperLinq.Test</_Parameter1>
diff --git a/Source/SuperLinq/ValueTupleEqualityComparer.cs b/Source/SuperLinq/ValueTupleEqualityComparer.cs
@@ -87,12 +87,8 @@ public bool Equals(
 			&& _comparer2.Equals(x.Item2, y.Item2);
 
 		public int GetHashCode((T1, T2) obj) =>
-#if NETCOREAPP
 			HashCode.Combine(
 				_comparer1.GetHashCode(obj.Item1!),
 				_comparer2.GetHashCode(obj.Item2!));
-#else
-			_comparer1.GetHashCode(obj.Item1) * 397 ^ _comparer2.GetHashCode(obj.Item2);
-#endif
 	}
 }
diff --git a/Tests/SuperLinq.Test/ValueTupleEqualityComparerTest.cs b/Tests/SuperLinq.Test/ValueTupleEqualityComparerTest.cs
@@ -79,11 +79,7 @@ public void ValueTupleEqualityComparerWithTwoTypeArgsShouldGetHashCode()
 		var comparer = ValueTupleEqualityComparer.Create<int, int>(comparer1: null, comparer2: null);
 		ValueTuple<int, int> first = new(1, 2);
 		var firstHashCode = comparer.GetHashCode(first);
-#if NETCOREAPP
 		var expectedHashCode = HashCode.Combine(1.GetHashCode(), 2.GetHashCode());
-#else
-		var expectedHashCode = 1.GetHashCode() * 397 ^ 2.GetHashCode();
-#endif
 		Assert.Equal(expectedHashCode, firstHashCode);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,8 @@ public bool Equals(KeyValuePair<TKey, TValue> x, KeyValuePair<TKey, TValue> y) =`
`48`	`48`	`&& _valueComparer.Equals(x.Value, y.Value);`
`49`	`49`
`50`	`50`	`public int GetHashCode(KeyValuePair<TKey, TValue> obj) =>`
`51`		`-#if NETCOREAPP`
`52`	`51`	`HashCode.Combine(`
`53`	`52`	`_keyComparer.GetHashCode(obj.Key!),`
`54`	`53`	`_valueComparer.GetHashCode(obj.Value!));`
`55`		`-#else`
`56`		`- _keyComparer.GetHashCode(obj.Key) * 397 ^ _valueComparer.GetHashCode(obj.Value);`
`57`		`-#endif`
`58`	`54`	`}`
`59`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,8 @@ public bool Equals(`
`87`	`87`	`&& _comparer2.Equals(x.Item2, y.Item2);`
`88`	`88`
`89`	`89`	`public int GetHashCode((T1, T2) obj) =>`
`90`		`-#if NETCOREAPP`
`91`	`90`	`HashCode.Combine(`
`92`	`91`	`_comparer1.GetHashCode(obj.Item1!),`
`93`	`92`	`_comparer2.GetHashCode(obj.Item2!));`
`94`		`-#else`
`95`		`- _comparer1.GetHashCode(obj.Item1) * 397 ^ _comparer2.GetHashCode(obj.Item2);`
`96`		`-#endif`
`97`	`93`	`}`
`98`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,7 @@ public void ValueTupleEqualityComparerWithTwoTypeArgsShouldGetHashCode()`
`79`	`79`	`var comparer = ValueTupleEqualityComparer.Create<int, int>(comparer1: null, comparer2: null);`
`80`	`80`	`ValueTuple<int, int> first = new(1, 2);`
`81`	`81`	`var firstHashCode = comparer.GetHashCode(first);`
`82`		`-#if NETCOREAPP`
`83`	`82`	`var expectedHashCode = HashCode.Combine(1.GetHashCode(), 2.GetHashCode());`
`84`		`-#else`
`85`		`- var expectedHashCode = 1.GetHashCode() * 397 ^ 2.GetHashCode();`
`86`		`-#endif`
`87`	`83`	`Assert.Equal(expectedHashCode, firstHashCode);`
`88`	`84`	`}`
`89`	`85`	`}`