Skip to content

Commit 7437822

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240405.14 (#8995)
[main] Update dependencies from dotnet/arcade
1 parent 2595a55 commit 7437822

File tree

8 files changed

+26
-19
lines changed

8 files changed

+26
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24203.1">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.14">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
162+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24203.1">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24205.14">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
166+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24203.1">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24205.14">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
170+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24203.1">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24205.14">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
178+
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24203.1</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24205.14</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

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

Lines changed: 9 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-preview.1.24101.2"

0 commit comments

Comments
 (0)