diff --git a/NuGet.config b/NuGet.config
index f85c4295417..4a7909a05ba 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 497521a8bb5..c988c99bb01 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props
15.9.20
15.9.20
- 10.0.0-beta.26426.122
- 10.0.0-beta.26426.122
- 10.0.0-beta.26426.122
- 10.0.0-beta.26426.122
- 10.0.13-servicing.26426.122
+ 10.0.0-beta.26427.124
+ 10.0.0-beta.26427.124
+ 10.0.0-beta.26427.124
+ 10.0.0-beta.26427.124
+ 10.0.13-servicing.26427.124
10.0.13
- 10.0.13-servicing.26426.122
- 10.0.13-servicing.26426.122
+ 10.0.13-servicing.26427.124
+ 10.0.13-servicing.26427.124
8.0.0-beta.23409.2
8.0.0-beta.23409.2
10.0.13
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
10.0.13
10.0.13
10.0.13
- 10.0.13-servicing.26426.122
+ 10.0.13-servicing.26427.124
10.0.13
10.0.13
10.0.13
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7e3e8706e0..6f0306ed87a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,26 +1,26 @@
-
+
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -28,51 +28,51 @@
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
https://github.com/dotnet/dotnet
@@ -84,25 +84,25 @@
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
-
+
https://github.com/dotnet/dotnet
- c7ac883e69867495da925d6c0757b1662241fe1e
+ 2c07be8ab38eb69e43aedf74ed288079c839b1dc
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
index 726c2c1daf9..15d8c1571e7 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.
+ # The `internal` and `DevDiv` System.TeamProject values have same-named, project-scoped
+ # connections. Other values, and any pipeline that sets this to '', use 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 when System.TeamProject is `internal` or `DevDiv`.
+ - ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
- template: /eng/common/templates/steps/get-federated-access-token.yml
parameters:
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
@@ -130,9 +128,9 @@ jobs:
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
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 5335060af12..66701e96ad9 100644
--- a/global.json
+++ b/global.json
@@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26426.122",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26426.122",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26427.124",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26427.124",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {