Skip to content

Commit d23e6a3

Browse files
committed
Merged PR 43907: [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 Release preparation and dependency updates. #### PR Summary This pull request updates various dependencies and versions in preparation for the 9.0 release. - Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props` to 9.0.0. - Added a workaround in `/eng/common/core-templates/steps/get-delegation-sas.yml` for a Helix issue with SAS tokens. - Updated SDK versions in `/global.json`. - Added new package sources in `/NuGet.config`.
2 parents 7deff8e + 29c6dff commit d23e6a3

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "9.0.100-rc.2.24474.11"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
18-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24509.3",
19-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
18+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24516.2",
19+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "9.0.0"
2222
},

0 commit comments

Comments
 (0)