Skip to content

Commit b5a9965

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240407.1 (#55012)
[main] Update dependencies from dotnet/arcade
1 parent 6196f76 commit b5a9965

File tree

8 files changed

+33
-26
lines changed

8 files changed

+33
-26
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -383,31 +383,31 @@
383383
<Uri>https://github.com/dotnet/winforms</Uri>
384384
<Sha>0bf0cd0a97f1f76e133879501e3553d4b7825dbf</Sha>
385385
</Dependency>
386-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
386+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
387387
<Uri>https://github.com/dotnet/arcade</Uri>
388-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
388+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
389389
</Dependency>
390390
<!-- Intermediate is necessary for source build. -->
391-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
391+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
393+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
394394
<SourceBuild RepoName="arcade" ManagedOnly="true" />
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
396+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
398+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
399399
</Dependency>
400-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24179.6">
400+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24207.1">
401401
<Uri>https://github.com/dotnet/arcade</Uri>
402-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
402+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
403403
</Dependency>
404-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24179.6">
404+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24207.1">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
406+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
407407
</Dependency>
408-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24179.6">
408+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24207.1">
409409
<Uri>https://github.com/dotnet/arcade</Uri>
410-
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
410+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
411411
</Dependency>
412412
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.3.24175.2">
413413
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@
159159
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
160160
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
161161
<!-- Packages from dotnet/arcade -->
162-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersVersion>
163-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksTemplatingVersion>
164-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24179.6</MicrosoftDotNetRemoteExecutorVersion>
165-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24179.6</MicrosoftSourceBuildIntermediatearcadeVersion>
162+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersVersion>
163+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTemplatingVersion>
164+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24207.1</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24207.1</MicrosoftSourceBuildIntermediatearcadeVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24201.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

‎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
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.22"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1"
3232
}
3333
}

0 commit comments

Comments
 (0)