Skip to content

Commit 1e7a7af

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241016.2 (#58475)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24509.3 -> To Version 9.0.0-beta.24516.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b72b68d commit 1e7a7af

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
393+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24509.3">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
398+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24509.3">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
403+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24509.3">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24516.2">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
407+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
411+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24509.3">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24516.2">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
415+
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24503.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24509.3</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24509.3</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24509.3</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24509.3</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24516.2</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24516.2</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24510.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎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
@@ -27,7 +27,7 @@
2727
"jdk": "11"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2"
3232
}
3333
}

0 commit comments

Comments
 (0)