Skip to content

Commit b382788

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241222.1 (#59605)
[main] Update dependencies from dotnet/arcade
1 parent 794124f commit b382788

9 files changed

+101
-52
lines changed

‎eng/Version.Details.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>208b974f93c0ee35a171eba374ca36aa9a78e930</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24613.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24622.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
393+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24613.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24622.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
398+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24613.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24622.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
403+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24613.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24622.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
407+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24613.2">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24622.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
411+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24613.2">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24622.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
415+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24613.2">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24622.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
419+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24613.2">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24622.1">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
423+
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
424424
</Dependency>
425425
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24611.2">
426426
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24613.2</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24613.2</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24622.1</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24622.1</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.560902</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/steps/install-microbuild.yml

+37-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,49 @@
11
parameters:
2-
# Enable cleanup tasks for MicroBuild
2+
# Enable install tasks for MicroBuild
33
enableMicrobuild: false
4-
# Enable cleanup tasks for MicroBuild on Mac and Linux
4+
# Enable install tasks for MicroBuild on Mac and Linux
55
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
66
enableMicrobuildForMacAndLinux: false
7+
# Location of the MicroBuild output folder
8+
microBuildOutputFolder: '$(Agent.TempDirectory)'
79
continueOnError: false
810

911
steps:
1012
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11-
# Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
12-
- ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
13+
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
14+
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
15+
- script: |
16+
version=$(python3 --version | awk '{print $2}')
17+
major=$(echo $version | cut -d. -f1)
18+
minor=$(echo $version | cut -d. -f2)
19+
20+
installPython=false
21+
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
22+
installPython=true
23+
fi
24+
25+
echo "Python version: $version."
26+
echo "Install Python 3.12.x: $installPython."
27+
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
28+
name: InstallPython
29+
displayName: 'Determine Python installation'
30+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
31+
1332
- task: UsePythonVersion@0
14-
displayName: 'Use Python 3.11.x'
1533
inputs:
16-
versionSpec: '3.11.x'
34+
versionSpec: '3.12.x'
35+
displayName: 'Use Python 3.12.x'
36+
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))
37+
38+
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
39+
- task: UseDotNet@2
40+
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
41+
inputs:
42+
packageType: sdk
43+
version: 8.0.x
44+
installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet
45+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
46+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
1747

1848
- task: MicroBuildSigningPlugin@4
1949
displayName: Install MicroBuild plugin
@@ -25,7 +55,7 @@ steps:
2555
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
2656
env:
2757
TeamName: $(_TeamName)
28-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
58+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
2959
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
3060
continueOnError: ${{ parameters.continueOnError }}
3161
condition: and(

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

+32-17
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ usage()
66
{
77
echo "Creates a toolchain and sysroot used for cross-compiling for Android."
88
echo
9-
echo "Usage: $0 [BuildArch] [ApiLevel]"
9+
echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]"
1010
echo
1111
echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
1212
echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
13+
echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history"
1314
echo
1415
echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
1516
echo "by setting the TOOLCHAIN_DIR environment variable"
@@ -25,10 +26,15 @@ __BuildArch=arm64
2526
__AndroidArch=aarch64
2627
__AndroidToolchain=aarch64-linux-android
2728

28-
for i in "$@"
29-
do
30-
lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
31-
case $lowerI in
29+
while :; do
30+
if [[ "$#" -le 0 ]]; then
31+
break
32+
fi
33+
34+
i=$1
35+
36+
lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
37+
case $lowerI in
3238
-?|-h|--help)
3339
usage
3440
exit 1
@@ -43,15 +49,28 @@ for i in "$@"
4349
__AndroidArch=arm
4450
__AndroidToolchain=arm-linux-androideabi
4551
;;
52+
--ndk)
53+
shift
54+
__NDK_Version=$1
55+
;;
4656
*[0-9])
4757
__ApiLevel=$i
4858
;;
4959
*)
5060
__UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
5161
;;
5262
esac
63+
shift
5364
done
5465

66+
if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then
67+
__NDK_File_Arch_Spec=-x86_64
68+
__SysRoot=sysroot
69+
else
70+
__NDK_File_Arch_Spec=
71+
__SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot
72+
fi
73+
5574
# Obtain the location of the bash script to figure out where the root of the repo is.
5675
__ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5776

@@ -78,15 +97,16 @@ fi
7897

7998
echo "Target API level: $__ApiLevel"
8099
echo "Target architecture: $__BuildArch"
100+
echo "NDK version: $__NDK_Version"
81101
echo "NDK location: $__NDK_Dir"
82102
echo "Target Toolchain location: $__ToolchainDir"
83103

84104
# Download the NDK if required
85105
if [ ! -d $__NDK_Dir ]; then
86106
echo Downloading the NDK into $__NDK_Dir
87107
mkdir -p $__NDK_Dir
88-
wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip
89-
unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir
108+
wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip
109+
unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir
90110
fi
91111

92112
if [ ! -d $__lldb_Dir ]; then
@@ -116,16 +136,11 @@ for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/
116136
fi
117137
done
118138

119-
cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/"
139+
cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/"
120140

121141
# Generate platform file for build.sh script to assign to __DistroRid
122142
echo "Generating platform file..."
123-
echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform
124-
125-
echo "Now to build coreclr, libraries and installers; run:"
126-
echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
127-
--subsetCategory coreclr
128-
echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
129-
--subsetCategory libraries
130-
echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
131-
--subsetCategory installer
143+
echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform
144+
145+
echo "Now to build coreclr, libraries and host; run:"
146+
echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ case "$__AlpineVersion" in
422422
elif [[ "$__AlpineArch" == "riscv64" ]]; then
423423
__AlpineLlvmLibsLookup=1
424424
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
425-
elif [[ -n "$__AlpineVersion" ]]; then
425+
elif [[ -n "$__AlpineMajorVersion" ]]; then
426426
# use whichever alpine version is provided and select the latest toolchain libs
427427
__AlpineLlvmLibsLookup=1
428428
else

‎eng/common/native/install-dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case "$os" in
2727
libssl-dev libkrb5-dev zlib1g-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
30-
elif [ "$ID" = "fedora" ]; then
30+
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
3131
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
3232
elif [ "$ID" = "alpine" ]; then
3333
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio

‎eng/common/tools.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
# $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266+
# Pre-flighting new install script
267+
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1"
266268

267269
Retry({
268270
Write-Host "GET $uri"

‎eng/common/tools.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,9 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
# local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299+
# Pre-flight install script
300+
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh"
299301

300302
if [[ ! -a "$install_script" ]]; then
301303
mkdir -p "$root"

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24613.2",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24613.2",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24622.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24622.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)