diff --git a/NuGet.config b/NuGet.config index 9bfbde0bd6dc42..840930e36595ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + - 5.0.0-2.26418.103 - 5.0.0-2.26418.103 - 5.0.0-2.26418.103 + 5.0.0-2.26424.122 + 5.0.0-2.26424.122 + 5.0.0-2.26424.122 10.0.112 10.0.112 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 0.11.5-alpha.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 10.0.0-beta.26418.103 - 2.9.3-beta.26418.103 - 2.9.3-beta.26418.103 - 10.0.0-beta.26418.103 - 5.0.0-2.26418.103 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 0.11.5-alpha.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 10.0.0-beta.26424.122 + 2.9.3-beta.26424.122 + 2.9.3-beta.26424.122 + 10.0.0-beta.26424.122 + 5.0.0-2.26424.122 10.0.12 - 10.0.112-servicing.26418.103 + 10.0.112-servicing.26424.122 10.0.12 10.0.12 - 7.0.3-rc.41903 - 7.0.3-rc.41903 - 7.0.3-rc.41903 - 7.0.3-rc.41903 + 7.0.3-rc.42522 + 7.0.3-rc.42522 + 7.0.3-rc.42522 + 7.0.3-rc.42522 10.0.12 2.0.12 10.0.12 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98ffbdc99623d6..872c8f3d6c0483 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -43,89 +43,89 @@ https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/runtime-assets @@ -265,31 +265,31 @@ https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness f10844a1593bd12a5b59046798831ead3eeef2e0 - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 9269cdec2fee60b5914f8085dd26d1679bab9243 - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd - + https://github.com/dotnet/dotnet - d247057ae32ae36e14905eb8e776304a84433554 + a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd https://github.com/dotnet/node diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index b28af6613c23ec..726c2c1daf9904 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -14,10 +14,11 @@ parameters: # exist, 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 (dnceng/internal only). - # The infrastructure identifiers are centralized here and the App path is enabled by default. - # DevDiv requires its own project-scoped service connection before this path can be enabled there. + # 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' @@ -97,13 +98,16 @@ jobs: outputVariableName: 'CeapexEntraToken' condition: ${{ parameters.condition }} - # Mint a short-lived GitHub App installation token for the loc check-in PR (dnceng/internal only). - # All other projects fall back to PAT-based auth, since the app service connection is scoped to dnceng/internal. - - ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}: + # 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))) }}: - template: /eng/common/core-templates/steps/get-github-app-token.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - azureSubscription: ${{ parameters.GitHubAppServiceConnection }} + ${{ if and(eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.GitHubAppServiceConnection, 'dnceng-oneloc-githubapp')) }}: + azureSubscription: 'devdiv-oneloc-githubapp' + ${{ else }}: + azureSubscription: ${{ parameters.GitHubAppServiceConnection }} keyVaultName: ${{ parameters.GitHubAppKeyVaultName }} keyName: ${{ parameters.GitHubAppKeyName }} appClientId: ${{ parameters.GitHubAppClientId }} @@ -132,9 +136,9 @@ jobs: patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} - ${{ if and(eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}: + ${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}: gitHubPatVariable: "$(GitHubAppInstallationToken)" - ${{ if or(eq(parameters.UseGitHubAppAuthentication, false), ne(variables['System.TeamProject'], 'internal')) }}: + ${{ else }}: gitHubPatVariable: "${{ parameters.GithubPat }}" ${{ if ne(parameters.MirrorRepo, '') }}: isMirrorRepoSelected: true diff --git a/global.json b/global.json index 3c4458ffc9f505..5553e07d5ca012 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "10.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26418.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26418.103", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26418.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26424.122", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26424.122", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26424.122", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.12"