From 4f111f9d6f641d74ff9273d3cb397ed5d4d90bbe Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Thu, 4 Apr 2024 08:11:57 -0600 Subject: [PATCH] fix: Don't specify Google Android Material with MAUI Embedding (cherry picked from commit 94dfeb3e59aa557731ffda59caafc26ec6f0ca3a) --- src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs b/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs index 1912621ddd40..228e6c499d3e 100644 --- a/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs +++ b/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs @@ -66,8 +66,12 @@ private void AddCorePackagesForExecutable() if (TargetRuntime == UnoTarget.Android) { + if (!HasFeature(UnoFeature.MauiEmbedding)) + { + AddPackage("Xamarin.Google.Android.Material", AndroidMaterialVersion); + } + AddPackage("Uno.UniversalImageLoader", UnoUniversalImageLoaderVersion); - AddPackage("Xamarin.Google.Android.Material", AndroidMaterialVersion); AddPackage("Xamarin.AndroidX.Legacy.Support.V4", AndroidXLegacySupportV4Version); AddPackage("Xamarin.AndroidX.AppCompat", AndroidXAppCompatVersion); AddPackage("Xamarin.AndroidX.RecyclerView", AndroidXRecyclerViewVersion); @@ -197,7 +201,6 @@ public void AddUnoExtensionsPackages() if (TargetRuntime == UnoTarget.Android) { - AddPackage("Xamarin.Google.Android.Material", AndroidMaterialVersion); AddPackage("Xamarin.AndroidX.Navigation.UI", AndroidXNavigationVersion); AddPackage("Xamarin.AndroidX.Navigation.Fragment", AndroidXNavigationVersion); AddPackage("Xamarin.AndroidX.Navigation.Runtime", AndroidXNavigationVersion);