Skip to content

[CoreCLR] Track libxamarin-app.so as a _BuildApkFastDev input #12205

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
jonathanpeppers merged 8 commits into from
Jul 23, 2026
+45 −1
Merged

[CoreCLR] Track libxamarin-app.so as a _BuildApkFastDev input #12205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a595dcb
[XABT] Track libxamarin-app.so as a _BuildApkFastDev input
kotlarmilos Jul 22, 2026
f38aa8a
[Tests] Add CoreCLR Fast Deploy incremental coverage
davidnguyen-tech Jul 22, 2026
9ea04c0
[Tests] Exercise Fast Deploy typemap updates on device
jonathanpeppers Jul 22, 2026
4a6b833
[Tests] Resolve FastDev coverage with main
jonathanpeppers Jul 22, 2026
820b2c4
[Tests] Avoid FastDev merge overlap
jonathanpeppers Jul 22, 2026
ec2e238
[Tests] Keep FastDev PR diff focused
jonathanpeppers Jul 22, 2026
744199a
[Tests] Expect APK reinstall after CoreCLR source edit
jonathanpeppers Jul 22, 2026
c2a6937
Merge branch 'main' into dev/kotlarmilos/fastdev-typemap-input
jonathanpeppers Jul 22, 2026
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
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,6 +2352,7 @@ because xbuild doesn't support framework reference assemblies.
;@(_ShrunkFrameworkAssemblies)
;@(_AndroidNativeLibraryForFastDev)
;@(_DexFileForFastDevInput)
;@(_ApplicationSharedLibrary)

@jonathanpeppers jonathanpeppers Jul 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So, my copilot actually has the exact same fix from overnight, but I like the test it wrote better than the one here.

I'll add some changes on top of this, thanks!

;$(_AndroidBuildPropertiesCache)
;$(_AdbPropertiesCache)
;$(_PackagedResources)
Expand Down
45 changes: 44 additions & 1 deletion tests/MSBuildDeviceIntegration/Tests/FastDevTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,49 @@ public void FastDevSimpleBuild ()
b.Dispose ();
}

[Test]
public void FastDeployUpdatesTypeMapAfterAssemblyEdit ()
{
var proj = new XamarinAndroidApplicationProject {
PackageName = "com.xamarin.fastdeploy_typemap",
};
proj.SetDefaultTargetDevice ();
proj.SetProperty ("_AndroidFastDevStrategy", "FastDeploy");
proj.MainActivity = proj.DefaultMainActivity
.Replace ("//${AFTER_ONCREATE}", "StartActivity (new Android.Content.Intent (this, typeof (SecondActivity)));")
.Replace ("//${AFTER_MAINACTIVITY}", """
[Activity (Label = "Fast Deploy Result")]
public sealed class SecondActivity : Activity
{
}
""");

using var builder = CreateApkBuilder ();
Assert.IsTrue (builder.Install (proj), "Initial install should have succeeded.");
AssertSecondActivityStarts ("initial-launch.log");

proj.MainActivity += "// Incremental C# edit.";
proj.Touch ("MainActivity.cs");
Assert.IsTrue (builder.Install (proj, doNotCleanupOnUpdate: true, saveProject: false), "Incremental install should have succeeded.");
AssertSecondActivityStarts ("incremental-launch.log");
Assert.IsTrue (builder.Uninstall (proj), "Uninstall should have succeeded.");

void AssertSecondActivityStarts (string logFileName)
{
ClearAdbLogcat ();
AdbStartActivity ($"{proj.PackageName}/{proj.JavaPackageName}.MainActivity");
Assert.IsTrue (
WaitForActivityToStart (
proj.PackageName,
"SecondActivity",
Path.Combine (Root, builder.ProjectDirectory, logFileName),
ActivityStartTimeoutInSeconds
),
"SecondActivity should have started."
);
}
}

[Test]
public void TargetsSkipped ([Values(false, true)] bool useManagedResourceGenerator)
{
Expand Down Expand Up @@ -140,7 +183,7 @@ public void SkipFastDevAlreadyInstalledFile ()
proj.Touch ("MainActivity.cs");
// make sure that the fastdev log tells that the relevant dll is updated but NOT for others.
Assert.IsTrue (b.Install (proj, doNotCleanupOnUpdate: true, saveProject: false), "install should have succeeded.");
Assert.IsFalse (b.Output.IsApkInstalled, "app apk was installed");
Assert.IsTrue (b.Output.IsApkInstalled, "app apk was not installed");
Assert.IsTrue (b.LastBuildOutput.Any (l => l.Contains ("UnnamedProject.dll") && l.Contains ("NotifySync CopyFile")), "app dll not uploaded");

var assemblies = new[] {
Expand Down
Loading