Skip to content

Commit 7b219d4

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20260806.9 (#897)
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26406.2 -> To Version 10.0.0-beta.26406.9 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5fc126a commit 7b219d4

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26406.2">
39+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26406.9">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>d51f248d4c7105245195f0e522dc422795e8d2c2</Sha>
41+
<Sha>af57946065838fca9b1745ab055d5a15a4783fba</Sha>
4242
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4343
</Dependency>
4444
</ToolsetDependencies>

eng/common/Get-GitHubAppToken.ps1

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,34 @@ $digestBytes = $sha256.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($signi
7272
$digestBase64 = [Convert]::ToBase64String($digestBytes)
7373

7474
Write-Host "Signing JWT with key '$KeyName' in vault '$KeyVaultName'..."
75+
$previousNativeCommandErrorPreference = $PSNativeCommandUseErrorActionPreference
7576
try {
76-
$signatureUrl = az keyvault key sign `
77+
# Azure CLI can emit non-fatal Python warnings to stderr even when signing succeeds.
78+
# Use the exit code to determine success for this invocation.
79+
$PSNativeCommandUseErrorActionPreference = $false
80+
$signatureBase64 = az keyvault key sign `
7781
--vault-name $KeyVaultName `
7882
--name $KeyName `
7983
--algorithm RS256 `
8084
--digest $digestBase64 `
81-
--query value `
85+
--query signature `
8286
--output tsv `
8387
--only-show-errors
88+
$signExitCode = $LASTEXITCODE
8489
}
8590
catch {
8691
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."
8792
exit 1
8893
}
89-
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($signatureUrl)) {
90-
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."
94+
finally {
95+
$PSNativeCommandUseErrorActionPreference = $previousNativeCommandErrorPreference
96+
}
97+
if ($signExitCode -ne 0 -or [string]::IsNullOrWhiteSpace($signatureBase64)) {
98+
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."
9199
exit 1
92100
}
93-
$jwt = "$signingInput.$($signatureUrl.Trim())"
101+
$signatureUrl = $signatureBase64.Trim().TrimEnd('=').Replace('+', '-').Replace('/', '_')
102+
$jwt = "$signingInput.$signatureUrl"
94103

95104
$headers = @{
96105
Authorization = "Bearer $jwt"

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.Build.NoTargets": "3.7.0",
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26406.2",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26406.9",
1313
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1414
}
1515
}

0 commit comments

Comments
 (0)