diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9f1366749..ed4d94a1f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore 3535cfb61dd955a7fa6c31bdf72a3eba5353f1ce - + https://github.com/dotnet/runtime - 58efa4b79751a2dad08d9bf7ca67930f8160afe3 + c0662e8129beaf93b8050d39a863cc6d16a0308c - + https://github.com/dotnet/runtime - 58efa4b79751a2dad08d9bf7ca67930f8160afe3 + c0662e8129beaf93b8050d39a863cc6d16a0308c diff --git a/eng/Versions.props b/eng/Versions.props index 0882148140..dcc03254e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,8 +17,8 @@ 5.0.6 $(MicrosoftNETCoreApp50Version) - 6.0.0-rc.1.21406.5 - 6.0.0-rc.1.21406.5 + 6.0.0-rc.1.21411.2 + 6.0.0-rc.1.21411.2 6.0.0-rc.1.21410.1 6.0.0-rc.1.21410.1 diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs index 4ba404e196..b953cdad8a 100644 --- a/src/SOS/SOS.UnitTests/SOSRunner.cs +++ b/src/SOS/SOS.UnitTests/SOSRunner.cs @@ -1192,6 +1192,14 @@ private HashSet GetEnabledDefines() { defines.Add("MAJOR_RUNTIME_VERSION_GE_5"); } + if (major >= 6) + { + defines.Add("MAJOR_RUNTIME_VERSION_GE_6"); + } + if (major >= 7) + { + defines.Add("MAJOR_RUNTIME_VERSION_GE_7"); + } } catch (SkipTestException) { diff --git a/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script b/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script index 91fe0db65c..954d2e7d5b 100644 --- a/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script +++ b/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script @@ -35,11 +35,13 @@ ENDIF:DESKTOP SOSCOMMAND:bpmd SymbolTestApp.dll SymbolTestApp.Program.Foo4 ENDIF:DESKTOP -IFDEF:PROJECTK +!IFDEF:MAJOR_RUNTIME_VERSION_GE_6 +!IFDEF:DESKTOP CONTINUE SOSCOMMAND:ClrStack VERIFY:\s+\s+\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s* -ENDIF:PROJECTK +ENDIF:DESKTOP +ENDIF:MAJOR_RUNTIME_VERSION_GE_6 CONTINUE SOSCOMMAND:ClrStack diff --git a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script index c321762c8f..bc551422ce 100644 --- a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script +++ b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script @@ -36,11 +36,13 @@ ENDIF:DESKTOP SOSCOMMAND:bpmd SymbolTestApp.dll SymbolTestApp.Program.Foo4 ENDIF:DESKTOP +!IFDEF:MAJOR_RUNTIME_VERSION_GE_6 !IFDEF:DESKTOP CONTINUE SOSCOMMAND:ClrStack VERIFY:\s+\s+\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s* ENDIF:DESKTOP +ENDIF:MAJOR_RUNTIME_VERSION_GE_6 CONTINUE SOSCOMMAND:ClrStack