diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c0d41449a4d94648c535f53741f1693c705d617b..2e50fdd0e3241df210fad0f39bc196919f7cec13 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,17 +11,17 @@
-
+
https://github.com/dotnet/arcade
- bd50b2bcc787a8c62e2e114fb54704b645cc1c3a
+ 9946534da4f73e6242ca105f6798ab58119c9ab0
-
+
https://github.com/dotnet/arcade
- bd50b2bcc787a8c62e2e114fb54704b645cc1c3a
+ 9946534da4f73e6242ca105f6798ab58119c9ab0
-
+
https://github.com/dotnet/arcade
- bd50b2bcc787a8c62e2e114fb54704b645cc1c3a
+ 9946534da4f73e6242ca105f6798ab58119c9ab0
diff --git a/eng/Versions.props b/eng/Versions.props
index 41c29d005b81ee2dc9159c08b955a8d8b8d85e50..8bb538750dd4d0cdd72f7bdd923e52023f31abd9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,6 +6,6 @@
0.1.0-prerelease.19321.1
0.1.0-prerelease.19321.1
- 1.0.0-beta.19319.25
+ 1.0.0-beta.19323.4
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 7c4e122651c06f7f73e48d769dc814ed2445476e..d7d5d7d5f449d73e81c9e08a3be3202d783b324c 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 2f669fd95ba36698e9b6be8c38a296e618fa9434..acb4c55d735fd96eb4281145779b3a773bf26bf6 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 01442216816fd5643e31271007c3c9299aad5980..ff7346163f43febe232148d8255d0633c2cad88b 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 6b74475a6f87bde4ffd92ce0d2d6662b388a2380..2c411dd0098cd226f0ec22ea1458b30d0b76908b 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 9de585a94acddf96aba46a7fab649a33a209a83a..0eddd6cd3b77725d7d6117ebdfc82d2dd75317c3 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 f39aab57b99f40ad3532d2144fa154bfe7540a1d..70d92cf85aa2b0a2bcd525604d616c177c262aca 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 787b46658fb3dc68f0ccfc463ec2829f889d6cfc..1fc8df46b1738bf7bc4948c9c95b0819117676e5 100644
--- a/global.json
+++ b/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"
}
}