Skip to content

Commit 5307f2a

Browse files
[release/9.0] Update dependencies from dotnet/arcade (#4747)
[release/9.0] Update dependencies from dotnet/arcade
1 parent 4e65822 commit 5307f2a

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
157+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24509.3">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24516.2">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
161+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24509.3">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24516.2">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
165+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24509.3">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24516.2">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
169+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24509.3">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
173+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24509.3">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24516.2">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
177+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24509.3</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24509.3</MicrosoftDotNetBuildTasksInstallersVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersVersion>
1717
<!-- corefx -->
1818
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1919
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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.SharedFramework.Sdk": "9.0.0-beta.24509.3",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)