Skip to content

Commit c47d034

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5020)
[main] Update dependencies from dotnet/arcade
1 parent 8dd313a commit c47d034

File tree

6 files changed

+88
-74
lines changed

6 files changed

+88
-74
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23120.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23164.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
9+
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23120.1">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23164.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
13+
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23120.1">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23164.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
17+
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23120.1">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23164.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
21+
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23120.1">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23164.2">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
25+
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23120.1</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23120.1</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23120.1</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23120.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23120.1</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23164.2</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23164.2</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23164.2</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23164.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23164.2</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

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

Lines changed: 67 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ __AlpinePackages+=" gettext-dev"
5555
__AlpinePackages+=" icu-dev"
5656
__AlpinePackages+=" libunwind-dev"
5757
__AlpinePackages+=" lttng-ust-dev"
58-
__AlpinePackages+=" compiler-rt-static"
58+
__AlpinePackages+=" compiler-rt"
5959
__AlpinePackages+=" numactl-dev"
6060

6161
# runtime libraries' dependencies
@@ -150,7 +150,6 @@ while :; do
150150
__BuildArch=riscv64
151151
__AlpineArch=riscv64
152152
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
153-
__AlpinePackages="${__AlpinePackages// compiler-rt-static/}"
154153
__QEMUArch=riscv64
155154
__UbuntuArch=riscv64
156155
__UbuntuRepo="http://deb.debian.org/debian-ports"
@@ -160,10 +159,6 @@ while :; do
160159
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
161160
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
162161
fi
163-
164-
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
165-
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
166-
fi
167162
;;
168163
ppc64le)
169164
__BuildArch=ppc64le
@@ -175,10 +170,6 @@ while :; do
175170
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
176171
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
177172
unset __LLDB_Package
178-
179-
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
180-
__AlpineVersion=3.15 # minimum version that supports compiler-rt
181-
fi
182173
;;
183174
s390x)
184175
__BuildArch=s390x
@@ -190,10 +181,6 @@ while :; do
190181
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
191182
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
192183
unset __LLDB_Package
193-
194-
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
195-
__AlpineVersion=3.15 # minimum version that supports compiler-rt
196-
fi
197184
;;
198185
x64)
199186
__BuildArch=x64
@@ -206,6 +193,7 @@ while :; do
206193
x86)
207194
__BuildArch=x86
208195
__UbuntuArch=i386
196+
__AlpineArch=x86
209197
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
210198
;;
211199
lldb*)
@@ -260,25 +248,40 @@ while :; do
260248
;;
261249
jessie) # Debian 8
262250
__CodeName=jessie
263-
__UbuntuRepo="http://ftp.debian.org/debian/"
251+
252+
if [[ -z "$__UbuntuRepo" ]]; then
253+
__UbuntuRepo="http://ftp.debian.org/debian/"
254+
fi
264255
;;
265256
stretch) # Debian 9
266257
__CodeName=stretch
267-
__UbuntuRepo="http://ftp.debian.org/debian/"
268258
__LLDB_Package="liblldb-6.0-dev"
259+
260+
if [[ -z "$__UbuntuRepo" ]]; then
261+
__UbuntuRepo="http://ftp.debian.org/debian/"
262+
fi
269263
;;
270264
buster) # Debian 10
271265
__CodeName=buster
272-
__UbuntuRepo="http://ftp.debian.org/debian/"
273266
__LLDB_Package="liblldb-6.0-dev"
267+
268+
if [[ -z "$__UbuntuRepo" ]]; then
269+
__UbuntuRepo="http://ftp.debian.org/debian/"
270+
fi
274271
;;
275272
bullseye) # Debian 11
276273
__CodeName=bullseye
277-
__UbuntuRepo="http://ftp.debian.org/debian/"
274+
275+
if [[ -z "$__UbuntuRepo" ]]; then
276+
__UbuntuRepo="http://ftp.debian.org/debian/"
277+
fi
278278
;;
279279
sid) # Debian sid
280280
__CodeName=sid
281-
__UbuntuRepo="http://ftp.debian.org/debian/"
281+
282+
if [[ -z "$__UbuntuRepo" ]]; then
283+
__UbuntuRepo="http://ftp.debian.org/debian/"
284+
fi
282285
;;
283286
tizen)
284287
__CodeName=
@@ -296,29 +299,8 @@ while :; do
296299
parts=(${version//./ })
297300
__AlpineMajorVersion="${parts[0]}"
298301
__AlpineMinoVersion="${parts[1]}"
299-
300-
if [[ -z "$__AlpineVersion" ]]; then
301-
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
302-
fi
302+
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
303303
fi
304-
305-
case "$__AlpineVersion" in
306-
3.14) __AlpinePackages+=" llvm11-libs" ;;
307-
3.15) __AlpinePackages+=" llvm12-libs" ;;
308-
3.16) __AlpinePackages+=" llvm13-libs" ;;
309-
3.17) __AlpinePackages+=" llvm15-libs" ;;
310-
edge) __AlpineLlvmLibsLookup=1 ;;
311-
*)
312-
if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then
313-
__AlpineVersion=3.15 # minimum version that supports compiler-rt
314-
__AlpinePackages+=" llvm12-libs"
315-
elif [[ "$__AlpineArch" == "riscv64" ]]; then
316-
__AlpineLlvmLibsLookup=1
317-
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
318-
else
319-
__AlpineVersion=3.13 # 3.13 to maximize compatibility
320-
fi
321-
esac
322304
;;
323305
freebsd12)
324306
__CodeName=freebsd
@@ -361,10 +343,41 @@ while :; do
361343
shift
362344
done
363345

346+
case "$__AlpineVersion" in
347+
3.14) __AlpinePackages+=" llvm11-libs" ;;
348+
3.15) __AlpinePackages+=" llvm12-libs" ;;
349+
3.16) __AlpinePackages+=" llvm13-libs" ;;
350+
3.17) __AlpinePackages+=" llvm15-libs" ;;
351+
edge) __AlpineLlvmLibsLookup=1 ;;
352+
*)
353+
if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
354+
echo boo
355+
__AlpineVersion=3.15 # minimum version that supports lldb-dev
356+
__AlpinePackages+=" llvm12-libs"
357+
elif [[ "$__AlpineArch" == "x86" ]]; then
358+
__AlpineVersion=3.17 # minimum version that supports lldb-dev
359+
__AlpinePackages+=" llvm15-libs"
360+
elif [[ "$__AlpineArch" == "riscv64" ]]; then
361+
__AlpineLlvmLibsLookup=1
362+
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
363+
else
364+
__AlpineVersion=3.13 # 3.13 to maximize compatibility
365+
__AlpinePackages+=" llvm10-libs"
366+
367+
if [[ "$__AlpineArch" == "armv7" ]]; then
368+
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
369+
fi
370+
fi
371+
esac
372+
373+
if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
374+
# compiler-rt--static was merged in compiler-rt package in alpine 3.16
375+
# for older versions, we need compiler-rt--static, so replace the name
376+
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
377+
fi
378+
364379
if [[ "$__BuildArch" == "armel" ]]; then
365380
__LLDB_Package="lldb-3.5-dev"
366-
elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then
367-
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
368381
fi
369382

370383
__UbuntuPackages+=" ${__LLDB_Package:-}"
@@ -407,26 +420,27 @@ if [[ "$__CodeName" == "alpine" ]]; then
407420
version="v$__AlpineVersion"
408421
fi
409422

423+
# initialize DB
410424
"$__ApkToolsDir/apk.static" \
411425
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
412426
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
413-
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \
414-
add $__AlpinePackages
427+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add
415428

416429
if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then
417-
"$__ApkToolsDir/apk.static" \
430+
__AlpinePackages+=" $("$__ApkToolsDir/apk.static" \
418431
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
419432
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
420433
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
421-
search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do
422-
"$__ApkToolsDir/apk.static" \
423-
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
424-
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
425-
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
426-
add "$name-libs"
427-
done
434+
search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
428435
fi
429436

437+
# install all packages in one go
438+
"$__ApkToolsDir/apk.static" \
439+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
440+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
441+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
442+
add $__AlpinePackages
443+
430444
rm -r "$__ApkToolsDir"
431445
elif [[ "$__CodeName" == "freebsd" ]]; then
432446
mkdir -p "$__RootfsDir"/usr/local/etc

‎eng/common/templates/job/job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
# handle key-value variable syntax.
102102
# example:
103103
# - [key]: [value]
104-
- ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}:
104+
- ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}:
105105
- ${{ each pair in variable }}:
106106
- name: ${{ pair.key }}
107107
value: ${{ pair.value }}

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20221220.2
3+
sourceIndexPackageVersion: 1.0.1-20230228.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.100-alpha.1.23061.8",
3+
"dotnet": "8.0.100-preview.1.23115.2",
44
"runtimes": {
55
"dotnet": [
66
"3.1.5",
@@ -9,10 +9,10 @@
99
}
1010
},
1111
"sdk": {
12-
"version": "8.0.100-alpha.1.23061.8"
12+
"version": "8.0.100-preview.1.23115.2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23120.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23164.2",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23164.2"
1717
}
1818
}

0 commit comments

Comments
 (0)