[main] Update dependencies from dotnet/runtime (#2498)

* Update dependencies from https://github.com/dotnet/runtime build 20210811.2

Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.1.21406.5 -> To Version 6.0.0-rc.1.21411.2

* Fix SOS test failures with new runtime

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <[email protected]>

Author: dotnet-maestro[bot]

eng/Version.Details.xml

@@ -40,13 +40,13 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>a671f9652808921d6bbe74994c16065372bec6f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21406.5">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21411.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>58efa4b79751a2dad08d9bf7ca67930f8160afe3</Sha>
+      <Sha>c0662e8129beaf93b8050d39a863cc6d16a0308c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21406.5">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21411.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>58efa4b79751a2dad08d9bf7ca67930f8160afe3</Sha>
+      <Sha>c0662e8129beaf93b8050d39a863cc6d16a0308c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -17,8 +17,8 @@
     <MicrosoftNETCoreApp50Version>5.0.6</MicrosoftNETCoreApp50Version>
     <MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21406.5</VSRedistCommonNetCoreSharedFrameworkx6460Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21406.5</MicrosoftNETCoreAppRuntimewinx64Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21411.2</VSRedistCommonNetCoreSharedFrameworkx6460Version>
+    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21411.2</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
     <MicrosoftAspNetCoreAppRefInternalVersion>6.0.0-rc.1.21410.16</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>6.0.0-rc.1.21410.16</MicrosoftAspNetCoreAppRefVersion>

src/SOS/SOS.UnitTests/SOSRunner.cs

@@ -1192,6 +1192,14 @@ private HashSet<string> 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)
         {

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+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s*
-ENDIF:PROJECTK
+ENDIF:DESKTOP
+ENDIF:MAJOR_RUNTIME_VERSION_GE_6
 
 CONTINUE
 SOSCOMMAND:ClrStack

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+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 16\]\s*
 ENDIF:DESKTOP
+ENDIF:MAJOR_RUNTIME_VERSION_GE_6
 
 CONTINUE
 SOSCOMMAND:ClrStack