From 1f1d5d5e1d2e13b21c63451c6eb2559d74e54344 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Jul 2025 02:03:53 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/arcade build 20250730.1 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.25366.1 -> To Version 9.0.0-beta.25380.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce3b78795e70f2..bc28a254c48a2f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,12 +10,12 @@ + - - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9de61e5379a6b9..ea9b6fb20b273d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 2.9.0-beta.25380.1 + 9.0.0-beta.25380.1 + 2.9.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 1.4.0 diff --git a/global.json b/global.json index fbcea3f120a495..481590c4d0fafe 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.25366.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25380.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From adf7128e633ba3603f4dadcdd6e7d8598ec1b38d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 02:03:16 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/arcade build 20250806.1 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.25366.1 -> To Version 9.0.0-beta.25406.1 --- eng/Version.Details.xml | 84 +++++++++++++-------------- eng/Versions.props | 32 +++++----- eng/common/core-templates/job/job.yml | 10 ++-- global.json | 6 +- 4 files changed, 67 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eca13bd737a944..8fc9eb95a3a354 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ea9b6fb20b273d..e8691751e7c039 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 2.9.0-beta.25380.1 - 9.0.0-beta.25380.1 - 2.9.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 2.9.0-beta.25406.1 + 9.0.0-beta.25406.1 + 2.9.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 1.4.0 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09c9..8947ea3f0593d0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ 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 + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ 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/global.json b/global.json index 481590c4d0fafe..c642b51e2a6621 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.25380.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25406.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 3da7147189a506385dbe27c8bf3dcc16fa189054 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:04:28 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/arcade build 20250807.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.25366.1 -> To Version 9.0.0-beta.25407.2 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 10 ++--- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc9eb95a3a354..98442af2c087b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e8691751e7c039..b41ba232d4f261 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 2.9.0-beta.25406.1 - 9.0.0-beta.25406.1 - 2.9.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 2.9.0-beta.25407.2 + 9.0.0-beta.25407.2 + 2.9.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 1.4.0 diff --git a/global.json b/global.json index c642b51e2a6621..c09a8af39f8436 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.107", + "version": "9.0.109", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25407.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 6851466ee7be5163c759cd2513525d73d3be9b66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 02:05:14 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/arcade build 20250815.3 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.25366.1 -> To Version 9.0.0-beta.25415.3 --- NuGet.config | 4 - eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 8 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 10 ++- .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 ++-- .../core-templates/steps/source-build.yml | 4 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 6 +- 22 files changed, 108 insertions(+), 108 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc28a254c48a2f..00cd886597dd2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98442af2c087b5..36150d3c94f93f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b41ba232d4f261..f99905b0c0a1e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 2.9.0-beta.25407.2 - 9.0.0-beta.25407.2 - 2.9.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 2.9.0-beta.25415.3 + 9.0.0-beta.25415.3 + 2.9.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 1.4.0 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f3e..792b60b49d424d 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0323ae..facb415ca6ff35 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8947ea3f0593d0..8da43d3b5837a1 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -166,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -189,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -200,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -244,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8ebbc3ab..edefa789d360f3 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e3196727..b103b7ee1686c7 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,7 +95,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +115,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +144,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b3ee96..662b9fcce154fc 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252cc65c8..4571a7864df6bf 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be4341c62f..3129670b3380c3 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9214e5..2ee8bbfff54553 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe721..a7abd58c4bb609 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3cf1..4085512b690910 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094824f4..7f5b84c4cb827f 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c5231912f..0623ac6e112309 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b7541b..730f7ab2b67493 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -97,7 +97,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +126,5 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba88..4bf4cf41bd7c76 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505aa602..81ea7a261f2d4a 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3a0..f1311bbb1b33d9 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fcea519..5bdd3dd85fd2be 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index c09a8af39f8436..f4dbe5851e058d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25415.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From bc617438c6a4cefaf8c59cbeeba636913a054ff5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Aug 2025 02:04:47 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/arcade build 20250828.3 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.25366.1 -> To Version 9.0.0-beta.25428.3 --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- .../core-templates/job/source-build.yml | 4 + .../core-templates/jobs/source-build.yml | 5 ++ .../core-templates/steps/source-build.yml | 9 +- global.json | 6 +- 6 files changed, 78 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36150d3c94f93f..f66d9f04c6531c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f99905b0c0a1e1..f6b7731da173a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 2.9.0-beta.25415.3 - 9.0.0-beta.25415.3 - 2.9.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 2.9.0-beta.25428.3 + 9.0.0-beta.25428.3 + 2.9.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 1.4.0 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58fd9a8..5baedac1e03dd4 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6de6e..0b408a67bd51cd 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 730f7ab2b67493..0718e4ba902e8f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index f4dbe5851e058d..5750340f106d11 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25428.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 026fd7b6d10e3e8a282f7002721b133d5111acca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 11 Sep 2025 16:14:04 +0200 Subject: [PATCH 6/9] Bump SdkVersionForWorkloadTesting --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f6b7731da173a7..060a8d31451b26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -263,7 +263,7 @@ 1.0.406601 - 9.0.107 + 9.0.109 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) From 6c5457fcf1a6552e70ac50c9100b89b0687e7e44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Sep 2025 19:35:33 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/arcade build 20250910.1 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.25366.1 -> To Version 9.0.0-beta.25460.1 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 10 ++--- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f66d9f04c6531c..c922b8234984d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 060a8d31451b26..5e41991438ecb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 2.9.0-beta.25428.3 - 9.0.0-beta.25428.3 - 2.9.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 2.9.0-beta.25460.1 + 9.0.0-beta.25460.1 + 2.9.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 1.4.0 diff --git a/global.json b/global.json index 5750340f106d11..3347fc23f29f2f 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.109", + "version": "9.0.110", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.109" + "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25460.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From a9065ba96e719cfb6b85631ce945e6e09b29890b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 12 Sep 2025 20:00:59 +0200 Subject: [PATCH 8/9] Bump SdkVersionForWorkloadTesting --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5e41991438ecb8..2843e17fa6b97c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -263,7 +263,7 @@ 1.0.406601 - 9.0.109 + 9.0.110 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) From 03c0052c8f14b0a7feb7d8b77d39cd6eae03b832 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:06:23 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root 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.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25462.4 Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner From Version 2.9.0-beta.25366.1 -> To Version 2.9.0-beta.25462.4 --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- .../job/publish-build-assets.yml | 9 +- eng/common/core-templates/jobs/jobs.yml | 2 + global.json | 6 +- 5 files changed, 71 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c922b8234984d1..3b23798f2ccf9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 604c13925074041a51e4533959477c8b6888dcf5 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2843e17fa6b97c..50097dd85875b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 2.9.0-beta.25460.1 - 9.0.0-beta.25460.1 - 2.9.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 1.4.0 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b103b7ee1686c7..a58c8a418e8a99 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -34,6 +34,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -56,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -100,7 +107,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3129670b3380c3..bf33cdc2cc7787 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -119,3 +120,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index 3347fc23f29f2f..cdac5c7bdcad75 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"