diff --git a/.external b/.external index 40278e95833..4d5362cd217 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:main@ae47dedcdb9d7cd83c18630b3941ecb4b9441d7c +xamarin/monodroid:main@6ba6f3b6be8b679b7ea21e8c2fed452b43ef20e0 diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs index 5c8940508c7..2e2960dcd03 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs @@ -626,6 +626,22 @@ public void AdbTargetChangesAppBundle () Assert.AreNotEqual (before, after, $"{apkset} should change!"); } + [Test] + public void AdbTargetArchitecture () + { + AssertCommercialBuild (); + AssertHasDevices (); + + const string abi = "x86_64"; + var proj = new XamarinAndroidApplicationProject (); + + using var b = CreateApkBuilder (); + b.Verbosity = LoggerVerbosity.Diagnostic; + Assert.IsTrue (b.Install (proj, parameters: [ $"AdbTargetArchitecture={abi}" ]), "install should have succeeded."); + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, $"Using $(AdbTargetArchitecture): {abi}"), + $"`_GetPrimaryCpuAbi` should be skipped for $(AdbTargetArchitecture)!"); + } + [Test] public void AppWithAndroidJavaSource () {