starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-03 21:25:34 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #3236] [MERGED] Introduce a Universal package for Windows Terminal #25282

New Issue
Open
opened 2026-01-31 09:08:29 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:08:29 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/3236
Author: @miniksa
Created: 10/17/2019
Status: ✅ Merged
Merged: 11/26/2019
Merged by: @DHowett-MSFT

Base: master ← Head: dev/miniksa/uwp

📝 Commits (10+)

  • dc8f535 Break everything out of App except the base initialization for XAML. AppLogic is the new home.
  • e195c31 codeformat
  • e08a869 deduplicate logics by always using the app one (since it has to be there to support universal launch).
  • deadb0d apparently that was too many cross-boundary calls and we can cache it because winrt objects are magic.
  • 3aa80ed Put UWP project into solution.
  • 576a838 tabs in titlebar needs disabling from uwp context as the non-client is way different. This adds a method to signal that to logic and apply the setting override.
  • 62a59cb Change to use App CRT in preparation for universal.
  • 61c665b Try to make project build again by setting winconpty to static lib so it'll use the CRT inside TerminalConnection (or its other consumers) instead of linking its own.
  • bd3750a Remove test for conpty dll, it's a lib now. Add additional commentary on how CRT linking works for future reference. I'm sure this will come up again.
  • 43ddd8b This fixes the build error.

📊 Changes

26 files changed (+579 additions, -269 deletions)

View changed files

📝 .gitignore (+3 -0)
📝 OpenConsole.sln (+29 -0)
📝 src/cascadia/CascadiaPackage/CascadiaPackage.wapproj (+2 -11)
📝 src/cascadia/CascadiaResources.build.items (+16 -235)
📝 src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj (+1 -1)
📝 src/cascadia/TerminalApp/App.cpp (+1 -0)
📝 src/cascadia/TerminalApp/AppLogic.cpp (+15 -0)
📝 src/cascadia/TerminalApp/AppLogic.h (+3 -0)
📝 src/cascadia/TerminalApp/AppLogic.idl (+2 -0)
📝 src/cascadia/TerminalApp/TerminalApp.vcxproj (+1 -1)
📝 src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj (+2 -2)
📝 src/cascadia/TerminalApp/packages.config (+1 -1)
📝 src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj (+4 -4)
📝 src/cascadia/WindowsTerminal/packages.config (+1 -1)
➕ src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest (+47 -0)
➕ src/cascadia/WindowsTerminalUniversal/Package.appxmanifest (+47 -0)
➕ src/cascadia/WindowsTerminalUniversal/PropertySheet.props (+16 -0)
➕ src/cascadia/WindowsTerminalUniversal/Resources/en-US/Resources.resw (+138 -0)
➕ src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj (+158 -0)
➕ src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters (+30 -0)

...and 6 more files

📄 Description

This PR creates a Universal entrypoint for the Windows Terminal solution in search of our goals to run everywhere, on all Windows platforms.

The Universal entrypoint is relatively straightforward and mostly just invokes the App without any of the other islands and win32 boilerplate required for the centennial route. The Universal project is also its own packaging project all in one and will emit a relevant APPX.

A few things were required to make this work correctly:

  • Vcxitems reuse of resources (and link instructions on all of them for proper pkg layout)
  • Move all Terminal project CRT usages to the app ones (and ensure forwarders are only Nugetted to the Centennial package to not pollute the Universal one)
  • Fix/delay dependencies in TerminalApp that are not available in the core platform (or don't have an appropriate existing platform forwarder... do a loader snaps check)
  • vcpkg needs updating for the Azure connection parser
  • font fallbacks because Consolas isn't necessarily there
  • fallbacks because there are environments without a window handle

Some of those happened in other small PRs in the past week or two. They were relevant to this.

Note, this isn't useful as such yet. You can run the Terminal in this context and even get some of the shells to work. But they don't do a whole lot yet. Scoping which shells appear in the profiles list and only offering those that contextually make sense is future work.

🔄 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/3236 **Author:** [@miniksa](https://github.com/miniksa) **Created:** 10/17/2019 **Status:** ✅ Merged **Merged:** 11/26/2019 **Merged by:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Base:** `master` ← **Head:** `dev/miniksa/uwp` --- ### 📝 Commits (10+) - [`dc8f535`](https://github.com/microsoft/terminal/commit/dc8f535a4d167742f8eb5d5a08c8627d73b51b40) Break everything out of App except the base initialization for XAML. AppLogic is the new home. - [`e195c31`](https://github.com/microsoft/terminal/commit/e195c31cb7f2f8bd2a78d1934c3126e329ee31dc) codeformat - [`e08a869`](https://github.com/microsoft/terminal/commit/e08a8692040074aa9ce873e23ac16415fb63d81d) deduplicate logics by always using the app one (since it has to be there to support universal launch). - [`deadb0d`](https://github.com/microsoft/terminal/commit/deadb0d124197d9109a8828887715ceb93e910a8) apparently that was too many cross-boundary calls and we can cache it because winrt objects are magic. - [`3aa80ed`](https://github.com/microsoft/terminal/commit/3aa80ed4d6981553bdaacabc2745ccea53690975) Put UWP project into solution. - [`576a838`](https://github.com/microsoft/terminal/commit/576a8385d6728dc40119cb467ff1b6be9122ef0f) tabs in titlebar needs disabling from uwp context as the non-client is way different. This adds a method to signal that to logic and apply the setting override. - [`62a59cb`](https://github.com/microsoft/terminal/commit/62a59cbe412b5444acc1a9bcbc2b4ee0cdfb868c) Change to use App CRT in preparation for universal. - [`61c665b`](https://github.com/microsoft/terminal/commit/61c665bb86498a1a63d4b945591e3cc93b0c2869) Try to make project build again by setting winconpty to static lib so it'll use the CRT inside TerminalConnection (or its other consumers) instead of linking its own. - [`bd3750a`](https://github.com/microsoft/terminal/commit/bd3750a957aa23e4df69170e3cc9d34da290d8ef) Remove test for conpty dll, it's a lib now. Add additional commentary on how CRT linking works for future reference. I'm sure this will come up again. - [`43ddd8b`](https://github.com/microsoft/terminal/commit/43ddd8b6f3f732d906eadc2b28a441fab68b2446) This fixes the build error. ### 📊 Changes **26 files changed** (+579 additions, -269 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+3 -0) 📝 `OpenConsole.sln` (+29 -0) 📝 `src/cascadia/CascadiaPackage/CascadiaPackage.wapproj` (+2 -11) 📝 `src/cascadia/CascadiaResources.build.items` (+16 -235) 📝 `src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj` (+1 -1) 📝 `src/cascadia/TerminalApp/App.cpp` (+1 -0) 📝 `src/cascadia/TerminalApp/AppLogic.cpp` (+15 -0) 📝 `src/cascadia/TerminalApp/AppLogic.h` (+3 -0) 📝 `src/cascadia/TerminalApp/AppLogic.idl` (+2 -0) 📝 `src/cascadia/TerminalApp/TerminalApp.vcxproj` (+1 -1) 📝 `src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj` (+2 -2) 📝 `src/cascadia/TerminalApp/packages.config` (+1 -1) 📝 `src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj` (+4 -4) 📝 `src/cascadia/WindowsTerminal/packages.config` (+1 -1) ➕ `src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest` (+47 -0) ➕ `src/cascadia/WindowsTerminalUniversal/Package.appxmanifest` (+47 -0) ➕ `src/cascadia/WindowsTerminalUniversal/PropertySheet.props` (+16 -0) ➕ `src/cascadia/WindowsTerminalUniversal/Resources/en-US/Resources.resw` (+138 -0) ➕ `src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj` (+158 -0) ➕ `src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters` (+30 -0) _...and 6 more files_ </details> ### 📄 Description This PR creates a Universal entrypoint for the Windows Terminal solution in search of our goals to run everywhere, on all Windows platforms. The Universal entrypoint is relatively straightforward and mostly just invokes the App without any of the other islands and win32 boilerplate required for the centennial route. The Universal project is also its own packaging project all in one and will emit a relevant APPX. A few things were required to make this work correctly: - [x] Vcxitems reuse of resources (and link instructions on all of them for proper pkg layout) - [x] Move all Terminal project CRT usages to the app ones (and ensure forwarders are only Nugetted to the Centennial package to not pollute the Universal one) - [x] Fix/delay dependencies in `TerminalApp` that are not available in the core platform (or don't have an appropriate existing platform forwarder... do a loader snaps check) - [x] vcpkg needs updating for the Azure connection parser - [x] font fallbacks because Consolas isn't necessarily there - [x] fallbacks because there are environments without a window handle Some of those happened in other small PRs in the past week or two. They were relevant to this. Note, this isn't *useful* as such yet. You can run the Terminal in this context and even get some of the shells to work. But they don't do a whole lot yet. Scoping which shells appear in the profiles list and only offering those that contextually make sense is future work. --- <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:08:29 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#25282
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?