From 790c96939ac589b6796a277a061c297c458a856b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Aug 2026 02:02:18 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20260817.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.26411.4 -> To Version 8.0.0-beta.26417.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/steps/source-build.yml | 5 ++--- eng/common/templates/steps/source-build.yml | 5 ++--- global.json | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84e167b138f6..2e9062b065d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 7945b1b660dff1927e4d71aca0a11e5d067ba4a5 + 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 - + https://github.com/dotnet/arcade - 7945b1b660dff1927e4d71aca0a11e5d067ba4a5 + 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 - + https://github.com/dotnet/arcade - 7945b1b660dff1927e4d71aca0a11e5d067ba4a5 + 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 - + https://github.com/dotnet/arcade - 7945b1b660dff1927e4d71aca0a11e5d067ba4a5 + 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1d91c90f5bce..47921f4bc4a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.26411.4 + 8.0.0-beta.26417.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.26411.4 + 8.0.0-beta.26417.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index acb64b39a693..1695b6dcf37f 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -20,13 +20,12 @@ steps: - script: | df -h - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # If building on the dnceng internal project, call the feed setup script to add internal feeds corresponding to public ones. # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those # changes. internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + if [ '${{ eq(variables['System.TeamProject'], 'internal') }}' = 'True' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh # Authenticate to internal feeds using the build identity (System.AccessToken) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 91da8aaee5f8..c1e517f38d02 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -20,13 +20,12 @@ steps: - script: | df -h - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # If building on the dnceng internal project, call the feed setup script to add internal feeds corresponding to public ones. # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those # changes. internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + if [ '${{ eq(variables['System.TeamProject'], 'internal') }}' = 'True' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh # Authenticate to internal feeds using the build identity (System.AccessToken) diff --git a/global.json b/global.json index 4f300a747391..3ed6fc2d609a 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26411.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26411.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26417.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26417.2" } } From a8ceaae284fea25fe7716fa58b70aa884e33e220 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Aug 2026 02:02:46 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20260818.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.26411.4 -> To Version 8.0.0-beta.26418.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9062b065d6..445bff3d1ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 + 3175ec7d73772469351b03df062098104aba1c0d - + https://github.com/dotnet/arcade - 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 + 3175ec7d73772469351b03df062098104aba1c0d - + https://github.com/dotnet/arcade - 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 + 3175ec7d73772469351b03df062098104aba1c0d - + https://github.com/dotnet/arcade - 15b1da3f94c67c2a0fb0ccaa193160e462b1d243 + 3175ec7d73772469351b03df062098104aba1c0d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 47921f4bc4a9..3e25e6ab95e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.26417.2 + 8.0.0-beta.26418.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.26417.2 + 8.0.0-beta.26418.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 3ed6fc2d609a..b211a4429b46 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26417.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26417.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26418.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26418.3" } } From 1460fd425f9d519f43a0375af6aeaf2601f25db0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Aug 2026 02:02:10 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20260820.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.26411.4 -> To Version 8.0.0-beta.26420.2 --- eng/Version.Details.xml | 16 ++-- eng/Versions.props | 4 +- eng/common/sdl/extract-artifact-packages.ps1 | 82 -------------------- eng/common/templates/job/execute-sdl.yml | 12 --- global.json | 4 +- 5 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 eng/common/sdl/extract-artifact-packages.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 445bff3d1ae7..29d031ace009 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 3175ec7d73772469351b03df062098104aba1c0d + a2796e857b76715dea179a06a1363605beac3eb5 - + https://github.com/dotnet/arcade - 3175ec7d73772469351b03df062098104aba1c0d + a2796e857b76715dea179a06a1363605beac3eb5 - + https://github.com/dotnet/arcade - 3175ec7d73772469351b03df062098104aba1c0d + a2796e857b76715dea179a06a1363605beac3eb5 - + https://github.com/dotnet/arcade - 3175ec7d73772469351b03df062098104aba1c0d + a2796e857b76715dea179a06a1363605beac3eb5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3e25e6ab95e5..417c66a9e855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.26418.3 + 8.0.0-beta.26420.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.26418.3 + 8.0.0-beta.26420.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 deleted file mode 100644 index f031ed5b25e9..000000000000 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ /dev/null @@ -1,82 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored - [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -function ExtractArtifacts { - if (!(Test-Path $InputPath)) { - Write-Host "Input Path does not exist: $InputPath" - ExitWithExitCode 0 - } - $Jobs = @() - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - $ExtractPackage = { - param( - [string] $PackagePath # Full path to a NuGet package - ) - - if (!(Test-Path $PackagePath)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - $RelevantExtensions = @('.dll', '.exe', '.pdb') - Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) - [System.IO.Directory]::CreateDirectory($TargetPath); - - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) - } - } - catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 - } - finally { - $zip.Dispose() - } - } - Measure-Command { ExtractArtifacts } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 89f1b31bc55c..7152ff120adf 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -109,18 +109,6 @@ jobs: displayName: Trim the version from the NuGet packages continueOnError: ${{ parameters.sdlContinueOnError }} - - powershell: eng/common/sdl/extract-artifact-packages.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts - -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts - displayName: Extract Blob Artifacts - continueOnError: ${{ parameters.sdlContinueOnError }} - - - powershell: eng/common/sdl/extract-artifact-packages.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts - -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts - displayName: Extract Package Artifacts - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - powershell: eng/common/sdl/extract-artifact-archives.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts diff --git a/global.json b/global.json index b211a4429b46..208ff5279387 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26418.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26418.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26420.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26420.2" } } From cfd697e89b4e321739816cd0abd2c616894778f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Aug 2026 02:01:42 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20260823.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.26411.4 -> To Version 8.0.0-beta.26423.4 --- eng/Version.Details.xml | 16 +++++----- eng/Versions.props | 4 +-- .../templates-official/job/onelocbuild.yml | 31 ++++++++++++++++++- eng/common/templates/job/onelocbuild.yml | 31 ++++++++++++++++++- global.json | 4 +-- 5 files changed, 72 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29d031ace009..7996640ae76c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a2796e857b76715dea179a06a1363605beac3eb5 + 14bc335d8f09c18b359e7100cbb164e071e71ad7 - + https://github.com/dotnet/arcade - a2796e857b76715dea179a06a1363605beac3eb5 + 14bc335d8f09c18b359e7100cbb164e071e71ad7 - + https://github.com/dotnet/arcade - a2796e857b76715dea179a06a1363605beac3eb5 + 14bc335d8f09c18b359e7100cbb164e071e71ad7 - + https://github.com/dotnet/arcade - a2796e857b76715dea179a06a1363605beac3eb5 + 14bc335d8f09c18b359e7100cbb164e071e71ad7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 417c66a9e855..0f352f60c412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.26420.2 + 8.0.0-beta.26423.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.26420.2 + 8.0.0-beta.26423.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index c103b0445a81..d0e4f1ceb2b8 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -14,6 +14,16 @@ 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 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' + GitHubAppKeyName: 'oneloc-localization-app-key' + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false @@ -83,6 +93,22 @@ jobs: 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))) }}: + - template: /eng/common/templates-official/steps/get-github-app-token.yml + parameters: + ${{ 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 }} + installationOwner: ${{ parameters.GitHubOrg }} + outputVariableName: 'GitHubAppInstallationToken' + condition: ${{ parameters.condition }} + - task: OneLocBuild@2 displayName: OneLocBuild env: @@ -105,7 +131,10 @@ jobs: patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ 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 }}" ${{ if ne(parameters.MirrorRepo, '') }}: isMirrorRepoSelected: true gitHubOrganization: ${{ parameters.GitHubOrg }} diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 77584083d3c8..a4fed41f4ec5 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,16 @@ 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 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' + GitHubAppKeyName: 'oneloc-localization-app-key' + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false @@ -80,6 +90,22 @@ jobs: 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))) }}: + - template: /eng/common/templates/steps/get-github-app-token.yml + parameters: + ${{ 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 }} + installationOwner: ${{ parameters.GitHubOrg }} + outputVariableName: 'GitHubAppInstallationToken' + condition: ${{ parameters.condition }} + - task: OneLocBuild@2 displayName: OneLocBuild env: @@ -102,7 +128,10 @@ jobs: patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ 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 }}" ${{ if ne(parameters.MirrorRepo, '') }}: isMirrorRepoSelected: true gitHubOrganization: ${{ parameters.GitHubOrg }} diff --git a/global.json b/global.json index 208ff5279387..4544789fb7fb 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26420.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26420.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26423.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26423.4" } }