Merge in 'release/7.0.2xx' changes
This commit is contained in:
commit
ddb28ae249
5 changed files with 45 additions and 2 deletions
|
@ -193,6 +193,7 @@
|
|||
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
||||
necessary, and this property is removed from the file.
|
||||
-->
|
||||
<PrivateSourceBuiltSDKVersion>7.0.102</PrivateSourceBuiltSDKVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>7.0.102-4</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
|
|
|
@ -101,6 +101,35 @@ jobs:
|
|||
Contents: '*.tar.gz'
|
||||
TargetFolder: $(tarballDir)/packages/archive/
|
||||
|
||||
- script: |
|
||||
set -euo pipefail
|
||||
|
||||
sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/"
|
||||
packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props"
|
||||
notFoundMessage="No source-built SDK found to download..."
|
||||
|
||||
echo "Looking for source-built SDK to download..."
|
||||
archiveVersionLine=`grep -m 1 "<PrivateSourceBuiltSDKVersion>" "$packageVersionsPath" || :`
|
||||
versionPattern="<PrivateSourceBuiltSDKVersion>(.*)</PrivateSourceBuiltSDKVersion>"
|
||||
|
||||
if [[ $archiveVersionLine =~ $versionPattern ]]; then
|
||||
filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz"
|
||||
archiveUrl="${sourceBuiltSDKUrl}${filename}"
|
||||
downloadDir=$(mktemp -d)
|
||||
(cd $downloadDir && curl --retry 5 -O $archiveUrl)
|
||||
|
||||
mkdir $(tarballDir)/.dotnet
|
||||
tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet
|
||||
rm -rf $downloadDir
|
||||
else
|
||||
echo "$notFoundMessage"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet"
|
||||
displayName: Setup Previously Source-Built SDK
|
||||
condition: eq(variables._WithPreviousSDK, 'true')
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
|
|
|
@ -41,31 +41,43 @@ jobs:
|
|||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_RunOnline: true
|
||||
_WithPreviousSDK: false
|
||||
CentOSStream8-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: ${{ parameters.centOSStream8Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
||||
CentOSStream8-WithPreviousSDK:
|
||||
_BootstrapPrep: false
|
||||
_Container: ${{ parameters.centOSStream8Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: true
|
||||
CentOSStream9-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: ${{ parameters.centOSStream9Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
Fedora36-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: ${{ parameters.fedora36Container }}
|
||||
_EnablePoison: true
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
Ubuntu2004-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: ${{ parameters.ubuntu2004Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
|
@ -89,6 +101,7 @@ jobs:
|
|||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_arm64
|
||||
pool: ${{ parameters.poolInternalArm64 }}
|
||||
|
||||
|
@ -109,6 +122,7 @@ jobs:
|
|||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64_Using_Previous
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
|
|
|
@ -12,6 +12,7 @@ jobs:
|
|||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64
|
||||
pool:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
|
|
|
@ -16,8 +16,6 @@
|
|||
|
||||
<!-- SBRP builds before Arcade so it also needs the bootstrap Arcade version -->
|
||||
<UseBootstrapArcade>true</UseBootstrapArcade>
|
||||
|
||||
<RepoNoWarns>NU1504</RepoNoWarns>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Loading…
Reference in a new issue