diff --git a/eng/Version.Details.props b/eng/Version.Details.props index dffd39389a..e98bd685db 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 4.0.0-beta.25381.2 - 4.0.0-beta.25381.2 + 4.0.0-beta.25610.1 + 4.0.0-beta.25610.1 2.0.0-beta5.25210.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d073c2f0c..5a7068e214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - f11663fc2e71ddd0869deb528047f0f476a0e346 + 41c1e91786141d37b26cfdfb8059fc522e81fb8d - + https://github.com/microsoft/clrmd - f11663fc2e71ddd0869deb528047f0f476a0e346 + 41c1e91786141d37b26cfdfb8059fc522e81fb8d https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 82fe464071..e40a722c1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 8.0.0 - 8.0.0 + 9.0.11 9.0.8 17.10.0-beta1.24272.1 diff --git a/src/SOS/extensions/hostcoreclr.cpp b/src/SOS/extensions/hostcoreclr.cpp index e9e48eb6c7..36ae77c82f 100644 --- a/src/SOS/extensions/hostcoreclr.cpp +++ b/src/SOS/extensions/hostcoreclr.cpp @@ -71,8 +71,8 @@ namespace RuntimeHostingConstants constexpr RuntimeVersion SupportedHostRuntimeVersions[] = { {9, 0}, {8, 0}, - {6, 0}, {10, 0}, + {11, 0}, }; constexpr char DotnetRootEnvVar[] = "DOTNET_ROOT"; @@ -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