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

[release/5.0] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.CodeAnalysis: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.GenAPI: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.Helix.Sdk: 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 - Microsoft.DotNet.ApiCompat: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21

Update dependencies from https://github.com/dotnet/arcade build 20200819.21 (#3358)
[release/5.0] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.CodeAnalysis: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.GenAPI: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.Helix.Sdk: 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 - Microsoft.DotNet.ApiCompat: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21
ad3a13c5 · dotnet-maestro[bot] · GitHub · b6fcdfdc · ad3a13c5 · ad3a13c5
9 changed file
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -91,25 +91,25 @@
    </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.DotNet.CodeAnalysis" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20419.21">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.Helix.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.DotNet.ApiCompat" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20419.21">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20417.6">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20419.21">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,9 +41,9 @@
  </PropertyGroup>
  <!-- Packages that come from https://github.com/dotnet/arcade -->
  <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20417.6</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20417.6</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20417.6</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20419.21</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20419.21</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20419.21</MicrosoftDotNetGenAPIVersion>
  </PropertyGroup>
  <!-- Packages that come from https://github.com/dotnet/corefxlab -->
  <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
 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()

@@ -49,12 +51,13 @@ try {
  }

  & darc add-build-to-channel `
-	--id $buildId `
-	--default-channels `
-	--source-branch master `
-	--azdev-pat $AzdoToken `
-	--bar-uri $MaestroApiEndPoint `
-	--password $MaestroToken `
+  --id $buildId `
+  --publishing-infra-version $PublishingInfraVersion `
+  --default-channels `
+  --source-branch master `
+  --azdev-pat $AzdoToken `
+  --bar-uri $MaestroApiEndPoint `
+  --password $MaestroToken `
 	@optionalParams

  if ($LastExitCode -ne 0) {

--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml
 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
 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
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
+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

-    - task: DownloadBuildArtifacts@0
-      displayName: Download Release Configs
-      condition: and(eq(variables.PromoteToMaestroChannels, 0), eq(variables.PromoteToMaestroChannel, 0))
-      inputs:
-        buildType: current
-        artifactName: ReleaseConfigs
+    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Release Configs
+        inputs:
+          buildType: current
+          artifactName: ReleaseConfigs

    - task: PowerShell@2
      name: setReleaseVars
@@ -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
@@ -12,8 +12,8 @@
    }
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20419.21"
  },
  "sdk": {
    "version": "5.0.100-preview.6.20323.1"