From 9aa9b729ccd5f58e59337d60a821583e7dbc7a72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 May 2026 02:08:22 +0000 Subject: [PATCH 1/3] Update dependencies from build 313652 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.7.0-1.26257.113 -> 5.7.0-1.26258.107) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.5.26257.113 -> 11.0.100-preview.5.26258.107) 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 11.0.0-beta.26257.113 -> 11.0.0-beta.26258.107) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26257.113 -> 0.11.5-preview.26258.107) Microsoft.DotNet.XUnitAssert (Version 3.2.2-beta.26257.113 -> 3.2.2-beta.26258.107) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26257.113 -> 2.9.3-beta.26258.107) 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 11.0.0-preview.5.26257.113 -> 11.0.0-preview.5.26258.107) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.7.0-rc.25813 -> 7.7.0-rc.25907) System.CommandLine (Version 3.0.0-preview.5.26257.113 -> 3.0.0-preview.5.26258.107) [[ commit created by automation ]] --- 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 a35525c98f82e7..0295c0ac243907 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,45 +6,45 @@ This file should be imported by eng/Versions.props - 5.7.0-1.26257.113 - 5.7.0-1.26257.113 - 5.7.0-1.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 0.11.5-preview.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 3.2.2-beta.26257.113 - 2.9.3-beta.26257.113 - 11.0.0-beta.26257.113 - 5.7.0-1.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 11.0.0-preview.5.26257.113 - 3.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 + 5.7.0-1.26258.107 + 5.7.0-1.26258.107 + 5.7.0-1.26258.107 + 11.0.100-preview.5.26258.107 + 11.0.100-preview.5.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 0.11.5-preview.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 11.0.0-beta.26258.107 + 3.2.2-beta.26258.107 + 2.9.3-beta.26258.107 + 11.0.0-beta.26258.107 + 5.7.0-1.26258.107 + 11.0.0-preview.5.26258.107 + 11.0.100-preview.5.26258.107 + 11.0.0-preview.5.26258.107 + 11.0.0-preview.5.26258.107 + 7.7.0-rc.25907 + 7.7.0-rc.25907 + 7.7.0-rc.25907 + 7.7.0-rc.25907 + 11.0.0-preview.5.26258.107 + 3.0.0-preview.5.26258.107 + 11.0.0-preview.5.26258.107 + 11.0.0-preview.5.26258.107 + 11.0.0-preview.5.26258.107 11.0.0-alpha.1.26181.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a357698eefc928..c29cb42fa9d8ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 0668c80ec27851f3c7f1b3e4536110a1d39af587 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,29 +323,29 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -357,21 +357,21 @@ - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 https://github.com/dotnet/node diff --git a/global.json b/global.json index 01f9d078a1fb65..9080ceeca06feb 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26257.113", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26257.113", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26257.113", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26258.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26258.107", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26258.107", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26257.113" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26258.107" } } From 4066b745cc2a6e4c22ec571b6ebdf926bfae341f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 May 2026 02:06:29 +0000 Subject: [PATCH 2/3] Update dependencies from build 313660 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.7.0-1.26258.107 -> 5.7.0-1.26258.110) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.5.26258.107 -> 11.0.100-preview.5.26258.110) 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 11.0.0-beta.26258.107 -> 11.0.0-beta.26258.110) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26258.107 -> 0.11.5-preview.26258.110) Microsoft.DotNet.XUnitAssert (Version 3.2.2-beta.26258.107 -> 3.2.2-beta.26258.110) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26258.107 -> 2.9.3-beta.26258.110) 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 11.0.0-preview.5.26258.107 -> 11.0.0-preview.5.26258.110) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.7.0-rc.25907 -> 7.7.0-rc.25910) System.CommandLine (Version 3.0.0-preview.5.26258.107 -> 3.0.0-preview.5.26258.110) [[ commit created by automation ]] --- 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 0295c0ac243907..d363b8ea521cf4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,45 +6,45 @@ This file should be imported by eng/Versions.props - 5.7.0-1.26258.107 - 5.7.0-1.26258.107 - 5.7.0-1.26258.107 - 11.0.100-preview.5.26258.107 - 11.0.100-preview.5.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 0.11.5-preview.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 11.0.0-beta.26258.107 - 3.2.2-beta.26258.107 - 2.9.3-beta.26258.107 - 11.0.0-beta.26258.107 - 5.7.0-1.26258.107 - 11.0.0-preview.5.26258.107 - 11.0.100-preview.5.26258.107 - 11.0.0-preview.5.26258.107 - 11.0.0-preview.5.26258.107 - 7.7.0-rc.25907 - 7.7.0-rc.25907 - 7.7.0-rc.25907 - 7.7.0-rc.25907 - 11.0.0-preview.5.26258.107 - 3.0.0-preview.5.26258.107 - 11.0.0-preview.5.26258.107 - 11.0.0-preview.5.26258.107 - 11.0.0-preview.5.26258.107 + 5.7.0-1.26258.110 + 5.7.0-1.26258.110 + 5.7.0-1.26258.110 + 11.0.100-preview.5.26258.110 + 11.0.100-preview.5.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 0.11.5-preview.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 11.0.0-beta.26258.110 + 3.2.2-beta.26258.110 + 2.9.3-beta.26258.110 + 11.0.0-beta.26258.110 + 5.7.0-1.26258.110 + 11.0.0-preview.5.26258.110 + 11.0.100-preview.5.26258.110 + 11.0.0-preview.5.26258.110 + 11.0.0-preview.5.26258.110 + 7.7.0-rc.25910 + 7.7.0-rc.25910 + 7.7.0-rc.25910 + 7.7.0-rc.25910 + 11.0.0-preview.5.26258.110 + 3.0.0-preview.5.26258.110 + 11.0.0-preview.5.26258.110 + 11.0.0-preview.5.26258.110 + 11.0.0-preview.5.26258.110 11.0.0-alpha.1.26181.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c29cb42fa9d8ab..c6f5703cb8fa52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 0668c80ec27851f3c7f1b3e4536110a1d39af587 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,29 +323,29 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -357,21 +357,21 @@ - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 6a78ff2ff4f82b8929d58d6af5d97b16737ca756 + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 https://github.com/dotnet/node diff --git a/global.json b/global.json index 9080ceeca06feb..b80d549332c23c 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26258.107", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26258.107", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26258.107", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26258.110", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26258.110", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26258.110", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26258.107" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26258.110" } } From 340fa7aaf9646aa1494d9dbcbd8d6fc1fa072620 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 May 2026 02:04:18 +0000 Subject: [PATCH 3/3] Update dependencies from build 313814 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.7.0-1.26258.110 -> 5.7.0-1.26261.101) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.5.26258.110 -> 11.0.100-preview.5.26261.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 11.0.0-beta.26258.110 -> 11.0.0-beta.26261.101) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26258.110 -> 0.11.5-preview.26261.101) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26258.110 -> 2.9.3-beta.26261.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 11.0.0-preview.5.26258.110 -> 11.0.0-preview.5.26261.101) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.7.0-rc.25910 -> 7.7.0-rc.26201) System.CommandLine (Version 3.0.0-preview.5.26258.110 -> 3.0.0-preview.5.26261.101) [[ commit created by automation ]] --- eng/Version.Details.props | 76 ++++----- eng/Version.Details.xml | 154 +++++++++--------- eng/common/AGENTS.md | 5 + eng/common/core-templates/job/onelocbuild.yml | 3 + eng/common/cross/toolchain.cmake | 12 +- eng/common/dotnet-install.ps1 | 6 +- eng/common/dotnet-install.sh | 6 +- eng/common/tools.ps1 | 38 +++-- eng/common/tools.sh | 43 +++-- global.json | 8 +- 10 files changed, 193 insertions(+), 158 deletions(-) create mode 100644 eng/common/AGENTS.md diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d363b8ea521cf4..ffba69a35201c9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,45 +6,45 @@ This file should be imported by eng/Versions.props - 5.7.0-1.26258.110 - 5.7.0-1.26258.110 - 5.7.0-1.26258.110 - 11.0.100-preview.5.26258.110 - 11.0.100-preview.5.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 0.11.5-preview.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 - 11.0.0-beta.26258.110 + 5.7.0-1.26261.101 + 5.7.0-1.26261.101 + 5.7.0-1.26261.101 + 11.0.100-preview.5.26261.101 + 11.0.100-preview.5.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 0.11.5-preview.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 + 11.0.0-beta.26261.101 3.2.2-beta.26258.110 - 2.9.3-beta.26258.110 - 11.0.0-beta.26258.110 - 5.7.0-1.26258.110 - 11.0.0-preview.5.26258.110 - 11.0.100-preview.5.26258.110 - 11.0.0-preview.5.26258.110 - 11.0.0-preview.5.26258.110 - 7.7.0-rc.25910 - 7.7.0-rc.25910 - 7.7.0-rc.25910 - 7.7.0-rc.25910 - 11.0.0-preview.5.26258.110 - 3.0.0-preview.5.26258.110 - 11.0.0-preview.5.26258.110 - 11.0.0-preview.5.26258.110 - 11.0.0-preview.5.26258.110 + 2.9.3-beta.26261.101 + 11.0.0-beta.26261.101 + 5.7.0-1.26261.101 + 11.0.0-preview.5.26261.101 + 11.0.100-preview.5.26261.101 + 11.0.0-preview.5.26261.101 + 11.0.0-preview.5.26261.101 + 7.7.0-rc.26201 + 7.7.0-rc.26201 + 7.7.0-rc.26201 + 7.7.0-rc.26201 + 11.0.0-preview.5.26261.101 + 3.0.0-preview.5.26261.101 + 11.0.0-preview.5.26261.101 + 11.0.0-preview.5.26261.101 + 11.0.0-preview.5.26261.101 11.0.0-alpha.1.26181.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6f5703cb8fa52..0a62d35fb03a5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://github.com/dotnet/dotnet 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project db9a80a3e25e21268d55cf3385298dc03cfbed4d - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 0668c80ec27851f3c7f1b3e4536110a1d39af587 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,29 +323,29 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -357,21 +357,21 @@ - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 - + https://github.com/dotnet/dotnet - 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 + 547c640d5626b2976499cb3433abc741a63d67c5 https://github.com/dotnet/node diff --git a/eng/common/AGENTS.md b/eng/common/AGENTS.md new file mode 100644 index 00000000000000..a5ed8f72926d3d --- /dev/null +++ b/eng/common/AGENTS.md @@ -0,0 +1,5 @@ +# `eng/common` + +Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade). +Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository. +For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation). diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index eefed3b667a4fb..86ea9f63504243 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -22,6 +22,7 @@ parameters: GitHubOrg: dotnet MirrorRepo: '' MirrorBranch: main + xLocCustomPowerShellScript: '' condition: '' JobNameSuffix: '' is1ESPipeline: '' @@ -97,6 +98,8 @@ jobs: gitHubOrganization: ${{ parameters.GitHubOrg }} mirrorRepo: ${{ parameters.MirrorRepo }} mirrorBranch: ${{ parameters.MirrorBranch }} + ${{ if ne(parameters.xLocCustomPowerShellScript, '') }}: + xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }} condition: ${{ parameters.condition }} # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ff2dfdb4a5bf60..99d6dfe82dde38 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -225,13 +225,19 @@ elseif(ILLUMOS) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") - set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) - locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) + if ($ENV{CCC_CC} MATCHES ".*gcc.*") + set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") + locate_toolchain_exec(gcc CMAKE_C_COMPILER) + locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) + else() + set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + endif() # let CMake set up the correct search paths include(Platform/Haiku) diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 811f0f717f736a..50ae62737687c5 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -10,7 +10,11 @@ Param( . $PSScriptRoot\tools.ps1 -$dotnetRoot = Join-Path $RepoRoot '.dotnet' +if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) { + $dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR +} else { + $dotnetRoot = Join-Path $RepoRoot '.dotnet' +} $installdir = $dotnetRoot try { diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 61f302bb677560..1cb3f5abac2864 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -80,7 +80,11 @@ case $cpuname in ;; esac -dotnetRoot="${repo_root}.dotnet" +if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then + dotnetRoot="$DOTNET_GLOBAL_INSTALL_DIR" +else + dotnetRoot="${repo_root}.dotnet" +fi if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then dotnetRoot="$dotnetRoot/$architecture" fi diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 65adefc7f26871..0e281df8cae5cd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -168,6 +168,12 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } + # Keep repo builds isolated from machine-installed SDK state and workload advertising. + # This avoids preview SDK builds picking up mismatched workloads on CI images. + $env:DOTNET_MULTILEVEL_LOOKUP = '0' + $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' + $env:DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE = '1' + # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' @@ -230,6 +236,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' + Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -619,11 +628,7 @@ function GetSdkTaskProject([string]$taskName) { if (Test-Path $proj) { return $proj } - # TODO: Remove this fallback once all supported versions use the new layout. - $legacyProj = Join-Path $toolsetDir "SdkTasks\$taskName.proj" - if (Test-Path $legacyProj) { - return $legacyProj - } + throw "Unable to find $taskName.proj in toolset at: $toolsetDir" } @@ -699,23 +704,14 @@ function InitializeToolset() { $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) $packageToolsetDir = Join-Path $packageDir 'toolset' - $packageToolsDir = Join-Path $packageDir 'tools' - # TODO: Remove the tools/ check once all supported versions have the toolset folder. - if (!(Test-Path $packageToolsetDir) -and !(Test-Path $packageToolsDir)) { + if (!(Test-Path $packageToolsetDir)) { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK package does not contain a toolset or tools folder: $packageDir" ExitWithExitCode 3 } New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null - - # Copy toolset if present at the package root (new layout), otherwise fall back to tools - if (Test-Path $packageToolsetDir) { - Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force - } else { - # TODO: Remove this fallback once all supported versions have the toolset folder. - Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force - } + Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force if (Test-Path $buildProjPath) { $toolsetBuildProj = $buildProjPath @@ -842,6 +838,10 @@ function MSBuild-Core() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + if ($ci -and $buildTool.Tool -eq 'dotnet') { + $cmdArgs += ' /p:MSBuildEnableWorkloadResolver=false' + } + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable if ($env:MSBUILD_MT_ENABLED -eq "1") { $cmdArgs += ' -mt' @@ -952,6 +952,12 @@ Create-Directory $ToolsetDir Create-Directory $TempDir Create-Directory $LogDir +# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location +# under artifacts/log so they are captured as build artifacts in CI. +if (-not $env:MSBUILDDEBUGPATH) { + $env:MSBUILDDEBUGPATH = Join-Path $LogDir 'MsbuildDebugLogs' +} + Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 95c55ce9b4d914..5ff37cfb700010 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -126,6 +126,12 @@ function InitializeDotNetCli { export DOTNET_CLI_TELEMETRY_OPTOUT=1 fi + # Keep repo builds isolated from machine-installed SDK state and workload advertising. + # This avoids preview SDK builds picking up mismatched workloads on CI images. + export DOTNET_MULTILEVEL_LOOKUP=0 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=1 + # LTTNG is the logging infrastructure used by Core CLR. Need this variable set # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" @@ -171,6 +177,9 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" + Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" + Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -449,21 +458,13 @@ function InitializeToolset { local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" - # TODO: Remove the tools/ check once all supported versions have the toolset folder. - if [[ ! -d "$package_dir/toolset" && ! -d "$package_dir/tools" ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset or tools folder: $package_dir" + if [[ ! -d "$package_dir/toolset" ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset folder: $package_dir" ExitWithExitCode 3 fi mkdir -p "$toolset_tools_dir" - - # Copy toolset if present at the package root (new layout), otherwise fall back to tools - if [[ -d "$package_dir/toolset" ]]; then - cp -r "$package_dir/toolset/." "$toolset_tools_dir" - else - # TODO: Remove this fallback once all supported versions have the toolset folder. - cp -r "$package_dir/tools/." "$toolset_tools_dir" - fi + cp -r "$package_dir/toolset/." "$toolset_tools_dir" if [[ -a "$toolset_tools_dir/Build.proj" ]]; then toolset_build_proj="$toolset_tools_dir/Build.proj" @@ -590,7 +591,12 @@ function MSBuild-Core { warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" fi - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + local workload_resolver_switch="" + if [[ "$ci" == true && -n "${_InitializeBuildToolCommand:-}" ]]; then + workload_resolver_switch="/p:MSBuildEnableWorkloadResolver=false" + fi + + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch $workload_resolver_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { @@ -615,12 +621,7 @@ function GetSdkTaskProject { echo "$proj" return fi - # TODO: Remove this fallback once all supported versions use the new layout. - local legacyProj="$toolsetDir/SdkTasks/$taskName.proj" - if [[ -a "$legacyProj" ]]; then - echo "$legacyProj" - return - fi + Write-PipelineTelemetryError -category 'Build' "Unable to find $taskName.proj in toolset at: $toolsetDir" ExitWithExitCode 3 } @@ -660,6 +661,12 @@ mkdir -p "$toolset_dir" mkdir -p "$temp_dir" mkdir -p "$log_dir" +# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location +# under artifacts/log so they are captured as build artifacts in CI. +if [[ -z "${MSBUILDDEBUGPATH:-}" ]]; then + export MSBUILDDEBUGPATH="$log_dir/MsbuildDebugLogs" +fi + Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir" Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir" Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir" diff --git a/global.json b/global.json index b80d549332c23c..33f198ee54b2da 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26258.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26258.110", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26258.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26261.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26261.101", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26261.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26258.110" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26261.101" } }