[PR #12778] [MERGED] Convert WIL submodule to global NuGet. Update to latest. Replace winrt::resume_foreground with wil::resume_foreground #29223

Open
opened 2026-01-31 09:33:35 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/12778
Author: @dmachaj
Created: 3/28/2022
Status: ✅ Merged
Merged: 3/28/2022
Merged by: @undefined

Base: main ← Head: user/dmachaj/wil-nuget-andawait


📝 Commits (2)

  • 541f4c6 Convert WIL submodule to global NuGet. Replace winrt::resume_foreground with wil::resume_foreground
  • a1eaa67 I spell gud

📊 Changes

47 files changed (+122 additions, -45 deletions)

View changed files

📝 dep/nuget/packages.config (+1 -0)
➖ dep/wil (+0 -1)
📝 doc/building.md (+10 -1)
📝 src/buffer/out/lib/bufferout.vcxproj (+2 -0)
📝 src/cascadia/ElevateShim/elevate-shim.vcxproj (+2 -0)
📝 src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj (+2 -0)
📝 src/cascadia/TerminalApp/Pane.cpp (+2 -2)
📝 src/cascadia/TerminalApp/SettingsTab.cpp (+1 -1)
📝 src/cascadia/TerminalApp/TabBase.cpp (+1 -1)
📝 src/cascadia/TerminalApp/TabManagement.cpp (+1 -1)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+10 -10)
📝 src/cascadia/TerminalApp/TerminalTab.cpp (+10 -10)
📝 src/cascadia/TerminalApp/pch.h (+1 -0)
📝 src/cascadia/TerminalControl/TermControl.cpp (+8 -8)
📝 src/cascadia/TerminalControl/pch.h (+1 -0)
📝 src/cascadia/TerminalSettingsModel/pch.h (+1 -0)
📝 src/cascadia/WindowsTerminal/AppHost.cpp (+3 -3)
📝 src/cascadia/WindowsTerminal/IslandWindow.cpp (+1 -1)
📝 src/cascadia/WindowsTerminal/pch.h (+1 -0)
📝 src/cascadia/wt/wt.vcxproj (+2 -0)

...and 27 more files

📄 Description

Summary of the Pull Request

This builds on top of #12707. As I understand it the primary motivation for using a git submodule instead of NuGet is just that it is too annoying to have to manage dozens of packages.config files and their corresponding import statements. Now that there is a single global nuget definition that is a nonissue and we can switch over.

This also updates to the latest version of WIL.

Now that the latest version of WIL is available it uses it to replace winrt::resume_foreground with wil::resume_foreground. See https://github.com/microsoft/wil/commit/492c01bb535daadf719d4445d6107aadf1e60812 for a detailed explanation of the problems with winrt::resume_foreground and how WIL addresses them.

References

PR Checklist

  • Closes #12776, Closes Make FontFace ComboBox editable (#12777)
  • CLA signed. If not, go over here and sign the CLA
  • Tests added/passed
  • Documentation updated. If checked, please file a pull request on our docs repo and link it here: #xxx
  • Schema updated.
  • I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Ran git clean -fdx to wipe my clone to be completely clean. Opened the solution in Visual Studio 2022 and build it. Used razzle.cmd, b, and runut.cmd to run the tests.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/12778 **Author:** [@dmachaj](https://github.com/dmachaj) **Created:** 3/28/2022 **Status:** ✅ Merged **Merged:** 3/28/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `user/dmachaj/wil-nuget-andawait` --- ### 📝 Commits (2) - [`541f4c6`](https://github.com/microsoft/terminal/commit/541f4c6829aa5ebc78880fa1424e59bfea777349) Convert WIL submodule to global NuGet. Replace winrt::resume_foreground with wil::resume_foreground - [`a1eaa67`](https://github.com/microsoft/terminal/commit/a1eaa67ec6abd09ddc815715c86bfd489dff70d5) I spell gud ### 📊 Changes **47 files changed** (+122 additions, -45 deletions) <details> <summary>View changed files</summary> 📝 `dep/nuget/packages.config` (+1 -0) ➖ `dep/wil` (+0 -1) 📝 `doc/building.md` (+10 -1) 📝 `src/buffer/out/lib/bufferout.vcxproj` (+2 -0) 📝 `src/cascadia/ElevateShim/elevate-shim.vcxproj` (+2 -0) 📝 `src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj` (+2 -0) 📝 `src/cascadia/TerminalApp/Pane.cpp` (+2 -2) 📝 `src/cascadia/TerminalApp/SettingsTab.cpp` (+1 -1) 📝 `src/cascadia/TerminalApp/TabBase.cpp` (+1 -1) 📝 `src/cascadia/TerminalApp/TabManagement.cpp` (+1 -1) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+10 -10) 📝 `src/cascadia/TerminalApp/TerminalTab.cpp` (+10 -10) 📝 `src/cascadia/TerminalApp/pch.h` (+1 -0) 📝 `src/cascadia/TerminalControl/TermControl.cpp` (+8 -8) 📝 `src/cascadia/TerminalControl/pch.h` (+1 -0) 📝 `src/cascadia/TerminalSettingsModel/pch.h` (+1 -0) 📝 `src/cascadia/WindowsTerminal/AppHost.cpp` (+3 -3) 📝 `src/cascadia/WindowsTerminal/IslandWindow.cpp` (+1 -1) 📝 `src/cascadia/WindowsTerminal/pch.h` (+1 -0) 📝 `src/cascadia/wt/wt.vcxproj` (+2 -0) _...and 27 more files_ </details> ### 📄 Description <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This builds on top of #12707. As I understand it the primary motivation for using a git submodule instead of NuGet is just that it is too annoying to have to manage dozens of packages.config files and their corresponding import statements. Now that there is a single global nuget definition that is a nonissue and we can switch over. This also updates to the latest version of WIL. Now that the latest version of WIL is available it uses it to replace `winrt::resume_foreground` with `wil::resume_foreground`. See [https://github.com/microsoft/wil/commit/492c01bb535daadf719d4445d6107aadf1e60812](https://github.com/microsoft/wil/commit/492c01bb535daadf719d4445d6107aadf1e60812) for a detailed explanation of the problems with `winrt::resume_foreground` and how WIL addresses them. <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [ ] Closes #12776, Closes #12777 * [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Ran `git clean -fdx` to wipe my clone to be completely clean. Opened the solution in Visual Studio 2022 and build it. Used `razzle.cmd`, `b`, and `runut.cmd` to run the tests. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:33:35 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#29223