Skip to content

Commit feb61c7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#2492)
* Update dependencies from https://github.com/dotnet/arcade build 20240925.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24475.3 * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1 * Update dependencies from https://github.com/dotnet/arcade build 20241016.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * Update dependencies from https://github.com/dotnet/arcade build 20241025.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24525.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 31ab507 commit feb61c7

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</Dependency>
1010
</ProductDependencies>
1111
<ToolsetDependencies>
12-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24463.3">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24525.2">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
14+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
1515
</Dependency>
1616
<!-- Intermediate is necessary for source build. -->
17-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24463.3">
17+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24525.2">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
19+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
2020
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2121
</Dependency>
2222
<!-- Don't declare a separate xliff-tasks intermediate as Arcade 8.0 does not have xliff intermediate declared. -->

‎eng/common/templates-official/steps/get-delegation-sas.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
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)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
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)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ function IsWindowsPlatform() {
892892
}
893893

894894
function Get-Darc($version) {
895-
$darcPath = "$TempDir\darc\$(New-Guid)"
895+
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
896896
if ($version -ne $null) {
897897
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
898898
} else {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.108",
3+
"dotnet": "8.0.110",
44
"runtimes": {
55
"dotnet": [
66
"5.0.17",
@@ -10,6 +10,6 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3"
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2"
1414
}
1515
}

0 commit comments

Comments
 (0)