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

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

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

* Fix SOS bpmd tests on 6.0 runtime

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1704c89d3e70540ee95b7b90513004a6692c87ae..5b4ece7b37173dfa6157fc1d21aa9f78ccf0ef77 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -40,13 +40,13 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>1ca82c8bab7d4a0660371d8bb15aa5956b801887</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.2.21464.21">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rtm.21470.22">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b3a9b0b740cce9322b03200db0b4ab736d7cd12d</Sha>
+      <Sha>da9d3777afe61bbcfd16ff70ca150433370b4139</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21464.21">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21470.22">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b3a9b0b740cce9322b03200db0b4ab736d7cd12d</Sha>
+      <Sha>da9d3777afe61bbcfd16ff70ca150433370b4139</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index 05906eb9cbeb3e0f8210896272850594ffb1f40d..74f68ff344bee72fa27b0230119742137829c7c6 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,8 +15,8 @@
     <MicrosoftNETCoreApp50Version>5.0.9</MicrosoftNETCoreApp50Version>
     <MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21464.21</VSRedistCommonNetCoreSharedFrameworkx6460Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.2.21464.21</MicrosoftNETCoreAppRuntimewinx64Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rtm.21470.22</VSRedistCommonNetCoreSharedFrameworkx6460Version>
+    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rtm.21470.22</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
     <MicrosoftAspNetCoreAppRefInternalVersion>6.0.0-rtm.21471.8</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>6.0.0-rtm.21471.8</MicrosoftAspNetCoreAppRefVersion>

diff --git a/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script b/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script
index 954d2e7d5b5ff6be0aefb1297ed120c641b77fc7..26fd1313c72fb5262ad00cc224fdc2622810cbcf 100644 (file)
--- a/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script
+++ b/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script
@@ -35,13 +35,11 @@ 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

diff --git a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script
index bc551422cedec93b016546c2763dde1cae575df2..c321762c8f54f08b7bb5ad423579c2cfb0be3023 100644 (file)
--- a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script
+++ b/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script
@@ -36,13 +36,11 @@ 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