Skip to content
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

Jump to bottom

[release/9.0] Update dependencies from dotnet/arcade #108482

Merged
merged 6 commits into from
Oct 17, 2024
+76 −65
Merged

[release/9.0] Update dependencies from dotnet/arcade #108482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a96293
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 2, 2024
416fcc9
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 5, 2024
ac5778b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
69bf79c
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
2a84794
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 16, 2024
d4ec122
Merge branch 'release/9.0' into darc-release/9.0-98da60c8-c139-47fd-9…
mmitche 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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24459.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9794254fa909ff5adc46326e9b54009793f61dcd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24473.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24516.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1230437de1ab7b3e15fe7cdfe7ffce2f65449959</Sha>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-rtm.24504.15</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24473.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24473.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24473.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24473.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24473.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24473.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24473.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24473.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24473.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24473.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24516.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24516.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24516.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24516.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24516.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24516.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24516.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24516.2</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
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
1 change: 1 addition & 0 deletions eng/common/templates-official/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
parameters:
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

Expand Down
1 change: 1 addition & 0 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
componentGovernanceIgnoreDirectories: ''
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

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,16 +1,16 @@
{
"sdk": {
"version": "9.0.100-rc.1.24452.12",
"version": "9.0.100-rc.2.24474.11",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.100-rc.1.24452.12"
"dotnet": "9.0.100-rc.2.24474.11"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24473.1",
"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",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24503.8"
Expand Down
Loading