Use the actual process image instead of module filename to dedup session (#19415)

Apparently, `GetModuleFileNameW` returns exactly the path (or prefix, in
case of a DLL) passed to `CreateProcess` casing and all. Since we were
using it to generate the uniquing hash for Portable and Unpackaged
instances, this meant that `C:\Terminal\wt` and `C:\TeRmInAl\wt` were
considered different instances. Whoops.

Using `QueryFullProcessImageNameW` instead results in canonicalization.
Maybe the kernel does it. I don't know. What I do know is that it works
more correctly.

(`Query...` goes through the kernel, while `GetModule...` goes through
the loader. Interesting!)

Closes #19253

(cherry picked from commit 9d7ea77cc8)
Service-Card-Id: PVTI_lADOAF3p4s4BBcTlzgfkTuo
Service-Version: 1.24

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 
 contact_links:
   - name: Microsoft Security Response Center 🔐

.github/actions/spelling/allow/allow.txt

@@ -67,14 +67,11 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent
 toolset
-Uids
 UEFI
-UIDs
 uiatextrange
 und
 vsdevcmd

.github/actions/spelling/allow/apis.txt

@@ -178,7 +178,6 @@ ubrk
 UChar
 UFIELD
 ULARGE
-UNCEx
 UOI
 UPDATEINIFILE
 urlmon

.github/actions/spelling/expect/74d92373e136649071b3c04dc8773f18deaf5e04.txt

@@ -1 +0,0 @@
-ftcs

.github/actions/spelling/expect/expect.txt

@@ -141,7 +141,6 @@ BValue
 Cacafire
 CALLCONV
 CANDRABINDU
-CANTCALLOUT
 capslock
 CARETBLINKINGENABLED
 CARRIAGERETURN
@@ -256,6 +255,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -495,7 +495,6 @@ DSBUFFERDESC
 DSBVOLUME
 dsm
 dsound
-DSRCPR
 DSSCL
 DSwap
 DTo
@@ -541,6 +540,7 @@ EPres
 EQU
 ERASEBKGND
 ERRORONEXIT
+ESFCIB
 esrp
 ESV
 ETW
@@ -572,7 +572,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -604,6 +603,7 @@ FONTSTRING
 FONTTYPE
 FONTWIDTH
 FONTWINDOW
+foob
 FORCEOFFFEEDBACK
 FORCEONFEEDBACK
 FRAMECHANGED
@@ -620,8 +620,10 @@ FUNCTIONCALL
 fuzzmain
 fuzzmap
 fuzzwrapper
+fuzzyfinder
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx
@@ -805,10 +807,8 @@ IMPEXP
 inbox
 inclusivity
 INCONTEXT
-INDEXID
 INFOEX
 inheritcursor
-ININPUTSYNCCALL
 INITCOMMONCONTROLSEX
 INITDIALOG
 INITGUID
@@ -865,7 +865,6 @@ KILLACTIVE
 KILLFOCUS
 kinda
 KIYEOK
-KKP
 KLF
 KLMNO
 KOK
@@ -885,7 +884,6 @@ LBUTTONDOWN
 LBUTTONUP
 lcb
 lci
-LCMAP
 LCONTROL
 LCTRL
 lcx
@@ -910,7 +908,6 @@ LNM
 LOADONCALL
 LOBYTE
 localappdata
-LOCATIONCHANGE
 locsrc
 Loewen
 LOGBRUSH
@@ -962,6 +959,7 @@ lsb
 lsconfig
 lstatus
 lstrcmp
+lstrcmpi
 LTEXT
 lto
 ltsc
@@ -1020,7 +1018,6 @@ minkernel
 MINMAXINFO
 minwin
 minwindef
-misprediction
 MMBB
 mmcc
 MMCPL
@@ -1036,7 +1033,6 @@ MOUSEACTIVATE
 MOUSEFIRST
 MOUSEHWHEEL
 MOVESTART
-msaa
 msb
 msbuildcache
 msctls
@@ -1065,7 +1061,6 @@ Mypair
 Myval
 NAMELENGTH
 namestream
-NCACTIVATE
 NCCALCSIZE
 NCCREATE
 NCLBUTTONDOWN
@@ -1096,8 +1091,6 @@ NEXTLINE
 nfe
 NLSMODE
 NOACTIVATE
-NOACTIVATEKEYBOARDLAYOUT
-NOACTIVATETIP
 NOAPPLYNOW
 NOCLIP
 NOCOMM
@@ -1129,6 +1122,7 @@ NOREPOSITION
 NORMALDISPLAY
 NOSCRATCH
 NOSEARCH
+noselect
 NOSELECTION
 NOSENDCHANGING
 NOSIZE
@@ -1146,7 +1140,6 @@ NOYIELD
 NOZORDER
 NPFS
 nrcs
-NRNW
 NSTATUS
 ntapi
 ntdef
@@ -1187,6 +1180,7 @@ onecoreuuid
 ONECOREWINDOWS
 onehalf
 oneseq
+oob
 openbash
 opencode
 opencon
@@ -1511,6 +1505,7 @@ scrolllock
 scrolloffset
 SCROLLSCALE
 SCROLLSCREENBUFFER
+scursor
 sddl
 SDKDDK
 segfault
@@ -1590,7 +1585,6 @@ SLGP
 SLIST
 slmult
 sln
-slnx
 slpit
 SManifest
 SMARTQUOTE
@@ -1709,11 +1703,9 @@ TEXTMETRIC
 TEXTMETRICW
 textmode
 texttests
-TFCAT
 THUMBPOSITION
 THUMBTRACK
 tilunittests
-TIPCAP
 titlebars
 TITLEISLINKNAME
 TLDP
@@ -1765,15 +1757,11 @@ UIACCESS
 uiacore
 uiautomationcore
 uielem
-UIELEMENTENABLED
-UIELEMENTENABLEDONLY
 UINTs
 uld
 uldash
 uldb
-ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY
@@ -1984,8 +1972,8 @@ WRITECONSOLEINPUT
 WRITECONSOLEOUTPUT
 WRITECONSOLEOUTPUTSTRING
 wrkstr
-wrl
 WRL
+wrl
 wrp
 WRunoff
 WSLENV

README.md

@@ -169,10 +169,10 @@ The Portable ZIP distribution is a portable application. It will not automatical
 
 | Distribution  | Architecture    | Link                                                 |
 |---------------|:---------------:|------------------------------------------------------|
-| App Installer | x64, arm64, x86 | [Download](https://aka.ms/terminal-canary-installer) |
-| Portable ZIP  | x64             | [Download](https://aka.ms/terminal-canary-zip-x64)   |
-| Portable ZIP  | ARM64           | [Download](https://aka.ms/terminal-canary-zip-arm64) |
-| Portable ZIP  | x86             | [Download](https://aka.ms/terminal-canary-zip-x86)   |
+| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
+| Portable ZIP  | x64             | [download](https://aka.ms/terminal-canary-zip-x64)   |
+| Portable ZIP  | ARM64           | [download](https://aka.ms/terminal-canary-zip-arm64) |
+| Portable ZIP  | x86             | [download](https://aka.ms/terminal-canary-zip-x86)   |
 
 _Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._
 
@@ -375,7 +375,7 @@ winget configure .config\configuration.winget
 
 ## Building the Code
 
-OpenConsole.slnx may be built from within Visual Studio or from the command-line
+OpenConsole.sln may be built from within Visual Studio or from the command-line
 using a set of convenience scripts & tools in the **/tools** directory:
 
 ### Building in PowerShell

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,11 +56,11 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
-– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
-– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
+- Wir haben der Benutzeroberfläche durchschnittliche Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs "Neue Registerkarte"!
+- Wir haben die Fensterverwaltung zurückgesetzt, um die Zuverlässigkeit zu verbessern; Melden Sie alle Fehler, die mit dem alias "wt.exe" auftreten.
+- Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf programme verweisen, die deinstalliert wurden.
 
-Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
+Weitere Details finden Sie auf unserer GitHub-Releasesseite.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -56,11 +56,11 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
-- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
-- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
+- Hemos agregado decenas de configuraciones a la interfaz de usuario que solo existían una vez en el archivo JSON, incluida una página nueva para personalizar el diseño del menú Nueva pestaña.
+- Tenemos administración de ventanas rearchitecdas para mejorar la confiabilidad; envíe los errores que encuentre con el alias de wt.exe.
+- Ahora, los perfiles muestran un icono si se han ocultado o hacen referencia a programas que se han desinstalado.
 
-Consulta la página de versiones de GitHub para más información.
+Consulte nuestra página de versiones de GitHub para obtener más detalles.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -54,13 +54,13 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    __VERSION_NUMBER__ de version
 
-- Une toute nouvelle page Extensions qui montre ce qui a été installé dans votre terminal
-- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
-- Nouvelles fonctionnalités VT telles que le rendu synchronisé, de nouveaux schémas de couleurs, la configuration pour des actions rapides de la souris comme le zoom, et plus encore
+- Nous avons ajouté des milliers de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet !
+- Nous avons réarchitialiser la gestion des fenêtres pour améliorer la fiabilité ; entrez les bogues rencontrés avec l’alias wt.exe
+- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.
 
-Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
+Pour plus d’informations, consultez notre page des mises en production GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,13 +54,13 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__
 
-- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
-- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
-- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
+- Sono state aggiunte decine di impostazioni all'interfaccia utente che una volta esisteva solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
+- È stata riattivata la gestione delle finestre per migliorare l'affidabilità; inserire eventuali bug riscontrati con l'alias wt.exe
+- I profili ora mostrano un'icona se sono stati nascosti o fanno riferimento ai programmi che sono stati disinstallati.
 
-Per altri dettagli, vedi la pagina delle release di GitHub.
+Per altri dettagli, vedere la pagina delle versioni di GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- ターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
-- コマンド パレットがネイティブ言語と英語で表示されるようになりました
-- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
+- [新しいタブ] メニューのレイアウトをカスタマイズするための新しいページを含む、一度だけ JSON ファイルに存在した UI に多数の設定を追加しました。
+- 信頼性を向上させるためにウィンドウ管理を再選択しました。wt.exe エイリアスで発生したバグを報告してください
+- プロファイルが非表示になっているか、アンインストールされたプログラムを参照している場合にアイコンが表示されるようになりました。
 
-詳細については、GitHub リリース ページをご覧ください。
+詳細については、GitHub リリース ページを参照してください。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
-- 명령 팔레트가 이제 영어뿐만 아니라 모국어로도 표시
-- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능이 추가
+- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에 한 번만 존재했던 UI에 수천 개의 설정을 추가했습니다.
+- 안정성을 개선하기 위해 창 관리를 다시 보관했습니다. wt.exe 별칭에 발생한 버그를 제출하세요.
+- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
 
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -54,13 +54,13 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versão __VERSION_NUMBER__
 
-– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
-– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
-– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
+- Adicionamos várias configurações à interface do usuário que só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do menu Nova Guia!
+- Temos o gerenciamento de janelas rearmado para melhorar a confiabilidade; registre todos os bugs encontrados com o wt.exe alias
+- Os perfis agora mostram um ícone se eles foram ocultos ou se referem a programas que foram desinstalados.
 
-Confira nossa página de lançamentos no GitHub para obter mais detalhes.
+Consulte nossa página de versões do GitHub para obter detalhes adicionais.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
-– Палитра команд теперь доступна на вашем языке, а также на английском
-– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
+- Мы добавили в пользовательский интерфейс десятки параметров, которые существовали только в JSON-файле, включая новую страницу для настройки макета меню "Новая вкладка".
+- Для повышения надежности мы переупоряхлили управление окнами; создайте все ошибки, обнаруженные с wt.exe псевдонимом
+- Профили теперь показывают значок, если они скрыты или ссылаются на программы, которые были удалены.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="en-us" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Термінал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Консоль</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Це попередня збірка терміналу Windows, яка містить найновіші функції в міру їх розробки. Термінал Windows - це сучасний, швидкий, ефективний, потужний та продуктивний термінальний застосунок для користувачів інструментів командного рядка та оболонок, таких як командний рядок, PowerShell та WSL. Його основні функції включають кілька вкладок, панелей, підтримку символів Unicode та UTF-8, механізм візуалізації тексту з прискоренням GPU, а також користувацькі теми, стилі та конфігурації.
-
-Це проєкт з відкритим кодом, і ми вітаємо участь спільноти. Щоб взяти участь, будь ласка, відвідайте https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
-
-- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому терміналі
-- Палітра команд тепер відображається вашою рідною мовою, а також англійською
-- Нові функції віртуального автомата, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
-
-Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Новий термінал Windows</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Наявність вкладок</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Повна підтримка Юнікоду</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->Рендеринг тексту з прискоренням GPU</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Широкі можливості кастомізації</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Розділення панелей</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Клавіатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Права (c) Корпорація Майкрософт</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -54,13 +54,13 @@
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__
 
-- 一个全新的“扩展”页，显示已安装到终端的内容
-- 命令面板现在以你的母语和英语显示
-- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
+- 我们向用户界面添加了许多设置，这些设置仅存在于 JSON 文件中，包括用于自定义“新建标签页”菜单布局的新页面！
+- 我们已重新检测窗口管理以提高可靠性;请将遇到的任何 bug 归档为 wt.exe 别名
+- 如果配置文件已隐藏或引用已卸载的程序，则它们现在将显示一个图标。
 
-有关其他详细信息，请参阅我们的 GitHub 发布页面。
+有关其他详细信息，请参阅 GitHub 发布页面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -54,13 +54,13 @@
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__
 
-- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
-- 命令選擇區現在以您的母語和英文顯示
-- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
+- 我們已新增數十個只存在於 JSON 檔案中的設定到 UI，包括自定義 [新索引標籤] 功能表版面配置的新頁面！
+- 我們已重新設定視窗管理，以改善可靠性;請提出您在 wt.exe 別名遇到的任何錯誤
+- 設定文件現在會在隱藏或參照已卸載的程式時顯示圖示。
 
-如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
+如需詳細數據，請參閱我們的 GitHub 版本頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,9 +56,12 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Wir haben der Benutzeroberfläche Dutzende von Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs „Neue Registerkarte“!
-– Wir haben die Fensterverwaltung umgestaltet, um die Zuverlässigkeit zu verbessern. Melden Sie alle Fehler, die beim alias „wt.exe“ auftreten
-– Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf Programme verweisen, die deinstalliert wurden.
+– Wir haben umgeschrieben, wie Konsolenanwendungen im Terminal gehostet werden! Melden Sie alle auftretenden Fehler.
+– Terminal unterstützt jetzt Sixels!
+– Sie können jetzt einen angedockten Bereich öffnen, der Ausschnitte von Befehlen enthält, die Sie gespeichert haben, um sie später zu verwenden.
+– Für Benutzer der Eingabeaufforderung der neuesten Version von Windows 11 wird möglicherweise ein QuickInfo-Symbol angezeigt, das installierbare Software von WinGet vorschlägt.
+– Ausgewählter Text wird jetzt viel sichtbarer (und anpassbarer!).
+- Eine Reihe von Zuverlässigkeitsfehlern, Benutzerfreundlichkeitsproblemen und Ärgernissen wurden behoben.
 
 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,9 +56,12 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Hemos añadido decenas de configuraciones a la interfaz de usuario que antes solo existían en el archivo JSON, incluida una nueva página para personalizar el diseño del menú Nueva pestaña.
-- Hemos reestructurado la gestión de ventanas para mejorar la fiabilidad; informe de cualquier error que encuentre con el alias wt.exe
-- Ahora, los perfiles muestran un icono si han sido ocultados o hacen referencia a programas que han sido desinstalados.
+- Hemos reescrito cómo se hospedan las aplicaciones de consola en Terminal. Informe de los errores que encuentre.
+- Terminal ahora admite síxeles.
+- Ahora puede abrir un panel acoplado que contenga fragmentos de comandos que haya guardado para usarlos más adelante
+- Los usuarios del símbolo del sistema de la versión más reciente de Windows 11 pueden ver un icono de "sugerencia rápida" que sugiere software instalable de WinGet
+- El texto seleccionado ahora será mucho más visible (y personalizable)
+- Se han corregido varios errores de fiabilidad, problemas de comodidad y molestias.
 
 Consulte la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,9 +56,12 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Nous avons ajouté des dizaines de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet.
-- Nous avons fait une refonte de la gestion des fenêtres pour améliorer la fiabilité. Veuillez signaler les bogues que vous rencontrez avec l’alias wt.exe.
-- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.
+– Nous avons réécrit la manière dont les applications de console sont hébergées dans Terminal ! Veuillez signaler tout bogue que vous rencontrez.
+– Terminal prend désormais en charge Sixels !
+– Vous pouvez maintenant ouvrir un panneau ancré contenant des extraits de commandes que vous avez enregistrées pour les utiliser ultérieurement
+– Les utilisateurs de l’invite de commande sur la dernière version de Windows 11 peuvent voir une icône « astuce rapide » qui suggère un logiciel installable à partir de WinGet
+– Le texte sélectionné sera désormais beaucoup plus visible (et personnalisable !)
+– Un certain nombre de bogues de fiabilité, de problèmes de commodité et de désagréments ont été corrigés.
 
 Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -56,9 +56,12 @@ Si tratta di un progetto open source e la partecipazione della community è molt
   <ReleaseNotes>
     Versione __VERSION_NUMBER__
 
-- Abbiamo aggiunto decine di impostazioni all'interfaccia utente che in precedenza esistevano solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
-- Abbiamo riprogettato la gestione delle finestre per migliorarne l'affidabilità; segnala eventuali bug riscontrati con l'alias wt.exe
-- I profili ora mostrano un'icona se sono stati nascosti o se fanno riferimento a programmi disinstallati.
+- Abbiamo cambiato il modo in cui le applicazioni della console vengono ospitate all’interno di Terminale. Segnala eventuali bug riscontrati.
+- Ora Terminale supporta i Sixel.
+- Puoi aprire un pannello ancorato contenente frammenti di comandi salvati per usarli in seguito
+- Gli utenti che usano il prompt dei comandi nella versione più recente di Windows 11 potrebbero visualizzare un’icona di “suggerimento rapido” che consiglia il software installabile da WinGet
+- Il testo selezionato sarà ora molto più visibile, oltre che personalizzabile.
+- Sono stati risolti diversi bug di affidabilità e problemi di ordine pratico.
 
 Per altri dettagli, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,9 +56,12 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- 新しいタブ メニューのレイアウトをカスタマイズするための新しいページなど、以前は JSON ファイルにしかなかった設定が UI に多数追加されました。
-- 信頼性を向上させるために、ウィンドウ管理を再設計しました。wt.exe エイリアスで発生したバグを報告してください
-- プロファイルが非表示になっている場合や、アンインストールされたプログラムを参照している場合に、アイコンが表示されるようになりました。
+- ターミナル内でのコンソール アプリケーションのホスト方法を書き換えました。発生したバグを報告してください。
+- ターミナルで Sixels がサポートされるようになりました。
+- 後で使用するために保存したコマンドのスニペットを含むドッキング パネルを開けるようになりました
+- 最新の Windows 11 リリースのコマンド プロンプト ユーザーには、WinGet からインストール可能なソフトウェアを提案する "クイック ヒント" アイコンが表示される場合があります
+- 選択したテキストが大幅に見やすくなりました (カスタマイズも可能です)
+- 信頼性に関するバグ、利便性の問題、不快な問題の多くが修正されました。
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,9 +56,12 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에만 존재했던 수십 개의 설정을 UI에 추가
-- 안정성을 개선하기 위해 창 관리 구조를 재구성했습니다. wt.exe 별칭과 관련하여 발생한 버그 신고
-- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
+- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다. 버그가 발생하면 보고해 주세요.
+- 터미널에서 이제 Sixels를 지원합니다.
+- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
+- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 추천하는 "간단한 팁" 아이콘을 볼 수 있습니다.
+- 이제 선택한 텍스트가 훨씬 더 잘 보입니다(사용자 지정 가능).
+- 여러 안정성 버그, 편의성 문제, 불편 사항이 수정되었습니다.
 
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -54,11 +54,14 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versão __VERSION_NUMBER__
 
-– Adicionamos várias configurações à interface do usuário que antes só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do seu menu Nova Guia!
-– Reestruturamos o gerenciamento de janelas para melhorar a confiabilidade; registre os bugs que você encontrar com o alias wt.exe
-– Os perfis agora exibem um ícone se estiverem ocultos ou se referirem a programas que foram desinstalados.
+– Reescrevemos a forma como os aplicativos de console são hospedados no Terminal! Relate os bugs encontrados.
+– O terminal agora oferece suporte ao Sixels!
+– Agora você pode abrir um painel acoplado contendo snippets de comandos que você salvou para usar mais tarde
+– Os usuários do Prompt de Comando na versão mais recente do Windows 11 podem ver um ícone de "dica rápida", que sugere softwares instaláveis a partir do WinGet
+– O texto selecionado agora ficará muito mais visível (e personalizável!)
+– Vários bugs de confiabilidade, problemas de conveniência e incômodos foram resolvidos.
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml

@@ -56,11 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml

@@ -56,11 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml

@@ -56,11 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,12 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Мы добавили в пользовательский интерфейс десятки параметров, которые ранее существовали только в JSON-файле, включая новую страницу для настройки макета меню новой вкладки.
-– Мы переработали управление окнами для повышения надежности. Сообщайте о любых ошибках, которые вы обнаружите с псевдонимом wt.exe
-– Профили теперь отображают значок, если они были скрыты или ссылаются на программы, которые были удалены.
+– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
+– Терминал теперь поддерживает форматы Sixel!
+– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
+– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
+– Выделенный текст теперь станет более видимым (и настраиваемым!)
+– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="en-us" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Термінал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Консоль</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-      <!-- _locComment_text="{MaxLength=10000} {Locked=Windows} App Description" -->Термінал Windows - це сучасний, швидкий, ефективний, потужний та продуктивний термінальний застосунок для користувачів інструментів командного рядка та оболонок, таких як командний рядок, PowerShell та WSL. Його основні функції включають кілька вкладок, панелей, підтримку символів Unicode та UTF-8, механізм візуалізації тексту з прискоренням GPU, а також користувацькі теми, стилі та конфігурації.
-
-Це проєкт з відкритим кодом, і ми вітаємо участь спільноти. Щоб взяти участь, будь ласка, відвідайте https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
-
-- Ми додали десятки налаштувань до інтерфейсу користувача, які раніше існували лише у файлі JSON, включаючи нову сторінку для налаштування макета меню «Нова вкладка»!
-- Ми переробили архітектуру керування вікнами для підвищення надійності; будь ласка, повідомляйте про будь-які помилки, з якими ви зіткнулися, за допомогою псевдоніма wt.exe.
-- Профілі тепер відображають значок, якщо вони були приховані, або посилаються на програми, які було видалено.
-
-Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Новий термінал Windows</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Наявність вкладок</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Повна підтримка Юнікоду</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->Рендеринг тексту з прискоренням GPU</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Широкі можливості кастомізації</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Розділення панелей</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Клавіатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Права (c) Корпорація Майкрософт</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -56,9 +56,12 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 我们向用户界面添加了许多之前仅存在于 JSON 文件中的设置，包括用于自定义“新建标签页”菜单布局的新页面!
-- 我们已重新架构窗口管理以提高可靠性; 请使用 wt.exe 别名提交您遇到的任何错误
-- 配置文件如果已被隐藏或引用了已卸载的程序，现在会显示一个图标。
+- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
+- 终端现在支持 Sixels!
+- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
+- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
+- 所选文本现在将具有更高的可见性(和可自定义性!)
+- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -54,13 +54,16 @@
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__
 
-- 我們已在使用者介面中新增數十個曾經僅存在於 JSON 檔案中的設定，包括一個可自訂新索引標籤選單版面配置的新頁面!
-- 我們已重新架構視窗管理以提升可靠性; 如果您在使用 wt.exe 別名時遇到任何錯誤，請提交錯誤回報
-- 如果設定檔已隱藏或參照已解除安裝的程式，現在會顯示圖示。
+- 我們已重寫主機應用程式在終端機內託管的方式!請報告您遇到的錯誤。
+- 終端機現在支援 Sixels!
+- 現在，您可以開啟包含已儲存命令程式碼片段的固定面板，以供稍後使用
+- 最新 Windows 11 版本中的 [命令提示] 使用者可能會看到「快速提示」圖示，建議可自 WinGet 安裝的軟體
+- 選取的文字現在會更明顯 (且可自訂!)
+- 已修正一些可靠性錯誤、便利性問題和令人困擾的問題。
 
-如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
+如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/config/esrp.build.batch.terminal_constituents.json

@@ -17,6 +17,7 @@
             "PackageContents/WindowsTerminalShellExt.dll",
 
             // The rest
+            "PackageContents/TerminalAzBridge.exe",
             "PackageContents/wt.exe",
             "PackageContents/WindowsTerminal.exe",
             "PackageContents/elevate-shim.exe"

build/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Taef" version="10.100.251104001" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
   <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />
   <package id="Microsoft.Debugging.Tools.SrcTool" version="20220617.1556.0" targetFramework="native" />

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.25</PGOBranch>
+    <PGOBranch>main</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

build/pipelines/ci.yml

@@ -87,13 +87,6 @@ stages:
             buildConfigurations: [Release]
             buildEverything: true
             keepAllExpensiveBuildOutputs: false
-            ${{ if eq(parameters.runTests, true) }}:
-              # Copy the appx files into the bin drop because the LocalTests need them
-              afterBuildSteps:
-                - pwsh: |-
-                    $deps = ./build/scripts/Get-DependenciesFromAppxRecipe.ps1 -Path "$(Terminal.BinDir)/TestHostApp/TestHostApp.build.appxrecipe"
-                    $dir = New-Item -Type Directory "$(Terminal.BinDir)/_testDeps"
-                    $deps | Copy-Item -Destination $dir -Verbose
 
     - ${{ if eq(parameters.runTests, true) }}:
       - stage: Test_${{ platform }}

build/pipelines/daily-loc-submission.yml

@@ -23,7 +23,7 @@ parameters:
     default: true
 
 pool:
-  vmImage: windows-latest
+  vmImage: windows-2019
 
 resources:
   repositories:
@@ -51,8 +51,8 @@ steps:
   displayName: 'Touchdown Build - 7105, PRODEXT'
   inputs:
     teamId: 7105
-    FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
-    authType: FederatedIdentityTDBuild
+    TDBuildServiceConnection: $(TouchdownServiceConnection)
+    authType: SubjectNameIssuer
     resourceFilePath: |
      **\en-US\*.resw
      build\StoreSubmission\Stable\PDPs\en-us\PDP.xml

build/pipelines/feature-flag-ci.yml

@@ -31,7 +31,7 @@ stages:
         - template: ./templates-v2/job-build-project.yml
           parameters:
             pool: # This only runs in CI
-              name: SHINE-OSS-L
+                name: SHINE-OSS-L
             buildPlatforms: [x64]
             buildConfigurations: [Release]
             buildEverything: true

build/pipelines/ob-nightly.yml

@@ -28,7 +28,7 @@ extends:
     official: true
     branding: Canary
     buildTerminal: true
-    pgoBuildMode: Optimize
+    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
     codeSign: true
     signingIdentity:
       serviceName: $(SigningServiceName)

build/pipelines/pgo.yml

@@ -50,7 +50,6 @@ stages:
           buildEverything: true
           pgoBuildMode: Instrument
           artifactStem: -instrumentation
-          keepAllExpensiveBuildOutputs: false # the ARM64 build agent runs out of memory downloading the artifacts...
 
   - stage: RunPGO
     displayName: Run PGO
@@ -75,7 +74,7 @@ stages:
         parameters:
           jobName: MergePGD
           pool:
-            vmImage: 'windows-latest'
+            vmImage: 'windows-2022'
           buildConfiguration: Release
           buildPlatforms: ${{ parameters.buildPlatforms }}
           artifactStem: -instrumentation
@@ -83,7 +82,7 @@ stages:
       - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
         parameters:
           pool:
-            vmImage: 'windows-latest'
+            vmImage: 'windows-2022'
           dependsOn: MergePGD
           buildConfiguration: Release
           artifactStem: -instrumentation

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -46,7 +46,6 @@ jobs:
           BuildConfiguration: ${{ config }}
   dependsOn: ${{ parameters.dependsOn }}
   variables:
-    BuildPlatform: Any CPU
     OutputBuildPlatform: AnyCPU
     Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
     JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
@@ -76,9 +75,9 @@ jobs:
   - template: .\steps-restore-nuget.yml
 
   - task: VSBuild@1
-    displayName: Build solution OpenConsole.slnx for WPF Control (Pack)
+    displayName: Build solution OpenConsole.sln for WPF Control (Pack)
     inputs:
-      solution: 'OpenConsole.slnx'
+      solution: 'OpenConsole.sln'
       msbuildArgs: >-
         /p:WindowsTerminalReleaseBuild=true;Version=$(XES_PACKAGEVERSIONNUMBER)
         /p:NoBuild=true

build/pipelines/templates-v2/job-build-project.yml

@@ -71,9 +71,6 @@ parameters:
   - name: enableCaching
     type: boolean
     default: false
-  - name: afterBuildSteps
-    type: stepList
-    default: []
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -133,11 +130,11 @@ jobs:
           $SignFragments += "wpfdotnet"
         }
         If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\TerminalControl"
+          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
           $SignFragments += "wpf"
         }
         If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
+          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
           $SignFragments += "conpty"
         }
         Write-Host "Targets: $($BuildTargets -Join ";")"
@@ -173,9 +170,9 @@ jobs:
   - ${{ parameters.beforeBuildSteps }}
 
   - task: VSBuild@1
-    displayName: Build OpenConsole.slnx
+    displayName: Build OpenConsole.sln
     inputs:
-      solution: 'OpenConsole.slnx'
+      solution: 'OpenConsole.sln'
       msbuildArgs: >-
         /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }}
         ${{ parameters.additionalBuildOptions }}
@@ -213,8 +210,6 @@ jobs:
           contents: $(Build.SourcesDirectory)/MSBuildCacheLogs/**
           TargetFolder: $(Terminal.BinDir)/MSBuildCacheLogs
 
-  - ${{ parameters.afterBuildSteps }}
-
   # This saves ~2GiB per architecture. We won't need these later.
   # Removes:
   # - All .lib that do not have an associated .exp (which would indicate that they are import libs)

build/pipelines/templates-v2/job-check-code-format.yml

@@ -1,7 +1,7 @@
 jobs:
 - job: CodeFormatCheck
   displayName: Check Code Format
-  pool: { vmImage: windows-latest }
+  pool: { vmImage: windows-2022 }
 
   steps:
   - checkout: self

build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml

@@ -26,7 +26,6 @@ jobs:
     pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
     nuspecPath: $(pgoToolsPath)\NuSpecs
     nuspecFilename: PGO.nuspec
-    nugetFeed: "https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json"
 
   steps:
   - checkout: self
@@ -46,8 +45,7 @@ jobs:
 
   - task: NuGetAuthenticate@1
     inputs:
-      azureDevOpsServiceConnection: 'Terminal Public Artifact Feed'
-      feedUrl: $(nugetFeed)
+      nuGetServiceConnections: 'Terminal Public Artifact Feed'
 
   # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
   # This should be `task: NuGetCommand@2`
@@ -70,7 +68,15 @@ jobs:
     artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
     displayName: "Publish Pipeline Artifact"
 
-  - pwsh: |-
-      $nupkg = Get-Item "$(Build.ArtifactStagingDirectory)/*.nupkg"
-      & nuget push -ApiKey az -Source "$(nugetFeed)" "$nupkg"
-    displayName: NuGet push
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet push'
+    inputs:
+      command: push
+      nuGetFeedType: external
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
+      # The actual URL and PAT for this feed is configured at
+      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
+      # This is the name of that connection
+      publishFeedCredentials: 'Terminal Public Artifact Feed'
+      feedsToUse: config
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'

build/pipelines/templates-v2/job-run-pgo-tests.yml

@@ -45,10 +45,6 @@ jobs:
     displayName: Extract the unpackaged build for PGO
 
   - template: steps-ensure-nuget-version.yml
-    parameters:
-      ${{ if eq(parameters.buildPlatform, 'arm64') }}:
-        # The ARM64 agents do not seem to have NuGet installed
-        forceNugetInstallation: true
 
   - powershell: |-
       $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'

build/pipelines/templates-v2/job-test-project.yml

@@ -58,24 +58,6 @@ jobs:
         filePath: build\scripts\Run-Tests.ps1
         arguments: -MatchPattern '*feature.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
 
-    # Load-bearing: This needs to be Windows PowerShell, not pwsh, due to Add-AppxPackage not working in pwsh.
-    - powershell: |-
-        $deps = Get-ChildItem -Recurse "$(Terminal.BinDir)/_testDeps"
-        $deps | % {
-          Write-Host "Installing $($_.FullName)..."
-          Add-AppxPackage -Path $_.FullName -ErrorAction:Ignore
-        }
-      displayName: 'Install LocalTest Dependencies'
-
-    - task: PowerShell@2
-      displayName: 'Run Local Tests'
-      inputs:
-        pwsh: true
-        targetType: filePath
-        filePath: build\scripts\Run-Tests.ps1
-        arguments: -MatchPattern '*LocalTests*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
-      condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
-
   - task: PowerShell@2
     displayName: 'Convert Test Logs from WTL to xUnit format'
     condition: always()

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -210,8 +210,6 @@ extends:
                   ob_createvpack_taskLogVerbosity: Detailed
                   ob_createvpack_verbose: true
                   ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_PACKAGEVERSIONNUMBER)'
                   ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
                   # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
                   # that it doesn't expect to have downloaded a manifest directly to some 'destination'

build/pipelines/templates-v2/steps-ensure-nuget-version.yml

@@ -1,10 +1,5 @@
-parameters:
-  - name: forceNugetInstallation
-    type: boolean
-    default: false
-
 steps:
-- ${{ if and(ne(parameters.forceNugetInstallation, true), eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564')) }}:
+- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
   - pwsh: |-
       Write-Host "Assuming NuGet is already installed..."
       & nuget.exe help
@@ -12,6 +7,6 @@ steps:
 
 - ${{ else }}:
   - task: NuGetToolInstaller@1
-    displayName: Use NuGet 7.0.1
+    displayName: Use NuGet 6.6.1
     inputs:
-      versionSpec: 7.0.1
+      versionSpec: 6.6.1

build/pipelines/templates-v2/steps-restore-nuget.yml

@@ -19,16 +19,14 @@ steps:
     restoreSolution: build/packages.config
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
-- task: VSBuild@1
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
   displayName: Restore NuGet packages for solution
   inputs:
-    solution: 'OpenConsole.slnx'
-    msbuildArgs: /t:Restore
-    platform: $(BuildPlatform)
-    configuration: $(BuildConfiguration)
-    msbuildArchitecture: x64
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: OpenConsole.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
   displayName: Restore NuGet packages for global nuget

build/scripts/Get-DependenciesFromAppxRecipe.ps1

@@ -1,17 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$true, ValueFromPipeline=$true,
-      HelpMessage="Path to the .appxrecipe to parse")]
-    [string]
-    $Path
-)
-
-$Recipe = [xml](Get-Content $Path)
-$ResolvedSDKReferences = $Recipe.Project.ItemGroup.ResolvedSDKReference
-
-$ResolvedSDKReferences |
-    Where-Object Architecture -eq $Recipe.Project.PropertyGroup.PackageArchitecture |
-    ForEach-Object {
-        $l = [Uri]::UnescapeDataString($_.AppxLocation)
-        Get-Item $l
-    }

consolegit2gitfilters.json

@@ -26,12 +26,7 @@
     "/doc/user-docs/",
     "/src/tools/ansi-color/",
     "/src/tools/ColorTool/",
-    "/src/tools/scratch/",
-    "/src/tools/ConsoleBench/",
-    "/src/tools/schemes-fragment/",
     "/scratch/",
-    "/tools/ReleaseEngineering/",
-    "/policies/",
     "Scratch.sln",
   ],
   "SuffixFilters": [
@@ -49,11 +44,6 @@
     ".rec",
     ".err",
     "XamlStyler.json",
-    ".xlsx",
-    ".vcxproj",
-    ".vcxproj.filters",
-    ".Build.props",
-    ".Build.targets",
-    "OpenConsole.slnx"
+    ".xlsx"
   ]
 }

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>25</VersionMinor>
+    <VersionMinor>24</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
     <VersionInfoCulture>1033</VersionInfoCulture>
     <!-- The default has a spacing problem -->

dep/Console/ntcsrdll.h

@@ -7,17 +7,9 @@ Licensed under the MIT license.
 
 #include <ntcsrmsg.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 NTSTATUS CsrClientCallServer(
     PCSR_API_MSG m,
     PCSR_CAPTURE_HEADER CaptureBuffer OPTIONAL,
     ULONG ApiNumber,
     ULONG ArgLength
 );
-
-#ifdef __cplusplus
-}
-#endif

dep/Console/ntlpcapi.h

@@ -5,10 +5,6 @@ Licensed under the MIT license.
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define OB_FILE_OBJECT_TYPE 1
 
 typedef struct _PORT_MESSAGE {
@@ -128,7 +124,3 @@ NTSTATUS NtAlpcQueryInformationMessage(
     ULONG Length,
     PULONG ReturnLength
 );
-
-#ifdef __cplusplus
-}
-#endif

dep/nuget/packages.config

@@ -3,13 +3,13 @@
 <packages>
   <!-- Native packages -->
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.100.251104001" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
   <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.8.250811004" targetFramework="native" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
   <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.WindowsPackageManager.ComInterop" version="1.8.1911" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->

dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch

@@ -1,45 +0,0 @@
-From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
-From: "J. Berger" <mail@janaberger.de>
-Date: Sat, 1 Nov 2025 17:38:30 +0100
-Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
- conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
-
-This is a follow-up for PR #4572.
----
- include/fmt/format.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..65e19d2d 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-     auto grouping = Grouping(loc, specs.localized());
-     size += grouping.count_separators(exp);
-     return write_padded<Char, align::right>(
--        out, specs, to_unsigned(size), [&](iterator it) {
-+        out, specs, static_cast<size_t>(size), [&](iterator it) {
-           if (s != sign::none) *it++ = detail::getsign<Char>(s);
-           it = write_significand(it, f.significand, significand_size, exp,
-                                  decimal_point, grouping);
-@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
-   size += 1 + (pointy ? 1 : 0) + num_zeros;
-   return write_padded<Char, align::right>(
--      out, specs, to_unsigned(size), [&](iterator it) {
-+      out, specs, static_cast<size_t>(size), [&](iterator it) {
-         if (s != sign::none) *it++ = detail::getsign<Char>(s);
-         *it++ = Char('0');
-         if (!pointy) return it;
-@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-     *it++ = Char(exp_char);
-     return write_exponent<Char>(exp, it);
-   };
--  auto usize = to_unsigned(size);
-+  size_t usize = static_cast<size_t>(size);
-   return specs.width > 0
-              ? write_padded<Char, align::right>(out, specs, usize, write)
-              : base_iterator(out, write(reserve(out, usize)));
--- 
-2.52.0.vfs.0.5
-

dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88c12148..967b53dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
++  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()

dep/vcpkg-overlay-ports/fmt/portfile.cmake

@@ -2,10 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
     REF "${VERSION}"
-    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
+    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
     HEAD_REF master
     PATCHES
-        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+        fix-write-batch.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,6 +22,13 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
+        "defined(FMT_SHARED)"
+        "1"
+    )
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"

dep/vcpkg-overlay-ports/fmt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fmt",
-  "version": "12.1.0",
+  "version": "11.1.4",
   "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",

dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch

@@ -1,57 +0,0 @@
-From fae5556fd4d4850f948aeabee25ddf0280494725 Mon Sep 17 00:00:00 2001
-From: lizz <lizz@sensetime.com>
-Date: Fri, 10 Apr 2020 23:02:21 +0800
-Subject: [PATCH] No trailing space for BuiltStyledStreamWriter
-
-Signed-off-by: lizz <lizz@sensetime.com>
----
- src/lib_json/json_writer.cpp | 10 +++++++++-
- src/test_lib_json/main.cpp   |  4 ++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
-index ee45c43..e22eb17 100644
---- a/src/lib_json/json_writer.cpp
-+++ b/src/lib_json/json_writer.cpp
-@@ -990,7 +990,15 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
-         writeCommentBeforeValue(childValue);
-         writeWithIndent(
-             valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
--        *sout_ << colonSymbol_;
-+        size_t n = colonSymbol_.size();
-+        if ((childValue.type() == objectValue && !childValue.empty()) ||
-+            (childValue.type() == arrayValue && !childValue.empty() &&
-+             ((cs_ == CommentStyle::All) || isMultilineArray(childValue)))) {
-+          // Line-ending colon, so trim any trailing space from it
-+          for (; n && colonSymbol_[n - 1] == ' '; --n)
-+            ;
-+        }
-+        sout_->write(colonSymbol_.data(), n);
-         writeValue(childValue);
-         if (++it == members.end()) {
-           writeCommentAfterValueOnSameLine(childValue);
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 55ab224..28cb043 100644
---- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -2533,7 +2533,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNumericValue) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"property1\" : \n"
-+                              "\t\"property1\" :\n"
-                               "\t[\n"
-                               "\t\t\"value1\",\n"
-                               "\t\t\"value2\"\n"
-@@ -2553,7 +2553,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNestedObjects) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"object1\" : \n"
-+                              "\t\"object1\" :\n"
-                               "\t{\n"
-                               "\t\t\"bool\" : true,\n"
-                               "\t\t\"nested\" : 123\n"
--- 
-2.52.0.vfs.0.5
-

dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake

@@ -1,36 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-source-parsers/jsoncpp
-    REF "${VERSION}"
-    SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
-    HEAD_REF master
-    PATCHES
-        0001-No-trailing-space-for-BuildStyledStreamWriter.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
-        -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
-        -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
-        -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-        -DJSONCPP_WITH_TESTS=OFF
-        -DJSONCPP_WITH_EXAMPLE=OFF
-        -DBUILD_OBJECT_LIBS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json

@@ -1,17 +0,0 @@
-{
-  "name": "jsoncpp",
-  "version": "1.9.6",
-  "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.",
-  "homepage": "https://github.com/open-source-parsers/jsoncpp",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}

dep/vcpkg-overlay-triplets/arm64-windows-static.cmake

@@ -1,8 +0,0 @@
-# Same as the official arm64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)

dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake

@@ -1,11 +1,6 @@
-# Same as the official arm64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake

@@ -1,11 +1,6 @@
-# Same as the official x64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake

@@ -1,11 +1,6 @@
-# Same as the official x86-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x86)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/x64-windows-static.cmake

@@ -1,8 +0,0 @@
-# Same as the official x64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)

dep/vcpkg-overlay-triplets/x86-windows-static.cmake

@@ -1,8 +0,0 @@
-# Same as the official x86-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)

doc/building.md

@@ -7,7 +7,7 @@ This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-S
 git submodule update --init --recursive
 ```
 
-OpenConsole.slnx may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
+OpenConsole.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
 
 When using Visual Studio, be sure to set up the path for code formatting. To download the required clang-format.exe file, follow one of the building instructions below and run:
 ```powershell
@@ -103,7 +103,7 @@ If you want to use .nupkg files instead of the downloaded Nuget package, you can
 The Terminal is bundled as an `.msix`, which is produced by the `CascadiaPackage.wapproj` project. To build that project from the commandline, you can run the following (from a window you've already run `tools\razzle.cmd` in):
 
 ```cmd
-"%msbuild%" "%OPENCON%\OpenConsole.slnx" /p:Configuration=%_LAST_BUILD_CONF% /p:Platform=%ARCH% /p:AppxSymbolPackageEnabled=false /t:Terminal\CascadiaPackage /m
+"%msbuild%" "%OPENCON%\OpenConsole.sln" /p:Configuration=%_LAST_BUILD_CONF% /p:Platform=%ARCH% /p:AppxSymbolPackageEnabled=false /t:Terminal\CascadiaPackage /m
 ```
 
 This takes quite some time, and only generates an `msix`. It does not install the msix. To deploy the package:

doc/cascadia/profiles.schema.json

@@ -2407,14 +2407,6 @@
             "console"
           ]
         },
-        "compatibility.ambiguousWidth": {
-          "default": "narrow",
-          "description": "Controls the cell width of East Asian Ambiguous characters.",
-          "enum": [
-            "narrow",
-            "wide"
-          ]
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2474,7 +2466,6 @@
           "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
           "type": "string",
           "enum": [
-            "automatic",
             "direct2d",
             "direct3d11"
           ]
@@ -2488,9 +2479,8 @@
           "type": "boolean"
         },
         "experimental.input.forceVT": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"compatibility.input.forceVT\" profile setting.",
-          "deprecated": true
+          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
+          "type": "boolean"
         },
         "experimental.useBackgroundImageForWindow": {
           "default": false,
@@ -2537,14 +2527,14 @@
           "type": "string"
         },
         "rowsToScroll": {
+          "default": "system",
+          "description": "This parameter once allowed you to override the systemwide \"choose how many lines to scroll at one time\" setting. It no longer does so. However, you can customize the number of lines to scroll in \"scrollUp\" and \"scrollDown\" bindings.",
+          "maximum": 999,
+          "minimum": 0,
           "type": [
             "integer",
             "string"
           ],
-          "description": "[Deprecated] This setting no longer has any effect. However, you can customize the number of lines to scroll using the \"rowsToScroll\" argument on the \"scrollUp\" and \"scrollDown\" actions.",
-          "default": "system",
-          "minimum": 0,
-          "maximum": 999,
           "deprecated": true
         },
         "minimizeToNotificationArea": {
@@ -2590,12 +2580,9 @@
           "$ref": "#/$defs/NewTabMenu"
         },
         "language": {
-          "type": [
-            "string",
-            "null"
-          ],
+          "default": "",
           "description": "Sets an override for the app's preferred language, expressed as a BCP-47 language tag like en-US.",
-          "default": null
+          "type": "string"
         },
         "theme": {
           "default": "dark",
@@ -2659,19 +2646,19 @@
           "type": "boolean"
         },
         "useTabSwitcher": {
-          "description": "[Deprecated] Replaced with the \"tabSwitcherMode\" setting.",
           "default": true,
+          "description": "Deprecated. Please use \"tabSwitcherMode\" instead.",
           "oneOf": [
             {
               "type": "boolean"
             },
             {
-              "type": "string",
               "enum": [
                 "mru",
                 "inOrder",
                 "disabled"
-              ]
+              ],
+              "type": "string"
             }
           ],
           "deprecated": true
@@ -2728,12 +2715,12 @@
       "type": "object",
       "properties": {
         "acrylicOpacity": {
-          "type": "number",
-          "description": "[Deprecated] Replaced with the \"opacity\" setting.",
           "default": 0.5,
-          "minimum": 0,
+          "description": "[deprecated] Please use `opacity` instead.",
+          "deprecated": true,
           "maximum": 1,
-          "deprecated": true
+          "minimum": 0,
+          "type": "number"
         },
         "antialiasingMode": {
           "default": "grayscale",
@@ -2759,11 +2746,6 @@
           "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
           "type": "boolean"
         },
-        "compatibility.input.forceVT": {
-          "default": false,
-          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
-          "type": "boolean"
-        },
         "compatibility.allowDECRQCRA": {
           "default": false,
           "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
@@ -2935,29 +2917,24 @@
           "type": "boolean"
         },
         "experimental.autoMarkPrompts": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"autoMarkPrompts\" setting.",
-          "deprecated": true
+          "deprecated": true,
+          "description": "This has been replaced by autoMarkPrompts in 1.21",
+          "type": "boolean"
         },
         "experimental.retroTerminalEffect": {
           "description": "When set to true, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed.",
           "type": "boolean"
         },
         "experimental.showMarksOnScrollbar": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"showMarksOnScrollbar\" setting.",
-          "deprecated": true
+          "deprecated": true,
+          "description": "This has been replaced by showMarksOnScrollbar in 1.21",
+          "type": "boolean"
         },
         "showMarksOnScrollbar": {
           "default": false,
           "description": "When set to true, marks added to the buffer via the addMark action will appear on the scrollbar.",
           "type": "boolean"
         },
-        "experimental.rainbowSuggestions": {
-          "type": "boolean",
-          "description": "Enables displaying command suggestions in the terminal in RGB (all the colors of the rainbow!).",
-          "default": false
-        },
         "experimental.rightClickContextMenu": {
           "default": false,
           "description": "When true, right-click shows a context menu; otherwise, it pastes from the clipboard or copies selection.",
@@ -2973,29 +2950,23 @@
           "type": "string"
         },
         "fontFace": {
-          "type": "string",
-          "description": "[Deprecated] Replaced with the \"face\" setting within the \"font\" object.",
           "default": "Cascadia Mono",
+          "description": "[deprecated] Define 'face' within the 'font' object instead.",
+          "type": "string",
           "deprecated": true
         },
         "fontSize": {
-          "type": "number",
-          "description": "[Deprecated] Replaced with the \"size\" setting within the \"font\" object.",
           "default": 12,
+          "description": "[deprecated] Define 'size' within the 'font' object instead.",
           "minimum": 1,
+          "type": "number",
           "deprecated": true
         },
         "fontWeight": {
-          "description": "[Deprecated] Replaced with the \"weight\" setting within the \"font\" object.",
           "default": "normal",
+          "description": "[deprecated] Define 'weight' within the 'font' object instead.",
           "oneOf": [
             {
-              "type": "integer",
-              "minimum": 100,
-              "maximum": 990
-            },
-            {
-              "type": "string",
               "enum": [
                 "thin",
                 "extra-light",
@@ -3008,7 +2979,13 @@
                 "extra-bold",
                 "black",
                 "extra-black"
-              ]
+              ],
+              "type": "string"
+            },
+            {
+              "maximum": 990,
+              "minimum": 100,
+              "type": "integer"
             }
           ],
           "deprecated": true
@@ -3119,10 +3096,7 @@
         },
         "answerbackMessage": {
           "description": "The response that is sent when an ENQ control character is received.",
-          "type": [
-            "string",
-            "null"
-          ]
+          "type": "string"
         },
         "source": {
           "description": "Stores the name of the profile generator that originated this profile.",

doc/specs/#1043 - Set the initial position of the Terminal/spec.md

@@ -27,7 +27,6 @@ Two new properties should be added in the json settings file:
 
 2. Both X value and Y values are optional. If any one of them is missing, or the value is invalid, system default value will be used. Examples:
 
-       "1000" equals (1000, 1000)
        ", 1000" equals (default, 1000)
        "1000, " equals (1000, default)
        "," equals (default, default)

doc/specs/#11000 - Marks/Shell-Integration-Marks.md

@@ -111,7 +111,7 @@ not understanding these sequences originally.
 The relevant FinalTerm sequences for marking up the prompt are as follows.
 
 
-![image](ftcs-diagram.png)
+![image](FTCS-diagram.png)
 
 * **FTCS_PROMPT**: `OSC 133 ; A ST`
   - The start of a prompt. Internally, this sets a marker in the buffer

scratch/ScratchIslandApp/Package/Resources/uk-UA/Resources.resw

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppDescription" xml:space="preserve">
-    <value>Скретч-додаток для тестів XAML Islands</value>
-  </data>
-</root>

scratch/ScratchIslandApp/SampleApp/Resources/uk-UA/Resources.resw

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

src/buffer/out/Row.cpp

@@ -1143,13 +1143,6 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
     return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
 }
 
-uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
-{
-    const auto columns = GetReadableColumnCount();
-    const auto colBeg = clamp(col, 0, columns);
-    return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
     const auto col = _clampedColumn(column);

src/buffer/out/Row.hpp

@@ -172,7 +172,6 @@ public:
     std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
     til::CoordType GetLeadingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
     til::CoordType GetTrailingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
-    uint16_t GetCharOffset(til::CoordType col) const noexcept;
     DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;
 
     auto AttrBegin() const noexcept { return _attr.begin(); }

src/buffer/out/UTextAdapter.cpp

@@ -390,9 +390,6 @@ Microsoft::Console::ICU::unique_utext Microsoft::Console::ICU::UTextFromTextBuff
     utext_setup(&ut, 0, &status);
     FAIL_FAST_IF(status > U_ZERO_ERROR);
 
-    rowBeg = std::max<til::CoordType>(0, rowBeg);
-    rowEnd = std::min(textBuffer.GetSize().BottomExclusive(), rowEnd);
-
     ut.providerProperties = (1 << UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE) | (1 << UTEXT_PROVIDER_STABLE_CHUNKS);
     ut.pFuncs = &utextFuncs;
     ut.context = &textBuffer;

src/buffer/out/cursor.cpp

@@ -13,28 +13,46 @@
 // - ulSize - The height of the cursor within this buffer
 Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
     _parentBuffer{ parentBuffer },
-    _ulSize(ulSize)
+    _fHasMoved(false),
+    _fIsVisible(true),
+    _fIsOn(true),
+    _fIsDouble(false),
+    _fBlinkingAllowed(true),
+    _fDelay(false),
+    _fIsConversionArea(false),
+    _fDelayedEolWrap(false),
+    _fDeferCursorRedraw(false),
+    _fHaveDeferredCursorRedraw(false),
+    _ulSize(ulSize),
+    _cursorType(CursorType::Legacy)
 {
 }
 
+Cursor::~Cursor() = default;
+
 til::point Cursor::GetPosition() const noexcept
 {
     return _cPosition;
 }
 
-uint64_t Cursor::GetLastMutationId() const noexcept
+bool Cursor::HasMoved() const noexcept
 {
-    return _mutationId;
+    return _fHasMoved;
 }
 
 bool Cursor::IsVisible() const noexcept
 {
-    return _isVisible;
+    return _fIsVisible;
 }
 
-bool Cursor::IsBlinking() const noexcept
+bool Cursor::IsOn() const noexcept
 {
-    return _isBlinking;
+    return _fIsOn;
+}
+
+bool Cursor::IsBlinkingAllowed() const noexcept
+{
+    return _fBlinkingAllowed;
 }
 
 bool Cursor::IsDouble() const noexcept
@@ -42,128 +60,178 @@ bool Cursor::IsDouble() const noexcept
     return _fIsDouble;
 }
 
+bool Cursor::IsConversionArea() const noexcept
+{
+    return _fIsConversionArea;
+}
+
+bool Cursor::GetDelay() const noexcept
+{
+    return _fDelay;
+}
+
 ULONG Cursor::GetSize() const noexcept
 {
     return _ulSize;
 }
 
-void Cursor::SetIsVisible(bool enable) noexcept
+void Cursor::SetHasMoved(const bool fHasMoved) noexcept
 {
-    if (_isVisible != enable)
-    {
-        _isVisible = enable;
-        _redrawIfVisible();
-    }
+    _fHasMoved = fHasMoved;
 }
 
-void Cursor::SetIsBlinking(bool enable) noexcept
+void Cursor::SetIsVisible(const bool fIsVisible) noexcept
 {
-    if (_isBlinking != enable)
-    {
-        _isBlinking = enable;
-        _redrawIfVisible();
-    }
+    _fIsVisible = fIsVisible;
+    _RedrawCursor();
+}
+
+void Cursor::SetIsOn(const bool fIsOn) noexcept
+{
+    _fIsOn = fIsOn;
+    _RedrawCursorAlways();
+}
+
+void Cursor::SetBlinkingAllowed(const bool fBlinkingAllowed) noexcept
+{
+    _fBlinkingAllowed = fBlinkingAllowed;
+    // GH#2642 - From what we've gathered from other terminals, when blinking is
+    // disabled, the cursor should remain On always, and have the visibility
+    // controlled by the IsVisible property. So when you do a printf "\e[?12l"
+    // to disable blinking, the cursor stays stuck On. At this point, only the
+    // cursor visibility property controls whether the user can see it or not.
+    // (Yes, the cursor can be On and NOT Visible)
+    _fIsOn = true;
+    _RedrawCursorAlways();
 }
 
 void Cursor::SetIsDouble(const bool fIsDouble) noexcept
 {
-    if (_fIsDouble != fIsDouble)
-    {
-        _fIsDouble = fIsDouble;
-        _redrawIfVisible();
-    }
+    _fIsDouble = fIsDouble;
+    _RedrawCursor();
+}
+
+void Cursor::SetIsConversionArea(const bool fIsConversionArea) noexcept
+{
+    // Functionally the same as "Hide cursor"
+    // Never called with TRUE, it's only used in the creation of a
+    //      ConversionAreaInfo, and never changed after that.
+    _fIsConversionArea = fIsConversionArea;
+    _RedrawCursorAlways();
+}
+
+void Cursor::SetDelay(const bool fDelay) noexcept
+{
+    _fDelay = fDelay;
 }
 
 void Cursor::SetSize(const ULONG ulSize) noexcept
 {
-    if (_ulSize != ulSize)
-    {
-        _ulSize = ulSize;
-        _redrawIfVisible();
-    }
+    _ulSize = ulSize;
+    _RedrawCursor();
 }
 
 void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
 {
-    if (_ulSize != ulSize || _cursorType != type)
+    _ulSize = ulSize;
+    _cursorType = type;
+
+    _RedrawCursor();
+}
+
+// Routine Description:
+// - Sends a redraw message to the renderer only if the cursor is currently on.
+// - NOTE: For use with most methods in this class.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void Cursor::_RedrawCursor() noexcept
+{
+    // Only trigger the redraw if we're on.
+    // Don't draw the cursor if this was triggered from a conversion area.
+    // (Conversion areas have cursors to mark the insertion point internally, but the user's actual cursor is the one on the primary screen buffer.)
+    if (IsOn() && !IsConversionArea())
     {
-        _ulSize = ulSize;
-        _cursorType = type;
-        _redrawIfVisible();
+        if (_fDeferCursorRedraw)
+        {
+            _fHaveDeferredCursorRedraw = true;
+        }
+        else
+        {
+            _RedrawCursorAlways();
+        }
     }
 }
 
+// Routine Description:
+// - Sends a redraw message to the renderer no matter what.
+// - NOTE: For use with the method that turns the cursor on and off to force a refresh
+//         and clear the ON cursor from the screen. Not for use with other methods.
+//         They should use the other method so refreshes are suppressed while the cursor is off.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void Cursor::_RedrawCursorAlways() noexcept
+{
+    _parentBuffer.NotifyPaintFrame();
+}
+
 void Cursor::SetPosition(const til::point cPosition) noexcept
 {
-    // The VT code assumes that moving the cursor implicitly resets the delayed EOL wrap,
-    // so we call ResetDelayEOLWrap() independent of _cPosition != cPosition.
-    // You can see the effect of this with "`e[1;9999Ha`e[1;9999Hb", which should print just "b".
+    _RedrawCursor();
+    _cPosition = cPosition;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (_cPosition != cPosition)
-    {
-        _cPosition = cPosition;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::SetXPosition(const til::CoordType NewX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x = NewX;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (_cPosition.x != NewX)
-    {
-        _cPosition.x = NewX;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::SetYPosition(const til::CoordType NewY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y = NewY;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (_cPosition.y != NewY)
-    {
-        _cPosition.y = NewY;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::IncrementXPosition(const til::CoordType DeltaX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x += DeltaX;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (DeltaX != 0)
-    {
-        _cPosition.x = _cPosition.x + DeltaX;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::IncrementYPosition(const til::CoordType DeltaY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y += DeltaY;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (DeltaY != 0)
-    {
-        _cPosition.y = _cPosition.y + DeltaY;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::DecrementXPosition(const til::CoordType DeltaX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x -= DeltaX;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (DeltaX != 0)
-    {
-        _cPosition.x = _cPosition.x - DeltaX;
-        _redrawIfVisible();
-    }
 }
 
 void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y -= DeltaY;
+    _RedrawCursor();
     ResetDelayEOLWrap();
-    if (DeltaY != 0)
-    {
-        _cPosition.y = _cPosition.y - DeltaY;
-        _redrawIfVisible();
-    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -176,33 +244,74 @@ void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
 // - OtherCursor - The cursor to copy properties from
 // Return Value:
 // - <none>
-void Cursor::CopyProperties(const Cursor& other) noexcept
+void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
 {
-    _cPosition = other._cPosition;
-    _coordDelayedAt = other._coordDelayedAt;
-    _ulSize = other._ulSize;
-    _cursorType = other._cursorType;
-    _isVisible = other._isVisible;
-    _isBlinking = other._isBlinking;
-    _fIsDouble = other._fIsDouble;
+    // We shouldn't copy the position as it will be already rearranged by the resize operation.
+    //_cPosition                    = pOtherCursor->_cPosition;
+
+    _fHasMoved = OtherCursor._fHasMoved;
+    _fIsVisible = OtherCursor._fIsVisible;
+    _fIsOn = OtherCursor._fIsOn;
+    _fIsDouble = OtherCursor._fIsDouble;
+    _fBlinkingAllowed = OtherCursor._fBlinkingAllowed;
+    _fDelay = OtherCursor._fDelay;
+    _fIsConversionArea = OtherCursor._fIsConversionArea;
+
+    // A resize operation should invalidate the delayed end of line status, so do not copy.
+    //_fDelayedEolWrap              = OtherCursor._fDelayedEolWrap;
+    //_coordDelayedAt               = OtherCursor._coordDelayedAt;
+
+    _fDeferCursorRedraw = OtherCursor._fDeferCursorRedraw;
+    _fHaveDeferredCursorRedraw = OtherCursor._fHaveDeferredCursorRedraw;
+
+    // Size will be handled separately in the resize operation.
+    //_ulSize                       = OtherCursor._ulSize;
+    _cursorType = OtherCursor._cursorType;
 }
 
 void Cursor::DelayEOLWrap() noexcept
 {
     _coordDelayedAt = _cPosition;
+    _fDelayedEolWrap = true;
 }
 
 void Cursor::ResetDelayEOLWrap() noexcept
 {
-    _coordDelayedAt.reset();
+    _coordDelayedAt = {};
+    _fDelayedEolWrap = false;
 }
 
-const std::optional<til::point>& Cursor::GetDelayEOLWrap() const noexcept
+til::point Cursor::GetDelayedAtPosition() const noexcept
 {
     return _coordDelayedAt;
 }
 
-CursorType Cursor::GetType() const noexcept
+bool Cursor::IsDelayedEOLWrap() const noexcept
+{
+    return _fDelayedEolWrap;
+}
+
+void Cursor::StartDeferDrawing() noexcept
+{
+    _fDeferCursorRedraw = true;
+}
+
+bool Cursor::IsDeferDrawing() noexcept
+{
+    return _fDeferCursorRedraw;
+}
+
+void Cursor::EndDeferDrawing() noexcept
+{
+    if (_fHaveDeferredCursorRedraw)
+    {
+        _RedrawCursorAlways();
+    }
+
+    _fDeferCursorRedraw = FALSE;
+}
+
+const CursorType Cursor::GetType() const noexcept
 {
     return _cursorType;
 }
@@ -211,18 +320,3 @@ void Cursor::SetType(const CursorType type) noexcept
 {
     _cursorType = type;
 }
-
-void Cursor::_redrawIfVisible() noexcept
-{
-    _mutationId++;
-    if (_isVisible)
-    {
-        _parentBuffer.NotifyPaintFrame();
-    }
-}
-
-void Cursor::_redraw() noexcept
-{
-    _mutationId++;
-    _parentBuffer.NotifyPaintFrame();
-}

src/buffer/out/cursor.h

@@ -29,6 +29,8 @@ public:
 
     Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept;
 
+    ~Cursor();
+
     // No Copy. It will copy the timer handle. Bad news.
     Cursor(const Cursor&) = delete;
     Cursor& operator=(const Cursor&) & = delete;
@@ -36,17 +38,29 @@ public:
     Cursor(Cursor&&) = default;
     Cursor& operator=(Cursor&&) & = delete;
 
-    uint64_t GetLastMutationId() const noexcept;
+    bool HasMoved() const noexcept;
     bool IsVisible() const noexcept;
-    bool IsBlinking() const noexcept;
+    bool IsOn() const noexcept;
+    bool IsBlinkingAllowed() const noexcept;
     bool IsDouble() const noexcept;
+    bool IsConversionArea() const noexcept;
+    bool GetDelay() const noexcept;
     ULONG GetSize() const noexcept;
     til::point GetPosition() const noexcept;
-    CursorType GetType() const noexcept;
 
-    void SetIsVisible(bool enable) noexcept;
-    void SetIsBlinking(bool enable) noexcept;
+    const CursorType GetType() const noexcept;
+
+    void StartDeferDrawing() noexcept;
+    bool IsDeferDrawing() noexcept;
+    void EndDeferDrawing() noexcept;
+
+    void SetHasMoved(const bool fHasMoved) noexcept;
+    void SetIsVisible(const bool fIsVisible) noexcept;
+    void SetIsOn(const bool fIsOn) noexcept;
+    void SetBlinkingAllowed(const bool fIsOn) noexcept;
     void SetIsDouble(const bool fIsDouble) noexcept;
+    void SetIsConversionArea(const bool fIsConversionArea) noexcept;
+    void SetDelay(const bool fDelay) noexcept;
     void SetSize(const ULONG ulSize) noexcept;
     void SetStyle(const ULONG ulSize, const CursorType type) noexcept;
 
@@ -58,30 +72,42 @@ public:
     void DecrementXPosition(const til::CoordType DeltaX) noexcept;
     void DecrementYPosition(const til::CoordType DeltaY) noexcept;
 
-    void CopyProperties(const Cursor& other) noexcept;
+    void CopyProperties(const Cursor& OtherCursor) noexcept;
 
     void DelayEOLWrap() noexcept;
     void ResetDelayEOLWrap() noexcept;
-    const std::optional<til::point>& GetDelayEOLWrap() const noexcept;
+    til::point GetDelayedAtPosition() const noexcept;
+    bool IsDelayedEOLWrap() const noexcept;
 
     void SetType(const CursorType type) noexcept;
 
 private:
-    void _redrawIfVisible() noexcept;
-    void _redraw() noexcept;
-
     TextBuffer& _parentBuffer;
 
     //TODO: separate the rendering and text placement
 
     // NOTE: If you are adding a property here, go add it to CopyProperties.
 
-    uint64_t _mutationId = 0;
     til::point _cPosition; // current position on screen (in screen buffer coords).
-    std::optional<til::point> _coordDelayedAt; // coordinate the EOL wrap was delayed at.
+
+    bool _fHasMoved;
+    bool _fIsVisible; // whether cursor is visible (set only through the API)
+    bool _fIsOn; // whether blinking cursor is on or not
+    bool _fIsDouble; // whether the cursor size should be doubled
+    bool _fBlinkingAllowed; //Whether or not the cursor is allowed to blink at all. only set through VT (^[[?12h/l)
+    bool _fDelay; // don't blink scursor on next timer message
+    bool _fIsConversionArea; // is attached to a conversion area so it doesn't actually need to display the cursor.
+
+    bool _fDelayedEolWrap; // don't wrap at EOL till the next char comes in.
+    til::point _coordDelayedAt; // coordinate the EOL wrap was delayed at.
+
+    bool _fDeferCursorRedraw; // whether we should defer redrawing the cursor or not
+    bool _fHaveDeferredCursorRedraw; // have we been asked to redraw the cursor while it was being deferred?
+
     ULONG _ulSize;
-    CursorType _cursorType = CursorType::Legacy;
-    bool _isVisible = true;
-    bool _isBlinking = true;
-    bool _fIsDouble = false; // whether the cursor size should be doubled
+
+    void _RedrawCursor() noexcept;
+    void _RedrawCursorAlways() noexcept;
+
+    CursorType _cursorType;
 };

src/buffer/out/textBuffer.cpp

@@ -2628,8 +2628,11 @@ void TextBuffer::_AppendRTFText(std::string& contentBuilder, const std::wstring_
     }
 }
 
-void TextBuffer::SerializeTo(HANDLE handle) const
+void TextBuffer::SerializeToPath(const wchar_t* destination) const
 {
+    const wil::unique_handle file{ CreateFileW(destination, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr) };
+    THROW_LAST_ERROR_IF(!file);
+
     static constexpr size_t writeThreshold = 32 * 1024;
     std::wstring buffer;
     buffer.reserve(writeThreshold + writeThreshold / 2);
@@ -2658,7 +2661,7 @@ void TextBuffer::SerializeTo(HANDLE handle) const
         {
             const auto fileSize = gsl::narrow<DWORD>(buffer.size() * sizeof(wchar_t));
             DWORD bytesWritten = 0;
-            THROW_IF_WIN32_BOOL_FALSE(WriteFile(handle, buffer.data(), fileSize, &bytesWritten, nullptr));
+            THROW_IF_WIN32_BOOL_FALSE(WriteFile(file.get(), buffer.data(), fileSize, &bytesWritten, nullptr));
             THROW_WIN32_IF_MSG(ERROR_WRITE_FAULT, bytesWritten != fileSize, "failed to write");
             buffer.clear();
         }

src/buffer/out/textBuffer.hpp

@@ -288,7 +288,7 @@ public:
                        const bool isIntenseBold,
                        std::function<std::tuple<COLORREF, COLORREF, COLORREF>(const TextAttribute&)> GetAttributeColors) const noexcept;
 
-    void SerializeTo(HANDLE handle) const;
+    void SerializeToPath(const wchar_t* destination) const;
 
     struct PositionInformation
     {

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -600,6 +600,90 @@ namespace
             },
         },
     };
+
+#pragma region TAEF hookup for the test case array above
+    struct ArrayIndexTaefAdapterRow : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataRow>
+    {
+        HRESULT RuntimeClassInitialize(const size_t index)
+        {
+            _index = index;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestData(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            const auto indexString{ wil::str_printf<std::wstring>(L"%zu", _index) };
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto indexBstr{ wil::make_bstr(indexString.c_str()) };
+            (void)SafeArrayPutElement(safeArray, &index, indexBstr.release());
+            *ppData = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetMetadataNames(SAFEARRAY** ppMetadataNames) override
+        {
+            *ppMetadataNames = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetMetadata(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            *ppData = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetName(BSTR* ppszRowName) override
+        {
+            *ppszRowName = nullptr;
+            return S_FALSE;
+        }
+
+    private:
+        size_t _index;
+    };
+
+    struct ArrayIndexTaefAdapterSource : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataSource>
+    {
+        STDMETHODIMP Advance(IDataRow** ppDataRow) override
+        {
+            if (_index < std::extent_v<decltype(testCases)>)
+            {
+                Microsoft::WRL::MakeAndInitialize<ArrayIndexTaefAdapterRow>(ppDataRow, _index++);
+            }
+            else
+            {
+                *ppDataRow = nullptr;
+            }
+            return S_OK;
+        }
+
+        STDMETHODIMP Reset() override
+        {
+            _index = 0;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataNames(SAFEARRAY** names) override
+        {
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto dataNameBstr{ wil::make_bstr(L"index") };
+            (void)SafeArrayPutElement(safeArray, &index, dataNameBstr.release());
+            *names = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataType(BSTR /*name*/, BSTR* type) override
+        {
+            *type = nullptr;
+            return S_OK;
+        }
+
+    private:
+        size_t _index{ 0 };
+    };
+#pragma endregion
 }
 
 extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -77,6 +77,9 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
       <Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
     </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
+      <Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
+    </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
       <Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
     </ProjectReference>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -5,14 +5,12 @@
 
 #include "../TerminalApp/TerminalPage.h"
 #include "../UnitTests_SettingsModel/TestUtils.h"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
 using namespace Microsoft::Console;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Control;
 
@@ -823,7 +821,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(3u, command.NestedCommands().Size());
             _logCommandNames(command.NestedCommands());
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -845,7 +843,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -867,7 +865,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -960,8 +958,8 @@ namespace TerminalAppLocalTests
 
         for (auto name : std::vector<std::wstring>({ L"profile0", L"profile1", L"profile2" }))
         {
-            const auto childCommandName = fmt::format(FMT_COMPILE(L"New tab, profile: {}"), name);
-            auto command = rootCommand.NestedCommands().Lookup(childCommandName);
+            winrt::hstring commandName{ fmt::format(L"New tab, profile: {}", name) };
+            auto command = rootCommand.NestedCommands().Lookup(commandName);
             VERIFY_IS_NOT_NULL(command);
             auto actionAndArgs = command.ActionAndArgs();
             VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1078,7 +1076,7 @@ namespace TerminalAppLocalTests
 
             _logCommandNames(command.NestedCommands());
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1100,7 +1098,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1122,7 +1120,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1421,10 +1419,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile0", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=true, action.elevate=nullopt: DO auto elevate");
@@ -1444,10 +1442,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile1", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=false, action.elevate=nullopt: don't auto elevate");
@@ -1467,10 +1465,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile2", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
         }
 
         {
@@ -1492,10 +1490,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=true, action.elevate=false: don't auto elevate");
@@ -1516,10 +1514,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=false, action.elevate=false: don't auto elevate");
@@ -1540,10 +1538,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
         }
 
         {
@@ -1565,10 +1563,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=true, action.elevate=true: DO auto elevate");
@@ -1588,10 +1586,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
         }
         {
             Log::Comment(L"profile.elevate=false, action.elevate=true: DO auto elevate");
@@ -1612,10 +1610,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
             const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
         }
     }
 

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -66,6 +66,7 @@ namespace TerminalAppLocalTests
         // can help you identify if something much lower in the stack has
         // failed.
         TEST_METHOD(EnsureTestsActivate);
+        TEST_METHOD(TryCreateSettingsType);
         TEST_METHOD(TryCreateConnectionType);
         TEST_METHOD(TryCreateXamlObjects);
 
@@ -130,12 +131,23 @@ namespace TerminalAppLocalTests
         VERIFY_IS_TRUE(true);
     }
 
+    void TabTests::TryCreateSettingsType()
+    {
+        // Verify we can create a WinRT type we authored
+        // Just creating it is enough to know that everything is working.
+        TerminalSettings settings;
+        VERIFY_IS_NOT_NULL(settings);
+    }
+
     void TabTests::TryCreateConnectionType()
     {
         // Verify we can create a WinRT type we authored
         // Just creating it is enough to know that everything is working.
         winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
         VERIFY_IS_NOT_NULL(conn);
+        // We're doing this test separately from the TryCreateSettingsType test,
+        // to ensure both dependent binaries (TerminalSettings and
+        // TerminalConnection) both work individually.
     }
 
     void TabTests::TryCreateXamlObjects()
@@ -347,10 +359,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadTab()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _DuplicateFocusedTab on tab 1
@@ -438,10 +446,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadPane()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _SplitPane(Duplicate) on tab 1
@@ -693,7 +697,6 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -733,10 +736,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::MoveFocusFromZoomedPane()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -782,10 +781,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::CloseZoomedPane()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -841,10 +836,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::SwapPanes()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         auto page = _commonSetup();
 
         Log::Comment(L"Setup 4 panes.");
@@ -1051,10 +1042,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::NextMRUTab()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         // This is a test for GH#8025 - we want to make sure that we can do both
         // in-order and MRU tab traversal, using the tab switcher and with the
         // tab switcher disabled.
@@ -1171,10 +1158,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::VerifyCommandPaletteTabSwitcherOrder()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         // This is a test for GH#8188 - we want to make sure that the order of tabs
         // is preserved in the CommandPalette's TabSwitcher
 
@@ -1270,7 +1253,6 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1303,7 +1285,6 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1325,32 +1306,21 @@ namespace TerminalAppLocalTests
         });
     }
 
-    static til::color _getControlBackgroundColor(winrt::TerminalApp::implementation::ContentManager* contentManager,
-                                                 const winrt::Microsoft::Terminal::Control::TermControl& c)
-    {
-        auto interactivity{ contentManager->TryLookupCore(c.ContentId()) };
-        VERIFY_IS_NOT_NULL(interactivity);
-        const auto core{ interactivity.Core() };
-        return til::color{ core.BackgroundColor() };
-    }
-
     void TabTests::TestPreviewCommitScheme()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
 
         auto page = _commonSetup();
         VERIFY_IS_NOT_NULL(page);
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1360,13 +1330,15 @@ namespace TerminalAppLocalTests
             page->_PreviewAction(actionAndArgs);
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
 
             // And we should have stored a function to revert the change.
             VERIFY_ARE_EQUAL(1u, page->_restorePreviewFuncs.size());
@@ -1380,13 +1352,15 @@ namespace TerminalAppLocalTests
             page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
 
             // After preview there should be no more restore functions to execute.
             VERIFY_ARE_EQUAL(0u, page->_restorePreviewFuncs.size());
@@ -1402,21 +1376,19 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewDismissScheme()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then dismissed accordingly");
 
         auto page = _commonSetup();
         VERIFY_IS_NOT_NULL(page);
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1426,13 +1398,15 @@ namespace TerminalAppLocalTests
             page->_PreviewAction(actionAndArgs);
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1440,13 +1414,15 @@ namespace TerminalAppLocalTests
             page->_EndPreview();
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be the same as it originally was");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
         });
         Log::Comment(L"Sleep to let events propagate");
         Sleep(250);
@@ -1454,10 +1430,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewSchemeWhilePreviewing()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         Log::Comment(L"Preview a color scheme, then preview another scheme. ");
 
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
@@ -1465,12 +1437,14 @@ namespace TerminalAppLocalTests
         auto page = _commonSetup();
         VERIFY_IS_NOT_NULL(page);
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1479,13 +1453,15 @@ namespace TerminalAppLocalTests
             page->_PreviewColorScheme(args);
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1494,13 +1470,15 @@ namespace TerminalAppLocalTests
             page->_PreviewColorScheme(args);
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
         });
 
         TestOnUIThread([&page]() {
@@ -1511,13 +1489,15 @@ namespace TerminalAppLocalTests
             page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
         });
 
-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
             Log::Comment(L"Color should be changed");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
         });
         Log::Comment(L"Sleep to let events propagate");
         Sleep(250);
@@ -1525,10 +1505,6 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestClampSwitchToTab()
     {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
         Log::Comment(L"Test that switching to a tab index higher than the number of tabs just clamps to the last tab.");
 
         auto page = _commonSetup();

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj

@@ -60,9 +60,6 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsAppAdapterLib\TerminalSettingsAppAdapterLib.vcxproj">
-      <Project>{3c46e2b0-ae6c-4132-9122-6772fb411959}</Project>
-    </ProjectReference>
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->

src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj

@@ -22,7 +22,6 @@
     <VcpkgAutoLink>false</VcpkgAutoLink>
 
     <TerminalMUX>true</TerminalMUX>
-    <TerminalThemeHelpers>true</TerminalThemeHelpers>
 
     <!--
     These two properties are very important!
@@ -115,9 +114,6 @@
       <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
     </ProjectReference>
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
-    </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>

src/cascadia/Remoting/Resources/sr-Cyrl-RS/Resources.resw

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

src/cascadia/ShellExtension/OpenTerminalHere.h

@@ -34,7 +34,7 @@ struct
 #else // DEV
     __declspec(uuid("52065414-e077-47ec-a3ac-1cc5455e1b54"))
 #endif
-    OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
+        OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
 {
 #pragma region IExplorerCommand
     STDMETHODIMP Invoke(IShellItemArray* psiItemArray,

src/cascadia/TerminalApp/AboutDialog.cpp

@@ -6,6 +6,7 @@
 #include "AboutDialog.h"
 #include "AboutDialog.g.cpp"
 
+#include <LibraryResources.h>
 #include <WtExeUtils.h>
 
 #include "../../types/inc/utils.hpp"

src/cascadia/TerminalApp/ActionPreviewHandlers.cpp

@@ -5,7 +5,8 @@
 #include "TerminalPage.h"
 #include "Utils.h"
 #include "../../types/inc/utils.hpp"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
+
+#include <LibraryResources.h>
 
 using namespace winrt;
 using namespace winrt::Windows::Foundation::Collections;
@@ -96,19 +97,24 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& scheme{ _settings.GlobalSettings().ColorSchemes().TryLookup(args.SchemeName()) })
         {
-            // Clear the saved preview funcs because we don't need to add a restore each time
-            // the preview color changes, we only need to be able to restore the last one.
-            _restorePreviewFuncs.clear();
+            const auto backup = _restorePreviewFuncs.empty();
 
             _ApplyToActiveControls([&](const auto& control) {
-                auto temporarySettings{ winrt::make_self<Settings::TerminalSettings>() };
-                temporarySettings->ApplyColorScheme(scheme);
-                control.ApplyPreviewColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
+                // Stash a copy of the current scheme.
+                auto originalScheme{ control.ColorScheme() };
 
-                // Take a copy of the inputs, since they are pointers anyways.
-                _restorePreviewFuncs.emplace_back([=]() {
-                    control.ResetPreviewColorScheme();
-                });
+                // Apply the new scheme.
+                control.ColorScheme(scheme.ToCoreScheme());
+
+                if (backup)
+                {
+                    // Each control will emplace a revert into the
+                    // _restorePreviewFuncs for itself.
+                    _restorePreviewFuncs.emplace_back([=]() {
+                        // On dismiss, restore the original scheme.
+                        control.ColorScheme(originalScheme);
+                    });
+                }
             });
         }
     }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -8,7 +8,6 @@
 #include "ScratchpadContent.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
 #include "../../types/inc/utils.hpp"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 #include "Utils.h"
 
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
@@ -669,10 +668,8 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
             {
-                auto temporarySettings{ winrt::make_self<Settings::TerminalSettings>() };
-                temporarySettings->ApplyColorScheme(scheme);
                 const auto res = _ApplyToActiveControls([&](auto& control) {
-                    control.SetOverrideColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
+                    control.ColorScheme(scheme.ToCoreScheme());
                 });
                 args.Handled(res);
             }
@@ -903,10 +900,7 @@ namespace winrt::TerminalApp::implementation
             co_return;
         }
 
-        // ShellExecuteExW may block, so do it on a background thread.
-        //
-        // NOTE: All remaining code of this function doesn't touch `this`, so we don't need weak/strong_ref.
-        // NOTE NOTE: Don't touch `this` when you make changes here.
+        // Hop to the BG thread
         co_await winrt::resume_background();
 
         // This will get us the correct exe for dev/preview/release. If you
@@ -917,7 +911,7 @@ namespace winrt::TerminalApp::implementation
         // Build the commandline to pass to wt for this set of NewTerminalArgs
         // `-w -1` will ensure a new window is created.
         const auto commandline = terminalArgs.ToCommandline();
-        const auto cmdline = fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline);
+        winrt::hstring cmdline{ fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline) };
 
         // Build the args to ShellExecuteEx. We need to use ShellExecuteEx so we
         // can pass the SEE_MASK_NOASYNC flag. That flag allows us to safely
@@ -1459,8 +1453,6 @@ namespace winrt::TerminalApp::implementation
 
     safe_void_coroutine TerminalPage::_doHandleSuggestions(SuggestionsArgs realArgs)
     {
-        const auto weak = get_weak();
-        const auto dispatcher = Dispatcher();
         const auto source = realArgs.Source();
         std::vector<Command> commandsCollection;
         Control::CommandHistoryContext context{ nullptr };
@@ -1527,12 +1519,7 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        co_await wil::resume_foreground(dispatcher);
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());
 
         // Open the palette with all these commands in it.
         _OpenSuggestions(_GetActiveControl(),

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -5,6 +5,7 @@
 #include "AppCommandlineArgs.h"
 #include "../types/inc/utils.hpp"
 #include "TerminalSettingsModel/ModelSerializationHelpers.h"
+#include <LibraryResources.h>
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace TerminalApp;

src/cascadia/TerminalApp/AppLogic.cpp

@@ -6,6 +6,7 @@
 #include "AppLogic.g.cpp"
 #include "SettingsLoadEventArgs.h"
 
+#include <LibraryResources.h>
 #include <WtExeUtils.h>
 #include <wil/token_helpers.h>
 
@@ -149,9 +150,7 @@ namespace winrt::TerminalApp::implementation
             });
 
         _languageProfileNotifier = winrt::make_self<LanguageProfileNotifier>([this]() {
-            // TODO: This is really bad, because we reset any current user customizations.
-            // See GH#11522.
-            ReloadSettingsThrottled();
+            _reloadSettings->Run();
         });
 
         // Do this here, rather than at the top of main. This will prevent us from
@@ -331,7 +330,7 @@ namespace winrt::TerminalApp::implementation
 
                 if (modifiedBasename == settingsBasename)
                 {
-                    ReloadSettingsThrottled();
+                    _reloadSettings->Run();
                 }
             });
     }
@@ -437,11 +436,6 @@ namespace winrt::TerminalApp::implementation
         SettingsChanged.raise(*this, *ev);
     }
 
-    void AppLogic::ReloadSettingsThrottled()
-    {
-        _reloadSettings->Run();
-    }
-
     // This is a continuation of AppLogic::Create() and includes the more expensive parts.
     void AppLogic::NotifyRootInitialized()
     {