diff --git a/NuGet.config b/NuGet.config
index 08dd145b3b5309..d869a5afb008cb 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,7 +9,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6f08063c2c89c4..3500b2b6064c46 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,37 +13,37 @@
https://github.com/dotnet/wcf
7f504aabb1988e9a093c1e74d8040bd52feb2f01
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
https://github.com/dotnet/command-line-api
@@ -65,18 +65,18 @@
5850baac30805f358b113f0b12966ce234023725
-
+
https://github.com/dotnet/emsdk
- bd30e104eaf27c7f46fee5edba0ba416e00c8f5e
+ 2b4c425892386783f059f98bd2aa8d780b78617f
https://github.com/dotnet/emsdk
- bd30e104eaf27c7f46fee5edba0ba416e00c8f5e
+ 2b4c425892386783f059f98bd2aa8d780b78617f
-
+
https://github.com/dotnet/emsdk
- bd30e104eaf27c7f46fee5edba0ba416e00c8f5e
+ 2b4c425892386783f059f98bd2aa8d780b78617f
@@ -93,87 +93,87 @@
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
https://github.com/dotnet/runtime-assets
@@ -227,61 +227,61 @@
https://github.com/dotnet/runtime-assets
12466630283f5e0fe1869b52184aece70d3967a4
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
-
+
https://github.com/dotnet/llvm-project
- 7f1c84c77e2f2abe3ce19a9fe8a1149f3c1bafdb
+ 5a502086ee0ced380f53194c674e3c21701fb5c0
https://github.com/dotnet/runtime
@@ -333,9 +333,9 @@
https://github.com/dotnet/xharness
8dd9b8e6004e22c7b120af0631f0809865ff2088
-
+
https://github.com/dotnet/arcade
- ee364d8268f86d6a2ab859f6cc82ca6f9d20b31c
+ c11157d174c111c4ab316dc60ff53311e410ef97
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index c846cfe8f061f4..1b7f6a44f00a5d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -84,22 +84,22 @@
9.0.109
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 2.9.0-beta.26431.8
- 9.0.0-beta.26431.8
- 2.9.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
- 9.0.0-beta.26431.8
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 2.9.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 2.9.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
+ 9.0.0-beta.26458.10
1.4.0
@@ -169,7 +169,7 @@
1.0.0-prerelease.24462.2
2.0.0
- 17.12.0-beta1.24603.5
+ 18.9.0-beta1.26405.2
2.0.0-beta4.24324.3
3.1.7
2.1.0
@@ -230,25 +230,25 @@
2.5.10
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
- 9.0.21-servicing.26451.1
+ 9.0.21-servicing.26464.5
9.0.21
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
- 19.1.0-alpha.1.26407.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
+ 19.1.0-alpha.1.26457.4
3.1.7
1.0.406601
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
index 932fcef6494c6b..ea590495fb0d5e 100644
--- a/eng/common/core-templates/job/onelocbuild.yml
+++ b/eng/common/core-templates/job/onelocbuild.yml
@@ -5,19 +5,10 @@ parameters:
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool: ''
- 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).
- # 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.
+ # Project-scoped WIF service connection for Ceapex feed authentication.
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'
# GitHub App authentication for the OneLoc check-in PR.
- # dnceng/internal and DevDiv/DevDiv are enabled by default with their project-scoped service
- # connections. Other projects must explicitly opt in after provisioning equivalent infrastructure.
- UseGitHubAppAuthentication: true
- UseGitHubAppAuthenticationInOtherProjects: false
GitHubAppServiceConnection: 'dnceng-oneloc-githubapp'
GitHubAppClientId: 'Iv23lijBU8x3gc9lDOc9'
GitHubAppKeyVaultName: 'EngKeyVault'
@@ -48,7 +39,6 @@ jobs:
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
variables:
- - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
- name: _GenerateLocProjectArguments
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
-LanguageSet "${{ parameters.LanguageSet }}"
@@ -79,6 +69,10 @@ jobs:
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+ - ${{ if notIn(variables['System.TeamProject'], 'internal', 'DevDiv') }}:
+ - 'OneLocBuild is supported only in dnceng/internal and DevDiv/DevDiv.': error
+ - ${{ if eq(parameters.CeapexServiceConnection, '') }}:
+ - 'CeapexServiceConnection must identify a WIF service connection.': error
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
- task: Powershell@2
@@ -88,18 +82,16 @@ jobs:
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}
- # 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 }}
- federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
- outputVariableName: 'CeapexEntraToken'
- condition: ${{ parameters.condition }}
+ # Acquire a short-lived Entra token for Ceapex feed access.
+ - template: /eng/common/core-templates/steps/get-federated-access-token.yml
+ parameters:
+ is1ESPipeline: ${{ parameters.is1ESPipeline }}
+ federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
+ outputVariableName: 'CeapexEntraToken'
+ condition: ${{ parameters.condition }}
- # Mint a short-lived GitHub App installation token for the loc check-in PR. Use the connection
- # provisioned in each supported project; other projects must explicitly opt in and override it.
- - ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
+ # Mint a short-lived GitHub App installation token for the loc check-in PR.
+ - ${{ if eq(parameters.RepoType, 'gitHub') }}:
- template: /eng/common/core-templates/steps/get-github-app-token.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -130,16 +122,10 @@ jobs:
${{ if eq(parameters.RepoType, 'gitHub') }}:
isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
- patVariable: $(CeapexEntraToken)
- ${{ if or(eq(parameters.CeapexServiceConnection, ''), and(ne(variables['System.TeamProject'], 'internal'), ne(variables['System.TeamProject'], 'DevDiv'))) }}:
- patVariable: ${{ parameters.CeapexPat }}
+ patVariable: $(CeapexEntraToken)
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
- ${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
- gitHubPatVariable: "$(GitHubAppInstallationToken)"
- ${{ else }}:
- gitHubPatVariable: "${{ parameters.GithubPat }}"
+ gitHubPatVariable: "$(GitHubAppInstallationToken)"
${{ if ne(parameters.MirrorRepo, '') }}:
isMirrorRepoSelected: true
gitHubOrganization: ${{ parameters.GitHubOrg }}
diff --git a/global.json b/global.json
index c2d023dfb1ef09..fc0abba4c41317 100644
--- a/global.json
+++ b/global.json
@@ -8,9 +8,9 @@
"dotnet": "9.0.116"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26431.8",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26431.8",
- "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26431.8",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26458.10",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26458.10",
+ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26458.10",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"