Update dependencies from https://github.com/dotnet/arcade build 20200819.21 (#1477)

[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.RemoteExecutor: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21
2020-08-24 16:02:11 +00:00 · 2020-08-24 16:02:11 +00:00 · cff5003d75
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -4,9 +4,9 @@
      <Uri>https://github.com/dotnet/command-line-api</Uri>
      <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20419.21">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
    </Dependency>
    <Dependency Name="Microsoft.SymbolStore" Version="1.0.142101">
      <Uri>https://github.com/dotnet/symstore</Uri>
@ -14,9 +14,9 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20419.21">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
    </Dependency>
    <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20412.8">
      <Uri>https://github.com/dotnet/runtime</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -54,7 +54,7 @@
    <SystemThreadingChannelsVersion>4.7.0</SystemThreadingChannelsVersion>
    <XUnitVersion>2.4.1</XUnitVersion>
    <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20417.6</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20419.21</MicrosoftDotNetRemoteExecutorVersion>
    <cdbsosversion>10.0.18362</cdbsosversion>
  </PropertyGroup>
  <PropertyGroup>
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@ -199,14 +199,15 @@ if [[ "$mono_dotnet" != "" ]]; then
 fi

 if [[ "$wasm_runtime_loc" != "" ]]; then
-    configurations="CompilationMode=wasm;RunKind=micro"
+    configurations="CompilationMode=wasm RunKind=micro"
+    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM"
 fi

 if [[ "$monointerpreter" == "true" ]]; then
    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter"
 fi

-common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs \"$configurations\" --architecture $architecture"
+common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
 setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"


--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@ -1,12 +1,13 @@
 param(
  [Parameter(Mandatory=$true)][int] $BuildId,
+  [Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
  [Parameter(Mandatory=$true)][string] $AzdoToken,
  [Parameter(Mandatory=$true)][string] $MaestroToken,
  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
  [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
-  [Parameter(Mandatory=$true)][string] $EnableSourceLinkValidation,
-  [Parameter(Mandatory=$true)][string] $EnableSigningValidation,
-  [Parameter(Mandatory=$true)][string] $EnableNugetValidation,
+  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
+  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
+  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
  [Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums,
  [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
@ -14,7 +15,8 @@ param(

 try {
  . $PSScriptRoot\post-build-utils.ps1
-  . $PSScriptRoot\..\darc-init.ps1
+  # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
+  . $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1"

  $optionalParams = [System.Collections.ArrayList]::new()

@ -50,6 +52,7 @@ try {

  & darc add-build-to-channel `
  --id $buildId `
+  --publishing-infra-version $PublishingInfraVersion `
  --default-channels `
  --source-branch master `
  --azdev-pat $AzdoToken `
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml
@ -1,4 +1,6 @@
 parameters:
+  BARBuildId: ''
+  PromoteToChannelIds: ''
  artifactsPublishingAdditionalParameters: ''
  dependsOn:
  - Validate
@ -19,6 +21,9 @@ stages:
  displayName: ${{ parameters.channelName }} Publishing
  jobs:
  - template: ../setup-maestro-vars.yml
+    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}

  - job: publish_symbols
    displayName: Symbol Publishing
@ -138,6 +143,7 @@ stages:
        inputs:
          filePath: eng\common\sdk-task.ps1
          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
+            /p:PublishingInfraVersion=2
            /p:IsStableBuild=$(IsStableBuild)
            /p:IsInternalBuild=$(IsInternalBuild)
            /p:RepositoryName=$(Build.Repository.Name)
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-public-channel.yml
@ -1,4 +1,6 @@
 parameters:
+  BARBuildId: ''
+  PromoteToChannelIds: ''
  artifactsPublishingAdditionalParameters: ''
  dependsOn:
  - Validate
@ -21,6 +23,9 @@ stages:
  displayName: ${{ parameters.channelName }} Publishing
  jobs:
  - template: ../setup-maestro-vars.yml
+    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}

  - job: publish_symbols
    displayName: Symbol Publishing
@ -137,6 +142,7 @@ stages:
        inputs:
          filePath: eng\common\sdk-task.ps1
          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
+            /p:PublishingInfraVersion=2
            /p:ArtifactsCategory=$(ArtifactsCategory)
            /p:IsStableBuild=$(IsStableBuild)
            /p:IsInternalBuild=$(IsInternalBuild)
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@ -1,13 +1,20 @@
 parameters:
+ # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+  # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
+  # Publishing V3 DOES NOT accept inlining the publishing stages.
+  publishingInfraVersion: 2
  # When set to true the publishing templates from the repo will be used
  # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
  inline: true

  # Only used if inline==false. When set to true will stall the current build until
-  # the Promotion Pipeline build finishes. Otherwise, the current build continue 
+  # the Promotion Pipeline build finishes. Otherwise, the current build will continue 
  # execution concurrently with the promotion build.
  waitPublishingFinish: true

+  BARBuildId: ''
+  PromoteToChannelIds: ''
+
  enableSourceLinkValidation: false
  enableSigningValidation: true
  enableSymbolValidation: false
@ -59,47 +66,16 @@ parameters:
  VSMasterChannelId: 1012
  
 stages:
- ${{ if ne(parameters.inline, 'true') }}:
-  - stage: publish_using_darc
-    dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Publish using Darc
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-
-    - job:
-      displayName: Publish Using Darc
-      dependsOn: setupMaestroVars
-      variables:
-        - name: BARBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: PowerShell@2
-          displayName: Publish Using Darc
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId) 
-              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-              -MaestroToken '$(MaestroApiAccessToken)'
-              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-              -EnableSourceLinkValidation ${{ parameters.enableSourceLinkValidation }}
-              -EnableSigningValidation ${{ parameters.enableSourceLinkValidation }}
-              -EnableNugetValidation ${{ parameters.enableSourceLinkValidation }}
-              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
-              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SigningValidationAdditionalParameters '${{ parameters.signingValidationAdditionalParameters }}'
-
- ${{ if eq(parameters.inline, 'true') }}:
-  - stage: Validate
+- stage: Validate
  dependsOn: ${{ parameters.validateDependsOn }}
  displayName: Validate Build Assets
  variables:
    - template: common-variables.yml
  jobs:
  - template: setup-maestro-vars.yml
+    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}

  - job:
    displayName: Post-build Checks
@ -256,8 +232,43 @@ stages:
      artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
      downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}

+- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
+  - stage: publish_using_darc
+    dependsOn: Validate
+    displayName: Publish using Darc
+    variables:
+      - template: common-variables.yml
+    jobs:
+    - template: setup-maestro-vars.yml
+      parameters:
+        BARBuildId: ${{ parameters.BARBuildId }}
+        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+    - job:
+      displayName: Publish Using Darc
+      dependsOn: setupMaestroVars
+      variables:
+        - name: BARBuildId
+          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
+      pool:
+        vmImage: 'windows-2019'
+      steps:
+        - task: PowerShell@2
+          displayName: Publish Using Darc
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+            arguments: -BuildId $(BARBuildId) 
+              -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
+              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+              -MaestroToken '$(MaestroApiAccessToken)'
+              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
+              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
+
+- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -272,6 +283,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -286,6 +299,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -300,6 +315,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -314,6 +331,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -328,6 +347,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -342,6 +363,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -356,6 +379,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -369,6 +394,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -382,6 +409,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -395,6 +424,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -408,6 +439,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -421,6 +454,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -434,6 +469,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -447,6 +484,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -460,6 +499,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -473,6 +514,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -486,6 +529,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -499,6 +544,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -512,6 +559,8 @@ stages:
      
  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
@ -525,6 +574,8 @@ stages:

  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
    parameters:
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
      dependsOn: ${{ parameters.publishDependsOn }}
      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@ -1,22 +1,20 @@
+parameters:
+  BARBuildId: ''
+  PromoteToChannelIds: ''
+
 jobs:
 - job: setupMaestroVars
  displayName: Setup Maestro Vars
  variables:
    - template: common-variables.yml
-    - name: BuildId
-      value: $[ coalesce(variables.BARBuildId, 0) ]
-    - name: PromoteToMaestroChannels
-      value: $[ coalesce(variables.PromoteToChannelIds, 0) ]
-    - name: PromoteToMaestroChannel 
-      value: $[ coalesce(variables.PromoteToMaestroChannelId, 0) ]
  pool:
    vmImage: 'windows-2019'
  steps:
    - checkout: none

+    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
      - task: DownloadBuildArtifacts@0
        displayName: Download Release Configs
-      condition: and(eq(variables.PromoteToMaestroChannels, 0), eq(variables.PromoteToMaestroChannel, 0))
        inputs:
          buildType: current
          artifactName: ReleaseConfigs
@ -28,7 +26,7 @@ jobs:
        targetType: inline
        script: |
          try {
-            if ($Env:PromoteToMaestroChannels -eq 0 -and $Env:PromoteToMaestroChannel -eq 0) {
+            if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
              $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt

              $BarId = $Content | Select -Index 0
@ -51,7 +49,7 @@ jobs:
              $BarId = $Env:BARBuildId
              $Channels = $Env:PromoteToMaestroChannels -split ","
              $Channels = $Channels -join "]["
-              $Channels = "[$Channels][$Env:PromoteToMaestroChannel]"
+              $Channels = "[$Channels]"

              $IsStableBuild = $buildInfo.stable
              $AzureDevOpsProject = $buildInfo.azureDevOpsProject
@ -75,3 +73,5 @@ jobs:
          }
      env:
        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+        BARBuildId: ${{ parameters.BARBuildId }}
+        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
--- a/global.json
+++ b/global.json
@ -13,6 +13,6 @@
    }
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21"
  }
 }