Skip to content

Update S.R.Metadata in HostModel #74009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 3 commits into from
Aug 16, 2022
Merged

Update S.R.Metadata in HostModel #74009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8a98cd
Update S.R.Metadata in HostModel
am11 Aug 16, 2022
dc38c2c
Update S.C.Immutable, cleanup unused
am11 Aug 16, 2022
39b7afa
Remove versions from auto-update list
am11 Aug 16, 2022
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
8 changes: 0 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-rc.1.22414.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-rc.1.22414.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-rc.1.22414.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
Expand Down
2 changes: 0 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22414.6</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreDotNetHostVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreDotNetHostPolicyVersion>
Copy link
Member Author

@am11 am11 Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are unused and removed by #73095, but inadvertently undone by #72934.

<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreILAsmVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
Copy link
Member

@jkoritzinsky jkoritzinsky Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to ensure that we're matching the version of System.Reflection.Metadata that is in the SDK, as version mismatches can cause significant issues when running on the Full Framework version of MSBuild.

Copy link
Member

@jkoritzinsky jkoritzinsky Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we can update to 6.0.0 (the current value of SystemReflectionMetadataVersion) as it's the same as the sdk's version.

Copy link
Member Author

@am11 am11 Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, I first tested updating SystemReflectionMetadataVersion to 7.0 preview7, but ILCompiler.Build.Tasks.csproj requirement is that we keep SystemCollectionsImmutableVersion and SystemReflectionMetadataVersion in sync. Updating System.Collections.Immutable to 7.0 preview7 was failing Pri0 tests (XUnitWrapperGenerator was unable to load S.C.I among other things), so I reverted that change.

<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

Expand Down