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

[Blazor] Account for Maui multi-rid builds #9348

Merged

Conversation

javiercn
Copy link
Member

Microsoft.Android.Sdk.AssemblyResolution.targets _ResolveAssemblies triggers a nested build to resolve publish files in a Maui specific way and that breaks elements depending on the '$(IntermediateOutputPath)'.

This target detects we are running inside one of such builds and adjust the relevant paths.

@javiercn javiercn requested a review from a team as a code owner August 11, 2022 13:59
@Redth Redth mentioned this pull request Aug 11, 2022
Copy link
Contributor

@TanayParikh TanayParikh left a comment

Choose a reason for hiding this comment

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

:shipit:

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

Overall think this is a fine short-term fix, until there is some multi-RID build support in the .NET SDK.

Comment on lines +125 to +127
<Target Name="_AdjustStaticWebAssetPathBaseWhenBuildingWithRid" BeforeTargets="ResolveStaticWebAssetsConfiguration" Condition="'$(_OuterIntermediateOutputPath)' != ''">
<PropertyGroup>
<_StaticWebAssetsManifestBase>$(_OuterIntermediateOutputPath)</_StaticWebAssetsManifestBase>
Copy link
Member

Choose a reason for hiding this comment

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

It's good this checks if $(_OuterIntermediateOutputPath) is blank. Since it's "private", prefixed with underscore, someone might delete/rename this in the future.

@javiercn javiercn merged commit ef5e813 into main Aug 12, 2022
@javiercn javiercn deleted the javiercn/account-for-outer-build-intermediate-output-path branch August 12, 2022 12:13
@TanayParikh
Copy link
Contributor

We're looking to backport dotnet/sdk#27108 (Intermediate output changes) to 6.0.4xx. Do we need to backport this PR as well, or is it fine as-is given main is on .NET 6? cc/ @jonathanpeppers

@jonathanpeppers
Copy link
Member

/cc @mattleibow I believe you need this change on release/6.0.4xx as well.

@TanayParikh
Copy link
Contributor

/backport to release/6.0.4xx

@TanayParikh
Copy link
Contributor

release/6.0.4xx

I'm not seeing any changes in that branch since June (https://github.com/dotnet/maui/commits/release/6.0.4xx) just wondering if that's expected or perhaps this needs to go to another branch?

@jonathanpeppers
Copy link
Member

jonathanpeppers commented Aug 12, 2022

Yes, I'm not sure how their branches are setup, maybe it's actually net6.0? @mattleibow?

@mattleibow
Copy link
Member

yeah, net6.0

@TanayParikh
Copy link
Contributor

Created #9393.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants