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

[PR #4536] [MERGED] deps: upgrade CppWinRT to 2.0.200316.3, gsl to v2.1.0 #25816

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/4536
Author: @DHowett-MSFT
Created: 2/11/2020
Status: ✅ Merged
Merged: 3/23/2020
Merged by: @undefined

Base: master ← Head: dev/duhowett/c++++winrt

📝 Commits (7)

  • 799c46f deps: upgrade CppWinRT to 2.0.200203.5
  • 61f551d Fix build error from cppwinrt update
  • 2bef4e4 TerminalAppLib no longer needs to fake its xaml reference
  • 71162e8 Merge remote-tracking branch 'origin/master' into dev/duhowett/c++++winrt
  • 79c7a41 Microsoft.Windows.CppWinRT -> 2.0.200316.3
  • b94572b Add deps to WindowsTerminalUniversal
  • 6214856 gsl -> v2.1.0

📊 Changes

18 files changed (+48 additions, -63 deletions)

View changed files

📝 dep/gsl (+1 -1)
📝 src/cascadia/TerminalApp/TerminalApp.vcxproj (+12 -5)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+2 -1)
📝 src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj (+5 -33)
📝 src/cascadia/TerminalApp/packages.config (+1 -1)
📝 src/cascadia/TerminalAzBridge/packages.config (+1 -1)
📝 src/cascadia/TerminalConnection/packages.config (+1 -1)
📝 src/cascadia/TerminalControl/packages.config (+1 -1)
📝 src/cascadia/TerminalCore/packages.config (+1 -1)
📝 src/cascadia/TerminalSettings/packages.config (+1 -1)
📝 src/cascadia/WinRTUtils/packages.config (+1 -1)
📝 src/cascadia/WindowsTerminal/packages.config (+1 -1)
📝 src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj (+10 -5)
📝 src/cascadia/WindowsTerminalUniversal/packages.config (+1 -1)
📝 src/cppwinrt.build.post.props (+3 -3)
📝 src/cppwinrt.build.pre.props (+1 -1)
📝 src/tools/U8U16Test/U8U16Test.vcxproj (+4 -4)
📝 src/tools/U8U16Test/packages.config (+1 -1)

📄 Description

This commit upgrades C++/WinRT to 2.0.200316.3 and fixes a couple of the
transitive dependency issues we had in the process.

Because the latest version has better dependency resolution, we're able
to properly depend on Microsoft.UI.Xaml and the Toolkit in TerminalApp
and TerminalAppLib so we no longer need to manually include .dll and
.pri files.

Because of nebulous other changes in dependency resolution,
WindowsTerminalUniversal isn't picking up transitive .winmd dependencies
from TerminalApp, and needs to include them as ProjectReferences
directly. This was already happening transitively, so now it's explicit.

I've also taken the time to upgrade GSL to v2.1.0, the last release
before they removed span::at and blew up our world.

🔄 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/4536 **Author:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Created:** 2/11/2020 **Status:** ✅ Merged **Merged:** 3/23/2020 **Merged by:** [@undefined](undefined) **Base:** `master` ← **Head:** `dev/duhowett/c++++winrt` --- ### 📝 Commits (7) - [`799c46f`](https://github.com/microsoft/terminal/commit/799c46f2e3993587635c01d58b10744fefa52254) deps: upgrade CppWinRT to 2.0.200203.5 - [`61f551d`](https://github.com/microsoft/terminal/commit/61f551d18b74bd5a866e8e96ea1a59d917736c71) Fix build error from cppwinrt update - [`2bef4e4`](https://github.com/microsoft/terminal/commit/2bef4e484223de3eb89638d59a3c63aafbec50a9) TerminalAppLib no longer needs to fake its xaml reference - [`71162e8`](https://github.com/microsoft/terminal/commit/71162e86ea1be8b86f0d8660ae44759b8790be63) Merge remote-tracking branch 'origin/master' into dev/duhowett/c++++winrt - [`79c7a41`](https://github.com/microsoft/terminal/commit/79c7a41739f0da7c43830dcb61ab5c69610339c3) Microsoft.Windows.CppWinRT -> 2.0.200316.3 - [`b94572b`](https://github.com/microsoft/terminal/commit/b94572bcb32ba93d7f26a2c792c5cb993f7a4427) Add deps to WindowsTerminalUniversal - [`6214856`](https://github.com/microsoft/terminal/commit/621485631eb152cbd1be471fdff44ff4fc43ac5f) gsl -> v2.1.0 ### 📊 Changes **18 files changed** (+48 additions, -63 deletions) <details> <summary>View changed files</summary> 📝 `dep/gsl` (+1 -1) 📝 `src/cascadia/TerminalApp/TerminalApp.vcxproj` (+12 -5) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+2 -1) 📝 `src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj` (+5 -33) 📝 `src/cascadia/TerminalApp/packages.config` (+1 -1) 📝 `src/cascadia/TerminalAzBridge/packages.config` (+1 -1) 📝 `src/cascadia/TerminalConnection/packages.config` (+1 -1) 📝 `src/cascadia/TerminalControl/packages.config` (+1 -1) 📝 `src/cascadia/TerminalCore/packages.config` (+1 -1) 📝 `src/cascadia/TerminalSettings/packages.config` (+1 -1) 📝 `src/cascadia/WinRTUtils/packages.config` (+1 -1) 📝 `src/cascadia/WindowsTerminal/packages.config` (+1 -1) 📝 `src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj` (+10 -5) 📝 `src/cascadia/WindowsTerminalUniversal/packages.config` (+1 -1) 📝 `src/cppwinrt.build.post.props` (+3 -3) 📝 `src/cppwinrt.build.pre.props` (+1 -1) 📝 `src/tools/U8U16Test/U8U16Test.vcxproj` (+4 -4) 📝 `src/tools/U8U16Test/packages.config` (+1 -1) </details> ### 📄 Description This commit upgrades C++/WinRT to 2.0.200316.3 and fixes a couple of the transitive dependency issues we had in the process. Because the latest version has better dependency resolution, we're able to properly depend on Microsoft.UI.Xaml and the Toolkit in TerminalApp and TerminalAppLib so we no longer need to manually include .dll and .pri files. Because of nebulous _other_ changes in dependency resolution, WindowsTerminalUniversal isn't picking up transitive .winmd dependencies from TerminalApp, and needs to include them as ProjectReferences directly. This was already happening transitively, so now it's explicit. I've also taken the time to upgrade GSL to v2.1.0, the last release before they removed span::at and blew up our world. --- <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:11:58 +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#25816
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?