diff --git a/.external b/.external
index f442b6bf6c5..e3b6d52cc87 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:master@5849ea1078827543cad9c966d27e4ab9915e572d
+xamarin/monodroid:master@e795bcef375bc77da0bbe995fc9e57560ed5ddc0
mono/mono:2020-02@075c3f06197e3b969f4234d0f56a2e10ee6ee305
diff --git a/NuGet.config b/NuGet.config
index e35b0ced4e7..a877b8c9f07 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,6 +6,10 @@
+
+
+
+
diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
index 504f2679431..84e9333973e 100644
--- a/build-tools/installers/create-installers.targets
+++ b/build-tools/installers/create-installers.targets
@@ -386,6 +386,12 @@
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Build.Debugging.Tasks.pdb" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.Debugging.props" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.Debugging.targets" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\lib\arm64-v8a\installer" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\lib\armeabi-v7a\installer" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\lib\x86\installer" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\lib\x86_64\installer" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\protobuf-net.dll" />
+ <_MSBuildFiles Include="$(MSBuildSrcDir)\System.Collections.Immutable.dll" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ResourceProcessors.dll" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.AndroidTools.dll" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.AndroidTools.pdb" />
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs
index 2a59e9df6f0..882624a2ce0 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs
@@ -32,6 +32,7 @@ public static class KnownProperties
public const string OutputType = "OutputType";
public const string AndroidFastDeploymentType = "AndroidFastDeploymentType";
public const string AndroidClassParser = "AndroidClassParser";
+ public const string _AndroidAllowDeltaInstall = "_AndroidAllowDeltaInstall";
}
}
diff --git a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
old mode 100644
new mode 100755
index c49831f2875..b675b7d82bf
--- a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
@@ -276,31 +276,43 @@ public override void OnCreate ()
/* useSharedRuntime */ false,
/* embedAssemblies */ true,
/* fastDevType */ "Assemblies",
+ /* allowDeltaInstall */ false,
},
new object[] {
/* useSharedRuntime */ false,
/* embedAssemblies */ false,
/* fastDevType */ "Assemblies",
+ /* allowDeltaInstall */ false,
},
new object[] {
/* useSharedRuntime */ true,
/* embedAssemblies */ true,
/* fastDevType */ "Assemblies",
+ /* allowDeltaInstall */ false,
},
new object[] {
/* useSharedRuntime */ true,
/* embedAssemblies */ false,
/* fastDevType */ "Assemblies",
+ /* allowDeltaInstall */ false,
},
new object[] {
/* useSharedRuntime */ true,
/* embedAssemblies */ true,
/* fastDevType */ "Assemblies:Dexes",
+ /* allowDeltaInstall */ false,
},
new object[] {
/* useSharedRuntime */ true,
/* embedAssemblies */ false,
/* fastDevType */ "Assemblies:Dexes",
+ /* allowDeltaInstall */ false,
+ },
+ new object[] {
+ /* useSharedRuntime */ true,
+ /* embedAssemblies */ false,
+ /* fastDevType */ "Assemblies",
+ /* allowDeltaInstall */ true,
},
};
#pragma warning restore 414
@@ -308,7 +320,7 @@ public override void OnCreate ()
[Test]
[TestCaseSource (nameof(DebuggerTestCases))]
[Retry (1)]
- public void ApplicationRunsWithDebuggerAndBreaks (bool useSharedRuntime, bool embedAssemblies, string fastDevType)
+ public void ApplicationRunsWithDebuggerAndBreaks (bool useSharedRuntime, bool embedAssemblies, string fastDevType, bool allowDeltaInstall)
{
if (!CommercialBuildAvailable) {
Assert.Ignore ("Test does not run on the Open Source Builds.");
@@ -326,6 +338,8 @@ public void ApplicationRunsWithDebuggerAndBreaks (bool useSharedRuntime, bool em
};
var abis = new string [] { "armeabi-v7a", "x86" };
proj.SetProperty (KnownProperties.AndroidSupportedAbis, string.Join (";", abis));
+ if (allowDeltaInstall)
+ proj.SetProperty (KnownProperties._AndroidAllowDeltaInstall, "true");
proj.SetDefaultTargetDevice ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
SetTargetFrameworkAndManifest (proj, b);