From 0f6815a8aec69cde3206664db24748eadcc76328 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Sep 2026 01:47:28 +0000 Subject: [PATCH 1/2] Update dependencies from build 332243 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26464.119 -> 11.0.0-beta.26465.108) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-rc.2.26464.119 -> 11.0.0-rc.2.26465.108) [[ commit created by automation ]] --- eng/Version.Details.props | 34 ++++----- eng/Version.Details.xml | 70 +++++++++---------- .../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 | 4 +- 6 files changed, 135 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a00edff5477..04d5415e630 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26464.119 - 11.0.0-beta.26464.119 - 11.0.0-beta.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-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-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-rc.2.26464.119 - 11.0.0-rc.2.26464.119 - 11.0.0-rc.2.26464.119 + 11.0.0-beta.26465.108 + 11.0.0-beta.26465.108 + 11.0.0-beta.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-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-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-rc.2.26465.108 + 11.0.0-rc.2.26465.108 + 11.0.0-rc.2.26465.108 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 290a7de22c9..49d46faa615 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,76 +1,76 @@ - + - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 - + https://github.com/dotnet/dotnet - e30f34edad9fde012dbe3d67c95aa4db4c1d022b + e5abd3f0528a8467c64a855a6ff569566d0daf27 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 53bbf74927e..7417afdf3ea 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 cb60f529784..7da6bdf520e 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 ec7a2000399..62cce4d4ea2 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 b7f56e0aeaf..a4d7da9c43a 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26464.119", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26464.119", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.108", "Microsoft.Build.NoTargets": "3.7.134" } } From 9eac6272ff039b85b6ba1245c63c8fb8aedb0463 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Sep 2026 12:19:08 +0000 Subject: [PATCH 2/2] Update dependencies from build 332290 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26465.108 -> 11.0.0-beta.26465.113) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-rc.2.26465.108 -> 11.0.0-rc.2.26465.113) [[ commit created by automation ]] --- eng/Version.Details.props | 34 +++++++++---------- eng/Version.Details.xml | 70 +++++++++++++++++++-------------------- global.json | 4 +-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 04d5415e630..c82ef023a18 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26465.108 - 11.0.0-beta.26465.108 - 11.0.0-beta.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-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-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-rc.2.26465.108 - 11.0.0-rc.2.26465.108 - 11.0.0-rc.2.26465.108 + 11.0.0-beta.26465.113 + 11.0.0-beta.26465.113 + 11.0.0-beta.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 + 11.0.0-rc.2.26465.113 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49d46faa615..629aeb70f3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,76 +1,76 @@ - + - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d - + https://github.com/dotnet/dotnet - e5abd3f0528a8467c64a855a6ff569566d0daf27 + 3d2a4811a58d8ba08bc2162cced36034f98c6b5d diff --git a/global.json b/global.json index a4d7da9c43a..768e7d1b368 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26465.113", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26465.113", "Microsoft.Build.NoTargets": "3.7.134" } }