From 8a36f5f87bf8338a189fb001c0205ff4baee1cd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jul 2026 02:03:02 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20260721.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 9.0.0-beta.26301.4 -> To Version 9.0.0-beta.26371.3 --- NuGet.config | 4 ---- eng/Version.Details.xml | 16 +++++++------- eng/Versions.props | 2 +- eng/common/core-templates/job/onelocbuild.yml | 21 ++++++++++++++++++- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83f178c4680..bc6addd0970 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,8 @@ - - @@ -24,10 +22,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dd56e3d60f..386751ea4b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + cbbdb81eb86e96536be289b03d96b605c47932e1 - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + cbbdb81eb86e96536be289b03d96b605c47932e1 - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + cbbdb81eb86e96536be289b03d96b605c47932e1 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + cbbdb81eb86e96536be289b03d96b605c47932e1 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 8457d3a64c6..3b72225c132 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ 9.0.0-beta.24053.1 - 9.0.0-beta.26301.4 + 9.0.0-beta.26371.3 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index edefa789d36..79386ab0863 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,6 +8,12 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + # Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat). + # When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT. + # All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not + # exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter. + CeapexServiceConnection: 'dnceng-onelocbuild-ceapex' + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false @@ -73,6 +79,16 @@ jobs: displayName: Generate LocProject.json condition: ${{ parameters.condition }} + # Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only). + # All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal. + - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + - template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} + outputVariableName: 'CeapexEntraToken' + condition: ${{ parameters.condition }} + - task: OneLocBuild@2 displayName: OneLocBuild env: @@ -89,7 +105,10 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} + ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + patVariable: $(CeapexEntraToken) + ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}: + patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a06513a5940..d89aa48781b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -727,7 +727,7 @@ function InitializeToolset() { '' | Set-Content $proj - MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile + MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile /p:RestoreIgnoreFailedSources=true $path = Get-Content $toolsetLocationFile -Encoding UTF8 -TotalCount 1 if (!(Test-Path $path)) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 01b09b65796..c412703d1ba 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -410,7 +410,7 @@ function InitializeToolset { fi echo '' > "$proj" - MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" /p:RestoreIgnoreFailedSources=true local toolset_build_proj=`cat "$toolset_location_file"` diff --git a/global.json b/global.json index c6dbc287b14..4ef7c9c90f0 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26301.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26301.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26371.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26371.3" }, "sdk": { "version": "9.0.116" From b44b13c8d4384456f4b8d63044e08195e2dd5499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jul 2026 02:02:41 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20260722.8 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 9.0.0-beta.26301.4 -> To Version 9.0.0-beta.26372.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 386751ea4b3..6f90272f9b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - cbbdb81eb86e96536be289b03d96b605c47932e1 + 16960d68c1325deaabd35f46313462b7c1070545 - + https://github.com/dotnet/arcade - cbbdb81eb86e96536be289b03d96b605c47932e1 + 16960d68c1325deaabd35f46313462b7c1070545 - + https://github.com/dotnet/arcade - cbbdb81eb86e96536be289b03d96b605c47932e1 + 16960d68c1325deaabd35f46313462b7c1070545 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - cbbdb81eb86e96536be289b03d96b605c47932e1 + 16960d68c1325deaabd35f46313462b7c1070545 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 3b72225c132..f8af58028ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ 9.0.0-beta.24053.1 - 9.0.0-beta.26371.3 + 9.0.0-beta.26372.8 diff --git a/global.json b/global.json index 4ef7c9c90f0..1fb760020c0 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26371.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26371.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26372.8", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26372.8" }, "sdk": { "version": "9.0.116"