From f4724a49db7023988c3d25642b4961fcd4306a0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 May 2026 02:01:53 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/microsoft/clrmd build 20260506.2 On relative base path root Microsoft.Diagnostics.Runtime , Microsoft.Diagnostics.Runtime.Utilities From Version 4.0.725402 -> To Version 4.0.725602 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a91c7124d5..1c597f85a3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props 10.0.7-servicing.26217.108 10.0.7-servicing.26217.108 - 4.0.725402 - 4.0.725402 + 4.0.725602 + 4.0.725602 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f2e0cb70c..e53520b3e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - b15a248d70b18b49e129bb55dc334bf34c565406 + 5e99ea034d14dc787fd65c14f33d59d0636f3d64 - + https://github.com/microsoft/clrmd - b15a248d70b18b49e129bb55dc334bf34c565406 + 5e99ea034d14dc787fd65c14f33d59d0636f3d64 https://github.com/dotnet/command-line-api From 8da55fce78e8e9fd6b080a1799907559dce916a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 May 2026 02:01:50 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/microsoft/clrmd build 20260507.1 On relative base path root Microsoft.Diagnostics.Runtime , Microsoft.Diagnostics.Runtime.Utilities From Version 4.0.725402 -> To Version 4.0.725701 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1c597f85a3..12c297166c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props 10.0.7-servicing.26217.108 10.0.7-servicing.26217.108 - 4.0.725602 - 4.0.725602 + 4.0.725701 + 4.0.725701 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e53520b3e6..1932b802b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - 5e99ea034d14dc787fd65c14f33d59d0636f3d64 + fe207e24dc1039d15e63e16c3862a558622f7b3b - + https://github.com/microsoft/clrmd - 5e99ea034d14dc787fd65c14f33d59d0636f3d64 + fe207e24dc1039d15e63e16c3862a558622f7b3b https://github.com/dotnet/command-line-api From 84aa609766ba8c4d0fabd3def6190ffb6d616a6c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 9 May 2026 00:08:22 +0000 Subject: [PATCH 3/5] Update System.Memory and related package versions for clean managed build Agent-Logs-Url: https://github.com/dotnet/diagnostics/sessions/d17342cb-49f3-4a93-8039-82f6cc1efca7 Co-authored-by: hoyosjs <19413848+hoyosjs@users.noreply.github.com> --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8ffec56516..54efdf8936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,11 +43,11 @@ 5.0.0 4.5.1 8.0.1 - 4.5.5 + 4.6.3 4.3.0 - 4.5.4 - 8.0.0 - 8.0.5 + 4.6.3 + 10.0.3 + 10.0.3 2.0.3 1.2.0-beta.556 10.0.26100.1 From 765d1b44105e34052b97f7c0ac196f03f294509f Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala <19413848+hoyosjs@users.noreply.github.com> Date: Sun, 10 May 2026 23:03:03 -0700 Subject: [PATCH 4/5] Update TPA list --- src/SOS/extensions/hostcoreclr.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/SOS/extensions/hostcoreclr.cpp b/src/SOS/extensions/hostcoreclr.cpp index 36ae77c82f..0e690a20c9 100644 --- a/src/SOS/extensions/hostcoreclr.cpp +++ b/src/SOS/extensions/hostcoreclr.cpp @@ -146,7 +146,7 @@ struct FileFind public: bool Open(const char* directory) - { + { m_directory = directory; m_dir = opendir(directory); if (m_dir == nullptr) { @@ -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; @@ -205,7 +205,7 @@ struct FileFind } } - bool IsDirectory() + bool IsDirectory() { return m_entry->d_type == DT_DIR; } @@ -246,7 +246,7 @@ struct FileFind } } - bool IsDirectory() + bool IsDirectory() { return (m_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; } @@ -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 @@ -369,7 +372,7 @@ static bool FindDotNetVersion(const RuntimeVersion& runtimeVersion, std::string& } } } - } + } while (find.Next()); } @@ -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) @@ -659,7 +662,7 @@ static HRESULT InitializeNetCoreHost() return hr; } } - try + try { hr = g_extensionsInitializeFunc(sosModulePath.c_str()); } From 914dfc5f6ba0e30a5093b10603632306632a2820 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 May 2026 02:01:41 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/microsoft/clrmd build 20260511.1 On relative base path root Microsoft.Diagnostics.Runtime , Microsoft.Diagnostics.Runtime.Utilities From Version 4.0.725402 -> To Version 4.0.726101 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 12c297166c..91bd2674f9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props 10.0.7-servicing.26217.108 10.0.7-servicing.26217.108 - 4.0.725701 - 4.0.725701 + 4.0.726101 + 4.0.726101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1932b802b1..d8ecb29037 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - fe207e24dc1039d15e63e16c3862a558622f7b3b + fb4a9376435036da1efcf83450a912c0ddf86908 - + https://github.com/microsoft/clrmd - fe207e24dc1039d15e63e16c3862a558622f7b3b + fb4a9376435036da1efcf83450a912c0ddf86908 https://github.com/dotnet/command-line-api