Terminal receives focus on drag n drop (#20003)

### Summary
Updates terminal to gain foreground focus when a user drags and drops a
file into the terminal.

### Changes
Updates the `DragDropHandler` to call `SetForegroundWindow`.

### Validation
* Built and deployed locally
* Manually verified terminal gains focus when dragging and dropping

Closes #19934

(cherry picked from commit a1a43a4ff5)
Service-Card-Id: PVTI_lADOAF3p4s4BQX0-zgpBND8
Service-Version: 1.25

.github/ISSUE_TEMPLATE/config.yml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,181 @@
+<?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/Stable/PDPs/qps-ploc/PDP.xml

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

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

@@ -0,0 +1,181 @@
+<?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/config/GitCheckin.json

@@ -4,7 +4,7 @@
         "collection": "microsoft",
         "project": "OS",
         "repo": "os.2020",
-        "name": "official/rs_we_adept_e4d2",
+        "name": "official/ge_current_directwinpd_deep",
         "workitem": "38106206",
         "CheckinFiles": [
           {

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

@@ -17,7 +17,6 @@
             "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.93.240607003" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.100.251104001" 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>main</PGOBranch>
+    <PGOBranch>release-1.25</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,6 +87,13 @@ 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-2019
+  vmImage: windows-latest
 
 resources:
   repositories:
@@ -51,8 +51,8 @@ steps:
   displayName: 'Touchdown Build - 7105, PRODEXT'
   inputs:
     teamId: 7105
-    TDBuildServiceConnection: $(TouchdownServiceConnection)
-    authType: SubjectNameIssuer
+    FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
+    authType: FederatedIdentityTDBuild
     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: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
+    pgoBuildMode: Optimize
     codeSign: true
     signingIdentity:
       serviceName: $(SigningServiceName)

build/pipelines/ob-release.yml

@@ -53,8 +53,12 @@ parameters:
     displayName: "Publish Symbols to MSDL"
     type: boolean
     default: true
+  - name: createVpack
+    displayName: "Create a VPack for Windows"
+    type: boolean
+    default: false
   - name: publishVpackToWindows
-    displayName: "Publish VPack to Windows"
+    displayName: "Publish above VPack to Windows"
     type: boolean
     default: false
 
@@ -89,6 +93,7 @@ extends:
       clientId: $(SigningOriginalClientId)
     terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
     publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
+    createVpack: ${{ parameters.createVpack }}
     publishVpackToWindows: ${{ parameters.publishVpackToWindows }}
     symbolPublishingSubscription: $(SymbolPublishingServiceConnection)
     symbolPublishingProject: $(SymbolPublishingProject)

build/pipelines/pgo.yml

@@ -50,6 +50,7 @@ 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
@@ -74,7 +75,7 @@ stages:
         parameters:
           jobName: MergePGD
           pool:
-            vmImage: 'windows-2022'
+            vmImage: 'windows-latest'
           buildConfiguration: Release
           buildPlatforms: ${{ parameters.buildPlatforms }}
           artifactStem: -instrumentation
@@ -82,7 +83,7 @@ stages:
       - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
         parameters:
           pool:
-            vmImage: 'windows-2022'
+            vmImage: 'windows-latest'
           dependsOn: MergePGD
           buildConfiguration: Release
           artifactStem: -instrumentation

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

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

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

@@ -71,6 +71,9 @@ parameters:
   - name: enableCaching
     type: boolean
     default: false
+  - name: afterBuildSteps
+    type: stepList
+    default: []
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -130,11 +133,11 @@ jobs:
           $SignFragments += "wpfdotnet"
         }
         If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
+          $BuildTargets += "Terminal\Control\TerminalControl"
           $SignFragments += "wpf"
         }
         If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
+          $BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
           $SignFragments += "conpty"
         }
         Write-Host "Targets: $($BuildTargets -Join ";")"
@@ -170,9 +173,9 @@ jobs:
   - ${{ parameters.beforeBuildSteps }}
 
   - task: VSBuild@1
-    displayName: Build OpenConsole.sln
+    displayName: Build OpenConsole.slnx
     inputs:
-      solution: 'OpenConsole.sln'
+      solution: 'OpenConsole.slnx'
       msbuildArgs: >-
         /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }}
         ${{ parameters.additionalBuildOptions }}
@@ -210,6 +213,8 @@ 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-2022 }
+  pool: { vmImage: windows-latest }
 
   steps:
   - checkout: self

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

@@ -26,6 +26,7 @@ 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
@@ -45,7 +46,8 @@ jobs:
 
   - task: NuGetAuthenticate@1
     inputs:
-      nuGetServiceConnections: 'Terminal Public Artifact Feed'
+      azureDevOpsServiceConnection: 'Terminal Public Artifact Feed'
+      feedUrl: $(nugetFeed)
 
   # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
   # This should be `task: NuGetCommand@2`
@@ -68,15 +70,7 @@ jobs:
     artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
     displayName: "Publish Pipeline Artifact"
 
-  - 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'
+  - pwsh: |-
+      $nupkg = Get-Item "$(Build.ArtifactStagingDirectory)/*.nupkg"
+      & nuget push -ApiKey az -Source "$(nugetFeed)" "$nupkg"
+    displayName: NuGet push

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

@@ -45,6 +45,10 @@ 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,6 +58,24 @@ 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

@@ -49,6 +49,9 @@ parameters:
   - name: symbolExpiryTime
     type: string
     default: 36530 # This is the default from PublishSymbols@2
+  - name: createVpack
+    type: boolean
+    default: false
   - name: publishVpackToWindows
     type: boolean
     default: false
@@ -192,8 +195,8 @@ extends:
                   ob_outputDirectory: $(JobOutputDirectory)
                   ob_artifactBaseName: $(JobOutputArtifactName)
                   ### This job is also in charge of submitting the vpack to Windows if it's enabled
-                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
+                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.createVpack) }}
+                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.createVpack, parameters.publishVpackToWindows) }}
                   ### If enabled above, these options are in play.
                   ob_createvpack_packagename: 'WindowsTerminal.app'
                   ob_createvpack_owneralias: 'conhost@microsoft.com'
@@ -207,6 +210,8 @@ 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'
@@ -229,7 +234,7 @@ extends:
                       New-Item "$(JobOutputDirectory)/vpack" -Type Directory
                     displayName: Make sure the vpack directory exists
 
-                  - ${{ if parameters.publishVpackToWindows }}:
+                  - ${{ if parameters.createVpack }}:
                     - pwsh: |-
                         Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path "$(JobOutputDirectory)/vpack" 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
                       displayName: Stage msixbundle for vpack

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

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

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

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

build/scripts/Get-DependenciesFromAppxRecipe.ps1

@@ -0,0 +1,17 @@
+[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,7 +26,12 @@
     "/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": [
@@ -44,6 +49,11 @@
     ".rec",
     ".err",
     "XamlStyler.json",
-    ".xlsx"
+    ".xlsx",
+    ".vcxproj",
+    ".vcxproj.filters",
+    ".Build.props",
+    ".Build.targets",
+    "OpenConsole.slnx"
   ]
 }

custom.props

@@ -3,7 +3,7 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>25</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>

dep/Console/ntcsrdll.h

@@ -7,9 +7,17 @@ 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,6 +5,10 @@ Licensed under the MIT license.
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OB_FILE_OBJECT_TYPE 1
 
 typedef struct _PORT_MESSAGE {
@@ -124,3 +128,7 @@ 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.93.240607003" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.100.251104001" 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.240122.1" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.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

@@ -0,0 +1,45 @@
+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

@@ -1,13 +0,0 @@
-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 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
+    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
     HEAD_REF master
     PATCHES
-        fix-write-batch.patch
+        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,13 +22,6 @@ 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": "11.1.4",
+  "version": "12.1.0",
   "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

@@ -0,0 +1,57 @@
+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

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,17 @@
+{
+  "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

@@ -0,0 +1,8 @@
+# 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,6 +1,11 @@
+# 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,6 +1,11 @@
+# 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,6 +1,11 @@
+# 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

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,8 @@
+# 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.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
+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:
 
 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.sln" /p:Configuration=%_LAST_BUILD_CONF% /p:Platform=%ARCH% /p:AppxSymbolPackageEnabled=false /t:Terminal\CascadiaPackage /m
+"%msbuild%" "%OPENCON%\OpenConsole.slnx" /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

@@ -2302,8 +2302,15 @@
       "additionalProperties": false,
       "properties": {
         "id": {
-          "description": "The ID of the command this keybinding should execute.",
-          "type": "string"
+          "description": "The ID of the command this keybinding should execute (or null to disable a default).",
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "keys": {
           "description": "Defines the key combinations used to call the command. It must be composed of...\n -any number of modifiers (ctrl/alt/shift)\n -a non-modifier key",
@@ -2400,6 +2407,14 @@
             "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.",
@@ -2459,6 +2474,7 @@
           "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"
           ]
@@ -2472,8 +2488,9 @@
           "type": "boolean"
         },
         "experimental.input.forceVT": {
-          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
-          "type": "boolean"
+          "type": "boolean",
+          "description": "[Deprecated] Replaced with the \"compatibility.input.forceVT\" profile setting.",
+          "deprecated": true
         },
         "experimental.useBackgroundImageForWindow": {
           "default": false,
@@ -2520,14 +2537,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": {
@@ -2573,9 +2590,12 @@
           "$ref": "#/$defs/NewTabMenu"
         },
         "language": {
-          "default": "",
+          "type": [
+            "string",
+            "null"
+          ],
           "description": "Sets an override for the app's preferred language, expressed as a BCP-47 language tag like en-US.",
-          "type": "string"
+          "default": null
         },
         "theme": {
           "default": "dark",
@@ -2639,19 +2659,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
@@ -2708,12 +2728,12 @@
       "type": "object",
       "properties": {
         "acrylicOpacity": {
+          "type": "number",
+          "description": "[Deprecated] Replaced with the \"opacity\" setting.",
           "default": 0.5,
-          "description": "[deprecated] Please use `opacity` instead.",
-          "deprecated": true,
-          "maximum": 1,
           "minimum": 0,
-          "type": "number"
+          "maximum": 1,
+          "deprecated": true
         },
         "antialiasingMode": {
           "default": "grayscale",
@@ -2739,6 +2759,11 @@
           "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.",
@@ -2910,24 +2935,29 @@
           "type": "boolean"
         },
         "experimental.autoMarkPrompts": {
-          "deprecated": true,
-          "description": "This has been replaced by autoMarkPrompts in 1.21",
-          "type": "boolean"
+          "type": "boolean",
+          "description": "[Deprecated] Replaced with the \"autoMarkPrompts\" setting.",
+          "deprecated": true
         },
         "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": {
-          "deprecated": true,
-          "description": "This has been replaced by showMarksOnScrollbar in 1.21",
-          "type": "boolean"
+          "type": "boolean",
+          "description": "[Deprecated] Replaced with the \"showMarksOnScrollbar\" setting.",
+          "deprecated": true
         },
         "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.",
@@ -2943,23 +2973,29 @@
           "type": "string"
         },
         "fontFace": {
-          "default": "Cascadia Mono",
-          "description": "[deprecated] Define 'face' within the 'font' object instead.",
           "type": "string",
+          "description": "[Deprecated] Replaced with the \"face\" setting within the \"font\" object.",
+          "default": "Cascadia Mono",
           "deprecated": true
         },
         "fontSize": {
-          "default": 12,
-          "description": "[deprecated] Define 'size' within the 'font' object instead.",
-          "minimum": 1,
           "type": "number",
+          "description": "[Deprecated] Replaced with the \"size\" setting within the \"font\" object.",
+          "default": 12,
+          "minimum": 1,
           "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",
@@ -2972,13 +3008,7 @@
                 "extra-bold",
                 "black",
                 "extra-black"
-              ],
-              "type": "string"
-            },
-            {
-              "maximum": 990,
-              "minimum": 100,
-              "type": "integer"
+              ]
             }
           ],
           "deprecated": true
@@ -3089,7 +3119,10 @@
         },
         "answerbackMessage": {
           "description": "The response that is sent when an ENQ control character is received.",
-          "type": "string"
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "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,6 +27,7 @@ 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

@@ -0,0 +1,123 @@
+<?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

@@ -0,0 +1,120 @@
+<?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/UTextAdapter.cpp

@@ -390,6 +390,9 @@ 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,46 +13,28 @@
 // - ulSize - The height of the cursor within this buffer
 Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
     _parentBuffer{ parentBuffer },
-    _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)
+    _ulSize(ulSize)
 {
 }
 
-Cursor::~Cursor() = default;
-
 til::point Cursor::GetPosition() const noexcept
 {
     return _cPosition;
 }
 
-bool Cursor::HasMoved() const noexcept
+uint64_t Cursor::GetLastMutationId() const noexcept
 {
-    return _fHasMoved;
+    return _mutationId;
 }
 
 bool Cursor::IsVisible() const noexcept
 {
-    return _fIsVisible;
+    return _isVisible;
 }
 
-bool Cursor::IsOn() const noexcept
+bool Cursor::IsBlinking() const noexcept
 {
-    return _fIsOn;
-}
-
-bool Cursor::IsBlinkingAllowed() const noexcept
-{
-    return _fBlinkingAllowed;
+    return _isBlinking;
 }
 
 bool Cursor::IsDouble() const noexcept
@@ -60,178 +42,128 @@ 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::SetHasMoved(const bool fHasMoved) noexcept
+void Cursor::SetIsVisible(bool enable) noexcept
 {
-    _fHasMoved = fHasMoved;
+    if (_isVisible != enable)
+    {
+        _isVisible = enable;
+        _redrawIfVisible();
+    }
 }
 
-void Cursor::SetIsVisible(const bool fIsVisible) noexcept
+void Cursor::SetIsBlinking(bool enable) noexcept
 {
-    _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();
+    if (_isBlinking != enable)
+    {
+        _isBlinking = enable;
+        _redrawIfVisible();
+    }
 }
 
 void Cursor::SetIsDouble(const bool fIsDouble) noexcept
 {
-    _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;
+    if (_fIsDouble != fIsDouble)
+    {
+        _fIsDouble = fIsDouble;
+        _redrawIfVisible();
+    }
 }
 
 void Cursor::SetSize(const ULONG ulSize) noexcept
 {
-    _ulSize = ulSize;
-    _RedrawCursor();
+    if (_ulSize != ulSize)
+    {
+        _ulSize = ulSize;
+        _redrawIfVisible();
+    }
 }
 
 void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
 {
-    _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())
+    if (_ulSize != ulSize || _cursorType != type)
     {
-        if (_fDeferCursorRedraw)
-        {
-            _fHaveDeferredCursorRedraw = true;
-        }
-        else
-        {
-            _RedrawCursorAlways();
-        }
+        _ulSize = ulSize;
+        _cursorType = type;
+        _redrawIfVisible();
     }
 }
 
-// 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
 {
-    _RedrawCursor();
-    _cPosition = cPosition;
-    _RedrawCursor();
+    // 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".
     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();
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -244,74 +176,33 @@ void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
 // - OtherCursor - The cursor to copy properties from
 // Return Value:
 // - <none>
-void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
+void Cursor::CopyProperties(const Cursor& other) noexcept
 {
-    // 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;
+    _cPosition = other._cPosition;
+    _coordDelayedAt = other._coordDelayedAt;
+    _ulSize = other._ulSize;
+    _cursorType = other._cursorType;
+    _isVisible = other._isVisible;
+    _isBlinking = other._isBlinking;
+    _fIsDouble = other._fIsDouble;
 }
 
 void Cursor::DelayEOLWrap() noexcept
 {
     _coordDelayedAt = _cPosition;
-    _fDelayedEolWrap = true;
 }
 
 void Cursor::ResetDelayEOLWrap() noexcept
 {
-    _coordDelayedAt = {};
-    _fDelayedEolWrap = false;
+    _coordDelayedAt.reset();
 }
 
-til::point Cursor::GetDelayedAtPosition() const noexcept
+const std::optional<til::point>& Cursor::GetDelayEOLWrap() const noexcept
 {
     return _coordDelayedAt;
 }
 
-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
+CursorType Cursor::GetType() const noexcept
 {
     return _cursorType;
 }
@@ -320,3 +211,18 @@ 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,8 +29,6 @@ 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;
@@ -38,29 +36,17 @@ public:
     Cursor(Cursor&&) = default;
     Cursor& operator=(Cursor&&) & = delete;
 
-    bool HasMoved() const noexcept;
+    uint64_t GetLastMutationId() const noexcept;
     bool IsVisible() const noexcept;
-    bool IsOn() const noexcept;
-    bool IsBlinkingAllowed() const noexcept;
+    bool IsBlinking() 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;
 
-    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 SetIsVisible(bool enable) noexcept;
+    void SetIsBlinking(bool enable) 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;
 
@@ -72,42 +58,30 @@ public:
     void DecrementXPosition(const til::CoordType DeltaX) noexcept;
     void DecrementYPosition(const til::CoordType DeltaY) noexcept;
 
-    void CopyProperties(const Cursor& OtherCursor) noexcept;
+    void CopyProperties(const Cursor& other) noexcept;
 
     void DelayEOLWrap() noexcept;
     void ResetDelayEOLWrap() noexcept;
-    til::point GetDelayedAtPosition() const noexcept;
-    bool IsDelayedEOLWrap() const noexcept;
+    const std::optional<til::point>& GetDelayEOLWrap() 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).
-
-    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?
-
+    std::optional<til::point> _coordDelayedAt; // coordinate the EOL wrap was delayed at.
     ULONG _ulSize;
-
-    void _RedrawCursor() noexcept;
-    void _RedrawCursorAlways() noexcept;
-
-    CursorType _cursorType;
+    CursorType _cursorType = CursorType::Legacy;
+    bool _isVisible = true;
+    bool _isBlinking = true;
+    bool _fIsDouble = false; // whether the cursor size should be doubled
 };

src/buffer/out/textBuffer.cpp

@@ -2628,11 +2628,8 @@ void TextBuffer::_AppendRTFText(std::string& contentBuilder, const std::wstring_
     }
 }
 
-void TextBuffer::SerializeToPath(const wchar_t* destination) const
+void TextBuffer::SerializeTo(HANDLE handle) 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);
@@ -2661,7 +2658,7 @@ void TextBuffer::SerializeToPath(const wchar_t* destination) const
         {
             const auto fileSize = gsl::narrow<DWORD>(buffer.size() * sizeof(wchar_t));
             DWORD bytesWritten = 0;
-            THROW_IF_WIN32_BOOL_FALSE(WriteFile(file.get(), buffer.data(), fileSize, &bytesWritten, nullptr));
+            THROW_IF_WIN32_BOOL_FALSE(WriteFile(handle, 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 SerializeToPath(const wchar_t* destination) const;
+    void SerializeTo(HANDLE handle) const;
 
     struct PositionInformation
     {

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -600,90 +600,6 @@ 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,9 +77,6 @@
     <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/LocalTests_TerminalApp/SettingsTests.cpp

@@ -5,12 +5,14 @@
 
 #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;
 
@@ -821,7 +823,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(3u, command.NestedCommands().Size());
             _logCommandNames(command.NestedCommands());
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -843,7 +845,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -865,7 +867,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -958,8 +960,8 @@ namespace TerminalAppLocalTests
 
         for (auto name : std::vector<std::wstring>({ L"profile0", L"profile1", L"profile2" }))
         {
-            winrt::hstring commandName{ fmt::format(L"New tab, profile: {}", name) };
-            auto command = rootCommand.NestedCommands().Lookup(commandName);
+            const auto childCommandName = fmt::format(FMT_COMPILE(L"New tab, profile: {}"), name);
+            auto command = rootCommand.NestedCommands().Lookup(childCommandName);
             VERIFY_IS_NOT_NULL(command);
             auto actionAndArgs = command.ActionAndArgs();
             VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1076,7 +1078,7 @@ namespace TerminalAppLocalTests
 
             _logCommandNames(command.NestedCommands());
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1098,7 +1100,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1120,7 +1122,7 @@ namespace TerminalAppLocalTests
                 VERIFY_IS_FALSE(childCommand.HasNestedCommands());
             }
             {
-                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
+                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
                 auto childCommand = command.NestedCommands().Lookup(childCommandName);
                 VERIFY_IS_NOT_NULL(childCommand);
                 auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1419,10 +1421,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile0", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1442,10 +1444,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile1", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1465,10 +1467,10 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile2", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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());
         }
 
         {
@@ -1490,10 +1492,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1514,10 +1516,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1538,10 +1540,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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());
         }
 
         {
@@ -1563,10 +1565,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1586,10 +1588,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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");
@@ -1610,10 +1612,10 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             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,7 +66,6 @@ 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);
 
@@ -131,23 +130,12 @@ 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()
@@ -359,6 +347,10 @@ 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
@@ -446,6 +438,10 @@ 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
@@ -697,6 +693,7 @@ 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();
@@ -736,6 +733,10 @@ 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");
@@ -781,6 +782,10 @@ 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");
@@ -836,6 +841,10 @@ 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.");
@@ -1042,6 +1051,10 @@ 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.
@@ -1158,6 +1171,10 @@ 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
 
@@ -1253,6 +1270,7 @@ 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();
@@ -1285,6 +1303,7 @@ 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();
@@ -1306,21 +1325,32 @@ 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]() {
+        TestOnUIThread([&page, this]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto& controlSettings = activeControl.Settings();
-            VERIFY_IS_NOT_NULL(controlSettings);
-
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1330,15 +1360,13 @@ namespace TerminalAppLocalTests
             page->_PreviewAction(actionAndArgs);
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
 
             // And we should have stored a function to revert the change.
             VERIFY_ARE_EQUAL(1u, page->_restorePreviewFuncs.size());
@@ -1352,15 +1380,13 @@ namespace TerminalAppLocalTests
             page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
 
             // After preview there should be no more restore functions to execute.
             VERIFY_ARE_EQUAL(0u, page->_restorePreviewFuncs.size());
@@ -1376,19 +1402,21 @@ 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]() {
+        TestOnUIThread([&page, this]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto& controlSettings = activeControl.Settings();
-            VERIFY_IS_NOT_NULL(controlSettings);
-
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1398,15 +1426,13 @@ namespace TerminalAppLocalTests
             page->_PreviewAction(actionAndArgs);
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1414,15 +1440,13 @@ namespace TerminalAppLocalTests
             page->_EndPreview();
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
         });
         Log::Comment(L"Sleep to let events propagate");
         Sleep(250);
@@ -1430,6 +1454,10 @@ 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");
@@ -1437,14 +1465,12 @@ namespace TerminalAppLocalTests
         auto page = _commonSetup();
         VERIFY_IS_NOT_NULL(page);
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             const auto& activeControl{ page->_GetActiveControl() };
             VERIFY_IS_NOT_NULL(activeControl);
 
-            const auto& controlSettings = activeControl.Settings();
-            VERIFY_IS_NOT_NULL(controlSettings);
-
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1453,15 +1479,13 @@ namespace TerminalAppLocalTests
             page->_PreviewColorScheme(args);
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1470,15 +1494,13 @@ namespace TerminalAppLocalTests
             page->_PreviewColorScheme(args);
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
         });
 
         TestOnUIThread([&page]() {
@@ -1489,15 +1511,13 @@ namespace TerminalAppLocalTests
             page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
         });
 
-        TestOnUIThread([&page]() {
+        TestOnUIThread([&page, this]() {
             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");
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
+            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
         });
         Log::Comment(L"Sleep to let events propagate");
         Sleep(250);
@@ -1505,6 +1525,10 @@ 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,6 +60,9 @@
     <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,6 +22,7 @@
     <VcpkgAutoLink>false</VcpkgAutoLink>
 
     <TerminalMUX>true</TerminalMUX>
+    <TerminalThemeHelpers>true</TerminalThemeHelpers>
 
     <!--
     These two properties are very important!
@@ -114,6 +115,9 @@
       <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

@@ -0,0 +1,120 @@
+<?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,7 +6,6 @@
 #include "AboutDialog.h"
 #include "AboutDialog.g.cpp"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 
 #include "../../types/inc/utils.hpp"

src/cascadia/TerminalApp/ActionPreviewHandlers.cpp

@@ -5,8 +5,7 @@
 #include "TerminalPage.h"
 #include "Utils.h"
 #include "../../types/inc/utils.hpp"
-
-#include <LibraryResources.h>
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
 using namespace winrt;
 using namespace winrt::Windows::Foundation::Collections;
@@ -97,24 +96,19 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& scheme{ _settings.GlobalSettings().ColorSchemes().TryLookup(args.SchemeName()) })
         {
-            const auto backup = _restorePreviewFuncs.empty();
+            // 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();
 
             _ApplyToActiveControls([&](const auto& control) {
-                // Stash a copy of the current scheme.
-                auto originalScheme{ control.ColorScheme() };
+                auto temporarySettings{ winrt::make_self<Settings::TerminalSettings>() };
+                temporarySettings->ApplyColorScheme(scheme);
+                control.ApplyPreviewColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
 
-                // 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);
-                    });
-                }
+                // Take a copy of the inputs, since they are pointers anyways.
+                _restorePreviewFuncs.emplace_back([=]() {
+                    control.ResetPreviewColorScheme();
+                });
             });
         }
     }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -8,6 +8,7 @@
 #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;
@@ -668,8 +669,10 @@ 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.ColorScheme(scheme.ToCoreScheme());
+                    control.SetOverrideColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
                 });
                 args.Handled(res);
             }
@@ -900,7 +903,10 @@ namespace winrt::TerminalApp::implementation
             co_return;
         }
 
-        // Hop to the BG thread
+        // 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.
         co_await winrt::resume_background();
 
         // This will get us the correct exe for dev/preview/release. If you
@@ -911,7 +917,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();
-        winrt::hstring cmdline{ fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline) };
+        const auto 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
@@ -1453,6 +1459,8 @@ 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 };
@@ -1467,7 +1475,7 @@ namespace winrt::TerminalApp::implementation
                                       WI_IsAnyFlagSet(source, SuggestionsSource::CommandHistory | SuggestionsSource::QuickFixes);
         if (const auto& control{ _GetActiveControl() })
         {
-            currentWorkingDirectory = control.CurrentWorkingDirectory();
+            currentWorkingDirectory = control.WorkingDirectory();
 
             if (shouldGetContext)
             {
@@ -1519,7 +1527,12 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        co_await wil::resume_foreground(Dispatcher());
+        co_await wil::resume_foreground(dispatcher);
+        const auto strong = weak.get();
+        if (!strong)
+        {
+            co_return;
+        }
 
         // Open the palette with all these commands in it.
         _OpenSuggestions(_GetActiveControl(),

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

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

src/cascadia/TerminalApp/AppLogic.h

@@ -36,6 +36,7 @@ namespace winrt::TerminalApp::implementation
         bool IsRunningElevated() const noexcept;
         bool CanDragDrop() const noexcept;
         void ReloadSettings();
+        void ReloadSettingsThrottled();
         void NotifyRootInitialized();
 
         bool HasSettingsStartupActions() const noexcept;
@@ -80,7 +81,6 @@ namespace winrt::TerminalApp::implementation
         [[nodiscard]] HRESULT _TryLoadSettings() noexcept;
         void _ProcessLazySettingsChanges();
         void _RegisterSettingsChange();
-        safe_void_coroutine _DispatchReloadSettings();
 
         void _setupFolderPathEnvVar();
 

src/cascadia/TerminalApp/AppLogic.idl

@@ -25,6 +25,7 @@ namespace TerminalApp
         Boolean HasSettingsStartupActions();
 
         void ReloadSettings();
+        void ReloadSettingsThrottled();
         Microsoft.Terminal.Settings.Model.CascadiaSettings Settings { get; };
 
         TerminalWindow CreateNewWindow();

src/cascadia/TerminalApp/ColorPickupFlyout.cpp

@@ -1,7 +1,6 @@
 #include "pch.h"
 #include "ColorPickupFlyout.h"
 #include "ColorPickupFlyout.g.cpp"
-#include <LibraryResources.h>
 
 namespace winrt::TerminalApp::implementation
 {

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "CommandPalette.h"
 #include "CommandPaletteItems.h"
-#include <LibraryResources.h>
 
 #include "CommandPalette.g.cpp"
 
@@ -929,6 +928,17 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                             const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
     {
+        // GH#18737: Only respond to this change if we are visible:
+        // _close calls _searchBox().Text(L"") to reset the search text, which lands us
+        // in here after the command palette is dismissed. Since we have a code path here that
+        // could potentially lead to an action being previewed (specifically if there is a
+        // preview-able action as the first entry in the command list), that preview will
+        // appear after the palette is dismissed without this check.
+        if (Visibility() != Visibility::Visible)
+        {
+            return;
+        }
+
         // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
         // is getting triggered because we set up the default value for that CommandPalette
         // with an empty string. Therefore, to avoid the reset of the index when executing

src/cascadia/TerminalApp/CommandPaletteItems.cpp

@@ -4,8 +4,6 @@
 #include "pch.h"
 #include "Tab.h"
 
-#include <LibraryResources.h>
-
 #include "CommandPaletteItems.h"
 
 using namespace winrt;

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -34,9 +34,15 @@ namespace winrt::Microsoft::TerminalApp::implementation
             // before actually starting the connection to the client app. This
             // will ensure both controls are initialized before the client app
             // is.
+            const auto weak = get_weak();
             co_await winrt::resume_background();
-            _pairedTap->_start.wait();
+            const auto strong = weak.get();
+            if (!strong)
+            {
+                co_return;
+            }
 
+            _pairedTap->_start.wait();
             _wrappedConnection.Start();
         }
         void WriteInput(const winrt::array_view<const char16_t> buffer)
@@ -120,9 +126,9 @@ namespace winrt::Microsoft::TerminalApp::implementation
         return ConnectionState::Failed;
     }
 
-    void DebugTapConnection::_OutputHandler(const std::wstring_view str)
+    void DebugTapConnection::_OutputHandler(const winrt::array_view<const char16_t> str)
     {
-        auto output = til::visualize_control_codes(str);
+        auto output = til::visualize_control_codes(winrt_array_to_wstring_view(str));
         // To make the output easier to read, we introduce a line break whenever
         // an LF control is encountered. But at this point, the LF would have
         // been converted to U+240A (␊), so that's what we need to search for.
@@ -130,7 +136,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
         {
             output.insert(++lfPos, L"\r\n");
         }
-        TerminalOutput.raise(output);
+        TerminalOutput.raise(winrt_wstring_to_array_view(output));
     }
 
     // Called by the DebugInputTapConnection to print user input
@@ -138,7 +144,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
     {
         auto clean{ til::visualize_control_codes(str) };
         auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
-        TerminalOutput.raise(formatted);
+        TerminalOutput.raise(winrt_wstring_to_array_view(formatted));
     }
 
     // Wire us up so that we can forward input through

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -13,7 +13,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
     {
     public:
         explicit DebugTapConnection(Microsoft::Terminal::TerminalConnection::ITerminalConnection wrappedConnection);
-        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
+        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {};
         ~DebugTapConnection();
         void Start();
         void WriteInput(const winrt::array_view<const char16_t> data);
@@ -31,7 +31,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
 
     private:
         void _PrintInput(const std::wstring_view data);
-        void _OutputHandler(const std::wstring_view str);
+        void _OutputHandler(const winrt::array_view<const char16_t> str);
 
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::TerminalOutput_revoker _outputRevoker;
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::StateChanged_revoker _stateChangedRevoker;

src/cascadia/TerminalApp/FilteredCommand.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "CommandPalette.h"
-#include <LibraryResources.h>
 #include "fzf/fzf.h"
 
 #include "FilteredCommand.g.cpp"

src/cascadia/TerminalApp/IPaneContent.idl

@@ -8,8 +8,7 @@ namespace TerminalApp
         None,
         Content,
         MovePane,
-        PersistLayout,
-        PersistAll
+        Persist,
     };
 
     runtimeclass BellEventArgs

src/cascadia/TerminalApp/Jumplist.cpp

@@ -43,6 +43,9 @@ safe_void_coroutine Jumplist::UpdateJumplist(const CascadiaSettings& settings) n
     // make sure to capture the settings _before_ the co_await
     const auto strongSettings = settings;
 
+    // Explorer APIs may block, so do it on a background thread.
+    //
+    // NOTE: Jumplist has no members, so we don't need to hold onto `this` here.
     co_await winrt::resume_background();
 
     try

src/cascadia/TerminalApp/MarkdownPaneContent.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "MarkdownPaneContent.h"
-#include <LibraryResources.h>
 #include "MarkdownPaneContent.g.cpp"
 #include <til/io.h>
 

src/cascadia/TerminalApp/MarkdownPaneContent.h

@@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation
 #pragma region IPaneContent
         winrt::Windows::UI::Xaml::FrameworkElement GetRoot();
 
-        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&){};
+        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&) {};
 
         winrt::Windows::Foundation::Size MinimumSize() { return { 1, 1 }; };
         void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic) { reason; };

src/cascadia/TerminalApp/MinMaxCloseControl.cpp

@@ -5,7 +5,6 @@
 
 #include "MinMaxCloseControl.h"
 #include "MinMaxCloseControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt::Windows::UI::Xaml;
 
@@ -89,6 +88,18 @@ namespace winrt::TerminalApp::implementation
         CloseClick.raise(*this, e);
     }
 
+    bool MinMaxCloseControl::Focused() const
+    {
+        return _focused;
+    }
+
+    void MinMaxCloseControl::Focused(bool focused)
+    {
+        _focused = focused;
+
+        ReleaseButtons();
+    }
+
     void MinMaxCloseControl::SetWindowVisualState(WindowVisualState visualState)
     {
         // Look up the heights we should use for the caption buttons from our
@@ -170,25 +181,25 @@ namespace winrt::TerminalApp::implementation
             // animate the fade in/out transition between colors.
         case CaptionButton::Minimize:
             VisualStateManager::GoToState(MinimizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
-            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
 
             _displayToolTip->Run(MinimizeButton());
             closeToolTipForButton(MaximizeButton());
             closeToolTipForButton(CloseButton());
             break;
         case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
             VisualStateManager::GoToState(MaximizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
 
             closeToolTipForButton(MinimizeButton());
             _displayToolTip->Run(MaximizeButton());
             closeToolTipForButton(CloseButton());
             break;
         case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
-            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
             VisualStateManager::GoToState(CloseButton(), L"PointerOver", true);
 
             closeToolTipForButton(MinimizeButton());
@@ -211,17 +222,17 @@ namespace winrt::TerminalApp::implementation
         {
         case CaptionButton::Minimize:
             VisualStateManager::GoToState(MinimizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
-            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
             break;
         case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
             VisualStateManager::GoToState(MaximizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
             break;
         case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
-            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
             VisualStateManager::GoToState(CloseButton(), L"Pressed", true);
             break;
         }
@@ -234,9 +245,9 @@ namespace winrt::TerminalApp::implementation
     void MinMaxCloseControl::ReleaseButtons()
     {
         _displayToolTip->Run(nullptr);
-        VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
-        VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
-        VisualStateManager::GoToState(CloseButton(), L"Normal", true);
+        VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+        VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+        VisualStateManager::GoToState(CloseButton(), _normalState(), true);
 
         closeToolTipForButton(MinimizeButton());
         closeToolTipForButton(MaximizeButton());
@@ -244,4 +255,11 @@ namespace winrt::TerminalApp::implementation
 
         _lastPressedButton = std::nullopt;
     }
+
+    const winrt::param::hstring& MinMaxCloseControl::_normalState() const
+    {
+        static const winrt::param::hstring normal = L"Normal";
+        static const winrt::param::hstring unfocused = L"Unfocused";
+        return (_focused ? normal : unfocused);
+    }
 }

src/cascadia/TerminalApp/MinMaxCloseControl.h

@@ -21,6 +21,9 @@ namespace winrt::TerminalApp::implementation
         void PressButton(CaptionButton button);
         void ReleaseButtons();
 
+        bool Focused() const;
+        void Focused(bool focused);
+
         void _MinimizeClick(const winrt::Windows::Foundation::IInspectable& sender,
                             const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
         void _MaximizeClick(const winrt::Windows::Foundation::IInspectable& sender,
@@ -32,8 +35,12 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> MaximizeClick;
         til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> CloseClick;
 
+        bool _focused{ false };
         std::shared_ptr<ThrottledFunc<winrt::Windows::UI::Xaml::Controls::Button>> _displayToolTip{ nullptr };
         std::optional<CaptionButton> _lastPressedButton{ std::nullopt };
+
+    private:
+        const winrt::param::hstring& _normalState() const;
     };
 }
 

src/cascadia/TerminalApp/MinMaxCloseControl.idl

@@ -14,6 +14,7 @@ namespace TerminalApp
         void HoverButton(CaptionButton button);
         void PressButton(CaptionButton button);
         void ReleaseButtons();
+        Boolean Focused { get; set; };
 
         event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MinimizeClick;
         event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MaximizeClick;

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -32,6 +32,10 @@
                                     ResourceKey="SystemControlForegroundBaseHighBrush" />
                     <StaticResource x:Key="CaptionButtonForegroundPressed"
                                     ResourceKey="SystemControlForegroundBaseHighBrush" />
+                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
+                                    ResourceKey="TextFillColorDisabled" />
+                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
+                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                     <SolidColorBrush x:Key="CaptionButtonBackground"
                                      Color="Transparent" />
                     <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -66,6 +70,10 @@
                                     ResourceKey="SystemControlForegroundBaseHighBrush" />
                     <StaticResource x:Key="CaptionButtonForegroundPressed"
                                     ResourceKey="SystemControlForegroundBaseHighBrush" />
+                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
+                                    ResourceKey="TextFillColorDisabled" />
+                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
+                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                     <SolidColorBrush x:Key="CaptionButtonBackground"
                                      Color="Transparent" />
                     <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -103,6 +111,10 @@
                                      Color="{ThemeResource SystemColorHighlightTextColor}" />
                     <SolidColorBrush x:Key="CaptionButtonForegroundPressed"
                                      Color="{ThemeResource SystemColorHighlightTextColor}" />
+                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
+                                     Color="{ThemeResource SystemColorButtonTextColor}" />
+                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
+                                    ResourceKey="SystemColorButtonTextColor" />
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver"
                                      Color="{ThemeResource SystemColorHighlightColor}" />
                     <SolidColorBrush x:Key="CloseButtonForegroundPointerOver"
@@ -189,6 +201,20 @@
                                                                     Duration="0:0:0.1" />
                                                 </Storyboard>
                                             </VisualTransition>
+
+                                            <VisualTransition From="PointerOver"
+                                                              To="Unfocused">
+                                                <Storyboard>
+                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement"
+                                                                    Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)"
+                                                                    To="{ThemeResource CaptionButtonBackgroundColor}"
+                                                                    Duration="0:0:0.15" />
+                                                    <ColorAnimation Storyboard.TargetName="ButtonIcon"
+                                                                    Storyboard.TargetProperty="(UIElement.Foreground).(SolidColorBrush.Color)"
+                                                                    To="{ThemeResource CaptionButtonForegroundUnfocusedColor}"
+                                                                    Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </VisualTransition>
                                         </VisualStateGroup.Transitions>
 
                                         <VisualState x:Name="Normal">
@@ -198,6 +224,13 @@
                                             </VisualState.Setters>
                                         </VisualState>
 
+                                        <VisualState x:Name="Unfocused">
+                                            <VisualState.Setters>
+                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackground}" />
+                                                <Setter Target="ButtonIcon.Foreground" Value="{ThemeResource CaptionButtonForegroundUnfocused}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+
                                         <VisualState x:Name="PointerOver">
                                             <VisualState.Setters>
                                                 <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackgroundPointerOver}" />

src/cascadia/TerminalApp/Remoting.cpp

@@ -44,10 +44,6 @@ namespace winrt::TerminalApp::implementation
     {
         _args = { value.begin(), value.end() };
         _parseResult = _parsed.ParseArgs(_args);
-        if (_parseResult == 0)
-        {
-            _parsed.ValidateStartupCommands();
-        }
     }
 
     winrt::com_array<winrt::hstring> CommandlineArgs::Commandline()

src/cascadia/TerminalApp/Resources/de-DE/Resources.resw

@@ -152,12 +152,6 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Beim Laden von Benutzereinstellungen sind Fehler aufgetreten</value>
   </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Warnung:</value>
-  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>Der "{0}" wird nicht auf Ihrem Computer ausgeführt. Dies kann verhindern, dass die Terminal Tastatur Eingaben empfangen.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -171,21 +165,9 @@
   <data name="AboutMenuItem" xml:space="preserve">
     <value>Info</value>
   </data>
-  <data name="FeedbackMenuItem" xml:space="preserve">
-    <value>Feedback</value>
-  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Abbrechen</value>
-  </data>
-  <data name="CloseAll" xml:space="preserve">
-    <value>Alle schließen</value>
-  </data>
-  <data name="Quit" xml:space="preserve">
-    <value>Beenden</value>
-  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Mehrere Bereiche</value>
   </data>
@@ -292,13 +274,6 @@
     <value>• Das angegebene "Design" wurde in der Liste der Designs nicht gefunden. Vorübergehender Fallback auf den Standardwert.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
-  <data name="LegacyGlobalsProperty" xml:space="preserve">
-    <value>Die Eigenschaft "globals" ist veraltet. Möglicherweise müssen Sie Ihre Einstellungen aktualisieren. </value>
-    <comment>{Locked="\"globals\""} </comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
-    <value>Weitere Informationen hierzu finden Sie auf dieser Webseite.</value>
-  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Fehler beim Erweitern eines Befehls mit "iterateOn". Dieser Befehl wird ignoriert.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -479,21 +454,12 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>STRG+Klicken, um als Administrator zu öffnen</value>
   </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Schließen</value>
-  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Schließen</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Schließen</value>
   </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Maximieren</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Minimieren</value>
-  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Minimieren</value>
   </data>
@@ -513,10 +479,6 @@
     <value>Version:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
-  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
-    <value>Erste Schritte</value>
-    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
-  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Quellcode</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -792,18 +754,9 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Text exportieren</value>
   </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>Exportieren des Terminalinhalts fehlgeschlagen</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>Terminalinhalt wurde erfolgreich exportiert</value>
-  </data>
   <data name="FindText" xml:space="preserve">
     <value>Suchen</value>
   </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Unformatierter Text</value>
-  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Das Beendigungsverhalten kann in den erweiterten Profileinstellungen konfiguriert werden.</value>
   </data>
@@ -909,10 +862,6 @@
     <value>Registerkarte „{0}“ an Position „{1}“ verschoben</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>Der aktive Bereich wurde in "{1}" Fenster auf "{0}" Registerkarte verschoben.</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Der aktive Bereich wurde in das Fenster "{0}" verschoben</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -149,12 +149,6 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Encountered errors while loading user settings</value>
   </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Warning:</value>
-  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>The "{0}" isn't running on your machine. This can prevent the Terminal from receiving keyboard input.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -165,28 +159,12 @@
   <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
     <value>Failed to reload settings</value>
   </data>
-  <data name="FeedbackUriValue" xml:space="preserve">
-    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
-    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
-  </data>
   <data name="AboutMenuItem" xml:space="preserve">
     <value>About</value>
   </data>
-  <data name="FeedbackMenuItem" xml:space="preserve">
-    <value>Feedback</value>
-  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="CloseAll" xml:space="preserve">
-    <value>Close all</value>
-  </data>
-  <data name="Quit" xml:space="preserve">
-    <value>Quit</value>
-  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Multiple panes</value>
   </data>
@@ -293,17 +271,6 @@
     <value>• The specified "theme" was not found in the list of themes. Temporarily falling back to the default value.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
-  <data name="LegacyGlobalsProperty" xml:space="preserve">
-    <value>The "globals" property is deprecated - your settings might need updating. </value>
-    <comment>{Locked="\"globals\""} </comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
-    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
-    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
-    <value>For more info, see this web page.</value>
-  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Failed to expand a command with "iterateOn" set. This command will be ignored.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -484,21 +451,12 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>Ctrl+Click to open as administrator</value>
   </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Close</value>
-  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Close</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Close</value>
   </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Maximize</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Minimize</value>
-  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Minimize</value>
   </data>
@@ -518,10 +476,6 @@
     <value>Version:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
-  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
-    <value>Getting started</value>
-    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
-  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Source code</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -797,18 +751,9 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Export text</value>
   </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>Failed to export terminal content</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>Successfully exported terminal content</value>
-  </data>
   <data name="FindText" xml:space="preserve">
     <value>Find</value>
   </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Plain text</value>
-  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Termination behavior can be configured in advanced profile settings.</value>
   </data>
@@ -914,10 +859,6 @@
     <value>"{0}" tab moved to position "{1}"</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>Active pane moved to "{0}" tab in "{1}" window</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Active pane moved to "{0}" window</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
@@ -982,4 +923,4 @@
   <data name="InvalidRegex" xml:space="preserve">
     <value>An invalid regular expression was found.</value>
   </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/es-ES/Resources.resw

@@ -149,12 +149,6 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Se detectaron errores al cargar la configuración de usuario</value>
   </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>Aceptar</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Advertencia:</value>
-  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>El "{0}" no se está ejecutando en el equipo. Esto puede impedir que el terminal reciba entradas del teclado.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -168,21 +162,9 @@
   <data name="AboutMenuItem" xml:space="preserve">
     <value>Acerca de</value>
   </data>
-  <data name="FeedbackMenuItem" xml:space="preserve">
-    <value>Comentarios</value>
-  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Configuración</value>
   </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Cancelar</value>
-  </data>
-  <data name="CloseAll" xml:space="preserve">
-    <value>Cerrar todo</value>
-  </data>
-  <data name="Quit" xml:space="preserve">
-    <value>Salir</value>
-  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Varios paneles</value>
   </data>
@@ -289,13 +271,6 @@
     <value>• No se encontró el "tema" especificado en la lista de temas. Revirtiendo temporalmente al valor predeterminado.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
-  <data name="LegacyGlobalsProperty" xml:space="preserve">
-    <value>La propiedad "globals" está en desuso, es posible que tengas que actualizar la configuración. </value>
-    <comment>{Locked="\"globals\""} </comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
-    <value>Para más información, consulta esta página web.</value>
-  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>No se pudo expandir un comando con el conjunto de "iterateOn". Este comando se omitirá.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -476,21 +451,12 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>Ctrl+Clic para abrir como administrador</value>
   </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Cerrar</value>
-  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Cerrar</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Cerrar</value>
   </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Maximizar</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Minimizar</value>
-  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Minimizar</value>
   </data>
@@ -510,10 +476,6 @@
     <value>Versión:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
-  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
-    <value>Introducción</value>
-    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
-  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Código fuente</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -789,18 +751,9 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Exportar texto</value>
   </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>No se pudo exportar el contenido del terminal</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>El contenido del terminal se exportó correctamente</value>
-  </data>
   <data name="FindText" xml:space="preserve">
     <value>Buscar</value>
   </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Texto sin formato</value>
-  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>El comportamiento de finalización se puede configurar en la configuración avanzada del perfil.</value>
   </data>
@@ -906,10 +859,6 @@
     <value>La pestaña "{0}" se movió a la posición "{1}"</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>El panel activo se movió a la pestaña "{0}" en "{1}" ventana</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Panel activo movido a la ventana "{0}"</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>

src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw

@@ -149,12 +149,6 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Erreurs rencontrées lors du chargement des paramètres utilisateur</value>
   </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Avertissement :</value>
-  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>Le "{0}" n’est pas en cours d’exécution sur votre ordinateur. Cela peut empêcher le terminal de recevoir l’entrée au clavier.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -168,21 +162,9 @@
   <data name="AboutMenuItem" xml:space="preserve">
     <value>À propos de</value>
   </data>
-  <data name="FeedbackMenuItem" xml:space="preserve">
-    <value>Commentaires</value>
-  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Paramètres</value>
   </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Annuler</value>
-  </data>
-  <data name="CloseAll" xml:space="preserve">
-    <value>Fermer tout</value>
-  </data>
-  <data name="Quit" xml:space="preserve">
-    <value>Quitter</value>
-  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Volets multiples</value>
   </data>
@@ -289,13 +271,6 @@
     <value>• Le « thème » spécifié est introuvable dans la liste des thèmes. Retour temporaire à la valeur par défaut.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
-  <data name="LegacyGlobalsProperty" xml:space="preserve">
-    <value>La propriété "globals" est déconseillée. Vos paramètres nécessiteront peut-être une mise à jour. </value>
-    <comment>{Locked="\"globals\""} </comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
-    <value>Pour plus d’informations, voir cette page web.</value>
-  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Echec du développement d’une commande avec "iterateOn". Cette commande sera ignorée.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -476,21 +451,12 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>Ctrl+Clic pour ouvrir en tant qu’administrateur</value>
   </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Fermer</value>
-  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Fermer</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Fermer</value>
   </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Agrandir</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Réduire</value>
-  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Réduire</value>
   </data>
@@ -510,10 +476,6 @@
     <value>Version :</value>
     <comment>This is the heading for a version number label</comment>
   </data>
-  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
-    <value>Bien démarrer</value>
-    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
-  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Code source</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -789,18 +751,9 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Exporter le texte</value>
   </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>Échec de l’exportation du contenu du terminal</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>Le contenu du terminal a été exporté.</value>
-  </data>
   <data name="FindText" xml:space="preserve">
     <value>Rechercher</value>
   </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Texte brut</value>
-  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Le comportement d’arrêt peut être configuré dans les paramètres de profil avancés.</value>
   </data>
@@ -887,7 +840,7 @@
     <value>Déplacer l'onglet vers une nouvelle fenêtre </value>
   </data>
   <data name="RunAsAdminFlyout.Text" xml:space="preserve">
-    <value>Exécuter en temps qu'administrateur (restreint)</value>
+    <value>Exécuter en tant qu'administrateur (restreint)</value>
     <comment>This text is displayed on context menu for profile entries in add new tab button.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
@@ -906,10 +859,6 @@
     <value>Onglet « {0} » déplacé vers la position « {1} »</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>Volet actif déplacé vers l’onglet "{0}" dans "{1}" fenêtre</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>

src/cascadia/TerminalApp/Resources/it-IT/Resources.resw

@@ -149,12 +149,6 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Si sono verificati errori durante il caricamento delle impostazioni utente</value>
   </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Avvertenza:</value>
-  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>Il "{0}" non è in esecuzione nel computer. Ciò può impedire al terminale di ricevere l'input da tastiera.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -168,21 +162,9 @@
   <data name="AboutMenuItem" xml:space="preserve">
     <value>Informazioni</value>
   </data>
-  <data name="FeedbackMenuItem" xml:space="preserve">
-    <value>Feedback</value>
-  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Impostazioni</value>
   </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Annulla</value>
-  </data>
-  <data name="CloseAll" xml:space="preserve">
-    <value>Chiudi tutto</value>
-  </data>
-  <data name="Quit" xml:space="preserve">
-    <value>Esci</value>
-  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Più riquadri</value>
   </data>
@@ -289,13 +271,6 @@
     <value>• Impossibile trovare il "tema" specificato nell'elenco dei temi. Fallback temporaneo al valore predefinito.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
-  <data name="LegacyGlobalsProperty" xml:space="preserve">
-    <value>La proprietà "globals" è deprecata: potrebbe essere necessario aggiornare le impostazioni. </value>
-    <comment>{Locked="\"globals\""} </comment>
-  </data>
-  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
-    <value>Per altre informazioni, visita questa pagina Web.</value>
-  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Impossibile espandere un comando con "iterateOn" impostato. Il comando verrà ignorato.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -476,21 +451,12 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>CTRL+CLIC per aprire come amministratore</value>
   </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Chiudi</value>
-  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Chiudi</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Chiudi</value>
   </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Ingrandisci</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Riduci a icona</value>
-  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Riduci a icona</value>
   </data>
@@ -510,10 +476,6 @@
     <value>Versione:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
-  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
-    <value>Introduzione</value>
-    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
-  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Codice sorgente</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -789,18 +751,9 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Esporta testo</value>
   </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>Non è stato possibile esportare il contenuto del terminale</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>Il contenuto del terminale è stato esportato</value>
-  </data>
   <data name="FindText" xml:space="preserve">
     <value>Trova</value>
   </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Testo normale</value>
-  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>È possibile configurare il comportamento di terminazione nelle impostazioni avanzate del profilo.</value>
   </data>
@@ -906,10 +859,6 @@
     <value>Scheda "{0}" spostata nella posizione "{1}"</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>Riquadro attivo spostato nella scheda "{0}" nella finestra "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Riquadro attivo spostato nella finestra "{0}"</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>