Skip to content

Bump to xamarin/monodroid/main@1f2ce156 #5991

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

Closed
wants to merge 1 commit into from
Closed

Bump to xamarin/monodroid/main@1f2ce156 #5991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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:main@76c04cd15eca7afc269a6d26296e9d2db6f79be2
xamarin/monodroid:main@1f2ce156245ef1bf63ec8014882d283b3224216b
mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7
4 changes: 4 additions & 0 deletions tests/MSBuildDeviceIntegration/Tests/InstantRunTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ public void InstantRunNativeLibrary ([Values ("dx", "d8")] string dexTool)
nativeLib,
},
};
if (Builder.UseDotNet) {
//NOTE: in .NET 6 by default an x86_64 emulator would fall back to x86 if we don't set this.
proj.SetAndroidSupportedAbis (DeviceAbi);
}
proj.SetDefaultTargetDevice ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Install (proj), "install should have succeeded. 0");
Expand Down