From a0852172c3662408284b8102d6d409f27138814b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:16:24 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240417.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24217.1 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 +++--- .../variables/pool-providers.yml | 2 +- global.json | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4088514a8..9fb973196 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 https://github.com/dotnet/arcade-services @@ -258,14 +258,14 @@ https://github.com/dotnet/arcade-services 9ec07c3673acf5602234c244d9465bca48f49969 - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 diff --git a/eng/Versions.props b/eng/Versions.props index 051ef0809..fc3c44802 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24212.4 + 9.0.0-beta.24217.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index c63e17e86..761acc5eb 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -210,7 +210,7 @@ jobs: - task: 1ES.PublishPipelineArtifact@1 inputs: targetPath: 'artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }} displayName: 'Publish logs' continueOnError: true condition: always() diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930..52b4d05d3 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index c91872093..2180e97a2 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: 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')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index d286e956b..da1f40958 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index c1bf9aace..2308a0f4b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.1.24101.2", + "dotnet": "9.0.100-preview.3.24204.13", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,8 +11,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24212.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1", "Microsoft.Build.NoTargets": "3.7.0" } }