Skip to content

Commit b9d711a

Browse files
authored
[ci] Use passwordless auth for darc/maestro (#24220)
* [ci] Use passwordless auth for darc/maestro Fixes: #23974 Migrates darc/maestro commands to use a passwordless auth flow, as token based authentication is deprecated and will be removed in the future. * Update Microsoft.DotNet.Build.Tasks.Feed
1 parent d27a10f commit b9d711a

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@
149149
</Dependency>
150150
</ProductDependencies>
151151
<ToolsetDependencies>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24311.4">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24408.2">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>c0a26bebfc5bda84ba691a04014aac41b0296b99</Sha>
154+
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
155155
</Dependency>
156156
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.4">
157157
<Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
133133
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
134134
<SystemDrawingCommonPackageVersion>8.0.3</SystemDrawingCommonPackageVersion>
135-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24311.4</MicrosoftDotNetBuildTasksFeedVersion>
135+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedVersion>
136136
</PropertyGroup>
137137
<PropertyGroup>
138138
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>

eng/pipelines/common/sdk-insertion.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
name: ${{ parameters.poolName }}
1616
image: ${{ parameters.vmImage }}
1717
os: ${{ parameters.os }}
18-
variables:
19-
- group: Publish-Build-Assets
2018
templateContext:
2119
outputs:
2220
- output: artifactsDrop
@@ -66,23 +64,30 @@ jobs:
6664
version: $(DOTNET_VERSION)
6765
includePreviewVersions: true
6866

69-
- task: DotNetCoreCLI@2
67+
- task: AzureCLI@2
7068
displayName: Generate and publish BAR manifest
7169
inputs:
72-
projects: $(Build.SourcesDirectory)\src\Workload\Microsoft.Maui.Sdk\Microsoft.Maui.Sdk.csproj
73-
arguments: >-
70+
azureSubscription: "Darc: Maestro Production"
71+
scriptType: ps
72+
scriptLocation: inlineScript
73+
inlineScript: >-
74+
dotnet build $(Build.SourcesDirectory)\src\Workload\Microsoft.Maui.Sdk\Microsoft.Maui.Sdk.csproj
7475
-t:PushManifestToBuildAssetRegistry
7576
-p:OfficialBuildId=$(_BuildOfficalId)
76-
-p:BuildAssetRegistryToken=$(MaestroAccessToken)
7777
-p:OutputPath=${{ parameters.nugetArtifactPath }}
7878
-v:n -bl:$(Build.StagingDirectory)\binlogs\push-bar-manifest.binlog
7979
condition: and(succeeded(), eq('${{ parameters.pushMauiPackagesToMaestro }}', 'true'))
8080

81-
- powershell: |
82-
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
83-
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
84-
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
85-
& dotnet tool update microsoft.dotnet.darc --version "$darcVersion" --add-source "$arcadeServicesSource" --tool-path $(Agent.ToolsDirectory)\darc -v n
86-
& $(Agent.ToolsDirectory)\darc\darc add-build-to-channel --default-channels --id $(BARBuildId) --publishing-infra-version 3 --password $(MaestroAccessToken) --azdev-pat $(publishing-dnceng-devdiv-code-r-build-re)
81+
- task: AzureCLI@2
82+
inputs:
83+
azureSubscription: "Darc: Maestro Production"
84+
scriptType: ps
85+
scriptLocation: inlineScript
86+
inlineScript: |
87+
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
88+
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
89+
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
90+
& dotnet tool update microsoft.dotnet.darc --version "$darcVersion" --add-source "$arcadeServicesSource" --tool-path $(Agent.ToolsDirectory)\darc -v n
91+
& $(Agent.ToolsDirectory)\darc\darc add-build-to-channel --default-channels --id $(BARBuildId) --ci --publishing-infra-version 3 --azdev-pat $(System.AccessToken)
8792
displayName: Add build to default darc channel
8893
condition: and(succeeded(), eq('${{ parameters.pushMauiPackagesToMaestro }}', 'true'))

0 commit comments

Comments
 (0)