Update from main (#4272)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 23878c8d5d24263a17b9a33dc0cd518219731d82..91361135057f3b6eebb3ecf99251e6785f25bca9 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -31,21 +31,21 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>f8a61a24ac843529a82a8f6ede35fc08a6fb8c35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23476.22">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23477.14">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
+      <Sha>96da75d67ff058d95e14de12d9fc2ff215074e3c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23476.22">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23477.14">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
+      <Sha>96da75d67ff058d95e14de12d9fc2ff215074e3c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23476.15">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23477.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
+      <Sha>885100b00bc944cbb698bc4cc2ec3ec18007534f</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23476.15">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23477.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
+      <Sha>885100b00bc944cbb698bc4cc2ec3ec18007534f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23475.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index 2a1327cb635220861a810ebc52572ed7d40a548e..3f186e6d6d9466462f7b034b94a50fdf768dd86f 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,11 +18,11 @@
     <!-- Latest symstore version updated by darc -->
     <MicrosoftSymbolStoreVersion>1.0.446801</MicrosoftSymbolStoreVersion>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rtm.23476.15</VSRedistCommonNetCoreSharedFrameworkx6480Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rtm.23476.15</MicrosoftNETCoreAppRuntimewinx64Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rtm.23477.9</VSRedistCommonNetCoreSharedFrameworkx6480Version>
+    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rtm.23477.9</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rtm.23477.14</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>8.0.0-rtm.23477.14</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkInternalVersion>8.0.100-rtm.23474.2</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>

diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/EEHeapCommand.cs b/src/Microsoft.Diagnostics.ExtensionCommands/EEHeapCommand.cs
index ac2f9507f6901c2d78bcf342509a82d94e620a60..c565148650e0be143417f632cc7cea4d00f58224 100644 (file)
--- a/src/Microsoft.Diagnostics.ExtensionCommands/EEHeapCommand.cs
+++ b/src/Microsoft.Diagnostics.ExtensionCommands/EEHeapCommand.cs
@@ -525,11 +525,11 @@ namespace Microsoft.Diagnostics.ExtensionCommands
                     WriteSegment(gcOutput, segment);
                 }
 
-                // print frozen object heap
+                // print NonGC heap
                 segments = HeapWithFilters.EnumerateFilteredSegments(gc_heap).Where(seg => seg.Kind == GCSegmentKind.Frozen).OrderBy(seg => seg.Start);
                 if (segments.Any())
                 {
-                    Console.WriteLine("Frozen object heap");
+                    Console.WriteLine("NonGC heap");
                     WriteSegmentHeader(gcOutput);
 
                     foreach (ClrSegment segment in segments)