Skip to content

[manual] Merge release/6.0-staging into release/6.0 #88645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 10 commits into from
Jul 11, 2023
Merged

[manual] Merge release/6.0-staging into release/6.0 #88645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2e27d62
[6.0-staging] Bump branding to 6.0.20 (#87453)
carlossanlop Jun 13, 2023
e8a5dbc
Merge pull request #87461 from dotnet-maestro-bot/merge/release/6.0-t…
carlossanlop Jun 13, 2023
5d59f38
Merge pull request #87523 from dotnet-maestro-bot/merge/release/6.0-t…
carlossanlop Jun 14, 2023
18d463b
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jun 20, 2023
8dcaf05
Merge branch 'release/6.0-staging' into merge/release/6.0-to-release/…
carlossanlop Jul 6, 2023
71b40e2
Merge pull request #87805 from dotnet-maestro-bot/merge/release/6.0-t…
carlossanlop Jul 6, 2023
9df36d8
[release/6.0-staging][mono][debugger] Showing "Frame not in module" a…
thaystg Jul 10, 2023
8d8c7b5
[release/6.0-staging] Update dependencies from dotnet/arcade dotnet/i…
dotnet-maestro[bot] Jul 11, 2023
f059c7e
GetTotalPauseDuration implementation (#68835) (#87143)
cshung Jul 11, 2023
83e6727
Reset OOB packages from 6.0.19
carlossanlop Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-6c7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6c7f38c6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-864fae9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-864fae9e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.23218.5">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.23315.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>cff1c9ff20d271c6698d150e484e8327998595a4</Sha>
<Sha>18b103db239331f9b917e741b13c95eddf32f6df</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down Expand Up @@ -102,49 +102,49 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.23212.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -242,13 +242,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.23226.4">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.23316.3">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>83c5bd71b65d9de362ae0ba2f2cdea94c002c8c7</Sha>
<Sha>2293d2ba069595f1c87f4e002c84cbab7201bfe7</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.23212.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.23316.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7</Sha>
<Sha>60b420e88cdd0ec0becb2115e14288adc1a1cb55</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.23212.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.23212.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>6.0.0-beta.23212.1</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.23212.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.23212.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.23212.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.23212.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.23212.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.23212.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.23212.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.23212.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.23212.1</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.23316.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.23316.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>6.0.0-beta.23316.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.23316.2</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.23316.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.23316.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.23316.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.23316.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.23316.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.23316.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.23316.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.23316.2</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down Expand Up @@ -162,7 +162,7 @@
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.23218.5</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.23315.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
Expand All @@ -175,9 +175,9 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/System.Private.CoreLib/src/System/GC.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,5 +719,13 @@ public static T[] AllocateArray<T>(int length, bool pinned = false) // T[] rathe

return Unsafe.As<T[]>(AllocateNewArray(typeof(T[]).TypeHandle.Value, length, flags));
}

[MethodImpl(MethodImplOptions.InternalCall)]
private static extern long _GetTotalPauseDuration();

public static TimeSpan GetTotalPauseDuration()
{
return new TimeSpan(_GetTotalPauseDuration());
}
}
}
5 changes: 5 additions & 0 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45045,6 +45045,11 @@ void GCHeap::GetMemoryInfo(uint64_t* highMemLoadThresholdBytes,
#endif //_DEBUG
}

int64_t GCHeap::GetTotalPauseDuration()
{
return (int64_t)(gc_heap::total_suspended_time * 10);
}

uint32_t GCHeap::GetMemoryLoad()
{
uint32_t memory_load = 0;
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/gc/gcimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ class GCHeap : public IGCHeapInternal
bool* isConcurrent,
uint64_t* genInfoRaw,
uint64_t* pauseInfoRaw,
int kind);;
int kind);

int64_t GetTotalPauseDuration();

uint32_t GetMemoryLoad();

Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/gc/gcinterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,9 @@ class IGCHeap {

IGCHeap() {}
virtual ~IGCHeap() {}

// Get the total paused duration
virtual int64_t GetTotalPauseDuration() = 0;
};

#ifdef WRITE_BARRIER_CHECK
Expand Down
10 changes: 10 additions & 0 deletions src/coreclr/vm/comutilnative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,16 @@ UINT64 GCInterface::m_remPressure[MEM_PRESSURE_COUNT] = {0, 0, 0, 0}; // his
// (m_iteration % MEM_PRESSURE_COUNT) is used as an index into m_addPressure and m_remPressure
UINT GCInterface::m_iteration = 0;

FCIMPL0(INT64, GCInterface::GetTotalPauseDuration)
{
FCALL_CONTRACT;

FC_GC_POLL_NOT_NEEDED();

return GCHeapUtilities::GetGCHeap()->GetTotalPauseDuration();
}
FCIMPLEND

FCIMPL2(void, GCInterface::GetMemoryInfo, Object* objUNSAFE, int kind)
{
FCALL_CONTRACT;
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/comutilnative.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class GCInterface {
static FORCEINLINE UINT64 InterlockedAdd(UINT64 *pAugend, UINT64 addend);
static FORCEINLINE UINT64 InterlockedSub(UINT64 *pMinuend, UINT64 subtrahend);

static FCDECL0(INT64, GetTotalPauseDuration);
static FCDECL2(void, GetMemoryInfo, Object* objUNSAFE, int kind);
static FCDECL0(UINT32, GetMemoryLoad);
static FCDECL0(int, GetGcLatencyMode);
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/ecalllist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@ FCFuncStart(gGCInterfaceFuncs)
FCFuncElement("_WaitForFullGCComplete", GCInterface::WaitForFullGCComplete)
FCFuncElement("_CollectionCount", GCInterface::CollectionCount)
FCFuncElement("GetMemoryInfo", GCInterface::GetMemoryInfo)
FCFuncElement("_GetTotalPauseDuration", GCInterface::GetTotalPauseDuration)
FCFuncElement("GetMemoryLoad", GCInterface::GetMemoryLoad)
QCFuncElement("_StartNoGCRegion", GCInterface::StartNoGCRegion)
QCFuncElement("_EndNoGCRegion", GCInterface::EndNoGCRegion)
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
<ServicingVersion>11</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation.
# C# generates backing fields for fixed buffers as public.
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.

# This API only exists on servicing builds after the commit that introduce it
MembersMustExist : Member 'public System.TimeSpan System.GC.GetTotalPauseDuration()' does not exist in the reference but it does exist in the implementation.
5 changes: 5 additions & 0 deletions src/mono/System.Private.CoreLib/src/System/GC.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,5 +313,10 @@ internal static int GetLastGCPercentTimeInGC()
{
return (int)EventPipeInternal.GetRuntimeCounterValue(EventPipeInternal.RuntimeCounters.GC_LAST_PERCENT_TIME_IN_GC);
}

public static TimeSpan GetTotalPauseDuration()
{
return TimeSpan.Zero;
}
}
}
Loading