Skip to content
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.

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

Bump to xamarin/monodroid/main@9b3a37af #6405

Merged
merged 2 commits into from
Oct 22, 2021

Conversation

jonathanpeppers
Copy link
Member

@jonathanpeppers jonathanpeppers commented Oct 19, 2021

Changes: https://github.com/xamarin/monodroid/compare/07a99d79...9b3a37af

  • [tools/msbuild] <GetPrimaryCpuAbi/> should not select 32-bit ABIs

@jonathanpeppers
Copy link
Member Author

Test failed 3 times, need to investigate:

MonoAndroidExportReferencedAppStarts(False,"Assemblies:Dexes",False)

@jonathanpeppers jonathanpeppers marked this pull request as draft October 20, 2021 20:02
Changes: xamarin/monodroid@07a99d7...9b3a37a

* [tools/msbuild] <GetPrimaryCpuAbi/> should not select 32-bit ABIs
This test was failing under .NET 6 because it was doing:

    <RuntimeIdentifiers>android-arm;android-x86</RuntimeIdentifiers>

This situation wouldn't even deploy on an API 31 emulator, so we
should just add `x86_64` in this test.
@jonpryor jonpryor merged commit 1ab4f23 into dotnet:main Oct 22, 2021
jonathanpeppers added a commit that referenced this pull request Oct 22, 2021
Context: #6353

Changes: xamarin/monodroid@07a99d7...9b3a37a

  * xamarin/monodroid@9b3a37af1: [tools/msbuild] <GetPrimaryCpuAbi/> should not select 32-bit ABIs (#1228)

Update `MonoAndroidExportTest.MonoAndroidExportReferencedAppStarts()`
under .NET 6 to add `x86_64`, e.g.
`$(AndroidSupportedAbis)`=`armeabi-v7a;x86;x86_64`.  This is needed
because the API-31 emulator only supports x86_64, not x86.
@jonathanpeppers jonathanpeppers deleted the monodroid-9b3a37af branch October 22, 2021 20:09
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants