[workload] move SingleProject.targets to Microsoft.Maui.Sdk #3281
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonathanpeppers
force-pushed
the
design-time-builds
branch
from
a264c3c to
238ba40
Compare
Eilon
added
the
area-setup
jonathanpeppers
force-pushed
the
design-time-builds
branch
from
e03f126 to
e1a58dc
Compare
Fixes: https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1428787 Currently, if you mimic a design-time build that would happen inside Visual Studio: > dotnet new maui > dotnet build -f net6.0-android -t:Compile -p:DesignTimeBuild=true -p:BuildingInsideVisualStudio=true -p:SkipCompilerExecution=true --no-restore This fails because of the `--no-restore` flag: C:\Program Files\dotnet\packs\Microsoft.Android.Sdk.Windows\31.0.101-preview.11.74\tools\Xamarin.Android.Common.targets(511,3): error XA1018: Specified AndroidManifest file does not exist: foo\AndroidManifest.xml. I was able to reproduce this failure in our template tests in `dotnet.cake`. In 974cac4, several of .NET MAUI's MSBuild targets were moved to `library-packs`, such as `Microsoft.Maui.Controls.Build.Tasks`. This means that files like `Microsoft.Maui.Controls.SingleProject.targets` won't be evaluated until NuGet restore completes. To solve this problem: * Move `Microsoft.Maui.Controls.SingleProject.targets` and `Microsoft.Maui.Controls.DefaultItems.targets` to the `Microsoft.Maui.Sdk` pack. These `.targets` are no longer affected by `$(MauiVersion)`, and just exist in the workload. * Stop importing these files in `Microsoft.Maui.Controls.targets` in `Microsoft.Maui.Controls.Build.Tasks`. * Import these files in `Microsoft.Maui.Sdk.After.targets`. Overall, I think the loss of `$(MauiVersion)` is fine for the moved `.targets` files, because they are not invoking MSBuild tasks. The design-time build tests now complete successfully.
jonathanpeppers
force-pushed
the
design-time-builds
branch
from
e1a58dc to
09c27f5
Compare
mattleibow
approved these changes
Nov 9, 2021
samhouts
added
the
fixed-in-6.0.101-preview.11.3
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Fixes: https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1428787
Currently, if you mimic a design-time build that would happen inside
Visual Studio:
This fails because of the
--no-restoreflag:I was able to reproduce this failure in our template tests in
dotnet.cake.In 974cac4, several of .NET MAUI's MSBuild targets were moved to
library-packs, such asMicrosoft.Maui.Controls.Build.Tasks. Thismeans that files like
Microsoft.Maui.Controls.SingleProject.targetswon't be evaluated until NuGet restore completes.
To solve this problem:
Move
Microsoft.Maui.Controls.SingleProject.targetsandMicrosoft.Maui.Controls.DefaultItems.targetsto theMicrosoft.Maui.Sdkpack. These.targetsare no longer affected by$(MauiVersion), and just exist in the workload.Stop importing these files in
Microsoft.Maui.Controls.targetsinMicrosoft.Maui.Controls.Build.Tasks.Import these files in
Microsoft.Maui.Sdk.After.targets.Overall, I think the loss of
$(MauiVersion)is fine for the moved.targetsfiles, because they are not invoking MSBuild tasks.The design-time build tests now complete successfully.
PR Checklist
Does this PR touch anything that might affect accessibility?
Nope