From 4b40be39060433fbac17696a0f519115566c02cb Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 3 Dec 2024 12:17:02 -0500 Subject: [PATCH 1/5] Bump to dotnet/android-tools@f53106a1 Changes: https://github.com/dotnet/android-tools/compare/d50747cbddf6ab3e2151fc2ae3e3af76edb4fd72...f53106a126b0e2f7f34802de5e1f99be4c34ce54 * dotnet/android-tools@f53106a: Bump to dotnet/msbuild@10fbfbf2 (#241) * dotnet/android-tools@a2e146d: Bump to dotnet/msbuild/v17.9.5@33de0b22 (#232) * dotnet/android-tools@1818d59: Bump LibZipSharp and Xamarin.Build.AsyncTask (#236) * dotnet/android-tools@75f79e7: Bump LibZipSharp to 3.1.1 (#228) * dotnet/android-tools@b1f795e: [MSBuildReferences.projitems] Require opt-in to use `Microsoft.Build` (#220) --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index d50747cbddf..f53106a126b 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit d50747cbddf6ab3e2151fc2ae3e3af76edb4fd72 +Subproject commit f53106a126b0e2f7f34802de5e1f99be4c34ce54 From 48bcf834898e206ad5a68a277f0d190c06b198db Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 3 Dec 2024 13:05:04 -0500 Subject: [PATCH 2/5] Set IncludeMicrosoftBuildPackage=true --- ...amarin.Android.Tools.BootstrapTasks.csproj | 1 + .../Xamarin.ProjectTools.csproj | 3 +- src/native/CMakePresets.json | 324 ++++++++++++++++++ 3 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 src/native/CMakePresets.json diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index d3ab591a159..7aef0db2ed7 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -6,6 +6,7 @@ $(TargetFrameworkNETStandard) true $(BootstrapOutputDirectory) + <_IncludeMicrosoftBuildPackage>true diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj index fb4dfe53ce0..465b83791a5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj @@ -3,10 +3,11 @@ {2DD1EE75-6D8D-4653-A800-0A24367F7F38} true - netstandard2.0 + $(DotNetStableTargetFramework) true ..\..\..\..\product.snk $(NoWarn);CA1305 + <_IncludeMicrosoftBuildPackage>true diff --git a/src/native/CMakePresets.json b/src/native/CMakePresets.json new file mode 100644 index 00000000000..346045e5c9d --- /dev/null +++ b/src/native/CMakePresets.json @@ -0,0 +1,324 @@ +{ + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 21, + "patch": 0 + }, + + "configurePresets": [ + { + "name": "common", + "hidden": true, + "generator": "Ninja", + "debug": { + "output": true + }, + "toolchainFile": "/Users/peter/android-toolchain/ndk/build/cmake/android.toolchain.cmake", + "cacheVariables": { + "ANDROID_NDK": "/Users/peter/android-toolchain/ndk", + "ANDROID_TOOLCHAIN": "clang", + "ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_MAKE_PROGRAM": "/Users/peter/android-toolchain/sdk/cmake/3.30.3/bin/ninja", + "OUTPUT_PATH": "/Users/peter/source/android/bin/Debug/lib/packs/Microsoft.Android.Sdk.Darwin/35.99.0/tools/lib", + "XA_LIB_TOP_DIR": "/Users/peter/source/android/bin/Debug/lib/packs/Microsoft.Android.Sdk.Darwin/35.99.0/tools/", + "XA_BUILD_CONFIGURATION": "Debug" + } + }, + + { + "name": "common-debug", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + + { + "name": "common-release", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + + { + "name": "default-common", + "hidden": true, + "inherits": "common", + "cacheVariables": { + "ANDROID_STL": "none", + "ANDROID_CPP_FEATURES": "no-rtti no-exceptions" + } + }, + + { + "name": "analyzers-common", + "hidden": true, + "inherits": "common", + "cacheVariables": { + "ANDROID_STL": "c++_static", + "ANDROID_CPP_FEATURES": "rtti exceptions" + } + }, + + { + "name": "default-debug", + "hidden": true, + "inherits": ["default-common", "common-debug"] + }, + + { + "name": "default-release", + "hidden": true, + "inherits": ["default-common", "common-release"] + }, + + { + "name": "analyzers-debug", + "hidden": true, + "inherits": ["analyzers-common", "common-debug"] + }, + + { + "name": "analyzers-release", + "hidden": true, + "inherits": ["analyzers-common", "common-release"] + }, + + { + "name": "common-armeabi-v7a", + "hidden": true, + "cacheVariables": { + "ANDROID_ABI": "armeabi-v7a", + "ANDROID_NATIVE_API_LEVEL": "21", + "ANDROID_PLATFORM": "android-21", + "ANDROID_RID": "android-arm" + } + }, + + { + "name": "common-arm64-v8a", + "hidden": true, + "cacheVariables": { + "ANDROID_ABI": "arm64-v8a", + "ANDROID_NATIVE_API_LEVEL": "21", + "ANDROID_PLATFORM": "android-21", + "ANDROID_RID": "android-arm64" + } + }, + + { + "name": "common-x86", + "hidden": true, + "cacheVariables": { + "ANDROID_ABI": "x86", + "ANDROID_NATIVE_API_LEVEL": "21", + "ANDROID_PLATFORM": "android-21", + "ANDROID_RID": "android-x86" + } + }, + + { + "name": "common-x86_64", + "hidden": true, + "cacheVariables": { + "ANDROID_ABI": "x86_64", + "ANDROID_NATIVE_API_LEVEL": "21", + "ANDROID_PLATFORM": "android-21", + "ANDROID_RID": "android-x64" + } + }, + + { + "name": "asan-common", + "hidden": true, + "cacheVariables": { + "ENABLE_CLANG_ASAN": "ON" + } + }, + + { + "name": "ubsan-common", + "hidden": true, + "cacheVariables": { + "ENABLE_CLANG_UBSAN": "ON" + } + }, + + { + "name": "default-debug-armeabi-v7a", + "inherits": ["default-common", "common-debug", "common-armeabi-v7a"] + }, + + { + "name": "default-release-armeabi-v7a", + "inherits": ["default-common", "common-release", "common-armeabi-v7a"] + }, + + { + "name": "analyzers-debug-armeabi-v7a", + "hidden": true, + "inherits": ["analyzers-common", "common-debug", "common-armeabi-v7a"] + }, + + { + "name": "analyzers-release-armeabi-v7a", + "hidden": true, + "inherits": ["analyzers-common", "common-release", "common-armeabi-v7a"] + }, + + { + "name": "asan-release-armeabi-v7a", + "inherits": ["analyzers-release-armeabi-v7a", "asan-common"] + }, + + { + "name": "asan-debug-armeabi-v7a", + "inherits": ["analyzers-debug-armeabi-v7a", "asan-common"] + }, + + { + "name": "ubsan-release-armeabi-v7a", + "inherits": ["analyzers-release-armeabi-v7a", "ubsan-common"] + }, + + { + "name": "ubsan-debug-armeabi-v7a", + "inherits": ["analyzers-debug-armeabi-v7a", "ubsan-common"] + }, + + + + { + "name": "default-debug-arm64-v8a", + "inherits": ["default-common", "common-debug", "common-arm64-v8a"] + }, + + { + "name": "default-release-arm64-v8a", + "inherits": ["default-common", "common-release", "common-arm64-v8a"] + }, + + { + "name": "analyzers-debug-arm64-v8a", + "hidden": true, + "inherits": ["analyzers-common", "common-debug", "common-arm64-v8a"] + }, + + { + "name": "analyzers-release-arm64-v8a", + "hidden": true, + "inherits": ["analyzers-common", "common-release", "common-arm64-v8a"] + }, + + { + "name": "asan-release-arm64-v8a", + "inherits": ["analyzers-release-arm64-v8a", "asan-common"] + }, + + { + "name": "asan-debug-arm64-v8a", + "inherits": ["analyzers-debug-arm64-v8a", "asan-common"] + }, + + { + "name": "ubsan-release-arm64-v8a", + "inherits": ["analyzers-release-arm64-v8a", "ubsan-common"] + }, + + { + "name": "ubsan-debug-arm64-v8a", + "inherits": ["analyzers-debug-arm64-v8a", "ubsan-common"] + }, + + + + { + "name": "default-debug-x86", + "inherits": ["default-common", "common-debug", "common-x86"] + }, + + { + "name": "default-release-x86", + "inherits": ["default-common", "common-release", "common-x86"] + }, + + { + "name": "analyzers-debug-x86", + "hidden": true, + "inherits": ["analyzers-common", "common-debug", "common-x86"] + }, + + { + "name": "analyzers-release-x86", + "hidden": true, + "inherits": ["analyzers-common", "common-release", "common-x86"] + }, + + { + "name": "asan-release-x86", + "inherits": ["analyzers-release-x86", "asan-common"] + }, + + { + "name": "asan-debug-x86", + "inherits": ["analyzers-debug-x86", "asan-common"] + }, + + { + "name": "ubsan-release-x86", + "inherits": ["analyzers-release-x86", "ubsan-common"] + }, + + { + "name": "ubsan-debug-x86", + "inherits": ["analyzers-debug-x86", "ubsan-common"] + }, + + + + { + "name": "default-debug-x86_64", + "inherits": ["default-common", "common-debug", "common-x86_64"] + }, + + { + "name": "default-release-x86_64", + "inherits": ["default-common", "common-release", "common-x86_64"] + }, + + { + "name": "analyzers-debug-x86_64", + "hidden": true, + "inherits": ["analyzers-common", "common-debug", "common-x86_64"] + }, + + { + "name": "analyzers-release-x86_64", + "hidden": true, + "inherits": ["analyzers-common", "common-release", "common-x86_64"] + }, + + { + "name": "asan-release-x86_64", + "inherits": ["analyzers-release-x86_64", "asan-common"] + }, + + { + "name": "asan-debug-x86_64", + "inherits": ["analyzers-debug-x86_64", "asan-common"] + }, + + { + "name": "ubsan-release-x86_64", + "inherits": ["analyzers-release-x86_64", "ubsan-common"] + }, + + { + "name": "ubsan-debug-x86_64", + "inherits": ["analyzers-debug-x86_64", "ubsan-common"] + } + ] +} From 56e96be5aa3eb13e2996adbf365dcc28a8086f0b Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 3 Dec 2024 13:06:07 -0500 Subject: [PATCH 3/5] Fix merge --- src/native/CMakePresets.json | 324 ----------------------------------- 1 file changed, 324 deletions(-) delete mode 100644 src/native/CMakePresets.json diff --git a/src/native/CMakePresets.json b/src/native/CMakePresets.json deleted file mode 100644 index 346045e5c9d..00000000000 --- a/src/native/CMakePresets.json +++ /dev/null @@ -1,324 +0,0 @@ -{ - "version": 3, - "cmakeMinimumRequired": { - "major": 3, - "minor": 21, - "patch": 0 - }, - - "configurePresets": [ - { - "name": "common", - "hidden": true, - "generator": "Ninja", - "debug": { - "output": true - }, - "toolchainFile": "/Users/peter/android-toolchain/ndk/build/cmake/android.toolchain.cmake", - "cacheVariables": { - "ANDROID_NDK": "/Users/peter/android-toolchain/ndk", - "ANDROID_TOOLCHAIN": "clang", - "ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "CMAKE_MAKE_PROGRAM": "/Users/peter/android-toolchain/sdk/cmake/3.30.3/bin/ninja", - "OUTPUT_PATH": "/Users/peter/source/android/bin/Debug/lib/packs/Microsoft.Android.Sdk.Darwin/35.99.0/tools/lib", - "XA_LIB_TOP_DIR": "/Users/peter/source/android/bin/Debug/lib/packs/Microsoft.Android.Sdk.Darwin/35.99.0/tools/", - "XA_BUILD_CONFIGURATION": "Debug" - } - }, - - { - "name": "common-debug", - "hidden": true, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - - { - "name": "common-release", - "hidden": true, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - - { - "name": "default-common", - "hidden": true, - "inherits": "common", - "cacheVariables": { - "ANDROID_STL": "none", - "ANDROID_CPP_FEATURES": "no-rtti no-exceptions" - } - }, - - { - "name": "analyzers-common", - "hidden": true, - "inherits": "common", - "cacheVariables": { - "ANDROID_STL": "c++_static", - "ANDROID_CPP_FEATURES": "rtti exceptions" - } - }, - - { - "name": "default-debug", - "hidden": true, - "inherits": ["default-common", "common-debug"] - }, - - { - "name": "default-release", - "hidden": true, - "inherits": ["default-common", "common-release"] - }, - - { - "name": "analyzers-debug", - "hidden": true, - "inherits": ["analyzers-common", "common-debug"] - }, - - { - "name": "analyzers-release", - "hidden": true, - "inherits": ["analyzers-common", "common-release"] - }, - - { - "name": "common-armeabi-v7a", - "hidden": true, - "cacheVariables": { - "ANDROID_ABI": "armeabi-v7a", - "ANDROID_NATIVE_API_LEVEL": "21", - "ANDROID_PLATFORM": "android-21", - "ANDROID_RID": "android-arm" - } - }, - - { - "name": "common-arm64-v8a", - "hidden": true, - "cacheVariables": { - "ANDROID_ABI": "arm64-v8a", - "ANDROID_NATIVE_API_LEVEL": "21", - "ANDROID_PLATFORM": "android-21", - "ANDROID_RID": "android-arm64" - } - }, - - { - "name": "common-x86", - "hidden": true, - "cacheVariables": { - "ANDROID_ABI": "x86", - "ANDROID_NATIVE_API_LEVEL": "21", - "ANDROID_PLATFORM": "android-21", - "ANDROID_RID": "android-x86" - } - }, - - { - "name": "common-x86_64", - "hidden": true, - "cacheVariables": { - "ANDROID_ABI": "x86_64", - "ANDROID_NATIVE_API_LEVEL": "21", - "ANDROID_PLATFORM": "android-21", - "ANDROID_RID": "android-x64" - } - }, - - { - "name": "asan-common", - "hidden": true, - "cacheVariables": { - "ENABLE_CLANG_ASAN": "ON" - } - }, - - { - "name": "ubsan-common", - "hidden": true, - "cacheVariables": { - "ENABLE_CLANG_UBSAN": "ON" - } - }, - - { - "name": "default-debug-armeabi-v7a", - "inherits": ["default-common", "common-debug", "common-armeabi-v7a"] - }, - - { - "name": "default-release-armeabi-v7a", - "inherits": ["default-common", "common-release", "common-armeabi-v7a"] - }, - - { - "name": "analyzers-debug-armeabi-v7a", - "hidden": true, - "inherits": ["analyzers-common", "common-debug", "common-armeabi-v7a"] - }, - - { - "name": "analyzers-release-armeabi-v7a", - "hidden": true, - "inherits": ["analyzers-common", "common-release", "common-armeabi-v7a"] - }, - - { - "name": "asan-release-armeabi-v7a", - "inherits": ["analyzers-release-armeabi-v7a", "asan-common"] - }, - - { - "name": "asan-debug-armeabi-v7a", - "inherits": ["analyzers-debug-armeabi-v7a", "asan-common"] - }, - - { - "name": "ubsan-release-armeabi-v7a", - "inherits": ["analyzers-release-armeabi-v7a", "ubsan-common"] - }, - - { - "name": "ubsan-debug-armeabi-v7a", - "inherits": ["analyzers-debug-armeabi-v7a", "ubsan-common"] - }, - - - - { - "name": "default-debug-arm64-v8a", - "inherits": ["default-common", "common-debug", "common-arm64-v8a"] - }, - - { - "name": "default-release-arm64-v8a", - "inherits": ["default-common", "common-release", "common-arm64-v8a"] - }, - - { - "name": "analyzers-debug-arm64-v8a", - "hidden": true, - "inherits": ["analyzers-common", "common-debug", "common-arm64-v8a"] - }, - - { - "name": "analyzers-release-arm64-v8a", - "hidden": true, - "inherits": ["analyzers-common", "common-release", "common-arm64-v8a"] - }, - - { - "name": "asan-release-arm64-v8a", - "inherits": ["analyzers-release-arm64-v8a", "asan-common"] - }, - - { - "name": "asan-debug-arm64-v8a", - "inherits": ["analyzers-debug-arm64-v8a", "asan-common"] - }, - - { - "name": "ubsan-release-arm64-v8a", - "inherits": ["analyzers-release-arm64-v8a", "ubsan-common"] - }, - - { - "name": "ubsan-debug-arm64-v8a", - "inherits": ["analyzers-debug-arm64-v8a", "ubsan-common"] - }, - - - - { - "name": "default-debug-x86", - "inherits": ["default-common", "common-debug", "common-x86"] - }, - - { - "name": "default-release-x86", - "inherits": ["default-common", "common-release", "common-x86"] - }, - - { - "name": "analyzers-debug-x86", - "hidden": true, - "inherits": ["analyzers-common", "common-debug", "common-x86"] - }, - - { - "name": "analyzers-release-x86", - "hidden": true, - "inherits": ["analyzers-common", "common-release", "common-x86"] - }, - - { - "name": "asan-release-x86", - "inherits": ["analyzers-release-x86", "asan-common"] - }, - - { - "name": "asan-debug-x86", - "inherits": ["analyzers-debug-x86", "asan-common"] - }, - - { - "name": "ubsan-release-x86", - "inherits": ["analyzers-release-x86", "ubsan-common"] - }, - - { - "name": "ubsan-debug-x86", - "inherits": ["analyzers-debug-x86", "ubsan-common"] - }, - - - - { - "name": "default-debug-x86_64", - "inherits": ["default-common", "common-debug", "common-x86_64"] - }, - - { - "name": "default-release-x86_64", - "inherits": ["default-common", "common-release", "common-x86_64"] - }, - - { - "name": "analyzers-debug-x86_64", - "hidden": true, - "inherits": ["analyzers-common", "common-debug", "common-x86_64"] - }, - - { - "name": "analyzers-release-x86_64", - "hidden": true, - "inherits": ["analyzers-common", "common-release", "common-x86_64"] - }, - - { - "name": "asan-release-x86_64", - "inherits": ["analyzers-release-x86_64", "asan-common"] - }, - - { - "name": "asan-debug-x86_64", - "inherits": ["analyzers-debug-x86_64", "asan-common"] - }, - - { - "name": "ubsan-release-x86_64", - "inherits": ["analyzers-release-x86_64", "ubsan-common"] - }, - - { - "name": "ubsan-debug-x86_64", - "inherits": ["analyzers-debug-x86_64", "ubsan-common"] - } - ] -} From 464fbcebae2bc9d1f23bea8fd6dabf42938c6aa4 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2024 11:48:55 -0500 Subject: [PATCH 4/5] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index b1a8e524052..837669aebc0 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:release/8.0.4xx@b753d75f846b76cabb3b65b52ac12c4a83c07a13 +xamarin/monodroid:dev/pjc/rel8-at-506b@8a2325109ee735691c8e2e933ff03cb85a590880 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d From b0b42dd660295d2b275124b1eff261db599fccf1 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2024 13:26:50 -0500 Subject: [PATCH 5/5] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 837669aebc0..5457942c72f 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:dev/pjc/rel8-at-506b@8a2325109ee735691c8e2e933ff03cb85a590880 +xamarin/monodroid:release/8.0.4xx@99627fea9cf2ce9ca59fa571ea5640f8eb4a9c59 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d