Skip to content

[Xamarin.Android.Build.Tasks] add $(_AndroidAllowDeltaInstall) support #4643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 18 commits into from
May 21, 2020
Merged

[Xamarin.Android.Build.Tasks] add $(_AndroidAllowDeltaInstall) support #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
799f731
[Xamarin.Android.Build.Tasks] add $(AndroidAllowDeltaInstall) support
jonathanpeppers Apr 30, 2020
7cb41b1
Add AndroidAllowDeltaInstall description to doc
Apr 30, 2020
1df04f5
Add new delta install dependencies to installer
Apr 30, 2020
c64be48
Add AndroidAllowDeltaInstall to KnownProperties
Apr 30, 2020
8926a3e
Add test case for AllowDeltaInstall=true
Apr 30, 2020
1d71ff0
Add Xamarin.Android.Deploy.Installer to XA NuGet.config
May 1, 2020
6c1ac44
Use "Assemblies" mode for delta install tests
May 1, 2020
2cb82fc
Updated NuGet feel for installer
May 6, 2020
5dc8cf7
Update feed name in NuGet.config
May 7, 2020
6df4fff
Bumped to latest monodroid deltainstall branch
May 7, 2020
83b0a78
Fixup test invocation
May 8, 2020
271a243
Added release notes for the experimental option
May 13, 2020
e511243
Updated release notes text
May 13, 2020
9df000b
Fix .external
May 14, 2020
6030801
Update installer paths to include lib directory
May 18, 2020
1978589
Remove option from doc, since we're adding the _ prefix
May 18, 2020
9f17d18
Rename AndroidAllowDeltaInstall => _AndroidAllowDeltaInstall
May 18, 2020
e3d3fd8
Bump to xamarin/monodroid/master@e795bcef
jonathanpeppers May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:master@5849ea1078827543cad9c966d27e4ab9915e572d
xamarin/monodroid:master@e795bcef375bc77da0bbe995fc9e57560ed5ddc0
mono/mono:2020-02@075c3f06197e3b969f4234d0f56a2e10ee6ee305
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="dotnet internal feed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" protocolVersion="3" />

<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
</packageSources>
<config>
<add key="globalPackagesFolder" value="packages" />
Expand Down
6 changes: 6 additions & 0 deletions build-tools/installers/create-installers.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Copy link
Contributor

@jonpryor jonpryor May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this means we're redistributing installer, this means that we need to update the ThirdPartyNotices.txt that we generate and include in the installers so that the licensing information for installer is available to our users.

Copy link

@BretJohnson BretJohnson May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per @garuma:

they should already have the right entry, the license and copyright is the same as the other tooling (Apache 2.0 copyright Android Open Source Project)
but they may need a specific entry for the entries, their system is different

Copy link

@BretJohnson BretJohnson May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonathanpeppers do we need anything else for this?

Copy link
Member Author

@jonathanpeppers jonathanpeppers May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonpryor is this existing license sufficient?

https://github.com/xamarin/xamarin-android/blob/bea063b939d7d8d5f166c50564665d62ab140417/build-tools/xaprepare/xaprepare/ThirdPartyNotices/Xamarin.Android.Build.Tasks.cs#L7-L16

<_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" />
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}

16 changes: 15 additions & 1 deletion tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,39 +276,51 @@ 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

[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.");
Expand All @@ -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);
Expand Down