Skip to content

Commit 8a4e7b0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250314.6 (#60961)
[main] Update dependencies from dotnet/arcade
1 parent d18d253 commit 8a4e7b0

File tree

13 files changed

+59
-116
lines changed

13 files changed

+59
-116
lines changed

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>4ff64a03e5c31fa824c4bc9377ef1ae8134d3f7a</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25164.6">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
393+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25157.1">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25164.6">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
398+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25157.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25164.6">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
403+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25157.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25164.6">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
407+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25157.1">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25164.6">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
411+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25164.6">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
415+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25157.1">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
419+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25157.1">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25164.6">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
423+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
424424
</Dependency>
425425
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.4.0-preview.1.25164.5">
426426
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25157.1</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25157.1</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25164.6</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25164.6</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.616001</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
# in the default public locations.
3838
internalRuntimeDownloadArgs=
3939
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
40-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
40+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4141
fi
4242
4343
buildConfig=Release

‎eng/common/cross/armel/armel.jessie.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

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

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,13 @@ while :; do
164164
armel)
165165
__BuildArch=armel
166166
__UbuntuArch=armel
167-
__UbuntuRepo="http://ftp.debian.org/debian/"
168-
__CodeName=jessie
167+
__UbuntuRepo="http://archive.debian.org/debian/"
168+
__CodeName=buster
169169
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
170+
__LLDB_Package="liblldb-6.0-dev"
171+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
172+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
173+
__UbuntuSuites=
170174
;;
171175
armv6)
172176
__BuildArch=armv6
@@ -278,46 +282,23 @@ while :; do
278282

279283
;;
280284
xenial) # Ubuntu 16.04
281-
if [[ "$__CodeName" != "jessie" ]]; then
282-
__CodeName=xenial
283-
fi
284-
;;
285-
zesty) # Ubuntu 17.04
286-
if [[ "$__CodeName" != "jessie" ]]; then
287-
__CodeName=zesty
288-
fi
285+
__CodeName=xenial
289286
;;
290287
bionic) # Ubuntu 18.04
291-
if [[ "$__CodeName" != "jessie" ]]; then
292-
__CodeName=bionic
293-
fi
288+
__CodeName=bionic
294289
;;
295290
focal) # Ubuntu 20.04
296-
if [[ "$__CodeName" != "jessie" ]]; then
297-
__CodeName=focal
298-
fi
291+
__CodeName=focal
299292
;;
300293
jammy) # Ubuntu 22.04
301-
if [[ "$__CodeName" != "jessie" ]]; then
302-
__CodeName=jammy
303-
fi
294+
__CodeName=jammy
304295
;;
305296
noble) # Ubuntu 24.04
306-
if [[ "$__CodeName" != "jessie" ]]; then
307-
__CodeName=noble
308-
fi
297+
__CodeName=noble
309298
if [[ -n "$__LLDB_Package" ]]; then
310299
__LLDB_Package="liblldb-18-dev"
311300
fi
312301
;;
313-
jessie) # Debian 8
314-
__CodeName=jessie
315-
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
316-
317-
if [[ -z "$__UbuntuRepo" ]]; then
318-
__UbuntuRepo="http://ftp.debian.org/debian/"
319-
fi
320-
;;
321302
stretch) # Debian 9
322303
__CodeName=stretch
323304
__LLDB_Package="liblldb-6.0-dev"
@@ -333,7 +314,7 @@ while :; do
333314
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
334315

335316
if [[ -z "$__UbuntuRepo" ]]; then
336-
__UbuntuRepo="http://ftp.debian.org/debian/"
317+
__UbuntuRepo="http://archive.debian.org/debian/"
337318
fi
338319
;;
339320
bullseye) # Debian 11
@@ -473,10 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
473454
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
474455
fi
475456

476-
if [[ "$__BuildArch" == "armel" ]]; then
477-
__LLDB_Package="lldb-3.5-dev"
478-
fi
479-
480457
__UbuntuPackages+=" ${__LLDB_Package:-}"
481458

482459
if [[ -z "$__UbuntuRepo" ]]; then
@@ -850,12 +827,6 @@ EOF
850827
if [[ "$__SkipUnmount" == "0" ]]; then
851828
umount "$__RootfsDir"/* || true
852829
fi
853-
854-
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
855-
pushd "$__RootfsDir"
856-
patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
857-
popd
858-
fi
859830
elif [[ "$__Tizen" == "tizen" ]]; then
860831
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
861832
else

‎eng/common/native/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$os" in
4545
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4646
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4747
# brew update --preinstall
48-
brew bundle --no-upgrade --no-lock --file=- <<EOF
48+
brew bundle --no-upgrade --file=- <<EOF
4949
brew "cmake"
5050
brew "icu4c"
5151
brew "openssl@3"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
3232
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
3333
condition: always()
34+
retryCountOnTaskFailure: 10 # for any logs being locked
3435
continueOnError: true
3536
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
3637
- output: pipelineArtifact
@@ -39,14 +40,15 @@ jobs:
3940
displayName: 'Publish logs'
4041
continueOnError: true
4142
condition: always()
43+
retryCountOnTaskFailure: 10 # for any logs being locked
4244
sbomEnabled: false # we don't need SBOM for logs
4345

4446
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
4547
- output: buildArtifacts
4648
displayName: Publish Logs
4749
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
4850
publishLocation: Container
49-
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
51+
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
5052
continueOnError: true
5153
condition: always()
5254
sbomEnabled: false # we don't need SBOM for logs

‎eng/common/templates-official/steps/publish-build-artifacts.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ parameters:
2424
- name: is1ESPipeline
2525
type: boolean
2626
default: true
27+
28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
2731

2832
steps:
2933
- ${{ if ne(parameters.is1ESPipeline, true) }}:
@@ -38,4 +42,5 @@ steps:
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
4044
ArtifactName: ${{ parameters.artifactName }}
41-
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

‎eng/common/templates/job/job.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
4747
continueOnError: true
4848
condition: always()
49+
retryCountOnTaskFailure: 10 # for any logs being locked
4950
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
5051
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
5152
parameters:
@@ -56,6 +57,7 @@ jobs:
5657
displayName: 'Publish logs'
5758
continueOnError: true
5859
condition: always()
60+
retryCountOnTaskFailure: 10 # for any logs being locked
5961
sbomEnabled: false # we don't need SBOM for logs
6062

6163
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
@@ -66,7 +68,7 @@ jobs:
6668
displayName: Publish Logs
6769
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
6870
publishLocation: Container
69-
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
71+
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
7072
continueOnError: true
7173
condition: always()
7274

‎eng/common/templates/steps/publish-build-artifacts.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ parameters:
2525
type: string
2626
default: 'Container'
2727

28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
31+
2832
steps:
2933
- ${{ if eq(parameters.is1ESPipeline, true) }}:
3034
- 'eng/common/templates cannot be referenced from a 1ES managed template': error
@@ -37,4 +41,6 @@ steps:
3741
PublishLocation: ${{ parameters.publishLocation }}
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
40-
ArtifactName: ${{ parameters.artifactName }}
44+
ArtifactName: ${{ parameters.artifactName }}
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

0 commit comments

Comments
 (0)