diff options
author | dotnet-maestro <@dotnet-maestro> | 2019-06-22 16:08:37 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-06-24 10:12:13 +0300 |
commit | 33a4a35826c4bfdf30825cd6f3132a130ee87fa4 (patch) | |
tree | 77bf68e69d82d09cd88bf68131a806766a8c53d5 /eng | |
parent | bbfce0087817d135c32d96a5284b52d1e485da72 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20190621.75
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19321.75
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19321.75
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 8 | ||||
-rw-r--r-- | eng/common/cross/build-rootfs.sh | 1 | ||||
-rw-r--r-- | eng/common/templates/job/execute-sdl.yml | 7 | ||||
-rw-r--r-- | eng/common/templates/job/publish-build-assets.yml | 23 | ||||
-rw-r--r-- | eng/common/templates/post-build/post-build.yml | 8 | ||||
-rw-r--r-- | eng/common/templates/post-build/setup-maestro-vars.yml | 29 | ||||
-rwxr-xr-x | eng/common/tools.sh | 4 |
7 files changed, 43 insertions, 37 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0966abfcc35..523570b373a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ <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> </ToolsetDependencies> </Dependencies> diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7c4e122651c..d7d5d7d5f44 100644 --- 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 2f669fd95ba..acb4c55d735 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 01442216816..ff7346163f4 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 6b74475a6f8..2c411dd0098 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 9de585a94ac..0eddd6cd3b7 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 f39aab57b99..70d92cf85aa 100755 --- 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" |