Bump and rework tests

Author: dellis1972

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:fastdevv2@0a43ffec4dda8d35878bad638d54211ebebec6f9
+xamarin/monodroid:fastdevv2@3c3f90b1de38c4f24148349b2516f42f277016c1
 mono/mono:2020-02@075c3f06197e3b969f4234d0f56a2e10ee6ee305

tests/MSBuildDeviceIntegration/Tests/InstallTests.cs

@@ -56,6 +56,7 @@ public void ReInstallIfUserUninstalled ([Values (false, true)] bool isRelease)
 				Assert.IsTrue (builder.Output.AreTargetsAllBuilt ("_Upload"), "_Upload should have built completely.");
 				Assert.AreEqual ($"package:{proj.PackageName}", RunAdbCommand ($"shell pm list packages {proj.PackageName}").Trim (),
 					$"{proj.PackageName} is not installed on the device.");
+				Assert.IsTrue (builder.Uninstall (proj), "unnstall should have succeeded.");
 			}
 		}
 
@@ -68,7 +69,7 @@ public void InstallAndUnInstall ([Values (false, true)] bool isRelease)
 			if (!HasDevices) {
 				Assert.Ignore ("Test Skipped no devices or emulators found.");
 			}
-			
+
 			var proj = new XamarinAndroidApplicationProject () {
 				IsRelease = isRelease,
 			};
@@ -136,6 +137,7 @@ public void ChangeKeystoreRedeploy ()
 				proj.SetProperty ("AndroidSigningKeyAlias", "mykey");
 
 				Assert.IsTrue (builder.Install (proj), "second install should succeed.");
+				Assert.IsTrue (builder.Uninstall (proj), "unnstall should have succeeded.");
 			}
 		}
 
@@ -179,7 +181,7 @@ public void SwitchConfigurationsShouldRedeploy ()
 				Assert.IsTrue (builder.Install (proj));
 				Assert.AreEqual ($"package:{proj.PackageName}", RunAdbCommand ($"shell pm list packages {proj.PackageName}").Trim (),
 					$"{proj.PackageName} is not installed on the device.");
-			
+
 				directorylist = string.Empty;
 				foreach (var dir in overrideDirs) {
 					var listing = RunAdbCommand ($"shell ls {dir}");
@@ -200,7 +202,7 @@ public void SwitchConfigurationsShouldRedeploy ()
 						directorylist += listing;
 				}
 				StringAssert.Contains ($"{proj.AssemblyName}", directorylist, $"{proj.AssemblyName} not found in fastdev directory.");
-			
+
 				Assert.IsTrue (builder.Uninstall (proj));
 				Assert.AreNotEqual ($"package:{proj.PackageName}", RunAdbCommand ($"shell pm list packages {proj.PackageName}").Trim (),
 					$"{proj.PackageName} is installed on the device.");
@@ -262,7 +264,7 @@ public void InstallWithoutSharedRuntime ()
 				StringAssert.Contains ($"{proj.ProjectName}.dll", directorylist, $"{proj.ProjectName}.dll should exist in the .__override__ directory.");
 				StringAssert.Contains ($"System.dll", directorylist, $"System.dll should exist in the .__override__ directory.");
 				StringAssert.Contains ($"Mono.Android.dll", directorylist, $"Mono.Android.dll should exist in the .__override__ directory.");
-
+				Assert.IsTrue (builder.Uninstall (proj), "unnstall should have succeeded.");
 			}
 		}
 
@@ -345,6 +347,7 @@ public void ToggleFastDev ()
 
 				//Deploy one last time to verify install still works without the .__override__ directory existing
 				Assert.IsTrue (builder.Install (proj), "Third install should have succeeded.");
+				Assert.IsTrue (builder.Uninstall (proj), "unnstall should have succeeded.");
 			}
 		}
 

tests/MSBuildDeviceIntegration/Tests/InstantRunTest.cs

@@ -335,6 +335,8 @@ public void InstantRunNativeLibrary ([Values ("dx", "d8")] string dexTool)
 
 				nativeLib.BinaryContent = () => new byte [20];
 				nativeLib.Timestamp = DateTime.UtcNow.AddSeconds(1);
+				nativeLibx86.BinaryContent = () => new byte [20];
+				nativeLibx86.Timestamp = DateTime.UtcNow.AddSeconds(1);
 				Assert.IsTrue (b.Install (proj, doNotCleanupOnUpdate: true, saveProject: false), "install should have succeeded. 1");
 				logLines = b.LastBuildOutput;
 				Assert.IsFalse (logLines.Any (l => l.Contains ("Building target \"_BuildApkFastDev\" completely.") ||