From 874bcb166561b40eb7fbd59b6c0708f94e15f5a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Jul 2025 02:05:03 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/dotnet build 276450 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25372.103 -> 10.0.0-beta.25373.104) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-preview.7.25372.103 -> 10.0.0-preview.7.25373.104) --- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- global.json | 4 +-- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60e40acc2df..d05dc22c0b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f diff --git a/eng/Versions.props b/eng/Versions.props index fa4c79320c3..aef0105c279 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,24 +16,24 @@ False - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 - 10.0.0-preview.7.25372.103 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25373.104 - 10.0.0-beta.25372.103 + 10.0.0-beta.25373.104 17.14.8 diff --git a/global.json b/global.json index 6b861421774..060a7c24476 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25373.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25373.104" } } From 13f590a0d80496a7021b7b2b638878b619f2b91f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Jul 2025 02:06:48 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 276628 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25373.104 -> 10.0.0-beta.25374.102) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-preview.7.25373.104 -> 10.0.0-preview.7.25374.102) --- eng/Version.Details.xml | 74 +++++++++---------- eng/Versions.props | 32 ++++---- eng/common/core-templates/job/job.yml | 2 + .../steps/install-microbuild.yml | 40 ++++++++-- global.json | 4 +- 5 files changed, 90 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d05dc22c0b4..1602b4b6eaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c diff --git a/eng/Versions.props b/eng/Versions.props index 93226cee49c..f7835cdfc3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,24 +16,24 @@ False - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 - 10.0.0-beta.25373.104 + 10.0.0-beta.25374.102 17.14.8 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 6badecba7bc..d9013251542 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -20,6 +20,7 @@ parameters: artifacts: '' enableMicrobuild: false enableMicrobuildForMacAndLinux: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -128,6 +129,7 @@ jobs: parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} + microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f3064a7834e..da30e67bc34 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,8 +4,16 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Determines whether the ESRP service connection information should be passed to the signing plugin. + # This overlaps with _SignType to some degree. We only need the service connection for real signing. + # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. + # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod. + # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The + # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. + microbuildUseESRP: true # Location of the MicroBuild output folder microBuildOutputFolder: '$(Build.SourcesDirectory)' + continueOnError: false steps: @@ -21,19 +29,37 @@ steps: workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - script: | + REM Check if ESRP is disabled while SignType is real + if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" ( + echo Error: ESRP must be enabled when SignType is real. + exit /b 1 + ) + displayName: 'Validate ESRP usage (Windows)' + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + - script: | + # Check if ESRP is disabled while SignType is real + if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then + echo "Error: ESRP must be enabled when SignType is real." + exit 1 + fi + displayName: 'Validate ESRP usage (Non-Windows)' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif 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(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + azureSubscription: 'MicroBuild Signing Task (DevDiv)' + useEsrpCli: true + ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} diff --git a/global.json b/global.json index 060a7c24476..1f882a496b5 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25373.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25373.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25374.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25374.102" } }