Skip to content

Commit 2ed8cce

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240624.7 (#483)
[main] Update dependencies from dotnet/arcade
1 parent 29880ec commit 2ed8cce

File tree

8 files changed

+51
-44
lines changed

8 files changed

+51
-44
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24321.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24324.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>a95bcc256e9bdf47394e4dab04872811c16daaea</Sha>
8+
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24321.3">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24324.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>a95bcc256e9bdf47394e4dab04872811c16daaea</Sha>
12+
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

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

Lines changed: 7 additions & 8 deletions
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‎

Lines changed: 7 additions & 5 deletions
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)
@@ -144,7 +147,6 @@ jobs:
144147
arguments: -BuildId $(BARBuildId)
145148
-PublishingInfraVersion 3
146149
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
147-
-MaestroToken '$(MaestroApiAccessToken)'
148150
-WaitPublishingFinish true
149151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
150152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

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

Lines changed: 5 additions & 3 deletions
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‎

Lines changed: 7 additions & 5 deletions
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)
@@ -140,7 +143,6 @@ jobs:
140143
arguments: -BuildId $(BARBuildId)
141144
-PublishingInfraVersion 3
142145
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
143-
-MaestroToken '$(MaestroApiAccessToken)'
144146
-WaitPublishingFinish true
145147
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
146148
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

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

Lines changed: 5 additions & 3 deletions
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‎

Lines changed: 14 additions & 14 deletions
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.101"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24321.3"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7"
88
}
99
}

0 commit comments

Comments
 (0)