From ab35182c176aa4f804fdb700bf771e9d1bd8369a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Nov 2025 02:01:38 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20251120.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25569.5 -> To Version 11.0.0-beta.25570.6 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/source-build.yml | 2 +- global.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e8fb6ffb8b..cc5ee72efb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props 5.0.0-2.25480.7 5.0.0-2.25480.7 - 11.0.0-beta.25569.5 + 11.0.0-beta.25570.6 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1901bc115c..aa6aee89d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - d0dd6fd98074a55efc1bfe63297467c706058a56 + c1926cf647dd684194c2914f47f61ff534f030ac https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 9f6b3ee9e4..9d820f9742 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index d362a9f064..9142be7c90 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.5", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 63e268087ce01386122f0c517289d92225be76b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Nov 2025 02:01:36 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20251121.7 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25569.5 -> To Version 11.0.0-beta.25571.7 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cc5ee72efb..4aa438ade6 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props 5.0.0-2.25480.7 5.0.0-2.25480.7 - 11.0.0-beta.25570.6 + 11.0.0-beta.25571.7 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa6aee89d3..e9738f5f3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - c1926cf647dd684194c2914f47f61ff534f030ac + 23d431613e20b20517334c1acbc7a04a6edb6ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/global.json b/global.json index 9142be7c90..55a4f6cb5c 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.6", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.7", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 3d8efc3e3fa94c4e20eaddad23f2d7809d5bd2c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Nov 2025 02:01:47 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20251121.8 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25569.5 -> To Version 11.0.0-beta.25571.8 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 +-- .../steps/install-microbuild.yml | 29 +++++++++++++++---- global.json | 2 +- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4aa438ade6..75834531c8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props 5.0.0-2.25480.7 5.0.0-2.25480.7 - 11.0.0-beta.25571.7 + 11.0.0-beta.25571.8 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9738f5f3f..6f68631a45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 23d431613e20b20517334c1acbc7a04a6edb6ad9 + a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index bdebec0eaa..4f4b56ed2a 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,9 +13,8 @@ parameters: # 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 - # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. - microBuildOutputFolder: '$(Build.SourcesDirectory)' + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild # Microbuild version microbuildPluginVersion: 'latest' @@ -30,8 +29,27 @@ steps: inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -85,6 +103,7 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json version: ${{ parameters.microbuildPluginVersion }} + workingDirectory: ${{ parameters.microBuildOutputFolder }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: diff --git a/global.json b/global.json index 55a4f6cb5c..ee3469b1d3 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.7", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.8", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } }