Skip to content

[main] Update dependencies from dotnet/arcade #6235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 18, 2024
Merged

[main] Update dependencies from dotnet/arcade #6235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb9f684
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
837d80e
Update eng/common/template-guidance.md
radical Oct 10, 2024
34bfbba
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 16, 2024
a139a9d
Merge remote-tracking branch 'origin/main' into darc-main-913788ce-38…
radical Oct 16, 2024
8807b05
Update eng/common/template-guidance.md
radical Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,42 +125,42 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
<MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.8.10</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
<MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.8.10</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
<!-- Other -->
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>8.10.0</MicrosoftExtensionsHttpResiliencePackageVersion>
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>8.10.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
Expand Down
11 changes: 10 additions & 1 deletion eng/common/core-templates/steps/get-delegation-sas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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 eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ function IsWindowsPlatform() {
}

function Get-Darc($version) {
$darcPath = "$TempDir\darc\$(New-Guid)"
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
if ($version -ne $null) {
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
} else {
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.100-rc.1.24452.12",
"version": "9.0.100-rc.2.24474.11",
"rollForward": "major",
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.100-rc.1.24452.12",
"dotnet": "9.0.100-rc.2.24474.11",
"runtimes": {
"dotnet/x64": [
"$(DotNetRuntimePreviousVersionForTesting)"
Expand All @@ -22,9 +22,9 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
Loading