From a718906843304e6576efa46f93482566ed17c0d3 Mon Sep 17 00:00:00 2001
From: Juan Hoyos <juan.s.hoyos@outlook.com>
Date: Thu, 7 Apr 2022 21:16:33 -0700
Subject: [PATCH] Set the build ID using arcade's scripts instead of retrieving
 it from another job (#2993)

---
 eng/prepare-release.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eng/prepare-release.yml b/eng/prepare-release.yml
index 61a55f62de..f1246e2ec5 100644
--- a/eng/prepare-release.yml
+++ b/eng/prepare-release.yml
@@ -19,8 +19,6 @@ stages:
       - group: DotNet-Diagnostics-Storage
       - group: DotNet-DotNetStage-Storage
       - group: Release-Pipeline
-      - name: BARBuildId
-        value: $[ stageDependencies.publish_using_darc.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
     steps:
     - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
       - script: '$(Build.Repository.LocalPath)\dotnet.cmd build $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release /bl'
@@ -33,11 +31,12 @@ stages:
           artifact: 'DiagnosticsReleaseToolBin'
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
       - task: UseDotNet@2
-        displayName: 'Use .NET Core runtime 3.1.x'
+        displayName: 'Use .NET Core runtime 6.x'
         inputs:
           packageType: runtime
-          version: 3.1.x
+          version: 6.x
           installationPath: '$(Build.Repository.LocalPath)\.dotnet'
+      - template: /eng/common/templates/post-build/setup-maestro-vars.yml
       - task: PowerShell@2
         displayName: 'DARC Gather build'
         inputs: