From 9880d891ddfddee1b1182c149468a43b89c090a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:28:06 -0500 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240614.1 (#819) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24311.10 -> To Version 9.0.0-beta.24314.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++----------- eng/Versions.props | 8 +++--- eng/common/cross/build-rootfs.sh | 13 +++++++-- eng/common/cross/riscv64/sources.list.noble | 11 +++++++ eng/common/post-build/nuget-validation.ps1 | 7 +++++ global.json | 6 ++-- 6 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 eng/common/cross/riscv64/sources.list.noble diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57b3bad86b..41b0d03534 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,38 +207,38 @@ https://github.com/dotnet/llvm-project 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 diff --git a/eng/Versions.props b/eng/Versions.props index 7bd42e7fd4..92495cd0e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,10 +50,10 @@ release - 9.0.0-beta.24311.10 - 9.0.0-beta.24311.10 - 9.0.0-beta.24311.10 - 9.0.0-beta.24311.10 + 9.0.0-beta.24314.1 + 9.0.0-beta.24314.1 + 9.0.0-beta.24314.1 + 9.0.0-beta.24314.1 1.1.87-gba258badda diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7455dcb6af..8bb233ba25 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -131,6 +131,7 @@ __AlpineKeys=' __Keyring= __SkipSigCheck=0 __UseMirror=0 +__UseDeb822Format=0 __UnprocessedBuildArgs= while :; do @@ -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 @@ -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 @@ -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 diff --git a/eng/common/cross/riscv64/sources.list.noble b/eng/common/cross/riscv64/sources.list.noble new file mode 100644 index 0000000000..4a5b56256d --- /dev/null +++ b/eng/common/cross/riscv64/sources.list.noble @@ -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 diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index 9c81aa4391..e5de00c898 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -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 } diff --git a/global.json b/global.json index 916257ffd2..cb0f7e6ebe 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.4.24267.66" + "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.Arcade.Sdk": "9.0.0-beta.24314.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1", "Microsoft.Build.Traversal": "3.4.0" } }