From 96b5ba838bfa299d30adc569ed1957eba027d220 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Oct 2026 12:22:09 +0000 Subject: [PATCH 1/2] Update dependencies from build 335786 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26471.108 -> 5.13.0-1.26508.114) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.DotNet.GenAPI.Task (Version 12.0.100-alpha.1.26471.108 -> 12.0.100-alpha.1.26508.114) 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 12.0.0-beta.26471.108 -> 12.0.0-beta.26508.114) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26471.108 -> 0.11.5-preview.26508.114) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26471.108 -> 2.9.3-beta.26508.114) 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 12.0.0-alpha.1.26471.108 -> 12.0.0-alpha.1.26508.114) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.47208 -> 8.0.0-rc.51014) System.CommandLine (Version 4.0.0-alpha.1.26471.108 -> 4.0.0-alpha.1.26508.114) 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.26457.1 -> 23.1.0-alpha.1.26471.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.26459.1 -> 12.0.0-alpha.1.26473.2) [[ commit created by automation ]] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.props | 156 ++++----- eng/Version.Details.xml | 314 +++++++++--------- eng/common/build.ps1 | 4 - .../core-templates/job/helix-job-monitor.yml | 135 +++----- eng/common/core-templates/stages/renovate.yml | 2 +- .../core-templates/steps/astred-artifacts.yml | 5 +- .../core-templates/steps/send-to-helix.yml | 260 +++++++++------ eng/common/cross/build-rootfs.sh | 8 +- eng/common/cross/install-debs.py | 2 + eng/common/cross/toolchain.cmake | 16 +- eng/common/msbuild.ps1 | 5 - eng/common/native/init-distro-rid.sh | 15 +- eng/common/native/init-os-and-arch.sh | 8 + eng/common/run-helix-job-monitor.sh | 64 ++++ eng/common/tools.ps1 | 10 +- eng/common/tools.sh | 8 +- global.json | 12 +- 18 files changed, 563 insertions(+), 463 deletions(-) create mode 100644 eng/common/run-helix-job-monitor.sh diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d9e0f9916802ea..801db5acc16bc4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "12.0.0-beta.26471.108", + "version": "12.0.0-beta.26508.114", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6a391c395316fb..e7e2bf2a9d7428 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,88 +6,88 @@ This file should be imported by eng/Versions.props - 5.12.0-1.26471.108 - 5.12.0-1.26471.108 - 5.12.0-1.26471.108 - 5.12.0-1.26471.108 - 12.0.100-alpha.1.26471.108 - 12.0.100-alpha.1.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 0.11.5-preview.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.100-alpha.1.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 12.0.0-beta.26471.108 - 2.9.3-beta.26471.108 - 12.0.0-beta.26471.108 - 5.12.0-1.26471.108 - 12.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 - 7.12.0-rc.47208 - 7.12.0-rc.47208 - 7.12.0-rc.47208 - 7.12.0-rc.47208 - 12.0.0-alpha.1.26471.108 - 4.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 - 12.0.0-alpha.1.26471.108 + 5.13.0-1.26508.114 + 5.13.0-1.26508.114 + 5.13.0-1.26508.114 + 5.13.0-1.26508.114 + 12.0.100-alpha.1.26508.114 + 12.0.100-alpha.1.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 0.11.5-preview.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.100-alpha.1.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 12.0.0-beta.26508.114 + 2.9.3-beta.26508.114 + 12.0.0-beta.26508.114 + 5.13.0-1.26508.114 + 12.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 + 8.0.0-rc.51014 + 8.0.0-rc.51014 + 8.0.0-rc.51014 + 8.0.0-rc.51014 + 12.0.0-alpha.1.26508.114 + 4.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 + 12.0.0-alpha.1.26508.114 11.0.0-alpha.1.26418.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 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.1 + 23.1.0-alpha.1.26471.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 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 + 12.0.0-alpha.1.26473.2 1.0.0-prerelease.26451.1 1.0.0-prerelease.26451.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 064a7dca8d416f..7f5e2bf85a76cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,127 +1,127 @@ - + https://github.com/dotnet/icu c6131fd7b7cebcef44c17f381b2fe325cb331964 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 https://github.com/dotnet/runtime-assets @@ -175,117 +175,117 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/llvm-project - d9efae02c571d39f4e2a50971af239603c37b0d0 + c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 4f2266d4c147bd8af3fe4dff129f725ddb9dce57 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,33 +323,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -361,53 +361,53 @@ - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 - + https://github.com/dotnet/node - 4ae8e1c1d08d09e5025db77e22a832051c56fd28 + d954f395f7c6155158008b2c953eb4add91c3dd2 https://github.com/dotnet/runtime-assets @@ -417,9 +417,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - d1920aa3fa8523a7b8d04d6e442faccb0b0bb68e + 6780ebfddbb695447cc33bf976bf4c6de8031ef3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 305132a6d6dd74..64c5ed10263f13 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -181,10 +181,6 @@ try { if (-not $PSBoundParameters.ContainsKey('nodeReuse')) { $nodeReuse = $false } - # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded. - if (-not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) { - $msbuildMultiThreaded = $false - } } if (-not [string]::IsNullOrEmpty($binaryLogName)) { diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 7417afdf3ea48d..ef8ee08fbd2298 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -63,7 +63,7 @@ parameters: type: boolean default: false -# Azure service connection ID authorized for Helix. Required when +# Workload identity federation service connection name authorized for Helix. Required when # useEntraAuthentication is true. - name: azureSubscription type: string @@ -94,13 +94,12 @@ parameters: type: boolean default: false -# When true, test results are reported to Azure DevOps using the fully qualified test name -# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as -# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display; -# primarily useful for frameworks like MSTest whose display name is only the method name. +# When true (the default), test results are reported to Azure DevOps using the fully qualified test +# name (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as +# well (--use-fully-qualified-test-name). Set to false to preserve framework-provided display names. - name: useFullyQualifiedTestName type: boolean - default: false + default: true # Controls per-test output attachments. Defaults to Failed. - name: testResultAttachmentMode @@ -136,6 +135,20 @@ jobs: displayName: Monitor Helix Jobs timeoutInMinutes: ${{ parameters.timeoutInMinutes }} continueOnError: ${{ parameters.continueOnError }} + variables: + HELIX_MONITOR_BASE_URI: ${{ parameters.helixBaseUri }} + HELIX_MONITOR_USE_ENTRA_AUTHENTICATION: ${{ parameters.useEntraAuthentication }} + HELIX_MONITOR_POLLING_INTERVAL_SECONDS: ${{ parameters.pollingIntervalSeconds }} + HELIX_MONITOR_FAIL_ON_FAILED_TESTS: ${{ parameters.failWorkItemsWithFailedTests }} + HELIX_MONITOR_ALLOW_NO_HELIX_JOBS: ${{ parameters.allowNoHelixJobs }} + HELIX_MONITOR_USE_FULLY_QUALIFIED_TEST_NAME: ${{ parameters.useFullyQualifiedTestName }} + HELIX_MONITOR_TIMEOUT_IN_MINUTES: ${{ parameters.timeoutInMinutes }} + HELIX_MONITOR_TEST_RESULT_UPLOAD_PARALLELISM: ${{ parameters.testResultUploadParallelism }} + HELIX_MONITOR_ORGANIZATION: ${{ parameters.organization }} + HELIX_MONITOR_REPOSITORY: ${{ parameters.repository }} + HELIX_MONITOR_TEST_RESULT_ATTACHMENT_MODE: ${{ parameters.testResultAttachmentMode }} + HELIX_MONITOR_TOOL_NUPKG_ARTIFACT_NAME: ${{ parameters.toolNupkgArtifactName }} + HELIX_MONITOR_TOOL_COMMAND: ${{ parameters.toolCommand }} ${{ if ne(length(parameters.dependsOn), 0) }}: dependsOn: ${{ parameters.dependsOn }} ${{ if ne(parameters.condition, '') }}: @@ -157,22 +170,6 @@ jobs: - 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 @@ -241,76 +238,26 @@ jobs: - bash: ./eng/common/dotnet.sh tool restore displayName: Restore Helix Job Monitor - - bash: | - set -euo pipefail - - 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 }}' - --use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}' - --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. - --stage-name '$(System.StageName)' - --stage-attempt '$(System.StageAttempt)' - --job-attempt '$(System.JobAttempt)' - --test-result-upload-parallelism '${{ parameters.testResultUploadParallelism }}' - ) - - organization='${{ parameters.organization }}' - repository='${{ parameters.repository }}' - testResultAttachmentMode='${{ parameters.testResultAttachmentMode }}' - - # Fall back to Azure DevOps-provided environment variables when the caller did not - # supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically - # 'owner/repo' for GitHub-backed builds and 'owner-repo' for internal builds. - if [ -z "$organization" ] || [ -z "$repository" ]; then - buildRepoName="${BUILD_REPOSITORY_NAME:-}" - if [ -n "$buildRepoName" ] && [[ "$buildRepoName" == */* ]]; then - repoOwner="${buildRepoName%%/*}" - repoName="${buildRepoName#*/}" - elif [ -n "$buildRepoName" ] && [[ "$buildRepoName" == *-* ]]; then - repoOwner="${buildRepoName%%-*}" - repoName="${buildRepoName#*-}" - fi - - if [ -n "${repoOwner:-}" ] && [ -n "${repoName:-}" ]; then - if [ -z "$organization" ]; then organization="$repoOwner"; fi - if [ -z "$repository" ]; then repository="$repoName"; fi - fi - fi - - if [ -n "$organization" ]; then toolArgs+=( --organization "$organization" ); fi - if [ -n "$repository" ]; then toolArgs+=( --repository "$repository" ); fi - if [ -n "$testResultAttachmentMode" ]; then - toolArgs+=( --test-result-attachment-mode "$testResultAttachmentMode" ) - fi - - # Build.Reason and Build.SourceBranch are required to derive the Helix source filter - # the same way the Helix SDK submitter does (PR -> 'pr', internal -> 'official', - # otherwise -> 'ci'). Without these, manually-queued / scheduled / CI builds would - # be looked up under the wrong source prefix and find zero jobs. - toolArgs+=( --build-reason "$(Build.Reason)" ) - toolArgs+=( --source-branch "$(Build.SourceBranch)" ) - - if [ -n '${{ parameters.toolNupkgArtifactName }}' ]; then - # Tool was installed from a local nupkg; run the DLL via the repo-local dotnet. - export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet" - ./eng/common/dotnet.sh exec "$(HelixJobMonitorDll)" "${toolArgs[@]}" - else - # Tool was restored from the local .config/dotnet-tools.json manifest; invoke it - # through the manifest from the repo root. - pushd "$BUILD_SOURCESDIRECTORY" > /dev/null - trap 'popd > /dev/null' EXIT - ./eng/common/dotnet.sh tool run '${{ parameters.toolCommand }}' -- "${toolArgs[@]}" - fi - displayName: Monitor Helix Jobs - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - ${{ if eq(parameters.useEntraAuthentication, false) }}: + - ${{ if eq(parameters.useEntraAuthentication, true) }}: + - task: AzureCLI@2 + displayName: Monitor Helix Jobs + inputs: + azureSubscription: ${{ parameters.azureSubscription }} + keepAzSessionActive: true + scriptType: bash + scriptLocation: inlineScript + inlineScript: | + set -euo pipefail + + # AzureCLI@2 replaces SYSTEM_ACCESSTOKEN with the service connection token. + export SYSTEM_ACCESSTOKEN="$HELIX_AZDO_ACCESSTOKEN" + bash "$BUILD_SOURCESDIRECTORY/eng/common/run-helix-job-monitor.sh" + env: + HELIX_AZDO_ACCESSTOKEN: $(System.AccessToken) + + - ${{ if eq(parameters.useEntraAuthentication, false) }}: + - bash: bash "$BUILD_SOURCESDIRECTORY/eng/common/run-helix-job-monitor.sh" + displayName: Monitor Helix Jobs + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) 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/stages/renovate.yml b/eng/common/core-templates/stages/renovate.yml index cfa9683794ad3d..e046d1be030248 100644 --- a/eng/common/core-templates/stages/renovate.yml +++ b/eng/common/core-templates/stages/renovate.yml @@ -60,7 +60,7 @@ parameters: # Renovate version used in the container image tag. - name: renovateVersion - default: 43 + default: 44 type: number # Pool configuration for SDL analysis. diff --git a/eng/common/core-templates/steps/astred-artifacts.yml b/eng/common/core-templates/steps/astred-artifacts.yml index ab01349d540a53..86420925b44095 100644 --- a/eng/common/core-templates/steps/astred-artifacts.yml +++ b/eng/common/core-templates/steps/astred-artifacts.yml @@ -47,7 +47,6 @@ steps: env: ASTRED_BINLOG_DIR: ${{ parameters.binlogDir }} ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }} - condition: succeededOrFailed() continueOnError: true - pwsh: | @@ -94,12 +93,12 @@ steps: env: ASTRED_SOURCES_PATH: ${{ parameters.sourcesPath }} ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }} - condition: succeededOrFailed() continueOnError: true - task: UploadAstred@0 displayName: Upload Digest to Astred - condition: and(succeededOrFailed(), eq(variables['ASTRED_DIGEST_READY'], 'true')) + condition: and(succeeded(), eq(variables['ASTRED_DIGEST_READY'], 'true')) + continueOnError: true inputs: SourcePath: ${{ parameters.capturePath }}/upload env: diff --git a/eng/common/core-templates/steps/send-to-helix.yml b/eng/common/core-templates/steps/send-to-helix.yml index 62cce4d4ea2a90..dba2f1b0afadcc 100644 --- a/eng/common/core-templates/steps/send-to-helix.yml +++ b/eng/common/core-templates/steps/send-to-helix.yml @@ -6,7 +6,7 @@ parameters: HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues 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 + HelixAzureSubscription: '' # required when HelixUseEntraAuthentication is true -- workload identity federation service connection name 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 @@ -41,106 +41,176 @@ steps: - ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}: - task: AzureCLI@2 - displayName: Initialize Helix Entra authentication + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) inputs: azureSubscription: ${{ parameters.HelixAzureSubscription }} - addSpnToEnvironment: true + keepAzSessionActive: 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." - } + # AzureCLI@2 replaces SYSTEM_ACCESSTOKEN with the service connection token. + $env:SYSTEM_ACCESSTOKEN = $env:HELIX_AZDO_ACCESSTOKEN - Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId" - condition: ${{ parameters.condition }} + $(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 + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + HELIX_AZDO_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - task: AzureCLI@2 + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + inputs: + azureSubscription: ${{ parameters.HelixAzureSubscription }} + keepAzSessionActive: true + scriptType: bash + scriptLocation: inlineScript + inlineScript: | + # AzureCLI@2 replaces SYSTEM_ACCESSTOKEN with the service connection token. + export SYSTEM_ACCESSTOKEN="$HELIX_AZDO_ACCESSTOKEN" + + $(Build.SourcesDirectory)/eng/common/msbuild.sh \ + $(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 + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + HELIX_AZDO_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} - - 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 - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - ${{ if eq(parameters.HelixUseEntraAuthentication, false) }}: + - ${{ if eq(parameters.HelixUseEntraAuthentication, false) }}: + - 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 + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} 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 }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: > - $(Build.SourcesDirectory)/eng/common/msbuild.sh - $(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 - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - ${{ if eq(parameters.HelixUseEntraAuthentication, false) }}: + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: > + $(Build.SourcesDirectory)/eng/common/msbuild.sh + $(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 + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} 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 }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 3fea306bc2a2b2..3ce35ed12fdc8d 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -532,7 +532,7 @@ ensureDownloadTool() } if [[ "$__CodeName" == "alpine" ]]; then - __ApkToolsVersion=2.14.4-r1 + __ApkToolsVersion=3.0.8-r0 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" arch="$(uname -m)" @@ -540,7 +540,7 @@ if [[ "$__CodeName" == "alpine" ]]; then ensureDownloadTool __ApkToolsPackage="$__ApkToolsDir/apk-tools-static.apk" - __ApkToolsUrl="$__AlpineRepo/v3.20/main/$arch/apk-tools-static-$__ApkToolsVersion.apk" + __ApkToolsUrl="$__AlpineRepo/v3.24/main/$arch/apk-tools-static-$__ApkToolsVersion.apk" if [[ "$__hasWget" == 1 ]]; then wget -O "$__ApkToolsPackage" "$__ApkToolsUrl" @@ -549,9 +549,9 @@ if [[ "$__CodeName" == "alpine" ]]; then fi if [[ "$arch" == "x86_64" ]]; then - __ApkToolsSHA512SUM="b1b3cc382aa0ec26a2c24b742701a1f9885d0678365f9aea15d3d005926b06ecc802659cec8a7deba2717af99c19c708a17c23e1f0f07742268ee5be5400eb9e" + __ApkToolsSHA512SUM="6ab4f5e521efbfff75a4b0ecc6a028b4df0c22eadc46c18a30fa03faca0f6efd6c546b3682a856e66865f0152993a9cc843c15633a7d01b6e0f9d225b1e31ef8" elif [[ "$arch" == "aarch64" ]]; then - __ApkToolsSHA512SUM="61f9a636c5ac4e96e7a3f69fd65e60fc57b3ec8b23619c4df86f59b89e71d1309b3e406388945bdf0dd9168dac22df376943a70ff3efa179e5687e586f825fb0" + __ApkToolsSHA512SUM="c592bfefe3b3bc73d56fef5293a2c5c27a71d0555df7ca7db638a70c7ac81be6509f6348f28fe7474ae9adbda6f21c00a8c20d8a6ba6d5579f2ffa78d55184d2" else >&2 echo "ERROR: Unsupported apk-tools-static host architecture '$arch'." exit 1 diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py index 1d1dfabf7dc92d..e2d5ef4030a05e 100755 --- a/eng/common/cross/install-debs.py +++ b/eng/common/cross/install-debs.py @@ -36,6 +36,8 @@ async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, t f.write(content) print(f"Downloaded {url} at {dest_path}") return + elif response.status >= 500 or response.status in (408, 429): + response.raise_for_status() else: raise Exception(f"Failed to download {url}, Status Code: {response.status}") except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e: diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 70b71395e3ba72..ba77071090003d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -6,6 +6,7 @@ unset(FREEBSD) unset(OPENBSD) unset(ILLUMOS) unset(ANDROID) +unset(OPENHARMONY) unset(TIZEN) unset(HAIKU) @@ -35,6 +36,8 @@ if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release) set(TIZEN 1) elseif(EXISTS ${CROSS_ROOTFS}/android_platform) set(ANDROID 1) +elseif(EXISTS ${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake) + set(OPENHARMONY 1) endif() if(TARGET_ARCH_NAME STREQUAL "arm") @@ -204,6 +207,17 @@ if(ANDROID) # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) +elseif(OPENHARMONY) + if(TARGET_ARCH_NAME STREQUAL "arm") + set(OHOS_ARCH armeabi-v7a) + elseif(TARGET_ARCH_NAME STREQUAL "arm64") + set(OHOS_ARCH arm64-v8a) + elseif(TARGET_ARCH_NAME STREQUAL "x64") + set(OHOS_ARCH x86_64) + endif() + + # include official OHOS NDK toolchain script + include(${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake) elseif(FREEBSD OR OPENBSD) # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) @@ -308,7 +322,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index 8076945064dbb9..161f8e8077c3cc 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -19,11 +19,6 @@ try { $nodeReuse = $false } - # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded. - if ($ci -and -not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) { - $msbuildMultiThreaded = $false - } - MSBuild @extraArgs } catch { diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 8fc6d2fec78d2a..abb3e231173949 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -41,6 +41,9 @@ getNonPortableDistroRid() nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" elif [ "$targetOs" = "openbsd" ]; then nonPortableRid="openbsd.$(uname -r)-${targetArch}" + elif [ "$targetOs" = "openharmony" ] && command -v param >/dev/null && param get const.ohos.fullname 2>/dev/null | grep -qi '^openharmony'; then + __openharmony_api_version=$(param get const.ohos.apiversion | tr -d '[:space:]') + nonPortableRid="openharmony.$__openharmony_api_version-${targetArch}" elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then __android_sdk_version=$(getprop ro.build.version.sdk) nonPortableRid="android.$__android_sdk_version-${targetArch}" @@ -101,10 +104,14 @@ initDistroRidGlobal() STRINGS="$(command -v llvm-strings || true)" fi - # Check for musl-based distros (e.g. Alpine Linux, Void Linux). - if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || - ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then - __PortableTargetOS="linux-musl" + # Check for musl-based distros (e.g. Alpine Linux, Void Linux). Only linux targets + # have a musl/glibc portable flavor; skip the check for other targets so that a + # musl-based build host does not clobber their portable OS (e.g. openharmony). + if [ "$targetOs" = "linux" ]; then + if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || + ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then + __PortableTargetOS="linux-musl" + fi fi fi diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index 62d62fed522aa6..c3e21228436081 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -7,9 +7,17 @@ if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android OSName="android" fi +# OpenHarmony/HarmonyOS hosts report `HarmonyOS` (or `Linux` on some devices) +# from uname, so query the OHOS parameter service as well. +if command -v param >/dev/null 2>&1 && param get const.ohos.fullname 2>/dev/null | grep -qi '^openharmony'; then + OSName="openharmony" +fi + case "$OSName" in freebsd|linux|netbsd|openbsd|sunos|android|haiku) os="$OSName" ;; +harmonyos|openharmony) + os=openharmony ;; darwin) os=osx ;; *) diff --git a/eng/common/run-helix-job-monitor.sh b/eng/common/run-helix-job-monitor.sh new file mode 100644 index 00000000000000..dda140bc9a4bcc --- /dev/null +++ b/eng/common/run-helix-job-monitor.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptroot="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +. "$scriptroot/pipeline-logging-functions.sh" + +toolArgs=( + --helix-base-uri "$HELIX_MONITOR_BASE_URI" + --use-entra-authentication "$HELIX_MONITOR_USE_ENTRA_AUTHENTICATION" + --polling-interval-seconds "$HELIX_MONITOR_POLLING_INTERVAL_SECONDS" + --fail-on-failed-tests "$HELIX_MONITOR_FAIL_ON_FAILED_TESTS" + --allow-no-helix-jobs "$HELIX_MONITOR_ALLOW_NO_HELIX_JOBS" + --use-fully-qualified-test-name "$HELIX_MONITOR_USE_FULLY_QUALIFIED_TEST_NAME" + --max-wait-minutes "$((HELIX_MONITOR_TIMEOUT_IN_MINUTES - 5))" + --stage-name "$SYSTEM_STAGENAME" + --stage-attempt "$SYSTEM_STAGEATTEMPT" + --job-attempt "$SYSTEM_JOBATTEMPT" + --test-result-upload-parallelism "$HELIX_MONITOR_TEST_RESULT_UPLOAD_PARALLELISM" +) + +organization="${HELIX_MONITOR_ORGANIZATION:-}" +repository="${HELIX_MONITOR_REPOSITORY:-}" + +# Fall back to Azure DevOps-provided environment variables when the caller did not +# supply organization or repository explicitly. +if [ -z "$organization" ] || [ -z "$repository" ]; then + buildRepoName="${BUILD_REPOSITORY_NAME:-}" + if [ -n "$buildRepoName" ] && [[ "$buildRepoName" == */* ]]; then + repoOwner="${buildRepoName%%/*}" + repoName="${buildRepoName#*/}" + elif [ -n "$buildRepoName" ] && [[ "$buildRepoName" == *-* ]]; then + repoOwner="${buildRepoName%%-*}" + repoName="${buildRepoName#*-}" + fi + + if [ -n "${repoOwner:-}" ] && [ -n "${repoName:-}" ]; then + if [ -z "$organization" ]; then organization="$repoOwner"; fi + if [ -z "$repository" ]; then repository="$repoName"; fi + fi +fi + +if [ -n "$organization" ]; then toolArgs+=( --organization "$organization" ); fi +if [ -n "$repository" ]; then toolArgs+=( --repository "$repository" ); fi +if [ -n "${HELIX_MONITOR_TEST_RESULT_ATTACHMENT_MODE:-}" ]; then + toolArgs+=( --test-result-attachment-mode "$HELIX_MONITOR_TEST_RESULT_ATTACHMENT_MODE" ) +fi + +# These values let the monitor derive the same Helix source filter as the SDK submitter. +toolArgs+=( --build-reason "$BUILD_REASON" ) +toolArgs+=( --source-branch "$BUILD_SOURCEBRANCH" ) + +cd "$BUILD_SOURCESDIRECTORY" +exitCode=0 +if [ -n "${HELIX_MONITOR_TOOL_NUPKG_ARTIFACT_NAME:-}" ]; then + export DOTNET_ROOT="$BUILD_SOURCESDIRECTORY/.dotnet" + ./eng/common/dotnet.sh exec "$HELIXJOBMONITORDLL" "${toolArgs[@]}" || exitCode=$? +else + ./eng/common/dotnet.sh tool run "$HELIX_MONITOR_TOOL_COMMAND" -- "${toolArgs[@]}" || exitCode=$? +fi + +if [ "$exitCode" -ne 0 ]; then + Write-PipelineTelemetryError -force -category 'Helix' "Helix job monitor failed (exit code '$exitCode')." + exit "$exitCode" +fi diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index cea14279b857ee..9cb84a8a9419a5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -31,8 +31,9 @@ # Set to true to reuse msbuild nodes. Recommended to not reuse on CI. [bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci } -# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI. -[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { !$ci } +# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds. +# Not applied when building with msbuild.exe (VS MSBuild). +[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { $true } # Configures warning treatment in msbuild. [bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true } @@ -812,8 +813,9 @@ function MSBuild() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" - # Build with MSBuild's multi-threaded mode. - if ($msbuildMultiThreaded) { + # Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now. + # TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989 + if ($msbuildMultiThreaded -and [System.IO.Path]::GetFileName($buildTool.Path) -ne 'msbuild.exe') { $cmdArgs += ' -mt' } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index fdbc19243f1fb3..3b4a5ac5142a3f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -60,13 +60,9 @@ else node_reuse=${node_reuse:-true} fi -# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI. +# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds. msbuild_multi_threaded=$(NormalizeBoolArg "${msbuild_multi_threaded:-}") -if [[ "$ci" == true ]]; then - msbuild_multi_threaded=${msbuild_multi_threaded:-false} -else - msbuild_multi_threaded=${msbuild_multi_threaded:-true} -fi +msbuild_multi_threaded=${msbuild_multi_threaded:-true} # Configures warning treatment in msbuild. warn_as_error=$(NormalizeBoolArg "${warn_as_error:-}") diff --git a/global.json b/global.json index 075312686edd5b..27020c4c115687 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-rc.1.26420.103", + "version": "12.0.100-alpha.1.26480.102", "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": "12.0.100-alpha.1.26480.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26471.108", - "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26471.108", - "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26471.108", + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26508.114", + "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26508.114", + "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26508.114", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26471.108" + "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26508.114" } } From fb89546ac80ad6d19a0b715d6c584c05aa7f3a02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Oct 2026 02:08:06 +0000 Subject: [PATCH 2/2] Update dependencies from build 335867 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.13.0-1.26508.114 -> 5.13.0-1.26509.101) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.DotNet.GenAPI.Task (Version 12.0.100-alpha.1.26508.114 -> 12.0.100-alpha.1.26509.101) 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 12.0.0-beta.26508.114 -> 12.0.0-beta.26509.101) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26508.114 -> 0.11.5-preview.26509.101) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26508.114 -> 2.9.3-beta.26509.101) 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 12.0.0-alpha.1.26508.114 -> 12.0.0-alpha.1.26509.101) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 8.0.0-rc.51014 -> 8.0.0-rc.51101) System.CommandLine (Version 4.0.0-alpha.1.26508.114 -> 4.0.0-alpha.1.26509.101) [[ 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 801db5acc16bc4..9395d86400bb5f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "12.0.0-beta.26508.114", + "version": "12.0.0-beta.26509.101", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e7e2bf2a9d7428..517d514d159f0e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,47 +6,47 @@ This file should be imported by eng/Versions.props - 5.13.0-1.26508.114 - 5.13.0-1.26508.114 - 5.13.0-1.26508.114 - 5.13.0-1.26508.114 - 12.0.100-alpha.1.26508.114 - 12.0.100-alpha.1.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 0.11.5-preview.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.100-alpha.1.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 12.0.0-beta.26508.114 - 2.9.3-beta.26508.114 - 12.0.0-beta.26508.114 - 5.13.0-1.26508.114 - 12.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 - 8.0.0-rc.51014 - 8.0.0-rc.51014 - 8.0.0-rc.51014 - 8.0.0-rc.51014 - 12.0.0-alpha.1.26508.114 - 4.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 - 12.0.0-alpha.1.26508.114 + 5.13.0-1.26509.101 + 5.13.0-1.26509.101 + 5.13.0-1.26509.101 + 5.13.0-1.26509.101 + 12.0.100-alpha.1.26509.101 + 12.0.100-alpha.1.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 0.11.5-preview.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.100-alpha.1.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 12.0.0-beta.26509.101 + 2.9.3-beta.26509.101 + 12.0.0-beta.26509.101 + 5.13.0-1.26509.101 + 12.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 + 8.0.0-rc.51101 + 8.0.0-rc.51101 + 8.0.0-rc.51101 + 8.0.0-rc.51101 + 12.0.0-alpha.1.26509.101 + 4.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 + 12.0.0-alpha.1.26509.101 11.0.0-alpha.1.26418.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f5e2bf85a76cd..8920aab69b352d 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 c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project c4647a579aa25deb059728600979faf091e9a9b9 - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 4f2266d4c147bd8af3fe4dff129f725ddb9dce57 - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,33 +323,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -361,21 +361,21 @@ - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b https://github.com/dotnet/node @@ -417,9 +417,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 6780ebfddbb695447cc33bf976bf4c6de8031ef3 + 907535df2f7eb8e1845571867684244ad04b031b diff --git a/global.json b/global.json index 27020c4c115687..e9034e8e65eed5 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "12.0.100-alpha.1.26480.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26508.114", - "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26508.114", - "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26508.114", + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26509.101", + "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26509.101", + "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26509.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26508.114" + "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26509.101" } }