Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
SourceLink is a build-time only package (PrivateAssets="All"), but in 10.x its dependency
Microsoft.Build.Tasks.Git pulls System.IO.Hashing in as a *runtime* asset (e.g. 10.0.300 -> 10.0.8).
Projects that reference System.IO.Hashing only transitively would then ship that version into the
SDK pack's `tools/` directory, where it collides with the $(SystemIOHashingPackageVersion) the build
tasks are compiled against (System.IO.Hashing bumps its AssemblyVersion every patch: 10.0.0.8 vs
10.0.0.9), producing a MissingMethodException (XACRP7000) on System.IO.Hashing.Crc64.Hash at build
SDK pack's `tools/` directory, where it collides with the $(SystemIOHashingPackageVersion) assembly the build
tasks are compiled against (System.IO.Hashing bumps its AssemblyVersion every patch), producing a
MissingMethodException (XACRP7000) on System.IO.Hashing.Crc64.Hash at build
time. Exclude SourceLink's runtime assets so it can never contribute a floating System.IO.Hashing;
source linking is unaffected (it runs via SourceLink's build assets). Mirrors the same pin in
external/Java.Interop/Directory.Build.targets.
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.7.26360.111</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26360.111</MicrosoftDotNetCecilPackageVersion>
<MSTestPackageVersion>4.4.0-preview.26360.5</MSTestPackageVersion>
<SystemIOHashingPackageVersion>10.0.9</SystemIOHashingPackageVersion>
<SystemIOHashingPackageVersion>10.0.10</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.69</MicrosoftNETSdkAndroidManifest100100PackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions external/Java.Interop/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
dependency Microsoft.Build.Tasks.Git 10.0.300 pulls System.IO.Hashing 10.0.8 in as a *runtime*
asset. Projects that only reference System.IO.Hashing transitively (e.g. class-parse, jcw-gen,
generator) therefore ship a System.IO.Hashing 10.0.8 assembly, which collides in the shared
.NET for Android SDK pack `tools/` directory with the 10.0.9 assembly the build tasks are
compiled against (System.IO.Hashing bumps its AssemblyVersion every patch: 10.0.0.8 vs 10.0.0.9),
.NET for Android SDK pack `tools/` directory with the $(SystemIOHashingPackageVersion) assembly the
build tasks are compiled against (System.IO.Hashing bumps its AssemblyVersion every patch),
producing a MissingMethodException on System.IO.Hashing.Crc64.Hash at build time. These tools do
not use System.IO.Hashing themselves, so exclude SourceLink's runtime assets to keep the unused
assembly out of their output. Source linking is unaffected (it runs via SourceLink's build assets).
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageReference Update="nunit" Version="3.13.2" />
<PackageReference Update="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Update="BenchmarkDotNet" Version="0.15.8" />
<PackageReference Update="System.IO.Hashing" Version="10.0.9" />
<PackageReference Update="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
</ItemGroup>

</Project>
Loading