WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit d951821

Browse files
Mike McLaughlindotnet-maestro[bot]cshung
authored
Update from main (#4272)
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Andrew Au <[email protected]>
1 parent 5852a32 commit d951821

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
<Uri>https://github.com/dotnet/installer</Uri>
3232
<Sha>f8a61a24ac843529a82a8f6ede35fc08a6fb8c35</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23476.22">
34+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23477.14">
3535
<Uri>https://github.com/dotnet/aspnetcore</Uri>
36-
<Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
36+
<Sha>96da75d67ff058d95e14de12d9fc2ff215074e3c</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23476.22">
38+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23477.14">
3939
<Uri>https://github.com/dotnet/aspnetcore</Uri>
40-
<Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
40+
<Sha>96da75d67ff058d95e14de12d9fc2ff215074e3c</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23476.15">
42+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23477.9">
4343
<Uri>https://github.com/dotnet/runtime</Uri>
44-
<Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
44+
<Sha>885100b00bc944cbb698bc4cc2ec3ec18007534f</Sha>
4545
</Dependency>
46-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23476.15">
46+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23477.9">
4747
<Uri>https://github.com/dotnet/runtime</Uri>
48-
<Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
48+
<Sha>885100b00bc944cbb698bc4cc2ec3ec18007534f</Sha>
4949
</Dependency>
5050
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23475.1">
5151
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<!-- Latest symstore version updated by darc -->
1919
<MicrosoftSymbolStoreVersion>1.0.446801</MicrosoftSymbolStoreVersion>
2020
<!-- Latest shared runtime version updated by darc -->
21-
<VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rtm.23476.15</VSRedistCommonNetCoreSharedFrameworkx6480Version>
22-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rtm.23476.15</MicrosoftNETCoreAppRuntimewinx64Version>
21+
<VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rtm.23477.9</VSRedistCommonNetCoreSharedFrameworkx6480Version>
22+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rtm.23477.9</MicrosoftNETCoreAppRuntimewinx64Version>
2323
<!-- Latest shared aspnetcore version updated by darc -->
24-
<MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefInternalVersion>
25-
<MicrosoftAspNetCoreAppRefVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefVersion>
24+
<MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rtm.23477.14</MicrosoftAspNetCoreAppRefInternalVersion>
25+
<MicrosoftAspNetCoreAppRefVersion>8.0.0-rtm.23477.14</MicrosoftAspNetCoreAppRefVersion>
2626
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
2727
<MicrosoftDotnetSdkInternalVersion>8.0.100-rtm.23474.2</MicrosoftDotnetSdkInternalVersion>
2828
</PropertyGroup>

src/Microsoft.Diagnostics.ExtensionCommands/EEHeapCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,11 +525,11 @@ private ulong PrintGCHeap(ClrRuntime clrRuntime)
525525
WriteSegment(gcOutput, segment);
526526
}
527527

528-
// print frozen object heap
528+
// print NonGC heap
529529
segments = HeapWithFilters.EnumerateFilteredSegments(gc_heap).Where(seg => seg.Kind == GCSegmentKind.Frozen).OrderBy(seg => seg.Start);
530530
if (segments.Any())
531531
{
532-
Console.WriteLine("Frozen object heap");
532+
Console.WriteLine("NonGC heap");
533533
WriteSegmentHeader(gcOutput);
534534

535535
foreach (ClrSegment segment in segments)

0 commit comments

Comments
 (0)