From 2496619490be55f223b7476b78202d69bc407f78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:29:36 -0400 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240405.4 (#100710) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24203.1 -> To Version 9.0.0-beta.24205.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- .../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 +- 7 files changed, 67 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef3c9906e6fbd..b5717f05a5f58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 28af9496b0e260f7e66ec549b39f1410ee9743d1 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + 541820fbd313f9bb82b756b66d258fe316d5e48b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4ef6855a95544..cd1960205b4f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.4.24175.4 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 2.6.7-beta.24203.1 - 9.0.0-beta.24203.1 - 2.6.7-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 2.6.7-beta.24205.4 + 9.0.0-beta.24205.4 + 2.6.7-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 + 9.0.0-beta.24205.4 1.4.0 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8dd..ba9ba49303292 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 + image: 1es-windows-2022-pt os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50d4b98e201a3..50f04e642a354 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 + image: 1es-mariner-2-pt 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 da1f40958b450..d286e956bdfa4 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 + image: 1es-windows-2022-pt os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt 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 + image: 1es-windows-2022-pt 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 1f308b24efc43..beab7d1bfba06 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 +# image: 1es-windows-2022-pt 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 bf1936167a4a4..b3d764e6c1528 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24203.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24205.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24201.1"