From 43cd1a582a399abc8fc564ed0ec036eee5087cc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Sep 2025 05:05:47 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250918.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.25405.2 -> To Version 6.0.0-beta.25468.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 1 - eng/common/templates-official/job/job.yml | 5 +++++ eng/common/templates/job/job.yml | 7 ++++++- global.json | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 236e9047045..cca774514d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 05a5ee2a0c496e69d6d22cd03423231e928d1545 + 4fd02da57297248915f054a69990409bf79021ae https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 619599f5f7a..9d7b01390f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,6 @@ release 15.1.0.0 preview - test diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index d61a00a3512..bdb59870e78 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -123,6 +123,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ 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/templates/job/job.yml b/eng/common/templates/job/job.yml index 01da2420df6..e659f1b9ea1 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -112,12 +112,17 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index 7a1f63d5af4..ea9351707c0 100644 --- a/global.json +++ b/global.json @@ -12,6 +12,6 @@ }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.25405.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.25468.4" } } From ca486979bc7de6222ce54f55eb4197e18a8d786a Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:16:10 +0200 Subject: [PATCH 2/2] Update VersionPrefix to 16.11.14 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9d7b01390f5..f23bd794221 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 16.11.13 + 16.11.14 release 15.1.0.0 preview