Skip to content

Commit bad810e

Browse files
committed
Merged PR 44010: [internal/release/9.0] Merge from public
Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates various dependencies to their latest versions and addresses a specific issue with SAS token generation. - Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props`. - Implemented a workaround for SAS token generation in `/eng/common/core-templates/steps/get-delegation-sas.yml`. - Updated SDK versions in `/global.json`. - Updated NuGet package source in `/NuGet.config`.
2 parents 3050beb + 87f2204 commit bad810e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

eng/common/core-templates/steps/get-delegation-sas.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ steps:
3131
# Calculate the expiration of the SAS token and convert to UTC
3232
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3333
34-
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
34+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
35+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
36+
$sas = ""
37+
do {
38+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
39+
if ($LASTEXITCODE -ne 0) {
40+
Write-Error "Failed to generate SAS token."
41+
exit 1
42+
}
43+
} while($sas.IndexOf('/') -ne -1)
3544
3645
if ($LASTEXITCODE -ne 0) {
3746
Write-Error "Failed to generate SAS token."

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-rc.2.24474.11"

0 commit comments

Comments
 (0)