From 230dc86e9d92fbf191bf3b45b3f1b656f83d4426 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 21:55:20 -0500 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#100725) * Update dependencies from https://github.com/dotnet/arcade build 20240405.14 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24205.4 -> To Version 9.0.0-beta.24205.14 * Update dependencies from https://github.com/dotnet/arcade build 20240407.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24205.4 -> To Version 9.0.0-beta.24207.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++---------------- eng/Versions.props | 32 ++++++------ eng/common/cross/build-rootfs.sh | 11 ++++- global.json | 6 +-- 4 files changed, 70 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca789783ae115..bd4cfbab91a5e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 28af9496b0e260f7e66ec549b39f1410ee9743d1 - + https://github.com/dotnet/arcade - 541820fbd313f9bb82b756b66d258fe316d5e48b + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1e2f0ee0c75388..42dd4ad3f56338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.4.24175.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 2.6.7-beta.24205.4 - 9.0.0-beta.24205.4 - 2.6.7-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 - 9.0.0-beta.24205.4 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 2.6.7-beta.24207.1 + 9.0.0-beta.24207.1 + 2.6.7-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 1.4.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 99a9dd6bb60927..a10304fa117932 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 - __ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + arch="$(uname -m)" + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir" + if [[ "$arch" == "x86_64" ]]; then + __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" + elif [[ "$arch" == "aarch64" ]]; then + __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" + else + echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`" + fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" diff --git a/global.json b/global.json index b3d764e6c1528d..f97052be7470dc 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24205.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24207.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24201.1"