File tree Expand file tree Collapse file tree 4 files changed +21
-12
lines changed
common/core-templates/steps Expand file tree Collapse file tree 4 files changed +21
-12
lines changed Original file line number Diff line number Diff line change 88 </Dependency >
99 </ProductDependencies >
1010 <ToolsetDependencies >
11- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.24509.3 " >
11+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.24516.2 " >
1212 <Uri >https://github.com/dotnet/arcade</Uri >
13- <Sha >05c72bb3c9b38138276a8029017f2ef905dcc7fa </Sha >
13+ <Sha >3c393bbd85ae16ddddba20d0b75035b0c6f1a52d </Sha >
1414 </Dependency >
1515 <!-- Intermediate is necessary for source build. -->
16- <Dependency Name =" Microsoft.SourceBuild.Intermediate.arcade" Version =" 9.0.0-beta.24509.3 " >
16+ <Dependency Name =" Microsoft.SourceBuild.Intermediate.arcade" Version =" 9.0.0-beta.24516.2 " >
1717 <Uri >https://github.com/dotnet/arcade</Uri >
18- <Sha >05c72bb3c9b38138276a8029017f2ef905dcc7fa </Sha >
18+ <Sha >3c393bbd85ae16ddddba20d0b75035b0c6f1a52d </Sha >
1919 <SourceBuild RepoName =" arcade" ManagedOnly =" true" />
2020 </Dependency >
21- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 9.0.0-beta.24509.3 " >
21+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 9.0.0-beta.24516.2 " >
2222 <Uri >https://github.com/dotnet/arcade</Uri >
23- <Sha >05c72bb3c9b38138276a8029017f2ef905dcc7fa </Sha >
23+ <Sha >3c393bbd85ae16ddddba20d0b75035b0c6f1a52d </Sha >
2424 </Dependency >
25- <Dependency Name =" Microsoft.DotNet.Build.Tasks.Packaging" Version =" 9.0.0-beta.24509.3 " >
25+ <Dependency Name =" Microsoft.DotNet.Build.Tasks.Packaging" Version =" 9.0.0-beta.24516.2 " >
2626 <Uri >https://github.com/dotnet/arcade</Uri >
27- <Sha >05c72bb3c9b38138276a8029017f2ef905dcc7fa </Sha >
27+ <Sha >3c393bbd85ae16ddddba20d0b75035b0c6f1a52d </Sha >
2828 </Dependency >
2929 </ToolsetDependencies >
3030</Dependencies >
Original file line number Diff line number Diff line change 66 <PreReleaseVersionIteration >1</PreReleaseVersionIteration >
77 </PropertyGroup >
88 <PropertyGroup >
9- <MicrosoftDotNetBuildTasksPackagingVersion >9.0.0-beta.24509.3 </MicrosoftDotNetBuildTasksPackagingVersion >
9+ <MicrosoftDotNetBuildTasksPackagingVersion >9.0.0-beta.24516.2 </MicrosoftDotNetBuildTasksPackagingVersion >
1010 </PropertyGroup >
1111</Project >
Original file line number Diff line number Diff 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."
Original file line number Diff line number Diff line change 33 "dotnet" : " 9.0.100-rc.2.24474.11"
44 },
55 "msbuild-sdks" : {
6- "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.24509.3 " ,
7- "Microsoft.DotNet.Helix.Sdk" : " 9.0.0-beta.24509.3 " ,
6+ "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.24516.2 " ,
7+ "Microsoft.DotNet.Helix.Sdk" : " 9.0.0-beta.24516.2 " ,
88 "Microsoft.Build.Traversal" : " 3.4.0"
99 }
1010}
You can’t perform that action at this time.
0 commit comments