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

Fixed publishing multi-architecture Android builds #17145

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

TomEdwardsEnscape
Copy link
Contributor

Avalonia now respects the SkipCompilerExecution property. This fixes multi-architecture Android builds, in which the path to the intermediate assembly, which has already been transformed once, is passed to each inner build and then transformed again.

If compiler execution is being skipped then the presence of compiled output cannot be relied on, so not transforming the assembly paths seems harmless to me. This property check can replace DesignTimeBuild as both are passed at the same time.

The Android SDK passes the assembly path like this:

image

Breaking changes

None.

Obsoletions / Deprecations

None.

Fixed issues

Fixes #17099

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052186-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@MrJul MrJul added area-infrastructure Issues related to CI/tooling infrastructur bug labels Sep 27, 2024
Copy link
Member

@MrJul MrJul left a comment

Choose a reason for hiding this comment

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

I've lost the count of how many days in my life I spent fiddling with MSBuild targets. Still, it seems that I learn about a new important undocumented property every month :)

LGTM, thanks!

@MrJul MrJul enabled auto-merge September 27, 2024 08:21
@MrJul MrJul disabled auto-merge September 27, 2024 11:46
@MrJul
Copy link
Member

MrJul commented Sep 27, 2024

Integration test failures are unrelated.
Your branch is protected, can you please merge/rebase from master to re-trigger the CI?

Check it instead of DesignTimeBuild
@TomEdwardsEnscape TomEdwardsEnscape force-pushed the fixes/SkipCompilerExecution branch from 3332f0e to d843ae2 Compare September 27, 2024 13:13
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052198-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@MrJul MrJul added this pull request to the merge queue Sep 27, 2024
@noorez
Copy link

noorez commented Sep 27, 2024

pushed update to my test project to show that it works now (it also builds correctly on the actual project)

Merged via the queue into AvaloniaUI:master with commit dccaea6 Sep 27, 2024
10 checks passed
@TomEdwardsEnscape TomEdwardsEnscape deleted the fixes/SkipCompilerExecution branch September 27, 2024 18:09
@kekekeks
Copy link
Member

This has broken running ControlCatalog.Android on emulator from Rider, considering to revert

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Issues related to CI/tooling infrastructur bug
Projects
None yet
5 participants