Skip to content

Commit 024ba54

Browse files
authored
Merge pull request #8470 from dotnet/darc-release/9.0.2xx-6c38ca7d-877a-47f6-9a46-574f84a8401e
[release/9.0.2xx] Update dependencies from dotnet/arcade
2 parents 1226e5b + 5b6e5d8 commit 024ba54

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
24+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24509.3">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
29+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<Dependency Name="System.Formats.Asn1" Version="8.0.1">

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "9.0.100-rc.2.24474.11"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3"
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2"
77
}
88
}

0 commit comments

Comments
 (0)