Skip to content

Commit

Permalink
Remove Microsoft.Bcl.HashCode
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdmihai
cdmihai committed Jan 11, 2021
1 parent 151d47a commit 7e9f578
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion eng/Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<ItemGroup>
<PackageReference Update="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
<PackageReference Update="LargeAddressAware" Version="1.0.3" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.0" />
<PackageReference Update="Microsoft.Build.NuGetSdkResolver" Version="$(NuGetBuildTasksVersion)" />
<PackageReference Update="Microsoft.CodeAnalysis.Build.Tasks" Version="$(MicrosoftNetCompilersToolsetVersion)" />
<PackageReference Update="Microsoft.DotNet.BuildTools.GenAPI" Version="2.1.0-prerelease-02404-02" />
Expand Down
10 changes: 5 additions & 5 deletions src/Build/BackEnd/Components/ProjectCache/ProjectCacheItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ public override bool Equals(object obj)

public override int GetHashCode()
{
var hashCode = new HashCode();
int hashCode = -1043047289;

hashCode.Add(PluginPath);
hashCode = (hashCode * -1521134295) + PluginPath.GetHashCode();

foreach (var pluginSetting in _pluginSettingsSorted)
{
hashCode.Add(pluginSetting.Key);
hashCode.Add(pluginSetting.Value);
hashCode = (hashCode * -1521134295) + pluginSetting.Key.GetHashCode();
hashCode = (hashCode * -1521134295) + pluginSetting.Value.GetHashCode();
}

return hashCode.ToHashCode();
return hashCode;
}
}
}
1 change: 0 additions & 1 deletion src/Build/Microsoft.Build.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageReference Include="Microsoft.Bcl.HashCode" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
<Reference Include="System.Configuration" />
<Reference Include="System.IO.Compression" />
Expand Down
2 changes: 0 additions & 2 deletions src/Package/MSBuild.Engine.Corext/MsBuild.Engine.Corext.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<file src="$X86BinPath$/System.Memory.dll" target="v15.0/bin" />
<file src="$X86BinPath$/System.Text.Json.dll" target="v15.0/bin" />
<file src="$X86BinPath$/Microsoft.Bcl.AsyncInterfaces.dll" target="v15.0/bin" />
<file src="$X86BinPath$/Microsoft.Bcl.HashCode.dll" target="v15.0/bin" />
<file src="$X86BinPath$/System.Buffers.dll" target="v15.0/bin" />
<file src="$X86BinPath$/System.Text.Encodings.Web.dll" target="v15.0/bin" />
<file src="$X86BinPath$/System.Threading.Tasks.Extensions.dll" target="v15.0/bin" />
Expand Down Expand Up @@ -90,7 +89,6 @@
<file src="$X86BinPath$/System.Memory.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/System.Text.Json.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/Microsoft.Bcl.AsyncInterfaces.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/Microsoft.Bcl.HashCode.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/System.Buffers.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/System.Text.Encodings.Web.dll" target="v15.0/bin/amd64" />
<file src="$X86BinPath$/System.Threading.Tasks.Extensions.dll" target="v15.0/bin/amd64" />
Expand Down
2 changes: 0 additions & 2 deletions src/Package/MSBuild.VSSetup/files.swr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ folder InstallDir:\MSBuild\Current\Bin
file source=$(X86BinPath)System.Memory.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Text.Json.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.ValueTuple.dll vs.file.ngenArchitecture=all
Expand Down Expand Up @@ -191,7 +190,6 @@ folder InstallDir:\MSBuild\Current\Bin\amd64
file source=$(X86BinPath)System.Memory.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Text.Json.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenArchitecture=all