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

[workload] Move default item updates to workload sdk #16990

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

pjcollins
Copy link
Member

@pjcollins pjcollins commented Aug 24, 2023

Fixes #16501
Context: 95913ed
Context: 2dcc148

Attempts to improve xaml.cs file nesting by moving xaml.cs item updates
back into the workload SDK. Some of this logic was moved out of
Microsoft.Maui.Sdk.After.targets in commit 95913ed, and subsequently
moved out of the workload and into a NuGet package in commit 2dcc148.

I believe it should be harmless to move these default item properties
and the Compile / None item updates back into the workload SDK to avoid
solution explorer display issues on first run.

Fixes: dotnet#16501
Context: dotnet@95913ed
Context: dotnet@2dcc148

Attempts to improve xaml.cs file nesting by moving xaml.cs item updates
back into the workload SDK.  Some of this logic was moved out of
`Microsoft.Maui.Sdk.After.targets` in commit 95913ed, and subsequently
moved out of the workload and into a NuGet package in commit 2dcc148.

I believe it should be harmless to move these default item properties
and the Compile / None item updates back into the workload SDK to avoid
solution explorer display issues on first run.
@rmarinho
Copy link
Member

How can I test this?

@mattleibow
Copy link
Member

This will require installing the workload but not installing the rest of the nugets. Basically, testing the project puts the cs under the Xaml even when the nugets are unavailable.

@mattleibow
Copy link
Member

mattleibow commented Aug 30, 2023

My test scenario failed. :( This works as a workload install, but installing the nugets via the package manager results in #17040

The globs moved to the workload, but now p7 installs no longer had those globs.

Adding a copy of the globs back into the nugets: #17091

mattleibow added a commit that referenced this pull request Oct 6, 2023
mattleibow added a commit that referenced this pull request Oct 6, 2023
mattleibow added a commit that referenced this pull request Oct 9, 2023
mattleibow added a commit that referenced this pull request Oct 11, 2023
* Revert "Add globs back into the NuGet for older workloads (#17090)"

This reverts commit aa2adcd.

* Revert "[workload] Move default item updates to workload sdk (#16990)"

This reverts commit d85704d.
github-actions bot pushed a commit that referenced this pull request Oct 18, 2023
rmarinho pushed a commit that referenced this pull request Oct 18, 2023
…updates (#18112)

* Revert "Add globs back into the NuGet for older workloads (#17090)"

This reverts commit aa2adcd.

* Revert "[workload] Move default item updates to workload sdk (#16990)"

This reverts commit d85704d.

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
@github-actions github-actions bot locked and limited conversation to collaborators Dec 5, 2023
@samhouts samhouts added the fixed-in-8.0.0-rc.1.9171 Look for this fix in 8.0.0-rc.1.9171 label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
fixed-in-8.0.0-rc.1.9171 Look for this fix in 8.0.0-rc.1.9171
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[regression/8.0.0] .xaml.cs file nesting doesn't work on first build
6 participants