From b5a99658c3b007388bad0509c784521eeb8d5599 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:14:49 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240407.1 (#55012) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- eng/common/cross/build-rootfs.sh | 11 +++++++-- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 ++--- .../variables/pool-providers.yml | 2 +- global.json | 4 ++-- 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 326fc738c21..e2dbcb57995 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -383,31 +383,31 @@ https://github.com/dotnet/winforms 0bf0cd0a97f1f76e133879501e3553d4b7825dbf - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index d83d5798415..66df74396b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,10 +159,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.24179.6 - 9.0.0-beta.24179.6 - 9.0.0-beta.24179.6 - 9.0.0-beta.24179.6 + 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-alpha.1.24201.3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 99a9dd6bb60..a10304fa117 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/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8..ba9ba493032 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50d4b98e201..50f04e642a3 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-mariner-2-pt os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..d286e956bdf 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc..beab7d1bfba 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 +# image: 1es-windows-2022-pt variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index dd2d5d73af3..de1f68c583e 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.22" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1" } }