diff --git a/Directory.Packages.props b/Directory.Packages.props index 362db9a7..3e5b3a0b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,6 +9,7 @@ + diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj index f113b306..b9b73663 100644 --- a/Source/SuperLinq.Async/SuperLinq.Async.csproj +++ b/Source/SuperLinq.Async/SuperLinq.Async.csproj @@ -124,12 +124,13 @@ - - - - <_Parameter1>SuperLinq.Async.Test - - + + + + + <_Parameter1>SuperLinq.Async.Test + + true diff --git a/Source/SuperLinq/KeyValuePairEqualityComparer.cs b/Source/SuperLinq/KeyValuePairEqualityComparer.cs index ce598185..5f2cd97c 100644 --- a/Source/SuperLinq/KeyValuePairEqualityComparer.cs +++ b/Source/SuperLinq/KeyValuePairEqualityComparer.cs @@ -48,12 +48,8 @@ public bool Equals(KeyValuePair x, KeyValuePair y) = && _valueComparer.Equals(x.Value, y.Value); public int GetHashCode(KeyValuePair 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/ValueTupleEqualityComparer.cs b/Source/SuperLinq/ValueTupleEqualityComparer.cs index d55e1de4..e8f11e3d 100644 --- 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 index 8946c252..23c6e862 100644 --- a/Tests/SuperLinq.Test/ValueTupleEqualityComparerTest.cs +++ b/Tests/SuperLinq.Test/ValueTupleEqualityComparerTest.cs @@ -79,11 +79,7 @@ public void ValueTupleEqualityComparerWithTwoTypeArgsShouldGetHashCode() var comparer = ValueTupleEqualityComparer.Create(comparer1: null, comparer2: null); ValueTuple 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); } }