Skip to content

Commit dd37cd4

Browse files
dotnet-maestro[bot]v-wuzhaiViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#19337)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 6d9d25a commit dd37cd4

File tree

9 files changed

+30
-133
lines changed

9 files changed

+30
-133
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,17 @@
238238
</Dependency>
239239
</ProductDependencies>
240240
<ToolsetDependencies>
241-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24203.1">
241+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.14">
242242
<Uri>https://github.com/dotnet/arcade</Uri>
243-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
243+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24203.1">
245+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24205.14">
246246
<Uri>https://github.com/dotnet/arcade</Uri>
247-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
247+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24203.1">
249+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24205.14">
250250
<Uri>https://github.com/dotnet/arcade</Uri>
251-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
251+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
254254
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -258,14 +258,14 @@
258258
<Uri>https://github.com/dotnet/arcade-services</Uri>
259259
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24203.1">
261+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24205.14">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
263+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
264264
</Dependency>
265265
<!-- Intermediate is necessary for source build. -->
266-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24203.1">
266+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24205.14">
267267
<Uri>https://github.com/dotnet/arcade</Uri>
268-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
268+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
269269
<SourceBuild RepoName="arcade" ManagedOnly="true" />
270270
</Dependency>
271271
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24205.14</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/cross/build-rootfs.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )"
444444

445445
if [[ "$__CodeName" == "alpine" ]]; then
446446
__ApkToolsVersion=2.12.11
447-
__ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33
448447
__ApkToolsDir="$(mktemp -d)"
449448
__ApkKeysDir="$(mktemp -d)"
450449

451-
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir"
450+
arch="$(uname -m)"
451+
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir"
452+
if [[ "$arch" == "x86_64" ]]; then
453+
__ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33"
454+
elif [[ "$arch" == "aarch64" ]]; then
455+
__ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0"
456+
else
457+
echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`"
458+
fi
452459
echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
453460
chmod +x "$__ApkToolsDir/apk.static"
454461

eng/common/templates-official/job/onelocbuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022
59+
image: 1es-windows-2022-pt
6060
os: windows
6161

6262
steps:

eng/common/templates-official/job/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
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')]
55-
image: 1es-mariner-2
55+
image: 1es-mariner-2-pt
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

eng/common/templates-official/post-build/post-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022
113+
image: 1es-windows-2022-pt
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022
153+
image: 1es-windows-2022-pt
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022
211+
image: 1es-windows-2022-pt
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml

eng/common/templates-official/variables/pool-providers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022
26+
# image: 1es-windows-2022-pt
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

global.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"cmake": "latest"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
15-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1",
16-
"Microsoft.Build.NoTargets": "3.7.0" }
14+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14",
15+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14",
16+
"Microsoft.Build.NoTargets": "3.7.0"
17+
}
1718
}

src/SourceBuild/patches/arcade/0001-Copy-repo-symbols-to-intermediates.patch

-111
This file was deleted.

0 commit comments

Comments
 (0)