From 03c0fbf17c3f9174d224a2f69c369c44bb5788a7 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 21 Jul 2021 09:50:54 +0100 Subject: [PATCH] ff --- .../targets/Microsoft.Android.Sdk.BuildOrder.targets | 1 + .../Tests/Xamarin.Android.Build.Tests/XASdkTests.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets index a39d1c89d32..9531431b31a 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets @@ -37,6 +37,7 @@ projects, these properties are set in Xamarin.Android.Legacy.targets. $(BuildDependsOn); _CopyPackage; _Sign; + _CreateUniversalApkFromBundle; _PrepareAssemblies; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index bb1fe6c6e95..0c89a0dc487 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -433,8 +433,8 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease) }; } else { expectedFiles = new string[] { - $"{proj.PackageName}.apk", $"{proj.PackageName}-Signed.apk", + $"{proj.PackageName}.apk", "es", $"{proj.ProjectName}.dll", $"{proj.ProjectName}.pdb",