diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7657e54431c..26dcec672ba 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -67,17 +67,17 @@
-
+
https://github.com/dotnet/arcade
- d9d97de241d6e2bc5cce12d9e7f54e8d19ca67dc
+ df7cbf719bdc6a2e6dfc229542a53bf28a8d5180
-
+
https://github.com/dotnet/arcade
- d9d97de241d6e2bc5cce12d9e7f54e8d19ca67dc
+ df7cbf719bdc6a2e6dfc229542a53bf28a8d5180
-
+
https://github.com/dotnet/arcade
- d9d97de241d6e2bc5cce12d9e7f54e8d19ca67dc
+ df7cbf719bdc6a2e6dfc229542a53bf28a8d5180
diff --git a/eng/Versions.props b/eng/Versions.props
index 40f387506ca..38068d9b6d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
9.0.19
- 9.0.0-beta.26423.5
+ 9.0.0-beta.26429.3
17.8.43
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
index 0dd3c8dd232..932fcef6494 100644
--- a/eng/common/core-templates/job/onelocbuild.yml
+++ b/eng/common/core-templates/job/onelocbuild.yml
@@ -9,9 +9,8 @@ parameters:
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.
+ # dnceng/internal and DevDiv/DevDiv have same-named, project-scoped connections. Other projects,
+ # and any pipeline that sets this to '', fall back to PAT-based auth via the CeapexPat parameter.
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'
# GitHub App authentication for the OneLoc check-in PR.
@@ -89,9 +88,8 @@ 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')) }}:
+ # Acquire an Entra token for ceapex feed access in the supported internal and DevDiv projects.
+ - ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
- template: /eng/common/core-templates/steps/get-federated-access-token.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -132,9 +130,9 @@ jobs:
${{ if eq(parameters.RepoType, 'gitHub') }}:
isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
+ ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
patVariable: $(CeapexEntraToken)
- ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}:
+ ${{ if or(eq(parameters.CeapexServiceConnection, ''), and(ne(variables['System.TeamProject'], 'internal'), ne(variables['System.TeamProject'], 'DevDiv'))) }}:
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
diff --git a/global.json b/global.json
index 67e73133b16..a55bef5a17d 100644
--- a/global.json
+++ b/global.json
@@ -13,7 +13,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26423.5",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26423.5"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26429.3",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26429.3"
}
}