Skip to content

Commit 99446ae

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#3591)
* Update dependencies from https://github.com/dotnet/arcade build 20240628.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24324.1 -> To Version 8.0.0-beta.24328.2 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24324.1 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24324.1 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24324.1 -> To Version 8.0.0-beta.24360.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 253dba7 commit 99446ae

File tree

8 files changed

+60
-47
lines changed

8 files changed

+60
-47
lines changed

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24324.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>748cd976bf8b0f69b809e569943635ab8be36dc8</Sha>
8+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/post-build/publish-using-darc.ps1

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
44
[Parameter(Mandatory=$true)][string] $AzdoToken,
5-
[Parameter(Mandatory=$true)][string] $MaestroToken,
65
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
76
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
87
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
@@ -31,13 +30,13 @@ try {
3130
}
3231

3332
& $darc add-build-to-channel `
34-
--id $buildId `
35-
--publishing-infra-version $PublishingInfraVersion `
36-
--default-channels `
37-
--source-branch main `
38-
--azdev-pat $AzdoToken `
39-
--bar-uri $MaestroApiEndPoint `
40-
--password $MaestroToken `
33+
--id $buildId `
34+
--publishing-infra-version $PublishingInfraVersion `
35+
--default-channels `
36+
--source-branch main `
37+
--azdev-pat "$AzdoToken" `
38+
--bar-uri "$MaestroApiEndPoint" `
39+
--ci `
4140
@optionalParams
4241

4342
if ($LastExitCode -ne 0) {

‎eng/common/templates-official/job/publish-build-assets.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,16 @@ jobs:
7676

7777
- task: NuGetAuthenticate@1
7878

79-
- task: PowerShell@2
79+
- task: AzureCLI@2
8080
displayName: Publish Build Assets
8181
inputs:
82-
filePath: eng\common\sdk-task.ps1
83-
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
82+
azureSubscription: "Darc: Maestro Production"
83+
scriptType: ps
84+
scriptLocation: scriptPath
85+
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
86+
arguments: >
87+
-task PublishBuildAssets -restore -msbuildEngine dotnet
8488
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
85-
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
8689
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
8790
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
8891
/p:OfficialBuildId=$(Build.BuildNumber)
@@ -137,14 +140,16 @@ jobs:
137140
BARBuildId: ${{ parameters.BARBuildId }}
138141
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
139142

140-
- task: PowerShell@2
143+
- task: AzureCLI@2
141144
displayName: Publish Using Darc
142145
inputs:
143-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
144-
arguments: -BuildId $(BARBuildId)
146+
azureSubscription: "Darc: Maestro Production"
147+
scriptType: ps
148+
scriptLocation: scriptPath
149+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
150+
arguments: -BuildId $(BARBuildId)
145151
-PublishingInfraVersion 3
146152
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
147-
-MaestroToken '$(MaestroApiAccessToken)'
148153
-WaitPublishingFinish true
149154
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
150155
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates-official/post-build/post-build.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,16 @@ stages:
272272

273273
- task: NuGetAuthenticate@1
274274

275-
- task: PowerShell@2
275+
- task: AzureCLI@2
276276
displayName: Publish Using Darc
277277
inputs:
278-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
278+
azureSubscription: "Darc: Maestro Production"
279+
scriptType: ps
280+
scriptLocation: scriptPath
281+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
279282
arguments: -BuildId $(BARBuildId)
280283
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
281284
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
282-
-MaestroToken '$(MaestroApiAccessToken)'
283285
-WaitPublishingFinish true
284286
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
285287
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates/job/publish-build-assets.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,16 @@ jobs:
7474

7575
- task: NuGetAuthenticate@1
7676

77-
- task: PowerShell@2
77+
- task: AzureCLI@2
7878
displayName: Publish Build Assets
7979
inputs:
80-
filePath: eng\common\sdk-task.ps1
81-
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
80+
azureSubscription: "Darc: Maestro Production"
81+
scriptType: ps
82+
scriptLocation: scriptPath
83+
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
84+
arguments: >
85+
-task PublishBuildAssets -restore -msbuildEngine dotnet
8286
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
83-
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
8487
/p:MaestroApiEndpoint=https://maestro.dot.net
8588
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
8689
/p:OfficialBuildId=$(Build.BuildNumber)
@@ -133,14 +136,16 @@ jobs:
133136
BARBuildId: ${{ parameters.BARBuildId }}
134137
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
135138

136-
- task: PowerShell@2
139+
- task: AzureCLI@2
137140
displayName: Publish Using Darc
138141
inputs:
139-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
140-
arguments: -BuildId $(BARBuildId)
142+
azureSubscription: "Darc: Maestro Production"
143+
scriptType: ps
144+
scriptLocation: scriptPath
145+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
146+
arguments: -BuildId $(BARBuildId)
141147
-PublishingInfraVersion 3
142148
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
143-
-MaestroToken '$(MaestroApiAccessToken)'
144149
-WaitPublishingFinish true
145150
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
146151
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates/post-build/post-build.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,16 @@ stages:
268268

269269
- task: NuGetAuthenticate@1
270270

271-
- task: PowerShell@2
271+
- task: AzureCLI@2
272272
displayName: Publish Using Darc
273273
inputs:
274-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
274+
azureSubscription: "Darc: Maestro Production"
275+
scriptType: ps
276+
scriptLocation: scriptPath
277+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
275278
arguments: -BuildId $(BARBuildId)
276279
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
277280
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
278-
-MaestroToken '$(MaestroApiAccessToken)'
279281
-WaitPublishingFinish true
280282
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
281283
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates/post-build/setup-maestro-vars.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ steps:
1111
artifactName: ReleaseConfigs
1212
checkDownloadedFiles: true
1313

14-
- task: PowerShell@2
14+
- task: AzureCLI@2
1515
name: setReleaseVars
1616
displayName: Set Release Configs Vars
1717
inputs:
18-
targetType: inline
19-
pwsh: true
20-
script: |
18+
azureSubscription: "Darc: Maestro Production"
19+
scriptType: pscore
20+
scriptLocation: inlineScript
21+
inlineScript: |
2122
try {
2223
if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
2324
$Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
@@ -31,15 +32,16 @@ steps:
3132
$AzureDevOpsBuildId = $Env:Build_BuildId
3233
}
3334
else {
34-
$buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
35+
. $(Build.SourcesDirectory)\eng\common\tools.ps1
36+
$darc = Get-Darc
37+
$buildInfo = & $darc get-build `
38+
--id ${{ parameters.BARBuildId }} `
39+
--extended `
40+
--output-format json `
41+
--ci `
42+
| convertFrom-Json
3543
36-
$apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
37-
$apiHeaders.Add('Accept', 'application/json')
38-
$apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
39-
40-
$buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
41-
42-
$BarId = $Env:BARBuildId
44+
$BarId = ${{ parameters.BARBuildId }}
4345
$Channels = $Env:PromoteToMaestroChannels -split ","
4446
$Channels = $Channels -join "]["
4547
$Channels = "[$Channels]"
@@ -65,6 +67,4 @@ steps:
6567
exit 1
6668
}
6769
env:
68-
MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
69-
BARBuildId: ${{ parameters.BARBuildId }}
7070
PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"rollForward": "latestMinor"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.1"
12+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5"
1313
}
1414
}

0 commit comments

Comments
 (0)