Simplify the csproj and remove the wapproj#2171
Conversation
There was a problem hiding this comment.
Pull request overview
Simplifies the build configuration by removing the WAP packaging project (and its associated WinUIGallery.DesktopWap.slnx) and replacing the long hand-maintained list of <Content Include="...">/<None Remove="..."> entries in WinUIGallery.csproj with concise wildcard includes. The main solution WinUIGallery.slnx is reorganized to host the src and global folders that previously lived in the WAP solution.
Changes:
- Delete
WinUIGallery/WinUIGallery.DesktopWap.Package.wapprojand theWinUIGallery.DesktopWap.slnxsolution. - Collapse the per-file
<Content>/<None Remove>/<Page Update>lists inWinUIGallery.csprojto a few wildcards (Assets\**\*.png,Samples\SampleCode\**\*.txt, plus the two JSON data files) and drop the now-unusedSingleProjectconditional branches. - Move
WinUIGallery.SourceGeneratorandWinUIGalleryprojects into a new/src/folder inWinUIGallery.slnx.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj | Removed legacy WAP packaging project. |
| WinUIGallery/WinUIGallery.csproj | Heavy cleanup: drops SingleProject branches and replaces explicit asset/sample lists with wildcard Content includes. |
| WinUIGallery.slnx | Adds /src/ folder containing the main app and source generator projects (previously top-level). |
| WinUIGallery.DesktopWap.slnx | Removed alongside the WAP project. |
marcelwgn
left a comment
There was a problem hiding this comment.
Thanks for doing this but next time please file an issue before doing this, especially if its about highly opinionated things like project (infra)structure.
| <Platform Name="x86" /> | ||
| </Configurations> | ||
| <Folder Name="/Solution Items/"> | ||
| <Folder Name="/global/"> |
There was a problem hiding this comment.
Keep this as Solution Items.
| <Folder Name="/global/"> | ||
| <File Path="../Directory.Build.props" /> | ||
| </Folder> | ||
| <Folder Name="/src/"> |
There was a problem hiding this comment.
WinUI Gallery and the source generator should remain top level in my opinion.
|
Since I have a few questions, I've opened an issue. |
Description
<Content/>definitionsImportant
Make sure to enable this option when reviewing
Motivation and Context
Simplification of build-and-deploy
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes