Skip to content

Commit 17a566b

Browse files
[release/6.1] Port release preparation fixes (#1676)
* Inline maestro vars (#1423) * Remove task reference from BuildId parameter (#1427) * Install 6.0 runtime for release stage Co-authored-by: Wiktor Kopec <[email protected]>
1 parent fac9527 commit 17a566b

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

eng/PrepareRelease.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ stages:
1919
- group: DotNet-Diagnostics-Storage
2020
- group: DotNet-DotNetStage-Storage
2121
- group: Release-Pipeline
22-
- name: BARBuildId
23-
value: $[ stageDependencies.publish_using_darc.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
2422
steps:
2523
- task: UseDotNet@2
2624
displayName: 'Use .NET Core runtime 3.1.x'
2725
inputs:
2826
packageType: runtime
2927
version: 3.1.x
3028
installationPath: '$(Build.Repository.LocalPath)\.dotnet'
29+
- task: UseDotNet@2
30+
displayName: 'Use .NET Core runtime 6.x'
31+
inputs:
32+
packageType: runtime
33+
version: 6.x
34+
installationPath: '$(Build.Repository.LocalPath)\.dotnet'
3135
- ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/test/release/')))) }}:
3236
- script: '$(Build.SourcesDirectory)\dotnet.cmd build $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release /bl'
3337
workingDirectory: '$(System.ArtifactsDirectory)\'
@@ -38,13 +42,14 @@ stages:
3842
publishLocation: 'pipeline'
3943
artifact: 'DiagnosticsReleaseToolBin'
4044
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/test/release/'))) }}:
45+
- template: /eng/common/templates/post-build/setup-maestro-vars.yml
4146
- task: PowerShell@2
4247
displayName: 'DARC Gather build'
4348
inputs:
4449
targetType: filePath
4550
filePath: '$(Build.Repository.LocalPath)/eng/release/Scripts/AcquireBuild.ps1'
4651
arguments: >-
47-
-BarBuildId "$(BARBuildId)"
52+
-BarBuildId "$(BARBuildId)"
4853
-AzdoToken "$(dn-bot-dotnet-all-scopes)"
4954
-MaestroToken "$(MaestroAccessToken)"
5055
-GitHubToken "$(BotAccount-dotnet-bot-repo-PAT)"

0 commit comments

Comments
 (0)