From e42f84b297c1775999c443b472ccd4df516eca81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Jun 2025 02:03:32 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250623.2 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.25302.2 -> To Version 9.0.0-beta.25323.2 --- NuGet.config | 4 +- eng/Version.Details.xml | 84 +++++++++++++-------------- eng/Versions.props | 32 +++++----- eng/common/core-templates/job/job.yml | 4 ++ eng/common/internal/NuGet.config | 3 + global.json | 10 ++-- 6 files changed, 72 insertions(+), 65 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4806514865c0f..99b74bbf4b2dd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,10 +10,10 @@ + + - - - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 4d797652fa667e94a39db06cbb5a3cad4f72a51f - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1658031bdfbee1..61c9a18a284012 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.107 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 2.9.0-beta.25302.2 - 9.0.0-beta.25302.2 - 2.9.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 2.9.0-beta.25323.2 + 9.0.0-beta.25323.2 + 2.9.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 1.4.0 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd51334..abe80a2a0e09c9 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b166f5..f70261ed689bce 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index e7a948a8c83a06..9221b6bdf40176 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.106", + "version": "9.0.107", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.106" + "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25323.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 8155b45e21e73f14bbea6f35283fd86432c071e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Jun 2025 02:03:35 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20250625.4 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.25302.2 -> To Version 9.0.0-beta.25325.4 --- NuGet.config | 1 + eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 4 files changed, 62 insertions(+), 61 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99b74bbf4b2dd1..cd65b636a861b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb3837a5bd5f0..4ca2b8bc164216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 4d797652fa667e94a39db06cbb5a3cad4f72a51f - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 61c9a18a284012..05cb98535e520c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.107 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 2.9.0-beta.25323.2 - 9.0.0-beta.25323.2 - 2.9.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 2.9.0-beta.25325.4 + 9.0.0-beta.25325.4 + 2.9.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 1.4.0 diff --git a/global.json b/global.json index 9221b6bdf40176..060c5f7a5532be 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25323.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"