From 243add6b835bd496ce879f567877072590ab5013 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Sep 2026 09:36:33 +0000 Subject: [PATCH 1/4] Backflow from https://github.com/dotnet/dotnet / e30f34e build 332074 Diff: https://github.com/dotnet/dotnet/compare/e30f34edad9fde012dbe3d67c95aa4db4c1d022b..e30f34edad9fde012dbe3d67c95aa4db4c1d022b From: https://github.com/dotnet/dotnet/commit/e30f34edad9fde012dbe3d67c95aa4db4c1d022b To: https://github.com/dotnet/dotnet/commit/e30f34edad9fde012dbe3d67c95aa4db4c1d022b [[ commit created by automation ]] --- eng/Versions.props | 2 +- ...soft.DotNet.ILCompiler.SingleEntry.targets | 26 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 064c1ed07c8889..fd39d847487526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ 4.5.4 2.0.0 - 17.10.0-beta1.24272.1 + 18.9.0-beta1.26405.2 3.1.28 0.2.740901 2.1.0 diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets index 866ade66d5fc3f..368ab3b7b50c3d 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets @@ -1,6 +1,16 @@ + + <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')))) @@ -9,16 +19,6 @@ <_originalTargetOS>$(RuntimeIdentifier.SubString(0, $(RuntimeIdentifier.LastIndexOf('-')))) <_originalTargetOS Condition="'$(_targetsNonPortableSdkRid)' == 'true'">$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')))) - - <_originalTargetOS Condition="'$(_targetsNonPortableSdkRid)' != 'true' and $(_originalTargetOS.Contains('.'))">$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')))) - <_originalTargetOS Condition="$(_originalTargetOS.Contains('.'))">$(_originalTargetOS.SubString(0, $(_originalTargetOS.IndexOf('.')))) <_originalTargetOS Condition="$(_originalTargetOS.StartsWith('win'))">win @@ -31,13 +31,11 @@ <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler <_hostPackageName Condition="'$(_targetsNonPortableSdkRid)' == 'true'">runtime.$(RuntimeIdentifier).Microsoft.DotNet.ILCompiler - <_targetPackageName>runtime.$(_originalTargetOS)-$(_targetArchitecture).Microsoft.DotNet.ILCompiler - <_targetPackageName Condition="'$(_targetsNonPortableSdkRid)' == 'true'">runtime.$(RuntimeIdentifier).Microsoft.DotNet.ILCompiler - <_targetRuntimePackName>Microsoft.NETCore.App.Runtime.NativeAOT.$(_originalTargetOS)-$(_targetArchitecture) - <_targetRuntimePackName Condition="'$(_targetsNonPortableSdkRid)' == 'true'">Microsoft.NETCore.App.Runtime.NativeAOT.$(RuntimeIdentifier) + <_hostPackageName Condition="'$(IlcHostRuntimeIdentifier)' != ''">runtime.$(IlcHostRuntimeIdentifier).Microsoft.DotNet.ILCompiler <_targetOS>$(_originalTargetOS) + <_targetOS Condition="'$(IlcTargetOS)' != ''">$(IlcTargetOS) <_linuxToken>linux- <_linuxLibcFlavor Condition="$(_targetOS.StartsWith($(_linuxToken)))">$(_targetOS.SubString($(_linuxToken.Length))) <_linuxLibcFlavor Condition="'$(_targetOS)' == 'android'">bionic From fba59f78c0635d6dd625699b0fed2bd732330e3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Sep 2026 09:36:43 +0000 Subject: [PATCH 2/4] Update dependencies from build 332074 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26457.102 -> 5.12.0-1.26464.119) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-rc.2.26457.102 -> 11.0.100-rc.2.26464.119) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.FileCatalog, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.JobMonitor, 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.26457.102 -> 11.0.0-beta.26464.119) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26457.102 -> 0.11.5-preview.26464.119) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26457.102 -> 2.9.3-beta.26464.119) Microsoft.NET.Runtime.Emscripten.Internal, 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-rc.2.26457.102 -> 11.0.0-rc.2.26464.119) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.45802 -> 7.12.0-rc.46519) System.CommandLine (Version 3.0.0-rc.2.26457.102 -> 3.0.0-rc.2.26464.119) runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools (Version 23.1.0-alpha.1.26451.1 -> 23.1.0-alpha.1.26457.1) runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport, runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport (Version 11.0.0-alpha.1.26418.1 -> 11.0.0-alpha.1.26459.1) [[ commit created by automation ]] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.props | 156 ++++----- eng/Version.Details.xml | 314 +++++++++--------- eng/common/core-templates/job/onelocbuild.yml | 48 +-- global.json | 12 +- 5 files changed, 259 insertions(+), 273 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8ac58da57b54cc..311d7c59e7bd46 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "11.0.0-beta.26457.102", + "version": "11.0.0-beta.26464.119", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 029154101cad3c..b9e10fcb0c89ed 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,91 +6,91 @@ This file should be imported by eng/Versions.props - 5.12.0-1.26457.102 - 5.12.0-1.26457.102 - 5.12.0-1.26457.102 - 5.12.0-1.26457.102 - 11.0.100-rc.2.26457.102 - 11.0.100-rc.2.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 0.11.5-preview.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 - 11.0.0-beta.26457.102 + 5.12.0-1.26464.119 + 5.12.0-1.26464.119 + 5.12.0-1.26464.119 + 5.12.0-1.26464.119 + 11.0.100-rc.2.26464.119 + 11.0.100-rc.2.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 0.11.5-preview.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 + 11.0.0-beta.26464.119 3.2.2-beta.26257.113 - 2.9.3-beta.26457.102 - 11.0.0-beta.26457.102 - 5.12.0-1.26457.102 - 11.0.0-rc.2.26457.102 - 11.0.0-rc.2.26457.102 - 11.0.100-rc.2.26457.102 - 11.0.0-rc.2.26457.102 - 11.0.0-rc.2.26457.102 - 7.12.0-rc.45802 - 7.12.0-rc.45802 - 7.12.0-rc.45802 - 7.12.0-rc.45802 - 11.0.0-rc.2.26457.102 - 3.0.0-rc.2.26457.102 - 11.0.0-rc.2.26457.102 - 11.0.0-rc.2.26457.102 - 11.0.0-rc.2.26457.102 + 2.9.3-beta.26464.119 + 11.0.0-beta.26464.119 + 5.12.0-1.26464.119 + 11.0.0-rc.2.26464.119 + 11.0.0-rc.2.26464.119 + 11.0.100-rc.2.26464.119 + 11.0.0-rc.2.26464.119 + 11.0.0-rc.2.26464.119 + 7.12.0-rc.46519 + 7.12.0-rc.46519 + 7.12.0-rc.46519 + 7.12.0-rc.46519 + 11.0.0-rc.2.26464.119 + 3.0.0-rc.2.26464.119 + 11.0.0-rc.2.26464.119 + 11.0.0-rc.2.26464.119 + 11.0.0-rc.2.26464.119 11.0.0-alpha.0.26180.1 11.0.0-alpha.1.26418.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 - 23.1.0-alpha.1.26451.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 + 23.1.0-alpha.1.26457.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 - 11.0.0-alpha.1.26418.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 + 11.0.0-alpha.1.26459.1 1.0.0-prerelease.26420.2 1.0.0-prerelease.26420.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd226f3bb5dcba..afee42134091cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,131 +1,131 @@ - + https://github.com/dotnet/icu c6131fd7b7cebcef44c17f381b2fe325cb331964 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b https://github.com/dotnet/dotnet 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b https://github.com/dotnet/runtime-assets @@ -179,117 +179,117 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/llvm-project - 45a35ae96fc10e866f78a91e3b9c2a6b5e0434fe + d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness b355c0507b19670c2d386677d7f99260f07cefa5 - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,33 +331,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -369,53 +369,53 @@ - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 - + https://github.com/dotnet/node - c11a7ade99acf4b7981546cde3ac1827b961afc1 + 4ae8e1c1d08d09e5025db77e22a832051c56fd28 https://github.com/dotnet/runtime-assets @@ -425,9 +425,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 5672e8351ebfce13c513322244b6f37420599866 + e30f34edad9fde012dbe3d67c95aa4db4c1d022b diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index ce077368e40d58..25af2787900719 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -5,20 +5,10 @@ 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) - - # Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat). - # When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT. - # All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not - # exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter. + # Project-scoped WIF service connection for Ceapex feed authentication. CeapexServiceConnection: 'dnceng-onelocbuild-ceapex' # GitHub App authentication for the OneLoc check-in PR. - # dnceng/internal and DevDiv/DevDiv are enabled by default with their project-scoped service - # connections. Other projects must explicitly opt in after provisioning equivalent infrastructure. - UseGitHubAppAuthentication: true - UseGitHubAppAuthenticationInOtherProjects: false GitHubAppServiceConnection: 'dnceng-oneloc-githubapp' GitHubAppClientId: 'Iv23lijBU8x3gc9lDOc9' GitHubAppKeyVaultName: 'EngKeyVault' @@ -50,7 +40,6 @@ jobs: displayName: OneLocBuild${{ parameters.JobNameSuffix }} variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - name: _GenerateLocProjectArguments value: -SourcesDirectory ${{ parameters.SourcesDirectory }} -LanguageSet "${{ parameters.LanguageSet }}" @@ -81,6 +70,12 @@ jobs: steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + - ${{ if notin(variables['System.TeamProject'], 'internal', 'DevDiv') }}: + - 'OneLocBuild is supported only in dnceng/internal and DevDiv/DevDiv.': error + - ${{ if eq(parameters.CeapexServiceConnection, '') }}: + - 'CeapexServiceConnection must identify a WIF service connection.': error + - ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.GitHubAppServiceConnection, '')) }}: + - 'GitHubAppServiceConnection must identify a WIF service connection for GitHub repositories.': error - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 @@ -90,18 +85,15 @@ jobs: displayName: Generate LocProject.json condition: ${{ parameters.condition }} - # Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only). - # All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal. - - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: - - template: /eng/common/templates/steps/get-federated-access-token.yml - parameters: - federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} - outputVariableName: 'CeapexEntraToken' - condition: ${{ parameters.condition }} + # Acquire a short-lived Entra token for Ceapex feed access. + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} + outputVariableName: 'CeapexEntraToken' + condition: ${{ parameters.condition }} - # Mint a short-lived GitHub App installation token for the loc check-in PR. Use the connection - # provisioned in each supported project; other projects must explicitly opt in and override it. - - ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}: + # Mint a short-lived GitHub App installation token for the loc check-in PR. + - ${{ if eq(parameters.RepoType, 'gitHub') }}: - template: /eng/common/core-templates/steps/get-github-app-token.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -131,16 +123,10 @@ jobs: isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: - patVariable: $(CeapexEntraToken) - ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}: - patVariable: ${{ parameters.CeapexPat }} + patVariable: $(CeapexEntraToken) ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} - ${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}: - gitHubPatVariable: "$(GitHubAppInstallationToken)" - ${{ else }}: - gitHubPatVariable: "${{ parameters.GithubPat }}" + gitHubPatVariable: "$(GitHubAppInstallationToken)" ${{ if ne(parameters.MirrorRepo, '') }}: isMirrorRepoSelected: true gitHubOrganization: ${{ parameters.GitHubOrg }} diff --git a/global.json b/global.json index 23c189011cb00d..5d707ec83cca38 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-rc.1.26420.103", + "version": "11.0.100-rc.1.26425.128", "allowPrerelease": true, "rollForward": "major", "paths": [ @@ -10,14 +10,14 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.sh (Unix) or eng\\common\\dotnet.cmd (Windows) to install it." }, "tools": { - "dotnet": "11.0.100-rc.1.26420.103" + "dotnet": "11.0.100-rc.1.26425.128" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26457.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26457.102", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26457.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26464.119", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26464.119", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26464.119", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26457.102" + "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26464.119" } } From c35ceb3e149855f455f3e6b18756b85b695635a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Sep 2026 17:16:10 +0000 Subject: [PATCH 3/4] Update dependencies from build 332135 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26464.119 -> 5.12.0-1.26465.102) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-rc.2.26464.119 -> 11.0.100-rc.2.26465.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.FileCatalog, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.JobMonitor, 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.26464.119 -> 11.0.0-beta.26465.102) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26464.119 -> 0.11.5-preview.26465.102) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26464.119 -> 2.9.3-beta.26465.102) Microsoft.NET.Runtime.Emscripten.Internal, 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-rc.2.26464.119 -> 11.0.0-rc.2.26465.102) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.46519 -> 7.12.0-rc.46602) System.CommandLine (Version 3.0.0-rc.2.26464.119 -> 3.0.0-rc.2.26465.102) [[ commit created by automation ]] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.props | 82 +++++++++---------- eng/Version.Details.xml | 166 +++++++++++++++++++------------------- global.json | 8 +- 4 files changed, 129 insertions(+), 129 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 311d7c59e7bd46..51a44367445cab 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "11.0.0-beta.26464.119", + "version": "11.0.0-beta.26465.102", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b9e10fcb0c89ed..29b680c04e072b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,48 +6,48 @@ This file should be imported by eng/Versions.props - 5.12.0-1.26464.119 - 5.12.0-1.26464.119 - 5.12.0-1.26464.119 - 5.12.0-1.26464.119 - 11.0.100-rc.2.26464.119 - 11.0.100-rc.2.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 0.11.5-preview.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 + 5.12.0-1.26465.102 + 5.12.0-1.26465.102 + 5.12.0-1.26465.102 + 5.12.0-1.26465.102 + 11.0.100-rc.2.26465.102 + 11.0.100-rc.2.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 0.11.5-preview.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 + 11.0.0-beta.26465.102 3.2.2-beta.26257.113 - 2.9.3-beta.26464.119 - 11.0.0-beta.26464.119 - 5.12.0-1.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.100-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 7.12.0-rc.46519 - 7.12.0-rc.46519 - 7.12.0-rc.46519 - 7.12.0-rc.46519 - 11.0.0-rc.2.26464.119 - 3.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 + 2.9.3-beta.26465.102 + 11.0.0-beta.26465.102 + 5.12.0-1.26465.102 + 11.0.0-rc.2.26465.102 + 11.0.0-rc.2.26465.102 + 11.0.100-rc.2.26465.102 + 11.0.0-rc.2.26465.102 + 11.0.0-rc.2.26465.102 + 7.12.0-rc.46602 + 7.12.0-rc.46602 + 7.12.0-rc.46602 + 7.12.0-rc.46602 + 11.0.0-rc.2.26465.102 + 3.0.0-rc.2.26465.102 + 11.0.0-rc.2.26465.102 + 11.0.0-rc.2.26465.102 + 11.0.0-rc.2.26465.102 11.0.0-alpha.0.26180.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afee42134091cb..7ea7a5aaadb7e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,95 +37,95 @@ https://github.com/dotnet/llvm-project d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://github.com/dotnet/dotnet 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness b355c0507b19670c2d386677d7f99260f07cefa5 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,33 +331,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -369,21 +369,21 @@ - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 https://github.com/dotnet/node @@ -425,9 +425,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 diff --git a/global.json b/global.json index 5d707ec83cca38..62d44a97f08dae 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-rc.1.26425.128" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26464.119", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26464.119", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26464.119", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.102", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26465.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26464.119" + "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26465.102" } } From b800aaa41fd5422049c15c0aa9b5a4ab2bcae063 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Sep 2026 01:47:06 +0000 Subject: [PATCH 4/4] Update dependencies from build 332243 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26465.102 -> 5.12.0-1.26465.108) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-rc.2.26465.102 -> 11.0.100-rc.2.26465.108) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.FileCatalog, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.JobMonitor, 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.26465.102 -> 11.0.0-beta.26465.108) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26465.102 -> 0.11.5-preview.26465.108) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26465.102 -> 2.9.3-beta.26465.108) Microsoft.NET.Runtime.Emscripten.Internal, 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-rc.2.26465.102 -> 11.0.0-rc.2.26465.108) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.46602 -> 7.12.0-rc.46608) System.CommandLine (Version 3.0.0-rc.2.26465.102 -> 3.0.0-rc.2.26465.108) [[ commit created by automation ]] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.props | 82 ++++----- eng/Version.Details.xml | 166 +++++++++--------- .../core-templates/job/helix-job-monitor.yml | 42 ++++- eng/common/core-templates/job/job.yml | 3 +- .../core-templates/steps/send-to-helix.yml | 43 ++++- global.json | 8 +- 7 files changed, 210 insertions(+), 136 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 51a44367445cab..4c79ef87bc0a31 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "11.0.0-beta.26465.102", + "version": "11.0.0-beta.26465.108", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 29b680c04e072b..5395df539af632 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,48 +6,48 @@ This file should be imported by eng/Versions.props - 5.12.0-1.26465.102 - 5.12.0-1.26465.102 - 5.12.0-1.26465.102 - 5.12.0-1.26465.102 - 11.0.100-rc.2.26465.102 - 11.0.100-rc.2.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 0.11.5-preview.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 - 11.0.0-beta.26465.102 + 5.12.0-1.26465.108 + 5.12.0-1.26465.108 + 5.12.0-1.26465.108 + 5.12.0-1.26465.108 + 11.0.100-rc.2.26465.108 + 11.0.100-rc.2.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 0.11.5-preview.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 3.2.2-beta.26257.113 - 2.9.3-beta.26465.102 - 11.0.0-beta.26465.102 - 5.12.0-1.26465.102 - 11.0.0-rc.2.26465.102 - 11.0.0-rc.2.26465.102 - 11.0.100-rc.2.26465.102 - 11.0.0-rc.2.26465.102 - 11.0.0-rc.2.26465.102 - 7.12.0-rc.46602 - 7.12.0-rc.46602 - 7.12.0-rc.46602 - 7.12.0-rc.46602 - 11.0.0-rc.2.26465.102 - 3.0.0-rc.2.26465.102 - 11.0.0-rc.2.26465.102 - 11.0.0-rc.2.26465.102 - 11.0.0-rc.2.26465.102 + 2.9.3-beta.26465.108 + 11.0.0-beta.26465.108 + 5.12.0-1.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.100-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 7.12.0-rc.46608 + 7.12.0-rc.46608 + 7.12.0-rc.46608 + 7.12.0-rc.46608 + 11.0.0-rc.2.26465.108 + 3.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 11.0.0-alpha.0.26180.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ea7a5aaadb7e3..52069ddf3dba3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,95 +37,95 @@ https://github.com/dotnet/llvm-project d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://github.com/dotnet/dotnet 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project d9efae02c571d39f4e2a50971af239603c37b0d0 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness b355c0507b19670c2d386677d7f99260f07cefa5 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,33 +331,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -369,21 +369,21 @@ - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 https://github.com/dotnet/node @@ -425,9 +425,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - bcdaaccbf4b97f0fa310f29be7dc6d0bf4924d47 + e5abd3f0528a8467c64a855a6ff569566d0daf27 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 53bbf74927e7cc..7417afdf3ea48d 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -52,11 +52,23 @@ parameters: type: string default: https://helix.dot.net/ -# Helix API access token forwarded to the tool via the HELIX_ACCESSTOKEN environment variable. +# Helix API access token forwarded via HELIX_ACCESSTOKEN. Not forwarded when +# useEntraAuthentication is true. - name: helixAccessToken type: string default: '' +# Use a refreshable Entra credential instead of a PAT or anonymous access. +- name: useEntraAuthentication + type: boolean + default: false + +# Azure service connection ID authorized for Helix. Required when +# useEntraAuthentication is true. +- name: azureSubscription + type: string + default: '' + # Polling interval in seconds (--polling-interval-seconds). - name: pollingIntervalSeconds type: number @@ -141,6 +153,26 @@ jobs: - checkout: self fetchDepth: 1 + - ${{ if and(eq(parameters.useEntraAuthentication, true), eq(parameters.azureSubscription, '')) }}: + - pwsh: throw "azureSubscription must be set when useEntraAuthentication is true." + displayName: Validate Helix Entra authentication + + - ${{ if eq(parameters.useEntraAuthentication, true) }}: + - task: AzureCLI@2 + displayName: Initialize Helix Entra authentication + inputs: + azureSubscription: ${{ parameters.azureSubscription }} + addSpnToEnvironment: true + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | + if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) { + throw "The Helix Azure service connection did not provide a service principal or tenant ID." + } + + Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId" + Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId" + - ${{ if ne(parameters.toolNupkgArtifactName, '') }}: - task: DownloadPipelineArtifact@2 displayName: Download Helix Job Monitor artifact @@ -214,6 +246,7 @@ jobs: toolArgs=( --helix-base-uri '${{ parameters.helixBaseUri }}' + --use-entra-authentication '${{ parameters.useEntraAuthentication }}' --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}' --fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}' --allow-no-helix-jobs '${{ parameters.allowNoHelixJobs }}' @@ -275,4 +308,9 @@ jobs: displayName: Monitor Helix Jobs env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) - HELIX_ACCESSTOKEN: ${{ parameters.helixAccessToken }} + ${{ if eq(parameters.useEntraAuthentication, false) }}: + HELIX_ACCESSTOKEN: ${{ parameters.helixAccessToken }} + ${{ if eq(parameters.useEntraAuthentication, true) }}: + AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId) + AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId) + AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.azureSubscription }} diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb60f5297844a4..7da6bdf520ec8a 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -119,7 +119,8 @@ jobs: - name: ${{ pair.key }} value: ${{ pair.value }} - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds. + # Entra-enabled Helix templates do not forward this value to their processes. - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-HelixApi-Access diff --git a/eng/common/core-templates/steps/send-to-helix.yml b/eng/common/core-templates/steps/send-to-helix.yml index ec7a20003992c2..62cce4d4ea2a90 100644 --- a/eng/common/core-templates/steps/send-to-helix.yml +++ b/eng/common/core-templates/steps/send-to-helix.yml @@ -4,7 +4,9 @@ parameters: HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixAccessToken: '' # optional -- legacy access token; not forwarded when HelixUseEntraAuthentication is true + HelixUseEntraAuthentication: false # optional -- use refreshable Entra authentication instead of a PAT or anonymous access + HelixAzureSubscription: '' # required when HelixUseEntraAuthentication is true -- Azure service connection ID authorized for Helix HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY HelixProjectArguments: '' # optional -- arguments passed to the build command HelixConfiguration: '' # optional -- additional property attached to a job @@ -32,12 +34,35 @@ parameters: continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: + - ${{ if and(eq(parameters.HelixUseEntraAuthentication, true), eq(parameters.HelixAzureSubscription, '')) }}: + - pwsh: throw "HelixAzureSubscription must be set when HelixUseEntraAuthentication is true." + displayName: Validate Helix Entra authentication + condition: ${{ parameters.condition }} + + - ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}: + - task: AzureCLI@2 + displayName: Initialize Helix Entra authentication + inputs: + azureSubscription: ${{ parameters.HelixAzureSubscription }} + addSpnToEnvironment: true + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | + if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) { + throw "The Helix Azure service connection did not provide a service principal or tenant ID." + } + + Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId" + Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId" + condition: ${{ parameters.condition }} + - powershell: > $(Build.SourcesDirectory)\eng\common\msbuild.ps1 $(Build.SourcesDirectory)/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false /p:EnableHelixJobMonitor=${{ parameters.UseHelixMonitor }} + /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} ${{ parameters.HelixProjectArguments }} /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog @@ -49,7 +74,12 @@ steps: HelixBuild: ${{ parameters.HelixBuild }} HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} + ${{ if eq(parameters.HelixUseEntraAuthentication, false) }}: + HelixAccessToken: ${{ parameters.HelixAccessToken }} + ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}: + AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId) + AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId) + AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }} HelixPreCommands: ${{ parameters.HelixPreCommands }} HelixPostCommands: ${{ parameters.HelixPostCommands }} WorkItemDirectory: ${{ parameters.WorkItemDirectory }} @@ -76,6 +106,7 @@ steps: /restore /p:TreatWarningsAsErrors=false /p:EnableHelixJobMonitor=${{ parameters.UseHelixMonitor }} + /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} ${{ parameters.HelixProjectArguments }} /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog @@ -87,7 +118,12 @@ steps: HelixBuild: ${{ parameters.HelixBuild }} HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} + ${{ if eq(parameters.HelixUseEntraAuthentication, false) }}: + HelixAccessToken: ${{ parameters.HelixAccessToken }} + ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}: + AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId) + AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId) + AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }} HelixPreCommands: ${{ parameters.HelixPreCommands }} HelixPostCommands: ${{ parameters.HelixPostCommands }} WorkItemDirectory: ${{ parameters.WorkItemDirectory }} @@ -108,4 +144,3 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - diff --git a/global.json b/global.json index 62d44a97f08dae..1ec0f68f3a6c5c 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-rc.1.26425.128" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.102", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26465.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.108", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26465.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26465.102" + "Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26465.108" } }