Fast Dev V2

Author: dellis1972

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:master@e795bcef375bc77da0bbe995fc9e57560ed5ddc0
+xamarin/monodroid:fastdevv2@805daf6a354bbd9c8350bd17c03a9d074b48aa90
 mono/mono:2020-02@87ef5557017a8d822ae31587846a54fcd66daf1b

Documentation/release-notes/fastdeployment.md

@@ -0,0 +1,15 @@
+# Fast Deployment Updates.
+
+As part of this update the fast deplyment system used for Debugging apps has
+been changed. The shared runtime is now no longer used or required.
+The Platform package has also been make obsolete.
+
+The new system also no longer uses the `external` drive for the fast deployment
+files. All of the files and tooling are now stored in the applications' `internal`
+directory. This has an advantage in that when the application is uninstalled all
+if the files and the tooling will be removed as well.
+
+The new system will not work on any devices older than API 21. This is because it
+relys on features that only work from API 21 onwards. Also API 21 is the lowest
+supported platform for the runtime, so running and debugging on older devices will
+be impossible.

build-tools/installers/create-installers.targets

@@ -407,6 +407,10 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.targets" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Compression.LZ4.dll" />
+    <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\%(Identity)\xamarin.copy')"                   Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " />
+    <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\%(Identity)\xamarin.find')"                   Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " />
+    <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\%(Identity)\xamarin.stat')"                   Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " />
     <LegacyTargetsFiles Include="$(RootBuildDir)\lib\xamarin.android\xbuild\Novell\Xamarin.Android.Bindings.targets" />
     <LegacyTargetsFiles Include="$(RootBuildDir)\lib\xamarin.android\xbuild\Novell\Xamarin.Android.VisualBasic.targets" />
   </ItemGroup>

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

@@ -48,7 +48,7 @@ public void InstantRunSimpleBuild ([Values ("dx", "d8")] string dexTool)
 					File.Delete (dexFile);
 				}
 			}
-			
+
 			b.Dispose ();
 		}
 
@@ -306,9 +306,9 @@ public void InstantRunNativeLibrary ([Values ("dx", "d8")] string dexTool)
 				Assert.Ignore ("Test needs a device attached.");
 				return;
 			}
-			var nativeLib = new AndroidItem.AndroidNativeLibrary ("foo\\x86_64\\libtest.so") {
+			var nativeLib = new AndroidItem.AndroidNativeLibrary ($"foo\\{DeviceAbi}\\libtest.so") {
 				BinaryContent = () => new byte [10],
-				MetadataValues = "Link=libs\\x86_64\\libtest.so",
+				MetadataValues = $"Link=libs\\{DeviceAbi}\\libtest.so",
 			};
 			var proj = new XamarinAndroidApplicationProject () {
 				AndroidFastDeploymentType = "Assemblies:Dexes",