[master] Update dependencies from dotnet/arcade (#516)

* Update dependencies from https://github.com/dotnet/arcade build 20190620.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19320.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19320.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19320.1

* Update dependencies from https://github.com/dotnet/arcade build 20190621.75

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19321.75
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19321.75
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19321.75

* Update dependencies from https://github.com/dotnet/arcade build 20190622.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19322.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19322.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19322.2

* Update dependencies from https://github.com/dotnet/arcade build 20190623.4

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19323.4
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19323.4
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19323.4

eng/Version.Details.xml

@@ -11,17 +11,17 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19319.25">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19323.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd50b2bcc787a8c62e2e114fb54704b645cc1c3a</Sha>
+      <Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19319.25">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19323.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd50b2bcc787a8c62e2e114fb54704b645cc1c3a</Sha>
+      <Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19319.25">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19323.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd50b2bcc787a8c62e2e114fb54704b645cc1c3a</Sha>
+      <Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -6,6 +6,6 @@
     <SystemDeviceGpioPackageVersion>0.1.0-prerelease.19321.1</SystemDeviceGpioPackageVersion>
     <IotDeviceBindingsPackageVersion>0.1.0-prerelease.19321.1</IotDeviceBindingsPackageVersion>
     <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19319.25</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19323.4</MicrosoftDotNetGenAPIPackageVersion>
   </PropertyGroup>
 </Project>

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

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

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') }}:

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 }}

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

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"

global.json

@@ -11,7 +11,7 @@
     "version": "3.0.100-preview5-011568"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19319.25",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19319.25"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19323.4",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19323.4"
   }
 }