Update dependencies from https://github.com/dotnet/arcade build 20190621.75 (#25328)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19321.75
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19321.75
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19321.75
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19321.75

9 files changed, 51 insertions, 45 deletions

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 909e876d17..0400c745dc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,21 +3,21 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19320.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19321.75">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
+      <Sha>fcee3d5c2d6180bec19c4ae50234771c436b4b52</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19320.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19321.75">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
+      <Sha>fcee3d5c2d6180bec19c4ae50234771c436b4b52</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19320.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19321.75">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
+      <Sha>fcee3d5c2d6180bec19c4ae50234771c436b4b52</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19320.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19321.75">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
+      <Sha>fcee3d5c2d6180bec19c4ae50234771c436b4b52</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19321.8">
       <Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f98443b6a0..5c6e206c28 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,8 +14,8 @@
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Package versions -->
     <!-- arcade -->
-    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19320.1</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19320.1</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19321.75</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19321.75</MicrosoftDotNetBuildTasksPackagingVersion>
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <!-- corefx -->
     <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19321.8</MicrosoftPrivateCoreFxNETCoreAppVersion>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 7c4e122651..d7d5d7d5f4 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -203,6 +203,7 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
       -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
       -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
       -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+      -X http://dl-cdn.alpinelinux.org/alpine/edge/main \
       -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
       add $__AlpinePackages
     rm -r $__ApkToolsDir
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 2f669fd95b..acb4c55d73 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -13,6 +13,13 @@ jobs:
   steps:
   - checkout: self
     clean: true
+  - task: DownloadBuildArtifacts@0
+    displayName: Download Build Artifacts
+    inputs:
+      buildType: current
+      downloadType: specific files
+      matchingPattern: "**"
+      downloadPath: $(Build.SourcesDirectory)\artifacts
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet.exe'
   - task: NuGetCommand@2
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 0144221681..ff7346163f 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -60,27 +60,18 @@ jobs:
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
     - task: powershell@2
-      displayName: Create BARBuildId Artifact
+      displayName: Create ReleaseConfigs Artifact
       inputs:
         targetType: inline
         script: |
-          Add-Content -Path  "$(Build.StagingDirectory)/BARBuildId.txt" -Value $(BARBuildId)
-    - task: powershell@2
-      displayName: Create Channels Artifact
-      inputs:
-        targetType: inline
-        script: |
-          Add-Content -Path  "$(Build.StagingDirectory)/Channels.txt" -Value "$(DefaultChannels)"
-    - task: PublishBuildArtifacts@1
-      displayName: Publish BAR BuildId to VSTS
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/BARBuildId.txt'
-        PublishLocation: Container
-        ArtifactName: ReleaseConfigs
+          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
+          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
+          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsInternalBuild)
+          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
     - task: PublishBuildArtifacts@1
-      displayName: Publish Channels to VSTS
+      displayName: Publish ReleaseConfigs Artifact
       inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/Channels.txt'
+        PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
         PublishLocation: Container
         ArtifactName: ReleaseConfigs
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 6b74475a6f..2c411dd009 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -2,6 +2,9 @@ parameters:
   enableSourceLinkValidation: true
   enableSigningValidation: true
   enableSymbolValidation: true
+  SDLValidationParameters:
+    enable: false
+    params: ''
 
 stages:
 - stage: validate
@@ -52,6 +55,11 @@ stages:
               -GHCommit $(Build.SourceVersion)
               -SourcelinkCliVersion $(SourceLinkCLIVersion)
 
+  - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}:
+    - template: /eng/common/templates/job/execute-sdl.yml
+      parameters:
+        additionalParameters: ${{ parameters.SDLValidationParameters.params }}
+
 - template: \eng\common\templates\post-build\channels\public-dev-release.yml
   parameters:
     enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 9de585a94a..0eddd6cd3b 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -17,22 +17,21 @@ jobs:
         targetType: inline
         script: |
           # This is needed to make Write-PipelineSetVariable works in this context
-          if ($env:BUILD_BUILDNUMBER -ne "" -and $env:BUILD_BUILDNUMBER -ne $null) {
-            $ci = $true
+          $ci = $true
 
-            . "$(Build.SourcesDirectory)/eng/common/tools.ps1"
-              
-            $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt" 
-            Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
+          . "$(Build.SourcesDirectory)/eng/common/tools.ps1"
 
-            Write-Host "Asked Write-PipelineSetVariable to create BARBuildId with value '$BarId'"
+          $Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
 
-            $Channels = ""
-            Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," }
-            Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
+          $BarId = $Content | Select -Index 0
 
-            Write-Host "Asked Write-PipelineSetVariable to create InitialChannels with value '$Channels'"
-          }
-          else {
-            Write-Host "This step can only be run in an Azure DevOps CI environment."
-          }
+          $Channels = ""            
+          $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
+            
+          $IsInternalBuild = $Content | Select -Index 2
+          $IsStableBuild = $Content | Select -Index 3
+
+          Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
+          Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
+          Write-PipelineSetVariable -Name 'IsInternalBuild' -Value $IsInternalBuild
+          Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index f39aab57b9..70d92cf85a 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -356,11 +356,11 @@ function MSBuild-Core {
   }
 }
 
-. "$scriptroot/pipeline-logging-functions.sh"
-
 ResolvePath "${BASH_SOURCE[0]}"
 _script_dir=`dirname "$_ResolvePath"`
 
+. "$_script_dir/pipeline-logging-functions.sh"
+
 eng_root=`cd -P "$_script_dir/.." && pwd`
 repo_root=`cd -P "$_script_dir/../.." && pwd`
 artifacts_dir="$repo_root/artifacts"
diff --git a/global.json b/global.json
index 69d527ef71..ee2b337261 100644
--- a/global.json
+++ b/global.json
@@ -7,8 +7,8 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19320.1",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19320.1",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19321.75",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19321.75",
     "Microsoft.Build.NoTargets": "1.0.53",
     "Microsoft.Build.Traversal": "2.0.2"
   }