Skip to content

Remove the wapproj#2171

Merged
marcelwgn merged 1 commit into
microsoft:mainfrom
0x5bfa:simplecsproj
May 25, 2026
Merged

Remove the wapproj#2171
marcelwgn merged 1 commit into
microsoft:mainfrom
0x5bfa:simplecsproj

Conversation

@0x5bfa

@0x5bfa 0x5bfa commented May 17, 2026

Copy link
Copy Markdown
Contributor

Description

Remove the WAP project

Copilot AI review requested due to automatic review settings May 17, 2026 09:14

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.wapproj and the WinUIGallery.DesktopWap.slnx solution.
  • Collapse the per-file <Content> / <None Remove> / <Page Update> lists in WinUIGallery.csproj to a few wildcards (Assets\**\*.png, Samples\SampleCode\**\*.txt, plus the two JSON data files) and drop the now-unused SingleProject conditional branches.
  • Move WinUIGallery.SourceGenerator and WinUIGallery projects into a new /src/ folder in WinUIGallery.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.

Comment thread WinUIGallery/WinUIGallery.csproj Outdated

@marcelwgn marcelwgn left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.

Comment thread WinUIGallery.slnx Outdated
Comment thread WinUIGallery.slnx Outdated
@0x5bfa

0x5bfa commented May 19, 2026

Copy link
Copy Markdown
Contributor Author

Since I have a few questions, I've opened an issue.

@0x5bfa 0x5bfa changed the title Simplify the csproj and remove the wapproj Remove the wapproj May 23, 2026
@marcelwgn

Copy link
Copy Markdown
Contributor

/azp run

@marcelwgn
marcelwgn enabled auto-merge (squash) May 25, 2026 07:47
@marcelwgn
marcelwgn merged commit 8ead974 into microsoft:main May 25, 2026
2 checks passed
@0x5bfa
0x5bfa deleted the simplecsproj branch May 25, 2026 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants