Skip to content

Commit 04c3620

Browse files
authored
Update Arcade & Put automated pool provider usage functionality into Dev17.4 branch (similar to PR in main now but will not be backported here) (#14177)
1 parent c370ee0 commit 04c3620

25 files changed

+170
-130
lines changed

azure-pipelines.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ variables:
6868
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
6969
- name: RunningAsPullRequest
7070
value: true
71+
# Pick up pool provider name behavior from shared yaml template
72+
- template: /eng/common/templates/variables/pool-providers.yml
7173

7274
# Variables defined in yml cannot be overridden at queue time; instead overridable variables must be defined in the web UI.
7375
# Commenting out until something like this is supported: https://github.com/Microsoft/azure-pipelines-yaml/pull/129
@@ -104,7 +106,7 @@ stages:
104106
jobs:
105107
- job: Full_Signed
106108
pool:
107-
name: NetCore1ESPool-Svc-Internal
109+
name: $(DncEngInternalBuildPool)
108110
demands: ImageOverride -equals windows.vs2022.amd64
109111
timeoutInMinutes: 300
110112
variables:
@@ -210,7 +212,7 @@ stages:
210212
- name: _SignType
211213
value: Test
212214
pool:
213-
name: NetCore-Public
215+
name: $(DncEngPublicBuildPool)
214216
demands: ImageOverride -equals $(WindowsMachineQueueName)
215217
timeoutInMinutes: 90
216218
steps:
@@ -283,7 +285,7 @@ stages:
283285
# WindowsMachineQueueName=Windows.vs2022.amd64.open
284286
# and there is an alternate build definition that sets this to a queue that is always scouting the
285287
# next preview of Visual Studio.
286-
name: NetCore-Public
288+
name: $(DncEngPublicBuildPool)
287289
demands: ImageOverride -equals $(WindowsMachineQueueName)
288290
timeoutInMinutes: 120
289291
strategy:
@@ -341,7 +343,7 @@ stages:
341343
# WindowsMachineQueueName=Windows.vs2022.amd64.open
342344
# and there is an alternate build definition that sets this to a queue that is always scouting the
343345
# next preview of Visual Studio.
344-
name: NetCore-Public
346+
name: $(DncEngPublicBuildPool)
345347
demands: ImageOverride -equals $(WindowsMachineQueueName)
346348
timeoutInMinutes: 120
347349
strategy:
@@ -395,7 +397,7 @@ stages:
395397
# Mock official build
396398
- job: MockOfficial
397399
pool:
398-
name: NetCore-Public
400+
name: $(DncEngPublicBuildPool)
399401
demands: ImageOverride -equals $(WindowsMachineQueueName)
400402
steps:
401403
- checkout: self
@@ -486,7 +488,7 @@ stages:
486488
# End to end build
487489
- job: EndToEndBuildTests
488490
pool:
489-
name: NetCore-Public
491+
name: $(DncEngPublicBuildPool)
490492
demands: ImageOverride -equals $(WindowsMachineQueueName)
491493
steps:
492494
- checkout: self
@@ -515,7 +517,7 @@ stages:
515517
- name: _SignType
516518
value: Test
517519
pool:
518-
name: NetCore-Public
520+
name: $(DncEngPublicBuildPool)
519521
demands: ImageOverride -equals $(WindowsMachineQueueName)
520522
timeoutInMinutes: 90
521523
steps:
@@ -541,7 +543,7 @@ stages:
541543
# Plain build Windows
542544
- job: Plain_Build_Windows
543545
pool:
544-
name: NetCore-Public
546+
name: $(DncEngPublicBuildPool)
545547
demands: ImageOverride -equals $(WindowsMachineQueueName)
546548
variables:
547549
- name: _BuildConfig
@@ -638,7 +640,7 @@ stages:
638640
# Test trimming on Windows
639641
- job: Build_And_Test_Trimming_Windows
640642
pool:
641-
name: NetCore-Public
643+
name: $(DncEngPublicBuildPool)
642644
demands: ImageOverride -equals $(WindowsMachineQueueName)
643645
strategy:
644646
maxParallel: 2

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22473.1">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
13+
<Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22473.1">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22524.5">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
18+
<Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
1919
</Dependency>
2020
</ToolsetDependencies>
2121
</Dependencies>

eng/Versions.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<VSMajorVersion>17</VSMajorVersion>
59-
6059
<VSMinorVersion>4</VSMinorVersion>
61-
6260
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6361
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6462
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

eng/common/cross/arm/tizen-fetch.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -155,7 +155,7 @@ fetch_tizen_pkgs()
155155
}
156156

157157
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
170170

eng/common/cross/arm64/tizen-fetch.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen/
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -154,8 +154,8 @@ fetch_tizen_pkgs()
154154
done
155155
}
156156

157-
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
157+
Inform "Initialize arm64 base"
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs aarch64 gssdp gssdp-devel tizen-release
170170

eng/common/cross/armel/tizen-fetch.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -154,8 +154,8 @@ fetch_tizen_pkgs()
154154
done
155155
}
156156

157-
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
157+
Inform "Initialize armel base"
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release
170170

eng/common/cross/armel/tizen/tizen-dotnet.ks

Lines changed: 0 additions & 50 deletions
This file was deleted.

eng/common/cross/build-android-rootfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ __AndroidPackages+=" liblzma"
107107
__AndroidPackages+=" krb5"
108108
__AndroidPackages+=" openssl"
109109

110-
for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\
110+
for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/main/binary-$__AndroidArch/Packages |\
111111
grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do
112112

113113
if [[ "$path" != "Filename:" ]]; then
114114
echo "Working on: $path"
115-
wget -qO- http://termux.net/$path | dpkg -x - "$__TmpDir"
115+
wget -qO- https://packages.termux.dev/termux-main-21/$path | dpkg -x - "$__TmpDir"
116116
fi
117117
done
118118

eng/common/cross/build-rootfs.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ elif [[ "$__CodeName" == "illumos" ]]; then
391391
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
392392
--disable-libquadmath-support --disable-shared --enable-tls
393393
make -j "$JOBS" && make install && cd ..
394-
BaseUrl=https://pkgsrc.joyent.com
394+
BaseUrl=https://pkgsrc.smartos.org
395395
if [[ "$__UseMirror" == 1 ]]; then
396-
BaseUrl=http://pkgsrc.smartos.skylime.net
396+
BaseUrl=https://pkgsrc.smartos.skylime.net
397397
fi
398398
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
399399
echo "Downloading manifest"
@@ -402,7 +402,8 @@ elif [[ "$__CodeName" == "illumos" ]]; then
402402
read -ra array <<<"$__IllumosPackages"
403403
for package in "${array[@]}"; do
404404
echo "Installing '$package'"
405-
package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
405+
# find last occurrence of package in listing and extract its name
406+
package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)"
406407
echo "Resolved name '$package'"
407408
wget "$BaseUrl"/"$package".tgz
408409
ar -x "$package".tgz

eng/common/cross/x86/tizen-fetch.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -155,7 +155,7 @@ fetch_tizen_pkgs()
155155
}
156156

157157
Inform "Initialize i686 base"
158-
fetch_tizen_pkgs_init standard base
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs i686 gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs i686 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs i686 gssdp gssdp-devel tizen-release
170170

0 commit comments

Comments
 (0)