diff --git a/eng/Versions.props b/eng/Versions.props index 2a905374ec7343..fd8d88b85a9291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,6 +182,8 @@ $(MicrosoftBuildVersion) 6.2.2 6.2.2 + 7.0.412701 + 6.0 1.1.0 17.4.0-preview-20220707-01 diff --git a/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs index 7f11d0cf203a07..62eb196ce820c0 100644 --- a/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs +++ b/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs @@ -601,10 +601,13 @@ static bool TryPrintStackTraceFromDmp(string dmpFile, StreamWriter outputWriter) return false; } + string sosPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dotnet", "sos", "sos.dll"); + var cdbScriptPath = Path.GetTempFileName(); - // TODO: Add SOS support once we can easily download SOS to install. - File.WriteAllText(cdbScriptPath, """ + File.WriteAllText(cdbScriptPath, $$""" + .load {{sosPath}} ~*k + !clrstack -f -all q """); diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index 247bd3c0179f7f..1bacf4b9313a11 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -725,6 +725,10 @@ + + sos + https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/flat2/dotnet-sos/$(DotnetSosVersion)/dotnet-sos.$(DotnetSosVersion).nupkg + @@ -867,4 +871,10 @@ + + + + $(HelixPreCommands);dotnet %25HELIX_CORRELATION_PAYLOAD%25\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture) + +