Merge remote-tracking branch 'origin/main' into dev/duhowett/connection-utf8

This fixes an issue where calling close on a tab/pane won't
raise a StateChange notification on the connection.

.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

@@ -495,6 +495,7 @@ DSBUFFERDESC
 DSBVOLUME
 dsm
 dsound
+DSRCPR
 DSSCL
 DSwap
 DTo
@@ -540,7 +541,6 @@ EPres
 EQU
 ERASEBKGND
 ERRORONEXIT
-ESFCIB
 esrp
 ESV
 ETW
@@ -603,7 +603,6 @@ FONTSTRING
 FONTTYPE
 FONTWIDTH
 FONTWINDOW
-foob
 FORCEOFFFEEDBACK
 FORCEONFEEDBACK
 FRAMECHANGED
@@ -620,7 +619,6 @@ FUNCTIONCALL
 fuzzmain
 fuzzmap
 fuzzwrapper
-fuzzyfinder
 fwdecl
 fwe
 fwlink
@@ -807,6 +805,7 @@ IMPEXP
 inbox
 inclusivity
 INCONTEXT
+INDEXID
 INFOEX
 inheritcursor
 INITCOMMONCONTROLSEX
@@ -908,6 +907,7 @@ LNM
 LOADONCALL
 LOBYTE
 localappdata
+LOCATIONCHANGE
 locsrc
 Loewen
 LOGBRUSH
@@ -959,7 +959,6 @@ lsb
 lsconfig
 lstatus
 lstrcmp
-lstrcmpi
 LTEXT
 lto
 ltsc
@@ -1033,6 +1032,7 @@ MOUSEACTIVATE
 MOUSEFIRST
 MOUSEHWHEEL
 MOVESTART
+msaa
 msb
 msbuildcache
 msctls
@@ -1091,6 +1091,8 @@ NEXTLINE
 nfe
 NLSMODE
 NOACTIVATE
+NOACTIVATEKEYBOARDLAYOUT
+NOACTIVATETIP
 NOAPPLYNOW
 NOCLIP
 NOCOMM
@@ -1122,7 +1124,6 @@ NOREPOSITION
 NORMALDISPLAY
 NOSCRATCH
 NOSEARCH
-noselect
 NOSELECTION
 NOSENDCHANGING
 NOSIZE
@@ -1140,6 +1141,7 @@ NOYIELD
 NOZORDER
 NPFS
 nrcs
+NRNW
 NSTATUS
 ntapi
 ntdef
@@ -1180,7 +1182,6 @@ onecoreuuid
 ONECOREWINDOWS
 onehalf
 oneseq
-oob
 openbash
 opencode
 opencon
@@ -1505,7 +1506,6 @@ scrolllock
 scrolloffset
 SCROLLSCALE
 SCROLLSCREENBUFFER
-scursor
 sddl
 SDKDDK
 segfault
@@ -1585,6 +1585,7 @@ SLGP
 SLIST
 slmult
 sln
+slnx
 slpit
 SManifest
 SMARTQUOTE
@@ -1703,9 +1704,11 @@ TEXTMETRIC
 TEXTMETRICW
 textmode
 texttests
+TFCAT
 THUMBPOSITION
 THUMBTRACK
 tilunittests
+TIPCAP
 titlebars
 TITLEISLINKNAME
 TLDP
@@ -1757,10 +1760,13 @@ UIACCESS
 uiacore
 uiautomationcore
 uielem
+UIELEMENTENABLED
+UIELEMENTENABLEDONLY
 UINTs
 uld
 uldash
 uldb
+ULONGLONG
 ulwave
 Unadvise
 unattend
@@ -1972,8 +1978,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/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/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/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-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

@@ -74,7 +74,7 @@ stages:
         parameters:
           jobName: MergePGD
           pool:
-            vmImage: 'windows-2022'
+            vmImage: 'windows-latest'
           buildConfiguration: Release
           buildPlatforms: ${{ parameters.buildPlatforms }}
           artifactStem: -instrumentation
@@ -82,7 +82,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

@@ -75,9 +75,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 }}
@@ -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-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'
@@ -229,7 +232,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-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"
   ]
 }

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 -->

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",
@@ -2459,6 +2466,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 +2480,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 +2529,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 +2582,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 +2651,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 +2720,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 +2751,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 +2927,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 +2965,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 +3000,7 @@
                 "extra-bold",
                 "black",
                 "extra-black"
-              ],
-              "type": "string"
-            },
-            {
-              "maximum": 990,
-              "minimum": 100,
-              "type": "integer"
+              ]
             }
           ],
           "deprecated": true
@@ -3089,7 +3111,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/#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/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/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;
 
@@ -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/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);
             }

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>
 

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"
 

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

@@ -39,9 +39,9 @@ namespace winrt::Microsoft::TerminalApp::implementation
 
             _wrappedConnection.Start();
         }
-        void WriteInput(const winrt::array_view<const char16_t> buffer)
+        void WriteInput(const winrt::array_view<const uint8_t> buffer)
         {
-            _pairedTap->_PrintInput(winrt_array_to_wstring_view(buffer));
+            _pairedTap->_PrintInput(winrt_array_to_string_view(buffer));
             _wrappedConnection.WriteInput(buffer);
         }
         void Resize(uint32_t rows, uint32_t columns) { _wrappedConnection.Resize(rows, columns); }
@@ -80,7 +80,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
         _start.count_down();
     }
 
-    void DebugTapConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void DebugTapConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
     {
         // If the user types into the tap side, forward it to the input side
         if (auto strongInput{ _inputSide.get() })
@@ -120,25 +120,44 @@ namespace winrt::Microsoft::TerminalApp::implementation
         return ConnectionState::Failed;
     }
 
-    void DebugTapConnection::_OutputHandler(const std::wstring_view str)
+    void DebugTapConnection::_OutputHandler(const winrt::array_view<const uint8_t>& str)
     {
-        auto output = til::visualize_control_codes(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.
-        for (size_t lfPos = 0; (lfPos = output.find(L'\u240A', lfPos)) != std::wstring::npos;)
+        uint8_t buffer[5] = { 0xe2, 0x90, 0x00, '\r', '\n' };
+        uint32_t i = 0, s = 0;
+        while (i < str.size())
         {
-            output.insert(++lfPos, L"\r\n");
+            while (i < str.size() && str[i] > 0x20 && str[i] != 0x7f)
+            {
+                ++i;
+            }
+            if (i > s)
+            {
+                TerminalOutput.raise(winrt::array_view{ str.data() + s, (i - s) });
+                s = i;
+            }
+            if (i >= str.size())
+                break;
+            auto ch = str[i];
+            if (ch == '\x20')
+                buffer[2] = 0xA3;
+            else if (ch == '\x7f')
+                buffer[2] = 0xA1;
+            else
+                buffer[2] = 0x80 | ch;
+            // If we encountered a LF, emit the extra \r\n from the buffer to pretty print it.
+            TerminalOutput.raise(winrt::array_view{ buffer, ch == '\x0a' ? 5u : 3u });
+            ++i;
+            ++s;
         }
-        TerminalOutput.raise(output);
     }
 
     // Called by the DebugInputTapConnection to print user input
-    void DebugTapConnection::_PrintInput(const std::wstring_view str)
+    void DebugTapConnection::_PrintInput(const std::string_view str)
     {
-        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);
+        static constexpr std::string_view buffer{ "\x1b[91m\x1b[m" }; // two escape sequences we need to write, back to back
+        TerminalOutput.raise(winrt_u8string_to_array_view(buffer.substr(0,5)));
+        _OutputHandler(winrt_u8string_to_array_view(str));
+        TerminalOutput.raise(winrt_u8string_to_array_view(buffer.substr(5)));
     }
 
     // Wire us up so that we can forward input through

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -16,7 +16,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
         void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
         ~DebugTapConnection();
         void Start();
-        void WriteInput(const winrt::array_view<const char16_t> data);
+        void WriteInput(const winrt::array_view<const uint8_t> data);
         void Resize(uint32_t rows, uint32_t columns);
         void Close();
 
@@ -30,8 +30,8 @@ namespace winrt::Microsoft::TerminalApp::implementation
         til::typed_event<winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection, winrt::Windows::Foundation::IInspectable> StateChanged;
 
     private:
-        void _PrintInput(const std::wstring_view data);
-        void _OutputHandler(const std::wstring_view str);
+        void _PrintInput(const std::string_view data);
+        void _OutputHandler(const winrt::array_view<const uint8_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/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/MinMaxCloseControl.cpp

@@ -5,7 +5,6 @@
 
 #include "MinMaxCloseControl.h"
 #include "MinMaxCloseControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt::Windows::UI::Xaml;
 

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/fr-FR/Resources.resw

@@ -887,7 +887,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">

src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw

@@ -185,7 +185,7 @@
     <value>終了</value>
   </data>
   <data name="MultiplePanes" xml:space="preserve">
-    <value>複数ウィンドウ</value>
+    <value>複数ペイン</value>
   </data>
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>閉じる</value>
@@ -203,13 +203,13 @@
     <value>タブを閉じる</value>
   </data>
   <data name="PaneClose" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
+    <value>ペインを閉じる</value>
   </data>
   <data name="SplitTabText" xml:space="preserve">
     <value>タブを分割</value>
   </data>
   <data name="SplitPaneText" xml:space="preserve">
-    <value>ウィンドウを分割する</value>
+    <value>ペインを分割する</value>
   </data>
   <data name="SplitPaneToolTipText" xml:space="preserve">
     <value>分割する方向を右クリック - 右/下/上/左</value>
@@ -230,7 +230,7 @@
     <value>複製</value>
   </data>
   <data name="SwapPaneText" xml:space="preserve">
-    <value>ウィンドウを入れ替える</value>
+    <value>ペインを入れ替える</value>
   </data>
   <data name="SwapPaneDownText" xml:space="preserve">
     <value>下とペインを入れ替え</value>
@@ -245,10 +245,10 @@
     <value>左とペインを入れ替え</value>
   </data>
   <data name="TogglePaneZoomText" xml:space="preserve">
-    <value>ウィンドウのズームの切り替え</value>
+    <value>ペインのズームの切り替え</value>
   </data>
   <data name="CloseOtherPanesText" xml:space="preserve">
-    <value>他のウィンドウを閉じる</value>
+    <value>他のペインを閉じる</value>
   </data>
   <data name="SearchWebText" xml:space="preserve">
     <value>Web 検索</value>
@@ -317,7 +317,7 @@
     <value>同じ名前ですが大文字と小文字が異なる環境変数が複数見つかりました。使用される値は 1 つだけです。</value>
   </data>
   <data name="CmdCommandArgDesc" xml:space="preserve">
-    <value>新しいタブまたはウィンドウで生成されるオプションのコマンドと引数</value>
+    <value>新しいタブまたはペインで生成されるオプションのコマンドと引数</value>
   </data>
   <data name="SaveSnippetDesc" xml:space="preserve">
     <value>コマンド ラインを入力アクションとして保存する</value>
@@ -345,17 +345,17 @@
     <value>指定されたインデックスのタブにフォーカスを移動する</value>
   </data>
   <data name="CmdMovePaneTabArgDesc" xml:space="preserve">
-    <value>フォーカスされたウィンドウを指定されたインデックスのタブに移動する</value>
+    <value>フォーカスされたペインを指定されたインデックスのタブに移動する</value>
   </data>
   <data name="CmdMovePaneDesc" xml:space="preserve">
-    <value>フォーカスされたウィンドウを別のタブに移動する</value>
+    <value>フォーカスされたペインを別のタブに移動する</value>
   </data>
   <data name="CmdMPDesc" xml:space="preserve">
     <value>"move-pane" サブコマンドのエイリアス。</value>
     <comment>{Locked="\"move-pane\""}</comment>
   </data>
   <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
-    <value>サイズを親ウィンドウに対する割合として指定します。有効な値は (0,1) の間で、排他的です。</value>
+    <value>サイズを親ペインに対する割合として指定します。有効な値は (0,1) の間で、排他的です。</value>
   </data>
   <data name="CmdNewTabDesc" xml:space="preserve">
     <value>新しいタブの作成</value>
@@ -365,14 +365,14 @@
     <comment>{Locked="\"new-tab\""}</comment>
   </data>
   <data name="CmdFocusPaneDesc" xml:space="preserve">
-    <value>別のウィンドウにフォーカスを移動する</value>
+    <value>別のペインにフォーカスを移動する</value>
   </data>
   <data name="CmdFPDesc" xml:space="preserve">
     <value>"focus-pane" サブコマンドのエイリアス。</value>
     <comment>{Locked="\"focus-pane\""}</comment>
   </data>
   <data name="CmdFocusPaneTargetArgDesc" xml:space="preserve">
-    <value>指定されたインデックスのウィンドウをフォーカスする</value>
+    <value>指定されたインデックスのペインをフォーカスする</value>
   </data>
   <data name="CmdProfileArgDesc" xml:space="preserve">
     <value>指定されたプロファイルで開きます。プロファイルの名前または GUID を指定できます</value>
@@ -381,20 +381,20 @@
     <value>WT_SESSION 変数を設定します; GUID である必要があります</value>
   </data>
   <data name="CmdSplitPaneDesc" xml:space="preserve">
-    <value>新しい分割ウィンドウの作成</value>
+    <value>新しい分割ペインの作成</value>
   </data>
   <data name="CmdSPDesc" xml:space="preserve">
     <value>"split-pane" サブコマンドのエイリアス。</value>
     <comment>{Locked="\"split-pane\""}</comment>
   </data>
   <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
-    <value>新しいウィンドウを水平方向に分割して作成します ([-]と考えてください)</value>
+    <value>新しいペインを水平方向に分割して作成します ([-]と考えてください)</value>
   </data>
   <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
-    <value>新しいウィンドウを垂直方向に分割して作成します ([|]と考えてください)</value>
+    <value>新しいペインを垂直方向に分割して作成します ([|]と考えてください)</value>
   </data>
   <data name="CmdSplitPaneDuplicateArgDesc" xml:space="preserve">
-    <value>フォーカスされたウィンドウのプロファイルを複製して、新しいウィンドウを作成します</value>
+    <value>フォーカスされたペインのプロファイルを複製して、新しいペインを作成します</value>
   </data>
   <data name="CmdStartingDirArgDesc" xml:space="preserve">
     <value>プロファイルの "startingDirectory" の設定ではなく、指定されたディレクトリで開きます</value>
@@ -412,7 +412,7 @@
     <comment>{Locked="\"tabTitle\""}</comment>
   </data>
   <data name="CmdInheritEnvDesc" xml:space="preserve">
-    <value>新しい環境ブロックを作成するのではなく、新しいタブまたはウィンドウを作成するときに、ターミナル独自の環境変数を継承します。これは、"command" が渡されたときに既定で設定されます。 </value>
+    <value>新しい環境ブロックを作成するのではなく、新しいタブまたはペインを作成するときに、ターミナル独自の環境変数を継承します。これは、"command" が渡されたときに既定で設定されます。 </value>
     <comment>{Locked="\"command\""}</comment>
   </data>
   <data name="CmdColorSchemeArgDesc" xml:space="preserve">
@@ -429,7 +429,7 @@
     <value>ウィンドウを全画面表示モードで起動する</value>
   </data>
   <data name="CmdMoveFocusDesc" xml:space="preserve">
-    <value>指定した方向にある隣のウィンドウにフォーカスを移動する</value>
+    <value>指定した方向にある隣のペインにフォーカスを移動する</value>
   </data>
   <data name="CmdMFDesc" xml:space="preserve">
     <value>"move-focus" サブコマンドのエイリアス。</value>
@@ -439,10 +439,10 @@
     <value>フォーカスを移動する方向</value>
   </data>
   <data name="CmdSwapPaneDesc" xml:space="preserve">
-    <value>フォーカスされたウィンドウを、指定された方向の隣接するウィンドウと入れ替える</value>
+    <value>フォーカスされたペインを、指定された方向の隣接するペインと入れ替える</value>
   </data>
   <data name="CmdSwapPaneDirectionArgDesc" xml:space="preserve">
-    <value>フォーカスされたウィンドウを移動する方向</value>
+    <value>フォーカスされたペインを移動する方向</value>
   </data>
   <data name="CmdFocusDesc" xml:space="preserve">
     <value>ウィンドウをフォーカス モードで起動</value>
@@ -857,7 +857,7 @@
     <value>設定ページを開きます</value>
   </data>
   <data name="SplitTabToolTip" xml:space="preserve">
-    <value>現在のディレクトリのアクティブなプロファイルを使用して新しいウィンドウを開きます</value>
+    <value>現在のディレクトリのアクティブなプロファイルを使用して新しいペインを開きます</value>
   </data>
   <data name="TabCloseAfterToolTip" xml:space="preserve">
     <value>このタブの右側にあるすべてのタブを閉じます</value>
@@ -872,10 +872,10 @@
     <value>なし</value>
   </data>
   <data name="ClosePaneText" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
+    <value>ペインを閉じる</value>
   </data>
   <data name="ClosePaneToolTip" xml:space="preserve">
-    <value>複数のウィンドウが存在する場合は、アクティブなウィンドウを閉じます</value>
+    <value>複数のペインが存在する場合は、アクティブなペインを閉じます</value>
   </data>
   <data name="TabColorClearButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.FullDescription" xml:space="preserve">
     <value>タブの色をリセット</value>
@@ -892,7 +892,7 @@
     <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">
-    <value>アクティブなウィンドウを [{0}] タブに移動しました</value>
+    <value>アクティブなペインを [{0}] タブに移動しました</value>
     <comment>{Locked="{0}"}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.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
@@ -908,19 +908,19 @@
     <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>アクティブなウィンドウを "{1}" ウィンドウの [{0}] タブに移動しました</value>
+    <value>アクティブなペインを "{1}" ウィンドウの [{0}] タブに移動しました</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>アクティブなウィンドウを "{0}" ウィンドウに移動しました</value>
+    <value>アクティブなペインを "{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>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
-    <value>アクティブなウィンドウを新しいウィンドウに移動しました</value>
+    <value>アクティブなペインを新しいウィンドウに移動しました</value>
     <comment>This text is read out by screen readers upon a successful pane movement to a new window.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewTab" xml:space="preserve">
-    <value>アクティブなウィンドウを新しいタブに移動しました</value>
+    <value>アクティブなペインを新しいタブに移動しました</value>
     <comment>This text is read out by screen readers upon a successful pane movement to a new tab within the existing window.</comment>
   </data>
   <data name="CmdAppendCommandLineDesc" xml:space="preserve">
@@ -930,7 +930,7 @@
     <value>接続の再起動</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>アクティブウィンドウ接続を再起動します</value>
+    <value>アクティブ ペイン接続を再起動します</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>抜粋</value>
@@ -961,10 +961,10 @@
     <value>操作の保存に失敗しました</value>
   </data>
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
+    <value>ペインを閉じる</value>
   </data>
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
+    <value>ペインを閉じる</value>
   </data>
   <data name="TabMoveLeft" xml:space="preserve">
     <value>左へ移動</value>

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

@@ -0,0 +1,985 @@
+<?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="InitialJsonParseErrorText" xml:space="preserve">
+    <value>Подешавања нису могла да се учитау из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+  </data>
+  <data name="MissingDefaultProfileText" xml:space="preserve">
+    <value>У листи профила није могао да се пронађе ваш подразумевани профил - користи се први профил. Проверите да ли се "defaultProfile" подудара са GUID неког од ваших профила.</value>
+    <comment>{Locked="\"defaultProfile\""}</comment>
+  </data>
+  <data name="DuplicateProfileText" xml:space="preserve">
+    <value>У вашем фајлу подешавања је пронађено више профила са истим GUID - дупликати се игноришу. Обезбедите да је GUID сваког профила јединствен.</value>
+  </data>
+  <data name="UnknownColorSchemeText" xml:space="preserve">
+    <value>Пронађен је профил са неисправном вредности "colorScheme". Тај профил ће користити подразумеване боје. Када постављате "colorScheme", будите сигурни да се вредност подудара са вредности "name" профила боја у "schemes" листи.</value>
+    <comment>{Locked="\"colorScheme\"","\"name\"","\"schemes\""}</comment>
+  </data>
+  <data name="NoProfilesText" xml:space="preserve">
+    <value>У вашим подешавањима није пронађен ниједан профил.</value>
+  </data>
+  <data name="AllProfilesHiddenText" xml:space="preserve">
+    <value>У вашим подешавањима су сви профили скривени. Морате да имате барем један профил који није сакривен.</value>
+  </data>
+  <data name="ReloadJsonParseErrorText" xml:space="preserve">
+    <value>Подешавања нису могла поново да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+  </data>
+  <data name="UsingDefaultSettingsText" xml:space="preserve">
+    <value>Привремено се користе подразумевана подешавања Windows Терминала.</value>
+  </data>
+  <data name="InitialJsonParseErrorTitle" xml:space="preserve">
+    <value>Није успело учитавање подешавања</value>
+  </data>
+  <data name="SettingsValidateErrorTitle" xml:space="preserve">
+    <value>Наишло се на грешке током учитавања корисничких подешавања</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Упозорење:</value>
+  </data>
+  <data name="KeyboardServiceWarningText" xml:space="preserve">
+    <value>„{0}” се не извршава на вашој машини. Због тога Терминал можда неће моћи да прима улаз са тастатуре.</value>
+    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
+  </data>
+  <data name="Ok" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
+    <value>Није успело поновно учитавање подешавања</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>О програму</value>
+  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Повратне информације</value>
+  </data>
+  <data name="SettingsMenuItem" xml:space="preserve">
+    <value>Подешавања</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Напусти</value>
+  </data>
+  <data name="MultiplePanes" xml:space="preserve">
+    <value>Више панела</value>
+  </data>
+  <data name="TabCloseSubMenu" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
+  <data name="TabMoveSubMenu" xml:space="preserve">
+    <value>Премести картицу</value>
+  </data>
+  <data name="TabCloseAfter" xml:space="preserve">
+    <value>Затвори картице на десној страни</value>
+  </data>
+  <data name="TabCloseOther" xml:space="preserve">
+    <value>Затвори остале картице</value>
+  </data>
+  <data name="TabClose" xml:space="preserve">
+    <value>Затвори картицу</value>
+  </data>
+  <data name="PaneClose" xml:space="preserve">
+    <value>Затвори панел</value>
+  </data>
+  <data name="SplitTabText" xml:space="preserve">
+    <value>Подели картицу</value>
+  </data>
+  <data name="SplitPaneText" xml:space="preserve">
+    <value>Подели панел</value>
+  </data>
+  <data name="SplitPaneToolTipText" xml:space="preserve">
+    <value>Десни клик за смерове поделе - десно/доле/горе/лево</value>
+  </data>
+  <data name="SplitPaneDownText" xml:space="preserve">
+    <value>Подели панел наниже</value>
+  </data>
+  <data name="SplitPaneRightText" xml:space="preserve">
+    <value>Подели панел удесно</value>
+  </data>
+  <data name="SplitPaneUpText" xml:space="preserve">
+    <value>Подели панел навише</value>
+  </data>
+  <data name="SplitPaneLeftText" xml:space="preserve">
+    <value>Подели панел улево</value>
+  </data>
+  <data name="SplitPaneDuplicateText" xml:space="preserve">
+    <value>Дуплирај</value>
+  </data>
+  <data name="SwapPaneText" xml:space="preserve">
+    <value>Замени панел</value>
+  </data>
+  <data name="SwapPaneDownText" xml:space="preserve">
+    <value>Замени са панелом испод</value>
+  </data>
+  <data name="SwapPaneRightText" xml:space="preserve">
+    <value>Замени са панелом десно</value>
+  </data>
+  <data name="SwapPaneUpText" xml:space="preserve">
+    <value>Замени са панелом изнад</value>
+  </data>
+  <data name="SwapPaneLeftText" xml:space="preserve">
+    <value>Замени са панелом лево</value>
+  </data>
+  <data name="TogglePaneZoomText" xml:space="preserve">
+    <value>Укљ./искљ. зум у панел</value>
+  </data>
+  <data name="CloseOtherPanesText" xml:space="preserve">
+    <value>Затвори остале панеле</value>
+  </data>
+  <data name="SearchWebText" xml:space="preserve">
+    <value>Претрага веба</value>
+  </data>
+  <data name="TabColorChoose" xml:space="preserve">
+    <value>Промени боју картице</value>
+  </data>
+  <data name="TabColorCustomButton.Content" xml:space="preserve">
+    <value>Произвољна</value>
+  </data>
+  <data name="TabColorClearButton.Content" xml:space="preserve">
+    <value>Ресетуј</value>
+  </data>
+  <data name="RenameTabText" xml:space="preserve">
+    <value>Промени име картице</value>
+  </data>
+  <data name="DuplicateTabText" xml:space="preserve">
+    <value>Дуплирај картицу</value>
+  </data>
+  <data name="InvalidMediaResource" xml:space="preserve">
+    <value>Не може да се пронађе један или више ресурса (као што је икона или backgroundImage) наведених у вашим подешавањима.</value>
+    <comment>{Locked="icon","backgroundImage"} Indicates that something has gone wrong while reading a user's settings.</comment>
+  </data>
+  <data name="AtLeastOneKeybindingWarning" xml:space="preserve">
+    <value>Током парсирања ваших пречица пронађена су упозорења:</value>
+  </data>
+  <data name="TooManyKeysForChord" xml:space="preserve">
+    <value>• Пронађена је пречица са превише стрингова за "keys" низ. Требало би да постоји само једна стринг вредност у низу "keys".</value>
+    <comment>{Locked="\"keys\"","•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="FailedToParseSubCommands" xml:space="preserve">
+    <value>• Није успело парсирање свих поткоманди угнеждене команде.</value>
+  </data>
+  <data name="MissingRequiredParameter" xml:space="preserve">
+    <value>• Пронађена је пречица којој недостаје обавезна вредност параметра. Ова пречица ће се игнорисати.</value>
+    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="UnknownTheme" xml:space="preserve">
+    <value>• Наведена "theme" није пронађена у листи тема. Привремено се употребљава подразумевана вредност.</value>
+    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Особина "globals" је застарела - ваша подешавања би требало да се ажурирају. </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>За више информација, погледајте следећу веб страницу.</value>
+  </data>
+  <data name="FailedToParseCommandJson" xml:space="preserve">
+    <value>Није успело развијање команде којој је постављено "iterateOn". Ова команда ће се игнорисати.</value>
+    <comment>{Locked="\"iterateOn\""} </comment>
+  </data>
+  <data name="InvalidColorSchemeInCmd" xml:space="preserve">
+    <value>Пронађена је команда са неисправном вредности "colorScheme". Ова команда ће се игнорисати. Када постављате "colorScheme", обезбедите да се вредност подудара са "name" вредности шеме боја у "schemes" листи.</value>
+    <comment>{Locked="\"colorScheme\"","\"name\"","\"schemes\""}</comment>
+  </data>
+  <data name="InvalidSplitSize" xml:space="preserve">
+    <value>Пронађена је "splitPane" команда са неисправном вредности "size". Ова команда ће се игнорисати. Обезбедите да је вредност између 0 и 1, искључиво.</value>
+    <comment>{Locked="\"splitPane\"","\"size\""}</comment>
+  </data>
+  <data name="FailedToParseStartupActions" xml:space="preserve">
+    <value>Није успело парсирање "startupActions".</value>
+    <comment>{Locked="\"startupActions\""}</comment>
+  </data>
+  <data name="InvalidProfileEnvironmentVariables" xml:space="preserve">
+    <value>Пронађено је више променљивих окружења са истим именом исписаним различитом величином слова (мала/велика) - користиће се само једна вредност.</value>
+  </data>
+  <data name="CmdCommandArgDesc" xml:space="preserve">
+    <value>Необавезна команда, са аргументима, која ће да се покрене у новој картици или панелу</value>
+  </data>
+  <data name="SaveSnippetDesc" xml:space="preserve">
+    <value>Чува командну линију као акцију уноса</value>
+  </data>
+  <data name="SaveSnippetArgDesc" xml:space="preserve">
+    <value>Необавезни аргумент</value>
+  </data>
+  <data name="KeyChordArgDesc" xml:space="preserve">
+    <value>Необавезни аргумент</value>
+  </data>
+  <data name="CmdFocusTabDesc" xml:space="preserve">
+    <value>Премешта фокус на другу картицу</value>
+  </data>
+  <data name="CmdFocusTabNextArgDesc" xml:space="preserve">
+    <value>Премешта фокус на наредну картицу</value>
+  </data>
+  <data name="CmdFTDesc" xml:space="preserve">
+    <value>Алијас за "focus-tab" поткоманду.</value>
+    <comment>{Locked="\"focus-tab\""}</comment>
+  </data>
+  <data name="CmdFocusTabPrevArgDesc" xml:space="preserve">
+    <value>Премешта фокус на претходну картицу</value>
+  </data>
+  <data name="CmdFocusTabTargetArgDesc" xml:space="preserve">
+    <value>Премешта фокус на картицу са наведеним индексом</value>
+  </data>
+  <data name="CmdMovePaneTabArgDesc" xml:space="preserve">
+    <value>Премешта фокусирани панел у картицу са наведеним индексом</value>
+  </data>
+  <data name="CmdMovePaneDesc" xml:space="preserve">
+    <value>Премешта фокусирани панел у другу картицу</value>
+  </data>
+  <data name="CmdMPDesc" xml:space="preserve">
+    <value>Алијас за "move-pane" поткоманду.</value>
+    <comment>{Locked="\"move-pane\""}</comment>
+  </data>
+  <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
+    <value>Наводи величину као проценат панела родитеља. Исправне вредности су између (0,1), искључиво.</value>
+  </data>
+  <data name="CmdNewTabDesc" xml:space="preserve">
+    <value>Креира нову картицу</value>
+  </data>
+  <data name="CmdNTDesc" xml:space="preserve">
+    <value>Алијас за "new-tab" поткоманду.</value>
+    <comment>{Locked="\"new-tab\""}</comment>
+  </data>
+  <data name="CmdFocusPaneDesc" xml:space="preserve">
+    <value>Премешта фокус на други панел</value>
+  </data>
+  <data name="CmdFPDesc" xml:space="preserve">
+    <value>Алијас за "focus-pane" поткоманду.</value>
+    <comment>{Locked="\"focus-pane\""}</comment>
+  </data>
+  <data name="CmdFocusPaneTargetArgDesc" xml:space="preserve">
+    <value>Фокусира панел са наведеним индексом</value>
+  </data>
+  <data name="CmdProfileArgDesc" xml:space="preserve">
+    <value>Отвара наведеним профилом. Прихвата или име или GUID профила</value>
+  </data>
+  <data name="CmdSessionIdArgDesc" xml:space="preserve">
+    <value>Поставља WT_SESSION променљиву; мора бити GUID</value>
+  </data>
+  <data name="CmdSplitPaneDesc" xml:space="preserve">
+    <value>Креира нови подељени панел</value>
+  </data>
+  <data name="CmdSPDesc" xml:space="preserve">
+    <value>Алијас за "split-pane" поткоманду.</value>
+    <comment>{Locked="\"split-pane\""}</comment>
+  </data>
+  <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
+    <value>Креира нову панел као хоризонталну поделу (као [-])</value>
+  </data>
+  <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
+    <value>Креира нови панел као вертикалну поделу (као [|])</value>
+  </data>
+  <data name="CmdSplitPaneDuplicateArgDesc" xml:space="preserve">
+    <value>Креира нови панел дуплирањем профила фокусираног панела</value>
+  </data>
+  <data name="CmdStartingDirArgDesc" xml:space="preserve">
+    <value>Отвара у наведеном директоријуму, а не у оном постављеном у "startingDirectory" профила</value>
+    <comment>{Locked="\"startingDirectory\""}</comment>
+  </data>
+  <data name="CmdTitleArgDesc" xml:space="preserve">
+    <value>Отвара терминал са наведеним насловом, а не са оним постављеним у "title" профила</value>
+    <comment>{Locked="\"title\""}</comment>
+  </data>
+  <data name="CmdTabColorArgDesc" xml:space="preserve">
+    <value>Отвара картицу са наведеном бојом, у #ццззпп формату</value>
+  </data>
+  <data name="CmdSuppressApplicationTitleDesc" xml:space="preserve">
+    <value>Отвара картицу са tabTitle које преиначује подразумевани наслов и уз игнорисање поруке за промену наслова из апликације</value>
+    <comment>{Locked="\"tabTitle\""}</comment>
+  </data>
+  <data name="CmdInheritEnvDesc" xml:space="preserve">
+    <value>Уместо да се приликом креирања нове картице или панела креира нови свежи блок окружења, наслеђују се терминалове променљиве окружења. Када се прослеђује "command", подразумевана вредност за ово је постави.</value>
+    <comment>{Locked="\"command\""}</comment>
+  </data>
+  <data name="CmdColorSchemeArgDesc" xml:space="preserve">
+    <value>Уместо са "colorScheme" постављеном у профилу, отвара картицу са наведеном шемом боја</value>
+    <comment>{Locked="\"colorScheme\""}</comment>
+  </data>
+  <data name="CmdVersionDesc" xml:space="preserve">
+    <value>Приказује верзију апликације</value>
+  </data>
+  <data name="CmdMaximizedDesc" xml:space="preserve">
+    <value>Покреће прозор максимизован</value>
+  </data>
+  <data name="CmdFullscreenDesc" xml:space="preserve">
+    <value>Покреће прозор у режиму пуног екрана</value>
+  </data>
+  <data name="CmdMoveFocusDesc" xml:space="preserve">
+    <value>Премешта фокуса на суседни панел у наведеном смеру</value>
+  </data>
+  <data name="CmdMFDesc" xml:space="preserve">
+    <value>Алијас за "move-focus" поткоманду.</value>
+    <comment>{Locked="\"move-focus\""}</comment>
+  </data>
+  <data name="CmdMoveFocusDirectionArgDesc" xml:space="preserve">
+    <value>Смер у којем се помера фокус</value>
+  </data>
+  <data name="CmdSwapPaneDesc" xml:space="preserve">
+    <value>Замењује фокусирани панел са суседним панелом у наведеном смеру</value>
+  </data>
+  <data name="CmdSwapPaneDirectionArgDesc" xml:space="preserve">
+    <value>Смер у којем се помера фокусирани панел</value>
+  </data>
+  <data name="CmdFocusDesc" xml:space="preserve">
+    <value>Покреће прозор у фокусираном режиму</value>
+  </data>
+  <data name="CmdSavedLayoutArgDesc" xml:space="preserve">
+    <value>Овај параметар је детаљ интерне имплементације и не би требало да се користи.</value>
+  </data>
+  <data name="CmdWindowTargetArgDesc" xml:space="preserve">
+    <value>Наводи прозор терминала у којем би требало да се покрене наведена командна линија. „0” се увек односи на текући прозор. </value>
+  </data>
+  <data name="CmdPositionDesc" xml:space="preserve">
+    <value>Наводи позицију терминала, у „x,y” формату.</value>
+  </data>
+  <data name="CmdSizeDesc" xml:space="preserve">
+    <value>Наводи број колона и редова за терминал, и "к,р" формату.</value>
+  </data>
+  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Притисните дугме да се отвори нова картица терминала са вашим подразумеваним профилом. Отвориће се потпалета у којој бирате профил који желите да се отвори.</value>
+  </data>
+  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Нова картица</value>
+  </data>
+  <data name="NewTabRun.Text" xml:space="preserve">
+    <value>Отвара нову картицу</value>
+  </data>
+  <data name="NewPaneRun.Text" xml:space="preserve">
+    <value>Alt+Клик да поделите текући прозор</value>
+  </data>
+  <data name="NewWindowRun.Text" xml:space="preserve">
+    <value>Shift+Клик да отворите нови прозор</value>
+  </data>
+  <data name="ElevatedRun.Text" xml:space="preserve">
+    <value>Ctrl+Клик да отворите као администратор</value>
+  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
+  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
+  <data name="WindowMinimizeButtonToolTip.Text" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
+  <data name="AboutDialog.Title" xml:space="preserve">
+    <value>О програму</value>
+  </data>
+  <data name="AboutDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Пошаљи информације</value>
+  </data>
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="AboutDialog_VersionLabel.Text" xml:space="preserve">
+    <value>Верзија:</value>
+    <comment>This is the heading for a version number label</comment>
+  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Брзи почетак</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>Изворни кôд</value>
+    <comment>A hyperlink name for the Terminal's documentation</comment>
+  </data>
+  <data name="AboutDialog_DocumentationLink.Content" xml:space="preserve">
+    <value>Документација</value>
+    <comment>A hyperlink name for user documentation</comment>
+  </data>
+  <data name="AboutDialog_ReleaseNotesLink.Content" xml:space="preserve">
+    <value>Белешке о издању</value>
+    <comment>A hyperlink name for the Terminal's release notes</comment>
+  </data>
+  <data name="AboutDialog_PrivacyPolicyLink.Content" xml:space="preserve">
+    <value>Политика приватности</value>
+    <comment>A hyperlink name for the Terminal's privacy policy</comment>
+  </data>
+  <data name="AboutDialog_ThirdPartyNoticesLink.Content" xml:space="preserve">
+    <value>Напомене треће стране</value>
+    <comment>A hyperlink name for the Terminal's third-party notices</comment>
+  </data>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Желите ли да затворите све прозоре?</value>
+  </data>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Желите ли да затворите све картице?</value>
+  </data>
+  <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseReadOnlyDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ипак затвори</value>
+  </data>
+  <data name="CloseReadOnlyDialog.Title" xml:space="preserve">
+    <value>Упозорење</value>
+  </data>
+  <data name="CloseReadOnlyDialog.Content" xml:space="preserve">
+    <value>Управо ћете затворити терминал означен само за читање. Желите ли да наставите?</value>
+  </data>
+  <data name="LargePasteDialog.CloseButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="LargePasteDialog.Content" xml:space="preserve">
+    <value>Управо ћете да налепите текст дужи од 5 KiB. Желите ли да наставите?</value>
+  </data>
+  <data name="LargePasteDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ипак налепи</value>
+  </data>
+  <data name="LargePasteDialog.Title" xml:space="preserve">
+    <value>Упозорење</value>
+  </data>
+  <data name="MultiLinePasteDialog.CloseButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="MultiLineWarningText.Text" xml:space="preserve">
+    <value>Управо ћете да налепите текст који се састоји из више линија. Ако га налепите у своју љуску, може доћи до неочекиваног извршавања команди. Желите ли да наставите?</value>
+  </data>
+  <data name="MultiLinePasteDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ипак налепи</value>
+  </data>
+  <data name="MultiLinePasteDialog.Title" xml:space="preserve">
+    <value>Упозорење</value>
+  </data>
+  <data name="CommandPalette_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Откуцајте име команде...</value>
+  </data>
+  <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
+    <value>Нема команди које се подударају</value>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
+    <value>Акција режим претраге</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into action (command search) mode.</comment>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_TabSearchSwitchMode" xml:space="preserve">
+    <value>Режим име картице</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into a mode that filters tab names.</comment>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_CommandlineMode" xml:space="preserve">
+    <value>Режим командна-линија</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into the raw commandline parsing mode.</comment>
+  </data>
+  <data name="CommandPalette_NestedCommandAnnouncement" xml:space="preserve">
+    <value>Више опција за "{}"</value>
+    <comment>This text will be read aloud using assistive technologies when the user selects a command that has additional options. The {} will be expanded to the name of the command containing more options.</comment>
+  </data>
+  <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
+    <value>Извршавање командне линије ће да позове следеће команде:</value>
+    <comment>Will be followed by a list of strings describing parsed commands</comment>
+  </data>
+  <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
+    <value>Није успело парсирање командне линије:</value>
+  </data>
+  <data name="CommandPaletteControlName" xml:space="preserve">
+    <value>Палета команди</value>
+  </data>
+  <data name="TabSwitcherControlName" xml:space="preserve">
+    <value>Пребацивач картица</value>
+  </data>
+  <data name="TabSwitcher_SearchBoxText" xml:space="preserve">
+    <value>Откуцајте име картице...</value>
+  </data>
+  <data name="TabSwitcher_NoMatchesText" xml:space="preserve">
+    <value>Ниједна картица се не подудара</value>
+  </data>
+  <data name="CmdPalCommandlinePrompt" xml:space="preserve">
+    <value>Унесите wt командну линију која треба да се изврши</value>
+    <comment>{Locked="wt"} </comment>
+  </data>
+  <data name="SuggestionsControl_NestedCommandAnnouncement" xml:space="preserve">
+    <value>Више опција за "{}"</value>
+    <comment>This text will be read aloud using assistive technologies when the user selects a command that has additional options. The {} will be expanded to the name of the command containing more options.</comment>
+  </data>
+  <data name="SuggestionsControl_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Откуцајте име команде...</value>
+  </data>
+  <data name="SuggestionsControl_NoMatchesText.Text" xml:space="preserve">
+    <value>Ниједна команда се не подудара</value>
+  </data>
+  <data name="SuggestionsControlName" xml:space="preserve">
+    <value>Мени предлога</value>
+  </data>
+  <data name="SuggestionsControl_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Још опција</value>
+  </data>
+  <data name="SuggestionsControl_MatchesAvailable" xml:space="preserve">
+    <value>Пронађено предлога: {0}</value>
+    <comment>{0} will be replaced with a number.</comment>
+  </data>
+  <data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Гримизна</value>
+  </data>
+  <data name="SteelBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Челично-плава</value>
+  </data>
+  <data name="MediumSeaGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Средње морско-зелена</value>
+  </data>
+  <data name="DarkOrangeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Тамнонаранџаста</value>
+  </data>
+  <data name="MediumVioletRedColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Средње љубичастоцрвена</value>
+  </data>
+  <data name="DodgerBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Доџер-плава</value>
+  </data>
+  <data name="LimeGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Лимета-зелена</value>
+  </data>
+  <data name="YellowColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Жута</value>
+  </data>
+  <data name="BlueVioletColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Плавољубичаста</value>
+  </data>
+  <data name="SlateBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Шкриљац-плава</value>
+  </data>
+  <data name="LimeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Лимета</value>
+  </data>
+  <data name="TanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Жутомрка</value>
+  </data>
+  <data name="MagentaColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Пурпурноцрвена</value>
+  </data>
+  <data name="CyanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Цијан</value>
+  </data>
+  <data name="SkyBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Небеско-плава</value>
+  </data>
+  <data name="DarkGrayColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Тамносива</value>
+  </data>
+  <data name="InvalidUriText" xml:space="preserve">
+    <value>Овај линк није исправан:</value>
+  </data>
+  <data name="UnsupportedSchemeText" xml:space="preserve">
+    <value>Тренутно се не подржава овај тип линка:</value>
+  </data>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="SettingsTab" xml:space="preserve">
+    <value>Подешавања</value>
+  </data>
+  <data name="FailedToWriteToSettings" xml:space="preserve">
+    <value>Нисмо могли да упишемо ваш фајл подешавања. Проверите дозволе за тај фајл и обезбедите да није постављена заставица само-за-читање и да је дозвољено уписивање.</value>
+  </data>
+  <data name="ParentCommandBackButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Назад</value>
+  </data>
+  <data name="ParentCommandBackButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Назад</value>
+  </data>
+  <data name="ControlNoticeDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="NoticeDebug" xml:space="preserve">
+    <value>Отклањање грешака</value>
+  </data>
+  <data name="NoticeError" xml:space="preserve">
+    <value>Грешка</value>
+  </data>
+  <data name="NoticeInfo" xml:space="preserve">
+    <value>Информација</value>
+  </data>
+  <data name="NoticeWarning" xml:space="preserve">
+    <value>Упозорење</value>
+  </data>
+  <data name="ClipboardTextHeader.Text" xml:space="preserve">
+    <value>Садржај системске оставе (преглед):</value>
+  </data>
+  <data name="CommandPalette_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Још опција</value>
+  </data>
+  <data name="WindowIdLabel" xml:space="preserve">
+    <value>Прозор</value>
+    <comment>This is displayed as a label for a number, like "Window: 10"</comment>
+  </data>
+  <data name="UnnamedWindowName" xml:space="preserve">
+    <value>неименовани прозор</value>
+    <comment>text used to identify when a window hasn't been assigned a name by the user</comment>
+  </data>
+  <data name="WindowRenamer.Subtitle" xml:space="preserve">
+    <value>Унесите ново име:</value>
+  </data>
+  <data name="WindowRenamer.ActionButtonContent" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="WindowRenamer.CloseButtonContent" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="WindowMaximizeButtonToolTip" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowRestoreDownButtonToolTip" xml:space="preserve">
+    <value>Врати назад</value>
+  </data>
+  <data name="CommandPaletteMenuItem" xml:space="preserve">
+    <value>Палета команди</value>
+  </data>
+  <data name="NotificationIconFocusTerminal" xml:space="preserve">
+    <value>Фокусирај Терминал</value>
+    <comment>This is displayed as a label for the context menu item that focuses the terminal.</comment>
+  </data>
+  <data name="NotificationIconWindowSubmenu" xml:space="preserve">
+    <value>Прозори</value>
+    <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
+  </data>
+  <data name="DropPathTabRun.Text" xml:space="preserve">
+    <value>Отвори нову картицу у наведеном почетном директоријуму</value>
+  </data>
+  <data name="DropPathTabNewWindow.Text" xml:space="preserve">
+    <value>Отвори нови прозор са наведеним почетним директоријумом</value>
+  </data>
+  <data name="DropPathTabSplit.Text" xml:space="preserve">
+    <value>Подели прозор и покрени у наведеном директоријуму</value>
+  </data>
+  <data name="ExportTabText" xml:space="preserve">
+    <value>Извези текст</value>
+  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Није успео извоз садржаја терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Успешно је извезен садржај терминала</value>
+  </data>
+  <data name="FindText" xml:space="preserve">
+    <value>Пронађи</value>
+  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Чисти текст</value>
+  </data>
+  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
+    <value>Понашање при прекиду извршавања може да се подеси у напредним подешавањима профила.</value>
+  </data>
+  <data name="InfoBarDismissButton.Content" xml:space="preserve">
+    <value>Не приказуј поново</value>
+  </data>
+  <data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Овај прозор Терминала се извршава као администратор</value>
+  </data>
+  <data name="CommandPalette_MatchesAvailable" xml:space="preserve">
+    <value>Пронађено предлога: {0}</value>
+    <comment>{0} will be replaced with a number.</comment>
+  </data>
+  <data name="AboutDialog_CheckingForUpdatesLabel.Text" xml:space="preserve">
+    <value>Проверавају се ажурирања...</value>
+  </data>
+  <data name="AboutDialog_UpdateAvailableLabel.Text" xml:space="preserve">
+    <value>Доступно је ажурирање.</value>
+  </data>
+  <data name="AboutDialog_InstallUpdateButton.Content" xml:space="preserve">
+    <value>Инсталирај одмах</value>
+  </data>
+  <data name="DuplicateRemainingProfilesEntry" xml:space="preserve">
+    <value>Поље "newTabMenu" садржи више од једне ставке типа "remainingProfiles". Само прва ће се узети у обзир.</value>
+    <comment>{Locked="newTabMenu"} {Locked="remainingProfiles"}</comment>
+  </data>
+  <data name="InvalidUseOfContent" xml:space="preserve">
+    <value>Особина "__content" је резервисана за интерну употребу</value>
+    <comment>{Locked="__content"}</comment>
+  </data>
+  <data name="AboutToolTip" xml:space="preserve">
+    <value>Отвара дијалог који садржи информације о производу</value>
+  </data>
+  <data name="ChooseColorToolTip" xml:space="preserve">
+    <value>Отвара бирач боје којим се бира боја за ову картицу</value>
+  </data>
+  <data name="CommandPaletteToolTip" xml:space="preserve">
+    <value>Отвара палету команди</value>
+  </data>
+  <data name="DuplicateTabToolTip" xml:space="preserve">
+    <value>Отвара нову картицу у текућем директоријуму користећи активни профил</value>
+  </data>
+  <data name="ExportTabToolTip" xml:space="preserve">
+    <value>Извози садржај текст бафера у текст фајл</value>
+  </data>
+  <data name="FindToolTip" xml:space="preserve">
+    <value>Отвара дијалог претраге</value>
+  </data>
+  <data name="RenameTabToolTip" xml:space="preserve">
+    <value>Мења име ове картице</value>
+  </data>
+  <data name="SettingsToolTip" xml:space="preserve">
+    <value>Отвара страницу подешавања</value>
+  </data>
+  <data name="SplitTabToolTip" xml:space="preserve">
+    <value>Отвара нови панел користећи активни профил у текућем директоријуму</value>
+  </data>
+  <data name="TabCloseAfterToolTip" xml:space="preserve">
+    <value>Затвара се картице десно од ове картице</value>
+  </data>
+  <data name="TabCloseOtherToolTip" xml:space="preserve">
+    <value>Затвара све картице осим ове</value>
+  </data>
+  <data name="TabCloseToolTip" xml:space="preserve">
+    <value>Затвара ову картицу</value>
+  </data>
+  <data name="NewTabMenuFolderEmpty" xml:space="preserve">
+    <value>Празно</value>
+  </data>
+  <data name="ClosePaneText" xml:space="preserve">
+    <value>Затвори панел</value>
+  </data>
+  <data name="ClosePaneToolTip" xml:space="preserve">
+    <value>Затвара активан панел ако постоји више панела</value>
+  </data>
+  <data name="TabColorClearButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.FullDescription" xml:space="preserve">
+    <value>Ресетуј боју картице</value>
+    <comment>Text used to identify the reset button</comment>
+  </data>
+  <data name="MoveTabToNewWindowText" xml:space="preserve">
+    <value>Премести картицу у нови прозор</value>
+  </data>
+  <data name="MoveTabToNewWindowToolTip" xml:space="preserve">
+    <value>Премешта картицу у нови прозор</value>
+  </data>
+  <data name="RunAsAdminFlyout.Text" xml:space="preserve">
+    <value>Покрени као администратор</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">
+    <value>Активни панел је премештен у картицу "{0}"</value>
+    <comment>{Locked="{0}"}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.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
+    <value>Картица "{0}" је премештена у прозор "{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 name of the window the tab was moved to.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
+    <value>Картица "{0}" је премештена у нови прозор</value>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_Direction" xml:space="preserve">
+    <value>Картица "{0}" је премештена на позицију "{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>Активни панел је премештен у картицу "{0}" у прозору "{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>Активни панел је премештен у прозор "{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>
+  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
+    <value>Активни панел је премештен у нови прозор</value>
+    <comment>This text is read out by screen readers upon a successful pane movement to a new window.</comment>
+  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_NewTab" xml:space="preserve">
+    <value>Активни панел је премештен у нову картицу</value>
+    <comment>This text is read out by screen readers upon a successful pane movement to a new tab within the existing window.</comment>
+  </data>
+  <data name="CmdAppendCommandLineDesc" xml:space="preserve">
+    <value>Ако је постављено, команда ће се надовезати на подразумевану команду профила, а неће је заменити.</value>
+  </data>
+  <data name="RestartConnectionText" xml:space="preserve">
+    <value>Поново покрени везу</value>
+  </data>
+  <data name="RestartConnectionToolTip" xml:space="preserve">
+    <value>Обнавља везу активног панела</value>
+  </data>
+  <data name="SnippetPaneTitle.Text" xml:space="preserve">
+    <value>Одломци</value>
+    <comment>Header for a page that includes small "snippets" of text for the user to enter</comment>
+  </data>
+  <data name="SnippetsFilterBox.PlaceholderText" xml:space="preserve">
+    <value>Филтрирај одломке...</value>
+    <comment>Placeholder text for a text box to filter snippets (on the same page as the 'SnippetPaneTitle')</comment>
+  </data>
+  <data name="SnippetPlayButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Унеси ову команду</value>
+  </data>
+  <data name="SnippetPlayButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Унеси ову команду</value>
+  </data>
+  <data name="SnippetsPaneNoneFoundHeader.Text" xml:space="preserve">
+    <value>У вашим подешавањима није пронађен ниједан одломак.</value>
+    <comment>Text shown to user when no snippets are found in their settings</comment>
+  </data>
+  <data name="SnippetsPaneNoneFoundDetails.Text" xml:space="preserve">
+    <value>Додајте у своја подешавања неке "Send input" акције и оне ће се појавити овде.</value>
+    <comment>Additional information presented to the user to let them know they can add a "Send input" action in their setting to populate the snippets pane</comment>
+  </data>
+  <data name="ActionSavedToast.Title" xml:space="preserve">
+    <value>Акција је сачувана</value>
+  </data>
+  <data name="ActionSaveFailedToast.Title" xml:space="preserve">
+    <value>Није успело чување акције</value>
+  </data>
+  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори панел</value>
+  </data>
+  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Затвори панел</value>
+  </data>
+  <data name="TabMoveLeft" xml:space="preserve">
+    <value>Помери улево</value>
+  </data>
+  <data name="TabMoveRight" xml:space="preserve">
+    <value>Помери удесно</value>
+  </data>
+  <data name="InvalidRegex" xml:space="preserve">
+    <value>Пронађен је неисправан регуларни израз.</value>
+  </data>
+</root>

src/cascadia/TerminalApp/Resources/uk-UA/Resources.resw

@@ -0,0 +1,985 @@
+<?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="InitialJsonParseErrorText" xml:space="preserve">
+    <value>Не вдалося завантажити налаштування з файлу. Перевірте синтаксичні помилки, включно з комами в кінці.</value>
+  </data>
+  <data name="MissingDefaultProfileText" xml:space="preserve">
+    <value>Не вдалося знайти типовий профіль у вашому списку профілів - використовуючи перший профіль. Переконайтеся, що "defaultProfile" відповідає GUID одного з ваших профілів.</value>
+    <comment>{Locked="\"defaultProfile\""}</comment>
+  </data>
+  <data name="DuplicateProfileText" xml:space="preserve">
+    <value>У вашому файлі налаштувань знайдено кілька профілів із однаковим GUID, дублікати ігноруються. Переконайтеся, що GUID кожного профілю є унікальним.</value>
+  </data>
+  <data name="UnknownColorSchemeText" xml:space="preserve">
+    <value>Знайдено профіль із недійсною "colorScheme". Застосовано типові кольори для цього профілю. Переконайтеся, що під час налаштування "colorScheme" значення відповідає "name" колірної схеми у списку "schemes".</value>
+    <comment>{Locked="\"colorScheme\"","\"name\"","\"schemes\""}</comment>
+  </data>
+  <data name="NoProfilesText" xml:space="preserve">
+    <value>У ваших налаштуваннях не знайдено жодного профілю.</value>
+  </data>
+  <data name="AllProfilesHiddenText" xml:space="preserve">
+    <value>Усі профілі є прихованими у ваших налаштуваннях. Ви повинні мати принаймні один неприхований профіль.</value>
+  </data>
+  <data name="ReloadJsonParseErrorText" xml:space="preserve">
+    <value>Не вдалося перезавантажити налаштування з файлу. Перевірте синтаксичні помилки, включно з комами в кінці.</value>
+  </data>
+  <data name="UsingDefaultSettingsText" xml:space="preserve">
+    <value>Тимчасово використовуються стандартні налаштування терміналу Windows.</value>
+  </data>
+  <data name="InitialJsonParseErrorTitle" xml:space="preserve">
+    <value>Не вдалося завантажити налаштування</value>
+  </data>
+  <data name="SettingsValidateErrorTitle" xml:space="preserve">
+    <value>Під час завантаження налаштувань користувача виникли помилки</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Попередження:</value>
+  </data>
+  <data name="KeyboardServiceWarningText" xml:space="preserve">
+    <value>"{0}" не працює на вашому ПК. Це може перешкодити терміналу отримувати введення з клавіатури.</value>
+    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
+  </data>
+  <data name="Ok" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
+    <value>Не вдалося перезавантажити налаштування</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>Про програму</value>
+  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Зворотній зв'язок</value>
+  </data>
+  <data name="SettingsMenuItem" xml:space="preserve">
+    <value>Налаштування</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Закрити всі</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Вийти</value>
+  </data>
+  <data name="MultiplePanes" xml:space="preserve">
+    <value>Кілька панелей</value>
+  </data>
+  <data name="TabCloseSubMenu" xml:space="preserve">
+    <value>Закрити</value>
+  </data>
+  <data name="TabMoveSubMenu" xml:space="preserve">
+    <value>Перемістити вкладку</value>
+  </data>
+  <data name="TabCloseAfter" xml:space="preserve">
+    <value>Закрити вкладки праворуч</value>
+  </data>
+  <data name="TabCloseOther" xml:space="preserve">
+    <value>Закрити інші вкладки</value>
+  </data>
+  <data name="TabClose" xml:space="preserve">
+    <value>Закрити вкладку</value>
+  </data>
+  <data name="PaneClose" xml:space="preserve">
+    <value>Закрити панель</value>
+  </data>
+  <data name="SplitTabText" xml:space="preserve">
+    <value>Розділити вкладку</value>
+  </data>
+  <data name="SplitPaneText" xml:space="preserve">
+    <value>Розділити панель</value>
+  </data>
+  <data name="SplitPaneToolTipText" xml:space="preserve">
+    <value>Клацніть правою кнопкою миші, щоб розділити напрямки - вправо/вниз/вгору/ліворуч</value>
+  </data>
+  <data name="SplitPaneDownText" xml:space="preserve">
+    <value>Розділити панель вниз</value>
+  </data>
+  <data name="SplitPaneRightText" xml:space="preserve">
+    <value>Розділити панель вправо</value>
+  </data>
+  <data name="SplitPaneUpText" xml:space="preserve">
+    <value>Розділити панель вгору</value>
+  </data>
+  <data name="SplitPaneLeftText" xml:space="preserve">
+    <value>Розділити панель вліво</value>
+  </data>
+  <data name="SplitPaneDuplicateText" xml:space="preserve">
+    <value>Дублювати</value>
+  </data>
+  <data name="SwapPaneText" xml:space="preserve">
+    <value>Змістити панель</value>
+  </data>
+  <data name="SwapPaneDownText" xml:space="preserve">
+    <value>Змістити панель вниз</value>
+  </data>
+  <data name="SwapPaneRightText" xml:space="preserve">
+    <value>Змістити панель вправо</value>
+  </data>
+  <data name="SwapPaneUpText" xml:space="preserve">
+    <value>Змістити панель вгору</value>
+  </data>
+  <data name="SwapPaneLeftText" xml:space="preserve">
+    <value>Змістити панель вліво</value>
+  </data>
+  <data name="TogglePaneZoomText" xml:space="preserve">
+    <value>Увімкнути масштаб панелі</value>
+  </data>
+  <data name="CloseOtherPanesText" xml:space="preserve">
+    <value>Закрити інші панелі</value>
+  </data>
+  <data name="SearchWebText" xml:space="preserve">
+    <value>Пошук в Інтернеті</value>
+  </data>
+  <data name="TabColorChoose" xml:space="preserve">
+    <value>Змінити колір вкладки</value>
+  </data>
+  <data name="TabColorCustomButton.Content" xml:space="preserve">
+    <value>Власний</value>
+  </data>
+  <data name="TabColorClearButton.Content" xml:space="preserve">
+    <value>Скинути</value>
+  </data>
+  <data name="RenameTabText" xml:space="preserve">
+    <value>Перейменувати вкладку</value>
+  </data>
+  <data name="DuplicateTabText" xml:space="preserve">
+    <value>Дублювати вкладку</value>
+  </data>
+  <data name="InvalidMediaResource" xml:space="preserve">
+    <value>Не вдалося знайти один або кілька ресурсів (наприклад, значок або фонове зображення), вказаних у ваших налаштуваннях.</value>
+    <comment>{Locked="icon","backgroundImage"} Indicates that something has gone wrong while reading a user's settings.</comment>
+  </data>
+  <data name="AtLeastOneKeybindingWarning" xml:space="preserve">
+    <value>Під час аналізу ваших сполучень клавіш знайдено попередження:</value>
+  </data>
+  <data name="TooManyKeysForChord" xml:space="preserve">
+    <value>• Знайдено прив'язку клавіш із завеликою кількістю рядків для масиву "keys". У масиві "keys" має бути лише одне рядкове значення.</value>
+    <comment>{Locked="\"keys\"","•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="FailedToParseSubCommands" xml:space="preserve">
+    <value>• Не вдалося розібрати всі підкоманди вкладеної команди.</value>
+  </data>
+  <data name="MissingRequiredParameter" xml:space="preserve">
+    <value>• Знайдено сполучення клавіш, у якому відсутнє необхідне значення параметра. Це сполучення клавіш буде проігноровано.</value>
+    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="UnknownTheme" xml:space="preserve">
+    <value>• Зазначену "тему" ​​не знайдено у списку тем. Тимчасове повернення до значення за замовчуванням.</value>
+    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
+  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Властивість "globals" застаріла - можливо, ваші налаштування потребують оновлення.</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>Для отримання додаткової інформації перегляньте цю веб-сторінку.</value>
+  </data>
+  <data name="FailedToParseCommandJson" xml:space="preserve">
+    <value>Не вдалося розгорнути команду з установленим "iterateOn". Ця команда буде проігнорована.</value>
+    <comment>{Locked="\"iterateOn\""} </comment>
+  </data>
+  <data name="InvalidColorSchemeInCmd" xml:space="preserve">
+    <value>Знайдено команду з недійсною "colorScheme". Ця команда буде проігнорована. Переконайтеся, що під час встановлення "colorScheme" значення відповідає "name" колірної схеми у списку "schemes".</value>
+    <comment>{Locked="\"colorScheme\"","\"name\"","\"schemes\""}</comment>
+  </data>
+  <data name="InvalidSplitSize" xml:space="preserve">
+    <value>Знайдено команду "splitPane" із недійсним "size". Ця команда буде проігнорована. Переконайтеся, що розмір задано між 0 і 1 (не включно).</value>
+    <comment>{Locked="\"splitPane\"","\"size\""}</comment>
+  </data>
+  <data name="FailedToParseStartupActions" xml:space="preserve">
+    <value>Не вдалося розпарсити "startupActions".</value>
+    <comment>{Locked="\"startupActions\""}</comment>
+  </data>
+  <data name="InvalidProfileEnvironmentVariables" xml:space="preserve">
+    <value>Знайдено кілька змінних середовища з однаковими іменами в різних регістрах (нижній/верхній) - використовуватиметься лише одне значення.</value>
+  </data>
+  <data name="CmdCommandArgDesc" xml:space="preserve">
+    <value>Необов'язкова команда з аргументами, яка буде створена в новій вкладці чи панелі</value>
+  </data>
+  <data name="SaveSnippetDesc" xml:space="preserve">
+    <value>Зберегти командний рядок як дію введення</value>
+  </data>
+  <data name="SaveSnippetArgDesc" xml:space="preserve">
+    <value>Необов'язковий аргумент</value>
+  </data>
+  <data name="KeyChordArgDesc" xml:space="preserve">
+    <value>Необов'язковий аргумент</value>
+  </data>
+  <data name="CmdFocusTabDesc" xml:space="preserve">
+    <value>Перемістити фокус на іншу вкладку</value>
+  </data>
+  <data name="CmdFocusTabNextArgDesc" xml:space="preserve">
+    <value>Перемістити фокус на наступну вкладку</value>
+  </data>
+  <data name="CmdFTDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "focus-tab".</value>
+    <comment>{Locked="\"focus-tab\""}</comment>
+  </data>
+  <data name="CmdFocusTabPrevArgDesc" xml:space="preserve">
+    <value>Перемістити фокус на попередню вкладку</value>
+  </data>
+  <data name="CmdFocusTabTargetArgDesc" xml:space="preserve">
+    <value>Перемістити виділену вкладку за вказаним індексом</value>
+  </data>
+  <data name="CmdMovePaneTabArgDesc" xml:space="preserve">
+    <value>Перемістити виділену панель на вкладку за вказаним індексом</value>
+  </data>
+  <data name="CmdMovePaneDesc" xml:space="preserve">
+    <value>Перемістити виділену панель на іншу вкладку</value>
+  </data>
+  <data name="CmdMPDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "move-pane".</value>
+    <comment>{Locked="\"move-pane\""}</comment>
+  </data>
+  <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
+    <value>Укажіть розмір у відсотках від батьківської панелі. Дійсні значення між 0 і 1 (не включно).</value>
+  </data>
+  <data name="CmdNewTabDesc" xml:space="preserve">
+    <value>Створити нову вкладку</value>
+  </data>
+  <data name="CmdNTDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "new-tab".</value>
+    <comment>{Locked="\"new-tab\""}</comment>
+  </data>
+  <data name="CmdFocusPaneDesc" xml:space="preserve">
+    <value>Перемістити фокус на іншу панель</value>
+  </data>
+  <data name="CmdFPDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "focus-pane".</value>
+    <comment>{Locked="\"focus-pane\""}</comment>
+  </data>
+  <data name="CmdFocusPaneTargetArgDesc" xml:space="preserve">
+    <value>Сфокусувати панель на заданому індексі</value>
+  </data>
+  <data name="CmdProfileArgDesc" xml:space="preserve">
+    <value>Відкрити у вказаному профілі. Приймає назву або GUID профілю</value>
+  </data>
+  <data name="CmdSessionIdArgDesc" xml:space="preserve">
+    <value>Встановлює змінну WT_SESSION; має бути GUID</value>
+  </data>
+  <data name="CmdSplitPaneDesc" xml:space="preserve">
+    <value>Створити нову розділену панель</value>
+  </data>
+  <data name="CmdSPDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "split-pane".</value>
+    <comment>{Locked="\"split-pane\""}</comment>
+  </data>
+  <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
+    <value>Створити нову панель у вигляді горизонтального розділення (як [-])</value>
+  </data>
+  <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
+    <value>Створити нову панель у вигляді вертикального розділення (як [|])</value>
+  </data>
+  <data name="CmdSplitPaneDuplicateArgDesc" xml:space="preserve">
+    <value>Створити нову панель, скопіювавши профіль виділеної панелі</value>
+  </data>
+  <data name="CmdStartingDirArgDesc" xml:space="preserve">
+    <value>Відкрити у вказаному каталозі замість набору профілю "startingDirectory"</value>
+    <comment>{Locked="\"startingDirectory\""}</comment>
+  </data>
+  <data name="CmdTitleArgDesc" xml:space="preserve">
+    <value>Відкрити термінал із вказаним заголовком замість встановленого "title" профілю</value>
+    <comment>{Locked="\"title\""}</comment>
+  </data>
+  <data name="CmdTabColorArgDesc" xml:space="preserve">
+    <value>Відкрити вкладку вказаного кольору у форматі #rrggbb</value>
+  </data>
+  <data name="CmdSuppressApplicationTitleDesc" xml:space="preserve">
+    <value>Відкрити вкладку з вкладкою tabTitle, яка замінює типовий заголовок і забороняє зміну заголовка від програм</value>
+    <comment>{Locked="\"tabTitle\""}</comment>
+  </data>
+  <data name="CmdInheritEnvDesc" xml:space="preserve">
+    <value>Успадковувати власні змінні середовища терміналу під час створення нової вкладки чи панелі, а не створювати новий блок середовища. За замовчуванням це значення встановлюється, коли передається "command".</value>
+    <comment>{Locked="\"command\""}</comment>
+  </data>
+  <data name="CmdColorSchemeArgDesc" xml:space="preserve">
+    <value>Відкрити вкладку з указаною колірною схемою, замість набору "colorScheme" профілю</value>
+    <comment>{Locked="\"colorScheme\""}</comment>
+  </data>
+  <data name="CmdVersionDesc" xml:space="preserve">
+    <value>Відображення версії програми</value>
+  </data>
+  <data name="CmdMaximizedDesc" xml:space="preserve">
+    <value>Запустити розгорнуте вікно</value>
+  </data>
+  <data name="CmdFullscreenDesc" xml:space="preserve">
+    <value>Запустити вікно в повноекранному режимі</value>
+  </data>
+  <data name="CmdMoveFocusDesc" xml:space="preserve">
+    <value>Перемістити фокус на сусідню панель у вказаному напрямку</value>
+  </data>
+  <data name="CmdMFDesc" xml:space="preserve">
+    <value>Псевдонім підкоманди "move-focus".</value>
+    <comment>{Locked="\"move-focus\""}</comment>
+  </data>
+  <data name="CmdMoveFocusDirectionArgDesc" xml:space="preserve">
+    <value>Напрямок, у якому потрібно перемістити фокус</value>
+  </data>
+  <data name="CmdSwapPaneDesc" xml:space="preserve">
+    <value>Поміняти сфокусовану панель на сусідню у вказаному напрямку</value>
+  </data>
+  <data name="CmdSwapPaneDirectionArgDesc" xml:space="preserve">
+    <value>Напрямок переміщення виділеної області</value>
+  </data>
+  <data name="CmdFocusDesc" xml:space="preserve">
+    <value>Запустити вікно в режимі фокусування</value>
+  </data>
+  <data name="CmdSavedLayoutArgDesc" xml:space="preserve">
+    <value>Цей параметр є внутрішньою деталлю реалізації, і його не слід використовувати.</value>
+  </data>
+  <data name="CmdWindowTargetArgDesc" xml:space="preserve">
+    <value>Виберіть вікно терміналу, у якому буде запущено даний командний рядок. "0" завжди стосується поточного вікна.</value>
+  </data>
+  <data name="CmdPositionDesc" xml:space="preserve">
+    <value>Вкажіть позицію терміналу у форматі "x,y".</value>
+  </data>
+  <data name="CmdSizeDesc" xml:space="preserve">
+    <value>Вкажіть кількість стовпців і рядків для терміналу у форматі "c,r".</value>
+  </data>
+  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Натисніть кнопку, щоб відкрити нову вкладку терміналу з профілем за умовчанням. Відкрийте спливаюче меню, щоб вибрати профіль, який потрібно відкрити.</value>
+  </data>
+  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Нова вкладка</value>
+  </data>
+  <data name="NewTabRun.Text" xml:space="preserve">
+    <value>Відкрити нову вкладку</value>
+  </data>
+  <data name="NewPaneRun.Text" xml:space="preserve">
+    <value>Alt+клік, щоб розділити поточне вікно</value>
+  </data>
+  <data name="NewWindowRun.Text" xml:space="preserve">
+    <value>Shift+клік, щоб відкрити нове вікно</value>
+  </data>
+  <data name="ElevatedRun.Text" xml:space="preserve">
+    <value>Ctrl+клік, щоб відкрити як Адміністратор</value>
+  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Закрити</value>
+  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Закрити</value>
+  </data>
+  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
+    <value>Закрити</value>
+  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Максимізувати</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Згорнути</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Згорнути</value>
+  </data>
+  <data name="WindowMinimizeButtonToolTip.Text" xml:space="preserve">
+    <value>Згорнути</value>
+  </data>
+  <data name="AboutDialog.Title" xml:space="preserve">
+    <value>Про программу</value>
+  </data>
+  <data name="AboutDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Надіслати відгук</value>
+  </data>
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="AboutDialog_VersionLabel.Text" xml:space="preserve">
+    <value>Версія:</value>
+    <comment>This is the heading for a version number label</comment>
+  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Початок роботи</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>Вихідний код</value>
+    <comment>A hyperlink name for the Terminal's documentation</comment>
+  </data>
+  <data name="AboutDialog_DocumentationLink.Content" xml:space="preserve">
+    <value>Документація</value>
+    <comment>A hyperlink name for user documentation</comment>
+  </data>
+  <data name="AboutDialog_ReleaseNotesLink.Content" xml:space="preserve">
+    <value>Примітки до випуску</value>
+    <comment>A hyperlink name for the Terminal's release notes</comment>
+  </data>
+  <data name="AboutDialog_PrivacyPolicyLink.Content" xml:space="preserve">
+    <value>Політика конфіденційності</value>
+    <comment>A hyperlink name for the Terminal's privacy policy</comment>
+  </data>
+  <data name="AboutDialog_ThirdPartyNoticesLink.Content" xml:space="preserve">
+    <value>Повідомлення третіх сторін</value>
+    <comment>A hyperlink name for the Terminal's third-party notices</comment>
+  </data>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Закрити всі</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ви хочете закрити всі вікна?</value>
+  </data>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Закрити всі</value>
+  </data>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Закрити всі вкладки?</value>
+  </data>
+  <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="CloseReadOnlyDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Все одно закрити</value>
+  </data>
+  <data name="CloseReadOnlyDialog.Title" xml:space="preserve">
+    <value>Попередження</value>
+  </data>
+  <data name="CloseReadOnlyDialog.Content" xml:space="preserve">
+    <value>Ви збираєтеся закрити термінал лише для читання. Ви бажаєте продовжити?</value>
+  </data>
+  <data name="LargePasteDialog.CloseButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="LargePasteDialog.Content" xml:space="preserve">
+    <value>Ви збираєтеся вставити текст, розмір якого перевищує 5 КіБ. Ви бажаєте продовжити?</value>
+  </data>
+  <data name="LargePasteDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Все одно вставити</value>
+  </data>
+  <data name="LargePasteDialog.Title" xml:space="preserve">
+    <value>Попередження</value>
+  </data>
+  <data name="MultiLinePasteDialog.CloseButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="MultiLineWarningText.Text" xml:space="preserve">
+    <value>Ви збираєтеся вставити текст, який містить кілька рядків. Якщо ви вставите цей текст у свою оболонку, це може призвести до неочікуваного виконання команд. Ви бажаєте продовжити?</value>
+  </data>
+  <data name="MultiLinePasteDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Все одно вставити</value>
+  </data>
+  <data name="MultiLinePasteDialog.Title" xml:space="preserve">
+    <value>Попередження</value>
+  </data>
+  <data name="CommandPalette_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Введіть назву команди...</value>
+  </data>
+  <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
+    <value>Немає відповідних команд</value>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
+    <value>Режим пошуку дії</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into action (command search) mode.</comment>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_TabSearchSwitchMode" xml:space="preserve">
+    <value>Режим заголовка вкладки</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into a mode that filters tab names.</comment>
+  </data>
+  <data name="CommandPaletteModeAnnouncement_CommandlineMode" xml:space="preserve">
+    <value>Режим командного рядка</value>
+    <comment>This text will be read aloud using assistive technologies when the command palette switches into the raw commandline parsing mode.</comment>
+  </data>
+  <data name="CommandPalette_NestedCommandAnnouncement" xml:space="preserve">
+    <value>Більше параметрів для "{}"</value>
+    <comment>This text will be read aloud using assistive technologies when the user selects a command that has additional options. The {} will be expanded to the name of the command containing more options.</comment>
+  </data>
+  <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
+    <value>Виконання командного рядка викличе такі команди:</value>
+    <comment>Will be followed by a list of strings describing parsed commands</comment>
+  </data>
+  <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
+    <value>Помилка аналізу командного рядка:</value>
+  </data>
+  <data name="CommandPaletteControlName" xml:space="preserve">
+    <value>Палітра команд</value>
+  </data>
+  <data name="TabSwitcherControlName" xml:space="preserve">
+    <value>Перемикач вкладок</value>
+  </data>
+  <data name="TabSwitcher_SearchBoxText" xml:space="preserve">
+    <value>Введіть назву вкладки...</value>
+  </data>
+  <data name="TabSwitcher_NoMatchesText" xml:space="preserve">
+    <value>Немає відповідної назви вкладки</value>
+  </data>
+  <data name="CmdPalCommandlinePrompt" xml:space="preserve">
+    <value>Введіть командний рядок wt для запуску</value>
+    <comment>{Locked="wt"} </comment>
+  </data>
+  <data name="SuggestionsControl_NestedCommandAnnouncement" xml:space="preserve">
+    <value>Більше параметрів для "{}"</value>
+    <comment>This text will be read aloud using assistive technologies when the user selects a command that has additional options. The {} will be expanded to the name of the command containing more options.</comment>
+  </data>
+  <data name="SuggestionsControl_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Введіть назву команди...</value>
+  </data>
+  <data name="SuggestionsControl_NoMatchesText.Text" xml:space="preserve">
+    <value>Немає відповідних команд</value>
+  </data>
+  <data name="SuggestionsControlName" xml:space="preserve">
+    <value>Меню пропозицій</value>
+  </data>
+  <data name="SuggestionsControl_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Більше варіантів</value>
+  </data>
+  <data name="SuggestionsControl_MatchesAvailable" xml:space="preserve">
+    <value>Знайдено пропозицій: {0}</value>
+    <comment>{0} will be replaced with a number.</comment>
+  </data>
+  <data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Багряний</value>
+  </data>
+  <data name="SteelBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Сталевий синій</value>
+  </data>
+  <data name="MediumSeaGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Середній морський зелений</value>
+  </data>
+  <data name="DarkOrangeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Темно-помаранчевий</value>
+  </data>
+  <data name="MediumVioletRedColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Середній фіолетово-червоний</value>
+  </data>
+  <data name="DodgerBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Доджер Блю</value>
+  </data>
+  <data name="LimeGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Зелений лайм</value>
+  </data>
+  <data name="YellowColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Жовтий</value>
+  </data>
+  <data name="BlueVioletColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Блакитно-фіалковий</value>
+  </data>
+  <data name="SlateBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Шиферно-блакитний</value>
+  </data>
+  <data name="LimeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Лайм</value>
+  </data>
+  <data name="TanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Жовтувато-коричневий</value>
+  </data>
+  <data name="MagentaColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Пурпуровий</value>
+  </data>
+  <data name="CyanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Блакитний</value>
+  </data>
+  <data name="SkyBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Небесно-блакитний</value>
+  </data>
+  <data name="DarkGrayColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Темно-сірий</value>
+  </data>
+  <data name="InvalidUriText" xml:space="preserve">
+    <value>Це посилання недійсне:</value>
+  </data>
+  <data name="UnsupportedSchemeText" xml:space="preserve">
+    <value>Цей тип посилання наразі не підтримується:</value>
+  </data>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="SettingsTab" xml:space="preserve">
+    <value>Налаштування</value>
+  </data>
+  <data name="FailedToWriteToSettings" xml:space="preserve">
+    <value>Не вдалося записати ваш файл налаштувань. Перевірте дозволи для цього файлу, щоб переконатися, що прапорець лише для читання не встановлено та надано доступ для запису.</value>
+  </data>
+  <data name="ParentCommandBackButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Назад</value>
+  </data>
+  <data name="ParentCommandBackButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Назад</value>
+  </data>
+  <data name="ControlNoticeDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="NoticeDebug" xml:space="preserve">
+    <value>Налагодження</value>
+  </data>
+  <data name="NoticeError" xml:space="preserve">
+    <value>Помилка</value>
+  </data>
+  <data name="NoticeInfo" xml:space="preserve">
+    <value>Інформація</value>
+  </data>
+  <data name="NoticeWarning" xml:space="preserve">
+    <value>Попередження</value>
+  </data>
+  <data name="ClipboardTextHeader.Text" xml:space="preserve">
+    <value>Вміст буфера обміну (попередній перегляд):</value>
+  </data>
+  <data name="CommandPalette_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Більше варіантів</value>
+  </data>
+  <data name="WindowIdLabel" xml:space="preserve">
+    <value>Вікно</value>
+    <comment>This is displayed as a label for a number, like "Window: 10"</comment>
+  </data>
+  <data name="UnnamedWindowName" xml:space="preserve">
+    <value>вікно без назви</value>
+    <comment>text used to identify when a window hasn't been assigned a name by the user</comment>
+  </data>
+  <data name="WindowRenamer.Subtitle" xml:space="preserve">
+    <value>Введіть нову назву:</value>
+  </data>
+  <data name="WindowRenamer.ActionButtonContent" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="WindowRenamer.CloseButtonContent" xml:space="preserve">
+    <value>Скасувати</value>
+  </data>
+  <data name="WindowMaximizeButtonToolTip" xml:space="preserve">
+    <value>Максимізувати</value>
+  </data>
+  <data name="WindowRestoreDownButtonToolTip" xml:space="preserve">
+    <value>Відновити вниз</value>
+  </data>
+  <data name="CommandPaletteMenuItem" xml:space="preserve">
+    <value>Палітра команд</value>
+  </data>
+  <data name="NotificationIconFocusTerminal" xml:space="preserve">
+    <value>Сфокусувати термінал</value>
+    <comment>This is displayed as a label for the context menu item that focuses the terminal.</comment>
+  </data>
+  <data name="NotificationIconWindowSubmenu" xml:space="preserve">
+    <value>Вікна</value>
+    <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
+  </data>
+  <data name="DropPathTabRun.Text" xml:space="preserve">
+    <value>Відкрити нову вкладку в заданому початковому каталозі</value>
+  </data>
+  <data name="DropPathTabNewWindow.Text" xml:space="preserve">
+    <value>Відкрити нове вікно з заданим початковим каталогом</value>
+  </data>
+  <data name="DropPathTabSplit.Text" xml:space="preserve">
+    <value>Розділити вікно та запустити у вказаному каталозі</value>
+  </data>
+  <data name="ExportTabText" xml:space="preserve">
+    <value>Експорт тексту</value>
+  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Не вдалося експортувати вміст терміналу</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Вміст терміналу успішно експортовано</value>
+  </data>
+  <data name="FindText" xml:space="preserve">
+    <value>Знайти</value>
+  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Звичайний текст</value>
+  </data>
+  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
+    <value>Поведінку припинення можна налаштувати в розширених налаштуваннях профілю.</value>
+  </data>
+  <data name="InfoBarDismissButton.Content" xml:space="preserve">
+    <value>Більше не показувати</value>
+  </data>
+  <data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Це вікно терміналу запущено від імені Адміністратора</value>
+  </data>
+  <data name="CommandPalette_MatchesAvailable" xml:space="preserve">
+    <value>Знайдено пропозицій: {0}</value>
+    <comment>{0} will be replaced with a number.</comment>
+  </data>
+  <data name="AboutDialog_CheckingForUpdatesLabel.Text" xml:space="preserve">
+    <value>Перевірка оновлень...</value>
+  </data>
+  <data name="AboutDialog_UpdateAvailableLabel.Text" xml:space="preserve">
+    <value>Доступне оновлення.</value>
+  </data>
+  <data name="AboutDialog_InstallUpdateButton.Content" xml:space="preserve">
+    <value>Встановити зараз</value>
+  </data>
+  <data name="DuplicateRemainingProfilesEntry" xml:space="preserve">
+    <value>Поле "newTabMenu" містить більше одного запису типу "remainingProfiles". Буде розглянуто лише перший.</value>
+    <comment>{Locked="newTabMenu"} {Locked="remainingProfiles"}</comment>
+  </data>
+  <data name="InvalidUseOfContent" xml:space="preserve">
+    <value>Властивість "__content" зарезервовано для внутрішнього використання</value>
+    <comment>{Locked="__content"}</comment>
+  </data>
+  <data name="AboutToolTip" xml:space="preserve">
+    <value>Відкрити діалогове вікно з інформацією про продукт</value>
+  </data>
+  <data name="ChooseColorToolTip" xml:space="preserve">
+    <value>Відкрити палітру кольорів, щоб вибрати колір цієї вкладки</value>
+  </data>
+  <data name="CommandPaletteToolTip" xml:space="preserve">
+    <value>Відкрити панель команд</value>
+  </data>
+  <data name="DuplicateTabToolTip" xml:space="preserve">
+    <value>Відкрити нову вкладку за допомогою активного профілю в поточному каталозі</value>
+  </data>
+  <data name="ExportTabToolTip" xml:space="preserve">
+    <value>Експортувати вміст текстового буфера в текстовий файл</value>
+  </data>
+  <data name="FindToolTip" xml:space="preserve">
+    <value>Відкрити діалогове вікно пошуку</value>
+  </data>
+  <data name="RenameTabToolTip" xml:space="preserve">
+    <value>Перейменувати цю вкладку</value>
+  </data>
+  <data name="SettingsToolTip" xml:space="preserve">
+    <value>Відкрити сторінку налаштувань</value>
+  </data>
+  <data name="SplitTabToolTip" xml:space="preserve">
+    <value>Відкрити нову панель за допомогою активного профілю в поточному каталозі</value>
+  </data>
+  <data name="TabCloseAfterToolTip" xml:space="preserve">
+    <value>Закрити всі вкладки праворуч від цієї вкладки</value>
+  </data>
+  <data name="TabCloseOtherToolTip" xml:space="preserve">
+    <value>Закрити всі вкладки, крім цієї</value>
+  </data>
+  <data name="TabCloseToolTip" xml:space="preserve">
+    <value>Закрити цю вкладку</value>
+  </data>
+  <data name="NewTabMenuFolderEmpty" xml:space="preserve">
+    <value>Порожній</value>
+  </data>
+  <data name="ClosePaneText" xml:space="preserve">
+    <value>Закрити панель</value>
+  </data>
+  <data name="ClosePaneToolTip" xml:space="preserve">
+    <value>Закрити активну панель, якщо наявні декілька панелей</value>
+  </data>
+  <data name="TabColorClearButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.FullDescription" xml:space="preserve">
+    <value>Скинути колір вкладки</value>
+    <comment>Text used to identify the reset button</comment>
+  </data>
+  <data name="MoveTabToNewWindowText" xml:space="preserve">
+    <value>Перемістити вкладку в нове вікно</value>
+  </data>
+  <data name="MoveTabToNewWindowToolTip" xml:space="preserve">
+    <value>Переміщує вкладку в нове вікно</value>
+  </data>
+  <data name="RunAsAdminFlyout.Text" xml:space="preserve">
+    <value>Запуск від імені Адміністратора</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">
+    <value>Активну панель переміщено на вкладку "{0}".</value>
+    <comment>{Locked="{0}"}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.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
+    <value>Вкладку "{0}" переміщено до вікна "{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 name of the window the tab was moved to.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
+    <value>Вкладку "{0}" переміщено в нове вікно</value>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab.</comment>
+  </data>
+  <data name="TerminalPage_TabMovedAnnouncement_Direction" xml:space="preserve">
+    <value>Вкладку "{0}" переміщено на позицію "{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>Активну панель переміщено на вкладку "{0}" у вікні "{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>Активну панель переміщено до вікна "{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>
+  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
+    <value>Активну панель переміщено в нове вікно</value>
+    <comment>This text is read out by screen readers upon a successful pane movement to a new window.</comment>
+  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_NewTab" xml:space="preserve">
+    <value>Активну панель переміщено на нову вкладку</value>
+    <comment>This text is read out by screen readers upon a successful pane movement to a new tab within the existing window.</comment>
+  </data>
+  <data name="CmdAppendCommandLineDesc" xml:space="preserve">
+    <value>Якщо встановлено, команда буде додана до типової команди профілю, а не замінить її.</value>
+  </data>
+  <data name="RestartConnectionText" xml:space="preserve">
+    <value>Перезапустити з'єднання</value>
+  </data>
+  <data name="RestartConnectionToolTip" xml:space="preserve">
+    <value>Перезапустити підключення до активної панелі</value>
+  </data>
+  <data name="SnippetPaneTitle.Text" xml:space="preserve">
+    <value>Сніпети</value>
+    <comment>Header for a page that includes small "snippets" of text for the user to enter</comment>
+  </data>
+  <data name="SnippetsFilterBox.PlaceholderText" xml:space="preserve">
+    <value>Фільтр сніпетів...</value>
+    <comment>Placeholder text for a text box to filter snippets (on the same page as the 'SnippetPaneTitle')</comment>
+  </data>
+  <data name="SnippetPlayButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Введіть цю команду</value>
+  </data>
+  <data name="SnippetPlayButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Введіть цю команду</value>
+  </data>
+  <data name="SnippetsPaneNoneFoundHeader.Text" xml:space="preserve">
+    <value>У ваших налаштуваннях не знайдено сніпетів.</value>
+    <comment>Text shown to user when no snippets are found in their settings</comment>
+  </data>
+  <data name="SnippetsPaneNoneFoundDetails.Text" xml:space="preserve">
+    <value>Додати кілька дій "Надіслати введені дані" у налаштуваннях, щоб вони відображалися тут.</value>
+    <comment>Additional information presented to the user to let them know they can add a "Send input" action in their setting to populate the snippets pane</comment>
+  </data>
+  <data name="ActionSavedToast.Title" xml:space="preserve">
+    <value>Дія збережена</value>
+  </data>
+  <data name="ActionSaveFailedToast.Title" xml:space="preserve">
+    <value>Не вдалося зберегти дію</value>
+  </data>
+  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Закрити панель</value>
+  </data>
+  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Закрити панель</value>
+  </data>
+  <data name="TabMoveLeft" xml:space="preserve">
+    <value>Перемістити ліворуч</value>
+  </data>
+  <data name="TabMoveRight" xml:space="preserve">
+    <value>Перемістити праворуч</value>
+  </data>
+  <data name="InvalidRegex" xml:space="preserve">
+    <value>Знайдено недійсний регулярний вираз.</value>
+  </data>
+</root>

src/cascadia/TerminalApp/SettingsPaneContent.h

@@ -3,7 +3,6 @@
 
 #pragma once
 #include "winrt/TerminalApp.h"
-#include <LibraryResources.h>
 #include "BasicPaneEvents.h"
 
 namespace winrt::TerminalApp::implementation

src/cascadia/TerminalApp/SnippetsPaneContent.h

@@ -7,7 +7,6 @@
 #include "BasicPaneEvents.h"
 #include "FilteredCommand.h"
 #include "CommandPaletteItems.h"
-#include <LibraryResources.h>
 
 namespace winrt::TerminalApp::implementation
 {

src/cascadia/TerminalApp/SuggestionsControl.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "SuggestionsControl.h"
-#include <LibraryResources.h>
 
 #include "CommandPaletteItems.h"
 

src/cascadia/TerminalApp/Tab.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include "ColorPickupFlyout.h"
 #include "Tab.h"
 #include "SettingsPaneContent.h"
@@ -934,6 +933,13 @@ namespace winrt::TerminalApp::implementation
         return res;
     }
 
+    void Tab::Close()
+    {
+        ASSERT_UI_THREAD();
+
+        Closed.raise(nullptr, nullptr);
+    }
+
     // Method Description:
     // - Prepares this tab for being removed from the UI hierarchy by shutting down all active connections.
     void Tab::Shutdown()
@@ -1062,7 +1068,6 @@ namespace winrt::TerminalApp::implementation
             dispatcher,
             til::throttled_func_options{
                 .delay = std::chrono::milliseconds{ 200 },
-                .leading = true,
                 .trailing = true,
             },
             [weakThis]() {
@@ -2418,7 +2423,7 @@ namespace winrt::TerminalApp::implementation
             const auto& currentDictionary = v.as<ResourceDictionary>();
 
             // TabViewItem.Background
-            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackground"), deselectedTabBrush);
+            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackground"), selectedTabBrush);
             currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundSelected"), selectedTabBrush);
             currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPointerOver"), isHighContrast ? fontBrush : hoverTabBrush);
             currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPressed"), selectedTabBrush);

src/cascadia/TerminalApp/Tab.h

@@ -61,6 +61,7 @@ namespace winrt::TerminalApp::implementation
         void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
         void UpdateTitle();
 
+        void Close();
         void Shutdown();
         void ClosePane();
 

src/cascadia/TerminalApp/Tab.idl

@@ -22,6 +22,7 @@ namespace TerminalApp
         UInt32 TabViewNumTabs;
 
         void Focus(Windows.UI.Xaml.FocusState focusState);
+        void Close();
         void Shutdown();
 
         void SetDispatch(ShortcutActionDispatch dispatch);

src/cascadia/TerminalApp/TabManagement.cpp

@@ -15,11 +15,10 @@
 #include "../../inc/til/string.h"
 #include <til/io.h>
 
-#include <LibraryResources.h>
-
 #include "TabRowControl.h"
 #include "DebugTapConnection.h"
 #include "..\TerminalSettingsModel\FileUtils.h"
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
 #include <shlobj.h>
 
@@ -74,7 +73,7 @@ namespace winrt::TerminalApp::implementation
             {
                 return S_FALSE;
             }
-            const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings) };
+            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs) };
 
             // Try to handle auto-elevation
             if (_maybeElevate(newTerminalArgs, settings, profile))
@@ -157,12 +156,7 @@ namespace winrt::TerminalApp::implementation
         // Set this tab's icon to the icon from the content
         _UpdateTabIcon(*newTabImpl);
 
-        // This is necessary, because WinUI does not have support for middle clicks.
-        // Its Tapped event doesn't provide the information what button was used either.
         tabViewItem.PointerPressed({ this, &TerminalPage::_OnTabPointerPressed });
-        tabViewItem.PointerReleased({ this, &TerminalPage::_OnTabPointerReleased });
-        tabViewItem.PointerExited({ this, &TerminalPage::_OnTabPointerExited });
-        tabViewItem.PointerEntered({ this, &TerminalPage::_OnTabPointerEntered });
 
         // When the tab requests close, try to close it (prompt for approval, if required)
         newTabImpl->CloseRequested([weakTab, weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
@@ -417,13 +411,11 @@ namespace winrt::TerminalApp::implementation
         auto actions = t->BuildStartupActions(BuildStartupKind::None);
         _AddPreviouslyClosedPaneOrTab(std::move(actions));
 
-        _RemoveTab(tab);
+        tab.Close();
     }
 
-    // Method Description:
-    // - Removes the tab (both TerminalControl and XAML)
-    // Arguments:
-    // - tab: the tab to remove
+    // Removes the tab (both TerminalControl and XAML).
+    // NOTE: Don't call this directly, but rather `tab.Close()`.
     void TerminalPage::_RemoveTab(const winrt::TerminalApp::Tab& tab)
     {
         uint32_t tabIndex{};
@@ -664,7 +656,7 @@ namespace winrt::TerminalApp::implementation
     // Method Description:
     // - returns a tab corresponding to a view item. This might return null,
     //   so make sure to check the result!
-    winrt::TerminalApp::Tab TerminalPage::_GetTabByTabViewItem(const Microsoft::UI::Xaml::Controls::TabViewItem& tabViewItem) const noexcept
+    winrt::TerminalApp::Tab TerminalPage::_GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept
     {
         uint32_t tabIndexFromControl{};
         const auto items{ _tabView.TabItems() };
@@ -876,60 +868,64 @@ namespace winrt::TerminalApp::implementation
         _UpdateTabView();
     }
 
-    // Method Description:
-    // - Additional responses to clicking on a TabView's item. Currently, just remove tab with middle click
-    // Arguments:
-    // - sender: the control that originated this event (TabViewItem)
-    // - eventArgs: the event's constituent arguments
-    void TerminalPage::_OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    void TerminalPage::_OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e)
     {
-        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        if (!_tabItemMiddleClickHookEnabled || !e.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
         {
-            if (const auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
-            {
-                _tabPointerMiddleButtonPressed = tabViewItem.CapturePointer(eventArgs.Pointer());
-                _tabPointerMiddleButtonExited = false;
-            }
-            eventArgs.Handled(true);
+            return;
         }
+
+        const auto tabViewItem = sender.try_as<MUX::Controls::TabViewItem>();
+        if (!tabViewItem || !tabViewItem.CapturePointer(e.Pointer()))
+        {
+            return;
+        }
+
+        _tabItemMiddleClickExited = false;
+
+        _tabItemMiddleClickPointerEntered = tabViewItem.PointerEntered(winrt::auto_revoke, [this](auto&&, auto&& e) {
+            _tabItemMiddleClickExited = false;
+            e.Handled(true);
+        });
+        _tabItemMiddleClickPointerExited = tabViewItem.PointerExited(winrt::auto_revoke, [this](auto&&, auto&& e) {
+            _tabItemMiddleClickExited = true;
+            e.Handled(true);
+        });
+        _tabItemMiddleClickPointerCaptureLost = tabViewItem.PointerCaptureLost(winrt::auto_revoke, [this](auto&& sender, auto&& e) {
+            // The WinUI TabView calls CapturePointer() internally and it's not reference counted,
+            // so when it calls ReleasePointerCapture() in its PointerReleased handler,
+            // we get a PointerCaptureLost before we receive the PointerReleased event.
+            // This makes typical handling of PointerReleased events on our side difficult.
+            // Well, whatever, now we just hook PointerCaptureLost because we know WinUI will trigger it.
+
+            _tabItemMiddleClickPointerEntered.revoke();
+            _tabItemMiddleClickPointerExited.revoke();
+            _tabItemMiddleClickPointerCaptureLost.revoke();
+
+            if (!_tabItemMiddleClickExited && !e.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+            {
+                _OnTabPointerReleasedCloseTab(std::move(sender));
+            }
+
+            e.Handled(true);
+        });
+        e.Handled(true);
     }
 
-    // Method Description:
-    // - Tracking pointer state for tab remove
-    // Arguments:
-    // - sender: the control that originated this event (TabViewItem)
-    // - eventArgs: the event's constituent arguments
-    void TerminalPage::_OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    safe_void_coroutine TerminalPage::_OnTabPointerReleasedCloseTab(IInspectable sender)
     {
-        if (_tabPointerMiddleButtonPressed && !eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
-        {
-            _tabPointerMiddleButtonPressed = false;
-            if (auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
-            {
-                tabViewItem.ReleasePointerCapture(eventArgs.Pointer());
-                if (!_tabPointerMiddleButtonExited)
-                {
-                    _OnTabPointerReleasedCloseTab(std::move(tabViewItem));
-                }
-            }
-            eventArgs.Handled(true);
-        }
-    }
-
-    safe_void_coroutine TerminalPage::_OnTabPointerReleasedCloseTab(winrt::Microsoft::UI::Xaml::Controls::TabViewItem sender)
-    {
-        const auto tab = _GetTabByTabViewItem(sender);
-        if (!tab)
-        {
-            co_return;
-        }
-
         // WinUI asynchronously updates its tab view items, so it may happen that we're given a
         // `TabViewItem` that still contains a `Tab` which has actually already been removed.
         // First we must yield once, to flush out whatever TabView is currently doing.
         const auto strong = get_strong();
         co_await wil::resume_foreground(Dispatcher());
 
+        const auto tab = _GetTabByTabViewItem(sender);
+        if (!tab)
+        {
+            co_return;
+        }
+
         // `tab.Shutdown()` in `_RemoveTab()` sets the content to null = This checks if the tab is closed.
         if (tab.Content())
         {
@@ -937,34 +933,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Method Description:
-    // - Tracking pointer state for tab remove
-    // Arguments:
-    // - sender: the control that originated this event (TabViewItem)
-    // - eventArgs: the event's constituent arguments
-    void TerminalPage::_OnTabPointerEntered(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
-    {
-        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
-        {
-            _tabPointerMiddleButtonExited = false;
-            eventArgs.Handled(true);
-        }
-    }
-
-    // Method Description:
-    // - Tracking pointer state for tab remove
-    // Arguments:
-    // - sender: the control that originated this event (TabViewItem)
-    // - eventArgs: the event's constituent arguments
-    void TerminalPage::_OnTabPointerExited(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
-    {
-        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
-        {
-            _tabPointerMiddleButtonExited = true;
-            eventArgs.Handled(true);
-        }
-    }
-
     void TerminalPage::_UpdatedSelectedTab(const winrt::TerminalApp::Tab& tab)
     {
         // Unfocus all the tabs.

src/cascadia/TerminalApp/TabRowControl.cpp

@@ -5,7 +5,6 @@
 #include "TabRowControl.h"
 
 #include "TabRowControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -414,6 +414,9 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
       <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
     </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsAppAdapterLib\TerminalSettingsAppAdapterLib.vcxproj">
+      <Project>{3c46e2b0-ae6c-4132-9122-6772fb411959}</Project>
+    </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIMarkdown\UIMarkdown.vcxproj">
       <Project>{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}</Project>
       <Private>true</Private>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -5,11 +5,14 @@
 #include "pch.h"
 #include "TerminalPage.h"
 
-#include <LibraryResources.h>
-#include <TerminalThemeHelpers.h>
-#include <Utils.h>
 #include <TerminalCore/ControlKeyStates.hpp>
+#include <TerminalThemeHelpers.h>
+#include <til/hash.h>
+#include <Utils.h>
 
+#include "../../types/inc/ColorFix.hpp"
+#include "../../types/inc/utils.hpp"
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 #include "App.h"
 #include "DebugTapConnection.h"
 #include "MarkdownPaneContent.h"
@@ -19,8 +22,6 @@
 #include "SnippetsPaneContent.h"
 #include "TabRowControl.h"
 #include "TerminalSettingsCache.h"
-#include "../../types/inc/ColorFix.hpp"
-#include "../../types/inc/utils.hpp"
 
 #include "LaunchPositionRequest.g.cpp"
 #include "RenameWindowRequestedArgs.g.cpp"
@@ -60,8 +61,42 @@ namespace winrt
 
 namespace clipboard
 {
-    wil::unique_close_clipboard_call open(HWND hwnd)
+    static SRWLOCK lock = SRWLOCK_INIT;
+
+    struct ClipboardHandle
     {
+        explicit ClipboardHandle(bool open) :
+            _open{ open }
+        {
+        }
+
+        ~ClipboardHandle()
+        {
+            if (_open)
+            {
+                ReleaseSRWLockExclusive(&lock);
+                CloseClipboard();
+            }
+        }
+
+        explicit operator bool() const noexcept
+        {
+            return _open;
+        }
+
+    private:
+        bool _open = false;
+    };
+
+    ClipboardHandle open(HWND hwnd)
+    {
+        // Turns out, OpenClipboard/CloseClipboard are not thread-safe whatsoever,
+        // and on CloseClipboard, the GetClipboardData handle may get freed.
+        // The problem is that WinUI also uses OpenClipboard (through WinRT which uses OLE),
+        // and so even with this mutex we can still crash randomly if you copy something via WinUI.
+        // Makes you wonder how many Windows apps are subtly broken, huh.
+        AcquireSRWLockExclusive(&lock);
+
         bool success = false;
 
         // OpenClipboard may fail to acquire the internal lock --> retry.
@@ -80,7 +115,12 @@ namespace clipboard
             Sleep(sleep);
         }
 
-        return wil::unique_close_clipboard_call{ success };
+        if (!success)
+        {
+            ReleaseSRWLockExclusive(&lock);
+        }
+
+        return ClipboardHandle{ success };
     }
 
     void write(wil::zwstring_view text, std::string_view html, std::string_view rtf)
@@ -231,7 +271,7 @@ namespace winrt::TerminalApp::implementation
         if (_settings == nullptr)
         {
             // Create this only on the first time we load the settings.
-            _terminalSettingsCache = std::make_shared<TerminalSettingsCache>(settings, *_bindings);
+            _terminalSettingsCache = std::make_shared<TerminalSettingsCache>(settings);
         }
         _settings = settings;
 
@@ -334,6 +374,8 @@ namespace winrt::TerminalApp::implementation
         {
             const auto visibility = theme.Tab() ? theme.Tab().ShowCloseButton() : Settings::Model::TabCloseButtonVisibility::Always;
 
+            _tabItemMiddleClickHookEnabled = visibility == Settings::Model::TabCloseButtonVisibility::Never;
+
             switch (visibility)
             {
             case Settings::Model::TabCloseButtonVisibility::Never:
@@ -1424,7 +1466,7 @@ namespace winrt::TerminalApp::implementation
     // Return value:
     // - the desired connection
     TerminalConnection::ITerminalConnection TerminalPage::_CreateConnectionFromSettings(Profile profile,
-                                                                                        TerminalSettings settings,
+                                                                                        IControlSettings settings,
                                                                                         const bool inheritCursor)
     {
         static const auto textMeasurement = [&]() -> std::wstring_view {
@@ -1449,18 +1491,8 @@ namespace winrt::TerminalApp::implementation
         if (connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
             TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
         {
-            std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
-            azBridgePath.replace_filename(L"TerminalAzBridge.exe");
-            if constexpr (Feature_AzureConnectionInProc::IsEnabled())
-            {
-                connection = TerminalConnection::AzureConnection{};
-            }
-            else
-            {
-                connection = TerminalConnection::ConptyConnection{};
-            }
-
-            valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
+            connection = TerminalConnection::AzureConnection{};
+            valueSet = TerminalConnection::ConptyConnection::CreateSettings(winrt::hstring{},
                                                                             L".",
                                                                             L"Azure",
                                                                             false,
@@ -1474,9 +1506,8 @@ namespace winrt::TerminalApp::implementation
 
         else
         {
-            const auto environment = settings.EnvironmentVariables() != nullptr ?
-                                         settings.EnvironmentVariables().GetView() :
-                                         nullptr;
+            auto settingsInternal{ winrt::get_self<Settings::TerminalSettings>(settings) };
+            const auto environment = settingsInternal->EnvironmentVariables();
 
             // Update the path to be relative to whatever our CWD is.
             //
@@ -1498,7 +1529,7 @@ namespace winrt::TerminalApp::implementation
             valueSet = TerminalConnection::ConptyConnection::CreateSettings(settings.Commandline(),
                                                                             newWorkingDirectory,
                                                                             settings.StartingTitle(),
-                                                                            settings.ReloadEnvironmentVariables(),
+                                                                            settingsInternal->ReloadEnvironmentVariables(),
                                                                             _WindowProperties.VirtualEnvVars(),
                                                                             environment,
                                                                             settings.InitialRows(),
@@ -1552,20 +1583,20 @@ namespace winrt::TerminalApp::implementation
         const auto& connection = control.Connection();
         auto profile{ paneContent.GetProfile() };
 
-        TerminalSettingsCreateResult controlSettings{ nullptr };
+        Settings::TerminalSettingsCreateResult controlSettings{ nullptr };
 
         if (profile)
         {
             // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
             profile = GetClosestProfileForDuplicationOfProfile(profile);
-            controlSettings = TerminalSettings::CreateWithProfile(_settings, profile, *_bindings);
+            controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile);
 
             // Replace the Starting directory with the CWD, if given
             const auto workingDirectory = control.WorkingDirectory();
             const auto validWorkingDirectory = !workingDirectory.empty();
             if (validWorkingDirectory)
             {
-                controlSettings.DefaultSettings().StartingDirectory(workingDirectory);
+                controlSettings.DefaultSettings()->StartingDirectory(workingDirectory);
             }
 
             // To facilitate restarting defterm connections: grab the original
@@ -1573,11 +1604,11 @@ namespace winrt::TerminalApp::implementation
             // settings.
             if (const auto& conpty{ connection.try_as<TerminalConnection::ConptyConnection>() })
             {
-                controlSettings.DefaultSettings().Commandline(conpty.Commandline());
+                controlSettings.DefaultSettings()->Commandline(conpty.Commandline());
             }
         }
 
-        return _CreateConnectionFromSettings(profile, controlSettings.DefaultSettings(), true);
+        return _CreateConnectionFromSettings(profile, *controlSettings.DefaultSettings(), true);
     }
 
     // Method Description:
@@ -2187,7 +2218,7 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TerminalPage::PersistState(bool serializeBuffer)
+    void TerminalPage::PersistState()
     {
         // This method may be called for a window even if it hasn't had a tab yet or lost all of them.
         // We shouldn't persist such windows.
@@ -2202,7 +2233,7 @@ namespace winrt::TerminalApp::implementation
         for (auto tab : _tabs)
         {
             auto t = winrt::get_self<implementation::Tab>(tab);
-            auto tabActions = t->BuildStartupActions(serializeBuffer ? BuildStartupKind::PersistAll : BuildStartupKind::PersistLayout);
+            auto tabActions = t->BuildStartupActions(BuildStartupKind::Persist);
             actions.insert(actions.end(), std::make_move_iterator(tabActions.begin()), std::make_move_iterator(tabActions.end()));
         }
 
@@ -2288,6 +2319,29 @@ namespace winrt::TerminalApp::implementation
         CloseWindowRequested.raise(*this, nullptr);
     }
 
+    std::vector<IPaneContent> TerminalPage::Panes() const
+    {
+        std::vector<IPaneContent> panes;
+
+        for (const auto tab : _tabs)
+        {
+            const auto impl = _GetTabImpl(tab);
+            if (!impl)
+            {
+                continue;
+            }
+
+            impl->GetRootPane()->WalkTree([&](auto&& pane) {
+                if (auto content = pane->GetContent())
+                {
+                    panes.push_back(std::move(content));
+                }
+            });
+        }
+
+        return panes;
+    }
+
     // Method Description:
     // - Move the viewport of the terminal of the currently focused tab up or
     //      down a number of lines.
@@ -3176,33 +3230,17 @@ namespace winrt::TerminalApp::implementation
         }
 
         PackageCatalog catalog = connectResult.PackageCatalog();
-        // clang-format off
-        static constexpr std::array<WinGetSearchParams, 3> searches{ {
-            { .Field = PackageMatchField::Command, .MatchOption = PackageFieldMatchOption::StartsWithCaseInsensitive },
-            { .Field = PackageMatchField::Name, .MatchOption = PackageFieldMatchOption::ContainsCaseInsensitive },
-            { .Field = PackageMatchField::Moniker, .MatchOption = PackageFieldMatchOption::ContainsCaseInsensitive } } };
-        // clang-format on
-
         PackageMatchFilter filter = WindowsPackageManagerFactory::CreatePackageMatchFilter();
         filter.Value(query);
+        filter.Field(PackageMatchField::Command);
+        filter.Option(PackageFieldMatchOption::Equals);
 
         FindPackagesOptions options = WindowsPackageManagerFactory::CreateFindPackagesOptions();
         options.Filters().Append(filter);
         options.ResultLimit(20);
 
-        IVectorView<MatchResult> pkgList;
-        for (const auto& search : searches)
-        {
-            filter.Field(search.Field);
-            filter.Option(search.MatchOption);
-
-            const auto result = co_await catalog.FindPackagesAsync(options);
-            pkgList = result.Matches();
-            if (pkgList.Size() > 0)
-            {
-                break;
-            }
-        }
+        const auto result = co_await catalog.FindPackagesAsync(options);
+        const IVectorView<MatchResult> pkgList = result.Matches();
         co_return pkgList;
     }
 
@@ -3378,13 +3416,11 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    TermControl TerminalPage::_CreateNewControlAndContent(const TerminalSettingsCreateResult& settings, const ITerminalConnection& connection)
+    TermControl TerminalPage::_CreateNewControlAndContent(const Settings::TerminalSettingsCreateResult& settings, const ITerminalConnection& connection)
     {
         // Do any initialization that needs to apply to _every_ TermControl we
         // create here.
-        // TermControl will copy the settings out of the settings passed to it.
-
-        const auto content = _manager.CreateCore(settings.DefaultSettings(), settings.UnfocusedSettings(), connection);
+        const auto content = _manager.CreateCore(*settings.DefaultSettings(), settings.UnfocusedSettings().try_as<IControlAppearance>(), connection);
         const TermControl control{ content };
         return _SetupControl(control);
     }
@@ -3398,7 +3434,7 @@ namespace winrt::TerminalApp::implementation
             // don't, then when we move the content to another thread, and it
             // tries to handle a key, it'll callback on the original page's
             // stack, inevitably resulting in a wrong_thread
-            return _SetupControl(TermControl::NewControlByAttachingContent(content, *_bindings));
+            return _SetupControl(TermControl::NewControlByAttachingContent(content));
         }
         return nullptr;
     }
@@ -3418,6 +3454,8 @@ namespace winrt::TerminalApp::implementation
             term.OwningHwnd(reinterpret_cast<uint64_t>(*_hostingHwnd));
         }
 
+        term.KeyBindings(*_bindings);
+
         _RegisterTerminalEvents(term);
         return term;
     }
@@ -3454,7 +3492,7 @@ namespace winrt::TerminalApp::implementation
             return std::make_shared<Pane>(paneContent);
         }
 
-        TerminalSettingsCreateResult controlSettings{ nullptr };
+        Settings::TerminalSettingsCreateResult controlSettings{ nullptr };
         Profile profile{ nullptr };
 
         if (const auto& tabImpl{ _GetTabImpl(sourceTab) })
@@ -3464,19 +3502,19 @@ namespace winrt::TerminalApp::implementation
             {
                 // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
                 profile = GetClosestProfileForDuplicationOfProfile(profile);
-                controlSettings = TerminalSettings::CreateWithProfile(_settings, profile, *_bindings);
+                controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile);
                 const auto workingDirectory = tabImpl->GetActiveTerminalControl().WorkingDirectory();
                 const auto validWorkingDirectory = !workingDirectory.empty();
                 if (validWorkingDirectory)
                 {
-                    controlSettings.DefaultSettings().StartingDirectory(workingDirectory);
+                    controlSettings.DefaultSettings()->StartingDirectory(workingDirectory);
                 }
             }
         }
         if (!profile)
         {
             profile = _settings.GetProfileForArgs(newTerminalArgs);
-            controlSettings = TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings);
+            controlSettings = Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs);
         }
 
         // Try to handle auto-elevation
@@ -3485,13 +3523,13 @@ namespace winrt::TerminalApp::implementation
             return nullptr;
         }
 
-        const auto sessionId = controlSettings.DefaultSettings().SessionId();
+        const auto sessionId = controlSettings.DefaultSettings()->SessionId();
         const auto hasSessionId = sessionId != winrt::guid{};
 
-        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profile, controlSettings.DefaultSettings(), hasSessionId);
+        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profile, *controlSettings.DefaultSettings(), hasSessionId);
         if (existingConnection)
         {
-            connection.Resize(controlSettings.DefaultSettings().InitialRows(), controlSettings.DefaultSettings().InitialCols());
+            connection.Resize(controlSettings.DefaultSettings()->InitialRows(), controlSettings.DefaultSettings()->InitialCols());
         }
 
         TerminalConnection::ITerminalConnection debugConnection{ nullptr };
@@ -3512,9 +3550,12 @@ namespace winrt::TerminalApp::implementation
 
         if (hasSessionId)
         {
+            using namespace std::string_view_literals;
+
             const auto settingsDir = CascadiaSettings::SettingsDirectory();
-            const auto idStr = Utils::GuidToPlainString(sessionId);
-            const auto path = fmt::format(FMT_COMPILE(L"{}\\buffer_{}.txt"), settingsDir, idStr);
+            const auto admin = IsRunningElevated();
+            const auto filenamePrefix = admin ? L"elevated_"sv : L"buffer_"sv;
+            const auto path = fmt::format(FMT_COMPILE(L"{}\\{}{}.txt"), settingsDir, filenamePrefix, sessionId);
             control.RestoreFromPath(path);
         }
 
@@ -3735,7 +3776,7 @@ namespace winrt::TerminalApp::implementation
         // updating terminal panes, so that we don't have to build a _new_
         // TerminalSettings for every profile we update - we can just look them
         // up the previous ones we built.
-        _terminalSettingsCache->Reset(_settings, *_bindings);
+        _terminalSettingsCache->Reset(_settings);
 
         for (const auto& tab : _tabs)
         {
@@ -3809,6 +3850,8 @@ namespace winrt::TerminalApp::implementation
                                     theme.Tab().ShowCloseButton() :
                                     Settings::Model::TabCloseButtonVisibility::Always;
 
+        _tabItemMiddleClickHookEnabled = visibility == Settings::Model::TabCloseButtonVisibility::Never;
+
         for (const auto& tab : _tabs)
         {
             tab.CloseButtonVisibility(visibility);
@@ -4644,7 +4687,7 @@ namespace winrt::TerminalApp::implementation
     // - true iff we tossed this request to an elevated window. Callers can use
     //   this result to early-return if needed.
     bool TerminalPage::_maybeElevate(const NewTerminalArgs& newTerminalArgs,
-                                     const TerminalSettingsCreateResult& controlSettings,
+                                     const Settings::TerminalSettingsCreateResult& controlSettings,
                                      const Profile& profile)
     {
         // When duplicating a tab there aren't any newTerminalArgs.
@@ -4657,7 +4700,7 @@ namespace winrt::TerminalApp::implementation
 
         // If we don't even want to elevate we can return early.
         // If we're already elevated we can also return, because it doesn't get any more elevated than that.
-        if (!defaultSettings.Elevate() || IsRunningElevated())
+        if (!defaultSettings->Elevate() || IsRunningElevated())
         {
             return false;
         }
@@ -4667,7 +4710,7 @@ namespace winrt::TerminalApp::implementation
         // will be that profile's GUID. If there wasn't, then we'll use
         // whatever the default profile's GUID is.
         newTerminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profile.Guid()));
-        newTerminalArgs.StartingDirectory(_evaluatePathForCwd(defaultSettings.StartingDirectory()));
+        newTerminalArgs.StartingDirectory(_evaluatePathForCwd(defaultSettings->StartingDirectory()));
         _OpenElevatedWT(newTerminalArgs);
         return true;
     }
@@ -4958,9 +5001,10 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_adjustProcessPriority() const
     {
         // Windowing is single-threaded, so this will not cause a race condition.
-        static bool supported{ true };
+        static uint64_t s_lastUpdateHash{ 0 };
+        static bool s_supported{ true };
 
-        if (!supported || !_hostingHwnd.has_value())
+        if (!s_supported || !_hostingHwnd.has_value())
         {
             return;
         }
@@ -5024,11 +5068,20 @@ namespace winrt::TerminalApp::implementation
         }
 
         const auto count{ gsl::narrow_cast<DWORD>(it - processes.begin()) };
+        const auto hash = til::hash((void*)processes.data(), count * sizeof(HANDLE));
+
+        if (hash == s_lastUpdateHash)
+        {
+            return;
+        }
+
+        s_lastUpdateHash = hash;
         const auto hr = TerminalTrySetWindowAssociatedProcesses(_hostingHwnd.value(), count, count ? processes.data() : nullptr);
+
         if (S_FALSE == hr)
         {
             // Don't bother trying again or logging. The wrapper tells us it's unsupported.
-            supported = false;
+            s_supported = false;
             return;
         }
 

src/cascadia/TerminalApp/TerminalPage.h

@@ -29,6 +29,11 @@ namespace Microsoft::Terminal::Core
     class ControlKeyStates;
 }
 
+namespace winrt::Microsoft::Terminal::Settings
+{
+    struct TerminalSettingsCreateResult;
+}
+
 namespace winrt::TerminalApp::implementation
 {
     struct TerminalSettingsCache;
@@ -117,7 +122,8 @@ namespace winrt::TerminalApp::implementation
 
         safe_void_coroutine RequestQuit();
         safe_void_coroutine CloseWindow();
-        void PersistState(bool serializeBuffer);
+        void PersistState();
+        std::vector<IPaneContent> Panes() const;
 
         void ToggleFocusMode();
         void ToggleFullscreen();
@@ -313,7 +319,7 @@ namespace winrt::TerminalApp::implementation
 
         std::wstring _evaluatePathForCwd(std::wstring_view path);
 
-        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(Microsoft::Terminal::Settings::Model::Profile profile, Microsoft::Terminal::Settings::Model::TerminalSettings settings, const bool inheritCursor);
+        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(Microsoft::Terminal::Settings::Model::Profile profile, Microsoft::Terminal::Control::IControlSettings settings, const bool inheritCursor);
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _duplicateConnectionForRestart(const TerminalApp::TerminalPaneContent& paneContent);
         void _restartPaneConnection(const TerminalApp::TerminalPaneContent&, const winrt::Windows::Foundation::IInspectable&);
 
@@ -391,7 +397,7 @@ namespace winrt::TerminalApp::implementation
         std::optional<uint32_t> _GetTabIndex(const TerminalApp::Tab& tab) const noexcept;
         TerminalApp::Tab _GetFocusedTab() const noexcept;
         winrt::com_ptr<Tab> _GetFocusedTabImpl() const noexcept;
-        TerminalApp::Tab _GetTabByTabViewItem(const Microsoft::UI::Xaml::Controls::TabViewItem& tabViewItem) const noexcept;
+        TerminalApp::Tab _GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept;
 
         void _HandleClosePaneRequested(std::shared_ptr<Pane> pane);
         safe_void_coroutine _SetFocusedTab(const winrt::TerminalApp::Tab tab);
@@ -435,13 +441,18 @@ namespace winrt::TerminalApp::implementation
         void _TabDragStarted(const IInspectable& sender, const IInspectable& eventArgs);
         void _TabDragCompleted(const IInspectable& sender, const IInspectable& eventArgs);
 
-        bool _tabPointerMiddleButtonPressed{ false };
-        bool _tabPointerMiddleButtonExited{ false };
+        // BODGY: WinUI's TabView has a broken close event handler:
+        // If the close button is disabled, middle-clicking the tab raises no close
+        // event. Because that's dumb, we implement our own middle-click handling.
+        // `_tabItemMiddleClickHookEnabled` is true whenever the close button is hidden,
+        // and that enables all of the rest of this machinery (and this workaround).
+        bool _tabItemMiddleClickHookEnabled = false;
+        bool _tabItemMiddleClickExited = false;
+        PointerEntered_revoker _tabItemMiddleClickPointerEntered;
+        PointerExited_revoker _tabItemMiddleClickPointerExited;
+        PointerCaptureLost_revoker _tabItemMiddleClickPointerCaptureLost;
         void _OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
-        void _OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
-        safe_void_coroutine _OnTabPointerReleasedCloseTab(winrt::Microsoft::UI::Xaml::Controls::TabViewItem sender);
-        void _OnTabPointerEntered(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
-        void _OnTabPointerExited(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        safe_void_coroutine _OnTabPointerReleasedCloseTab(IInspectable sender);
 
         void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
         void _OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs);
@@ -456,7 +467,7 @@ namespace winrt::TerminalApp::implementation
 
         void _Find(const Tab& tab);
 
-        winrt::Microsoft::Terminal::Control::TermControl _CreateNewControlAndContent(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& settings,
+        winrt::Microsoft::Terminal::Control::TermControl _CreateNewControlAndContent(const winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult& settings,
                                                                                      const winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection& connection);
         winrt::Microsoft::Terminal::Control::TermControl _SetupControl(const winrt::Microsoft::Terminal::Control::TermControl& term);
         winrt::Microsoft::Terminal::Control::TermControl _AttachControlToContent(const uint64_t& contentGuid);
@@ -511,7 +522,7 @@ namespace winrt::TerminalApp::implementation
         winrt::Microsoft::Terminal::Settings::Model::Profile GetClosestProfileForDuplicationOfProfile(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile) const noexcept;
 
         bool _maybeElevate(const winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs,
-                           const winrt::Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& controlSettings,
+                           const winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult& controlSettings,
                            const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
         void _OpenElevatedWT(winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs newTerminalArgs);
 

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -66,8 +66,12 @@ namespace winrt::TerminalApp::implementation
     }
     void TerminalPaneContent::Close()
     {
+        // We deliberately remove the event handlers before closing the control.
+        // This is to prevent reentrancy issues, pointless callbacks, etc.
         _removeControlEvents();
 
+        _control.Close();
+
         // Clear out our media player callbacks, and stop any playing media. This
         // will prevent the callback from being triggered after we've closed, and
         // also make sure that our sound stops when we're closed.
@@ -127,11 +131,9 @@ namespace winrt::TerminalApp::implementation
 
         // TODO:GH#9800 - we used to be able to persist the color scheme that a
         // TermControl was initialized with, by name. With the change to having the
-        // control own its own copy of its settings, this isn't possible anymore.
-        //
-        // We may be able to get around this by storing the Name in the Core::Scheme
-        // object. That would work for schemes set by the Terminal, but not ones set
-        // by VT, but that seems good enough.
+        // control own its own copy of its settings, this wasn't possible anymore.
+        // It probably is once again possible, but Dustin doesn't know how to undo
+        // the damage done in the ControlSettings migration.
 
         switch (kind)
         {
@@ -142,22 +144,16 @@ namespace winrt::TerminalApp::implementation
             // "attach existing" rather than a "create"
             args.ContentId(_control.ContentId());
             break;
-        case BuildStartupKind::PersistAll:
+        case BuildStartupKind::Persist:
         {
             const auto connection = _control.Connection();
             const auto id = connection ? connection.SessionId() : winrt::guid{};
-
             if (id != winrt::guid{})
             {
-                const auto settingsDir = CascadiaSettings::SettingsDirectory();
-                const auto idStr = ::Microsoft::Console::Utils::GuidToPlainString(id);
-                const auto path = fmt::format(FMT_COMPILE(L"{}\\buffer_{}.txt"), settingsDir, idStr);
-                _control.PersistToPath(path);
                 args.SessionId(id);
             }
             break;
         }
-        case BuildStartupKind::PersistLayout:
         default:
             break;
         }
@@ -347,9 +343,9 @@ namespace winrt::TerminalApp::implementation
         const auto profile{ settings.FindProfile(_profile.Guid()) };
         _profile = profile ? profile : settings.ProfileDefaults();
 
-        if (const auto& settings{ _cache->TryLookup(_profile) })
+        if (const auto settings{ _cache->TryLookup(_profile) })
         {
-            _control.UpdateControlSettings(settings.DefaultSettings(), settings.UnfocusedSettings());
+            _control.UpdateControlSettings(settings->DefaultSettings(), settings->UnfocusedSettings());
         }
     }
 

src/cascadia/TerminalApp/TerminalSettingsCache.cpp

@@ -3,22 +3,27 @@
 
 #include "pch.h"
 #include "TerminalSettingsCache.h"
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
 namespace winrt
 {
-    namespace MUX = Microsoft::UI::Xaml;
-    namespace WUX = Windows::UI::Xaml;
     namespace MTSM = Microsoft::Terminal::Settings::Model;
 }
 
 namespace winrt::TerminalApp::implementation
 {
-    TerminalSettingsCache::TerminalSettingsCache(const MTSM::CascadiaSettings& settings, const TerminalApp::AppKeyBindings& bindings)
+    TerminalSettingsPair::TerminalSettingsPair(const winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult& result)
     {
-        Reset(settings, bindings);
+        result.DefaultSettings().try_as(_defaultSettings);
+        result.UnfocusedSettings().try_as(_unfocusedSettings);
     }
 
-    MTSM::TerminalSettingsCreateResult TerminalSettingsCache::TryLookup(const MTSM::Profile& profile)
+    TerminalSettingsCache::TerminalSettingsCache(const MTSM::CascadiaSettings& settings)
+    {
+        Reset(settings);
+    }
+
+    std::optional<TerminalSettingsPair> TerminalSettingsCache::TryLookup(const MTSM::Profile& profile)
     {
         const auto found{ profileGuidSettingsMap.find(profile.Guid()) };
         // GH#2455: If there are any panes with controls that had been
@@ -30,18 +35,17 @@ namespace winrt::TerminalApp::implementation
             auto& pair{ found->second };
             if (!pair.second)
             {
-                pair.second = MTSM::TerminalSettings::CreateWithProfile(_settings, pair.first, _bindings);
+                pair.second = winrt::Microsoft::Terminal::Settings::TerminalSettings::CreateWithProfile(_settings, pair.first);
             }
-            return pair.second;
+            return std::optional{ TerminalSettingsPair{ *pair.second } };
         }
 
-        return nullptr;
+        return std::nullopt;
     }
 
-    void TerminalSettingsCache::Reset(const MTSM::CascadiaSettings& settings, const TerminalApp::AppKeyBindings& bindings)
+    void TerminalSettingsCache::Reset(const MTSM::CascadiaSettings& settings)
     {
         _settings = settings;
-        _bindings = bindings;
 
         // Mapping by GUID isn't _excellent_ because the defaults profile doesn't have a stable GUID; however,
         // when we stabilize its guid this will become fully safe.
@@ -51,12 +55,12 @@ namespace winrt::TerminalApp::implementation
         profileGuidSettingsMap.reserve(allProfiles.Size() + 1);
 
         // Include the Defaults profile for consideration
-        profileGuidSettingsMap.insert_or_assign(profileDefaults.Guid(), std::pair{ profileDefaults, nullptr });
+        profileGuidSettingsMap.insert_or_assign(profileDefaults.Guid(), std::pair{ profileDefaults, std::nullopt });
         for (const auto& newProfile : allProfiles)
         {
             // Avoid creating a TerminalSettings right now. They're not totally cheap, and we suspect that users with many
             // panes may not be using all of their profiles at the same time. Lazy evaluation is king!
-            profileGuidSettingsMap.insert_or_assign(newProfile.Guid(), std::pair{ newProfile, nullptr });
+            profileGuidSettingsMap.insert_or_assign(newProfile.Guid(), std::pair{ newProfile, std::nullopt });
         }
     }
 }

src/cascadia/TerminalApp/TerminalSettingsCache.h

@@ -16,17 +16,34 @@ Abstract:
 #include "winrt/Microsoft.Terminal.Settings.Model.h"
 #include "winrt/TerminalApp.h"
 
+namespace winrt::Microsoft::Terminal::Settings
+{
+    struct TerminalSettingsCreateResult;
+}
+
 namespace winrt::TerminalApp::implementation
 {
+    class TerminalSettingsPair
+    {
+    public:
+        TerminalSettingsPair(const winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult& result);
+
+        winrt::Microsoft::Terminal::Control::IControlSettings DefaultSettings() const { return _defaultSettings; };
+        winrt::Microsoft::Terminal::Control::IControlSettings UnfocusedSettings() const { return _unfocusedSettings; };
+
+    private:
+        winrt::Microsoft::Terminal::Control::IControlSettings _defaultSettings{ nullptr };
+        winrt::Microsoft::Terminal::Control::IControlSettings _unfocusedSettings{ nullptr };
+    };
+
     struct TerminalSettingsCache
     {
-        TerminalSettingsCache(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings, const TerminalApp::AppKeyBindings& bindings);
-        Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult TryLookup(const Microsoft::Terminal::Settings::Model::Profile& profile);
-        void Reset(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings, const TerminalApp::AppKeyBindings& bindings);
+        TerminalSettingsCache(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
+        std::optional<TerminalSettingsPair> TryLookup(const Microsoft::Terminal::Settings::Model::Profile& profile);
+        void Reset(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
 
     private:
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
-        TerminalApp::AppKeyBindings _bindings{ nullptr };
-        std::unordered_map<winrt::guid, std::pair<Microsoft::Terminal::Settings::Model::Profile, Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult>> profileGuidSettingsMap;
+        std::unordered_map<winrt::guid, std::pair<Microsoft::Terminal::Settings::Model::Profile, std::optional<winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult>>> profileGuidSettingsMap;
     };
 }

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -6,13 +6,14 @@
 
 #include "AppLogic.h"
 
-#include <LibraryResources.h>
 #include <til/env.h>
 
 #include "TerminalWindow.g.cpp"
 #include "SettingsLoadEventArgs.g.cpp"
 #include "WindowProperties.g.cpp"
 
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
+
 using namespace winrt::Windows::ApplicationModel;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Graphics::Display;
@@ -251,11 +252,11 @@ namespace winrt::TerminalApp::implementation
         AppLogic::Current()->NotifyRootInitialized();
     }
 
-    void TerminalWindow::PersistState(bool serializeBuffer)
+    void TerminalWindow::PersistState()
     {
         if (_root)
         {
-            _root->PersistState(serializeBuffer);
+            _root->PersistState();
         }
     }
 
@@ -613,11 +614,11 @@ namespace winrt::TerminalApp::implementation
         if ((_appArgs && _appArgs->ParsedArgs().GetSize().has_value()) || (proposedSize.Width == 0 && proposedSize.Height == 0))
         {
             // Use the default profile to determine how big of a window we need.
-            const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, nullptr, nullptr) };
+            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, nullptr) };
 
             const til::size emptySize{};
             const auto commandlineSize = _appArgs ? _appArgs->ParsedArgs().GetSize().value_or(emptySize) : til::size{};
-            proposedSize = TermControl::GetProposedDimensions(settings.DefaultSettings(),
+            proposedSize = TermControl::GetProposedDimensions(*settings.DefaultSettings(),
                                                               dpi,
                                                               commandlineSize.width,
                                                               commandlineSize.height);
@@ -828,6 +829,11 @@ namespace winrt::TerminalApp::implementation
         return _root.as<winrt::Windows::UI::Xaml::Controls::Control>();
     }
 
+    winrt::Windows::Foundation::Collections::IVector<IPaneContent> TerminalWindow::Panes() const
+    {
+        return winrt::single_threaded_vector(_root->Panes());
+    }
+
     // Method Description:
     // - Gets the title of the currently focused terminal control. If there
     //   isn't a control selected for any reason, returns "Terminal"
@@ -1048,6 +1054,11 @@ namespace winrt::TerminalApp::implementation
         // (or called TerminalWindow::Initialize)
         if (_appArgs->ExitCode() == 0)
         {
+            // The existing logic (before this commit) strictly relied on
+            // ValidateStartupCommands() only to be called for new windows.
+            // It modifies the actions it stores.
+            parsedArgs.ValidateStartupCommands();
+
             // If the size of the arguments list is 1,
             // then it contains only the executable name and no other arguments.
             _hasCommandLineArguments = _appArgs->CommandlineRef().size() > 1;

src/cascadia/TerminalApp/TerminalWindow.h

@@ -71,7 +71,7 @@ namespace winrt::TerminalApp::implementation
 
         void Create();
 
-        void PersistState(bool serializeBuffer);
+        void PersistState();
 
         void UpdateSettings(winrt::TerminalApp::SettingsLoadEventArgs args);
 
@@ -111,6 +111,7 @@ namespace winrt::TerminalApp::implementation
         float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
 
         Windows::UI::Xaml::UIElement GetRoot() noexcept;
+        winrt::Windows::Foundation::Collections::IVector<IPaneContent> Panes() const;
 
         hstring Title();
         void TitlebarClicked();

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "IPaneContent.idl";
 import "TerminalPage.idl";
 import "ShortcutActionDispatch.idl";
 
@@ -59,9 +60,10 @@ namespace TerminalApp
         Boolean ShouldImmediatelyHandoffToElevated();
         void HandoffToElevated();
 
-        void PersistState(Boolean serializeBuffer);
+        void PersistState();
 
         Windows.UI.Xaml.UIElement GetRoot();
+        IVector<IPaneContent> Panes { get; };
 
         String Title { get; };
         Boolean FocusMode { get; };

src/cascadia/TerminalApp/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // Note: Generate GUID using TlgGuid.exe tool

src/cascadia/TerminalApp/pch.h

@@ -96,3 +96,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
 
 #include <til/winrt.h>
+
+#include <LibraryResources.h>

src/cascadia/TerminalAzBridge/ConsoleInputReader.cpp

@@ -1,87 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "ConsoleInputReader.h"
-#include "unicode.hpp"
-
-ConsoleInputReader::ConsoleInputReader(HANDLE handle) :
-    _handle(handle)
-{
-    _buffer.resize(BufferSize);
-    _convertedString.reserve(BufferSize);
-}
-
-void ConsoleInputReader::SetWindowSizeChangedCallback(std::function<void()> callback)
-{
-    _windowSizeChangedCallback = std::move(callback);
-}
-
-std::optional<std::wstring_view> ConsoleInputReader::Read()
-{
-    DWORD readCount{ 0 };
-
-    _convertedString.clear();
-    while (_convertedString.empty())
-    {
-        _buffer.resize(BufferSize);
-        auto succeeded =
-            ReadConsoleInputW(_handle, _buffer.data(), gsl::narrow_cast<DWORD>(_buffer.size()), &readCount);
-        if (!succeeded)
-        {
-            return std::nullopt;
-        }
-
-        _buffer.resize(readCount);
-        for (auto it = _buffer.begin(); it != _buffer.end(); ++it)
-        {
-            if (it->EventType == WINDOW_BUFFER_SIZE_EVENT && _windowSizeChangedCallback)
-            {
-                _windowSizeChangedCallback();
-            }
-            else if (it->EventType == KEY_EVENT)
-            {
-                const auto& keyEvent = it->Event.KeyEvent;
-                if (keyEvent.bKeyDown || (!keyEvent.bKeyDown && keyEvent.wVirtualKeyCode == VK_MENU))
-                {
-                    // Got a high surrogate at the end of the buffer
-                    if (IS_HIGH_SURROGATE(keyEvent.uChar.UnicodeChar))
-                    {
-                        _highSurrogate.emplace(keyEvent.uChar.UnicodeChar);
-                        continue; // we've consumed it -- only dispatch it if we get a low
-                    }
-
-                    if (IS_LOW_SURROGATE(keyEvent.uChar.UnicodeChar))
-                    {
-                        // No matter what we do, we want to destructively consume the high surrogate
-                        if (const auto oldHighSurrogate{ std::exchange(_highSurrogate, std::nullopt) })
-                        {
-                            _convertedString.push_back(*_highSurrogate);
-                        }
-                        else
-                        {
-                            // If we get a low without a high surrogate, we've done everything we can.
-                            // This is an illegal state.
-                            _convertedString.push_back(UNICODE_REPLACEMENT);
-                            continue; // onto the next event
-                        }
-                    }
-
-                    // (\0 with a scancode is probably a modifier key, not a VT input key)
-                    if (keyEvent.uChar.UnicodeChar != L'\0' || keyEvent.wVirtualScanCode == 0)
-                    {
-                        if (_highSurrogate) // non-destructive: we don't want to set it to nullopt needlessly for every character
-                        {
-                            // If we get a high surrogate *here*, we didn't find a low surrogate.
-                            // This state is also illegal.
-                            _convertedString.push_back(UNICODE_REPLACEMENT);
-                            _highSurrogate.reset();
-                        }
-                        _convertedString.push_back(keyEvent.uChar.UnicodeChar);
-                    }
-                }
-            }
-        }
-    }
-    return _convertedString;
-}

src/cascadia/TerminalAzBridge/ConsoleInputReader.h

@@ -1,33 +0,0 @@
-/*++
-
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
-
-Module Name:
-
-    ConsoleInputReader.h
-
-Abstract:
-
-    This file contains a class whose sole purpose is to
-    abstract away a bunch of details you usually need to
-    know to read VT from a console input handle.
-
---*/
-
-class ConsoleInputReader
-{
-public:
-    explicit ConsoleInputReader(HANDLE handle);
-    void SetWindowSizeChangedCallback(std::function<void()> callback);
-    std::optional<std::wstring_view> Read();
-
-private:
-    static constexpr size_t BufferSize{ 128 };
-
-    HANDLE _handle;
-    std::wstring _convertedString;
-    std::vector<INPUT_RECORD> _buffer;
-    std::optional<wchar_t> _highSurrogate;
-    std::function<void()> _windowSizeChangedCallback;
-};

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>TerminalAzBridge</RootNamespace>
-    <ProjectName>TerminalAzBridge</ProjectName>
-    <TargetName>TerminalAzBridge</TargetName>
-    <ConfigurationType>Application</ConfigurationType>
-    <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
-    <ApplicationType>Windows Store</ApplicationType>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <VersionInfoFileDescription>Windows Terminal Azure Cloud Shell Connector</VersionInfoFileDescription>
-  </PropertyGroup>
-
-  <PropertyGroup Label="NuGet Dependencies">
-    <TerminalCppWinrt>true</TerminalCppWinrt>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
-  <PropertyGroup>
-    <GenerateManifest>true</GenerateManifest>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-
-  <!-- Source Files -->
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="ConsoleInputReader.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="ConsoleInputReader.cpp" />
-  </ItemGroup>
-  <!-- Dependencies -->
-  <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
-      <Project>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
-  </ItemGroup>
-
-  <!--
-    This ItemGroup and the Globals PropertyGroup below it are required in order
-    to enable F5 debugging for the unpackaged application
-    -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_general.xml" />
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_local_windows.xml" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
-
-  <!-- These have to come after post.props because the Cpp common targets will inexplicably overwrite them. -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!--
-  BODGY
-
-  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
-  executable we put in the package. But we DON'T produce a winmd. This makes the
-  FastUpToDate check fail every time, and leads to the whole wapproj build
-  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
-
-  Setting GenerateWindowsMetadata=false is enough to tell the build system that
-  we don't produce one, and get it off our backs.
-  -->
-  <ItemDefinitionGroup>
-    <Link>
-        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
-</Project>

src/cascadia/TerminalAzBridge/main.cpp

@@ -1,108 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "winrt/Microsoft.Terminal.TerminalConnection.h"
-#include "ConsoleInputReader.h"
-
-using namespace winrt;
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
-
-static til::size GetConsoleScreenSize(HANDLE outputHandle)
-{
-    CONSOLE_SCREEN_BUFFER_INFOEX csbiex{};
-    csbiex.cbSize = sizeof(csbiex);
-    GetConsoleScreenBufferInfoEx(outputHandle, &csbiex);
-    return {
-        (csbiex.srWindow.Right - csbiex.srWindow.Left) + 1,
-        (csbiex.srWindow.Bottom - csbiex.srWindow.Top) + 1
-    };
-}
-
-static ConnectionState RunConnectionToCompletion(const ITerminalConnection& connection, HANDLE outputHandle, HANDLE inputHandle)
-{
-    connection.TerminalOutput([outputHandle](const winrt::hstring& output) {
-        WriteConsoleW(outputHandle, output.data(), output.size(), nullptr, nullptr);
-    });
-
-    // Detach a thread to spin the console read indefinitely.
-    // This application exits when the connection is closed, so
-    // the connection's lifetime will outlast this thread.
-    std::thread([connection, outputHandle, inputHandle] {
-        ConsoleInputReader reader{ inputHandle };
-        reader.SetWindowSizeChangedCallback([&]() {
-            const auto size = GetConsoleScreenSize(outputHandle);
-
-            connection.Resize(size.height, size.width);
-        });
-
-        while (true)
-        {
-            auto input = reader.Read();
-            if (input)
-            {
-                connection.WriteInput(winrt_wstring_to_array_view(*input));
-            }
-        }
-    }).detach();
-
-    std::condition_variable stateChangeVar;
-    std::optional<ConnectionState> state;
-    std::mutex stateMutex;
-
-    connection.StateChanged([&](auto&& /*s*/, auto&& /*e*/) {
-        std::unique_lock<std::mutex> lg{ stateMutex };
-        state = connection.State();
-        stateChangeVar.notify_all();
-    });
-
-    connection.Start();
-
-    std::unique_lock<std::mutex> lg{ stateMutex };
-    stateChangeVar.wait(lg, [&]() {
-        if (!state.has_value())
-        {
-            return false;
-        }
-        return state.value() == ConnectionState::Closed || state.value() == ConnectionState::Failed;
-    });
-
-    return state.value();
-}
-
-int wmain(int /*argc*/, wchar_t** /*argv*/)
-{
-    winrt::init_apartment(winrt::apartment_type::single_threaded);
-
-    DWORD inputMode{}, outputMode{};
-    auto conIn{ GetStdHandle(STD_INPUT_HANDLE) }, conOut{ GetStdHandle(STD_OUTPUT_HANDLE) };
-    auto codepage{ GetConsoleCP() }, outputCodepage{ GetConsoleOutputCP() };
-
-    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conIn, &inputMode));
-    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conOut, &outputMode));
-
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conIn, ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conOut, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_WRAP_AT_EOL_OUTPUT | DISABLE_NEWLINE_AUTO_RETURN));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleCP(CP_UTF8));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleOutputCP(CP_UTF8));
-
-    auto restoreConsoleModes = wil::scope_exit([&]() {
-        SetConsoleMode(conIn, inputMode);
-        SetConsoleMode(conOut, outputMode);
-        SetConsoleCP(codepage);
-        SetConsoleOutputCP(outputCodepage);
-    });
-
-    const auto size = GetConsoleScreenSize(conOut);
-
-    AzureConnection azureConn{};
-    winrt::Windows::Foundation::Collections::ValueSet vs{};
-    vs.Insert(L"initialRows", winrt::Windows::Foundation::PropertyValue::CreateUInt32(gsl::narrow_cast<uint32_t>(size.height)));
-    vs.Insert(L"initialCols", winrt::Windows::Foundation::PropertyValue::CreateUInt32(gsl::narrow_cast<uint32_t>(size.width)));
-    azureConn.Initialize(vs);
-
-    const auto state = RunConnectionToCompletion(azureConn, conOut, conIn);
-
-    return state == ConnectionState::Closed ? 0 : 1;
-}

src/cascadia/TerminalAzBridge/pch.h

@@ -1,40 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- pch.h
-
-Abstract:
-- Contains external headers to include in the precompile phase of console build process.
-- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
---*/
-
-#pragma once
-
-// Ignore checked iterators warning from VC compiler.
-#define _SCL_SECURE_NO_WARNINGS
-
-// Block minwindef.h min/max macros to prevent <algorithm> conflict
-#define NOMINMAX
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMCX
-#define NOHELP
-#define NOCOMM
-#include <Unknwn.h>
-
-#include <windows.h>
-
-#include "../inc/LibraryIncludes.h"
-
-#include <wil/cppwinrt.h>
-
-#include <winrt/Windows.system.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-
-#include <wil/resource.h>
-#include <wil/win32_helpers.h>
-
-#include <cppwinrt_utils.h>

src/cascadia/TerminalConnection/AzureConnection.cpp

@@ -7,7 +7,6 @@
 #include "AzureClientID.h"
 #include <sstream>
 #include <cstdlib>
-#include <LibraryResources.h>
 #include <unicode.hpp>
 
 #include "AzureConnection.g.cpp"
@@ -97,7 +96,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     // - str: the string to write.
     void AzureConnection::_WriteStringWithNewline(const std::wstring_view str)
     {
-        TerminalOutput.raise(str + L"\r\n");
+        WriteUtf16Output(str + L"\r\n");
     }
 
     // Method description:
@@ -113,7 +112,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         catch (const std::exception& runtimeException)
         {
             // This also catches the AzureException, which has a .what()
-            TerminalOutput.raise(_colorize(91, til::u8u16(std::string{ runtimeException.what() })));
+            WriteUtf16Output(_colorize(91, til::u8u16(std::string{ runtimeException.what() })));
         }
         catch (...)
         {
@@ -152,7 +151,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         _transitionToState(ConnectionState::Connecting);
     }
 
-    std::optional<std::wstring> AzureConnection::_ReadUserInput(InputMode mode)
+    std::optional<std::string> AzureConnection::_ReadUserInput(InputMode mode)
     {
         std::unique_lock<std::mutex> inputLock{ _inputMutex };
 
@@ -163,20 +162,20 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         _currentInputMode = mode;
 
-        TerminalOutput.raise(L"> \x1b[92m"); // Make prompted user input green
+        WriteUtf8Output("> \x1b[92m"); // Make prompted user input green
 
         _inputEvent.wait(inputLock, [this, mode]() {
             return _currentInputMode != mode || _isStateAtOrBeyond(ConnectionState::Closing);
         });
 
-        TerminalOutput.raise(L"\x1b[m");
+        WriteUtf8Output("\x1b[m");
 
         if (_isStateAtOrBeyond(ConnectionState::Closing))
         {
             return std::nullopt;
         }
 
-        std::wstring readInput{};
+        std::string readInput{};
         _userInput.swap(readInput);
         return readInput;
     }
@@ -186,12 +185,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     // - handles the different possible inputs in the different states
     // Arguments:
     // the user's input
-    void AzureConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void AzureConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
     {
-        _writeInput(winrt_array_to_wstring_view(buffer));
+        _writeInput(winrt_array_to_string_view(buffer));
     }
 
-    void AzureConnection::_writeInput(const std::wstring_view data)
+    void AzureConnection::_writeInput(const std::string_view data)
     {
         // We read input while connected AND connecting.
         if (!_isStateOneOf(ConnectionState::Connected, ConnectionState::Connecting))
@@ -201,8 +200,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         if (_state == AzureState::TermConnected)
         {
-            auto buff{ winrt::to_string(data) };
-            WinHttpWebSocketSend(_webSocket.get(), WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, buff.data(), gsl::narrow<DWORD>(buff.size()));
+            WinHttpWebSocketSend(_webSocket.get(), WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, const_cast<char*>(data.data()), gsl::narrow<DWORD>(data.size()));
             return;
         }
 
@@ -212,19 +210,19 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             if (_userInput.size() > 0)
             {
                 _userInput.pop_back();
-                TerminalOutput.raise(L"\x08 \x08"); // overstrike the character with a space
+                WriteUtf8Output("\x08 \x08"); // overstrike the character with a space
             }
         }
         else
         {
-            TerminalOutput.raise(data); // echo back
+            WriteUtf8Output(data); // echo back
 
             switch (_currentInputMode)
             {
             case InputMode::Line:
                 if (data.size() > 0 && gsl::at(data, 0) == UNICODE_CARRIAGERETURN)
                 {
-                    TerminalOutput.raise(L"\r\n"); // we probably got a \r, so we need to advance to the next line.
+                    WriteUtf8Output("\r\n"); // we probably got a \r, so we need to advance to the next line.
                     _currentInputMode = InputMode::None; // toggling the mode indicates completion
                     _inputEvent.notify_one();
                     break;
@@ -416,21 +414,13 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                         case WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE:
                         case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE:
                         {
-                            const auto result{ til::u8u16(std::string_view{ _buffer.data(), read }, _u16Str, _u8State) };
-                            if (FAILED(result))
-                            {
-                                // EXIT POINT
-                                _transitionToState(ConnectionState::Failed);
-                                return gsl::narrow<DWORD>(result);
-                            }
-
-                            if (_u16Str.empty())
+                            if (read == 0)
                             {
                                 continue;
                             }
 
                             // Pass the output to our registered event handlers
-                            TerminalOutput.raise(_u16Str);
+                            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(_buffer.data()), read });
                             break;
                         }
                         case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE:
@@ -527,14 +517,14 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             }
 
             const auto& tenantSelection = maybeTenantSelection.value();
-            if (tenantSelection == RS_(L"AzureUserEntry_RemoveStored"))
+            if (tenantSelection == RS_A(L"AzureUserEntry_RemoveStored"))
             {
                 // User wants to remove the stored settings
                 _RemoveCredentials();
                 _state = AzureState::DeviceFlow;
                 return;
             }
-            else if (tenantSelection == RS_(L"AzureUserEntry_NewLogin"))
+            else if (tenantSelection == RS_A(L"AzureUserEntry_NewLogin"))
             {
                 // User wants to login with a different account
                 _state = AzureState::DeviceFlow;
@@ -715,13 +705,13 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             }
 
             const auto& storeCredentials = maybeStoreCredentials.value();
-            if (storeCredentials == RS_(L"AzureUserEntry_Yes"))
+            if (storeCredentials == RS_A(L"AzureUserEntry_Yes"))
             {
                 _StoreCredential();
                 _WriteStringWithNewline(RS_(L"AzureTokensStored"));
                 break;
             }
-            else if (storeCredentials == RS_(L"AzureUserEntry_No"))
+            else if (storeCredentials == RS_A(L"AzureUserEntry_No"))
             {
                 break; // we're done, but the user wants nothing.
             }
@@ -773,7 +763,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         const auto shellType = _ParsePreferredShellType(settingsResponse);
         _WriteStringWithNewline(RS_(L"AzureRequestingTerminal"));
         const auto socketUri = _GetTerminal(shellType);
-        TerminalOutput.raise(L"\r\n");
+        WriteUtf16Output(L"\r\n");
 
         //// Step 8: connecting to said terminal
         {
@@ -805,7 +795,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         _state = AzureState::TermConnected;
 
-        std::wstring queuedUserInput{};
+        std::string queuedUserInput{};
         std::swap(_userInput, queuedUserInput);
         if (queuedUserInput.size() > 0)
         {

src/cascadia/TerminalConnection/AzureConnection.h

@@ -22,12 +22,10 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         void Initialize(const Windows::Foundation::Collections::ValueSet& settings);
 
         void Start();
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
         void Resize(uint32_t rows, uint32_t columns);
         void Close();
 
-        til::event<TerminalOutputHandler> TerminalOutput;
-
     private:
         til::CoordType _initialRows{};
         til::CoordType _initialCols{};
@@ -66,7 +64,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         std::vector<::Microsoft::Terminal::Azure::Tenant> _tenantList;
         std::optional<::Microsoft::Terminal::Azure::Tenant> _currentTenant;
 
-        void _writeInput(const std::wstring_view str);
+        void _writeInput(const std::string_view str);
         void _WriteStringWithNewline(const std::wstring_view str);
         void _WriteCaughtExceptionRecord();
         winrt::Windows::Data::Json::JsonObject _SendRequestReturningJson(std::wstring_view uri, const winrt::Windows::Web::Http::IHttpContent& content = nullptr, winrt::Windows::Web::Http::HttpMethod method = nullptr, const winrt::Windows::Foundation::Uri referer = nullptr);
@@ -87,19 +85,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             Line
         };
         InputMode _currentInputMode{ InputMode::None };
-        std::wstring _userInput;
+        std::string _userInput;
         std::condition_variable _inputEvent;
         std::mutex _inputMutex;
 
-        std::optional<std::wstring> _ReadUserInput(InputMode mode);
+        std::optional<std::string> _ReadUserInput(InputMode mode);
 
         winrt::Windows::Web::Http::HttpClient _httpClient{ nullptr };
         wil::unique_winhttp_hinternet _socketSessionHandle;
         wil::unique_winhttp_hinternet _socketConnectionHandle;
         wil::unique_winhttp_hinternet _webSocket;
 
-        til::u8state _u8State{};
-        std::wstring _u16Str;
         std::array<char, 4096> _buffer{};
 
         static winrt::hstring _ParsePreferredShellType(const winrt::Windows::Data::Json::JsonObject& settingsResponse);

src/cascadia/TerminalConnection/BaseTerminalConnection.h

@@ -18,6 +18,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         }
 
         til::typed_event<ITerminalConnection, winrt::Windows::Foundation::IInspectable> StateChanged;
+        til::event<TerminalOutputHandler> TerminalOutput;
 
     protected:
         template<typename U>
@@ -101,6 +102,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             return _isStateOneOf(ConnectionState::Connected);
         }
 
+        void WriteUtf16Output(std::wstring_view str)
+        {
+            auto converted{ til::u16u8(str) };
+            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(converted.data()), static_cast<uint32_t>(converted.size()) });
+        }
+
+        void WriteUtf8Output(std::string_view str)
+        {
+            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(str.data()), static_cast<uint32_t>(str.size()) });
+        }
+
         winrt::guid _sessionId{};
 
     private:

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -8,7 +8,6 @@
 #include <winmeta.h>
 
 #include "CTerminalHandoff.h"
-#include "LibraryResources.h"
 #include "../../types/inc/utils.hpp"
 
 #include "ConptyConnection.g.cpp"
@@ -479,28 +478,28 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         // GH#11556 - make sure to format the error code to this string as an UNSIGNED int
         const auto failureText = RS_fmt(L"ProcessFailedToLaunch", _formatStatus(hr), _commandline);
-        TerminalOutput.raise(failureText);
+        WriteUtf16Output(failureText);
 
         // If the path was invalid, let's present an informative message to the user
         if (hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY))
         {
             const auto badPathText = RS_fmt(L"BadPathText", _startingDirectory);
-            TerminalOutput.raise(L"\r\n");
-            TerminalOutput.raise(badPathText);
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(badPathText);
         }
         // If the requested action requires elevation, display appropriate message
         else if (hr == HRESULT_FROM_WIN32(ERROR_ELEVATION_REQUIRED))
         {
             const auto elevationText = RS_(L"ElevationRequired");
-            TerminalOutput.raise(L"\r\n");
-            TerminalOutput.raise(elevationText);
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(elevationText);
         }
         // If the requested executable was not found, display appropriate message
         else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
         {
             const auto fileNotFoundText = RS_(L"FileNotFound");
-            TerminalOutput.raise(L"\r\n");
-            TerminalOutput.raise(fileNotFoundText);
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(fileNotFoundText);
         }
 
         _transitionToState(ConnectionState::Failed);
@@ -521,7 +520,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             const auto msg1 = RS_fmt(L"ProcessExited", _formatStatus(status));
             const auto msg2 = RS_(L"CtrlDToClose");
             const auto msg = fmt::format(FMT_COMPILE(L"\r\n{}\r\n{}\r\n"), msg1, msg2);
-            TerminalOutput.raise(msg);
+            WriteUtf16Output(msg);
         }
         CATCH_LOG();
     }
@@ -549,10 +548,8 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     }
     CATCH_LOG()
 
-    void ConptyConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void ConptyConnection::WriteInput(const winrt::array_view<const uint8_t> data)
     {
-        const auto data = winrt_array_to_wstring_view(buffer);
-
         if (!_isConnected())
         {
             return;
@@ -576,10 +573,8 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             }
         }
 
-        if (FAILED_LOG(til::u16u8(data, _writeBuffer)))
-        {
-            return;
-        }
+        // Since we are using overlapped I/O, we have to store the send buffer until the work is done.
+        _writeBuffer.assign(winrt_array_to_string_view(data));
 
         if (!WriteFile(_pipe.get(), _writeBuffer.data(), gsl::narrow_cast<DWORD>(_writeBuffer.length()), nullptr, &_writeOverlapped))
         {
@@ -746,11 +741,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         const wil::unique_event overlappedEvent{ CreateEventExW(nullptr, nullptr, CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS) };
         OVERLAPPED overlapped{ .hEvent = overlappedEvent.get() };
         bool overlappedPending = false;
-        char buffer[128 * 1024];
-        DWORD read = 0;
 
-        til::u8state u8State;
-        std::wstring wstr;
+        char buffer[128 * 1024], buffer2[128 * 1024];
+        char* thisBuffer = buffer;
+        DWORD read = 0;
+        char* lastBuffer = buffer2;
+        DWORD lastRead = 0;
 
         // If we use overlapped IO We want to queue ReadFile() calls before processing the
         // string, because TerminalOutput.raise() may take a while (relatively speaking).
@@ -761,7 +757,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             // When we have a `wstr` that's ready for processing we must do so without blocking.
             // Otherwise, whatever the user typed will be delayed until the next IO operation.
             // With overlapped IO that's not a problem because the ReadFile() calls won't block.
-            if (!ReadFile(_pipe.get(), &buffer[0], sizeof(buffer), &read, &overlapped))
+            if (!ReadFile(_pipe.get(), thisBuffer, sizeof(buffer), &read, &overlapped))
             {
                 if (GetLastError() != ERROR_IO_PENDING)
                 {
@@ -773,7 +769,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             // wstr can be empty in two situations:
             // * The previous call to til::u8u16 failed.
             // * We're using overlapped IO, and it's the first iteration.
-            if (!wstr.empty())
+            if (lastBuffer && lastRead)
             {
                 if (!_receivedFirstByte)
                 {
@@ -793,7 +789,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
                 try
                 {
-                    TerminalOutput.raise(wstr);
+                    TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(lastBuffer), lastRead });
                 }
                 CATCH_LOG();
             }
@@ -833,8 +829,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
                 TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
-            // If we hit a parsing error, eat it. It's bad utf-8, we can't do anything with it.
-            FAILED_LOG(til::u8u16({ &buffer[0], gsl::narrow_cast<size_t>(read) }, wstr, u8State));
+            // Prepare the buffers for the next loop
+            std::swap(thisBuffer, lastBuffer);
+            std::swap(read, lastRead);
         }
 
         return 0;

src/cascadia/TerminalConnection/ConptyConnection.h

@@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         static safe_void_coroutine final_release(std::unique_ptr<ConptyConnection> connection);
 
         void Start();
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
         void Resize(uint32_t rows, uint32_t columns);
         void ResetSize();
         void Close() noexcept;
@@ -52,8 +52,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                                                                          const winrt::guid& guid,
                                                                          const winrt::guid& profileGuid);
 
-        til::event<TerminalOutputHandler> TerminalOutput;
-
     private:
         static void closePseudoConsoleAsync(HPCON hPC) noexcept;
         static HRESULT NewHandoff(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo) noexcept;

src/cascadia/TerminalConnection/EchoConnection.cpp

@@ -13,28 +13,29 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
     void EchoConnection::Start() noexcept
     {
+        _transitionToState(ConnectionState::Connected);
     }
 
-    void EchoConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void EchoConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
     {
-        const auto data = winrt_array_to_wstring_view(buffer);
-        std::wstringstream prettyPrint;
-        for (const auto& wch : data)
+        const auto data = winrt_array_to_string_view(buffer);
+        std::stringstream prettyPrint;
+        for (const auto& ch : data)
         {
-            if (wch < 0x20)
+            if (ch < 0x20)
             {
-                prettyPrint << L"^" << gsl::narrow_cast<wchar_t>(wch + 0x40);
+                prettyPrint << "^" << gsl::narrow_cast<char>(ch + 0x40);
             }
-            else if (wch == 0x7f)
+            else if (ch == 0x7f)
             {
-                prettyPrint << L"0x7f";
+                prettyPrint << "0x7f";
             }
             else
             {
-                prettyPrint << wch;
+                prettyPrint << ch;
             }
         }
-        TerminalOutput.raise(prettyPrint.str());
+        WriteUtf8Output(prettyPrint.str());
     }
 
     void EchoConnection::Resize(uint32_t /*rows*/, uint32_t /*columns*/) noexcept

src/cascadia/TerminalConnection/EchoConnection.h

@@ -4,25 +4,20 @@
 #pragma once
 
 #include "EchoConnection.g.h"
+#include "BaseTerminalConnection.h"
 
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
-    struct EchoConnection : EchoConnectionT<EchoConnection>
+    struct EchoConnection : EchoConnectionT<EchoConnection>, BaseTerminalConnection<EchoConnection>
     {
         EchoConnection() noexcept;
 
         void Start() noexcept;
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
         void Resize(uint32_t rows, uint32_t columns) noexcept;
         void Close() noexcept;
 
         void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) const noexcept {};
-
-        winrt::guid SessionId() const noexcept { return {}; }
-        ConnectionState State() const noexcept { return ConnectionState::Connected; }
-
-        til::event<TerminalOutputHandler> TerminalOutput;
-        til::typed_event<ITerminalConnection, IInspectable> StateChanged;
     };
 }
 

src/cascadia/TerminalConnection/ITerminalConnection.idl

@@ -13,14 +13,14 @@ namespace Microsoft.Terminal.TerminalConnection
         Failed
     };
 
-    delegate void TerminalOutputHandler(String output);
+    delegate void TerminalOutputHandler(UInt8[] output);
 
     interface ITerminalConnection
     {
         void Initialize(Windows.Foundation.Collections.ValueSet settings);
 
         void Start();
-        void WriteInput(Char[] data);
+        void WriteInput(UInt8[] data);
         void Resize(UInt32 rows, UInt32 columns);
         void Close();
 

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

@@ -0,0 +1,229 @@
+<?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="AzureCodeExpiry" xml:space="preserve">
+    <value>Овај код ће да истекне за 15 минута.</value>
+  </data>
+  <data name="AzureEnterTenant" xml:space="preserve">
+    <value>Молимо вас да унесете број жељеног станара.</value>
+  </data>
+  <data name="AzureNewLogin" xml:space="preserve">
+    <value>Унесите {0} да се пријавите са новим налогом</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_NewLogin; it is intended to be a single-character shorthand for "new account"</comment>
+  </data>
+  <data name="AzureRemoveStored" xml:space="preserve">
+    <value>Унесите {0} да обришете горе сачувана подешавања везе.</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_RemoveStored; it is intended to be a single-character shorthand for "remove stored"</comment>
+  </data>
+  <data name="AzureInvalidAccessInput" xml:space="preserve">
+    <value>Молимо вас да унесете исправан број за приступ сачуваним подешавањима везе, {0} да се пријавите са новим налогом, или {1} да обришете сачувана подешавања везе.</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_NewLogin, and {1} will be replaced with AzureUserEntry_RemoveStored. This is an error message, used after AzureNewLogin/AzureRemoveStored if the user enters an invalid value.</comment>
+  </data>
+  <data name="AzureNonNumberError" xml:space="preserve">
+    <value>Молимо вас да унесете број.</value>
+  </data>
+  <data name="AzureNumOutOfBoundsError" xml:space="preserve">
+    <value>Број је ван опсега. Молимо вас да унесете исправан број.</value>
+  </data>
+  <data name="AzureNoTenants" xml:space="preserve">
+    <value>Не може да се пронађе ниједан станар.</value>
+  </data>
+  <data name="AzureNoCloudAccount" xml:space="preserve">
+    <value>Још увек нисте подесили ваш налог љуске облака. Посетите https://shell.azure.com да га подесите.</value>
+    <comment>{Locked="https://shell.azure.com"} This URL should not be localized. Everything else should.</comment>
+  </data>
+  <data name="AzureStorePrompt" xml:space="preserve">
+    <value>Желите ли да сачувате ова подешавања везе за будуће пријаве? [{0}/{1}]</value>
+    <comment>{0} and {1} will be replaced with AzureUserEntry_Yes and AzureUserEntry_No. They are single-character shorthands for "yes" and "no" in this language.</comment>
+  </data>
+  <data name="AzureInvalidStoreInput" xml:space="preserve">
+    <value>Молимо вас да унесете {0} или {1}</value>
+    <comment>{0} and {1} will be replaced with AzureUserEntry_Yes and AzureUserEntry_No. This resource will be used as an error response after AzureStorePrompt.</comment>
+  </data>
+  <data name="AzureRequestingCloud" xml:space="preserve">
+    <value>Захтева се инстанца љуске облака...</value>
+  </data>
+  <data name="AzureSuccess" xml:space="preserve">
+    <value>Успешно.</value>
+  </data>
+  <data name="AzureRequestingTerminal" xml:space="preserve">
+    <value>Захтева се терминал (ово може да потраје)...</value>
+  </data>
+  <data name="AzureTokensStored" xml:space="preserve">
+    <value>Ваша подешавања везе су сачувана за будуће пријаве.</value>
+  </data>
+  <data name="AzureNoTokens" xml:space="preserve">
+    <value>Нема токена који могу да се уклоне.</value>
+  </data>
+  <data name="AzureTokensRemoved" xml:space="preserve">
+    <value>Обрисана су сачувана подешавања везе.</value>
+  </data>
+  <data name="AzureOldCredentialsFlushedMessage" xml:space="preserve">
+    <value>Измењени су параметри потврде идентитета. Мораћете поново да се пријавите.</value>
+  </data>
+  <data name="AzureUnknownTenantName" xml:space="preserve">
+    <value>&lt;непознато име станара&gt;</value>
+  </data>
+  <data name="AzureIthTenant" xml:space="preserve">
+    <value>Станар {0}: {1} ({2})</value>
+    <comment>{0} is the tenant's number, which the user will enter to connect to the tenant. {1} is the tenant's display name, which will be meaningful for the user. {2} is the tenant's internal ID number.</comment>
+  </data>
+  <data name="AzureSuccessfullyAuthenticated" xml:space="preserve">
+    <value>Идентитет је потврђен.</value>
+  </data>
+  <data name="AzureUserEntry_NewLogin" xml:space="preserve">
+    <value>н</value>
+    <comment>This is shorthand for "new login". The user must enter this character to activate the New Login feature (AzureInvalidAccessInput, AzureNewLogin)</comment>
+  </data>
+  <data name="AzureUserEntry_RemoveStored" xml:space="preserve">
+    <value>о</value>
+    <comment>This is shorthand for "remove saved connections". The user must enter this character to activate the Remove Saved Logins feature (AzureRemoveStored, AzureInvalidAccessInput)</comment>
+  </data>
+  <data name="AzureUserEntry_Yes" xml:space="preserve">
+    <value>д</value>
+    <comment>This is shorthand for "yes". The user must enter this character to CONFIRM a prompt.</comment>
+  </data>
+  <data name="AzureUserEntry_No" xml:space="preserve">
+    <value>н</value>
+    <comment>This is shorthand for "no". The user must enter this character to DECLINE a prompt.</comment>
+  </data>
+  <data name="ProcessExited" xml:space="preserve">
+    <value>[процес је вратио код {0}]</value>
+    <comment>The first argument {0} is the error code of the process. When there is no error, the number ZERO will be displayed. </comment>
+  </data>
+  <data name="CtrlDToClose" xml:space="preserve">
+    <value>Сада можете да затворите овај терминал са Ctrl+D, или да притиснете Ентер да га поново покренете.</value>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+  </data>
+  <data name="ProcessFailedToLaunch" xml:space="preserve">
+    <value>[грешка {0} приликом покретања `{1}']</value>
+    <comment>The first argument {0} is the error code. The second argument {1} is the user-specified path to a program.
+      If this string is broken to multiple lines, it will not be displayed properly.</comment>
+  </data>
+  <data name="BadPathText" xml:space="preserve">
+    <value>Не може да се приступи почетном директоријуму „{0}”</value>
+    <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
+  </data>
+    <data name="ElevationRequired" xml:space="preserve">
+    <value>Тражена операција захтева веће привилегије.</value>
+  </data>
+  <data name="FileNotFound" xml:space="preserve">
+    <value>Систем не може да пронађе наведени фајл.</value>
+  </data>
+</root>

src/cascadia/TerminalConnection/Resources/uk-UA/Resources.resw

@@ -0,0 +1,229 @@
+<?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="AzureCodeExpiry" xml:space="preserve">
+    <value>Термін дії цього коду закінчиться через 15 хвилин.</value>
+  </data>
+  <data name="AzureEnterTenant" xml:space="preserve">
+    <value>Будь ласка, введіть бажаний тенант номер.</value>
+  </data>
+  <data name="AzureNewLogin" xml:space="preserve">
+    <value>Введіть {0}, щоб увійти з новим обліковим записом</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_NewLogin; it is intended to be a single-character shorthand for "new account"</comment>
+  </data>
+  <data name="AzureRemoveStored" xml:space="preserve">
+    <value>Введіть {0}, щоб видалити збережені вище налаштування підключення.</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_RemoveStored; it is intended to be a single-character shorthand for "remove stored"</comment>
+  </data>
+  <data name="AzureInvalidAccessInput" xml:space="preserve">
+    <value>Введіть дійсний номер, щоб отримати доступ до збережених налаштувань з'єднання, {0}, щоб увійти за допомогою нового облікового запису, або {1}, щоб видалити збережені налаштування з'єднання.</value>
+    <comment>{0} will be replaced with the resource from AzureUserEntry_NewLogin, and {1} will be replaced with AzureUserEntry_RemoveStored. This is an error message, used after AzureNewLogin/AzureRemoveStored if the user enters an invalid value.</comment>
+  </data>
+  <data name="AzureNonNumberError" xml:space="preserve">
+    <value>Будь ласка, введіть номер.</value>
+  </data>
+  <data name="AzureNumOutOfBoundsError" xml:space="preserve">
+    <value>Номер поза межами. Введіть дійсний номер.</value>
+  </data>
+  <data name="AzureNoTenants" xml:space="preserve">
+    <value>Не вдалося знайти жодного тенанту.</value>
+  </data>
+  <data name="AzureNoCloudAccount" xml:space="preserve">
+    <value>Ви ще не налаштували обліковий запис Cloud Shell. Перейдіть на сторінку https://shell.azure.com, щоб налаштувати його.</value>
+    <comment>{Locked="https://shell.azure.com"} This URL should not be localized. Everything else should.</comment>
+  </data>
+  <data name="AzureStorePrompt" xml:space="preserve">
+    <value>Ви бажаєте зберегти ці налаштування підключення для майбутніх входів? [{0}/{1}]</value>
+    <comment>{0} and {1} will be replaced with AzureUserEntry_Yes and AzureUserEntry_No. They are single-character shorthands for "yes" and "no" in this language.</comment>
+  </data>
+  <data name="AzureInvalidStoreInput" xml:space="preserve">
+    <value>Введіть {0} або {1}</value>
+    <comment>{0} and {1} will be replaced with AzureUserEntry_Yes and AzureUserEntry_No. This resource will be used as an error response after AzureStorePrompt.</comment>
+  </data>
+  <data name="AzureRequestingCloud" xml:space="preserve">
+    <value>Запит екземпляра хмарної оболонки...</value>
+  </data>
+  <data name="AzureSuccess" xml:space="preserve">
+    <value>Успіх.</value>
+  </data>
+  <data name="AzureRequestingTerminal" xml:space="preserve">
+    <value>Запит терміналу (це може зайняти деякий час)...</value>
+  </data>
+  <data name="AzureTokensStored" xml:space="preserve">
+    <value>Ваші налаштування підключення збережено для майбутніх входів.</value>
+  </data>
+  <data name="AzureNoTokens" xml:space="preserve">
+    <value>Немає токенів для видалення.</value>
+  </data>
+  <data name="AzureTokensRemoved" xml:space="preserve">
+    <value>Збережені налаштування підключення видалено.</value>
+  </data>
+  <data name="AzureOldCredentialsFlushedMessage" xml:space="preserve">
+    <value>Змінено параметри автентифікації. Вам потрібно буде увійти знову.</value>
+  </data>
+  <data name="AzureUnknownTenantName" xml:space="preserve">
+    <value>&lt;невідоме ім'я тенанту&gt;</value>
+  </data>
+  <data name="AzureIthTenant" xml:space="preserve">
+    <value>Тенант {0}: {1} ({2})</value>
+    <comment>{0} is the tenant's number, which the user will enter to connect to the tenant. {1} is the tenant's display name, which will be meaningful for the user. {2} is the tenant's internal ID number.</comment>
+  </data>
+  <data name="AzureSuccessfullyAuthenticated" xml:space="preserve">
+    <value>Автентифіковано.</value>
+  </data>
+  <data name="AzureUserEntry_NewLogin" xml:space="preserve">
+    <value>n</value>
+    <comment>This is shorthand for "new login". The user must enter this character to activate the New Login feature (AzureInvalidAccessInput, AzureNewLogin)</comment>
+  </data>
+  <data name="AzureUserEntry_RemoveStored" xml:space="preserve">
+    <value>r</value>
+    <comment>This is shorthand for "remove saved connections". The user must enter this character to activate the Remove Saved Logins feature (AzureRemoveStored, AzureInvalidAccessInput)</comment>
+  </data>
+  <data name="AzureUserEntry_Yes" xml:space="preserve">
+    <value>y</value>
+    <comment>This is shorthand for "yes". The user must enter this character to CONFIRM a prompt.</comment>
+  </data>
+  <data name="AzureUserEntry_No" xml:space="preserve">
+    <value>n</value>
+    <comment>This is shorthand for "no". The user must enter this character to DECLINE a prompt.</comment>
+  </data>
+  <data name="ProcessExited" xml:space="preserve">
+    <value>[процес завершено з кодом {0}]</value>
+    <comment>The first argument {0} is the error code of the process. When there is no error, the number ZERO will be displayed. </comment>
+  </data>
+  <data name="CtrlDToClose" xml:space="preserve">
+    <value>Тепер ви можете закрити цей термінал за допомогою Ctrl+D або натиснути Enter, щоб перезапустити.</value>
+    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+  </data>
+  <data name="ProcessFailedToLaunch" xml:space="preserve">
+    <value>[помилка {0} під час запуску '{1}']</value>
+    <comment>The first argument {0} is the error code. The second argument {1} is the user-specified path to a program.&#xD;
+      If this string is broken to multiple lines, it will not be displayed properly.</comment>
+  </data>
+  <data name="BadPathText" xml:space="preserve">
+    <value>Не вдалося отримати доступ до початкового каталогу "{0}"</value>
+    <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
+  </data>
+  <data name="ElevationRequired" xml:space="preserve">
+    <value>Запитана операція потребує підвищення.</value>
+  </data>
+  <data name="FileNotFound" xml:space="preserve">
+    <value>Система не може знайти вказаний файл.</value>
+  </data>
+</root>

src/cascadia/TerminalConnection/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // Note: Generate GUID using TlgGuid.exe tool

src/cascadia/TerminalConnection/pch.h

@@ -40,3 +40,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalConnectionProvider);
 #include <til/winrt.h>
 
 #include <cppwinrt_utils.h>
+
+#include <LibraryResources.h>

src/cascadia/TerminalControl/ControlAppearance.h

@@ -1,49 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
---*/
-#pragma once
-#include "../../inc/cppwinrt_utils.h"
-#include "../../inc/ControlProperties.h"
-
-#include <DefaultSettings.h>
-#include <conattrs.hpp>
-
-namespace winrt::Microsoft::Terminal::Control::implementation
-{
-    struct ControlAppearance : public winrt::implements<ControlAppearance, Microsoft::Terminal::Core::ICoreAppearance, Microsoft::Terminal::Control::IControlAppearance>
-    {
-#define SETTINGS_GEN(type, name, ...) WINRT_PROPERTY(type, name, __VA_ARGS__);
-        CORE_APPEARANCE_SETTINGS(SETTINGS_GEN)
-        CONTROL_APPEARANCE_SETTINGS(SETTINGS_GEN)
-#undef SETTINGS_GEN
-
-    private:
-        // Color Table is special because it's an array
-        std::array<winrt::Microsoft::Terminal::Core::Color, COLOR_TABLE_SIZE> _ColorTable;
-
-    public:
-        winrt::Microsoft::Terminal::Core::Color GetColorTableEntry(int32_t index) noexcept
-        {
-            return _ColorTable.at(index);
-        }
-        void SetColorTableEntry(int32_t index,
-                                winrt::Microsoft::Terminal::Core::Color color) noexcept
-        {
-            _ColorTable.at(index) = color;
-        }
-
-        ControlAppearance(Control::IControlAppearance appearance)
-        {
-#define COPY_SETTING(type, name, ...) _##name = appearance.name();
-            CORE_APPEARANCE_SETTINGS(COPY_SETTING)
-            CONTROL_APPEARANCE_SETTINGS(COPY_SETTING)
-#undef COPY_SETTING
-
-            for (size_t i = 0; i < _ColorTable.size(); i++)
-            {
-                _ColorTable[i] = appearance.GetColorTableEntry(static_cast<int32_t>(i));
-            }
-        }
-    };
-}

src/cascadia/TerminalControl/ControlCore.cpp

@@ -9,20 +9,19 @@
 #include <dsound.h>
 
 #include <DefaultSettings.h>
-#include <LibraryResources.h>
 #include <unicode.hpp>
-#include <utils.hpp>
-#include <WinUser.h>
 
 #include "EventArgs.h"
 #include "../../renderer/atlas/AtlasEngine.h"
 #include "../../renderer/base/renderer.hpp"
 #include "../../renderer/uia/UiaRenderer.hpp"
 #include "../../types/inc/CodepointWidthDetector.hpp"
+#include "../../types/inc/utils.hpp"
 
 #include "ControlCore.g.cpp"
 #include "SelectionColor.g.cpp"
 
+using namespace ::Microsoft::Console;
 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Console::VirtualTerminal;
 using namespace ::Microsoft::Terminal::Core;
@@ -89,7 +88,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return true;
         }();
 
-        _settings = winrt::make_self<implementation::ControlSettings>(settings, unfocusedAppearance);
+        _settings = settings;
+        _hasUnfocusedAppearance = static_cast<bool>(unfocusedAppearance);
+        _unfocusedAppearance = _hasUnfocusedAppearance ? unfocusedAppearance : settings;
         _terminal = std::make_shared<::Microsoft::Terminal::Core::Terminal>();
         const auto lock = _terminal->LockForWriting();
 
@@ -102,7 +103,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         });
 
         // GH#8969: pre-seed working directory to prevent potential races
-        _terminal->SetWorkingDirectory(_settings->StartingDirectory());
+        _terminal->SetWorkingDirectory(_settings.StartingDirectory());
 
         _terminal->SetCopyToClipboardCallback([this](wil::zwstring_view wstr) {
             WriteToClipboard.raise(*this, winrt::make<WriteToClipboardEventArgs>(winrt::hstring{ std::wstring_view{ wstr } }, std::string{}, std::string{}));
@@ -149,12 +150,27 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
             _renderer->SetBackgroundColorChangedCallback([this]() { _rendererBackgroundColorChanged(); });
             _renderer->SetFrameColorChangedCallback([this]() { _rendererTabColorChanged(); });
-            _renderer->SetRendererEnteredErrorStateCallback([this]() { RendererEnteredErrorState.raise(nullptr, nullptr); });
+            _renderer->SetRendererEnteredErrorStateCallback([this]() { _rendererEnteredErrorState(); });
         }
 
         UpdateSettings(settings, unfocusedAppearance);
     }
 
+    void ControlCore::_rendererEnteredErrorState()
+    {
+        // The first time the renderer fails out (after all of its own retries), switch it to D2D and WARP
+        // and force it to try again. If it _still_ fails, we can let it halt.
+        if (_renderFailures++ == 0)
+        {
+            const auto lock = _terminal->LockForWriting();
+            _renderEngine->SetGraphicsAPI(parseGraphicsAPI(GraphicsAPI::Direct2D));
+            _renderEngine->SetSoftwareRendering(true);
+            _renderer->EnablePainting();
+            return;
+        }
+        RendererEnteredErrorState.raise(nullptr, nullptr);
+    }
+
     void ControlCore::_setupDispatcherAndCallbacks()
     {
         // Get our dispatcher. If we're hosted in-proc with XAML, this will get
@@ -265,9 +281,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         shared->updateScrollBar.reset();
     }
 
-    void ControlCore::AttachToNewControl(const Microsoft::Terminal::Control::IKeyBindings& keyBindings)
+    void ControlCore::AttachToNewControl()
     {
-        _settings->KeyBindings(keyBindings);
         _setupDispatcherAndCallbacks();
         const auto actualNewSize = _actualFont.GetSize();
         // Bubble this up, so our new control knows how big we want the font.
@@ -399,10 +414,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
 
             // Override the default width and height to match the size of the swapChainPanel
-            _settings->InitialCols(width);
-            _settings->InitialRows(height);
+            const til::size viewportSize{ Utils::ClampToShortMax(width, 1),
+                                          Utils::ClampToShortMax(height, 1) };
 
-            _terminal->CreateFromSettings(*_settings, *_renderer);
+            // TODO:MSFT:20642297 - Support infinite scrollback here, if HistorySize is -1
+            _terminal->Create(viewportSize, Utils::ClampToShortMax(_settings.HistorySize(), 0), *_renderer);
+            _terminal->UpdateSettings(_settings);
 
             // Tell the render engine to notify us when the swap chain changes.
             // We do this after we initially set the swapchain so as to avoid
@@ -411,12 +428,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 _renderEngineSwapChainChanged(handle);
             });
 
-            _renderEngine->SetRetroTerminalEffect(_settings->RetroTerminalEffect());
-            _renderEngine->SetPixelShaderPath(_settings->PixelShaderPath());
-            _renderEngine->SetPixelShaderImagePath(_settings->PixelShaderImagePath());
-            _renderEngine->SetGraphicsAPI(parseGraphicsAPI(_settings->GraphicsAPI()));
-            _renderEngine->SetDisablePartialInvalidation(_settings->DisablePartialInvalidation());
-            _renderEngine->SetSoftwareRendering(_settings->SoftwareRendering());
+            _renderEngine->SetRetroTerminalEffect(_settings.RetroTerminalEffect());
+            _renderEngine->SetPixelShaderPath(_settings.PixelShaderPath());
+            _renderEngine->SetPixelShaderImagePath(_settings.PixelShaderImagePath());
+            _renderEngine->SetGraphicsAPI(parseGraphicsAPI(_settings.GraphicsAPI()));
+            _renderEngine->SetDisablePartialInvalidation(_settings.DisablePartialInvalidation());
+            _renderEngine->SetSoftwareRendering(_settings.SoftwareRendering());
 
             _updateAntiAliasingMode();
 
@@ -459,7 +476,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         if (_connection)
         {
-            _connection.WriteInput(winrt_wstring_to_array_view(wstr));
+            const auto utf8String{ til::u16u8(wstr) };
+            _connection.WriteInput(winrt_u8string_to_array_view(utf8String));
         }
     }
 
@@ -573,7 +591,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 _updateSelectionUI();
                 return true;
             }
-            else if (vkey == VK_TAB && !mods.IsAltPressed() && !mods.IsCtrlPressed() && _settings->DetectURLs())
+            else if (vkey == VK_TAB && !mods.IsAltPressed() && !mods.IsCtrlPressed() && _settings.DetectURLs())
             {
                 // [Shift +] Tab --> next/previous hyperlink
                 const auto direction = mods.IsShiftPressed() ? ::Terminal::SearchDirection::Backward : ::Terminal::SearchDirection::Forward;
@@ -600,7 +618,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             else if (vkey == VK_RETURN && !mods.IsCtrlPressed() && !mods.IsAltPressed())
             {
                 // [Shift +] Enter --> copy text
-                CopySelectionToClipboard(mods.IsShiftPressed(), false, _settings->CopyFormatting());
+                CopySelectionToClipboard(mods.IsShiftPressed(), false, _settings.CopyFormatting());
                 _terminal->ClearSelection();
                 _updateSelectionUI();
                 return true;
@@ -758,7 +776,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _runtimeFocusedOpacity = focused ? newOpacity : _runtimeFocusedOpacity;
 
         // Manually turn off acrylic if they turn off transparency.
-        _runtimeUseAcrylic = newOpacity < 1.0f && _settings->UseAcrylic();
+        _runtimeUseAcrylic = newOpacity < 1.0f && _settings.UseAcrylic();
 
         // Update the renderer as well. It might need to fall back from
         // cleartype -> grayscale if the BG is transparent / acrylic.
@@ -775,7 +793,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     void ControlCore::ToggleShaderEffects()
     {
-        const auto path = _settings->PixelShaderPath();
+        const auto path = _settings.PixelShaderPath();
         const auto lock = _terminal->LockForWriting();
         // Originally, this action could be used to enable the retro effects
         // even when they're set to `false` in the settings. If the user didn't
@@ -880,24 +898,26 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - INVARIANT: This method can only be called if the caller DOES NOT HAVE writing lock on the terminal.
     void ControlCore::UpdateSettings(const IControlSettings& settings, const IControlAppearance& newAppearance)
     {
-        _settings = winrt::make_self<implementation::ControlSettings>(settings, newAppearance);
+        _settings = settings;
+        _hasUnfocusedAppearance = static_cast<bool>(newAppearance);
+        _unfocusedAppearance = _hasUnfocusedAppearance ? newAppearance : settings;
 
         const auto lock = _terminal->LockForWriting();
 
-        _builtinGlyphs = _settings->EnableBuiltinGlyphs();
-        _colorGlyphs = _settings->EnableColorGlyphs();
-        _cellWidth = CSSLengthPercentage::FromString(_settings->CellWidth().c_str());
-        _cellHeight = CSSLengthPercentage::FromString(_settings->CellHeight().c_str());
+        _builtinGlyphs = _settings.EnableBuiltinGlyphs();
+        _colorGlyphs = _settings.EnableColorGlyphs();
+        _cellWidth = CSSLengthPercentage::FromString(_settings.CellWidth().c_str());
+        _cellHeight = CSSLengthPercentage::FromString(_settings.CellHeight().c_str());
         _runtimeOpacity = std::nullopt;
         _runtimeFocusedOpacity = std::nullopt;
 
         // Manually turn off acrylic if they turn off transparency.
-        _runtimeUseAcrylic = _settings->Opacity() < 1.0 && _settings->UseAcrylic();
+        _runtimeUseAcrylic = _settings.Opacity() < 1.0 && _settings.UseAcrylic();
 
-        const auto sizeChanged = _setFontSizeUnderLock(_settings->FontSize());
+        const auto sizeChanged = _setFontSizeUnderLock(_settings.FontSize());
 
         // Update the terminal core with its new Core settings
-        _terminal->UpdateSettings(*_settings);
+        _terminal->UpdateSettings(_settings);
 
         if (!_initializedTerminal.load(std::memory_order_relaxed))
         {
@@ -906,11 +926,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return;
         }
 
-        _renderEngine->SetGraphicsAPI(parseGraphicsAPI(_settings->GraphicsAPI()));
-        _renderEngine->SetDisablePartialInvalidation(_settings->DisablePartialInvalidation());
-        _renderEngine->SetSoftwareRendering(_settings->SoftwareRendering());
+        _renderEngine->SetGraphicsAPI(parseGraphicsAPI(_settings.GraphicsAPI()));
+        _renderEngine->SetDisablePartialInvalidation(_settings.DisablePartialInvalidation());
+        _renderEngine->SetSoftwareRendering(_settings.SoftwareRendering());
         // Inform the renderer of our opacity
         _renderEngine->EnableTransparentBackground(_isBackgroundTransparent());
+        _renderFailures = 0; // We may have changed the engine; reset the failure counter.
 
         // Trigger a redraw to repaint the window background and tab colors.
         _renderer->TriggerRedrawAll(true, true);
@@ -929,30 +950,34 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     void ControlCore::ApplyAppearance(const bool focused)
     {
         const auto lock = _terminal->LockForWriting();
-        const auto& newAppearance{ focused ? _settings->FocusedAppearance() : _settings->UnfocusedAppearance() };
+        const IControlAppearance newAppearance{ focused ? _settings : _unfocusedAppearance };
         // Update the terminal core with its new Core settings
-        _terminal->UpdateAppearance(*newAppearance);
+        _terminal->UpdateAppearance(newAppearance);
+        if ((focused || !_hasUnfocusedAppearance) && _focusedColorSchemeOverride)
+        {
+            _terminal->UpdateColorScheme(_focusedColorSchemeOverride);
+        }
 
         // Update AtlasEngine settings under the lock
         if (_renderEngine)
         {
             // Update AtlasEngine settings under the lock
-            _renderEngine->SetRetroTerminalEffect(newAppearance->RetroTerminalEffect());
-            _renderEngine->SetPixelShaderPath(newAppearance->PixelShaderPath());
-            _renderEngine->SetPixelShaderImagePath(newAppearance->PixelShaderImagePath());
+            _renderEngine->SetRetroTerminalEffect(newAppearance.RetroTerminalEffect());
+            _renderEngine->SetPixelShaderPath(newAppearance.PixelShaderPath());
+            _renderEngine->SetPixelShaderImagePath(newAppearance.PixelShaderImagePath());
 
             // Incase EnableUnfocusedAcrylic is disabled and Focused Acrylic is set to true,
             // the terminal should ignore the unfocused opacity from settings.
             // The Focused Opacity from settings should be ignored if overridden at runtime.
-            const auto useFocusedRuntimeOpacity = focused || (!_settings->EnableUnfocusedAcrylic() && UseAcrylic());
-            const auto newOpacity = useFocusedRuntimeOpacity ? FocusedOpacity() : newAppearance->Opacity();
+            const auto useFocusedRuntimeOpacity = focused || (!_settings.EnableUnfocusedAcrylic() && UseAcrylic());
+            const auto newOpacity = useFocusedRuntimeOpacity ? FocusedOpacity() : newAppearance.Opacity();
             _setOpacity(newOpacity, focused);
 
             // No need to update Acrylic if UnfocusedAcrylic is disabled
-            if (_settings->EnableUnfocusedAcrylic())
+            if (_settings.EnableUnfocusedAcrylic())
             {
                 // Manually turn off acrylic if they turn off transparency.
-                _runtimeUseAcrylic = Opacity() < 1.0 && newAppearance->UseAcrylic();
+                _runtimeUseAcrylic = Opacity() < 1.0 && newAppearance.UseAcrylic();
             }
 
             // Update the renderer as well. It might need to fall back from
@@ -974,24 +999,68 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     Control::IControlSettings ControlCore::Settings()
     {
-        return *_settings;
+        return _settings;
     }
 
     Control::IControlAppearance ControlCore::FocusedAppearance() const
     {
-        return *_settings->FocusedAppearance();
+        return _settings;
     }
 
     Control::IControlAppearance ControlCore::UnfocusedAppearance() const
     {
-        return *_settings->UnfocusedAppearance();
+        return _unfocusedAppearance;
+    }
+
+    void ControlCore::ApplyPreviewColorScheme(const Core::ICoreScheme& scheme)
+    {
+        const auto lock = _terminal->LockForReading();
+        auto& renderSettings = _terminal->GetRenderSettings();
+        if (!_stashedColorScheme)
+        {
+            _stashedColorScheme = std::make_unique_for_overwrite<StashedColorScheme>();
+            *_stashedColorScheme = {
+                .scheme = renderSettings.GetColorTable(),
+                .foregroundAlias = renderSettings.GetColorAliasIndex(ColorAlias::DefaultForeground),
+                .backgroundAlias = renderSettings.GetColorAliasIndex(ColorAlias::DefaultBackground),
+            };
+        }
+        _terminal->UpdateColorScheme(scheme);
+        _renderer->TriggerRedrawAll(true);
+    }
+
+    void ControlCore::ResetPreviewColorScheme()
+    {
+        if (_stashedColorScheme)
+        {
+            const auto lock = _terminal->LockForWriting();
+            auto& renderSettings = _terminal->GetRenderSettings();
+            decltype(auto) stashedScheme{ *_stashedColorScheme.get() };
+            for (size_t i = 0; i < TextColor::TABLE_SIZE; ++i)
+            {
+                renderSettings.SetColorTableEntry(i, til::at(stashedScheme.scheme, i));
+            }
+            renderSettings.SetColorAliasIndex(ColorAlias::DefaultForeground, stashedScheme.foregroundAlias);
+            renderSettings.SetColorAliasIndex(ColorAlias::DefaultBackground, stashedScheme.backgroundAlias);
+            _renderer->TriggerRedrawAll(true);
+        }
+        _stashedColorScheme.reset();
+    }
+
+    void ControlCore::SetOverrideColorScheme(const Core::ICoreScheme& scheme)
+    {
+        const auto lock = _terminal->LockForWriting();
+        _focusedColorSchemeOverride = scheme;
+
+        _terminal->UpdateColorScheme(scheme ? scheme : _settings.as<Core::ICoreScheme>());
+        _renderer->TriggerRedrawAll(true);
     }
 
     void ControlCore::_updateAntiAliasingMode()
     {
         D2D1_TEXT_ANTIALIAS_MODE mode;
         // Update AtlasEngine's AntialiasingMode
-        switch (_settings->AntialiasingMode())
+        switch (_settings.AntialiasingMode())
         {
         case TextAntialiasingMode::Cleartype:
             mode = D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE;
@@ -1024,7 +1093,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         if (_renderEngine)
         {
-            static constexpr auto cloneMap = [](const IFontFeatureMap& map) {
+            static constexpr auto cloneMap = [](const auto& map) {
                 std::unordered_map<std::wstring_view, float> clone;
                 if (map)
                 {
@@ -1037,8 +1106,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 return clone;
             };
 
-            const auto fontFeatures = _settings->FontFeatures();
-            const auto fontAxes = _settings->FontAxes();
+            const auto fontFeatures = _settings.FontFeatures();
+            const auto fontAxes = _settings.FontAxes();
             const auto featureMap = cloneMap(fontFeatures);
             const auto axesMap = cloneMap(fontAxes);
 
@@ -1062,8 +1131,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         // Make sure we have a non-zero font size
         const auto newSize = std::max(fontSize, 1.0f);
-        const auto fontFace = _settings->FontFace();
-        const auto fontWeight = _settings->FontWeight();
+        const auto fontFace = _settings.FontFace();
+        const auto fontWeight = _settings.FontWeight();
         _desiredFont = { fontFace, 0, fontWeight.Weight, newSize, CP_UTF8 };
         _actualFont = { fontFace, 0, fontWeight.Weight, _desiredFont.GetEngineSize(), CP_UTF8, false };
 
@@ -1085,7 +1154,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         const auto lock = _terminal->LockForWriting();
 
-        if (_setFontSizeUnderLock(_settings->FontSize()))
+        if (_setFontSizeUnderLock(_settings.FontSize()))
         {
             _refreshSizeUnderLock();
         }
@@ -1642,7 +1711,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     bool ControlCore::CopyOnSelect() const
     {
-        return _settings->CopyOnSelect();
+        return _settings.CopyOnSelect();
     }
 
     winrt::hstring ControlCore::SelectedText(bool trimTrailingWhitespace) const
@@ -1732,6 +1801,20 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     void ControlCore::ClearSearch()
     {
         const auto lock = _terminal->LockForWriting();
+
+        // GH #19358: select the focused search result before clearing search
+        if (const auto focusedSearchResult = _terminal->GetSearchHighlightFocused())
+        {
+            // search results are buffer-relative, whereas the selection functions expect viewport-relative coordinates
+            const auto scrollOffset{ _terminal->GetScrollOffset() };
+            const auto startPos = til::point{ focusedSearchResult->start.x, focusedSearchResult->start.y - scrollOffset };
+            const auto endPos = til::point{ focusedSearchResult->end.x, focusedSearchResult->end.y - scrollOffset };
+
+            _terminal->SetSelectionAnchor(startPos);
+            _terminal->SetSelectionEnd(endPos);
+            _renderer->TriggerSelection();
+        }
+
         _terminal->SetSearchHighlights({});
         _terminal->SetSearchHighlightFocused(0);
         _renderer->TriggerSearchHighlight(_searcher.Results());
@@ -1751,15 +1834,43 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _closeConnection();
     }
 
-    void ControlCore::PersistToPath(const wchar_t* path) const
+    void ControlCore::PersistTo(HANDLE handle) const
     {
         const auto lock = _terminal->LockForReading();
-        _terminal->SerializeMainBuffer(path);
+        _terminal->SerializeMainBuffer(handle);
     }
 
     void ControlCore::RestoreFromPath(const wchar_t* path) const
     {
-        const wil::unique_handle file{ CreateFileW(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr) };
+        wil::unique_handle file{ CreateFileW(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr) };
+
+        // This block of code exists temporarily to fix buffer dumps that were
+        // previously persisted as "buffer_" but really should be named "elevated_".
+        // If loading the properly named file fails, retry with the old name.
+        if (!file)
+        {
+            static constexpr std::wstring_view needle{ L"\\elevated_" };
+
+            // Check if the path contains "\elevated_", indicating that we're in an elevated session.
+            const std::wstring_view pathView{ path };
+            const auto idx = pathView.find(needle);
+
+            if (idx != std::wstring_view::npos)
+            {
+                // If so, try to open the file with "\buffer_" instead, which is what we previously used.
+                std::wstring altPath{ pathView };
+                altPath.replace(idx, needle.size(), L"\\buffer_");
+
+                file.reset(CreateFileW(altPath.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr));
+
+                // If the alternate file is found, move it to the correct location.
+                if (file)
+                {
+                    LOG_IF_WIN32_BOOL_FALSE(MoveFileW(altPath.c_str(), path));
+                }
+            }
+        }
+
         if (!file)
         {
             return;
@@ -1828,7 +1939,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             if (read < sizeof(buffer))
             {
                 // Normally the cursor should already be at the start of the line, but let's be absolutely sure it is.
-                if (_terminal->GetCursorPosition().x != 0)
+                if (_terminal->GetTextBuffer().GetCursor().GetPosition().x != 0)
                 {
                     _terminal->Write(L"\r\n");
                 }
@@ -1883,35 +1994,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         TabColorChanged.raise(*this, nullptr);
     }
 
-    void ControlCore::BlinkAttributeTick()
-    {
-        const auto lock = _terminal->LockForWriting();
-
-        auto& renderSettings = _terminal->GetRenderSettings();
-        renderSettings.ToggleBlinkRendition(_renderer.get());
-    }
-
-    void ControlCore::BlinkCursor()
-    {
-        const auto lock = _terminal->LockForWriting();
-        _terminal->BlinkCursor();
-    }
-
-    bool ControlCore::CursorOn() const
-    {
-        return _terminal->IsCursorOn();
-    }
-
-    void ControlCore::CursorOn(const bool isCursorOn)
-    {
-        const auto lock = _terminal->LockForWriting();
-        _terminal->SetCursorOn(isCursorOn);
-    }
-
     void ControlCore::ResumeRendering()
     {
         // The lock must be held, because it calls into IRenderData which is shared state.
         const auto lock = _terminal->LockForWriting();
+        _renderFailures = 0;
         _renderer->EnablePainting();
     }
 
@@ -1939,6 +2026,18 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return _terminal->GetViewportRelativeCursorPosition().to_core_point();
     }
 
+    bool ControlCore::ForceCursorVisible() const noexcept
+    {
+        return _forceCursorVisible;
+    }
+
+    void ControlCore::ForceCursorVisible(bool force)
+    {
+        const auto lock = _terminal->LockForWriting();
+        _renderer->AllowCursorVisibility(Render::InhibitionSource::Host, _terminal->IsFocused() || force);
+        _forceCursorVisible = force;
+    }
+
     // This one's really pushing the boundary of what counts as "encapsulation".
     // It really belongs in the "Interactivity" layer, which doesn't yet exist.
     // There's so many accesses to the selection in the Core though, that I just
@@ -1999,7 +2098,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             _terminal->MultiClickSelection(terminalPosition, mode);
             selectionNeedsToBeCopied = true;
         }
-        else if (_settings->RepositionCursorWithMouse() && !selectionNeedsToBeCopied) // Don't reposition cursor if this is part of a selection operation
+        else if (_settings.RepositionCursorWithMouse() && !selectionNeedsToBeCopied) // Don't reposition cursor if this is part of a selection operation
         {
             _repositionCursorWithMouse(terminalPosition);
         }
@@ -2018,7 +2117,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         //
         // As noted in GH #8573, there's plenty of edge cases with this
         // approach, but it's good enough to bring value to 90% of use cases.
-        const auto cursorPos{ _terminal->GetCursorPosition() };
 
         // Does the current buffer line have a mark on it?
         const auto& marks{ _terminal->GetMarkExtents() };
@@ -2026,8 +2124,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         {
             const auto& last{ marks.back() };
             const auto [start, end] = last.GetExtent();
-            const auto bufferSize = _terminal->GetTextBuffer().GetSize();
-            auto lastNonSpace = _terminal->GetTextBuffer().GetLastNonSpaceCharacter();
+            const auto& buffer = _terminal->GetTextBuffer();
+            const auto cursorPos = buffer.GetCursor().GetPosition();
+            const auto bufferSize = buffer.GetSize();
+            auto lastNonSpace = buffer.GetLastNonSpaceCharacter();
             bufferSize.IncrementInBounds(lastNonSpace, true);
 
             // If the user clicked off to the right side of the prompt, we
@@ -2137,13 +2237,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         auto noticeArgs = winrt::make<NoticeEventArgs>(NoticeLevel::Info, RS_(L"TermControlReadOnly"));
         RaiseNotice.raise(*this, std::move(noticeArgs));
     }
-    void ControlCore::_connectionOutputHandler(const hstring& hstr)
+    void ControlCore::_connectionOutputHandler(const winrt::array_view<const uint8_t>& data)
     {
         try
         {
+            FAILED_LOG(til::u8u16(winrt_array_to_string_view(data), _u16ConversionBuffer, _u8State));
+
+            if (!_u16ConversionBuffer.empty()) [[likely]]
             {
                 const auto lock = _terminal->LockForWriting();
-                _terminal->Write(hstr);
+                _terminal->Write(_u16ConversionBuffer);
             }
 
             if (!_pendingResponses.empty())
@@ -2333,109 +2436,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _cachedQuickFixes = quickFixes;
     }
 
-    Core::Scheme ControlCore::ColorScheme() const noexcept
-    {
-        Core::Scheme s;
-
-        // This part is definitely a hack.
-        //
-        // This function is usually used by the "Preview Color Scheme"
-        // functionality in TerminalPage. If we've got an unfocused appearance,
-        // then we've applied that appearance before this is even getting called
-        // (because the command palette is open with focus on top of us). If we
-        // return the _current_ colors now, we'll return out the _unfocused_
-        // colors. If we do that, and the user dismisses the command palette,
-        // then the scheme that will get restored is the _unfocused_ one, which
-        // is not what we want.
-        //
-        // So if that's the case, then let's grab the colors from the focused
-        // appearance as the scheme instead. We'll lose any current runtime
-        // changes to the color table, but those were already blown away when we
-        // switched to an unfocused appearance.
-        //
-        // IF WE DON'T HAVE AN UNFOCUSED APPEARANCE: then just ask the Terminal
-        // for its current color table. That way, we can restore those colors
-        // back.
-        if (HasUnfocusedAppearance())
-        {
-            s.Foreground = _settings->FocusedAppearance()->DefaultForeground();
-            s.Background = _settings->FocusedAppearance()->DefaultBackground();
-
-            s.CursorColor = _settings->FocusedAppearance()->CursorColor();
-
-            s.Black = _settings->FocusedAppearance()->GetColorTableEntry(0);
-            s.Red = _settings->FocusedAppearance()->GetColorTableEntry(1);
-            s.Green = _settings->FocusedAppearance()->GetColorTableEntry(2);
-            s.Yellow = _settings->FocusedAppearance()->GetColorTableEntry(3);
-            s.Blue = _settings->FocusedAppearance()->GetColorTableEntry(4);
-            s.Purple = _settings->FocusedAppearance()->GetColorTableEntry(5);
-            s.Cyan = _settings->FocusedAppearance()->GetColorTableEntry(6);
-            s.White = _settings->FocusedAppearance()->GetColorTableEntry(7);
-            s.BrightBlack = _settings->FocusedAppearance()->GetColorTableEntry(8);
-            s.BrightRed = _settings->FocusedAppearance()->GetColorTableEntry(9);
-            s.BrightGreen = _settings->FocusedAppearance()->GetColorTableEntry(10);
-            s.BrightYellow = _settings->FocusedAppearance()->GetColorTableEntry(11);
-            s.BrightBlue = _settings->FocusedAppearance()->GetColorTableEntry(12);
-            s.BrightPurple = _settings->FocusedAppearance()->GetColorTableEntry(13);
-            s.BrightCyan = _settings->FocusedAppearance()->GetColorTableEntry(14);
-            s.BrightWhite = _settings->FocusedAppearance()->GetColorTableEntry(15);
-        }
-        else
-        {
-            const auto lock = _terminal->LockForReading();
-            s = _terminal->GetColorScheme();
-        }
-
-        // This might be a tad bit of a hack. This event only gets called by set
-        // color scheme / preview color scheme, and in that case, we know the
-        // control _is_ focused.
-        s.SelectionBackground = _settings->FocusedAppearance()->SelectionBackground();
-
-        return s;
-    }
-
-    // Method Description:
-    // - Apply the given color scheme to this control. We'll take the colors out
-    //   of it and apply them to our focused appearance, and update the terminal
-    //   buffer with the new color table.
-    // - This is here to support the Set Color Scheme action, and the ability to
-    //   preview schemes in the control.
-    // Arguments:
-    // - scheme: the collection of colors to apply.
-    // Return Value:
-    // - <none>
-    void ControlCore::ColorScheme(const Core::Scheme& scheme)
-    {
-        _settings->FocusedAppearance()->DefaultForeground(scheme.Foreground);
-        _settings->FocusedAppearance()->DefaultBackground(scheme.Background);
-        _settings->FocusedAppearance()->CursorColor(scheme.CursorColor);
-        _settings->FocusedAppearance()->SelectionBackground(scheme.SelectionBackground);
-
-        _settings->FocusedAppearance()->SetColorTableEntry(0, scheme.Black);
-        _settings->FocusedAppearance()->SetColorTableEntry(1, scheme.Red);
-        _settings->FocusedAppearance()->SetColorTableEntry(2, scheme.Green);
-        _settings->FocusedAppearance()->SetColorTableEntry(3, scheme.Yellow);
-        _settings->FocusedAppearance()->SetColorTableEntry(4, scheme.Blue);
-        _settings->FocusedAppearance()->SetColorTableEntry(5, scheme.Purple);
-        _settings->FocusedAppearance()->SetColorTableEntry(6, scheme.Cyan);
-        _settings->FocusedAppearance()->SetColorTableEntry(7, scheme.White);
-        _settings->FocusedAppearance()->SetColorTableEntry(8, scheme.BrightBlack);
-        _settings->FocusedAppearance()->SetColorTableEntry(9, scheme.BrightRed);
-        _settings->FocusedAppearance()->SetColorTableEntry(10, scheme.BrightGreen);
-        _settings->FocusedAppearance()->SetColorTableEntry(11, scheme.BrightYellow);
-        _settings->FocusedAppearance()->SetColorTableEntry(12, scheme.BrightBlue);
-        _settings->FocusedAppearance()->SetColorTableEntry(13, scheme.BrightPurple);
-        _settings->FocusedAppearance()->SetColorTableEntry(14, scheme.BrightCyan);
-        _settings->FocusedAppearance()->SetColorTableEntry(15, scheme.BrightWhite);
-
-        const auto lock = _terminal->LockForWriting();
-        _terminal->ApplyScheme(scheme);
-        _renderer->TriggerRedrawAll(true);
-    }
-
     bool ControlCore::HasUnfocusedAppearance() const
     {
-        return _settings->HasUnfocusedAppearance();
+        return _hasUnfocusedAppearance;
     }
 
     void ControlCore::AdjustOpacity(const float opacityAdjust, const bool relative)
@@ -2505,7 +2508,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         TerminalInput::OutputType out;
         {
-            const auto lock = _terminal->LockForReading();
+            const auto lock = _terminal->LockForWriting();
+            _renderer->AllowCursorVisibility(Render::InhibitionSource::Host, focused || _forceCursorVisible);
             out = _terminal->FocusChanged(focused);
         }
         if (out && !out->empty())
@@ -2523,7 +2527,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // then the renderer should not render "default background" text with a
         // fully opaque background. Doing that would cover up our nice
         // transparency, or our acrylic, or our image.
-        return Opacity() < 1.0f || !_settings->BackgroundImage().empty() || _settings->UseBackgroundImageForWindow();
+        return Opacity() < 1.0f || !_settings.BackgroundImage().empty() || _settings.UseBackgroundImageForWindow();
     }
 
     uint64_t ControlCore::OwningHwnd()

src/cascadia/TerminalControl/ControlCore.h

@@ -19,7 +19,6 @@
 #include "SelectionColor.g.h"
 #include "CommandHistoryContext.g.h"
 
-#include "ControlSettings.h"
 #include "../../audio/midi/MidiAudio.hpp"
 #include "../../buffer/out/search.h"
 #include "../../cascadia/TerminalCore/Terminal.hpp"
@@ -100,12 +99,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         Control::IControlAppearance UnfocusedAppearance() const;
         bool HasUnfocusedAppearance() const;
 
-        winrt::Microsoft::Terminal::Core::Scheme ColorScheme() const noexcept;
-        void ColorScheme(const winrt::Microsoft::Terminal::Core::Scheme& scheme);
+        void ApplyPreviewColorScheme(const Core::ICoreScheme&);
+        void ResetPreviewColorScheme();
+        void SetOverrideColorScheme(const Core::ICoreScheme&);
 
         ::Microsoft::Console::Render::Renderer* GetRenderer() const noexcept;
         uint64_t SwapChainHandle() const;
-        void AttachToNewControl(const Microsoft::Terminal::Control::IKeyBindings& keyBindings);
+        void AttachToNewControl();
 
         void SizeChanged(const float width, const float height);
         void ScaleChanged(const float scale);
@@ -153,7 +153,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void ColorSelection(const Control::SelectionColor& fg, const Control::SelectionColor& bg, Core::MatchMode matchMode);
 
         void Close();
-        void PersistToPath(const wchar_t* path) const;
+        void PersistTo(HANDLE handle) const;
         void RestoreFromPath(const wchar_t* path) const;
 
         void ClearQuickFix();
@@ -214,14 +214,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
 #pragma endregion
 
-        void BlinkAttributeTick();
-        void BlinkCursor();
-        bool CursorOn() const;
-        void CursorOn(const bool isCursorOn);
-
         bool IsVtMouseModeEnabled() const;
         bool ShouldSendAlternateScroll(const unsigned int uiButton, const int32_t delta) const;
         Core::Point CursorPosition() const;
+        bool ForceCursorVisible() const noexcept;
+        void ForceCursorVisible(bool force);
 
         bool CopyOnSelect() const;
         Control::SelectionData SelectionInfo() const;
@@ -268,9 +265,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         void PreviewInput(std::wstring_view input);
 
-        RUNTIME_SETTING(float, Opacity, _settings->Opacity());
+        RUNTIME_SETTING(float, Opacity, _settings.Opacity());
         RUNTIME_SETTING(float, FocusedOpacity, FocusedAppearance().Opacity());
-        RUNTIME_SETTING(bool, UseAcrylic, _settings->UseAcrylic());
+        RUNTIME_SETTING(bool, UseAcrylic, _settings.UseAcrylic());
 
         // -------------------------------- WinRT Events ---------------------------------
         // clang-format off
@@ -347,11 +344,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         safe_void_coroutine _renderEngineSwapChainChanged(const HANDLE handle);
         void _rendererBackgroundColorChanged();
         void _rendererTabColorChanged();
+        void _rendererEnteredErrorState();
 #pragma endregion
 
         void _raiseReadOnlyWarning();
         void _updateAntiAliasingMode();
-        void _connectionOutputHandler(const hstring& hstr);
+        void _connectionOutputHandler(const winrt::array_view<const uint8_t>& data);
         void _connectionStateChangedHandler(const TerminalConnection::ITerminalConnection&, const Windows::Foundation::IInspectable&);
         void _updateHoveredCell(const std::optional<til::point> terminalPosition);
         void _setOpacity(const float opacity, const bool focused = true);
@@ -401,6 +399,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         float _panelWidth{ 0 };
         float _panelHeight{ 0 };
         float _compositionScale{ 0 };
+        uint8_t _renderFailures{ 0 };
+        bool _forceCursorVisible = false;
 
         // Audio stuff.
         MidiAudio _midiAudio;
@@ -408,7 +408,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         // Other stuff.
         winrt::Windows::System::DispatcherQueue _dispatcher{ nullptr };
-        winrt::com_ptr<ControlSettings> _settings{ nullptr };
+        IControlSettings _settings{ nullptr };
+        bool _hasUnfocusedAppearance{ false };
+        IControlAppearance _unfocusedAppearance{ nullptr };
+        Core::ICoreScheme _focusedColorSchemeOverride{ nullptr };
         til::point _contextMenuBufferPosition{ 0, 0 };
         Windows::Foundation::Collections::IVector<hstring> _cachedQuickFixes{ nullptr };
         ::Search _searcher;
@@ -420,6 +423,14 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         bool _isReadOnly{ false };
         bool _closing{ false };
 
+        struct StashedColorScheme
+        {
+            std::array<COLORREF, TextColor::TABLE_SIZE> scheme;
+            size_t foregroundAlias;
+            size_t backgroundAlias;
+        };
+        std::unique_ptr<StashedColorScheme> _stashedColorScheme;
+
         // ----------------------------------------------------------------------------------------
         // These are ordered last to ensure they're destroyed first.
         // This ensures that their respective contents stops taking dependency on the above.
@@ -448,6 +459,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         TerminalConnection::ITerminalConnection::StateChanged_revoker _connectionStateChangedRevoker;
         TerminalConnection::ITerminalConnection _connection{ nullptr };
 
+        std::wstring _u16ConversionBuffer;
+        til::u8state _u8State;
+
         friend class ControlUnitTests::ControlCoreTests;
         friend class ControlUnitTests::ControlInteractivityTests;
         bool _inUnitTests{ false };