[Xamarin.Android.Build.Tasks] Add support for new InstantRun

build-tools/scripts/RunTests.targets

@@ -25,6 +25,7 @@
     <_ApkTestProject Include="$(_TopDir)\tests\BCL-Tests\Xamarin.Android.Bcl-Tests\Xamarin.Android.Bcl-Tests.csproj" />
     <_ApkTestProject Include="$(_TopDir)\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.csproj" />
     <_ApkTestProject Include="$(_TopDir)\tests\EmbeddedDSOs\EmbeddedDSO\EmbeddedDSO.csproj" />
+    <_ApkTestProject Include="$(_TopDir)\tests\Runtime-MultiDex\Mono.Android-TestsMultiDex.csproj" />
     <_ApkTestProjectAot Include="$(_TopDir)\src\Mono.Android\Test\Mono.Android-Tests.csproj" />
     <_ApkTestProjectBundle Include="$(_TopDir)\src\Mono.Android\Test\Mono.Android-Tests.csproj" />
   </ItemGroup>

build-tools/scripts/TestApks.targets

@@ -128,6 +128,7 @@
     <Exec
         Condition=" '$(HostOS)' != 'Windows' And '$(_EmuTarget)' != '' "
         ContinueOnError="WarnAndContinue"
+        IgnoreStandardErrorWarningFormat="true"
         Command="kill -KILL $(_EmuPid)"
     />
   </Target>

src/Mono.Android/Test/Mono.Android-Test.Shared.projitems

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>{0AB4956E-6FB9-4DA0-9D49-AB65A3FF403A}</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Mono.Android-Test.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)\Resources\Resource.designer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Properties\AssemblyInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.App\ApplicationTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Content\IntentTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Runtime\CharSequenceTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Runtime\JavaCollectionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Runtime\JnienvArrayMarshaling.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Runtime\XmlReaderPullParserTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Runtime\XmlReaderResourceParserTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.Widget\AdapterTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Java.Interop\JavaConvertTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Java.Lang\ObjectArrayMarshaling.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Java.Lang\ObjectTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Java.Interop\JnienvTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System\AppDomainTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System\AssemblyInformationalVersionAttributeTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System\ExceptionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System\TimeZoneTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.IO\DriveInfoTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.IO.Compression\GZipStreamTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.Net\ProxyTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.Net\SslTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.Net\NetworkInterfaces.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\System.Threading\InterlockedTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Java.Interop\JavaObjectExtensionsTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.Net\AndroidClientHandlerTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.Net\HttpClientIntegrationTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.RuntimeTests\MainActivity.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.RuntimeTests\MyIntent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.RuntimeTests\NonJavaObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Xamarin.Android.RuntimeTests\TestInstrumentation.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Android.OS\BundleTest.cs" />
+  </ItemGroup>
+</Project>

src/Mono.Android/Test/Mono.Android-Test.Shared.shproj

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{0AB4956E-6FB9-4DA0-9D49-AB65A3FF403A}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <Import Project="Mono.Android-Test.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

src/Mono.Android/Test/Mono.Android-Tests.csproj

@@ -21,6 +21,7 @@
     <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
+  <Import Project="Mono.Android-Test.Shared.projitems" Label="Shared" Condition="Exists('Mono.Android-Test.Shared.projitems')" />
   <Import Project="..\..\..\Configuration.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/Xamarin.Android.Build.Tasks.tpnitems

@@ -6,7 +6,8 @@
       https://github.com/bazelbuild/bazel/tree/master/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment
       * Xamarin.Android.Build.Tasks/Resources/IncrementalClassLoader.java
       * Xamarin.Android.Build.Tasks/Resources/Placeholder.java
-      * Xamarin.Android.Build.Tasks/Resources/StubApplication.java
+      * Xamarin.Android.Build.Tasks/Resources/MonkeyPatcher.java
+      * Xamarin.Android.Build.Tasks/Resources/ResourceLoader.java
       -->
     <ThirdPartyNotice Include="bazelbuild/bazel">
       <LicenseFile>$(MSBuildThisFileDirectory)\..\build-tools\license-data\Apache-2.0.txt</LicenseFile>