From c8acb8c9e1fae2cff63626879ed788daab7906b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 05:01:54 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20250312.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25161.2 -> To Version 10.0.0-beta.25162.4 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- eng/common/templates-official/job/job.yml | 2 ++ .../steps/publish-build-artifacts.yml | 7 ++++- eng/common/templates/job/job.yml | 2 ++ .../steps/publish-build-artifacts.yml | 8 +++++- global.json | 4 +-- 7 files changed, 37 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7dfe18c073fd..f481625a4e48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -640,34 +640,34 @@ - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 - + https://github.com/dotnet/arcade - dbb4142ebc34d0a4b9f26136f86065c037dc4b80 + f5a7c5d5c56197b09715dece7541ca06beb94eb0 diff --git a/eng/Versions.props b/eng/Versions.props index 886b6898659d..436bb40cf177 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -275,10 +275,10 @@ - 10.0.0-beta.25161.2 - 10.0.0-beta.25161.2 - 10.0.0-beta.25161.2 - 10.0.0-beta.25161.2 + 10.0.0-beta.25162.4 + 10.0.0-beta.25162.4 + 10.0.0-beta.25162.4 + 10.0.0-beta.25162.4 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 54f7bdcf6619..a8a943287458 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -31,6 +31,7 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked continueOnError: true - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - output: pipelineArtifact @@ -39,6 +40,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml index 100a3fc98493..fcf6637b2ebc 100644 --- a/eng/common/templates-official/steps/publish-build-artifacts.yml +++ b/eng/common/templates-official/steps/publish-build-artifacts.yml @@ -24,6 +24,10 @@ parameters: - name: is1ESPipeline type: boolean default: true + +- name: retryCountOnTaskFailure + type: string + default: 10 steps: - ${{ if ne(parameters.is1ESPipeline, true) }}: @@ -38,4 +42,5 @@ steps: PathtoPublish: ${{ parameters.pathToPublish }} ${{ if parameters.artifactName }}: ArtifactName: ${{ parameters.artifactName }} - + ${{ if parameters.retryCountOnTaskFailure }}: + retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c42555977ebd..7cbf668c22bc 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -46,6 +46,7 @@ jobs: artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: @@ -56,6 +57,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked sbomEnabled: false # we don't need SBOM for logs - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml index 6428a98dfef6..605e602e94d1 100644 --- a/eng/common/templates/steps/publish-build-artifacts.yml +++ b/eng/common/templates/steps/publish-build-artifacts.yml @@ -25,6 +25,10 @@ parameters: type: string default: 'Container' +- name: retryCountOnTaskFailure + type: string + default: 10 + steps: - ${{ if eq(parameters.is1ESPipeline, true) }}: - 'eng/common/templates cannot be referenced from a 1ES managed template': error @@ -37,4 +41,6 @@ steps: PublishLocation: ${{ parameters.publishLocation }} PathtoPublish: ${{ parameters.pathToPublish }} ${{ if parameters.artifactName }}: - ArtifactName: ${{ parameters.artifactName }} \ No newline at end of file + ArtifactName: ${{ parameters.artifactName }} + ${{ if parameters.retryCountOnTaskFailure }}: + retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} diff --git a/global.json b/global.json index b5998fef345e..174fdbdf2e8a 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25161.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25161.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25162.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25162.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" }