[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]>
dotnet · Apr 5, 2022 · 17a566b · 17a566b
1 parent fac9527
commit 17a566b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/eng/PrepareRelease.yml b/eng/PrepareRelease.yml
@@ -19,15 +19,19 @@ stages:
       - group: DotNet-Diagnostics-Storage
       - group: DotNet-DotNetStage-Storage
       - group: Release-Pipeline
-      - name: BARBuildId
-        value: $[ stageDependencies.publish_using_darc.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
     steps:
     - task: UseDotNet@2
       displayName: 'Use .NET Core runtime 3.1.x'
       inputs:
         packageType: runtime
         version: 3.1.x
         installationPath: '$(Build.Repository.LocalPath)\.dotnet'
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core runtime 6.x'
+      inputs:
+        packageType: runtime
+        version: 6.x
+        installationPath: '$(Build.Repository.LocalPath)\.dotnet'
     - ${{ 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/')))) }}:
       - script: '$(Build.SourcesDirectory)\dotnet.cmd build $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release /bl'
         workingDirectory: '$(System.ArtifactsDirectory)\'
@@ -38,13 +42,14 @@ stages:
           publishLocation: 'pipeline'
           artifact: 'DiagnosticsReleaseToolBin'
     - ${{ 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/'))) }}:
+      - template: /eng/common/templates/post-build/setup-maestro-vars.yml
       - task: PowerShell@2
         displayName: 'DARC Gather build'
         inputs:
           targetType: filePath
           filePath: '$(Build.Repository.LocalPath)/eng/release/Scripts/AcquireBuild.ps1'
           arguments: >-
-            -BarBuildId "$(BARBuildId)" 
+            -BarBuildId "$(BARBuildId)" 
             -AzdoToken "$(dn-bot-dotnet-all-scopes)" 
             -MaestroToken "$(MaestroAccessToken)" 
             -GitHubToken "$(BotAccount-dotnet-bot-repo-PAT)"