Skip to content

Commit 1b7186d

Browse files
[release/8.0.4xx] Update dependencies from dotnet/arcade (#10486)
This pull request updates the following dependencies [marker]: <> (Begin:20c4d86a-e5ce-445f-1cbe-08dc5a6a3fdf) ## From https://github.com/dotnet/arcade - **Subscription**: [20c4d86a-e5ce-445f-1cbe-08dc5a6a3fdf](https://maestro.dot.net/subscriptions?search=20c4d86a-e5ce-445f-1cbe-08dc5a6a3fdf) - **Build**: [20260915.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=3076310) ([332072](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/332072)) - **Date Produced**: September 15, 2026 8:23:49 AM UTC - **Commit**: [659e244c0464986411ccd6ccf51084c96ae66091](dotnet/arcade@659e244) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [8.0.0-beta.26458.9 to 8.0.0-beta.26465.3][1] - Microsoft.DotNet.Arcade.Sdk [1]: dotnet/arcade@d1fe175...659e244 [DependencyUpdate]: <> (End) [marker]: <> (End:20c4d86a-e5ce-445f-1cbe-08dc5a6a3fdf) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent f89e803 commit 1b7186d

6 files changed

Lines changed: 87 additions & 17 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Dependency>
1818
</ProductDependencies>
1919
<ToolsetDependencies>
20-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26458.9">
20+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26465.3">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>d1fe17557ceac42ed078d3b4a8f2f4b5247aa7da</Sha>
22+
<Sha>659e244c0464986411ccd6ccf51084c96ae66091</Sha>
2323
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/common/templates-official/job/job.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ jobs:
116116
- name: ${{ pair.key }}
117117
value: ${{ pair.value }}
118118

119-
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
119+
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds.
120+
# Entra-enabled Helix templates do not forward this value to their processes.
120121
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
121122
- group: DotNet-HelixApi-Access
122123

‎eng/common/templates-official/steps/send-to-helix.yml‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ parameters:
44
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
55
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
66
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
7-
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
7+
HelixAccessToken: '' # optional -- legacy access token; not forwarded when HelixUseEntraAuthentication is true
8+
HelixUseEntraAuthentication: false # optional -- use refreshable Entra authentication instead of a PAT or anonymous access
9+
HelixAzureSubscription: '' # required when HelixUseEntraAuthentication is true -- Azure service connection ID authorized for Helix
810
HelixConfiguration: '' # optional -- additional property attached to a job
911
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1012
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
@@ -22,15 +24,37 @@ parameters:
2224
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2325
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2426
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
25-
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
27+
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if Entra is disabled, HelixAccessToken is empty, and Creator is set
2628
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2729
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
2830
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2931
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
3032
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3133

3234
steps:
33-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
35+
- ${{ if and(eq(parameters.HelixUseEntraAuthentication, true), eq(parameters.HelixAzureSubscription, '')) }}:
36+
- pwsh: throw "HelixAzureSubscription must be set when HelixUseEntraAuthentication is true."
37+
displayName: Validate Helix Entra authentication
38+
condition: ${{ parameters.condition }}
39+
40+
- ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
41+
- task: AzureCLI@2
42+
displayName: Initialize Helix Entra authentication
43+
inputs:
44+
azureSubscription: ${{ parameters.HelixAzureSubscription }}
45+
addSpnToEnvironment: true
46+
scriptType: pscore
47+
scriptLocation: inlineScript
48+
inlineScript: |
49+
if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) {
50+
throw "The Helix Azure service connection did not provide a service principal or tenant ID."
51+
}
52+
53+
Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId"
54+
Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId"
55+
condition: ${{ parameters.condition }}
56+
57+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3458
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3559
env:
3660
BuildConfig: $(_BuildConfig)
@@ -39,7 +63,12 @@ steps:
3963
HelixBuild: ${{ parameters.HelixBuild }}
4064
HelixConfiguration: ${{ parameters.HelixConfiguration }}
4165
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
42-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
66+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
67+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
68+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
69+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
70+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
71+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
4372
HelixPreCommands: ${{ parameters.HelixPreCommands }}
4473
HelixPostCommands: ${{ parameters.HelixPostCommands }}
4574
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
@@ -60,7 +89,7 @@ steps:
6089
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6190
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6291
continueOnError: ${{ parameters.continueOnError }}
63-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
92+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6493
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6594
env:
6695
BuildConfig: $(_BuildConfig)
@@ -69,7 +98,12 @@ steps:
6998
HelixBuild: ${{ parameters.HelixBuild }}
7099
HelixConfiguration: ${{ parameters.HelixConfiguration }}
71100
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
72-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
101+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
102+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
103+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
104+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
105+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
106+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
73107
HelixPreCommands: ${{ parameters.HelixPreCommands }}
74108
HelixPostCommands: ${{ parameters.HelixPostCommands }}
75109
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}

‎eng/common/templates/job/job.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ jobs:
114114
- name: ${{ pair.key }}
115115
value: ${{ pair.value }}
116116

117-
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
117+
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds.
118+
# Entra-enabled Helix templates do not forward this value to their processes.
118119
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
119120
- group: DotNet-HelixApi-Access
120121

‎eng/common/templates/steps/send-to-helix.yml‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ parameters:
44
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
55
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
66
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
7-
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
7+
HelixAccessToken: '' # optional -- legacy access token; not forwarded when HelixUseEntraAuthentication is true
8+
HelixUseEntraAuthentication: false # optional -- use refreshable Entra authentication instead of a PAT or anonymous access
9+
HelixAzureSubscription: '' # required when HelixUseEntraAuthentication is true -- Azure service connection ID authorized for Helix
810
HelixConfiguration: '' # optional -- additional property attached to a job
911
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1012
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
@@ -22,15 +24,37 @@ parameters:
2224
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2325
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2426
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
25-
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
27+
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if Entra is disabled, HelixAccessToken is empty, and Creator is set
2628
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2729
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
2830
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2931
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
3032
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3133

3234
steps:
33-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
35+
- ${{ if and(eq(parameters.HelixUseEntraAuthentication, true), eq(parameters.HelixAzureSubscription, '')) }}:
36+
- pwsh: throw "HelixAzureSubscription must be set when HelixUseEntraAuthentication is true."
37+
displayName: Validate Helix Entra authentication
38+
condition: ${{ parameters.condition }}
39+
40+
- ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
41+
- task: AzureCLI@2
42+
displayName: Initialize Helix Entra authentication
43+
inputs:
44+
azureSubscription: ${{ parameters.HelixAzureSubscription }}
45+
addSpnToEnvironment: true
46+
scriptType: pscore
47+
scriptLocation: inlineScript
48+
inlineScript: |
49+
if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) {
50+
throw "The Helix Azure service connection did not provide a service principal or tenant ID."
51+
}
52+
53+
Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId"
54+
Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId"
55+
condition: ${{ parameters.condition }}
56+
57+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3458
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3559
env:
3660
BuildConfig: $(_BuildConfig)
@@ -39,7 +63,12 @@ steps:
3963
HelixBuild: ${{ parameters.HelixBuild }}
4064
HelixConfiguration: ${{ parameters.HelixConfiguration }}
4165
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
42-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
66+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
67+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
68+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
69+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
70+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
71+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
4372
HelixPreCommands: ${{ parameters.HelixPreCommands }}
4473
HelixPostCommands: ${{ parameters.HelixPostCommands }}
4574
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
@@ -60,7 +89,7 @@ steps:
6089
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6190
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6291
continueOnError: ${{ parameters.continueOnError }}
63-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
92+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6493
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6594
env:
6695
BuildConfig: $(_BuildConfig)
@@ -69,7 +98,12 @@ steps:
6998
HelixBuild: ${{ parameters.HelixBuild }}
7099
HelixConfiguration: ${{ parameters.HelixConfiguration }}
71100
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
72-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
101+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
102+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
103+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
104+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
105+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
106+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
73107
HelixPreCommands: ${{ parameters.HelixPreCommands }}
74108
HelixPostCommands: ${{ parameters.HelixPostCommands }}
75109
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "8.0.126"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26458.9"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26465.3"
77
}
88
}

0 commit comments

Comments
 (0)