From 6b65e92994bd11e83f47af277d1f2dc33ff74822 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:06:03 +0000 Subject: [PATCH 1/9] Backflow from https://github.com/dotnet/dotnet / b7ad826 build 278405 [[ commit created by automation ]] --- eng/SignCheckExclusionsFile.txt | 15 --------------- .../Microsoft.DotNet.ILCompiler.pkgproj | 7 ++++++- .../pkg/projects/nativeaot-packages.proj | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 eng/SignCheckExclusionsFile.txt diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt deleted file mode 100644 index f41753338155eb..00000000000000 --- a/eng/SignCheckExclusionsFile.txt +++ /dev/null @@ -1,15 +0,0 @@ -;; Exclusions for SignCheck. Corresponds to info in Signing.props. -;; Format: https://github.com/dotnet/arcade/blob/397316e195639450b6c76bfeb9823b40bee72d6d/src/SignCheck/Microsoft.SignCheck/Verification/Exclusion.cs#L23-L35 -;; -;; This issue tracks a way to implement exclusions via Signing.props and avoid this extra file: https://github.com/dotnet/arcade/issues/2888 - -;; The apphost and comhost are template files, modified by the SDK to produce the executable for FDE -;; and SCD apps. If they are signed, the file that the SDK produces has an invalid signature and -;; can't be signed again. More info at https://github.com/dotnet/core-setup/pull/7549. -*apphost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*singlefilehost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*comhost.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*apphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*comhosttemplatecomhostdll.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*staticapphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*dotnet.js;;Workaround, https://github.com/dotnet/core-eng/issues/9933 \ No newline at end of file diff --git a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj index bf1c08d49f25db..09f900900e1142 100644 --- a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj +++ b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj @@ -34,8 +34,13 @@ BeforeTargets="GetPackageFiles" Condition="'$(PackageTargetRuntime)' != ''"> + + <_ILCompilerFilesRoot>$(CoreCLRILCompilerDir) + <_ILCompilerFilesRoot Condition="'$(PackHostILCompiler)' == 'true'">$(CoreCLRCrossILCompilerDir) + + - + diff --git a/src/installer/pkg/projects/nativeaot-packages.proj b/src/installer/pkg/projects/nativeaot-packages.proj index 37d894266f25d0..3f69b1ac3118e5 100644 --- a/src/installer/pkg/projects/nativeaot-packages.proj +++ b/src/installer/pkg/projects/nativeaot-packages.proj @@ -5,7 +5,7 @@ - + From b3f5838c3e5ec23956ec19159be7343fad2c1e78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:06:11 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/dotnet build 278405 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25406.102 -> 5.0.0-2.25407.105) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25406.102 -> 10.0.0-preview.25407.105) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25406.102 -> 10.0.100-rc.1.25407.105) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25406.102 -> 10.0.0-beta.25407.105) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25406.102 -> 0.11.5-alpha.25407.105) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25406.102 -> 2.9.3-beta.25407.105) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25406.102 -> 10.0.0-rc.1.25407.105) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.102 -> 7.0.0-preview.1.105) System.CommandLine (Version 2.0.0-rc.1.25406.102 -> 2.0.0-rc.1.25407.105) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 24a854e1ad8989..647ed07880c1e0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25406.102 - 5.0.0-2.25406.102 - 5.0.0-2.25406.102 - 10.0.0-preview.25406.102 - 10.0.100-rc.1.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 0.11.5-alpha.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 10.0.0-beta.25406.102 - 2.9.3-beta.25406.102 - 2.9.3-beta.25406.102 - 10.0.0-beta.25406.102 - 5.0.0-2.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.100-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 7.0.0-preview.1.102 - 7.0.0-preview.1.102 - 7.0.0-preview.1.102 - 7.0.0-preview.1.102 - 10.0.0-rc.1.25406.102 - 2.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 - 10.0.0-rc.1.25406.102 + 5.0.0-2.25407.105 + 5.0.0-2.25407.105 + 5.0.0-2.25407.105 + 10.0.0-preview.25407.105 + 10.0.100-rc.1.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 0.11.5-alpha.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 10.0.0-beta.25407.105 + 2.9.3-beta.25407.105 + 2.9.3-beta.25407.105 + 10.0.0-beta.25407.105 + 5.0.0-2.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.100-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 7.0.0-preview.1.105 + 7.0.0-preview.1.105 + 7.0.0-preview.1.105 + 7.0.0-preview.1.105 + 10.0.0-rc.1.25407.105 + 2.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 + 10.0.0-rc.1.25407.105 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0be0731b741ec2..a0fedcd8757f17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 - + https://github.com/dotnet/dotnet - 30bc8f92be07c2c8c3a6addb946877260e042f63 + b7ad826c308d3b0376ed21450271439a97f77f02 https://github.com/dotnet/node diff --git a/global.json b/global.json index b87adc9be7f315..e82cb3126e57a5 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25406.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25406.102", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25406.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25407.105", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25407.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25406.102" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25407.105" } } From b743f7cd503ad589df77a3b88fd589e7f6734e2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Aug 2025 02:06:10 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/dotnet build 278512 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25407.105 -> 5.0.0-2.25407.104) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25407.105 -> 10.0.0-preview.25407.104) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25407.105 -> 10.0.100-rc.1.25407.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25407.105 -> 10.0.0-beta.25407.104) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25407.105 -> 0.11.5-alpha.25407.104) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25407.105 -> 2.9.3-beta.25407.104) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25407.105 -> 10.0.0-rc.1.25407.104) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.105 -> 7.0.0-preview.1.104) System.CommandLine (Version 2.0.0-rc.1.25407.105 -> 2.0.0-rc.1.25407.104) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 647ed07880c1e0..733ce2c9c8f158 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25407.105 - 5.0.0-2.25407.105 - 5.0.0-2.25407.105 - 10.0.0-preview.25407.105 - 10.0.100-rc.1.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 0.11.5-alpha.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 10.0.0-beta.25407.105 - 2.9.3-beta.25407.105 - 2.9.3-beta.25407.105 - 10.0.0-beta.25407.105 - 5.0.0-2.25407.105 - 10.0.0-rc.1.25407.105 - 10.0.100-rc.1.25407.105 - 10.0.0-rc.1.25407.105 - 10.0.0-rc.1.25407.105 - 7.0.0-preview.1.105 - 7.0.0-preview.1.105 - 7.0.0-preview.1.105 - 7.0.0-preview.1.105 - 10.0.0-rc.1.25407.105 - 2.0.0-rc.1.25407.105 - 10.0.0-rc.1.25407.105 - 10.0.0-rc.1.25407.105 - 10.0.0-rc.1.25407.105 + 5.0.0-2.25407.104 + 5.0.0-2.25407.104 + 5.0.0-2.25407.104 + 10.0.0-preview.25407.104 + 10.0.100-rc.1.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 0.11.5-alpha.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 10.0.0-beta.25407.104 + 2.9.3-beta.25407.104 + 2.9.3-beta.25407.104 + 10.0.0-beta.25407.104 + 5.0.0-2.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.100-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 7.0.0-preview.1.104 + 7.0.0-preview.1.104 + 7.0.0-preview.1.104 + 7.0.0-preview.1.104 + 10.0.0-rc.1.25407.104 + 2.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 + 10.0.0-rc.1.25407.104 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0fedcd8757f17..8fb8f58ea9fa55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 - + https://github.com/dotnet/dotnet - b7ad826c308d3b0376ed21450271439a97f77f02 + 79090dc47fa1256f57be057cdf7aba3af8122870 https://github.com/dotnet/node diff --git a/global.json b/global.json index e82cb3126e57a5..d0cbbf93929fb5 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25407.105", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25407.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25407.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25407.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25407.105" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25407.104" } } From 92ea1754f2f2f8608be8fb5ee0a9f16453e18e16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Aug 2025 02:04:14 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/dotnet build 278626 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25407.104 -> 5.0.0-2.25409.103) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25407.104 -> 10.0.0-preview.25409.103) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25407.104 -> 10.0.100-rc.1.25409.103) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25407.104 -> 10.0.0-beta.25409.103) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25407.104 -> 0.11.5-alpha.25409.103) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25407.104 -> 2.9.3-beta.25409.103) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25407.104 -> 10.0.0-rc.1.25409.103) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.104 -> 7.0.0-preview.1.603) System.CommandLine (Version 2.0.0-rc.1.25407.104 -> 2.0.0-rc.1.25409.103) --- eng/Version.Details.props | 78 ++++----- eng/Version.Details.xml | 158 +++++++++--------- eng/common/core-templates/job/onelocbuild.yml | 30 ++-- eng/common/tools.ps1 | 13 ++ eng/common/tools.sh | 24 +++ global.json | 8 +- 6 files changed, 173 insertions(+), 138 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 733ce2c9c8f158..736de37372dd5b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25407.104 - 5.0.0-2.25407.104 - 5.0.0-2.25407.104 - 10.0.0-preview.25407.104 - 10.0.100-rc.1.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 0.11.5-alpha.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 10.0.0-beta.25407.104 - 2.9.3-beta.25407.104 - 2.9.3-beta.25407.104 - 10.0.0-beta.25407.104 - 5.0.0-2.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.100-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 7.0.0-preview.1.104 - 7.0.0-preview.1.104 - 7.0.0-preview.1.104 - 7.0.0-preview.1.104 - 10.0.0-rc.1.25407.104 - 2.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 - 10.0.0-rc.1.25407.104 + 5.0.0-2.25409.103 + 5.0.0-2.25409.103 + 5.0.0-2.25409.103 + 10.0.0-preview.25409.103 + 10.0.100-rc.1.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 0.11.5-alpha.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 10.0.0-beta.25409.103 + 2.9.3-beta.25409.103 + 2.9.3-beta.25409.103 + 10.0.0-beta.25409.103 + 5.0.0-2.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.100-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 7.0.0-preview.1.603 + 7.0.0-preview.1.603 + 7.0.0-preview.1.603 + 7.0.0-preview.1.603 + 10.0.0-rc.1.25409.103 + 2.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 + 10.0.0-rc.1.25409.103 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fb8f58ea9fa55..d7cb7c02f72a22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 79090dc47fa1256f57be057cdf7aba3af8122870 + e9f665e52848a3615736c099e5631af531b66a5c https://github.com/dotnet/node diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8034815f4213b1..8bf7d23355bc5e 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -27,7 +27,7 @@ parameters: is1ESPipeline: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} @@ -99,22 +99,20 @@ jobs: mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish Localization Files - pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} + # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact + - task: CopyFiles@2 + displayName: Copy LocProject.json + inputs: + SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + Contents: 'LocProject.json' + TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' + condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: - displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' - publishLocation: Container - artifactName: Loc + targetPath: '$(Build.ArtifactStagingDirectory)/loc' + artifactName: 'Loc' + displayName: 'Publish Localization Files' condition: ${{ parameters.condition }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 996a5f9c872591..d4cfd9ccd806c9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' + $shouldDownload = $false + if (!(Test-Path $installScript)) { + $shouldDownload = $true + } else { + # Check if the script is older than 30 days + $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime + if ($fileAge.Days -gt 30) { + Write-Host "Existing install script is too old, re-downloading..." + $shouldDownload = $true + } + } + + if ($shouldDownload) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3def02a638d2e8..c1841c9dfd0f4e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -300,8 +300,29 @@ function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local timestamp_file="$root/.dotnet-install.timestamp" + local should_download=false if [[ ! -a "$install_script" ]]; then + should_download=true + elif [[ -f "$timestamp_file" ]]; then + # Check if the script is older than 30 days using timestamp file + local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0") + local current_time=$(date +%s) + local age_seconds=$((current_time - download_time)) + + # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds + if [[ $age_seconds -gt 2592000 ]]; then + echo "Existing install script is too old, re-downloading..." + should_download=true + fi + else + # No timestamp file exists, assume script is old and re-download + echo "No timestamp found for existing install script, re-downloading..." + should_download=true + fi + + if [[ "$should_download" == true ]]; then mkdir -p "$root" echo "Downloading '$install_script_url'" @@ -328,6 +349,9 @@ function GetDotNetInstallScript { ExitWithExitCode $exit_code } fi + + # Create timestamp file to track download time in seconds from epoch + date +%s > "$timestamp_file" fi # return value _GetDotNetInstallScript="$install_script" diff --git a/global.json b/global.json index d0cbbf93929fb5..1f9a21c05d2141 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25407.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25407.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25409.103", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25409.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25407.104" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25409.103" } } From edb27aee51bb65849b98bd6b077b4254afa804ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 02:03:04 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/dotnet build 278647 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25409.103 -> 5.0.0-2.25410.101) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25409.103 -> 10.0.0-preview.25410.101) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25409.103 -> 10.0.100-rc.1.25410.101) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25409.103 -> 10.0.0-beta.25410.101) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25409.103 -> 0.11.5-alpha.25410.101) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25409.103 -> 2.9.3-beta.25410.101) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25409.103 -> 10.0.0-rc.1.25410.101) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.603 -> 7.0.0-preview.1.601) System.CommandLine (Version 2.0.0-rc.1.25409.103 -> 2.0.0-rc.1.25410.101) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 736de37372dd5b..d58ded83796708 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25409.103 - 5.0.0-2.25409.103 - 5.0.0-2.25409.103 - 10.0.0-preview.25409.103 - 10.0.100-rc.1.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 0.11.5-alpha.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 10.0.0-beta.25409.103 - 2.9.3-beta.25409.103 - 2.9.3-beta.25409.103 - 10.0.0-beta.25409.103 - 5.0.0-2.25409.103 - 10.0.0-rc.1.25409.103 - 10.0.100-rc.1.25409.103 - 10.0.0-rc.1.25409.103 - 10.0.0-rc.1.25409.103 - 7.0.0-preview.1.603 - 7.0.0-preview.1.603 - 7.0.0-preview.1.603 - 7.0.0-preview.1.603 - 10.0.0-rc.1.25409.103 - 2.0.0-rc.1.25409.103 - 10.0.0-rc.1.25409.103 - 10.0.0-rc.1.25409.103 - 10.0.0-rc.1.25409.103 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 10.0.0-preview.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 0.11.5-alpha.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 2.9.3-beta.25410.101 + 2.9.3-beta.25410.101 + 10.0.0-beta.25410.101 + 5.0.0-2.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 10.0.0-rc.1.25410.101 + 2.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7cb7c02f72a22..1fda181f4668f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - e9f665e52848a3615736c099e5631af531b66a5c + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://github.com/dotnet/node diff --git a/global.json b/global.json index 1f9a21c05d2141..09a0df7a929647 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25409.103", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25409.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25410.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25410.101", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25410.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25409.103" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25410.101" } } From 7c3ad07b4c8e38c9a520b55f1b06e49f839781ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 12:33:03 +0000 Subject: [PATCH 6/9] Backflow from https://github.com/dotnet/dotnet / c583c44 build 278837 [[ commit created by automation ]] --- eng/pipelines/coreclr/superpmi-diffs.yml | 5 +- .../coreclr/templates/jit-replay-pipeline.yml | 2 +- ...ttpClientHandlerTest.ServerCertificates.cs | 2 +- .../System/Net/Http/HttpClientHandlerTest.cs | 2 +- .../System.Data.OleDb/src/DbPropSet.cs | 2 +- .../System.Data.OleDb/src/OleDbComWrappers.cs | 124 ------------------ .../System.Data.OleDb/src/OleDbConnection.cs | 2 +- .../System.Data.OleDb/src/OleDbError.cs | 8 +- .../src/System.Data.OleDb.csproj | 54 +++----- .../src/UnsafeNativeMethods.COMWrappers.cs | 23 +--- .../src/UnsafeNativeMethods.cs | 46 +++---- .../src/System/Net/Http/WinHttpHandler.cs | 5 +- .../tests/UnitTests/WinHttpHandlerTest.cs | 11 +- .../FunctionalTests/SocketsHttpHandlerTest.cs | 2 +- .../Net/Security/SslAuthenticationOptions.cs | 6 +- .../SslStreamRemoteExecutorTests.cs | 26 ---- .../SslAuthenticationOptionsTests.cs | 8 +- .../src/System/Numerics/BitOperations.cs | 8 +- 18 files changed, 78 insertions(+), 258 deletions(-) delete mode 100644 src/libraries/System.Data.OleDb/src/OleDbComWrappers.cs diff --git a/eng/pipelines/coreclr/superpmi-diffs.yml b/eng/pipelines/coreclr/superpmi-diffs.yml index 10ba7a7a1df002..5e8b4f12b31da6 100644 --- a/eng/pipelines/coreclr/superpmi-diffs.yml +++ b/eng/pipelines/coreclr/superpmi-diffs.yml @@ -55,8 +55,11 @@ extends: platforms: - osx_arm64 - windows_x86 + # Not needed for subsequent steps, but this ensures we get some build + # coverage of community JITs in CI on JIT PRs. + - windows_x64 jobParameters: - buildArgs: -s clr.alljits+clr.spmi -c $(_BuildConfig) + buildArgs: -s clr.alljitscommunity+clr.spmi -c $(_BuildConfig) postBuildSteps: # Build CLR assets for x64 as well as the target as we need an x64 mcs - template: /eng/pipelines/common/templates/global-build-step.yml diff --git a/eng/pipelines/coreclr/templates/jit-replay-pipeline.yml b/eng/pipelines/coreclr/templates/jit-replay-pipeline.yml index 3ee415cb881a73..74f2caf2ff3852 100644 --- a/eng/pipelines/coreclr/templates/jit-replay-pipeline.yml +++ b/eng/pipelines/coreclr/templates/jit-replay-pipeline.yml @@ -32,7 +32,7 @@ extends: buildConfig: checked platforms: ${{ parameters.platforms }} jobParameters: - buildArgs: -s clr.alljitscommunity+clr.spmi -c $(_BuildConfig) + buildArgs: -s clr.alljits+clr.spmi -c $(_BuildConfig) postBuildSteps: - template: /eng/pipelines/common/upload-artifact-step.yml parameters: diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs index d027b87f0d86df..b2d0179378eca8 100644 --- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs +++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs @@ -48,7 +48,7 @@ public void Ctor_ExpectedDefaultValues() using (HttpClientHandler handler = CreateHttpClientHandler()) { Assert.Null(handler.ServerCertificateCustomValidationCallback); - Assert.True(handler.CheckCertificateRevocationList); + Assert.False(handler.CheckCertificateRevocationList); } } diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs index 450edaab12e377..b18dd83dcbeb71 100644 --- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs +++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs @@ -76,9 +76,9 @@ public void Ctor_ExpectedDefaultPropertyValues() Assert.False(handler.PreAuthenticate); Assert.True(handler.SupportsProxy); Assert.True(handler.SupportsRedirectConfiguration); + Assert.False(handler.CheckCertificateRevocationList); // Changes from .NET Framework. - Assert.True(handler.CheckCertificateRevocationList); Assert.Equal(0, handler.MaxRequestContentBufferSize); Assert.Equal(SslProtocols.None, handler.SslProtocols); } diff --git a/src/libraries/System.Data.OleDb/src/DbPropSet.cs b/src/libraries/System.Data.OleDb/src/DbPropSet.cs index 0a5151224c1c8e..614f556111c82d 100644 --- a/src/libraries/System.Data.OleDb/src/DbPropSet.cs +++ b/src/libraries/System.Data.OleDb/src/DbPropSet.cs @@ -111,7 +111,7 @@ private void SetLastErrorInfo(OleDbHResult lastErrorHr) } finally { - UnsafeNativeMethods.ReleaseErrorInfoObject(errorInfo); + UnsafeNativeMethods.ReleaseComWrappersObject(errorInfo); } } diff --git a/src/libraries/System.Data.OleDb/src/OleDbComWrappers.cs b/src/libraries/System.Data.OleDb/src/OleDbComWrappers.cs deleted file mode 100644 index 8cc99bc095026b..00000000000000 --- a/src/libraries/System.Data.OleDb/src/OleDbComWrappers.cs +++ /dev/null @@ -1,124 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System.Collections; -using System.Data.Common; -using System.Diagnostics; -using System.IO; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// We need to target netstandard2.0, so keep using ref for MemoryMarshal.Write -// CS9191: The 'ref' modifier for argument 2 corresponding to 'in' parameter is equivalent to 'in'. Consider using 'in' instead. -#pragma warning disable CS9191 - -namespace System.Data.OleDb -{ - /// - /// The ComWrappers implementation for System.Data.OleDb's COM interop usages. - /// - /// Supports IErrorInfo COM interface. - /// - internal sealed unsafe class OleDbComWrappers : ComWrappers - { - private const int S_OK = (int)OleDbHResult.S_OK; - private static readonly Guid IID_IErrorInfo = new Guid(0x1CF2B120, 0x547D, 0x101B, 0x8E, 0x65, 0x08, 0x00, 0x2B, 0x2B, 0xD1, 0x19); - - internal static OleDbComWrappers Instance { get; } = new OleDbComWrappers(); - - private OleDbComWrappers() { } - - protected override unsafe ComInterfaceEntry* ComputeVtables(object obj, CreateComInterfaceFlags flags, out int count) - { - throw new NotImplementedException(); - } - - protected override object CreateObject(IntPtr externalComObject, CreateObjectFlags flags) - { - Debug.Assert(flags == CreateObjectFlags.UniqueInstance); - - Guid errorInfoIID = IID_IErrorInfo; -#pragma warning disable CS9191 // The 'ref' modifier for argument 1 corresponding to 'in' parameter is equivalent to 'in'. Consider using 'in' instead. - int hr = Marshal.QueryInterface(externalComObject, ref errorInfoIID, out IntPtr comObject); -#pragma warning restore CS9191 - if (hr == S_OK) - { - return new ErrorInfoWrapper(comObject); - } - - throw new NotImplementedException(); - } - - protected override void ReleaseObjects(IEnumerable objects) - { - throw new NotImplementedException(); - } - - // Doc and type layout: https://learn.microsoft.com/windows/win32/api/oaidl/nn-oaidl-ierrorinfo - private sealed class ErrorInfoWrapper : UnsafeNativeMethods.IErrorInfo, IDisposable - { - private readonly IntPtr _wrappedInstance; - - public ErrorInfoWrapper(IntPtr wrappedInstance) - { - _wrappedInstance = wrappedInstance; - } - - public void Dispose() - { - Marshal.Release(_wrappedInstance); - } - - [Obsolete("not used", true)] - void UnsafeNativeMethods.IErrorInfo.GetGUID(/*deleted parameter signature*/) - { - throw new NotImplementedException(); - } - - public unsafe System.Data.OleDb.OleDbHResult GetSource(out string? source) - { - IntPtr pSource = IntPtr.Zero; - int errorCode = ((delegate* unmanaged)(*(*(void***)_wrappedInstance + 4 /* IErrorInfo.GetSource slot */))) - (_wrappedInstance, &pSource); - if (pSource == IntPtr.Zero || errorCode < 0) - { - source = null; - } - else - { - source = Marshal.PtrToStringBSTR(pSource); - } - - if (pSource != IntPtr.Zero) - { - Marshal.FreeBSTR(pSource); - } - - return (System.Data.OleDb.OleDbHResult)errorCode; - } - - public unsafe System.Data.OleDb.OleDbHResult GetDescription(out string? description) - { - IntPtr pDescription = IntPtr.Zero; - int errorCode = ((delegate* unmanaged)(*(*(void***)_wrappedInstance + 5 /* IErrorInfo.GetDescription slot */))) - (_wrappedInstance, &pDescription); - if (pDescription == IntPtr.Zero || errorCode < 0) - { - description = null; - } - else - { - description = Marshal.PtrToStringBSTR(pDescription); - } - - if (pDescription != IntPtr.Zero) - { - Marshal.FreeBSTR(pDescription); - } - - return (System.Data.OleDb.OleDbHResult)errorCode; - } - } - - } -} diff --git a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs index 5c8028fed7dd43..dc9368dca808b6 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs @@ -615,7 +615,7 @@ internal bool SupportSchemaRowset(Guid schema) } finally { - UnsafeNativeMethods.ReleaseErrorInfoObject(errorInfo); + UnsafeNativeMethods.ReleaseComWrappersObject(errorInfo); } } else if (0 < hresult) diff --git a/src/libraries/System.Data.OleDb/src/OleDbError.cs b/src/libraries/System.Data.OleDb/src/OleDbError.cs index 6497414fd49628..2e81f631773d41 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbError.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbError.cs @@ -24,7 +24,7 @@ internal OleDbError(UnsafeNativeMethods.IErrorRecords errorRecords, int index) if (OleDbHResult.DB_E_NOLOCALE == hr) { - Marshal.ReleaseComObject(errorInfo); + UnsafeNativeMethods.ReleaseComWrappersObject(errorInfo); lcid = Interop.Kernel32.GetUserDefaultLCID(); errorInfo = errorRecords.GetErrorInfo(index, lcid); @@ -43,7 +43,7 @@ internal OleDbError(UnsafeNativeMethods.IErrorRecords errorRecords, int index) if (OleDbHResult.DB_E_NOLOCALE == hr) { - Marshal.ReleaseComObject(errorInfo); + UnsafeNativeMethods.ReleaseComWrappersObject(errorInfo); lcid = Interop.Kernel32.GetUserDefaultLCID(); errorInfo = errorRecords.GetErrorInfo(index, lcid); @@ -56,7 +56,7 @@ internal OleDbError(UnsafeNativeMethods.IErrorRecords errorRecords, int index) { this.source = ODB.FailedGetSource(hr); } - Marshal.ReleaseComObject(errorInfo!); + UnsafeNativeMethods.ReleaseComWrappersObject(errorInfo); } } @@ -66,7 +66,7 @@ internal OleDbError(UnsafeNativeMethods.IErrorRecords errorRecords, int index) if (null != sqlErrorInfo) { this.nativeError = sqlErrorInfo.GetSQLInfo(out this.sqlState); - Marshal.ReleaseComObject(sqlErrorInfo); + UnsafeNativeMethods.ReleaseComWrappersObject(sqlErrorInfo); } } diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 5e454a02f23734..c750562b756c6b 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -8,6 +8,8 @@ $(NoWarn);CA2249 $(NoWarn);SYSLIB0004 + + $(NoWarn);CS3016 false true Provides a collection of classes for OLEDB. @@ -32,36 +34,21 @@ System.Data.OleDb.OleDbTransaction - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -136,18 +123,15 @@ System.Data.OleDb.OleDbTransaction - + - - + diff --git a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.COMWrappers.cs b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.COMWrappers.cs index d09e45ba0101aa..033bf5bf487318 100644 --- a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.COMWrappers.cs +++ b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.COMWrappers.cs @@ -3,6 +3,7 @@ using System.Data.OleDb; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.Marshalling; namespace System.Data.Common { @@ -15,27 +16,15 @@ internal static partial class UnsafeNativeMethods [LibraryImport(Interop.Libraries.OleAut32)] internal static unsafe partial OleDbHResult GetErrorInfo( int dwReserved, - System.IntPtr* ppIErrorInfo); + [MarshalUsing(typeof(UniqueComInterfaceMarshaller))] + out IErrorInfo? ppIErrorInfo); - internal static unsafe OleDbHResult GetErrorInfo( - int dwReserved, - out UnsafeNativeMethods.IErrorInfo? ppIErrorInfo) + internal static void ReleaseComWrappersObject(object? obj) { - ppIErrorInfo = null; - IntPtr pErrorInfo; - var hr = GetErrorInfo(dwReserved, &pErrorInfo); - if (hr == OleDbHResult.S_OK) + if (obj is not null) { - ppIErrorInfo = (UnsafeNativeMethods.IErrorInfo)OleDbComWrappers.Instance - .GetOrCreateObjectForComInstance(pErrorInfo, CreateObjectFlags.UniqueInstance); + ((ComObject)obj).FinalRelease(); } - - return hr; - } - - internal static void ReleaseErrorInfoObject(UnsafeNativeMethods.IErrorInfo errorInfo) - { - ((IDisposable)errorInfo).Dispose(); } } } diff --git a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs index 474d677280e596..683ea7d8be9f05 100644 --- a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs +++ b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.Marshalling; using System.Security; #pragma warning disable 0618 // ComInterfaceType.InterfaceIsDual is obsolete @@ -507,10 +508,18 @@ System.Data.OleDb.OleDbHResult GetSchemas( [Out] out IntPtr prgRestrictionSupport); } - [Guid("1CF2B120-547D-101B-8E65-08002B2BD119"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ComImport, SuppressUnmanagedCodeSecurity] - internal interface IErrorInfo + [Guid("0C733A74-2A1C-11CE-ADE5-00AA0044773D"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), GeneratedComInterface, SuppressUnmanagedCodeSecurity] + internal partial interface ISQLErrorInfo { - [Obsolete("not used", true)] void GetGUID(/*deleted parameter signature*/); + [return: MarshalAs(UnmanagedType.I4)] + int GetSQLInfo( + [MarshalAs(UnmanagedType.BStr)] out string pbstrSQLState); + } + + [Guid("1CF2B120-547D-101B-8E65-08002B2BD119"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), GeneratedComInterface, SuppressUnmanagedCodeSecurity] + internal partial interface IErrorInfo + { + [Obsolete("not used")] void GetGUID(/*deleted parameter signature*/); [PreserveSig] System.Data.OleDb.OleDbHResult GetSource( @@ -539,25 +548,26 @@ virtual HRESULT STDMETHODCALLTYPE GetHelpContext( /* [out] */ DWORD *pdwHelpContext) = 0; #endif - [Guid("0C733A67-2A1C-11CE-ADE5-00AA0044773D"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ComImport, SuppressUnmanagedCodeSecurity] - internal interface IErrorRecords + [Guid("0C733A67-2A1C-11CE-ADE5-00AA0044773D"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), GeneratedComInterface, SuppressUnmanagedCodeSecurity] + internal partial interface IErrorRecords { - [Obsolete("not used", true)] void AddErrorRecord(/*deleted parameter signature*/); + [Obsolete("not used")] void AddErrorRecord(/*deleted parameter signature*/); - [Obsolete("not used", true)] void GetBasicErrorInfo(/*deleted parameter signature*/); + [Obsolete("not used")] void GetBasicErrorInfo(/*deleted parameter signature*/); [PreserveSig] System.Data.OleDb.OleDbHResult GetCustomErrorObject( // may return E_NOINTERFACE when asking for IID_ISQLErrorInfo - [In] int ulRecordNum, - [In] in Guid riid, - [Out, MarshalAs(UnmanagedType.Interface)] out ISQLErrorInfo ppObject); + int ulRecordNum, + in Guid riid, + [MarshalUsing(typeof(UniqueComInterfaceMarshaller))] + out ISQLErrorInfo ppObject); - [return: MarshalAs(UnmanagedType.Interface)] + [return: MarshalUsing(typeof(UniqueComInterfaceMarshaller))] IErrorInfo GetErrorInfo( - [In] int ulRecordNum, - [In] int lcid); + int ulRecordNum, + int lcid); - [Obsolete("not used", true)] void GetErrorParameters(/*deleted parameter signature*/); + [Obsolete("not used")] void GetErrorParameters(/*deleted parameter signature*/); int GetRecordCount(); } @@ -725,14 +735,6 @@ System.Data.OleDb.OleDbHResult GetReferencedRowset( //int GetSpecification(/*deleted parameter signature*/); } - [Guid("0C733A74-2A1C-11CE-ADE5-00AA0044773D"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ComImport, SuppressUnmanagedCodeSecurity] - internal interface ISQLErrorInfo - { - [return: MarshalAs(UnmanagedType.I4)] - int GetSQLInfo( - [Out, MarshalAs(UnmanagedType.BStr)] out string pbstrSQLState); - } - [Guid("0C733A5F-2A1C-11CE-ADE5-00AA0044773D"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ComImport, SuppressUnmanagedCodeSecurity] internal interface ITransactionLocal { diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs index 110fc6a7ca29ca..1edeb191cc7ab7 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs @@ -43,10 +43,7 @@ public class WinHttpHandler : HttpMessageHandler internal static readonly Version HttpVersion20 = new Version(2, 0); internal static readonly Version HttpVersion30 = new Version(3, 0); internal static readonly Version HttpVersionUnknown = new Version(0, 0); - internal static bool DefaultCertificateRevocationCheck { get; } = - AppContextSwitchHelper.GetBooleanConfig( - "System.Net.Security.NoRevocationCheckByDefault", - "DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT") ? false : true; + internal static bool DefaultCertificateRevocationCheck { get; } internal static bool CertificateCachingAppContextSwitchEnabled { get; } = AppContext.TryGetSwitch("System.Net.Http.UseWinHttpCertificateCaching", out bool enabled) && enabled; private static readonly TimeSpan s_maxTimeout = TimeSpan.FromMilliseconds(int.MaxValue); diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs index 2505480230e59e..d257f38d382d6f 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/WinHttpHandlerTest.cs @@ -45,7 +45,7 @@ public void Ctor_ExpectedDefaultPropertyValues() Assert.Equal(CookieUsePolicy.UseInternalCookieStoreOnly, handler.CookieUsePolicy); Assert.Null(handler.CookieContainer); Assert.Null(handler.ServerCertificateValidationCallback); - Assert.True(handler.CheckCertificateRevocationList); + Assert.False(handler.CheckCertificateRevocationList); Assert.Equal(ClientCertificateOption.Manual, handler.ClientCertificateOption); X509Certificate2Collection certs = handler.ClientCertificates; Assert.True(certs.Count == 0); @@ -130,7 +130,8 @@ public void TcpKeepalive_WhenEnabled_ForwardsCorrectNativeOptions() { using var handler = new WinHttpHandler(); - SendRequestHelper.Send(handler, () => { + SendRequestHelper.Send(handler, () => + { handler.TcpKeepAliveEnabled = true; handler.TcpKeepAliveTime = TimeSpan.FromMinutes(13); handler.TcpKeepAliveInterval = TimeSpan.FromSeconds(42); @@ -148,7 +149,8 @@ public void TcpKeepalive_InfiniteTimeSpan_TranslatesToUInt32MaxValue() { using var handler = new WinHttpHandler(); - SendRequestHelper.Send(handler, () => { + SendRequestHelper.Send(handler, () => + { handler.TcpKeepAliveEnabled = true; handler.TcpKeepAliveTime = Timeout.InfiniteTimeSpan; handler.TcpKeepAliveInterval = Timeout.InfiniteTimeSpan; @@ -312,7 +314,8 @@ public void CookieUsePolicy_SetUseSpecifiedCookieContainerAndContainer_ExpectedW SendRequestHelper.Send( handler, - delegate { + delegate + { handler.CookieUsePolicy = CookieUsePolicy.UseSpecifiedCookieContainer; handler.CookieContainer = new CookieContainer(); }); diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index 332e31489c0f93..f5877a3bd2e286 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -2540,7 +2540,7 @@ public void SslOptions_GetSet_Roundtrips() Assert.True(options.AllowRenegotiation); Assert.Null(options.ApplicationProtocols); - Assert.Equal(X509RevocationMode.Online, options.CertificateRevocationCheckMode); + Assert.Equal(X509RevocationMode.NoCheck, options.CertificateRevocationCheckMode); Assert.Null(options.ClientCertificates); Assert.Equal(SslProtocols.None, options.EnabledSslProtocols); Assert.Equal(EncryptionPolicy.RequireEncryption, options.EncryptionPolicy); diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs index c70cbb3bb4e8ae..fce59ffaef0d74 100644 --- a/src/libraries/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs +++ b/src/libraries/System.Net.Security/src/System/Net/Security/SslAuthenticationOptions.cs @@ -13,11 +13,7 @@ internal sealed class SslAuthenticationOptions : IDisposable { private const string EnableOcspStaplingContextSwitchName = "System.Net.Security.EnableServerOcspStaplingFromOnlyCertificateOnLinux"; - internal static readonly X509RevocationMode DefaultRevocationMode = - AppContextSwitchHelper.GetBooleanConfig( - "System.Net.Security.NoRevocationCheckByDefault", - "DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT") - ? X509RevocationMode.NoCheck : X509RevocationMode.Online; + internal const X509RevocationMode DefaultRevocationMode = X509RevocationMode.NoCheck; internal SslAuthenticationOptions() { diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamRemoteExecutorTests.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamRemoteExecutorTests.cs index 4ac1691eb7f1fb..46a4707b43cf01 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamRemoteExecutorTests.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamRemoteExecutorTests.cs @@ -83,31 +83,5 @@ await TestConfiguration.WhenAllOrAnyFailedWithTimeout( Assert.True(File.ReadAllText(tempFile).Length == 0); } } - - [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] - [InlineData(true)] - [InlineData(false)] - public void DefaultRevocationMode_OfflineRevocationByDefault_True_UsesNoCheck(bool useEnvVar) - { - var psi = new ProcessStartInfo(); - if (useEnvVar) - { - psi.Environment.Add("DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT", "true"); - } - - Assert.Equal(X509RevocationMode.Online, new SslClientAuthenticationOptions().CertificateRevocationCheckMode); - Assert.Equal(X509RevocationMode.Online, new SslServerAuthenticationOptions().CertificateRevocationCheckMode); - - RemoteExecutor.Invoke(useEnvVar => - { - if (!bool.Parse(useEnvVar)) - { - AppContext.SetSwitch("System.Net.Security.NoRevocationCheckByDefault", true); - } - - Assert.Equal(X509RevocationMode.NoCheck, new SslClientAuthenticationOptions().CertificateRevocationCheckMode); - Assert.Equal(X509RevocationMode.NoCheck, new SslServerAuthenticationOptions().CertificateRevocationCheckMode); - }, useEnvVar.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose(); - } } } diff --git a/src/libraries/System.Net.Security/tests/UnitTests/SslAuthenticationOptionsTests.cs b/src/libraries/System.Net.Security/tests/UnitTests/SslAuthenticationOptionsTests.cs index 69874a0e85bf4b..249a2921c68f29 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/SslAuthenticationOptionsTests.cs +++ b/src/libraries/System.Net.Security/tests/UnitTests/SslAuthenticationOptionsTests.cs @@ -133,13 +133,13 @@ public void EnabledSslProtocols_Get_Set_Succeeds() [Fact] public void CheckCertificateRevocation_Get_Set_Succeeds() { - Assert.Equal(X509RevocationMode.Online, _clientOptions.CertificateRevocationCheckMode); - Assert.Equal(X509RevocationMode.Online, _serverOptions.CertificateRevocationCheckMode); + Assert.Equal(X509RevocationMode.NoCheck, _clientOptions.CertificateRevocationCheckMode); + Assert.Equal(X509RevocationMode.NoCheck, _serverOptions.CertificateRevocationCheckMode); - _clientOptions.CertificateRevocationCheckMode = X509RevocationMode.NoCheck; + _clientOptions.CertificateRevocationCheckMode = X509RevocationMode.Online; _serverOptions.CertificateRevocationCheckMode = X509RevocationMode.Offline; - Assert.Equal(X509RevocationMode.NoCheck, _clientOptions.CertificateRevocationCheckMode); + Assert.Equal(X509RevocationMode.Online, _clientOptions.CertificateRevocationCheckMode); Assert.Equal(X509RevocationMode.Offline, _serverOptions.CertificateRevocationCheckMode); Assert.Throws(() => _clientOptions.CertificateRevocationCheckMode = (X509RevocationMode)3); diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs index 498ccc82d7b702..a1f35d196bca50 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs @@ -389,12 +389,8 @@ private static int Log2SoftwareFallback(uint value) value |= value >> 08; value |= value >> 16; - // uint.MaxValue >> 27 is always in range [0 - 31] so we use Unsafe.AddByteOffset to avoid bounds check - return Unsafe.AddByteOffset( - // Using deBruijn sequence, k=2, n=5 (2^5=32) : 0b_0000_0111_1100_0100_1010_1100_1101_1101u - ref MemoryMarshal.GetReference(Log2DeBruijn), - // uint|long -> IntPtr cast on 32-bit platforms does expensive overflow checks not needed here - (IntPtr)(int)((value * 0x07C4ACDDu) >> 27)); + // Using deBruijn sequence, k=2, n=5 (2^5=32) : 0b_0000_0111_1100_0100_1010_1100_1101_1101u + return Log2DeBruijn[(int)((value * 0x07C4ACDDu) >> 27)]; } /// Returns the integer (ceiling) log of the specified value, base 2. From fc647c43e8978aa2835dc119eb30bf6dbf8e7b3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 12:33:08 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/dotnet build 278837 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25410.101 -> 5.0.0-2.25411.106) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25410.101 -> 10.0.0-preview.25411.106) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25410.101 -> 10.0.100-rc.1.25411.106) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25410.101 -> 10.0.0-beta.25411.106) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25410.101 -> 0.11.5-alpha.25411.106) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25410.101 -> 2.9.3-beta.25411.106) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25410.101 -> 10.0.0-rc.1.25411.106) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.601 -> 7.0.0-preview.1.606) System.CommandLine (Version 2.0.0-rc.1.25410.101 -> 2.0.0-rc.1.25411.106) Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, Microsoft.DotNet.XHarness.CLI (Version 10.0.0-prerelease.25405.1 -> 10.0.0-prerelease.25405.1) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ae05c62095c38b..475424bb847af5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25410.101 - 5.0.0-2.25410.101 - 5.0.0-2.25410.101 - 10.0.0-preview.25410.101 - 10.0.100-rc.1.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 0.11.5-alpha.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 10.0.0-beta.25410.101 - 2.9.3-beta.25410.101 - 2.9.3-beta.25410.101 - 10.0.0-beta.25410.101 - 5.0.0-2.25410.101 - 10.0.0-rc.1.25410.101 - 10.0.100-rc.1.25410.101 - 10.0.0-rc.1.25410.101 - 10.0.0-rc.1.25410.101 - 7.0.0-preview.1.601 - 7.0.0-preview.1.601 - 7.0.0-preview.1.601 - 7.0.0-preview.1.601 - 10.0.0-rc.1.25410.101 - 2.0.0-rc.1.25410.101 - 10.0.0-rc.1.25410.101 - 10.0.0-rc.1.25410.101 - 10.0.0-rc.1.25410.101 + 5.0.0-2.25411.106 + 5.0.0-2.25411.106 + 5.0.0-2.25411.106 + 10.0.0-preview.25411.106 + 10.0.100-rc.1.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 0.11.5-alpha.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 10.0.0-beta.25411.106 + 2.9.3-beta.25411.106 + 2.9.3-beta.25411.106 + 10.0.0-beta.25411.106 + 5.0.0-2.25411.106 + 10.0.0-rc.1.25411.106 + 10.0.100-rc.1.25411.106 + 10.0.0-rc.1.25411.106 + 10.0.0-rc.1.25411.106 + 7.0.0-preview.1.606 + 7.0.0-preview.1.606 + 7.0.0-preview.1.606 + 7.0.0-preview.1.606 + 10.0.0-rc.1.25411.106 + 2.0.0-rc.1.25411.106 + 10.0.0-rc.1.25411.106 + 10.0.0-rc.1.25411.106 + 10.0.0-rc.1.25411.106 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 132279106c3fdf..64f13a93e83a27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 4c17e23fcb7575baa9de575e5a96258096cbaea1 - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da - + https://github.com/dotnet/dotnet - 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 + c583c4456a81cbdf34656b5bf1a01abfc65590da https://github.com/dotnet/node diff --git a/global.json b/global.json index 09a0df7a929647..e7d50618f54bea 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25410.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25410.101", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25410.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25411.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25411.106", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25411.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25410.101" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25411.106" } } From bef141ffdc5f5d87678e81b2fb271e5d3c7326d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 17:31:19 +0000 Subject: [PATCH 8/9] Backflow from https://github.com/dotnet/dotnet / ca3dd2c build 278938 [[ commit created by automation ]] --- .../libraries/helix-queues-setup.yml | 4 +- src/coreclr/gc/gc.cpp | 292 +++++++++--------- src/coreclr/gc/gcconfig.h | 1 - src/coreclr/gc/gcpriv.h | 56 ++-- .../Compiler/Dataflow/HandleCallAction.cs | 21 +- .../src/FilePatternMatch.cs | 5 +- .../src/Internal/PatternTestResult.cs | 3 - .../tests/FilePatternMatchTests.cs | 13 - src/libraries/sendtohelix-mobile.targets | 2 + src/tests/Common/helixpublishwitharcade.proj | 2 + .../DynamicGenerics/Github118072.cs | 20 +- .../SmokeTests/Reflection/Reflection.cs | 56 ---- 12 files changed, 193 insertions(+), 282 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 71713d3bccb3c7..fdebac85bc327a 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -37,7 +37,7 @@ jobs: # Linux musl x64 - ${{ if eq(parameters.platform, 'linux_musl_x64') }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.edge.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-edge-helix-amd64 - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.322.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64 @@ -75,7 +75,7 @@ jobs: - Ubuntu.2204.Amd64.Open - (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 - (Centos.10.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64 - + # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - osx.13.arm64.open diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp index cacae581ae019a..1c990c6988463b 100644 --- a/src/coreclr/gc/gc.cpp +++ b/src/coreclr/gc/gc.cpp @@ -428,26 +428,9 @@ size_t gib (size_t num) #ifdef BACKGROUND_GC uint32_t bgc_alloc_spin_count = 140; +uint32_t bgc_alloc_spin_count_uoh = 16; uint32_t bgc_alloc_spin = 2; -// The following 2 ratios dictate how UOH allocations that happen during a BGC should be handled. Because -// UOH is not collected till the very end of a BGC, by default we don't want to allow UOH to grow too large -// during a BGC. So if we only increase the size by 10%, we will allow to allocate normally. But if it's -// too much (ie, > bgc_uoh_inc_ratio_alloc_wait), we will make the allocation wait till the BGC is done. -// -// This means threads that allocate heavily on UOH may be paused during a BGC. If you're willing to accept -// larger UOH sizes in exchange for fewer pauses, you can use the UOHWaitBGCSizeIncPercent config to increase -// the wait ratio. Likewise, set it to use a smaller ratio if you observe that UOH grows too large during -// BGCs. -float bgc_uoh_inc_ratio_alloc_normal = 0.1f; -// This ratio is 2x for regions because regions could start with a much smaller size since a lot of -// memory could be in the free pool. -#ifdef USE_REGIONS -float bgc_uoh_inc_ratio_alloc_wait = 2.0f; -#else -float bgc_uoh_inc_ratio_alloc_wait = 1.0f; -#endif //USE_REGIONS - inline void c_write (uint32_t& place, uint32_t value) { @@ -2737,9 +2720,10 @@ heap_segment* gc_heap::freeable_soh_segment = 0; size_t gc_heap::bgc_overflow_count = 0; -size_t gc_heap::bgc_begin_uoh_size[uoh_generation_count] = {}; -size_t gc_heap::bgc_uoh_current_size[uoh_generation_count] = {}; -size_t gc_heap::end_uoh_size[uoh_generation_count] = {}; +size_t gc_heap::bgc_begin_loh_size = 0; +size_t gc_heap::end_loh_size = 0; +size_t gc_heap::bgc_begin_poh_size = 0; +size_t gc_heap::end_poh_size = 0; size_t gc_heap::uoh_a_no_bgc[uoh_generation_count] = {}; size_t gc_heap::uoh_a_bgc_marking[uoh_generation_count] = {}; @@ -2748,10 +2732,16 @@ size_t gc_heap::uoh_a_bgc_planning[uoh_generation_count] = {}; size_t gc_heap::bgc_maxgen_end_fl_size = 0; #endif //BGC_SERVO_TUNING +size_t gc_heap::bgc_loh_size_increased = 0; + +size_t gc_heap::bgc_poh_size_increased = 0; + size_t gc_heap::background_soh_size_end_mark = 0; size_t gc_heap::background_soh_alloc_count = 0; +size_t gc_heap::background_uoh_alloc_count = 0; + uint8_t** gc_heap::background_mark_stack_tos = 0; uint8_t** gc_heap::background_mark_stack_array = 0; @@ -8176,6 +8166,19 @@ bool gc_heap::new_allocation_allowed (int gen_number) { if (dd_new_allocation (dynamic_data_of (gen_number)) < 0) { + if (gen_number != 0) + { + // For UOH we will give it more budget before we try a GC. + if (settings.concurrent) + { + dynamic_data* dd2 = dynamic_data_of (gen_number); + + if (dd_new_allocation (dd2) <= (ptrdiff_t)(-2 * dd_desired_allocation (dd2))) + { + return TRUE; + } + } + } return FALSE; } #ifndef MULTIPLE_HEAPS @@ -14512,26 +14515,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size, #endif //WRITE_WATCH #ifdef BACKGROUND_GC -#ifdef USE_REGIONS - int bgc_uoh_inc_percent_alloc_wait = (int)GCConfig::GetUOHWaitBGCSizeIncPercent(); - if (bgc_uoh_inc_percent_alloc_wait != -1) - { - bgc_uoh_inc_ratio_alloc_wait = (float)bgc_uoh_inc_percent_alloc_wait / 100.0f; - } - else - { - bgc_uoh_inc_percent_alloc_wait = (int)(bgc_uoh_inc_ratio_alloc_wait * 100.0f); - } - - if (bgc_uoh_inc_ratio_alloc_normal > bgc_uoh_inc_ratio_alloc_wait) - { - bgc_uoh_inc_ratio_alloc_normal = bgc_uoh_inc_ratio_alloc_wait; - } - GCConfig::SetUOHWaitBGCSizeIncPercent (bgc_uoh_inc_percent_alloc_wait); - dprintf (1, ("UOH allocs during BGC are allowed normally when inc ratio is < %.3f, will wait when > %.3f", - bgc_uoh_inc_ratio_alloc_normal, bgc_uoh_inc_ratio_alloc_wait)); -#endif - // leave the first page to contain only segment info // because otherwise we could need to revisit the first page frequently in // background GC. @@ -15601,11 +15584,10 @@ gc_heap::init_gc_heap (int h_number) bgc_threads_timeout_cs.Initialize(); current_bgc_state = bgc_not_in_process; background_soh_alloc_count = 0; + background_uoh_alloc_count = 0; bgc_overflow_count = 0; - for (int i = uoh_start_generation; i < total_generation_count; i++) - { - end_uoh_size[i - uoh_start_generation] = dd_min_size (dynamic_data_of (i)); - } + end_loh_size = dd_min_size (dynamic_data_of (loh_generation)); + end_poh_size = dd_min_size (dynamic_data_of (poh_generation)); current_sweep_pos = 0; #ifdef DOUBLY_LINKED_FL @@ -18041,7 +18023,6 @@ BOOL gc_heap::a_fit_segment_end_p (int gen_number, #ifdef BACKGROUND_GC if (cookie != -1) { - bgc_record_uoh_end_seg_allocation (gen_number, limit); allocated += limit; bgc_uoh_alloc_clr (old_alloc, limit, acontext, flags, gen_number, align_const, cookie, TRUE, seg); } @@ -18069,10 +18050,6 @@ BOOL gc_heap::a_fit_segment_end_p (int gen_number, limit += Align(min_obj_size, align_const); } -#ifdef BACKGROUND_GC - bgc_record_uoh_end_seg_allocation (gen_number, limit); -#endif - allocated += limit; adjust_limit_clr (old_alloc, limit, size, acontext, flags, seg, align_const, gen_number); } @@ -18585,6 +18562,60 @@ void gc_heap::bgc_untrack_uoh_alloc() dprintf (3, ("h%d: dec lc: %d", heap_number, (int32_t)uoh_alloc_thread_count)); } } + +// We need to throttle the UOH allocations during BGC since we can't +// collect UOH when BGC is in progress (when BGC sweeps UOH allocations on UOH are disallowed) +// We allow the UOH heap size to double during a BGC. And for every +// 10% increase we will have the UOH allocating thread sleep for one more +// ms. So we are already 30% over the original heap size the thread will +// sleep for 3ms. +int bgc_allocate_spin(size_t min_gc_size, size_t bgc_begin_size, size_t bgc_size_increased, size_t end_size) +{ + if ((bgc_begin_size + bgc_size_increased) < (min_gc_size * 10)) + { + // just do it, no spinning + return 0; + } + + if ((bgc_begin_size >= (2 * end_size)) || (bgc_size_increased >= bgc_begin_size)) + { + if (bgc_begin_size >= (2 * end_size)) + { + dprintf (3, ("alloc-ed too much before bgc started")); + } + else + { + dprintf (3, ("alloc-ed too much after bgc started")); + } + + // -1 means wait for bgc + return -1; + } + else + { + return (int)(((float)bgc_size_increased / (float)bgc_begin_size) * 10); + } +} + +int gc_heap::bgc_loh_allocate_spin() +{ + size_t min_gc_size = dd_min_size (dynamic_data_of (loh_generation)); + size_t bgc_begin_size = bgc_begin_loh_size; + size_t bgc_size_increased = bgc_loh_size_increased; + size_t end_size = end_loh_size; + + return bgc_allocate_spin(min_gc_size, bgc_begin_size, bgc_size_increased, end_size); +} + +int gc_heap::bgc_poh_allocate_spin() +{ + size_t min_gc_size = dd_min_size (dynamic_data_of (poh_generation)); + size_t bgc_begin_size = bgc_begin_poh_size; + size_t bgc_size_increased = bgc_poh_size_increased; + size_t end_size = end_poh_size; + + return bgc_allocate_spin(min_gc_size, bgc_begin_size, bgc_size_increased, end_size); +} #endif //BACKGROUND_GC size_t gc_heap::get_uoh_seg_size (size_t size) @@ -18697,6 +18728,19 @@ BOOL gc_heap::uoh_try_fit (int gen_number, acontext, flags, align_const, commit_failed_p, oom_r); +#ifdef BACKGROUND_GC + if (can_allocate && gc_heap::background_running_p()) + { + if (gen_number == poh_generation) + { + bgc_poh_size_increased += size; + } + else + { + bgc_loh_size_increased += size; + } + } +#endif //BACKGROUND_GC } return can_allocate; @@ -18809,83 +18853,26 @@ bool gc_heap::should_retry_other_heap (int gen_number, size_t size) } #ifdef BACKGROUND_GC -uoh_allocation_action gc_heap::get_bgc_allocate_action (int gen_number) -{ - int uoh_idx = gen_number - uoh_start_generation; - - // We always allocate normally if the total size is small enough. - if (bgc_uoh_current_size[uoh_idx] < (dd_min_size (dynamic_data_of (gen_number)) * 10)) - { - return uoh_alloc_normal; - } - -#ifndef USE_REGIONS - // This is legacy behavior for segments - segments' sizes are usually very stable. But for regions we could - // have released a bunch of regions into the free pool during the last gen2 GC so checking the last UOH size - // doesn't make sense. - if (bgc_begin_uoh_size[uoh_idx] >= (2 * end_uoh_size[uoh_idx])) - { - dprintf (3, ("h%d alloc-ed too much before bgc started, last end %Id, this start %Id, wait", - heap_number, end_uoh_size[uoh_idx], bgc_begin_uoh_size[uoh_idx])); - return uoh_alloc_wait; - } -#endif //USE_REGIONS - - size_t size_increased = bgc_uoh_current_size[uoh_idx] - bgc_begin_uoh_size[uoh_idx]; - float size_increased_ratio = (float)size_increased / (float)bgc_begin_uoh_size[uoh_idx]; - - if (size_increased_ratio < bgc_uoh_inc_ratio_alloc_normal) - { - return uoh_alloc_normal; - } - else if (size_increased_ratio > bgc_uoh_inc_ratio_alloc_wait) - { - return uoh_alloc_wait; - } - else - { - return uoh_alloc_yield; - } -} - void gc_heap::bgc_record_uoh_allocation(int gen_number, size_t size) { assert((gen_number >= uoh_start_generation) && (gen_number < total_generation_count)); - int uoh_idx = gen_number - uoh_start_generation; - if (gc_heap::background_running_p()) { + background_uoh_alloc_count++; + if (current_c_gc_state == c_gc_state_planning) { - uoh_a_bgc_planning[uoh_idx] += size; + uoh_a_bgc_planning[gen_number - uoh_start_generation] += size; } else { - uoh_a_bgc_marking[uoh_idx] += size; + uoh_a_bgc_marking[gen_number - uoh_start_generation] += size; } } else { - uoh_a_no_bgc[uoh_idx] += size; - } -} - -void gc_heap::bgc_record_uoh_end_seg_allocation (int gen_number, size_t size) -{ - if ((gen_number >= uoh_start_generation) && gc_heap::background_running_p()) - { - int uoh_idx = gen_number - uoh_start_generation; - bgc_uoh_current_size[uoh_idx] += size; - -#ifdef SIMPLE_DPRINTF - dynamic_data* dd_uoh = dynamic_data_of (gen_number); - size_t gen_size = generation_size (gen_number); - dprintf (3, ("h%d g%d size is now %Id (inc-ed %Id), size is %Id (gen size is %Id), budget %.3fmb, new alloc %.3fmb", - heap_number, gen_number, bgc_uoh_current_size[uoh_idx], - (bgc_uoh_current_size[uoh_idx] - bgc_begin_uoh_size[uoh_idx]), size, gen_size, - mb (dd_desired_allocation (dd_uoh)), (dd_new_allocation (dd_uoh) / 1000.0 / 1000.0))); -#endif //SIMPLE_DPRINTF + uoh_a_no_bgc[gen_number - uoh_start_generation] += size; } } #endif //BACKGROUND_GC @@ -18916,33 +18903,31 @@ allocation_state gc_heap::allocate_uoh (int gen_number, if (gc_heap::background_running_p()) { - uoh_allocation_action action = get_bgc_allocate_action (gen_number); - - if (action == uoh_alloc_yield) + //if ((background_uoh_alloc_count % bgc_alloc_spin_count_uoh) == 0) { - add_saved_spinlock_info (true, me_release, mt_alloc_large, msl_status); - leave_spin_lock (&more_space_lock_uoh); - bool cooperative_mode = enable_preemptive(); - GCToOSInterface::YieldThread (0); - disable_preemptive (cooperative_mode); + int spin_for_allocation = (gen_number == loh_generation) ? + bgc_loh_allocate_spin() : + bgc_poh_allocate_spin(); - msl_status = enter_spin_lock_msl (&more_space_lock_uoh); - if (msl_status == msl_retry_different_heap) return a_state_retry_allocate; + if (spin_for_allocation > 0) + { + add_saved_spinlock_info (true, me_release, mt_alloc_large, msl_status); + leave_spin_lock (&more_space_lock_uoh); + bool cooperative_mode = enable_preemptive(); + GCToOSInterface::YieldThread (spin_for_allocation); + disable_preemptive (cooperative_mode); - add_saved_spinlock_info (true, me_acquire, mt_alloc_large, msl_status); - dprintf (SPINLOCK_LOG, ("[%d]spin Emsl uoh", heap_number)); - } - else if (action == uoh_alloc_wait) - { - dynamic_data* dd_uoh = dynamic_data_of (loh_generation); - dprintf (3, ("h%d WAIT loh begin %.3fmb, current size recorded is %.3fmb(begin+%.3fmb), budget %.3fmb, new alloc %.3fmb (alloc-ed %.3fmb)", - heap_number, mb (bgc_begin_uoh_size[0]), mb (bgc_uoh_current_size[0]), - mb (bgc_uoh_current_size[0] - bgc_begin_uoh_size[0]), - mb (dd_desired_allocation (dd_uoh)), (dd_new_allocation (dd_uoh) / 1000.0 / 1000.0), - mb (dd_desired_allocation (dd_uoh) - dd_new_allocation (dd_uoh)))); + msl_status = enter_spin_lock_msl (&more_space_lock_uoh); + if (msl_status == msl_retry_different_heap) return a_state_retry_allocate; - msl_status = wait_for_background (awr_uoh_alloc_during_bgc, true); - check_msl_status ("uoh a_state_acquire_seg", size); + add_saved_spinlock_info (true, me_acquire, mt_alloc_large, msl_status); + dprintf (SPINLOCK_LOG, ("[%d]spin Emsl uoh", heap_number)); + } + else if (spin_for_allocation < 0) + { + msl_status = wait_for_background (awr_uoh_alloc_during_bgc, true); + check_msl_status ("uoh a_state_acquire_seg", size); + } } } #endif //BACKGROUND_GC @@ -38807,6 +38792,7 @@ void gc_heap::background_mark_phase () gen0_must_clear_bricks--; background_soh_alloc_count = 0; + background_uoh_alloc_count = 0; bgc_overflow_count = 0; bpromoted_bytes (heap_number) = 0; @@ -38838,6 +38824,8 @@ void gc_heap::background_mark_phase () slow = MAX_PTR; #endif //MULTIPLE_HEAPS + generation* gen = generation_of (max_generation); + dprintf(3,("BGC: stack marking")); sc.concurrent = TRUE; @@ -38848,19 +38836,16 @@ void gc_heap::background_mark_phase () dprintf(3,("BGC: finalization marking")); finalize_queue->GcScanRoots(background_promote_callback, heap_number, 0); + size_t total_soh_size = generation_sizes (generation_of (max_generation)); + size_t total_loh_size = generation_size (loh_generation); + size_t total_poh_size = generation_size (poh_generation); + bgc_begin_loh_size = total_loh_size; + bgc_begin_poh_size = total_poh_size; + bgc_loh_size_increased = 0; + bgc_poh_size_increased = 0; background_soh_size_end_mark = 0; - for (int uoh_gen_idx = uoh_start_generation; uoh_gen_idx < total_generation_count; uoh_gen_idx++) - { - size_t uoh_size = generation_size (uoh_gen_idx); - int uoh_idx = uoh_gen_idx - uoh_start_generation; - bgc_begin_uoh_size[uoh_idx] = uoh_size; - bgc_uoh_current_size[uoh_idx] = uoh_size; - } - - dprintf (GTC_LOG, ("BM: h%d: soh: %zd, loh: %zd, poh: %zd", - heap_number, generation_sizes (generation_of (max_generation)), - bgc_uoh_current_size[loh_generation - uoh_start_generation], bgc_uoh_current_size[poh_generation - uoh_start_generation])); + dprintf (GTC_LOG, ("BM: h%d: loh: %zd, soh: %zd, poh: %zd", heap_number, total_loh_size, total_soh_size, total_poh_size)); //concurrent_print_time_delta ("copying stack roots"); concurrent_print_time_delta ("CS"); @@ -39173,10 +39158,11 @@ void gc_heap::background_mark_phase () //marking sc.concurrent = FALSE; - dprintf (GTC_LOG, ("FM: h%d: soh: %zd, loh: %zd, poh: %zd", heap_number, - generation_sizes (generation_of (max_generation)), - bgc_uoh_current_size[loh_generation - uoh_start_generation], - bgc_uoh_current_size[poh_generation - uoh_start_generation])); + total_soh_size = generation_sizes (generation_of (max_generation)); + total_loh_size = generation_size (loh_generation); + total_poh_size = generation_size (poh_generation); + + dprintf (GTC_LOG, ("FM: h%d: loh: %zd, soh: %zd, poh: %zd", heap_number, total_loh_size, total_soh_size, total_poh_size)); #if defined(FEATURE_BASICFREEZE) && !defined(USE_REGIONS) if (ro_segments_in_range) @@ -44900,7 +44886,11 @@ void gc_heap::compute_new_dynamic_data (int gen_number) gen_data->free_obj_space_after = generation_free_obj_space (gen); gen_data->npinned_surv = out; #ifdef BACKGROUND_GC - end_uoh_size[i - uoh_start_generation] = total_gen_size; + if (i == loh_generation) + end_loh_size = total_gen_size; + + if (i == poh_generation) + end_poh_size = total_gen_size; #endif //BACKGROUND_GC dd_promoted_size (dd) = out; } diff --git a/src/coreclr/gc/gcconfig.h b/src/coreclr/gc/gcconfig.h index 9d5af77fa74fb0..0378323b6e96c5 100644 --- a/src/coreclr/gc/gcconfig.h +++ b/src/coreclr/gc/gcconfig.h @@ -128,7 +128,6 @@ class GCConfigStringHolder INT_CONFIG (BGCFLEnableTBH, "BGCFLEnableTBH", NULL, 0, "Enables TBH") \ INT_CONFIG (BGCFLEnableFF, "BGCFLEnableFF", NULL, 0, "Enables FF") \ INT_CONFIG (BGCG2RatioStep, "BGCG2RatioStep", NULL, 5, "Ratio correction factor for ML loop") \ - INT_CONFIG (UOHWaitBGCSizeIncPercent, "UOHWaitBGCSizeIncPercent", "System.GC.UOHWaitBGCSizeIncPercent",-1, "UOH allocation during a BGC waits till end of BGC after UOH increases by this percent") \ INT_CONFIG (GCHeapHardLimitSOH, "GCHeapHardLimitSOH", "System.GC.HeapHardLimitSOH", 0, "Specifies a hard limit for the GC heap SOH") \ INT_CONFIG (GCHeapHardLimitLOH, "GCHeapHardLimitLOH", "System.GC.HeapHardLimitLOH", 0, "Specifies a hard limit for the GC heap LOH") \ INT_CONFIG (GCHeapHardLimitPOH, "GCHeapHardLimitPOH", "System.GC.HeapHardLimitPOH", 0, "Specifies a hard limit for the GC heap POH") \ diff --git a/src/coreclr/gc/gcpriv.h b/src/coreclr/gc/gcpriv.h index 5c8988b7ac8a92..334601327f0a63 100644 --- a/src/coreclr/gc/gcpriv.h +++ b/src/coreclr/gc/gcpriv.h @@ -561,15 +561,6 @@ enum allocation_state a_state_max }; -#ifdef BACKGROUND_GC -enum uoh_allocation_action -{ - uoh_alloc_normal, - uoh_alloc_yield, - uoh_alloc_wait -}; -#endif //BACKGROUND_GC - enum enter_msl_status { msl_entered, @@ -2317,16 +2308,18 @@ class gc_heap int lock_index, BOOL check_used_p, heap_segment* seg); +#endif //BACKGROUND_GC +#ifdef BACKGROUND_GC PER_HEAP_METHOD void bgc_track_uoh_alloc(); PER_HEAP_METHOD void bgc_untrack_uoh_alloc(); - PER_HEAP_METHOD uoh_allocation_action get_bgc_allocate_action (int gen_number); + PER_HEAP_METHOD BOOL bgc_loh_allocate_spin(); - PER_HEAP_METHOD void bgc_record_uoh_allocation(int gen_number, size_t size); + PER_HEAP_METHOD BOOL bgc_poh_allocate_spin(); - PER_HEAP_METHOD void bgc_record_uoh_end_seg_allocation (int gen_number, size_t size); + PER_HEAP_METHOD void bgc_record_uoh_allocation(int gen_number, size_t size); #endif //BACKGROUND_GC PER_HEAP_METHOD void add_saved_spinlock_info ( @@ -3558,6 +3551,11 @@ class gc_heap #ifdef BACKGROUND_GC PER_HEAP_FIELD_SINGLE_GC VOLATILE(bgc_state) current_bgc_state; + PER_HEAP_FIELD_SINGLE_GC size_t bgc_begin_loh_size; + PER_HEAP_FIELD_SINGLE_GC size_t bgc_begin_poh_size; + PER_HEAP_FIELD_SINGLE_GC size_t end_loh_size; + PER_HEAP_FIELD_SINGLE_GC size_t end_poh_size; + // We can't process the ephemeral range concurrently so we // wait till final mark to process it. PER_HEAP_FIELD_SINGLE_GC BOOL processed_eph_overflow_p; @@ -3569,9 +3567,6 @@ class gc_heap PER_HEAP_FIELD_SINGLE_GC uint8_t* next_sweep_obj; PER_HEAP_FIELD_SINGLE_GC uint8_t* current_sweep_pos; - PER_HEAP_FIELD_SINGLE_GC size_t bgc_begin_uoh_size[uoh_generation_count]; - PER_HEAP_FIELD_SINGLE_GC size_t end_uoh_size[uoh_generation_count]; - PER_HEAP_FIELD_SINGLE_GC size_t uoh_a_no_bgc[uoh_generation_count]; PER_HEAP_FIELD_SINGLE_GC size_t uoh_a_bgc_marking[uoh_generation_count]; PER_HEAP_FIELD_SINGLE_GC size_t uoh_a_bgc_planning[uoh_generation_count]; @@ -3782,10 +3777,14 @@ class gc_heap #endif //MULTIPLE_HEAPS #ifdef BACKGROUND_GC - // Updated by the allocator and reinit-ed in each BGC - PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t bgc_uoh_current_size[uoh_generation_count]; + // This includes what we allocate at the end of segment - allocating + // in free list doesn't increase the heap size. + PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t bgc_loh_size_increased; + PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t bgc_poh_size_increased; - PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t background_soh_alloc_count; + // Updated by the allocator and reinit-ed in each BGC + PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t background_soh_alloc_count; + PER_HEAP_FIELD_SINGLE_GC_ALLOC size_t background_uoh_alloc_count; PER_HEAP_FIELD_SINGLE_GC_ALLOC VOLATILE(int32_t) uoh_alloc_thread_count; #endif //BACKGROUND_GC @@ -5367,6 +5366,11 @@ class gc_heap #ifdef BACKGROUND_GC PER_HEAP_ISOLATED_FIELD_INIT_ONLY bool gc_can_use_concurrent; + +#ifdef BGC_SERVO_TUNING + // This tells us why we chose to do a bgc in tuning. + PER_HEAP_ISOLATED_FIELD_DIAG_ONLY int saved_bgc_tuning_reason; +#endif //BGC_SERVO_TUNING #endif //BACKGROUND_GC PER_HEAP_ISOLATED_FIELD_INIT_ONLY uint8_t* bookkeeping_start; @@ -5479,11 +5483,6 @@ class gc_heap // This can only go from false to true concurrently so if it is true, // it means the bgc info is ready. PER_HEAP_ISOLATED_FIELD_DIAG_ONLY VOLATILE(bool) is_last_recorded_bgc; - -#ifdef BGC_SERVO_TUNING - // This tells us why we chose to do a bgc in tuning. - PER_HEAP_ISOLATED_FIELD_DIAG_ONLY int saved_bgc_tuning_reason; -#endif //BGC_SERVO_TUNING #endif //BACKGROUND_GC #ifdef DYNAMIC_HEAP_COUNT @@ -6234,13 +6233,10 @@ class heap_segment int plan_gen_num; int old_card_survived; int pinned_survived; - // at the end of each GC, we increase the age of each region in the relevant region - // free list(s) by 1. So we can observe if a region stays in the free list over many - // GCs. We stop at 99. It's initialized to 0 when a region is added to the region's free list. - // - // "Relevant" means we only age basic regions during ephemeral GCs and age all regions - // during gen2 GCs. The only exception is we do age all regions during an ephemeral GC - // done at the beginning of a BGC. + // at the end of each GC, we increase each region in the region free list + // by 1. So we can observe if a region stays in the free list over many + // GCs. We stop at 99. It's initialized to 0 when a region is added to + // the region's free list. #define MAX_AGE_IN_FREE 99 #define AGE_IN_FREE_TO_DECOMMIT_BASIC 20 #define AGE_IN_FREE_TO_DECOMMIT_LARGE 5 diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/HandleCallAction.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/HandleCallAction.cs index 6f67e769dd3a1d..9c5927a7532c03 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/HandleCallAction.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/HandleCallAction.cs @@ -90,24 +90,15 @@ private partial bool TryHandleIntrinsic( } } } + else if (typeInstantiated.Instantiation.IsConstrainedToBeReferenceTypes()) + { + // This will always succeed thanks to the runtime type loader + } else { - if (typeInstantiated.Instantiation.IsConstrainedToBeReferenceTypes()) - { - // This will always succeed thanks to the runtime type loader - } - else - { - triggersWarning = true; - } - - // This should technically be in the IsConstrainedToBeReferenceTypes branch above - // but we have trim warning suppressions in dotnet/runtime and elsewhere that rely on the implementation - // detail that reference type instantiations will work, even if the generic is not - // constrained to be a reference type. - // MarkType will try to come up with a reference type type loader template. - _reflectionMarker.MarkType(_diagnosticContext.Origin, typeInstantiated, "MakeGenericType"); + triggersWarning = true; } + } else if (value == NullValue.Instance) { diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/FilePatternMatch.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/FilePatternMatch.cs index 87d3954ef41292..e19649700e322c 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/FilePatternMatch.cs +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/FilePatternMatch.cs @@ -28,17 +28,16 @@ public struct FilePatternMatch : IEquatable /// If the matcher searched for "src/Project/**/*.cs" and the pattern matcher found "src/Project/Interfaces/IFile.cs", /// then = "Interfaces/IFile.cs" and = "src/Project/Interfaces/IFile.cs". /// - public string Stem { get; } + public string? Stem { get; } /// /// Initializes new instance of /// /// The path to the file matched, relative to the beginning of the matching search pattern. /// The subpath to the file matched, relative to the first wildcard in the matching search pattern. - public FilePatternMatch(string path, string stem) + public FilePatternMatch(string path, string? stem) { ArgumentNullException.ThrowIfNull(path); - ArgumentNullException.ThrowIfNull(stem); Path = path; Stem = stem; diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Internal/PatternTestResult.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Internal/PatternTestResult.cs index 4005fdc13ffa81..d1067b28574e41 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Internal/PatternTestResult.cs +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Internal/PatternTestResult.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Diagnostics.CodeAnalysis; - namespace Microsoft.Extensions.FileSystemGlobbing.Internal { /// @@ -13,7 +11,6 @@ public struct PatternTestResult { public static readonly PatternTestResult Failed = new(isSuccessful: false, stem: null); - [MemberNotNullWhen(returnValue: true, nameof(Stem))] public bool IsSuccessful { get; } public string? Stem { get; } diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/FilePatternMatchTests.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/FilePatternMatchTests.cs index f352c27013b2fe..c16e991e3b111c 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/FilePatternMatchTests.cs +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/FilePatternMatchTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using Xunit; namespace Microsoft.Extensions.FileSystemGlobbing.Tests @@ -25,17 +24,5 @@ public void TestGetHashCode() FilePatternMatch matchCase2 = new FilePatternMatch("sub/sub2/bar/baz/three.txt", "Sub2/bar/baz/thrEE.txt"); Assert.Equal(matchCase1.GetHashCode(), matchCase2.GetHashCode()); } - - [Fact] - public void TestPathArgumentNullExceptions() - { - Assert.Throws(() => new FilePatternMatch(null, "sub2/bar/baz/three.txt")); - } - - [Fact] - public void TestStemArgumentNullExceptions() - { - Assert.Throws(() => new FilePatternMatch("sub2/bar/baz/three.txt", null)); - } } } diff --git a/src/libraries/sendtohelix-mobile.targets b/src/libraries/sendtohelix-mobile.targets index 3d128ce22a3aa0..1475f03ad4df4a 100644 --- a/src/libraries/sendtohelix-mobile.targets +++ b/src/libraries/sendtohelix-mobile.targets @@ -90,6 +90,7 @@ Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))"> $(AppleTestTarget) $(_workItemTimeout) + $(_workItemTimeout) $(_XHarnessAppleCustomCommand) @@ -99,6 +100,7 @@ Exclude="$([System.IO.Directory]::GetFiles('$(TestArchiveRoot)', 'xharness-app-payload*', System.IO.SearchOption.AllDirectories))"> $(AppleTestTarget) $(_workItemTimeout) + $(_workItemTimeout) $(_XHarnessAppleCustomCommand) diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index 28fc40a768f954..b9daf4afbbe59e 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -1010,6 +1010,7 @@ $(AppleTestTarget) $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) + $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) $(SigningCommand) dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) @@ -1017,6 +1018,7 @@ --set-env=TestExclusionListPath=TestExclusionList.txt $(AppleTestTarget) $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) + $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) diff --git a/src/tests/nativeaot/SmokeTests/DynamicGenerics/Github118072.cs b/src/tests/nativeaot/SmokeTests/DynamicGenerics/Github118072.cs index e490ffbfd02024..3e5f12b666c062 100644 --- a/src/tests/nativeaot/SmokeTests/DynamicGenerics/Github118072.cs +++ b/src/tests/nativeaot/SmokeTests/DynamicGenerics/Github118072.cs @@ -21,22 +21,26 @@ class GitHub118072 [TestMethod] public static void RunTest() { + Type current = typeof(object); + GetMI1().MakeGenericMethod(typeof(object)).Invoke(null, []); - FlushCache(); + current = FillCache(current); GetMI2().MakeGenericMethod(typeof(object)).Invoke(null, []); - FlushCache(); + current = FillCache(current); GetMI3().MakeGenericMethod(typeof(object)).Invoke(null, []); - FlushCache(); + current = FillCache(current); GetMI4().MakeGenericMethod(typeof(object)).Invoke(null, []); - static void FlushCache() + static Type FillCache(Type current) { - // Make sure the cached type loader contexts are flushed - for (int j = 0; j < 10; j++) + for (int i = 0; i < 400; i++) { - GC.Collect(); - GC.WaitForPendingFinalizers(); + Type next = typeof(MyClass<>).MakeGenericType(current); + Activator.CreateInstance(next); + current = next; } + + return current; } } diff --git a/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs b/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs index 10a21b4d59e236..a0ee00a5e7ac21 100644 --- a/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs +++ b/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs @@ -76,8 +76,6 @@ private static int Main() Test105034Regression.Run(); TestMethodsNeededFromNativeLayout.Run(); TestFieldAndParamMetadata.Run(); - TestActivationWithoutConstructor.Run(); - TestNestedMakeGeneric.Run(); // // Mostly functionality tests @@ -861,60 +859,6 @@ public static void Run() } } - class TestActivationWithoutConstructor - { - public static void Run() - { - { - object o = Activator.CreateInstance(typeof(StructForCreateInstanceDirect<>).MakeGenericType(GetTheType())); - if (!o.ToString().Contains(nameof(StructForCreateInstanceDirect<>))) - throw new Exception(); - } - - { - object o = CreateInstance(typeof(StructForCreateInstanceIndirect<>).MakeGenericType(GetTheType())); - if (!o.ToString().Contains(nameof(StructForCreateInstanceIndirect<>))) - throw new Exception(); - - static object CreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type t) - => Activator.CreateInstance(t); - } - - { - object o = RuntimeHelpers.GetUninitializedObject(typeof(StructForGetUninitializedObject<>).MakeGenericType(GetTheType())); - if (!o.ToString().Contains(nameof(StructForGetUninitializedObject<>))) - throw new Exception(); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - static Type GetTheType() => typeof(Atom); - } - - class Atom; - - struct StructForCreateInstanceDirect where T : class; - struct StructForCreateInstanceIndirect where T : class; - struct StructForGetUninitializedObject where T : class; - } - - class TestNestedMakeGeneric - { - class Outie where T : class; - class Innie where T : class; - class Atom; - - public static void Run() - { - Type inner = typeof(Innie<>).MakeGenericType(GetAtom()); - Type outer = typeof(Outie<>).MakeGenericType(inner); - - Console.WriteLine(Activator.CreateInstance(outer)); - - [MethodImpl(MethodImplOptions.NoInlining)] - static Type GetAtom() => typeof(Atom); - } - } - class TestCreateDelegate { internal class Greeter From 97a772a67401b37ed50145ab3fb605597abbb400 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 17:31:22 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/dotnet build 278938 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25411.106 -> 5.0.0-2.25412.102) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25411.106 -> 10.0.0-preview.25412.102) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25411.106 -> 10.0.100-rc.1.25412.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25411.106 -> 10.0.0-beta.25412.102) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25411.106 -> 0.11.5-alpha.25412.102) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25411.106 -> 2.9.3-beta.25412.102) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25411.106 -> 10.0.0-rc.1.25412.102) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.606 -> 7.0.0-preview.1.602) System.CommandLine (Version 2.0.0-rc.1.25411.106 -> 2.0.0-rc.1.25412.102) Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, Microsoft.DotNet.XHarness.CLI (Version 10.0.0-prerelease.25405.1 -> 10.0.0-prerelease.25405.1) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 475424bb847af5..fe2349bd23d313 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,45 +41,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25167.1 19.1.0-alpha.1.25167.1 - 5.0.0-2.25411.106 - 5.0.0-2.25411.106 - 5.0.0-2.25411.106 - 10.0.0-preview.25411.106 - 10.0.100-rc.1.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 0.11.5-alpha.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 10.0.0-beta.25411.106 - 2.9.3-beta.25411.106 - 2.9.3-beta.25411.106 - 10.0.0-beta.25411.106 - 5.0.0-2.25411.106 - 10.0.0-rc.1.25411.106 - 10.0.100-rc.1.25411.106 - 10.0.0-rc.1.25411.106 - 10.0.0-rc.1.25411.106 - 7.0.0-preview.1.606 - 7.0.0-preview.1.606 - 7.0.0-preview.1.606 - 7.0.0-preview.1.606 - 10.0.0-rc.1.25411.106 - 2.0.0-rc.1.25411.106 - 10.0.0-rc.1.25411.106 - 10.0.0-rc.1.25411.106 - 10.0.0-rc.1.25411.106 + 5.0.0-2.25412.102 + 5.0.0-2.25412.102 + 5.0.0-2.25412.102 + 10.0.0-preview.25412.102 + 10.0.100-rc.1.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 0.11.5-alpha.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 10.0.0-beta.25412.102 + 2.9.3-beta.25412.102 + 2.9.3-beta.25412.102 + 10.0.0-beta.25412.102 + 5.0.0-2.25412.102 + 10.0.0-rc.1.25412.102 + 10.0.100-rc.1.25412.102 + 10.0.0-rc.1.25412.102 + 10.0.0-rc.1.25412.102 + 7.0.0-preview.1.602 + 7.0.0-preview.1.602 + 7.0.0-preview.1.602 + 7.0.0-preview.1.602 + 10.0.0-rc.1.25412.102 + 2.0.0-rc.1.25412.102 + 10.0.0-rc.1.25412.102 + 10.0.0-rc.1.25412.102 + 10.0.0-rc.1.25412.102 10.0.0-beta.25310.1 10.0.0-beta.25310.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64f13a93e83a27..0c2ee720df514e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 4c17e23fcb7575baa9de575e5a96258096cbaea1 - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d - + https://github.com/dotnet/dotnet - c583c4456a81cbdf34656b5bf1a01abfc65590da + ca3dd2c2d95a49bfe07a7457101ba67513cf142d https://github.com/dotnet/node diff --git a/global.json b/global.json index e7d50618f54bea..2f65311a5a8779 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25411.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25411.106", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25411.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25412.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25412.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25412.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25411.106" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25412.102" } }