diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs index 5955292b..87ed37a3 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs @@ -329,7 +329,9 @@ void RemoveAndroidPermissions (IEnumerable permissions) IEnumerable GetLaunchableActivities () { - foreach (var activity in application.Elements ("activity")) { + var activities = application.Elements ("activity"); + var aliases = application.Elements ("activity-alias"); + foreach (var activity in activities.Union (aliases)) { foreach (var filter in activity.Elements ("intent-filter")) { foreach (var category in filter.Elements ("category")) if (category != null && (string?)category.Attribute (aName) == "android.intent.category.LAUNCHER") diff --git a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs index 5c58199a..92e81dbe 100644 --- a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs +++ b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs @@ -51,8 +51,9 @@ public void GetLaunchableActivityNames () var versions = new AndroidVersions (Array.Empty()); var manifest = AndroidAppManifest.Load (GetTestAppManifest (), versions); var launchers = manifest.GetLaunchableActivityNames ().ToList (); - Assert.AreEqual (1, launchers.Count); + Assert.AreEqual (2, launchers.Count); Assert.AreEqual (".HasMultipleIntentFilters", launchers [0]); + Assert.AreEqual (".ActivityAlias", launchers [1]); } [Test] diff --git a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml index c834c6cf..b3e146a0 100644 --- a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml +++ b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml @@ -33,6 +33,12 @@ + + + + + + diff --git a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj index 19c4033d..27b85243 100644 --- a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj +++ b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj @@ -4,7 +4,7 @@ - net6.0 + net8.0 true ..\..\product.snk false