Skip to content

Commit

Permalink
[release/dev17.8] Update dependencies from dotnet/arcade (#11035)
Browse files Browse the repository at this point in the history
This pull request updates the following dependencies

[marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
## From https://github.com/dotnet/arcade
- **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8
- **Build**: 20241016.1
- **Date Produced**: October 16, 2024 4:52:26 PM UTC
- **Commit**: f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24508.1 to
8.0.0-beta.24516.1][1]

[1]: dotnet/arcade@e5b13e0...f7fb1fe

[DependencyUpdate]: <> (End)


[marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
  • Loading branch information
akhera99 authored Oct 22, 2024
2 parents 7736068 + c109815 commit af919ba
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
Expand Down
11 changes: 10 additions & 1 deletion eng/common/templates-official/steps/get-delegation-sas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@ steps:
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
$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
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
$sas = ""
do {
$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
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
exit 1
}
} while($sas.IndexOf('/') -ne -1)
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
Expand Down
11 changes: 10 additions & 1 deletion eng/common/templates/steps/get-delegation-sas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@ steps:
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
$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
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
$sas = ""
do {
$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
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
exit 1
}
} while($sas.IndexOf('/') -ne -1)
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"rollForward": "latestPatch"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
"Yarn.MSBuild": "1.22.10"
}
}

0 comments on commit af919ba

Please sign in to comment.