Skip to content

Commit

Permalink
Merge pull request #16127 from unoplatform/mergify/bp/release/stable/…
Browse files Browse the repository at this point in the history
…5.2/pr-16125

Don't specify Google Android Material with MAUI Embedding (backport #16125)
  • Loading branch information
jeromelaban authored Apr 5, 2024
2 parents 06ee0b6 + 4f111f9 commit 2006225
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2006225

Please sign in to comment.