[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotnet-maestro wants to merge 1 commit into
base:dotnet/release/8.0
Choose a base branch
from
+114 −136
Open

[dotnet/release/8.0] Update dependencies from dotnet/arcade #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
<Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
<Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- dotnet/arcade -->
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
<!-- dotnet/cpython -->
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down
44 changes: 32 additions & 12 deletions eng/common/Get-GitHubAppToken.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
$signatureUrl = az keyvault key sign `
# Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
# Use the exit code to determine success for this invocation.
$PSNativeCommandUseErrorActionPreference = $false
$signatureBase64 = az keyvault key sign `
--vault-name $KeyVaultName `
--name $KeyName `
--algorithm RS256 `
--digest $digestBase64 `
--query value `
--query signature `
--output tsv `
--only-show-errors
$signExitCode = $LASTEXITCODE
}
catch {
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
$PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
$installations = @()
$installations = [System.Collections.Generic.List[object]]::new()
$page = 1
do {
$pageInstallations = @(Invoke-RestMethod `
$pageResponse = Invoke-RestMethod `
-Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
-Headers $headers `
-Method Get)
$installations += $pageInstallations
-Method Get
$pageInstallationCount = 0
foreach ($installation in $pageResponse) {
$installations.Add($installation)
$pageInstallationCount++
}
$page++
} while ($pageInstallations.Count -eq 100)
} while ($pageInstallationCount -eq 100)
}
catch {
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
$found = ($installations | ForEach-Object { $_.account.login }) -join ', '
Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
exit 1
}
if ($matchingInstallations.Count -ne 1) {
$matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
$tokenResponse = Invoke-RestMethod `
Expand Down
82 changes: 0 additions & 82 deletions eng/common/sdl/extract-artifact-packages.ps1
View file
Open in desktop

This file was deleted.

45 changes: 36 additions & 9 deletions eng/common/templates-official/job/onelocbuild.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
# Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
parameters:
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))) }}:
- 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
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 }}
Expand Down
5 changes: 2 additions & 3 deletions eng/common/templates-official/steps/source-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down
12 changes: 0 additions & 12 deletions eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[dotnet/release/8.0] Update dependencies from dotnet/arcade#393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dotnet-maestro
wants to merge
1
commit into

base:dotnet/release/8.0
Choose a base branch

from


+114

−136

 Open


[dotnet/release/8.0] Update dependencies from dotnet/arcade
#393
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,13 +19,13 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26410.9">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26431.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>0992a0f871c48ccc32eaa49ad89fea8022b8f597</Sha>
 <Sha>25da4e8f08fab05a39c27443df99b96d738f3c82</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- dotnet/arcade -->
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26410.9</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26431.7</MicrosoftDotNetBuildTasksPackagingVersion>
 <!-- dotnet/cpython -->
 <runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
 <runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>8.0.0-rtm.26281.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion>
Expand Down

44 changes: 32 additions & 12 deletions
eng/common/Get-GitHubAppToken.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
$digestBase64 = [Convert]::ToBase64String($digestBytes)

Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
try {
 $signatureUrl = az keyvault key sign `
 # Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
 # Use the exit code to determine success for this invocation.
 $PSNativeCommandUseErrorActionPreference = $false
 $signatureBase64 = az keyvault key sign `
 --vault-name $KeyVaultName `
 --name $KeyName `
 --algorithm RS256 `
 --digest $digestBase64 `
 --query value `
 --query signature `
 --output tsv `
 --only-show-errors
 $signExitCode = $LASTEXITCODE
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to sign the JWT via Key Vault (key '$KeyName', vault '$KeyVaultName'): $_. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $LASTEXITCODE for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
finally {
 $PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
}
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
 Write-PipelineTelemetryError -Category 'Build' -Message "'az keyvault key sign' exited with code $signExitCode for key '$KeyName' in vault '$KeyVaultName'. Verify the service connection identity has the 'Key Vault Crypto User' role (Sign action) on the key."
 exit 1
}
$jwt = "$signingInput.$($signatureUrl.Trim())"
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
$jwt = "$signingInput.$signatureUrl"

$headers = @{
 Authorization = "Bearer $jwt"
Expand All@@ -101,27 +110,38 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
 $installations = @()
 $installations = [System.Collections.Generic.List[object]]::new()
 $page = 1
 do {
 $pageInstallations = @(Invoke-RestMethod `
 $pageResponse = Invoke-RestMethod `
 -Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
 -Headers $headers `
 -Method Get)
 $installations += $pageInstallations
 -Method Get
 $pageInstallationCount = 0
 foreach ($installation in $pageResponse) {
 $installations.Add($installation)
 $pageInstallationCount++
 }
 $page++
 } while ($pageInstallations.Count -eq 100)
 } while ($pageInstallationCount -eq 100)
}
catch {
 Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
 exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
 $found = ($installations | ForEach-Object { $_.account.login }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
 exit 1
}
if ($matchingInstallations.Count -ne 1) {
 $matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
 Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
 exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
 $tokenResponse = Invoke-RestMethod `
Expand Down

82 changes: 0 additions & 82 deletions
eng/common/sdl/extract-artifact-packages.ps1

View file


Open in desktop


This file was deleted.


45 changes: 36 additions & 9 deletions
eng/common/templates-official/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,20 @@ 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 projects each provide a project-scoped connection with this name.
 # Other projects, and any pipeline that sets this to '', fall back to CeapexPat.
 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
Expand DownExpand Up@@ -74,15 +83,30 @@ 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/templates-official/steps/get-federated-access-token.yml
 parameters:
 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))) }}:
 - 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:
Expand All@@ -99,13 +123,16 @@ 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 }}
 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 }}
Expand Down

5 changes: 2 additions & 3 deletions
eng/common/templates-official/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

12 changes: 0 additions & 12 deletions
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading