Skip to content

Pack cswinrt.exe under tools\win-x86 in the NuGet package#2344

Merged
manodasanW merged 4 commits intostaging/3.0from
move-cswinrt-exe-to-tools
Mar 18, 2026
Merged

Pack cswinrt.exe under tools\win-x86 in the NuGet package#2344
manodasanW merged 4 commits intostaging/3.0from
move-cswinrt-exe-to-tools

Conversation

@Sergio0694
Copy link
Member

This PR moves cswinrt.exe from the root of the NuGet package to the tools\win-x86 subdirectory, consistent with how other architecture-specific tools (cswinrtinteropgen, cswinrtimplgen, cswinrtprojectiongen) are already organized.

Changes

  • nuget\Microsoft.Windows.CsWinRT.nuspec: Added target="tools\win-x86" to the cswinrt.exe file entry so it is packed under the tools\win-x86 directory instead of the package root.
  • nuget\Microsoft.Windows.CsWinRT.props: Updated the CsWinRTExe MSBuild property to resolve to $(CsWinRTPath)tools\win-x86\cswinrt.exe, matching the new package layout.

All targets and tasks (Microsoft.Windows.CsWinRT.targets, Microsoft.Windows.CsWinRT.CsWinRTGen.targets, RunCsWinRTMergedProjectionGenerator) reference the $(CsWinRTExe) property from the props file, so no other changes are needed.

Sergio0694 and others added 2 commits March 17, 2026 14:32
Update the nuspec to place cswinrt.exe under the tools\win-x86
directory instead of the package root, consistent with how other
architecture-specific tools (cswinrtinteropgen, cswinrtimplgen,
cswinrtprojectiongen) are already organized.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Update the MSBuild property that resolves the cswinrt.exe path to
reflect its new location under tools\win-x86 in the NuGet package.
All targets and tasks reference this property, so no other changes
are needed.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copy link

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

This PR updates the Microsoft.Windows.CsWinRT NuGet package layout so cswinrt.exe is placed under an architecture-specific tools folder (tools\win-x86) and updates the MSBuild property that locates the executable accordingly.

Changes:

  • Pack cswinrt.exe into tools\win-x86 in the .nuspec instead of the package root.
  • Update CsWinRTExe in the .props file to point to $(CsWinRTPath)tools\win-x86\cswinrt.exe.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
nuget/Microsoft.Windows.CsWinRT.props Updates CsWinRTExe to resolve to the new tools\win-x86 location.
nuget/Microsoft.Windows.CsWinRT.nuspec Packs cswinrt.exe under tools\win-x86 to match the desired package structure.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Sergio0694 and others added 2 commits March 17, 2026 15:05
Make CsWinRTExe conditional in the NuGet props so it does not
override the value set by internal builds. Set CsWinRTExe
explicitly in src\Directory.Build.props to point directly at
cswinrt.exe within the local build output directory.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@manodasanW manodasanW merged commit 06b1f46 into staging/3.0 Mar 18, 2026
11 checks passed
@manodasanW manodasanW deleted the move-cswinrt-exe-to-tools branch March 18, 2026 05:18
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