Skip to content

Commit 902ecb3

Browse files
markplesmarkples
committed
Merge remote-tracking branch 'dotnet/main' into 94175_cleanup
2 parents e813e11 + 96bcf71 commit 902ecb3

File tree

7 files changed

+54
-44
lines changed

7 files changed

+54
-44
lines changed

‎eng/Version.Details.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<Sha>803d8598f98fb4efd94604b32627ee9407f246db</Sha>
5555
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24379.1">
57+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24413.1">
5858
<Uri>https://github.com/dotnet/cecil</Uri>
59-
<Sha>b9d928a9d65ed39b9257846e1b8e853cea609c00</Sha>
59+
<Sha>ed276e79e30bffc3e6405afa8a9323ec7e67c700</Sha>
6060
</Dependency>
6161
<!-- Intermediate is necessary for source build. -->
62-
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.24379.1">
62+
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.24413.1">
6363
<Uri>https://github.com/dotnet/cecil</Uri>
64-
<Sha>b9d928a9d65ed39b9257846e1b8e853cea609c00</Sha>
64+
<Sha>ed276e79e30bffc3e6405afa8a9323ec7e67c700</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
6767
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24402.2">
@@ -81,9 +81,9 @@
8181
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
8282
</Dependency>
8383
<!-- Intermediate is necessary for source build. -->
84-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24407.1">
84+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24412.1">
8585
<Uri>https://github.com/dotnet/source-build-externals</Uri>
86-
<Sha>51b029e3272f35af0af337823cd122725f316c69</Sha>
86+
<Sha>ee22054b44ec9615dc3481c4decc1b007a83a2b0</Sha>
8787
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
8888
</Dependency>
8989
</ProductDependencies>
@@ -278,43 +278,43 @@
278278
<Uri>https://github.com/dotnet/llvm-project</Uri>
279279
<Sha>b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.1.24403.1">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.1.24410.5">
282282
<Uri>https://github.com/dotnet/runtime</Uri>
283-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
283+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
284284
</Dependency>
285-
<Dependency Name="runtime.native.System.IO.Ports" Version="9.0.0-rc.1.24403.1">
285+
<Dependency Name="runtime.native.System.IO.Ports" Version="9.0.0-rc.1.24410.5">
286286
<Uri>https://github.com/dotnet/runtime</Uri>
287-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
287+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="9.0.0-rc.1.24403.1">
289+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="9.0.0-rc.1.24410.5">
290290
<Uri>https://github.com/dotnet/runtime</Uri>
291-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
291+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
292292
</Dependency>
293-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="9.0.0-rc.1.24403.1">
293+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="9.0.0-rc.1.24410.5">
294294
<Uri>https://github.com/dotnet/runtime</Uri>
295-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
295+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
296296
</Dependency>
297-
<Dependency Name="System.Text.Json" Version="9.0.0-rc.1.24403.1">
297+
<Dependency Name="System.Text.Json" Version="9.0.0-rc.1.24410.5">
298298
<Uri>https://github.com/dotnet/runtime</Uri>
299-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
299+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
300300
</Dependency>
301301
<!-- Intermediate is necessary for source build. -->
302-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-rc.1.24403.1">
302+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-rc.1.24410.5">
303303
<Uri>https://github.com/dotnet/runtime</Uri>
304-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
304+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
305305
<SourceBuild RepoName="runtime" ManagedOnly="false" />
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="9.0.0-rc.1.24403.1">
307+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="9.0.0-rc.1.24410.5">
308308
<Uri>https://github.com/dotnet/runtime</Uri>
309-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
309+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
310310
</Dependency>
311-
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-rc.1.24403.1">
311+
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-rc.1.24410.5">
312312
<Uri>https://github.com/dotnet/runtime</Uri>
313-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
313+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
314314
</Dependency>
315-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.1.24403.1">
315+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.1.24410.5">
316316
<Uri>https://github.com/dotnet/runtime</Uri>
317-
<Sha>1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6</Sha>
317+
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
318318
</Dependency>
319319
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24405.1">
320320
<Uri>https://github.com/dotnet/xharness</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
349349
<Sha>1b39aa819a38d504f7f828c28ff173acca7f99e2</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.24405.1">
351+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.24412.1">
352352
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
353-
<Sha>b97425c36aae0f46a22f2893309771383bfa9b30</Sha>
353+
<Sha>90b2ffe6186a5fa3782a65f61ef396b0463d29b2</Sha>
354354
</Dependency>
355355
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.24407.1">
356356
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -382,14 +382,14 @@
382382
<Sha>bba7ceac50f68468ec9733a6a66f2314227101d4</Sha>
383383
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
384384
</Dependency>
385-
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-rc.1.24378.3">
385+
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-rc.1.24409.1">
386386
<Uri>https://github.com/dotnet/sdk</Uri>
387-
<Sha>e028762ceb5ccaa05a8c93c29ce5bbcae926533a</Sha>
387+
<Sha>43360291a50c9c7c471551f8f8363919d38014ea</Sha>
388388
</Dependency>
389389
<!-- Intermediate is necessary for source build. -->
390-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-rc.1.24378.3">
390+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-rc.1.24409.1">
391391
<Uri>https://github.com/dotnet/sdk</Uri>
392-
<Sha>e028762ceb5ccaa05a8c93c29ce5bbcae926533a</Sha>
392+
<Sha>43360291a50c9c7c471551f8f8363919d38014ea</Sha>
393393
<SourceBuild RepoName="sdk" ManagedOnly="true" />
394394
</Dependency>
395395
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24376.4">

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<PropertyGroup>
8282
<StaticCsVersion>0.2.0</StaticCsVersion>
8383
<!-- SDK dependencies (also used in wasm build tests -->
84-
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-rc.1.24378.3</MicrosoftDotNetApiCompatTaskVersion>
84+
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-rc.1.24409.1</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
8686
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedVersion>
8787
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24408.2</MicrosoftDotNetCodeAnalysisVersion>
@@ -104,10 +104,10 @@
104104
<!-- NuGet dependencies -->
105105
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
106106
<!-- Installer dependencies -->
107-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.1.24403.1</MicrosoftNETCoreAppRuntimewinx64Version>
107+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.1.24410.5</MicrosoftNETCoreAppRuntimewinx64Version>
108108
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
109109
<!-- ILAsm dependencies -->
110-
<MicrosoftNETCoreILAsmVersion>9.0.0-rc.1.24403.1</MicrosoftNETCoreILAsmVersion>
110+
<MicrosoftNETCoreILAsmVersion>9.0.0-rc.1.24410.5</MicrosoftNETCoreILAsmVersion>
111111
<!-- Libraries dependencies -->
112112
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
113113
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
@@ -119,19 +119,19 @@
119119
<SystemDrawingCommonVersion>8.0.0</SystemDrawingCommonVersion>
120120
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
121121
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
122-
<SystemReflectionMetadataVersion>9.0.0-rc.1.24403.1</SystemReflectionMetadataVersion>
123-
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24403.1</SystemReflectionMetadataLoadContextVersion>
122+
<SystemReflectionMetadataVersion>9.0.0-rc.1.24410.5</SystemReflectionMetadataVersion>
123+
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24410.5</SystemReflectionMetadataLoadContextVersion>
124124
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
125125
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
126126
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
127127
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
128128
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
129-
<SystemTextJsonVersion>9.0.0-rc.1.24403.1</SystemTextJsonVersion>
129+
<SystemTextJsonVersion>9.0.0-rc.1.24410.5</SystemTextJsonVersion>
130130
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
131131
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
132132
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
133133
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
134-
<runtimenativeSystemIOPortsVersion>9.0.0-rc.1.24403.1</runtimenativeSystemIOPortsVersion>
134+
<runtimenativeSystemIOPortsVersion>9.0.0-rc.1.24410.5</runtimenativeSystemIOPortsVersion>
135135
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
136136
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
137137
<SystemTextJsonToolsetVersion>8.0.0</SystemTextJsonToolsetVersion>
@@ -184,7 +184,7 @@
184184
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24405.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
185185
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24405.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
186186
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24405.1</MicrosoftDotNetXHarnessCLIVersion>
187-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24405.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
187+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24412.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
188188
<NUnitVersion>3.12.0</NUnitVersion>
189189
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
190190
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -212,9 +212,9 @@
212212
<!-- Docs -->
213213
<MicrosoftPrivateIntellisenseVersion>8.0.0-preview-20230918.1</MicrosoftPrivateIntellisenseVersion>
214214
<!-- Mono Cecil -->
215-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24379.1</MicrosoftDotNetCecilVersion>
215+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24413.1</MicrosoftDotNetCecilVersion>
216216
<!-- ILCompiler -->
217-
<MicrosoftDotNetILCompilerVersion>9.0.0-rc.1.24403.1</MicrosoftDotNetILCompilerVersion>
217+
<MicrosoftDotNetILCompilerVersion>9.0.0-rc.1.24410.5</MicrosoftDotNetILCompilerVersion>
218218
<!-- ICU -->
219219
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rc.1.24373.1</MicrosoftNETCoreRuntimeICUTransportVersion>
220220
<!-- MsQuic -->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24408.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24403.1"
16+
"Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24410.5"
1717
}
1818
}

‎src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeBuilderState.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ public LowLevelList<bool> InstanceGCLayout
355355
else
356356
{
357357
Debug.Assert(TypeBeingBuilt.RetrieveRuntimeTypeHandleIfPossible() ||
358-
TypeBeingBuilt.IsTemplateCanonical() ||
359358
(TypeBeingBuilt is PointerType) ||
360359
(TypeBeingBuilt is ByRefType) ||
361-
(TypeBeingBuilt is FunctionPointerType));
360+
(TypeBeingBuilt is FunctionPointerType) ||
361+
TypeBeingBuilt.IsTemplateCanonical());
362362
_instanceGCLayout = s_emptyLayout;
363363
}
364364
}

‎src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.Shared.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<method signature="System.Boolean IsEnabled(System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords)" body="stub" value="false" />
88
<method signature="System.Boolean IsEnabled(System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords,System.Diagnostics.Tracing.EventChannel)" body="stub" value="false" />
99
</type>
10+
<type fullname="System.Diagnostics.Tracing.EventSource" feature="System.Diagnostics.Metrics.Meter.IsSupported" featurevalue="false">
11+
<method signature="System.Boolean get_IsMeterSupported()" body="stub" value="false" />
12+
</type>
1013
<type fullname="System.Diagnostics.StackTrace" feature="System.Diagnostics.StackTrace.IsSupported" featurevalue="false">
1114
<method signature="System.Boolean get_IsSupported()" body="stub" value="false" />
1215
</type>

‎src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,11 @@ public partial class EventSource : IDisposable
230230
private static bool InitializeIsSupported() =>
231231
AppContext.TryGetSwitch("System.Diagnostics.Tracing.EventSource.IsSupported", out bool isSupported) ? isSupported : true;
232232

233+
internal static bool IsMeterSupported { get; } = InitializeIsMeterSupported();
234+
235+
private static bool InitializeIsMeterSupported() =>
236+
AppContext.TryGetSwitch("System.Diagnostics.Metrics.Meter.IsSupported", out bool isSupported) ? isSupported : true;
237+
233238
#if FEATURE_EVENTSOURCE_XPLAT
234239
#pragma warning disable CA1823 // field is used to keep listener alive
235240
private static readonly EventListener? persistent_Xplat_Listener = IsSupported ? XplatEventLogger.InitializePersistentListener() : null;
@@ -3831,7 +3836,7 @@ internal static void InitializeDefaultEventSources()
38313836
// Functionally we could preregister NativeRuntimeEventSource and RuntimeEventSource as well, but it may not provide
38323837
// much benefit. The main benefit for MetricsEventSource is that the app may never use it and it defers
38333838
// pulling the System.Diagnostics.DiagnosticSource assembly into the process until it is needed.
3834-
if (AppContext.TryGetSwitch("System.Diagnostics.Metrics.Meter.IsSupported", out bool isSupported) ? isSupported : true)
3839+
if (IsMeterSupported)
38353840
{
38363841
const string name = "System.Diagnostics.Metrics";
38373842
Guid id = new Guid("20752bc4-c151-50f5-f27b-df92d8af5a61");

‎src/tools/illink/src/linker/Linker/CustomSymbolWriter.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ string GetOriginalPdbPath ()
113113

114114
public void Write (MethodDebugInformation info) => _symbolWriter.Write (info);
115115

116+
public void Write (ICustomDebugInformationProvider provider) => _symbolWriter.Write (provider);
117+
116118
public void Write () => _symbolWriter.Write ();
117119

118120
public void Dispose () => _symbolWriter.Dispose ();

0 commit comments

Comments
 (0)