From 9afcb8f7e67fad8a090ecdd6b0efb4a7839045dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 12:38:06 +0000 Subject: [PATCH 01/40] Update dependencies from https://github.com/dotnet/arcade build 20241010.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24510.3 --- eng/Version.Details.xml | 4 ++-- eng/common/build.sh | 1 - eng/common/core-templates/steps/source-build.yml | 1 - global.json | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65892b40e..f5b38a279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 380002a14775d7f68f098c7e6b7d1c3638bd4c5d + f044058aaef59331bfc565f098d81a4e2e9092e3 https://github.com/dotnet/wpf diff --git a/eng/common/build.sh b/eng/common/build.sh index ac1ee8620..483647daf 100644 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -231,7 +231,6 @@ function Build { /p:Restore=$restore \ /p:Build=$build \ /p:DotNetBuildRepo=$product_build \ - /p:ArcadeBuildFromSource=$source_build \ /p:DotNetBuildSourceOnly=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb..c9271c011 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -86,7 +86,6 @@ steps: $runtimeOsArgs \ $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/global.json b/global.json index 8bf14690b..549f6c413 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.3", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 7ffe1920ccbdf630f8c0bed96132bbffee15ab48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:36:52 +0000 Subject: [PATCH 02/40] Update dependencies from https://github.com/dotnet/arcade build 20241011.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.3 -> To Version 10.0.0-beta.24511.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5b38a279..4cd304604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - f044058aaef59331bfc565f098d81a4e2e9092e3 + 712dea25b14a59fe642f2d28e8a3f3c931c03759 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 549f6c413..61e1fafac 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 17d8c271ec3f61eebef21ddee1927eab21e31e95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Oct 2024 12:41:57 +0000 Subject: [PATCH 03/40] Update dependencies from https://github.com/dotnet/arcade build 20241014.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24511.1 -> To Version 10.0.0-beta.24514.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cd304604..e0c466076 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 712dea25b14a59fe642f2d28e8a3f3c931c03759 + 964e434191bd3ca5675743d08ff742ec0f1e79a9 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 61e1fafac..81dc8594a 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From ba696763440a9c3203a04f691683b9d3e9cc49b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 12:39:13 +0000 Subject: [PATCH 04/40] Update dependencies from https://github.com/dotnet/arcade build 20241015.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24514.3 -> To Version 10.0.0-beta.24515.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0c466076..3958c9f99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 964e434191bd3ca5675743d08ff742ec0f1e79a9 + 31624193093a13f765ab5382509e693911264509 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 81dc8594a..846647bcf 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24515.3", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 698d842063970f184f76df8ef5eae6e7ae70e11b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 12:41:05 +0000 Subject: [PATCH 05/40] Update dependencies from https://github.com/dotnet/arcade build 20241022.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24515.3 -> To Version 10.0.0-beta.24522.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3958c9f99..537a573f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 846647bcf..2484a7d2a 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24515.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 2d5005a365c372f69dc0e348ed98786ca3d3d18d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 12:35:53 +0000 Subject: [PATCH 06/40] Update dependencies from https://github.com/dotnet/arcade build 20241023.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24522.1 -> To Version 10.0.0-beta.24523.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 537a573f8..5f703fdb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 + 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 2484a7d2a..f6546c216 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24523.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From c0f9f5b0dbf90b56c086da1d5595d53634a0bc76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Oct 2024 12:35:59 +0000 Subject: [PATCH 07/40] Update dependencies from https://github.com/dotnet/arcade build 20241023.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24523.3 --- eng/Version.Details.xml | 4 +- eng/common/native/install-dependencies.sh | 61 +++++++++++++++++++++++ global.json | 2 +- 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 eng/common/native/install-dependencies.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f703fdb4..e4d6f1a16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 + 00e780071eb53d628a8f5bff7ecfc848eb88a1af https://github.com/dotnet/wpf diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh new file mode 100644 index 000000000..03e47c48a --- /dev/null +++ b/eng/common/native/install-dependencies.sh @@ -0,0 +1,61 @@ +#!/bin/sh + +set -e + +# This is a simple script primarily used for CI to install necessary dependencies +# +# Usage: +# +# ./install-dependencies.sh + +os="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + +if [ -z "$os" ]; then + . "$(dirname "$0")"/init-os-and-arch.sh +fi + +case "$os" in + linux) + if [ -e /etc/os-release ]; then + . /etc/os-release + fi + + if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then + apt update + + apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ + libssl-dev libkrb5-dev zlib1g-dev pigz + + localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 + elif [ "$ID" = "fedora" ]; then + dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz + elif [ "$ID" = "alpine" ]; then + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz + else + echo "Unsupported distro. distro: $ID" + exit 1 + fi + ;; + + osx|maccatalyst|ios|iossimulator|tvos|tvossimulator) + echo "Installed xcode version: $(xcode-select -p)" + + export HOMEBREW_NO_INSTALL_CLEANUP=1 + export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 + # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 + # brew update --preinstall + brew bundle --no-upgrade --no-lock --file=- < Date: Sat, 26 Oct 2024 12:36:16 +0000 Subject: [PATCH 08/40] Update dependencies from https://github.com/dotnet/arcade build 20241025.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24525.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4d6f1a16..06994fba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 00e780071eb53d628a8f5bff7ecfc848eb88a1af + ee7a468d815a3401b842e23ee336dd9d679d973d https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 0c223bca4..79d330728 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24523.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24525.3", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 76775cfa91ee0984f4dac7d2fb222720eab43e2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Oct 2024 12:35:27 +0000 Subject: [PATCH 09/40] Update dependencies from https://github.com/dotnet/arcade build 20241027.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24527.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06994fba9..a77589f97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - ee7a468d815a3401b842e23ee336dd9d679d973d + bee0a0f7b1e68e88c63261e127beee2ed06c6d13 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 79d330728..4e4858932 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24525.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24527.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 75a6609f114995cce8d436106096aabef883eb42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 12:37:46 +0000 Subject: [PATCH 10/40] Update dependencies from https://github.com/dotnet/arcade build 20241029.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24529.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a77589f97..729258e5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - bee0a0f7b1e68e88c63261e127beee2ed06c6d13 + e4df2888e714255352a6afa2ec1246e70ac21a49 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 4e4858932..ed7c4a940 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24527.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24529.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 4d1384c2395d55aa16623268d8d6c562f5a229e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 12:34:15 +0000 Subject: [PATCH 11/40] Update dependencies from https://github.com/dotnet/arcade build 20241030.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24530.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 729258e5e..2d6a6281b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - e4df2888e714255352a6afa2ec1246e70ac21a49 + e8d1fc3561447ab2e1015780db7c5388fc4a9b61 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index ed7c4a940..f33dcf6d3 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24529.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 68de212e01a136049713860305b3cf53555e2826 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 12:29:06 +0000 Subject: [PATCH 12/40] Update dependencies from https://github.com/dotnet/arcade build 20241031.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24531.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d6a6281b..3945fd359 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - e8d1fc3561447ab2e1015780db7c5388fc4a9b61 + 12f956787e1b8db30a6322c3fe24b10ac5dcab13 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index f33dcf6d3..6be2b1e4e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24531.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 31b5865a0d0f19b3c0a9498414a4c98144dee4a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Nov 2024 12:33:07 +0000 Subject: [PATCH 13/40] Update dependencies from https://github.com/dotnet/arcade build 20241101.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24551.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3945fd359..7593f6ab5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 12f956787e1b8db30a6322c3fe24b10ac5dcab13 + 1818ed2babf890a1cd62fa96a1f03abdada2d003 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 6be2b1e4e..a3575a91f 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24531.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From f82931fd3f4fe373c538ea432341da5a18dee3cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 13:36:20 +0000 Subject: [PATCH 14/40] Update dependencies from https://github.com/dotnet/arcade build 20241104.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24554.2 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 17 ++++++----------- eng/common/tools.sh | 16 ++++++---------- global.json | 2 +- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7593f6ab5..3f64f08ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 1818ed2babf890a1cd62fa96a1f03abdada2d003 + 5f327d7fb29852de22fb857d2b4a44e0cced9f41 https://github.com/dotnet/wpf diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a..7bd54b6ba 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -604,14 +604,7 @@ function InitializeBuildTool() { } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - # Use override if it exists - commonly set by source-build - if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { - $initializeBuildToolFramework="net9.0" - } else { - $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework - } - - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -620,7 +613,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } - $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS } + $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS } } else { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 @@ -779,8 +772,10 @@ function MSBuild() { # new scripts need to work with old packages, so we need to look for the old names/versions (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')), + + # This list doesn't need to be updated anymore and can eventually be removed. + (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')), (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) ) diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 00473c9f9..79b4a28e1 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -339,12 +339,6 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - # use override if it exists - commonly set by source-build - if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then - _InitializeBuildToolFramework="net9.0" - else - _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" - fi } # Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 @@ -454,10 +448,12 @@ function MSBuild { # new scripts need to work with old packages, so we need to look for the old names/versions local selectedPath= local possiblePaths=() - possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" ) + + # This list doesn't need to be updated anymore and can eventually be removed. + possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do diff --git a/global.json b/global.json index a3575a91f..c5c42b6c0 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24554.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From c2630dcc9dae606f9df1bb0514f3a075a65cd7eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 13:33:21 +0000 Subject: [PATCH 15/40] Update dependencies from https://github.com/dotnet/arcade build 20241106.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24556.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f64f08ac..90ec9fe35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 5f327d7fb29852de22fb857d2b4a44e0cced9f41 + 662841251075524f81c205ab4595bf0b9da74475 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index c5c42b6c0..5089f72d9 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24554.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24556.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 6254c5f94eb13a33b30440bd4b2d641707502237 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 13:32:05 +0000 Subject: [PATCH 16/40] Update dependencies from https://github.com/dotnet/arcade build 20241107.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24557.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90ec9fe35..cb30e69c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 662841251075524f81c205ab4595bf0b9da74475 + 39290b60a9015b444a1762d67e26f0f187eb5cc2 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 5089f72d9..47405420e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24556.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24557.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 0b79fb99960b581c57a7fe6f315444189b3d6a82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Nov 2024 13:33:21 +0000 Subject: [PATCH 17/40] Update dependencies from https://github.com/dotnet/arcade build 20241108.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24558.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb30e69c8..76314e977 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 39290b60a9015b444a1762d67e26f0f187eb5cc2 + 74ee04447a9882906e02bb135787ce2eca67ee67 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 47405420e..9aa3d2e41 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24557.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24558.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 734fc8613c2af13c00097f77466e33726cadc325 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 13:34:29 +0000 Subject: [PATCH 18/40] Update dependencies from https://github.com/dotnet/arcade build 20241110.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24560.1 --- eng/Version.Details.xml | 4 ++-- eng/common/native/install-dependencies.sh | 6 +++--- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76314e977..a411b5726 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 74ee04447a9882906e02bb135787ce2eca67ee67 + 232061b49ae2157efbb83acde9acae79ef3d6d40 https://github.com/dotnet/wpf diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 03e47c48a..6d1f8a94a 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -24,13 +24,13 @@ case "$os" in apt update apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ - libssl-dev libkrb5-dev zlib1g-dev pigz + libssl-dev libkrb5-dev zlib1g-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 elif [ "$ID" = "fedora" ]; then - dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz + dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then - apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio else echo "Unsupported distro. distro: $ID" exit 1 diff --git a/global.json b/global.json index 9aa3d2e41..32f322e82 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24558.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 6adb82d25ca9b57ea8ad0adebd55c0321b2da160 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 13:38:03 +0000 Subject: [PATCH 19/40] Update dependencies from https://github.com/dotnet/arcade build 20241111.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24561.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a411b5726..1776d80f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 232061b49ae2157efbb83acde9acae79ef3d6d40 + 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 32f322e82..16aae3f09 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24561.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 23cf9784456116f8a447166f764d46e7f054344d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 13:32:46 +0000 Subject: [PATCH 20/40] Update dependencies from https://github.com/dotnet/arcade build 20241112.15 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24562.15 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1776d80f6..9158e55aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 32b8acf5b6f79e78a7cc5f7b7c619f68ff0c97ad + e882d5925ca55013d5810ac51e36574a65c5da84 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 16aae3f09..f608e6c02 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24561.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From f21f13a01cc41a91ccba57449d3407f4ab244fa1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 13:50:03 +0000 Subject: [PATCH 21/40] Update dependencies from https://github.com/dotnet/arcade build 20241114.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24564.1 --- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/source-build.yml | 5 +++-- eng/common/core-templates/steps/source-build.yml | 7 ++++++- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9158e55aa..ac36405dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + c1852b9ac37df9a86630c2f078dbee43f7b186e7 https://github.com/dotnet/wpf diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6..05f7ad6ef 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -12,9 +12,10 @@ parameters: # The name of the job. This is included in the job ID. # targetRID: '' # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false + # portableBuild: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. + # linux-x64), and compiling against distro-provided packages rather than portable ones. The + # default is portable mode. # skipPublishValidation: false # Disables publishing validation. By default, a check is performed to ensure no packages are # published by source-build. diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index c9271c011..4da05afe0 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -76,6 +76,11 @@ steps: assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml fi + portableBuildArgs= + if [ '${{ parameters.platform.portableBuild }}' != '' ]; then + portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ @@ -85,7 +90,7 @@ steps: $targetRidArgs \ $runtimeOsArgs \ $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3f..4f0546dce 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7bd54b6ba..bd80ccccb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index f608e6c02..cf6fed709 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From c794bc47fb63b443ba6ce5f90278c3629eacd2f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 13:36:31 +0000 Subject: [PATCH 22/40] Update dependencies from https://github.com/dotnet/arcade build 20241120.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24570.1 --- eng/Version.Details.xml | 4 ++-- eng/common/native/install-dependencies.sh | 4 ++++ global.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac36405dc..de540f6ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - c1852b9ac37df9a86630c2f078dbee43f7b186e7 + efdc52bb77eeadae5420eb48e66722c4fdcaa3be https://github.com/dotnet/wpf diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 6d1f8a94a..dc396a955 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -44,6 +44,10 @@ case "$os" in export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 # brew update --preinstall + + # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 + brew uninstall --ignore-dependencies --force pkg-config@0.29.2 + brew bundle --no-upgrade --no-lock --file=- < Date: Thu, 21 Nov 2024 13:33:26 +0000 Subject: [PATCH 23/40] Update dependencies from https://github.com/dotnet/arcade build 20241120.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24570.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de540f6ba..e18027a1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - efdc52bb77eeadae5420eb48e66722c4fdcaa3be + 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 061148412..01f7c18fe 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 1e6dd5a2d9184532b06be7dbd8b7cd1b39a63774 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:32:43 +0000 Subject: [PATCH 24/40] Update dependencies from https://github.com/dotnet/arcade build 20241122.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24572.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e18027a1f..2c6b4fd0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 0c8f4989db0251f49a4f37d1b35bf4da1e9d6415 + 7d955f9f470465e144c76d47fd2596a0e4c02a21 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 01f7c18fe..dd3f9e1e4 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 7c7227cfc56f6ad238e9ecca0d9fb9496850ef47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 13:37:52 +0000 Subject: [PATCH 25/40] Update dependencies from https://github.com/dotnet/arcade build 20241125.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24575.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c6b4fd0d..773bc0042 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 7d955f9f470465e144c76d47fd2596a0e4c02a21 + 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index dd3f9e1e4..6241afe0f 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24575.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 091cfee5bb83c2c497bea2bbdbee4244e0dac07e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 13:35:47 +0000 Subject: [PATCH 26/40] Update dependencies from https://github.com/dotnet/arcade build 20241126.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24576.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 773bc0042..11679ce95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 + 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 6241afe0f..01b7f61a7 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24575.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24576.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 564159982b0c3d52042c8e242264e7668ec67b51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 13:32:16 +0000 Subject: [PATCH 27/40] Update dependencies from https://github.com/dotnet/arcade build 20241127.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24577.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11679ce95..7cc791214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 9ad0880a9f8450f4ac4e097cfe830e401ea3e22c + d0f89c635d780e183a97ad86af4f3c8d7e95977f https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 01b7f61a7..44d3dba15 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24576.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24577.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 2a0560da72507f749aeecc0297c2867d80fa0f10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Nov 2024 13:33:31 +0000 Subject: [PATCH 28/40] Update dependencies from https://github.com/dotnet/arcade build 20241128.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24578.2 --- eng/Version.Details.xml | 4 ++-- eng/common/native/install-dependencies.sh | 6 +----- global.json | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cc791214..c1734354d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - d0f89c635d780e183a97ad86af4f3c8d7e95977f + e8de3415124309210e4cbd0105e4a9da8dc01696 https://github.com/dotnet/wpf diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index dc396a955..3eef7409f 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -44,15 +44,11 @@ case "$os" in export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 # brew update --preinstall - - # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 - brew uninstall --ignore-dependencies --force pkg-config@0.29.2 - brew bundle --no-upgrade --no-lock --file=- < Date: Thu, 5 Dec 2024 13:35:20 +0000 Subject: [PATCH 29/40] Update dependencies from https://github.com/dotnet/arcade build 20241204.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24604.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1734354d..56328f822 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - e8de3415124309210e4cbd0105e4a9da8dc01696 + 45d845e04c05fbe5da9838c454bbc3af1df6be81 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index ff4e931b2..3dbb7127e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From cb2bf30cd9cd1aeacbce889ebb5dfe63bacafc77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Dec 2024 13:31:50 +0000 Subject: [PATCH 30/40] Update dependencies from https://github.com/dotnet/arcade build 20241205.6 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24605.6 --- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 2 +- global.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56328f822..07bfcd4c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 45d845e04c05fbe5da9838c454bbc3af1df6be81 + 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e https://github.com/dotnet/wpf diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 4da05afe0..f9ba1625c 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -78,7 +78,7 @@ steps: portableBuildArgs= if [ '${{ parameters.platform.portableBuild }}' != '' ]; then - portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' fi ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ diff --git a/global.json b/global.json index 3dbb7127e..9ade3f742 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.0-alpha.1.24414.6", + "dotnet": "10.0.100-alpha.1.24573.1", "runtimes": { "dotnet": [ "2.1.7", @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.6", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From b7eb3d356bfe98636db42c7ba70140efa998abc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Dec 2024 13:32:09 +0000 Subject: [PATCH 31/40] Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24606.6 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/build-rootfs.sh | 8 ++++---- global.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07bfcd4c6..6e60a0c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 3bd806cb4e6669c969614fd7b8a15990f3a1cd9e + 61b8f746424762d2e3173ebfaab19346224d591c https://github.com/dotnet/wpf diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 20ae8c286..096bfe51f 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.3-RELEASE" -__FreeBSDPkg="1.17.0" +__FreeBSDBase="13.4-RELEASE" +__FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" @@ -371,7 +371,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.0-RELEASE" + __FreeBSDBase="14.2-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; @@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf - echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf + echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager if [[ "$__hasWget" == 1 ]]; then diff --git a/global.json b/global.json index 9ade3f742..f3f2957b0 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 9f7168d6472f899cd15d79dbd81c0f2362bd3369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Dec 2024 13:34:31 +0000 Subject: [PATCH 32/40] Update dependencies from https://github.com/dotnet/arcade build 20241210.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24610.1 --- eng/Version.Details.xml | 4 +- eng/common/cross/toolchain.cmake | 138 ++++++++++++------------------- global.json | 2 +- 3 files changed, 58 insertions(+), 86 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e60a0c6a..75f3e8a27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c + bdea4c2fa4851874b372af1c90d4bd2ec51ad499 https://github.com/dotnet/wpf diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a4e285a5..deac538e6 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") else() set(TOOLCHAIN "riscv64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu") endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,32 +127,46 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "riscv64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() +function(locate_toolchain_exec exec var) + set(TOOLSET_PREFIX ${TOOLCHAIN}-) + string(TOUPPER ${exec} EXEC_UPPERCASE) + if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") + set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) + return() + endif() + + find_program(EXEC_LOCATION_${exec} + NAMES + "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" + "${TOOLSET_PREFIX}${exec}") + + if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") + message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") + endif() + set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) +endfunction() + if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) @@ -183,66 +197,24 @@ elseif(FREEBSD) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") include_directories(SYSTEM ${CROSS_ROOTFS}/include) - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") - - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - # let CMake set up the correct search paths include(Platform/Haiku) else() @@ -272,21 +244,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -297,10 +269,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/global.json b/global.json index f3f2957b0..baaca7d1f 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 8a0113ea0c170a2cf3e30240098b03571efad2c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Dec 2024 13:31:53 +0000 Subject: [PATCH 33/40] Update dependencies from https://github.com/dotnet/arcade build 20241210.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24610.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75f3e8a27..60249c600 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - bdea4c2fa4851874b372af1c90d4bd2ec51ad499 + d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index baaca7d1f..c279fed12 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 87c0da8e1febe925e45cffe05d750ef8a0ac89d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Dec 2024 13:30:57 +0000 Subject: [PATCH 34/40] Update dependencies from https://github.com/dotnet/arcade build 20241212.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24612.1 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/build-rootfs.sh | 14 +++----------- eng/common/cross/toolchain.cmake | 11 +++++++++-- global.json | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60249c600..0bb79c029 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - d5c8bb8726b46b5867961f5d8f56f1b13e72dcb9 + 2c4eeabbeab30dfe532190f7e5c448078231cdd0 https://github.com/dotnet/wpf diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 096bfe51f..de9807297 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks" __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" -__UbuntuPackages+=" libnuma-dev" __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt" -__AlpinePackages+=" numactl-dev" # runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -424,13 +422,12 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + elif [[ -n "$__AlpineVersion" ]]; then + # use whichever alpine version is provided and select the latest toolchain libs + __AlpineLlvmLibsLookup=1 else __AlpineVersion=3.13 # 3.13 to maximize compatibility __AlpinePackages+=" llvm10-libs" - - if [[ "$__AlpineArch" == "armv7" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" - fi fi esac @@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" fi -if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then - # libnuma-dev is not available on armhf for xenial - __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}" -fi - __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -z "$__UbuntuRepo" ]]; then diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index deac538e6..0ff85cf03 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() +elseif(TARGET_ARCH_NAME STREQUAL "loongarch64") + set(CMAKE_SYSTEM_PROCESSOR "loongarch64") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl) + set(TOOLCHAIN "loongarch64-alpine-linux-musl") + else() + set(TOOLCHAIN "loongarch64-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) @@ -118,7 +125,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -284,7 +291,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/global.json b/global.json index c279fed12..c4f3a0c2d 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24610.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 86565ba3cad95148d8f4357ad1ca9dfb90364c4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Dec 2024 13:29:09 +0000 Subject: [PATCH 35/40] Update dependencies from https://github.com/dotnet/arcade build 20241212.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24612.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb79c029..f7b0efb0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 2c4eeabbeab30dfe532190f7e5c448078231cdd0 + 1e161ed635ca19f61b1ddddee61b0bfc995fd716 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index c4f3a0c2d..8a7a5fb13 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 4b212b820770d6f69968758ea67a47a1a4cc6f13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Dec 2024 13:29:46 +0000 Subject: [PATCH 36/40] Update dependencies from https://github.com/dotnet/arcade build 20241213.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24613.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7b0efb0b..1939f56dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 1e161ed635ca19f61b1ddddee61b0bfc995fd716 + 255d5e0c89958af276883a988108c2d616438805 https://github.com/dotnet/wpf diff --git a/global.json b/global.json index 8a7a5fb13..c59495fc8 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 11c430a9044b73cce89df8099d0ea2c5bef37696 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:33:30 +0000 Subject: [PATCH 37/40] Update dependencies from https://github.com/dotnet/arcade build 20241216.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24616.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1939f56dc..cd5a51d49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e https://github.com/dotnet/wpf diff --git a/global.json b/global.json index c59495fc8..4374d1a1e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 8fdf41fa227a2a03a6c91c49d3634893ac1a55e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Dec 2024 13:30:43 +0000 Subject: [PATCH 38/40] Update dependencies from https://github.com/dotnet/arcade build 20241217.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24617.2 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/build-rootfs.sh | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5a51d49..02bd85e14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 https://github.com/dotnet/wpf diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index de9807297..464040aaa 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -422,7 +422,7 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - elif [[ -n "$__AlpineVersion" ]]; then + elif [[ -n "$__AlpineMajorVersion" ]]; then # use whichever alpine version is provided and select the latest toolchain libs __AlpineLlvmLibsLookup=1 else diff --git a/global.json b/global.json index 4374d1a1e..7404f1479 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 9cdea028f6fed77d2be7130797889c58ee19f4df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Dec 2024 23:40:05 +0000 Subject: [PATCH 39/40] Update dependencies from https://github.com/dotnet/arcade build 20241222.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24622.1 --- eng/Version.Details.xml | 4 +- .../steps/install-microbuild.yml | 44 ++++++++++++++--- eng/common/cross/build-android-rootfs.sh | 49 ++++++++++++------- eng/common/native/install-dependencies.sh | 2 +- eng/common/tools.ps1 | 4 +- eng/common/tools.sh | 4 +- global.json | 2 +- 7 files changed, 79 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02bd85e14..6da3d748a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 4f2968fce08735a7e22fca6bd4c99d003221d716 + 8589bd2a216025d753b5f107081bfa28a2d51bb8 https://github.com/dotnet/wpf diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 9abe726e5..2a6a52948 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -1,19 +1,49 @@ parameters: - # Enable cleanup tasks for MicroBuild + # Enable install tasks for MicroBuild enableMicrobuild: false - # Enable cleanup tasks for MicroBuild on Mac and Linux + # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Location of the MicroBuild output folder + microBuildOutputFolder: '$(Agent.TempDirectory)' continueOnError: false steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151 - - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + # Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802 + - script: | + version=$(python3 --version | awk '{print $2}') + major=$(echo $version | cut -d. -f1) + minor=$(echo $version | cut -d. -f2) + + installPython=false + if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then + installPython=true + fi + + echo "Python version: $version." + echo "Install Python 3.12.x: $installPython." + echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython" + name: InstallPython + displayName: 'Determine Python installation' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - task: UsePythonVersion@0 - displayName: 'Use Python 3.11.x' inputs: - versionSpec: '3.11.x' + versionSpec: '3.12.x' + displayName: 'Use Python 3.12.x' + condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT')) + + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + - task: UseDotNet@2 + displayName: Install .NET 8.0 SDK for MicroBuild Plugin + inputs: + packageType: sdk + version: 8.0.x + installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin @@ -25,7 +55,7 @@ steps: azureSubscription: 'MicroBuild Signing Task (DevDiv)' env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and( diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index 7e9ba2b75..fbd8d8084 100644 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Creates a toolchain and sysroot used for cross-compiling for Android." echo - echo "Usage: $0 [BuildArch] [ApiLevel]" + echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]" echo echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" + echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history" echo echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" echo "by setting the TOOLCHAIN_DIR environment variable" @@ -25,10 +26,15 @@ __BuildArch=arm64 __AndroidArch=aarch64 __AndroidToolchain=aarch64-linux-android -for i in "$@" - do - lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" - case $lowerI in +while :; do + if [[ "$#" -le 0 ]]; then + break + fi + + i=$1 + + lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" + case $lowerI in -?|-h|--help) usage exit 1 @@ -43,6 +49,10 @@ for i in "$@" __AndroidArch=arm __AndroidToolchain=arm-linux-androideabi ;; + --ndk) + shift + __NDK_Version=$1 + ;; *[0-9]) __ApiLevel=$i ;; @@ -50,8 +60,17 @@ for i in "$@" __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" ;; esac + shift done +if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then + __NDK_File_Arch_Spec=-x86_64 + __SysRoot=sysroot +else + __NDK_File_Arch_Spec= + __SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot +fi + # Obtain the location of the bash script to figure out where the root of the repo is. __ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -78,6 +97,7 @@ fi echo "Target API level: $__ApiLevel" echo "Target architecture: $__BuildArch" +echo "NDK version: $__NDK_Version" echo "NDK location: $__NDK_Dir" echo "Target Toolchain location: $__ToolchainDir" @@ -85,8 +105,8 @@ echo "Target Toolchain location: $__ToolchainDir" if [ ! -d $__NDK_Dir ]; then echo Downloading the NDK into $__NDK_Dir mkdir -p $__NDK_Dir - wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip - unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir + wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip + unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir fi if [ ! -d $__lldb_Dir ]; then @@ -116,16 +136,11 @@ for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/ fi done -cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/" +cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/" # Generate platform file for build.sh script to assign to __DistroRid echo "Generating platform file..." -echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform - -echo "Now to build coreclr, libraries and installers; run:" -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory coreclr -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory libraries -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory installer +echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform + +echo "Now to build coreclr, libraries and host; run:" +echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 3eef7409f..71bde0e45 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev zlib1g-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bd80ccccb..f46b3c692 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -262,7 +262,9 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + # $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + # Pre-flighting new install script + $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 79b4a28e1..b4d7b0b4e 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -295,7 +295,9 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + # local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + # Pre-flight install script + local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 7404f1479..dda909931 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" }, From 4e3b7579c5eea1c22c5dbb5854ddab564fc17625 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Dec 2024 14:46:10 +0000 Subject: [PATCH 40/40] Update dependencies from https://github.com/dotnet/arcade build 20241226.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24626.1 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 6 ++---- eng/common/tools.sh | 6 ++---- global.json | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6da3d748a..579c3cf9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 8589bd2a216025d753b5f107081bfa28a2d51bb8 + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b https://github.com/dotnet/wpf diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f46b3c692..04b02f4fd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -262,9 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - # $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" - # Pre-flighting new install script - $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" @@ -322,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b4d7b0b4e..40485a0f5 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then @@ -295,9 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - # local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" - # Pre-flight install script - local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index dda909931..8bf5c29a6 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1", "Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6", "Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7" },