Skip to content

Simplify the csproj and remove the wapproj#2171

Open
0x5bfa wants to merge 6 commits into
microsoft:mainfrom
0x5bfa:simplecsproj
Open

Simplify the csproj and remove the wapproj#2171
0x5bfa wants to merge 6 commits into
microsoft:mainfrom
0x5bfa:simplecsproj

Conversation

@0x5bfa
Copy link
Copy Markdown
Contributor

@0x5bfa 0x5bfa commented May 17, 2026

Description

  • Remove the WAP project
  • Remove unnecessary <Content/> definitions

Important

Make sure to enable this option when reviewing

image

Motivation and Context

Simplification of build-and-deploy

How Has This Been Tested?

  • Build the app
  • Check if images/ddsample codes are all present in the app

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Copilot AI review requested due to automatic review settings May 17, 2026 09:14
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

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
Copy link
Copy Markdown
Contributor

@marcelwgn marcelwgn left a comment

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
<Platform Name="x86" />
</Configurations>
<Folder Name="/Solution Items/">
<Folder Name="/global/">
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.

Keep this as Solution Items.

Comment thread WinUIGallery.slnx
<Folder Name="/global/">
<File Path="../Directory.Build.props" />
</Folder>
<Folder Name="/src/">
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.

WinUI Gallery and the source generator should remain top level in my opinion.

@0x5bfa
Copy link
Copy Markdown
Contributor Author

0x5bfa commented May 19, 2026

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

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