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.

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

[main] Update dependencies from dotnet/arcade #103412

Merged
merged 16 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6c97c68
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 13, 2024
ac33456
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 14, 2024
c125d7e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 15, 2024
907d1b9
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 16, 2024
f0cccec
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 17, 2024
bb73f82
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 18, 2024
e1879cc
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 19, 2024
bf12e38
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 20, 2024
865a351
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 21, 2024
d9c422a
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 22, 2024
96a3ed2
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 23, 2024
94c7f02
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 24, 2024
d8aa21b
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 25, 2024
2b6cf8c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 26, 2024
58a52fb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 27, 2024
ac603be
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 28, 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
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.24311.10">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.8.1-beta.24311.10">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.8.1-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24311.10">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24312.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24317.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.6.24311.23</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24311.10</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24311.10</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24311.10</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.8.1-beta.24311.10</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24311.10</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24311.10</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24311.10</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24311.10</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24311.10</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24317.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24317.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24317.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.8.1-beta.24317.3</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24317.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24317.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24317.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24317.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24317.3</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
13 changes: 11 additions & 2 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ __AlpineKeys='
__Keyring=
__SkipSigCheck=0
__UseMirror=0
__UseDeb822Format=0

__UnprocessedBuildArgs=
while :; do
Expand Down Expand Up @@ -181,7 +182,6 @@ while :; do
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
__QEMUArch=riscv64
__UbuntuArch=riscv64
__UbuntuRepo="http://deb.debian.org/debian"
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package

Expand Down Expand Up @@ -288,6 +288,12 @@ while :; do
__CodeName=jammy
fi
;;
noble) # Ubuntu 24.04
if [[ "$__CodeName" != "jessie" ]]; then
__CodeName=noble
fi
__UseDeb822Format=1
;;
jessie) # Debian 8
__CodeName=jessie

Expand Down Expand Up @@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
fi

# shellcheck disable=SC2086
echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list"
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename"
chroot "$__RootfsDir" apt-get update
chroot "$__RootfsDir" apt-get -f -y install
# shellcheck disable=SC2086
Expand Down
11 changes: 11 additions & 0 deletions eng/common/cross/riscv64/sources.list.noble
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Types: deb
URIs: http://ports.ubuntu.com/ubuntu-ports/
Suites: noble noble-updates noble-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

Types: deb
URIs: http://ports.ubuntu.com/ubuntu-ports/
Suites: noble-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
7 changes: 7 additions & 0 deletions eng/common/post-build/nuget-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ param(
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
)

# `tools.ps1` checks $ci to perform some actions. Since the post-build
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
$disableConfigureToolsetImport = $true
. $PSScriptRoot\..\tools.ps1

try {
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
}
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24317.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24317.3",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24317.3",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.6.24307.2"
Expand Down
Loading