File tree Expand file tree Collapse file tree 5 files changed +32
-14
lines changed Expand file tree Collapse file tree 5 files changed +32
-14
lines changed Original file line number Diff line number Diff line change 491
491
</Dependency >
492
492
</ProductDependencies >
493
493
<ToolsetDependencies >
494
- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.24508 .1" >
494
+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.24516 .1" >
495
495
<Uri >https://github.com/dotnet/arcade</Uri >
496
- <Sha >e5b13e054339e41d422212a0ecaf24fec20cb5a1 </Sha >
496
+ <Sha >f7fb1fec01b91be69e4dcc5290a0bff3f28e214f </Sha >
497
497
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
498
498
</Dependency >
499
- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.24508 .1" >
499
+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.24516 .1" >
500
500
<Uri >https://github.com/dotnet/arcade</Uri >
501
- <Sha >e5b13e054339e41d422212a0ecaf24fec20cb5a1 </Sha >
501
+ <Sha >f7fb1fec01b91be69e4dcc5290a0bff3f28e214f </Sha >
502
502
</Dependency >
503
- <Dependency Name =" Microsoft.DotNet.SignTool" Version =" 8.0.0-beta.24508 .1" >
503
+ <Dependency Name =" Microsoft.DotNet.SignTool" Version =" 8.0.0-beta.24516 .1" >
504
504
<Uri >https://github.com/dotnet/arcade</Uri >
505
- <Sha >e5b13e054339e41d422212a0ecaf24fec20cb5a1 </Sha >
505
+ <Sha >f7fb1fec01b91be69e4dcc5290a0bff3f28e214f </Sha >
506
506
</Dependency >
507
- <Dependency Name =" Microsoft.DotNet.XUnitExtensions" Version =" 8.0.0-beta.24508 .1" >
507
+ <Dependency Name =" Microsoft.DotNet.XUnitExtensions" Version =" 8.0.0-beta.24516 .1" >
508
508
<Uri >https://github.com/dotnet/arcade</Uri >
509
- <Sha >e5b13e054339e41d422212a0ecaf24fec20cb5a1 </Sha >
509
+ <Sha >f7fb1fec01b91be69e4dcc5290a0bff3f28e214f </Sha >
510
510
</Dependency >
511
511
<Dependency Name =" System.Reflection.MetadataLoadContext" Version =" 8.0.1" >
512
512
<Uri >https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri >
Original file line number Diff line number Diff line change 34
34
<SystemCollectionsImmutablePackageVersion >7.0.0</SystemCollectionsImmutablePackageVersion >
35
35
<SystemDiagnosticsFileVersionInfoVersion >4.0.0</SystemDiagnosticsFileVersionInfoVersion >
36
36
<SystemReflectionMetadataVersion >7.0.0</SystemReflectionMetadataVersion >
37
- <MicrosoftDotNetSignToolVersion >8.0.0-beta.24508 .1</MicrosoftDotNetSignToolVersion >
37
+ <MicrosoftDotNetSignToolVersion >8.0.0-beta.24516 .1</MicrosoftDotNetSignToolVersion >
38
38
<MicrosoftWebXdtPackageVersion >7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion >
39
39
<SystemSecurityCryptographyProtectedDataPackageVersion >8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion >
40
40
<SystemCollectionsSpecializedPackageVersion >4.3.0</SystemCollectionsSpecializedPackageVersion >
209
209
<PropertyGroup >
210
210
<FluentAssertionsVersion >6.12.0</FluentAssertionsVersion >
211
211
<FluentAssertionsJsonVersion >6.1.0</FluentAssertionsJsonVersion >
212
- <MicrosoftDotNetXUnitExtensionsVersion >8.0.0-beta.24508 .1</MicrosoftDotNetXUnitExtensionsVersion >
212
+ <MicrosoftDotNetXUnitExtensionsVersion >8.0.0-beta.24516 .1</MicrosoftDotNetXUnitExtensionsVersion >
213
213
<MoqPackageVersion >4.18.4</MoqPackageVersion >
214
214
<XunitCombinatorialVersion >1.3.2</XunitCombinatorialVersion >
215
215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion >8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion >
Original file line number Diff line number Diff line change @@ -28,7 +28,16 @@ steps:
28
28
# Calculate the expiration of the SAS token and convert to UTC
29
29
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
30
30
31
- $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
31
+ # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32
+ # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33
+ $sas = ""
34
+ do {
35
+ $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
36
+ if ($LASTEXITCODE -ne 0) {
37
+ Write-Error "Failed to generate SAS token."
38
+ exit 1
39
+ }
40
+ } while($sas.IndexOf('/') -ne -1)
32
41
33
42
if ($LASTEXITCODE -ne 0) {
34
43
Write-Error "Failed to generate SAS token."
Original file line number Diff line number Diff line change @@ -28,7 +28,16 @@ steps:
28
28
# Calculate the expiration of the SAS token and convert to UTC
29
29
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
30
30
31
- $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
31
+ # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32
+ # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33
+ $sas = ""
34
+ do {
35
+ $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
36
+ if ($LASTEXITCODE -ne 0) {
37
+ Write-Error "Failed to generate SAS token."
38
+ exit 1
39
+ }
40
+ } while($sas.IndexOf('/') -ne -1)
32
41
33
42
if ($LASTEXITCODE -ne 0) {
34
43
Write-Error "Failed to generate SAS token."
Original file line number Diff line number Diff line change 14
14
}
15
15
},
16
16
"msbuild-sdks" : {
17
- "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.24508 .1" ,
18
- "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.24508 .1"
17
+ "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.24516 .1" ,
18
+ "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.24516 .1"
19
19
}
20
20
}
You can’t perform that action at this time.
0 commit comments