Skip to content

Commit 00eecee

Browse files
dotnet-maestro[bot]wtgodbe
dotnet-maestro[bot]
and
wtgodbe
authored
[release/9.0] Update dependencies from dotnet/arcade (#58344)
* Update dependencies from https://github.com/dotnet/arcade build 20241009.3 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.24503.2 -> To Version 9.0.0-beta.24509.3 * Update SourceBuildPrebuiltBaseline.xml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <[email protected]>
1 parent 5b305f3 commit 00eecee

File tree

6 files changed

+28
-31
lines changed

6 files changed

+28
-31
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,10 @@
4747
<!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
4848
<UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
4949
</IgnorePatterns>
50+
51+
<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->
52+
<Usages>
53+
<Usage Id="Newtonsoft.Json" Version="13.0.1" />
54+
<Usage Id="System.Security.Cryptography.Xml" Version="6.0.0" />
55+
</Usages>
5056
</UsageData>

‎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>f9ea17ed57c1d2f5c1675f2c20547e53379af754</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24503.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
393+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24503.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24509.3">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
398+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24503.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24509.3">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
403+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24503.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24509.3">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
407+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24503.2">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
411+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24503.2">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24509.3">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
415+
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</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.24503.2</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24503.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24503.2</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24503.2</MicrosoftSourceBuildIntermediatearcadeVersion>
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>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24480.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,7 @@ 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-
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
35-
# of correlation payloads.
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)
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
4435
4536
if ($LASTEXITCODE -ne 0) {
4637
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
@@ -900,7 +900,7 @@ function IsWindowsPlatform() {
900900
}
901901

902902
function Get-Darc($version) {
903-
$darcPath = "$TempDir\darc\$(New-Guid)"
903+
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
904904
if ($version -ne $null) {
905905
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
906906
} else {

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.1.24452.12"
3+
"version": "9.0.100-rc.2.24474.11"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-rc.1.24452.12",
6+
"dotnet": "9.0.100-rc.2.24474.11",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
2727
"jdk": "11"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3"
3232
}
3333
}

0 commit comments

Comments
 (0)