Skip to content

Commit 3654fab

Browse files
author
v-wuzhai
authored
[release/9.0.1xx] Update dependencies from dotnet/arcade (#44249)
2 parents 8a5970f + 359ffd0 commit 3654fab

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
594+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24509.3">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
598+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
602+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24509.3">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24516.2">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
606+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24509.3">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
610+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24509.3">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24516.2">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
614+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24509.3">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
619+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rtm.24515.15">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@
281281
</PropertyGroup>
282282
<PropertyGroup>
283283
<!-- Dependencies from https://github.com/dotnet/arcade -->
284-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24509.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
285-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24509.3</MicrosoftDotNetSignToolVersion>
286-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24509.3</MicrosoftDotNetXliffTasksVersion>
287-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24509.3</MicrosoftDotNetXUnitExtensionsVersion>
284+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
285+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24516.2</MicrosoftDotNetSignToolVersion>
286+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24516.2</MicrosoftDotNetXliffTasksVersion>
287+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsVersion>
288288
</PropertyGroup>
289289
<PropertyGroup>
290290
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)