Skip to content

[main] Update dependencies from microsoft/clrmd #5660

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
hoyosjs merged 3 commits into from
Dec 15, 2025
+10 −20
Merged

[main] Update dependencies from microsoft/clrmd #5660

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
6f6bca2
Update dependencies from https://github.com/microsoft/clrmd build 202…
dotnet-maestro[bot] Dec 11, 2025
9317e56
Update System.Collections.Immutable to 9.0.11 (#5661)
Copilot Dec 11, 2025
0e4d608
Modify supported runtime versions and assembly checks
hoyosjs Dec 11, 2025
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
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- microsoft/clrmd dependencies -->
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.25381.2</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.25381.2</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.25610.1</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.25610.1</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
<!-- dotnet/command-line-api dependencies -->
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
<!-- dotnet/android dependencies -->
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="4e6cfd9762f7562d398be31e2bff79f3e993a9c2" BarId="284895" />
<ProductDependencies>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.25381.2">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.25610.1">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>f11663fc2e71ddd0869deb528047f0f476a0e346</Sha>
<Sha>41c1e91786141d37b26cfdfb8059fc522e81fb8d</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.25381.2">
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.25610.1">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>f11663fc2e71ddd0869deb528047f0f476a0e346</Sha>
<Sha>41c1e91786141d37b26cfdfb8059fc522e81fb8d</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<!-- <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</UsingToolMicrosoftNetCompilers> -->
<!-- CoreFX -->
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemCollectionsImmutableVersion>9.0.11</SystemCollectionsImmutableVersion>
<!-- Other libs -->
<MicrosoftBclAsyncInterfacesVersion>9.0.8</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
Expand Down
16 changes: 3 additions & 13 deletions src/SOS/extensions/hostcoreclr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ namespace RuntimeHostingConstants
constexpr RuntimeVersion SupportedHostRuntimeVersions[] = {
{9, 0},
{8, 0},
{6, 0},
{10, 0},
{11, 0},
};

constexpr char DotnetRootEnvVar[] = "DOTNET_ROOT";
Expand Down Expand Up @@ -327,20 +327,10 @@ static std::string GetTpaListForRuntimeVersion(
// assembly version than the ones in the ones in the framework. The test could just
// have a list of assemblies we pack with the versions, and if we end up using a newer assembly
// fail the test and point to update this list.
//
// There's currently no DLLs SOS requires that are of a higher version than those provided by
// the supported host frameworks. In case it's needed, add: a section here before AddFilesFromDirectoryToTpaList.
//
// if (hostRuntimeVersion.Major < 5)
// {
// AddFileToTpaList(directory, "System.Collections.Immutable.dll", tpaList);
// ...
// }

if (hostRuntimeVersion.Major > 0 && hostRuntimeVersion.Major < 8)

if (hostRuntimeVersion.Major > 0 && hostRuntimeVersion.Major < 9)
{
AddFileToTpaList(directory, "System.Collections.Immutable.dll", tpaList);
AddFileToTpaList(directory, "System.Reflection.Metadata.dll", tpaList);
}

// Trust the runtime assemblies that are newer than the ones needed and provided by SOS's managed
Expand Down