Skip to content

[main] Update dependencies from microsoft/clrmd #5833

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 6 commits into from
May 12, 2026
+22 −19
Merged

[main] Update dependencies from microsoft/clrmd #5833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4724a4
Update dependencies from https://github.com/microsoft/clrmd build 202…
dotnet-maestro[bot] May 7, 2026
8da55fc
Update dependencies from https://github.com/microsoft/clrmd build 202…
dotnet-maestro[bot] May 8, 2026
84aa609
Update System.Memory and related package versions for clean managed b…
Copilot May 9, 2026
765d1b4
Update TPA list
hoyosjs May 11, 2026
914dfc5
Update dependencies from https://github.com/microsoft/clrmd build 202…
dotnet-maestro[bot] May 12, 2026
f966b3f
Merge branch 'main' into darc-main-e17a31d5-cbd1-4a1e-9a5c-daa4ad9ef528
hoyosjs May 12, 2026
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 @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.7-servicing.26217.108</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.7-servicing.26217.108</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
<!-- microsoft-clrmd dependencies -->
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.725402</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.725402</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.726101</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.726101</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
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.725402">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.726101">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>b15a248d70b18b49e129bb55dc334bf34c565406</Sha>
<Sha>fb4a9376435036da1efcf83450a912c0ddf86908</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.725402">
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.726101">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>b15a248d70b18b49e129bb55dc334bf34c565406</Sha>
<Sha>fb4a9376435036da1efcf83450a912c0ddf86908</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
<SystemTextEncodingsWebVersion>10.0.3</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.3</SystemTextJsonVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.556</StyleCopAnalyzersVersion>
<cdbsosversion>10.0.26100.1</cdbsosversion>
Expand Down
21 changes: 12 additions & 9 deletions src/SOS/extensions/hostcoreclr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ struct FileFind

public:
bool Open(const char* directory)
{
{
m_directory = directory;
m_dir = opendir(directory);
if (m_dir == nullptr) {
Expand Down Expand Up @@ -184,7 +184,7 @@ struct FileFind
fullFilename.append(m_entry->d_name);

struct stat sb;
if (stat(fullFilename.c_str(), &sb) == 0)
if (stat(fullFilename.c_str(), &sb) == 0)
{
if (S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode)) {
return true;
Expand All @@ -205,7 +205,7 @@ struct FileFind
}
}

bool IsDirectory()
bool IsDirectory()
{
return m_entry->d_type == DT_DIR;
}
Expand Down Expand Up @@ -246,7 +246,7 @@ struct FileFind
}
}

bool IsDirectory()
bool IsDirectory()
{
return (m_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
}
Expand Down Expand Up @@ -327,10 +327,13 @@ 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.

if (hostRuntimeVersion.Major > 0 && hostRuntimeVersion.Major < 9)
// This is also not fully correct as it doesn't consider the patch version (i.e. a 10.0.3 host doesn't
// satisfy a 10.0.7 requirement). The only correct fix is to look at the two lists and choose the highest version of each assembly.
if (hostRuntimeVersion.Major > 0 && hostRuntimeVersion.Major < 10)
{
AddFileToTpaList(directory, "System.Collections.Immutable.dll", tpaList);
AddFileToTpaList(directory, "System.Text.Json.dll", tpaList);
AddFileToTpaList(directory, "System.Text.Encodings.Web.dll", tpaList);
}

// Trust the runtime assemblies that are newer than the ones needed and provided by SOS's managed
Expand Down Expand Up @@ -369,7 +372,7 @@ static bool FindDotNetVersion(const RuntimeVersion& runtimeVersion, std::string&
}
}
}
}
}
while (find.Next());
}

Expand Down Expand Up @@ -457,7 +460,7 @@ struct ProbingStrategy

/**********************************************************************\
* Returns the path to the coreclr to use for hosting and it's
* directory. Attempts to use the best installed version of the
* directory. Attempts to use the best installed version of the
* runtime, otherwise it defaults to the target's runtime version.
\**********************************************************************/
static HRESULT GetHostRuntime(std::string& coreClrPath, std::string& hostRuntimeDirectory, RuntimeVersion& hostRuntimeVersion)
Expand Down Expand Up @@ -659,7 +662,7 @@ static HRESULT InitializeNetCoreHost()
return hr;
}
}
try
try
{
hr = g_extensionsInitializeFunc(sosModulePath.c_str());
}
Expand Down