Migrate spelling-0.0.21 changes from main

Put prefastv3 first
ok we have no python. whatever.
2026-04-11 16:51:00 +00:00 · 2022-04-08 09:48:13 -07:00 · 2022-04-08 09:48:13 -07:00 · 2022-04-07 14:47:01 -07:00 · 2022-04-07 13:34:36 -07:00 · 2022-04-07 13:31:49 -07:00
811 changed files with 19180 additions and 26983 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -11,7 +11,7 @@ AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Never
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: Inline
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: Never
 #AllowShortLambdasOnASingleLine: Inline
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -2183,7 +2183,6 @@ wnd
 WNDALLOC
 WNDCLASS
 WNDCLASSEX
-WNDCLASSEXW
 WNDCLASSW
 Wndproc
 WNegative
--- a/.github/fabricbot.json
+++ b/.github/fabricbot.json
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32422.2
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29001.49
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Terminal", "Terminal", "{59840756-302F-44DF-AA47-441A9D673202}"
 EndProject
@@ -11,9 +11,9 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CascadiaPackage", "src\casc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.EXE", "src\host\exe\Host.EXE.vcxproj", "{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
 		{5D23E8E1-3C64-4CC1-A8F7-6861677F7239} = {5D23E8E1-3C64-4CC1-A8F7-6861677F7239}
-		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertiesLibrary", "src\propslib\propslib.vcxproj", "{345FD5A4-B32B-4F29-BD1C-B033BD2C35CC}"
@@ -64,9 +64,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererGdi", "src\renderer
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host", "src\host\lib\hostlib.vcxproj", "{06EC74CB-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}
+		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.unittest", "src\host\ut_lib\host.unittest.vcxproj", "{06EC74CB-9A12-429C-B551-8562EC954747}"
@@ -77,8 +77,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.unittest", "src\host\u
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Unit", "src\host\ut_host\Host.UnitTests.vcxproj", "{531C23E7-4B76-4C08-8AAD-04164CB628C9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{06EC74CB-9A12-429C-B551-8562EC954747} = {06EC74CB-9A12-429C-B551-8562EC954747}
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
+		{06EC74CB-9A12-429C-B551-8562EC954747} = {06EC74CB-9A12-429C-B551-8562EC954747}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextBuffer.Unit.Tests", "src\buffer\out\ut_textbuffer\TextBuffer.Unit.Tests.vcxproj", "{531C23E7-4B76-4C08-8BBD-04164CB628C9}"
@@ -89,9 +89,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Feature", "src\host\ft_host\Host.FeatureTests.vcxproj", "{8CDB8850-7484-4EC7-B45B-181F85B2EE54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
+		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
-		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalParser.UnitTests", "src\terminal\parser\ut_parser\Parser.UnitTests.vcxproj", "{12144E07-FE63-4D33-9231-748B8D8C3792}"
@@ -114,8 +114,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host.Tests.UIA", "src\host\ft_uia\Host.Tests.UIA.csproj", "{C17E1BF3-9D34-4779-9458-A8EF98CC5662}"
 	ProjectSection(ProjectDependencies) = postProject
 		{099193A0-1E43-4BBC-BA7F-7B351E1342DF} = {099193A0-1E43-4BBC-BA7F-7B351E1342DF}
-		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 		{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB} = {C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}
+		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VTApp", "src\tools\vtapp\VTApp.csproj", "{099193A0-1E43-4BBC-BA7F-7B351E1342DF}"
@@ -172,13 +172,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalCore", "src\cascadi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Control.Lib", "src\cascadia\TerminalControl\TerminalControlLib.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}"
 	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
+		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
 		{1CF55140-EF6A-4736-A403-957E4F7430BB} = {1CF55140-EF6A-4736-A403-957E4F7430BB}
 		{48D21369-3D7B-4431-9967-24E81292CF62} = {48D21369-3D7B-4431-9967-24E81292CF62}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {48D21369-3D7B-4431-9967-24E81292CF63}
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F} = {8222900C-8B6C-452A-91AC-BE95DB04B95F}
 		{AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F} = {AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F}
-		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
-		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Control", "src\cascadia\TerminalControl\dll\TerminalControl.vcxproj", "{CA5CAD1A-F542-4635-A069-7CAEFB930070}"
@@ -188,21 +187,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Control"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj", "{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
-		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
+		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
-		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
+		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}"
@@ -252,15 +251,15 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
 	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
-		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
@@ -274,9 +273,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.DLL", "src\wincon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia\LocalTests_TerminalApp\TestHostApp\TestHostApp.vcxproj", "{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {CA5CAD1A-9B68-456A-B13E-C8218070DC42}
-		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
@@ -331,8 +330,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
@@ -357,9 +356,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_SettingsModel", "src\cascadia\LocalTests_SettingsModel\SettingsModel.LocalTests.vcxproj", "{CA5CAD1A-9B68-456A-B13E-C8218070DC42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
+		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MonarchPeasantSample", "src\tools\MonarchPeasantSample\MonarchPeasantSample.vcxproj", "{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}"
@@ -378,8 +377,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Remoting", "src\cascadia\UnitTests_Remoting\Remoting.UnitTests.vcxproj", "{68A10CD3-AA64-465B-AF5F-ED4E9700543C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
 		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wpf", "wpf", "{4DAF0299-495E-4CD1-A982-9BAC16A45932}"
@@ -407,14 +406,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{61901E80
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererAtlas", "src\renderer\atlas\atlas.vcxproj", "{8222900C-8B6C-452A-91AC-BE95DB04B95F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InteractivityOneCore", "src\interactivity\onecore\lib\onecore.LIB.vcxproj", "{06EC74CB-9A12-428C-B551-8537EC964726}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererWddmCon", "src\renderer\wddmcon\lib\wddmcon.vcxproj", "{75C6F576-18E9-4566-978A-F0A301CAC090}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Audio", "Audio", "{40BD8415-DD93-4200-8D82-498DDDC08CC8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MidiAudio", "src\audio\midi\lib\midi.vcxproj", "{3C67784E-1453-49C2-9660-483E2CC7F7AD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -645,8 +636,7 @@ Global
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|ARM.ActiveCfg = Debug|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|DotNet_x64Test.Build.0 = Debug|x64
+		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|x64.ActiveCfg = Debug|x64
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|x64.Build.0 = Debug|x64
@@ -664,8 +654,7 @@ Global
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|ARM.ActiveCfg = Release|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|ARM64.ActiveCfg = Release|ARM64
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|ARM64.Build.0 = Release|ARM64
-		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|DotNet_x64Test.Build.0 = Release|x64
+		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|x64.ActiveCfg = Release|x64
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|x64.Build.0 = Release|x64
@@ -2312,8 +2301,7 @@ Global
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|ARM.ActiveCfg = Debug|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|ARM64.Build.0 = Debug|ARM64
-		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|DotNet_x64Test.Build.0 = Debug|x64
+		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|x64.ActiveCfg = Debug|x64
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Debug|x64.Build.0 = Debug|x64
@@ -2330,8 +2318,7 @@ Global
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|ARM.ActiveCfg = Release|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|ARM64.ActiveCfg = Release|ARM64
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|ARM64.Build.0 = Release|ARM64
-		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|DotNet_x64Test.Build.0 = Release|x64
+		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|x64.ActiveCfg = Release|x64
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|x64.Build.0 = Release|x64
@@ -3362,8 +3349,7 @@ Global
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM.ActiveCfg = Debug|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x64Test.Build.0 = Debug|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.ActiveCfg = Debug|x64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.Build.0 = Debug|x64
@@ -3383,123 +3369,12 @@ Global
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM.ActiveCfg = Release|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.ActiveCfg = Release|ARM64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.Build.0 = Release|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x64Test.Build.0 = Release|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.ActiveCfg = Release|x64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.Build.0 = Release|x64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.ActiveCfg = Release|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.Build.0 = Release|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|ARM.ActiveCfg = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x64.Build.0 = AuditMode|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM.ActiveCfg = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM64.Build.0 = Debug|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|DotNet_x86Test.ActiveCfg = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x64.ActiveCfg = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x64.Build.0 = Debug|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x86.ActiveCfg = Debug|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x86.Build.0 = Debug|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|Any CPU.ActiveCfg = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM.ActiveCfg = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM64.ActiveCfg = Release|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM64.Build.0 = Release|ARM64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|DotNet_x86Test.ActiveCfg = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x64.ActiveCfg = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x64.Build.0 = Release|x64
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x86.ActiveCfg = Release|Win32
-		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x86.Build.0 = Release|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|ARM.ActiveCfg = AuditMode|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM.ActiveCfg = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM64.Build.0 = Debug|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|DotNet_x86Test.ActiveCfg = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x64.ActiveCfg = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x64.Build.0 = Debug|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x86.ActiveCfg = Debug|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x86.Build.0 = Debug|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|Any CPU.ActiveCfg = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM.ActiveCfg = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM64.ActiveCfg = Release|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM64.Build.0 = Release|ARM64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|DotNet_x86Test.ActiveCfg = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x64.ActiveCfg = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x64.Build.0 = Release|x64
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x86.ActiveCfg = Release|Win32
-		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x86.Build.0 = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x64.Build.0 = AuditMode|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM.ActiveCfg = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x64.ActiveCfg = Debug|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x64.Build.0 = Debug|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x86.ActiveCfg = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x86.Build.0 = Debug|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|Any CPU.ActiveCfg = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM.ActiveCfg = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM64.Build.0 = Release|ARM64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x64.ActiveCfg = Release|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x64.Build.0 = Release|x64
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x86.ActiveCfg = Release|Win32
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3601,10 +3476,6 @@ Global
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{61901E80-E97D-4D61-A9BB-E8F2FDA8B40C} = {59840756-302F-44DF-AA47-441A9D673202}
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F} = {05500DEF-2294-41E3-AF9A-24E580B82836}
-		{06EC74CB-9A12-428C-B551-8537EC964726} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
-		{75C6F576-18E9-4566-978A-F0A301CAC090} = {05500DEF-2294-41E3-AF9A-24E580B82836}
-		{40BD8415-DD93-4200-8D82-498DDDC08CC8} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
-		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
--- a/README.md
+++ b/README.md
@@ -111,10 +111,10 @@ repository.

 ---

-## Windows Terminal Roadmap
+## Windows Terminal 2.0 Roadmap

-The plan for the Windows Terminal [is described here](/doc/roadmap-2022.md) and
-will be updated as the project proceeds.
+The plan for delivering Windows Terminal 2.0 [is described
+here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.

 ## Project Build Status

@@ -299,7 +299,6 @@ If you would like to ask a question that you feel doesn't warrant an issue
  * Universal Windows Platform Development
  * **The following Individual Components**
    * C++ (v142) Universal Windows Platform Tools
-* You must install the [.NET Framework Targeting Pack](https://docs.microsoft.com/dotnet/framework/install/guide-for-developers#to-install-the-net-framework-developer-pack-or-targeting-pack) to build test projects

 ## Building the Code

--- a/build/config/ESRPSigning_ConPTY.json
+++ b/build/config/ESRPSigning_ConPTY.json
@@ -1,51 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "conpty.dll",
-                "OpenConsole.exe"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}
--- a/build/config/GitCheckin.json
+++ b/build/config/GitCheckin.json
@@ -4,7 +4,7 @@
        "collection": "microsoft",
        "project": "OS",
        "repo": "os.2020",
-        "name": "official/rs_we_adept_e4d2",
+        "name": "official/rs_wdx_dxp_windev",
        "workitem": "38106206",
        "CheckinFiles": [
          {
@@ -21,4 +21,4 @@
        "sendOnErrorOnly": "False"
      }
    ]
-  }
+  }
--- a/build/config/tsaoptions.json
+++ b/build/config/tsaoptions.json
@@ -0,0 +1,8 @@
+{
+    "instanceUrl": "https://microsoft.visualstudio.com",
+    "projectName": "os",
+    "areaPath": "OS\\WDX\\DXP\\WinDev\\Terminal",
+    "iterationPath": "OS\\Future",
+    "notificationAliases": [ "condev@microsoft.com;" ],
+    "ignoreBranchName": true
+  }
--- a/build/packages.config
+++ b/build/packages.config
@@ -4,7 +4,5 @@
  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
  <!-- This cannot be included in another project that depends on XAML (as it would be a duplicate package ID) -->
-  <package id="Microsoft.UI.Xaml" version="2.7.3" 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" />
+  <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native" />
 </packages>
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -9,7 +9,7 @@

  <PropertyGroup>
    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.15</PGOBranch>
+    <PGOBranch>main</PGOBranch>

    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
--- a/build/pipelines/ci.yml
+++ b/build/pipelines/ci.yml
@@ -95,10 +95,3 @@ stages:
    jobs:
      - template: ./templates/check-formatting.yml

-
-  - stage: CodeIndexer
-    displayName: Github CodeNav Indexer
-    dependsOn: [Build_x64]
-    condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')))
-    jobs:
-      - template: ./templates/codenav-indexer.yml
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@@ -30,10 +30,6 @@ parameters:
    displayName: "Build Windows Terminal VPack"
    type: boolean
    default: false
-  - name: buildConPTY
-    displayName: "Build ConPTY NuGet"
-    type: boolean
-    default: false
  - name: buildWPF
    displayName: "Build Terminal WPF Control"
    type: boolean
@@ -64,42 +60,18 @@ parameters:

 variables:
  TerminalInternalPackageVersion: "0.0.7"
-  # If we are building a branch called "release-*", change the NuGet suffix
-  # to "preview". If we don't do that, XES will set the suffix to "release1"
-  # because it truncates the value after the first period.
-  # We also want to disable the suffix entirely if we're Release branded while
-  # on a release branch.
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label as
-  # well.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Release                    | Preview
-  # ------------------|----------------------------|-----------------------------
-  # release-*         | 1.12.20220427              | 1.13.20220427-preview
-  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
-  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      NoNuGetPackBetaVersion: true
-    ${{ else }}:
-      NuGetPackBetaVersion: preview
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental
-  # The NuGet packages have to use *somebody's* DLLs. We used to force them to
-  # use the Win10 build outputs, but if there isn't a Win10 build we should use
-  # the Win11 one.
-  ${{ if containsValue(parameters.buildWindowsVersions, 'Win10') }}:
-    TerminalBestVersionForNuGetPackages: Win10
-  ${{ else }}:
-    TerminalBestVersionForNuGetPackages: Win11

 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 resources:
  repositories:
  - repository: self
+    path: 's' # Now that there are two checkouts, specify 's' to ensure this one still sits at the $(Build.SourcesDirectory) root so other things don't break with the implicit subdirectory normally created for >1 checkout.
    type: git
    ref: main
+  - repository: templates_onebranch
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
 jobs:
 - job: Build
  strategy:
@@ -134,6 +106,8 @@ jobs:

        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
  - template: .\templates\restore-nuget-steps.yml
+  # Pull the Windows SDK for the developer tools like the debuggers so we can index sources later
+  - template: .\templates\install-winsdk-steps.yml
  - task: UniversalPackages@0
    displayName: Download terminal-internal Universal Package
    inputs:
@@ -224,22 +198,12 @@ jobs:
        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
        platform: $(BuildPlatform)
        configuration: $(BuildConfiguration)
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for ConPTY
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Conhost\Host_EXE;Conhost\winconpty_DLL
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
  - task: PowerShell@2
    displayName: Source Index PDBs
    inputs:
      filePath: build\scripts\Index-Pdbs.ps1
      arguments: -SearchDir '$(Build.SourcesDirectory)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
      errorActionPreference: silentlyContinue
-      pwsh: true
  - task: PowerShell@2
    displayName: Run Unit Tests
    condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
@@ -278,24 +242,6 @@ jobs:
      inputs:
        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
        ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)-$(TerminalTargetWindowsVersion)
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy ConPTY to Artifacts
-      inputs:
-        Contents: |-
-          $(Build.SourcesDirectory)/bin/**/conpty.dll
-          $(Build.SourcesDirectory)/bin/**/conpty.lib
-          $(Build.SourcesDirectory)/bin/**/conpty.pdb
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.exe
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.pdb
-        TargetFolder: $(Build.ArtifactStagingDirectory)/conpty
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (ConPTY)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/conpty
-        ArtifactName: conpty-dll-$(BuildPlatform)-$(BuildConfiguration)-$(TerminalTargetWindowsVersion)
  - ${{ if eq(parameters.buildWPF, true) }}:
    - task: CopyFiles@2
      displayName: Copy PublicTerminalCore.dll to Artifacts
@@ -335,13 +281,6 @@ jobs:
          ${{ windowsVersion }}:
            TerminalTargetWindowsVersion: ${{ windowsVersion }}
    displayName: Create and sign AppX/MSIX bundles
-    variables:
-      ${{ if eq(parameters.branding, 'Release') }}:
-        BundleStemName: Microsoft.WindowsTerminal
-      ${{ elseif eq(parameters.branding, 'Preview') }}:
-        BundleStemName: Microsoft.WindowsTerminalPreview
-      ${{ else }}:
-        BundleStemName: WindowsTerminalDev
    dependsOn: Build
    steps:
    - checkout: self
@@ -366,15 +305,14 @@ jobs:
        $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
        $Components[0] = ([int]$Components[0] + $VersionEpoch)
        $BundleVersion = $Components -Join "."
-        New-Item -Type Directory "$(System.ArtifactsDirectory)\bundle"
-        .\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(TerminalTargetWindowsVersion)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
+        .\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminal_$(TerminalTargetWindowsVersion)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
      displayName: Create WindowsTerminal*.msixbundle
    - task: EsrpCodeSigning@1
      displayName: Submit *.msixbundle to ESRP for code signing
      inputs:
        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)\bundle
-        Pattern: $(BundleStemName)*.msixbundle
+        FolderPath: $(System.ArtifactsDirectory)
+        Pattern: Microsoft.WindowsTerminal*.msixbundle
        UseMinimatch: true
        signConfigType: inlineSignParams
        inlineOperation: >-
@@ -407,100 +345,9 @@ jobs:
    - task: PublishBuildArtifacts@1
      displayName: 'Publish Artifact: appxbundle-signed'
      inputs:
-        PathtoPublish: $(System.ArtifactsDirectory)\bundle
+        PathtoPublish: $(System.ArtifactsDirectory)
        ArtifactName: appxbundle-signed-$(TerminalTargetWindowsVersion)

- ${{ if eq(parameters.buildConPTY, true) }}:
-  - job: PackageAndSignConPTY
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (ConPTY)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download ${{ platform }} ConPTY binaries
-        inputs:
-          artifactName: conpty-dll-${{ platform }}-$(BuildConfiguration)-$(TerminalBestVersionForNuGetPackages)
-          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
-          extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts around
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: |-
-          Get-ChildItem bin -Recurse -Directory -Filter conpty-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-          Move-Item bin\x86 bin\Win32
-
-    - task: EsrpCodeSigning@1
-      displayName: Submit ConPTY libraries and OpenConsole for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Build.SourcesDirectory)/bin'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_ConPTY.json'
-
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet pack
-      inputs:
-        command: pack
-        packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
-        packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
-        versioningScheme: byEnvVar
-        versionEnvVar: XES_PACKAGEVERSIONNUMBER
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (nupkg)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
-        ArtifactName: conpty-nupkg-$(BuildConfiguration)
-
-
 - ${{ if eq(parameters.buildWPF, true) }}:
  - job: PackageAndSignWPF
    strategy:
@@ -524,7 +371,7 @@ jobs:
      - task: DownloadBuildArtifacts@0
        displayName: Download ${{ platform }} PublicTerminalCore
        inputs:
-          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)-$(TerminalBestVersionForNuGetPackages)
+          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)-Win10
          itemPattern: '**/*.dll'
          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
          extractTars: false
@@ -619,8 +466,6 @@ jobs:
    - task: PkgESSetupBuild@12
      displayName: Package ES - Setup Build

-    - template: .\templates\restore-nuget-steps.yml
-
    # Download the appx-PLATFORM-CONFIG-VERSION artifact for every platform/version combo
    - ${{ each platform in parameters.buildPlatforms }}:
      - ${{ each windowsVersion in parameters.buildWindowsVersions }}:
@@ -643,12 +488,13 @@ jobs:
        }
      displayName: Extract symbols for public consumption

+    # Pull the Windows SDK for the developer tools like the debuggers so we can index sources later
+    - template: .\templates\install-winsdk-steps.yml
    - task: PowerShell@2
      displayName: Source Index PDBs (the public ones)
      inputs:
        filePath: build\scripts\Index-Pdbs.ps1
        arguments: -SearchDir '$(Build.SourcesDirectory)/appxsym-temp' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-        pwsh: true

    # Publish the app symbols to the public MSDL symbol server
    # accessible via https://msdl.microsoft.com/download/symbols
@@ -714,7 +560,6 @@ jobs:
        description: VPack for the Windows Terminal Application
        pushPkgName: WindowsTerminal.app
        owner: conhost
-        githubToken: $(GitHubTokenForVpackProvenance)
    - task: PublishPipelineArtifact@1
      displayName: 'Copy VPack Manifest to Drop'
      inputs:
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -11,7 +11,6 @@ jobs:
    BuildConfiguration: ${{ parameters.configuration }}
    BuildPlatform: ${{ parameters.platform }}
    WindowsTerminalBranding: ${{ parameters.branding }}
-    EnableRichCodeNavigation: true
  pool: 
    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
      name: WinDevPoolOSS-L
--- a/build/pipelines/templates/build-console-compliance-job.yml
+++ b/build/pipelines/templates/build-console-compliance-job.yml
@@ -13,6 +13,7 @@ jobs:
  timeoutInMinutes: 240
  steps:
  - checkout: self
+    path: 's' # Now that there are two checkouts, specify 's' to ensure this one still sits at the $(Build.SourcesDirectory) root so other things don't break with the implicit subdirectory normally created for >1 checkout.
    clean: true
    submodules: true
    persistCredentials: True
@@ -68,12 +69,76 @@ jobs:
        $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
      pwsh: true

-  # 1ES Component Governance onboarding (Detects open source components). See https://docs.opensource.microsoft.com/tools/cg.html
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: Component Detection
-    
-  # # PREfast and PoliCheck need Node. Install that first.
+  # Run compliance activities. 
+  # These are specified at https://www.osgwiki.com/wiki/Package_ES_SDL_Templates
+  # We use Option 3.
+  # Option 1 isn't feasible because we don't run in Stages and it hides many/most of the override options we need.
+  # Option 2 isn't feasible because we don't use OneBranch and it doesn't make sense to migrate to it since this isn't an Azure product.
+
+  ### PREfast and PoliCheck need Node. Install that first.
  - task: NodeTool@0
+    inputs:
+      versionSpec: '>=8.10.0'
+  
+  # This is the Package ES simplified SDL sources template. 
+  # To figure out which parameters to use, go read the source: https://microsoft.visualstudio.com/OneBranch.Pipelines/_git/GovernedTemplates?path=/v2/Steps/PackageES/Windows.SDL.Sources.Analysis.OS.Undocked.yml
+  - template: v2/Steps/PackageES/Windows.SDL.Sources.Analysis.OS.Undocked.yml@templates_onebranch
+    parameters:
+      globalSdl:
+          codeql:
+            eslint:
+              enabled: true
+            tsandjs:
+              enabled: true
+            python:
+              enabled: false
+            psscriptanalyzer:
+              enable: true
+          policheck:
+            exclusionsFile: $(Build.SourcesDirectory)\build\config\PolicheckExclusions.xml
+          tsa:
+            enabled: false
+            configFile: $(Build.SourcesDirectory)\build\config\tsaoptions.json
+    
+  # We need to run the v3 version of PREfast to be able to have the x64 toolset and specify the correct paths to avoid the WAPPROJ.
+  # Also, we run this prior to the rest of the binary analysis rules because PREfast will build all our binaries as a part of its checks.
+  # https://www.1eswiki.com/wiki/PREfast_Build_Task
+  # Builds the project with C/C++ static analysis tools to find coding flaws and vulnerabilities
+  # !!! WARNING !!! It doesn't work with WAPPROJ packaging projects. Build the sub-projects instead.
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@3
+    displayName: 'Run the PREfast SDL Native Rules for MSBuild'
+    condition: succeededOrFailed()
+    inputs:
+      msBuildCommandline: msbuild.exe /nologo /m /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }} /p:WindowsTerminalReleaseBuild=true /p:platform=$(BuildPlatform) /p:configuration=$(BuildConfiguration) /t:Terminal\Window\WindowsTerminal /p:VisualStudioVersion=16.0 $(Build.SourcesDirectory)\OpenConsole.sln
+
+  # Copies output from PREfast SDL Native Rules task to expected location for consumption by PkgESSecComp
+  - task: CopyFiles@1
+    displayName: 'Copy PREfast xml files to SDLNativeRulesDir'
+    inputs:
+      SourceFolder: '$(Agent.BuildDirectory)'
+      Contents: |
+        **\*.nativecodeanalysis.xml
+      TargetFolder: '$(Agent.BuildDirectory)\_sdt\logs\SDLNativeRules'
+
+  # This is the Package ES simplified SDL binary template. 
+  # To figure out which parameters to use, go read the source: https://microsoft.visualstudio.com/OneBranch.Pipelines/_git/GovernedTemplates?path=/v2/Steps/PackageES/Windows.SDL.Binary.Analysis.OS.Undocked.yml
+  - template: v2/Steps/PackageES/Windows.SDL.Binary.Analysis.OS.Undocked.yml@templates_onebranch
+    parameters:
+      globalSdl:
+        binskim:
+          analyzeTargetGlob: $(Build.SourcesDirectory)\bin\**\*.dll;$(Build.SourcesDirectory)\bin\**\*.exe;-:file|**\Microsoft.UI.Xaml.dll;-:file|**\Microsoft.Toolkit.Win32.UI.XamlHost.dll;-:file|**\vcruntime*.dll;-:file|**\vcomp*.dll;-:file|**\vccorlib*.dll;-:file|**\vcamp*.dll;-:file|**\msvcp*.dll;-:file|**\concrt*.dll;-:file|**\TerminalThemeHelpers*.dll;-:file|**\cpprest*.dll
+        prefast:
+          enabled: false # See above, we run the v3 variant of this task.
+        tsa:
+          enabled: false
+          configFile: $(Build.SourcesDirectory)\build\config\tsaoptions.json
+      variables:
+          ob_outputDirectory: $(Build.SourcesDirectory)\bin\
+
+  # # 1ES Component Governance onboarding (Detects open source components). See https://docs.opensource.microsoft.com/tools/cg.html
+  # - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  #   displayName: Component Detection
+    

  # !!! NOTE !!! Run PREfast first. Some of the other tasks are going to run on a completed build.
  # PREfast is going to build the code as a part of its analysis and the generated sources
@@ -94,108 +159,108 @@ jobs:
  # https://www.1eswiki.com/wiki/PREfast_Build_Task
  # Builds the project with C/C++ static analysis tools to find coding flaws and vulnerabilities
  # !!! WARNING !!! It doesn't work with WAPPROJ packaging projects. Build the sub-projects instead.
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@3
-    displayName: 'Run the PREfast SDL Native Rules for MSBuild'
-    condition: succeededOrFailed()
-    inputs:
-      msBuildCommandline: msbuild.exe /nologo /m /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }} /p:WindowsTerminalReleaseBuild=true /p:platform=$(BuildPlatform) /p:configuration=$(BuildConfiguration) /t:Terminal\Window\WindowsTerminal /p:VisualStudioVersion=16.0 $(Build.SourcesDirectory)\OpenConsole.sln
+  # - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@3
+  #   displayName: 'Run the PREfast SDL Native Rules for MSBuild'
+  #   condition: succeededOrFailed()
+  #   inputs:
+  #     msBuildCommandline: msbuild.exe /nologo /m /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }} /p:WindowsTerminalReleaseBuild=true /p:platform=$(BuildPlatform) /p:configuration=$(BuildConfiguration) /t:Terminal\Window\WindowsTerminal /p:VisualStudioVersion=16.0 $(Build.SourcesDirectory)\OpenConsole.sln

-  # Copies output from PREfast SDL Native Rules task to expected location for consumption by PkgESSecComp
-  - task: CopyFiles@1
-    displayName: 'Copy PREfast xml files to SDLNativeRulesDir'
-    inputs:
-      SourceFolder: '$(Agent.BuildDirectory)'
-      Contents: |
-        **\*.nativecodeanalysis.xml
-      TargetFolder: '$(Agent.BuildDirectory)\_sdt\logs\SDLNativeRules'
+  # # Copies output from PREfast SDL Native Rules task to expected location for consumption by PkgESSecComp
+  # - task: CopyFiles@1
+  #   displayName: 'Copy PREfast xml files to SDLNativeRulesDir'
+  #   inputs:
+  #     SourceFolder: '$(Agent.BuildDirectory)'
+  #     Contents: |
+  #       **\*.nativecodeanalysis.xml
+  #     TargetFolder: '$(Agent.BuildDirectory)\_sdt\logs\SDLNativeRules'

-  # https://www.1eswiki.com/index.php?title=PoliCheck_Build_Task
-  # Scans the text of source code, comments, and content for terminology that could be sensitive for legal, cultural, or geopolitical reasons.
-  # (Also finds vulgarities... takes all the fun out of everything.)
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
-    displayName: 'Run PoliCheck'
-    inputs:
-      targetType: F
-      targetArgument: $(Build.SourcesDirectory)
-      result: PoliCheck.xml
-      optionsFC: 1
-      optionsXS: 1
-      optionsUEPath: $(Build.SourcesDirectory)\build\config\PolicheckExclusions.xml
-      optionsHMENABLE: 0
-    continueOnError: true
+  # # https://www.1eswiki.com/index.php?title=PoliCheck_Build_Task
+  # # Scans the text of source code, comments, and content for terminology that could be sensitive for legal, cultural, or geopolitical reasons.
+  # # (Also finds vulgarities... takes all the fun out of everything.)
+  # - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
+  #   displayName: 'Run PoliCheck'
+  #   inputs:
+  #     targetType: F
+  #     targetArgument: $(Build.SourcesDirectory)
+  #     result: PoliCheck.xml
+  #     optionsFC: 1
+  #     optionsXS: 1
+  #     optionsUEPath: $(Build.SourcesDirectory)\build\config\PolicheckExclusions.xml
+  #     optionsHMENABLE: 0
+  #   continueOnError: true

-  # https://www.1eswiki.com/wiki/CredScan_Azure_DevOps_Build_Task
-  # Searches through source code and build outputs for a credential left behind in the open
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
-    displayName: 'Run CredScan'
-    inputs:
-      outputFormat: pre
-      # suppressionsFile: LocalSuppressions.json
-      batchSize: 20
-      debugMode: false
-    continueOnError: true
+  # # https://www.1eswiki.com/wiki/CredScan_Azure_DevOps_Build_Task
+  # # Searches through source code and build outputs for a credential left behind in the open
+  # - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
+  #   displayName: 'Run CredScan'
+  #   inputs:
+  #     outputFormat: pre
+  #     # suppressionsFile: LocalSuppressions.json
+  #     batchSize: 20
+  #     debugMode: false
+  #   continueOnError: true

-  # https://www.1eswiki.com/wiki/BinSkim_Build_Task
-  # Searches managed and unmanaged binaries for known security vulnerabilities.
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
-    displayName: 'Run BinSkim'
-    inputs:
-      TargetPattern: guardianGlob
-      # See https://aka.ms/gdn-globs for how to do match patterns
-      AnalyzeTargetGlob: $(Build.SourcesDirectory)\bin\**\*.dll;$(Build.SourcesDirectory)\bin\**\*.exe;-:file|**\Microsoft.UI.Xaml.dll;-:file|**\Microsoft.Toolkit.Win32.UI.XamlHost.dll;-:file|**\vcruntime*.dll;-:file|**\vcomp*.dll;-:file|**\vccorlib*.dll;-:file|**\vcamp*.dll;-:file|**\msvcp*.dll;-:file|**\concrt*.dll;-:file|**\TerminalThemeHelpers*.dll;-:file|**\cpprest*.dll
-    continueOnError: true
+  # # https://www.1eswiki.com/wiki/BinSkim_Build_Task
+  # # Searches managed and unmanaged binaries for known security vulnerabilities.
+  # - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
+  #   displayName: 'Run BinSkim'
+  #   inputs:
+  #     TargetPattern: guardianGlob
+  #     # See https://aka.ms/gdn-globs for how to do match patterns
+  #     AnalyzeTargetGlob: $(Build.SourcesDirectory)\bin\**\*.dll;$(Build.SourcesDirectory)\bin\**\*.exe;-:file|**\Microsoft.UI.Xaml.dll;-:file|**\Microsoft.Toolkit.Win32.UI.XamlHost.dll;-:file|**\vcruntime*.dll;-:file|**\vcomp*.dll;-:file|**\vccorlib*.dll;-:file|**\vcamp*.dll;-:file|**\msvcp*.dll;-:file|**\concrt*.dll;-:file|**\TerminalThemeHelpers*.dll;-:file|**\cpprest*.dll
+  #   continueOnError: true

-  # Set XES_SERIALPOSTBUILDREADY to run Security and Compliance task once per build
-  - powershell: Write-Host “##vso[task.setvariable variable=XES_SERIALPOSTBUILDREADY;]true”  
-    displayName: 'Set XES_SERIALPOSTBUILDREADY Vars'
+  # # Set XES_SERIALPOSTBUILDREADY to run Security and Compliance task once per build
+  # - powershell: Write-Host “##vso[task.setvariable variable=XES_SERIALPOSTBUILDREADY;]true”  
+  #   displayName: 'Set XES_SERIALPOSTBUILDREADY Vars'

-  # https://www.osgwiki.com/wiki/Package_ES_Security_and_Compliance
-  # Does a few things:
-  # - Ensures that Windows-required compliance tasks are run either inside this task
-  #   or were run as a previous step prior to this one
-  #   (PREfast, PoliCheck, Credscan)
-  # - Runs Windows-specific compliance tasks inside the task
-  #   + CheckCFlags - ensures that compiler and linker flags meet Windows standards
-  #   + CFGCheck/XFGCheck - ensures that Control Flow Guard (CFG) or 
-  #                         eXtended Flow Guard (XFG) are enabled on binaries
-  #                         NOTE: CFG is deprecated and XFG isn't fully ready yet.
-  #                         NOTE2: CFG fails on an XFG'd binary
-  # - Brokers all security/compliance task logs to "Trust Services Automation (TSA)" (https://aka.ms/tsa)
-  #   which is a system that maps all errors into the appropriate bug database 
-  #   template for each organization since they all vary. It should also suppress
-  #   new bugs when one already exists for the product.
-  #   This one is set up to go to the OS repository and use the given parameters
-  #   to file bugs to our AzDO product path.
-  #   If we don't use PkgESSecComp to do this for us, we need to install the TSA task
-  #   ourselves in this pipeline to finalize data upload and bug creation.
-  # !!! NOTE !!! This task goes *LAST* after any other compliance tasks so it catches their logs
-  - task: PkgESSecComp@10
-    displayName: 'Security and Compliance tasks'
-    inputs:
-      fileNewBugs: false
-      areaPath: 'OS\WDX\DXP\WinDev\Terminal'
-      teamProject: 'OS'
-      iterationPath: 'OS\Future'
-      bugTags: 'TerminalReleaseCompliance'
-      scanAll: true
-      errOnBugs: false
-      failOnStdErr: true
-      taskLogVerbosity: Diagnostic
-      secCompConfigFromTask: |
-        # Overrides default build sources directory
-        sourceTargetOverrideAll: $(Build.SourcesDirectory)
-        # Overrides default build binaries directory when "Scan all" option is specified
-        binariesTargetOverrideAll: $(Build.SourcesDirectory)\bin
+  # # https://www.osgwiki.com/wiki/Package_ES_Security_and_Compliance
+  # # Does a few things:
+  # # - Ensures that Windows-required compliance tasks are run either inside this task
+  # #   or were run as a previous step prior to this one
+  # #   (PREfast, PoliCheck, Credscan)
+  # # - Runs Windows-specific compliance tasks inside the task
+  # #   + CheckCFlags - ensures that compiler and linker flags meet Windows standards
+  # #   + CFGCheck/XFGCheck - ensures that Control Flow Guard (CFG) or 
+  # #                         eXtended Flow Guard (XFG) are enabled on binaries
+  # #                         NOTE: CFG is deprecated and XFG isn't fully ready yet.
+  # #                         NOTE2: CFG fails on an XFG'd binary
+  # # - Brokers all security/compliance task logs to "Trust Services Automation (TSA)" (https://aka.ms/tsa)
+  # #   which is a system that maps all errors into the appropriate bug database 
+  # #   template for each organization since they all vary. It should also suppress
+  # #   new bugs when one already exists for the product.
+  # #   This one is set up to go to the OS repository and use the given parameters
+  # #   to file bugs to our AzDO product path.
+  # #   If we don't use PkgESSecComp to do this for us, we need to install the TSA task
+  # #   ourselves in this pipeline to finalize data upload and bug creation.
+  # # !!! NOTE !!! This task goes *LAST* after any other compliance tasks so it catches their logs
+  # - task: PkgESSecComp@10
+  #   displayName: 'Security and Compliance tasks'
+  #   inputs:
+  #     fileNewBugs: false
+  #     areaPath: 'OS\WDX\DXP\WinDev\Terminal'
+  #     teamProject: 'OS'
+  #     iterationPath: 'OS\Future'
+  #     bugTags: 'TerminalReleaseCompliance'
+  #     scanAll: true
+  #     errOnBugs: false
+  #     failOnStdErr: true
+  #     taskLogVerbosity: Diagnostic
+  #     secCompConfigFromTask: |
+  #       # Overrides default build sources directory
+  #       sourceTargetOverrideAll: $(Build.SourcesDirectory)
+  #       # Overrides default build binaries directory when "Scan all" option is specified
+  #       binariesTargetOverrideAll: $(Build.SourcesDirectory)\bin

-        # Set the tools to false if they should not run in the build
-        tools:
-            - toolName: CheckCFlags
-              enable: true
-            - toolName: CFGCheck
-              enable: true
-            - toolName: Policheck
-              enable: false
-            - toolName: CredScan
-              enable: false
-            - toolName: XFGCheck
-              enable: false
+  #       # Set the tools to false if they should not run in the build
+  #       tools:
+  #           - toolName: CheckCFlags
+  #             enable: true
+  #           - toolName: CFGCheck
+  #             enable: true
+  #           - toolName: Policheck
+  #             enable: false
+  #           - toolName: CredScan
+  #             enable: false
+  #           - toolName: XFGCheck
+  #             enable: false
--- a/build/pipelines/templates/codenav-indexer.yml
+++ b/build/pipelines/templates/codenav-indexer.yml
@@ -1,22 +0,0 @@
-parameters:
-  artifactName: 'drop'
-
-jobs:
- job: CodeNavIndexer
-  displayName: Run Github CodeNav Indexer
-  pool: { vmImage: windows-2019 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    submodules: false
-    clean: true
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-
-  - task: RichCodeNavIndexer@0
-    inputs:
-      languages: 'cpp,csharp'
-    continueOnError: true
--- a/build/pipelines/templates/install-winsdk-steps.yml
+++ b/build/pipelines/templates/install-winsdk-steps.yml
@@ -0,0 +1,9 @@
+parameters:
+  sdkVersion: 18362
+steps:
+  - task: powershell@2
+    inputs:
+      targetType: filePath
+      filePath: build\scripts\Install-WindowsSdkISO.ps1
+      arguments: ${{ parameters.sdkVersion }}
+    displayName: 'Install Windows SDK (${{ parameters.sdkVersion }})'
--- a/build/scripts/Index-Pdbs.ps1
+++ b/build/scripts/Index-Pdbs.ps1
@@ -8,11 +8,10 @@ Param(
    [switch]$recursive
 )

-$pdbStrPackage = ([xml](Get-Content "$SourceRoot\build\packages.config")).packages.package | Where-Object id -like "*PdbStr*"
-# This assumes that we rev PdbStr and SrcTool at the same time.
-$debugPackageVersions = $pdbStrPackage.version
-$srctoolExe = Join-Path $SourceRoot "packages" "Microsoft.Debugging.Tools.SrcTool.$debugPackageVersions" "content" "amd64" "srctool.exe"
-$pdbstrExe = Join-Path $SourceRoot "packages" "Microsoft.Debugging.Tools.PdbStr.$debugPackageVersions" "content" "amd64" "pdbstr.exe"
+$debuggerPath = (Get-ItemProperty -path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots" -name WindowsDebuggersRoot10).WindowsDebuggersRoot10
+$srcsrvPath = Join-Path $debuggerPath "x64\srcsrv"
+$srctoolExe = Join-Path $srcsrvPath "srctool.exe"
+$pdbstrExe = Join-Path $srcsrvPath "pdbstr.exe"

 $fileTable = @{}
 foreach ($gitFile in & git ls-files)
--- a/build/scripts/Install-WindowsSdkISO.ps1
+++ b/build/scripts/Install-WindowsSdkISO.ps1
@@ -0,0 +1,346 @@
+[CmdletBinding()]
+param([Parameter(Mandatory=$true, Position=0)]
+      [string]$buildNumber)
+
+# Ensure the error action preference is set to the default for PowerShell3, 'Stop'
+$ErrorActionPreference = 'Stop'
+
+# Constants
+$WindowsSDKOptions = @("OptionId.UWPCpp", "OptionId.DesktopCPPx64", "OptionId.DesktopCPPx86", "OptionId.DesktopCPPARM64", "OptionId.DesktopCPPARM", "OptionId.WindowsDesktopDebuggers")
+$WindowsSDKRegPath = "HKLM:\Software\WOW6432Node\Microsoft\Windows Kits\Installed Roots"
+$WindowsSDKRegRootKey = "KitsRoot10"
+$WindowsSDKVersion = "10.0.$buildNumber.0"
+$WindowsSDKInstalledRegPath = "$WindowsSDKRegPath\$WindowsSDKVersion\Installed Options"
+$StrongNameRegPath = "HKLM:\SOFTWARE\Microsoft\StrongName\Verification"
+$PublicKeyTokens = @("31bf3856ad364e35")
+
+if ($buildNumber -notmatch "^\d{5,}$")
+{
+    Write-Host "ERROR: '$buildNumber' doesn't look like a windows build number"
+    Write-Host
+    Exit 1
+}
+
+function Download-File
+{
+    param ([string] $outDir,
+           [string] $downloadUrl,
+           [string] $downloadName)
+
+    $downloadPath = Join-Path $outDir "$downloadName.download"
+    $downloadDest = Join-Path $outDir $downloadName
+    $downloadDestTemp = Join-Path $outDir "$downloadName.tmp"
+
+    Write-Host -NoNewline "Downloading $downloadName..."
+
+    $retries = 10
+    $downloaded = $false
+    while (-not $downloaded)
+    {
+        try
+        {
+            $webclient = new-object System.Net.WebClient
+            $webclient.DownloadFile($downloadUrl, $downloadPath)
+            $downloaded = $true
+        }
+        catch [System.Net.WebException]
+        {
+            Write-Host
+            Write-Warning "Failed to fetch updated file from $downloadUrl : $($error[0])"
+            if (!(Test-Path $downloadDest))
+            {
+                if ($retries -gt 0)
+                {
+                    Write-Host "$retries retries left, trying download again"
+                    $retries--
+                    start-sleep -Seconds 10
+                }
+                else
+                {
+                    throw "$downloadName was not found at $downloadDest"
+                }
+            }
+            else
+            {
+                Write-Warning "$downloadName may be out of date"
+            }
+        }
+    }
+
+    Unblock-File $downloadPath
+
+    $downloadDestTemp = $downloadPath;
+
+    # Delete and rename to final dest
+    Write-Host "testing $downloadDest"
+    if (Test-Path $downloadDest)
+    {
+        Write-Host "Deleting: $downloadDest"
+        Remove-Item $downloadDest -Force
+    }
+
+    Move-Item -Force $downloadDestTemp $downloadDest
+    Write-Host "Done"
+
+    return $downloadDest
+}
+
+function Get-ISODriveLetter
+{
+    param ([string] $isoPath)
+
+    $diskImage = Get-DiskImage -ImagePath $isoPath
+    if ($diskImage)
+    {
+        $volume = Get-Volume -DiskImage $diskImage
+
+        if ($volume)
+        {
+            $driveLetter = $volume.DriveLetter
+            if ($driveLetter)
+            {
+                $driveLetter += ":"
+                return $driveLetter
+            }
+        }
+    }
+
+    return $null
+}
+
+function Mount-ISO
+{
+    param ([string] $isoPath)
+
+    # Check if image is already mounted
+    $isoDrive = Get-ISODriveLetter $isoPath
+
+    if (!$isoDrive)
+    {
+        Mount-DiskImage -ImagePath $isoPath -StorageType ISO | Out-Null
+    }
+
+    $isoDrive = Get-ISODriveLetter $isoPath
+    Write-Verbose "$isoPath mounted to ${isoDrive}:"
+}
+
+function Dismount-ISO
+{
+    param ([string] $isoPath)
+
+    $isoDrive = (Get-DiskImage -ImagePath $isoPath | Get-Volume).DriveLetter
+
+    if ($isoDrive)
+    {
+        Write-Verbose "$isoPath dismounted"
+        Dismount-DiskImage -ImagePath $isoPath | Out-Null
+    }
+}
+
+function Disable-StrongName
+{
+    param ([string] $publicKeyToken = "*")
+
+    reg ADD "HKLM\SOFTWARE\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
+    if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64")
+    {
+        reg ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
+    }
+}
+
+function Test-Admin
+{
+    $identity = [Security.Principal.WindowsIdentity]::GetCurrent()
+    $principal = New-Object Security.Principal.WindowsPrincipal $identity
+    $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+}
+
+function Test-RegistryPathAndValue
+{
+    param (
+        [parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $path,
+        [parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $value)
+
+    try
+    {
+        if (Test-Path $path)
+        {
+            Get-ItemProperty -Path $path | Select-Object -ExpandProperty $value -ErrorAction Stop | Out-Null
+            return $true
+        }
+    }
+    catch
+    {
+    }
+
+    return $false
+}
+
+function Test-InstallWindowsSDK
+{
+    $retval = $true
+
+    if (Test-RegistryPathAndValue -Path $WindowsSDKRegPath -Value $WindowsSDKRegRootKey)
+    {
+        # A Windows SDK is installed
+        # Is an SDK of our version installed with the options we need?
+        $allRequiredSdkOptionsInstalled = $true
+        foreach($sdkOption in $WindowsSDKOptions)
+        {
+            if (!(Test-RegistryPathAndValue -Path $WindowsSDKInstalledRegPath -Value $sdkOption))
+            {
+                $allRequiredSdkOptionsInstalled = $false
+            }
+        }
+
+        if($allRequiredSdkOptionsInstalled)
+        {
+            # It appears we have what we need. Double check the disk
+            $sdkRoot = Get-ItemProperty -Path $WindowsSDKRegPath | Select-Object -ExpandProperty $WindowsSDKRegRootKey
+            if ($sdkRoot)
+            {
+                if (Test-Path $sdkRoot)
+                {
+                    $refPath = Join-Path $sdkRoot "References\$WindowsSDKVersion"
+                    if (Test-Path $refPath)
+                    {
+                        $umdPath = Join-Path $sdkRoot "UnionMetadata\$WindowsSDKVersion"
+                        if (Test-Path $umdPath)
+                        {
+                            # Pretty sure we have what we need
+                            $retval = $false
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return $retval
+}
+
+function Test-InstallStrongNameHijack
+{
+    foreach($publicKeyToken in $PublicKeyTokens)
+    {
+        $key = "$StrongNameRegPath\*,$publicKeyToken"
+        if (!(Test-Path $key))
+        {
+            return $true
+        }
+    }
+
+    return $false
+}
+
+Write-Host -NoNewline "Checking for installed Windows SDK $WindowsSDKVersion..."
+$InstallWindowsSDK = Test-InstallWindowsSDK
+if ($InstallWindowsSDK)
+{
+    Write-Host "Installation required"
+}
+else
+{
+    Write-Host "INSTALLED"
+}
+
+$StrongNameHijack = Test-InstallStrongNameHijack
+Write-Host -NoNewline "Checking if StrongName bypass required..."
+
+if ($StrongNameHijack)
+{
+    Write-Host "REQUIRED"
+}
+else
+{
+    Write-Host "Done"
+}
+
+if ($StrongNameHijack -or $InstallWindowsSDK)
+{
+    if (!(Test-Admin))
+    {
+        Write-Host
+        throw "ERROR: Elevation required"
+    }
+}
+
+if ($InstallWindowsSDK)
+{
+    # Static(ish) link for Windows SDK
+    # Note: there is a delay from Windows SDK announcements to availability via the static link
+    $uri = "https://software-download.microsoft.com/download/sg/Windows_InsiderPreview_SDK_en-us_$($buildNumber)_1.iso";
+
+    if ($env:TEMP -eq $null)
+    {
+        $env:TEMP = Join-Path $env:SystemDrive 'temp'
+    }
+
+    $winsdkTempDir = Join-Path (Join-Path $env:TEMP ([System.IO.Path]::GetRandomFileName())) "WindowsSDK"
+
+    if (![System.IO.Directory]::Exists($winsdkTempDir))
+    {
+        [void][System.IO.Directory]::CreateDirectory($winsdkTempDir)
+    }
+
+    $file = "winsdk_$buildNumber.iso"
+
+    Write-Verbose "Getting WinSDK from $uri"
+    $downloadFile = Download-File $winsdkTempDir $uri $file
+    Write-Verbose "File is at $downloadFile"
+    $downloadFileItem = Get-Item $downloadFile
+    
+    # Check to make sure the file is at least 10 MB.
+    if ($downloadFileItem.Length -lt 10*1024*1024)
+    {
+        Write-Host
+        Write-Host "ERROR: Downloaded file doesn't look large enough to be an ISO. The requested version may not be on microsoft.com yet."
+        Write-Host
+        Exit 1
+    }
+
+    # TODO Check if zip, exe, iso, etc.
+    try
+    {
+        Write-Host -NoNewline "Mounting ISO $file..."
+        Mount-ISO $downloadFile
+        Write-Host "Done"
+
+        $isoDrive = Get-ISODriveLetter $downloadFile
+
+        if (Test-Path $isoDrive)
+        {
+            Write-Host -NoNewLine "Installing WinSDK..."
+
+            $setupPath = Join-Path "$isoDrive" "WinSDKSetup.exe"
+            Start-Process -Wait $setupPath "/features $WindowsSDKOptions /q"
+            Write-Host "Done"
+        }
+        else
+        {
+            throw "Could not find mounted ISO at ${isoDrive}"
+        }
+    }
+    finally
+    {
+        Write-Host -NoNewline "Dismounting ISO $file..."
+        Dismount-ISO $downloadFile
+        Write-Host "Done"
+    }
+}
+
+if ($StrongNameHijack)
+{
+    Write-Host -NoNewline "Disabling StrongName for Windows SDK..."
+
+    foreach($key in $PublicKeyTokens)
+    {
+        Disable-StrongName $key
+    }
+
+    Write-Host "Done"
+}
--- a/common.openconsole.props
+++ b/common.openconsole.props
@@ -18,14 +18,14 @@

    This version should be tracked in all project packages.config files for projects that depend on Xaml.
    -->
-    <TerminalMUXVersion>2.7.3-prerelease.220816001</TerminalMUXVersion>
+    <TerminalMUXVersion>2.7.0-prerelease.210913003</TerminalMUXVersion>
    <!--
    For the Windows 11-specific build, we're targeting the public version of Microsoft.UI.Xaml.
    This version emits a package dependency instead of embedding the dependency in our own package.

    This version should be tracked in build/packages.config.
    -->
-    <TerminalMUXVersion Condition="'$(TerminalTargetWindowsVersion)'=='Win11'">2.7.3</TerminalMUXVersion>
+    <TerminalMUXVersion Condition="'$(TerminalTargetWindowsVersion)'=='Win11'">2.7.0</TerminalMUXVersion>
  </PropertyGroup>

 </Project>
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -11,7 +11,6 @@
    "/packages/",
    "/ipch/",
    "/dep/",
-    "/doc/",
    "/.vs/",
    "/build/",
    "/src/cascadia/",
@@ -25,10 +24,6 @@
    "/doc/cascadia/",
    "/doc/user-docs/",
    "/src/tools/MonarchPeasantSample/",
-    "/src/tools/MonarchPeasantPackage/",
-    "/src/api-ms-win-core-synch-l1-2-0/",
-    "/src/tools/ansi-color/",
-    "/src/tools/ColorTool/",
    "/scratch/",
    "Scratch.sln",
  ],
--- a/custom.props
+++ b/custom.props
@@ -17,7 +17,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2022</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>15</VersionMinor>
+    <VersionMinor>14</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/dep/CLI11/cgmanifest.json
+++ b/dep/CLI11/cgmanifest.json
@@ -1,15 +1,13 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
+{"Registrations":[
    {
      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/CLIUtils/CLI11",
-          "commitHash": "5cb3efabce007c3a0230e4cc2e27da491c646b6c"
-        }
-      }
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/CLIUtils/CLI11",
+         "commitHash": "dd0d8e4fe729e5b1110232c7a5c9566dad884686"
+         }
+       }
    }
-  ],
-  "Version": 1
+ ],
+ "Version": 1
 }
--- a/dep/Console/ConIoSrv.h
+++ b/dep/Console/ConIoSrv.h
@@ -1,76 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
--*/
-
-#pragma once
-
-#include <ntlpcapi.h>
-
-#define CIS_ALPC_PORT_NAME           L""
-
-#define CIS_EVENT_TYPE_INPUT         (0)
-#define CIS_EVENT_TYPE_FOCUS         (1)
-#define CIS_EVENT_TYPE_FOCUS_ACK     (2)
-
-#define CIS_MSG_TYPE_GETDISPLAYSIZE  (3)
-#define CIS_MSG_TYPE_GETFONTSIZE     (4)
-#define CIS_MSG_TYPE_SETCURSOR       (5)
-#define CIS_MSG_TYPE_UPDATEDISPLAY   (6)
-
-#define CIS_MSG_ATTR_FLAGS           (0)
-
-#define CIS_MSG_ATTR_BUFFER_SIZE     (1024)
-
-#define CIS_DISPLAY_MODE_NONE        (0)
-#define CIS_DISPLAY_MODE_BGFX        (1)
-#define CIS_DISPLAY_MODE_DIRECTX     (2)
-
-typedef struct {
-    PORT_MESSAGE AlpcHeader;
-    UCHAR Type;
-
-    union {
-        struct {
-            CD_IO_DISPLAY_SIZE DisplaySize;
-
-            NTSTATUS ReturnValue;
-        } GetDisplaySizeParams;
-
-        struct {
-            CD_IO_FONT_SIZE FontSize;
-
-            NTSTATUS ReturnValue;
-        } GetFontSizeParams;
-
-        struct {
-            CD_IO_CURSOR_INFORMATION CursorInformation;
-
-            NTSTATUS ReturnValue;
-        } SetCursorParams;
-
-        struct {
-            SHORT RowIndex;
-
-            NTSTATUS ReturnValue;
-        } UpdateDisplayParams;
-
-        struct {
-            USHORT DisplayMode;
-        } GetDisplayModeParams;
-    };
-} CIS_MSG, *PCIS_MSG;
-
-typedef struct {
-    UCHAR Type;
-
-    union {
-        struct {
-            INPUT_RECORD Record;
-        } InputEvent;
-
-        struct {
-            BOOLEAN IsActive;
-        } FocusEvent;
-    };
-} CIS_EVENT, *PCIS_EVENT;
--- a/dep/Console/condrv.h
+++ b/dep/Console/condrv.h
@@ -158,8 +158,8 @@ typedef struct _CD_IO_DISPLAY_SIZE {
 } CD_IO_DISPLAY_SIZE, *PCD_IO_DISPLAY_SIZE;

 typedef struct _CD_IO_CHARACTER {
-    WCHAR Character;
-    USHORT Attribute;
+    WCHAR Character; 
+    USHORT Atribute;
 } CD_IO_CHARACTER, *PCD_IO_CHARACTER;

 typedef struct _CD_IO_ROW_INFORMATION {
@@ -175,11 +175,6 @@ typedef struct _CD_IO_CURSOR_INFORMATION {
    BOOLEAN IsVisible;
 } CD_IO_CURSOR_INFORMATION, *PCD_IO_CURSOR_INFORMATION;

-typedef struct _CD_IO_FONT_SIZE {
-    ULONG Width;
-    ULONG Height;
-} CD_IO_FONT_SIZE, *PCD_IO_FONT_SIZE;
-
 #define IOCTL_CONDRV_READ_IO \
    CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)

@@ -218,6 +213,3 @@ typedef struct _CD_IO_FONT_SIZE {

 #define IOCTL_CONDRV_LAUNCH_SERVER \
    CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_CONDRV_GET_FONT_SIZE \
-    CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_NEITHER, FILE_ANY_ACCESS)
--- a/dep/Console/csrmsg.h
+++ b/dep/Console/csrmsg.h
@@ -1,24 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
--*/
-
-#pragma once
-
-#include <ntcsrmsg.h>
-
-typedef enum _USER_API_NUMBER {
-    UserpEndTask,
-} USER_API_NUMBER, *PUSER_API_NUMBER;
-
-typedef struct _ENDTASKMSG {
-    HANDLE ProcessId;
-    ULONG ConsoleEventCode;
-    ULONG ConsoleFlags;
-} ENDTASKMSG, *PENDTASKMSG;
-
-typedef struct _USER_API_MSG {
-    union {
-        ENDTASKMSG EndTask;
-    } u;
-} USER_API_MSG, *PUSER_API_MSG;
--- a/dep/Console/ntcsrdll.h
+++ b/dep/Console/ntcsrdll.h
@@ -1,15 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
--*/
-
-#pragma once
-
-#include <ntcsrmsg.h>
-
-NTSTATUS CsrClientCallServer(
-    PCSR_API_MSG m,
-    PCSR_CAPTURE_HEADER CaptureBuffer OPTIONAL,
-    ULONG ApiNumber,
-    ULONG ArgLength
-);
--- a/dep/Console/ntcsrmsg.h
+++ b/dep/Console/ntcsrmsg.h
@@ -1,16 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
--*/
-
-#pragma once
-
-#include <ntlpcapi.h>
-
-typedef struct _CSR_CAPTURE_HEADER {
-} CSR_CAPTURE_HEADER, *PCSR_CAPTURE_HEADER;
-
-typedef struct _CSR_API_MSG {
-} CSR_API_MSG, *PCSR_API_MSG;
-
-#define CSR_MAKE_API_NUMBER(DllIndex, ApiIndex) 0
--- a/dep/Console/ntlpcapi.h
+++ b/dep/Console/ntlpcapi.h
@@ -1,126 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
--*/
-
-#pragma once
-
-#define OB_FILE_OBJECT_TYPE 1
-
-typedef struct _PORT_MESSAGE {
-    union {
-        struct {
-            SHORT DataLength;
-            SHORT TotalLength;
-        } s1;
-    } u1;
-    union {
-        ULONG ZeroInit;
-    } u2;
-    union {
-        CLIENT_ID ClientId;
-    };
-    ULONG MessageId;
-} PORT_MESSAGE, *PPORT_MESSAGE;
-
-#define ALPC_MSGFLG_SYNC_REQUEST            0
-#define ALPC_PORFLG_ACCEPT_DUP_HANDLES      1
-#define ALPC_PORFLG_ACCEPT_INDIRECT_HANDLES 2
-
-typedef struct _ALPC_DATA_VIEW_ATTR {
-    PVOID  ViewBase;
-    SIZE_T ViewSize;
-} ALPC_DATA_VIEW_ATTR, *PALPC_DATA_VIEW_ATTR;
-
-typedef struct _ALPC_CONTEXT_ATTR {
-} ALPC_CONTEXT_ATTR, *PALPC_CONTEXT_ATTR;
-
-#define ALPC_INDIRECT_HANDLE_MAX 512
-
-typedef struct _ALPC_HANDLE_ATTR {
-    union {
-        ULONG HandleCount;
-    };
-} ALPC_HANDLE_ATTR, *PALPC_HANDLE_ATTR;
-
-#define ALPC_FLG_MSG_DATAVIEW_ATTR 1
-#define ALPC_FLG_MSG_HANDLE_ATTR   2
-
-typedef struct _ALPC_MESSAGE_ATTRIBUTES {
-} ALPC_MESSAGE_ATTRIBUTES, *PALPC_MESSAGE_ATTRIBUTES;
-
-typedef struct _ALPC_PORT_ATTRIBUTES {
-    ULONG Flags;
-    SECURITY_QUALITY_OF_SERVICE SecurityQos;
-    SIZE_T MaxMessageLength;
-    SIZE_T MemoryBandwidth;
-    SIZE_T MaxPoolUsage;
-    SIZE_T MaxSectionSize;
-    SIZE_T MaxViewSize;
-    SIZE_T MaxTotalSectionSize;
-    ULONG DupObjectTypes;
-#ifdef _WIN64
-    ULONG Reserved;
-#endif
-} ALPC_PORT_ATTRIBUTES, *PALPC_PORT_ATTRIBUTES;
-
-typedef enum _ALPC_MESSAGE_INFORMATION_CLASS {
-    AlpcMessageHandleInformation
-} ALPC_MESSAGE_INFORMATION_CLASS;
-
-typedef struct _ALPC_MESSAGE_HANDLE_INFORMATION {
-    ULONG Index;
-    ULONG Handle;
-} ALPC_MESSAGE_HANDLE_INFORMATION, *PALPC_MESSAGE_HANDLE_INFORMATION;
-
-NTSTATUS AlpcInitializeMessageAttribute(
-    ULONG AttributeFlags,
-    PALPC_MESSAGE_ATTRIBUTES Buffer,
-    SIZE_T BufferSize,
-    PSIZE_T RequiredBufferSize
-);
-
-PVOID AlpcGetMessageAttribute(
-    PALPC_MESSAGE_ATTRIBUTES Buffer,
-    ULONG AttributeFlag
-);
-
-#define ALPC_GET_DATAVIEW_ATTRIBUTES(MsgAttr) \
-    ((PALPC_DATA_VIEW_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_DATAVIEW_ATTR))
-
-#define ALPC_GET_HANDLE_ATTRIBUTES(MsgAttr) \
-    ((PALPC_HANDLE_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_HANDLE_ATTR))
-
-NTSTATUS NtAlpcConnectPort(
-    PHANDLE PortHandle,
-    PUNICODE_STRING PortName,
-    POBJECT_ATTRIBUTES ObjectAttributes,
-    PALPC_PORT_ATTRIBUTES PortAttributes,
-    ULONG Flags,
-    PSID RequiredServerSid,
-    PPORT_MESSAGE ConnectionMessage,
-    PSIZE_T BufferLength,
-    PALPC_MESSAGE_ATTRIBUTES OutMessageAttributes,
-    PALPC_MESSAGE_ATTRIBUTES InMessageAttributes,
-    PLARGE_INTEGER Timeout
-);
-
-NTSTATUS NtAlpcSendWaitReceivePort(
-    HANDLE PortHandle,
-    ULONG Flags,
-    PPORT_MESSAGE SendMessage,
-    PALPC_MESSAGE_ATTRIBUTES SendMessageAttributes,
-    PPORT_MESSAGE ReceiveMessage,
-    PSIZE_T BufferLength,
-    PALPC_MESSAGE_ATTRIBUTES ReceiveMessageAttributes,
-    PLARGE_INTEGER Timeout
-);
-
-NTSTATUS NtAlpcQueryInformationMessage(
-    HANDLE PortHandle,
-    PPORT_MESSAGE PortMessage,
-    ALPC_MESSAGE_INFORMATION_CLASS MessageInformationClass,
-    PVOID MessageInformation,
-    ULONG Length,
-    PULONG ReturnLength
-);
--- a/dep/jsoncpp/README.md
+++ b/dep/jsoncpp/README.md
@@ -2,8 +2,8 @@

 [Amalgamated](https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated)
 from source commit
-[5defb4e](https://github.com/open-source-parsers/jsoncpp/commit/5defb4ed1a4293b8e2bf641e16b156fb9de498cc),
-release 1.9.5.
+[6aba23f](https://github.com/open-source-parsers/jsoncpp/commit/6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2),
+release 1.9.3.

 > Generating amalgamated source and header JsonCpp is provided with a script to
 > generate a single header and a single source file to ease inclusion into an
--- a/dep/jsoncpp/cgmanifest.json
+++ b/dep/jsoncpp/cgmanifest.json
@@ -1,15 +1,13 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
+{"Registrations":[
    {
      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/open-source-parsers/jsoncpp",
-          "commitHash": "5defb4ed1a4293b8e2bf641e16b156fb9de498cc"
-        }
-      }
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/open-source-parsers/jsoncpp",
+         "commitHash": "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
+         }
+       }
    }
-  ],
-  "Version": 1
+ ],
+ "Version": 1
 }
--- a/dep/jsoncpp/json/json-forwards.h
+++ b/dep/jsoncpp/json/json-forwards.h
@@ -7,28 +7,28 @@
 // //////////////////////////////////////////////////////////////////////

 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...

-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.

 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).

-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
+In jurisdictions which recognize Public Domain property, the user of this 
+software may choose to accept it either as 1) Public Domain, 2) under the 
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.

 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:

   http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:

 ========================================================================
@@ -94,10 +94,10 @@ license you like.
 // 3. /CMakeLists.txt
 // IMPORTANT: also update the SOVERSION!!

-#define JSONCPP_VERSION_STRING "1.9.5"
+#define JSONCPP_VERSION_STRING "1.9.3"
 #define JSONCPP_VERSION_MAJOR 1
 #define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 5
+#define JSONCPP_VERSION_PATCH 3
 #define JSONCPP_VERSION_QUALIFIER
 #define JSONCPP_VERSION_HEXA                                                   \
  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
@@ -162,10 +162,11 @@ public:
   * Release memory which was allocated for N items at pointer P.
   *
   * The memory block is filled with zeroes before being released.
+   * The pointer argument is tagged as "volatile" to prevent the
+   * compiler optimizing out this critical step.
   */
-  void deallocate(pointer p, size_type n) {
-    // memset_s is used because memset may be optimized away by the compiler
-    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
+  void deallocate(volatile pointer p, size_type n) {
+    std::memset(p, 0, n * sizeof(T));
    // free using "global operator delete"
    ::operator delete(p);
  }
--- a/dep/jsoncpp/json/json.h
+++ b/dep/jsoncpp/json/json.h
@@ -6,28 +6,28 @@
 // //////////////////////////////////////////////////////////////////////

 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...

-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.

 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).

-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
+In jurisdictions which recognize Public Domain property, the user of this 
+software may choose to accept it either as 1) Public Domain, 2) under the 
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.

 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:

   http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:

 ========================================================================
@@ -93,10 +93,10 @@ license you like.
 // 3. /CMakeLists.txt
 // IMPORTANT: also update the SOVERSION!!

-#define JSONCPP_VERSION_STRING "1.9.5"
+#define JSONCPP_VERSION_STRING "1.9.3"
 #define JSONCPP_VERSION_MAJOR 1
 #define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 5
+#define JSONCPP_VERSION_PATCH 3
 #define JSONCPP_VERSION_QUALIFIER
 #define JSONCPP_VERSION_HEXA                                                   \
  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
@@ -161,10 +161,11 @@ public:
   * Release memory which was allocated for N items at pointer P.
   *
   * The memory block is filled with zeroes before being released.
+   * The pointer argument is tagged as "volatile" to prevent the
+   * compiler optimizing out this critical step.
   */
-  void deallocate(pointer p, size_type n) {
-    // memset_s is used because memset may be optimized away by the compiler
-    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
+  void deallocate(volatile pointer p, size_type n) {
+    std::memset(p, 0, n * sizeof(T));
    // free using "global operator delete"
    ::operator delete(p);
  }
@@ -574,7 +575,7 @@ public:
 // be used by...
 #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 #pragma warning(push)
-#pragma warning(disable : 4251 4275)
+#pragma warning(disable : 4251)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)

 #pragma pack(push, 8)
@@ -787,10 +788,10 @@ private:
    CZString(ArrayIndex index);
    CZString(char const* str, unsigned length, DuplicationPolicy allocate);
    CZString(CZString const& other);
-    CZString(CZString&& other) noexcept;
+    CZString(CZString&& other);
    ~CZString();
    CZString& operator=(const CZString& other);
-    CZString& operator=(CZString&& other) noexcept;
+    CZString& operator=(CZString&& other);

    bool operator<(CZString const& other) const;
    bool operator==(CZString const& other) const;
@@ -866,15 +867,14 @@ public:
  Value(const StaticString& value);
  Value(const String& value);
  Value(bool value);
-  Value(std::nullptr_t ptr) = delete;
  Value(const Value& other);
-  Value(Value&& other) noexcept;
+  Value(Value&& other);
  ~Value();

  /// \note Overwrite existing comments. To preserve comments, use
  /// #swapPayload().
  Value& operator=(const Value& other);
-  Value& operator=(Value&& other) noexcept;
+  Value& operator=(Value&& other);

  /// Swap everything.
  void swap(Value& other);
@@ -1159,9 +1159,9 @@ private:
  public:
    Comments() = default;
    Comments(const Comments& that);
-    Comments(Comments&& that) noexcept;
+    Comments(Comments&& that);
    Comments& operator=(const Comments& that);
-    Comments& operator=(Comments&& that) noexcept;
+    Comments& operator=(Comments&& that);
    bool has(CommentPlacement slot) const;
    String get(CommentPlacement slot) const;
    void set(CommentPlacement slot, String comment);
@@ -1442,8 +1442,8 @@ public:
   *  because the returned references/pointers can be used
   *  to change state of the base class.
   */
-  reference operator*() const { return const_cast<reference>(deref()); }
-  pointer operator->() const { return const_cast<pointer>(&deref()); }
+  reference operator*() { return deref(); }
+  pointer operator->() { return &deref(); }
 };

 inline void swap(Value& a, Value& b) { a.swap(b); }
@@ -1506,7 +1506,8 @@ namespace Json {
 * \deprecated Use CharReader and CharReaderBuilder.
 */

-class JSON_API Reader {
+class JSONCPP_DEPRECATED(
+    "Use CharReader and CharReaderBuilder instead.") JSON_API Reader {
 public:
  using Char = char;
  using Location = const Char*;
@@ -1523,13 +1524,13 @@ public:
  };

  /** \brief Constructs a Reader allowing all features for parsing.
-    * \deprecated Use CharReader and CharReaderBuilder.
   */
+  JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead")
  Reader();

  /** \brief Constructs a Reader allowing the specified feature set for parsing.
-    * \deprecated Use CharReader and CharReaderBuilder.
   */
+  JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead")
  Reader(const Features& features);

  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
@@ -1796,9 +1797,6 @@ public:
   * - `"allowSpecialFloats": false or true`
   *   - If true, special float values (NaNs and infinities) are allowed and
   *     their values are lossfree restorable.
-   * - `"skipBom": false or true`
-   *   - If true, if the input starts with the Unicode byte order mark (BOM),
-   *     it is skipped.
   *
   * You can examine 'settings_` yourself to see the defaults. You can also
   * write and read them just like any JSON Value.
@@ -2002,8 +2000,6 @@ public:
   *  - Number of precision digits for formatting of real values.
   *  - "precisionType": "significant"(default) or "decimal"
   *  - Type of precision for formatting of real values.
-   *  - "emitUTF8": false or true
-   *  - If true, outputs raw UTF8 strings instead of escaping them.

   *  You can examine 'settings_` yourself
   *  to see the defaults. You can also write and read them just like any
@@ -2039,7 +2035,7 @@ public:
 /** \brief Abstract class for writers.
 * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
 */
-class JSON_API Writer {
+class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer {
 public:
  virtual ~Writer();

@@ -2059,7 +2055,7 @@ public:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSON_API FastWriter
+class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
    : public Writer {
 public:
  FastWriter();
@@ -2119,7 +2115,7 @@ private:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSON_API
+class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API
    StyledWriter : public Writer {
 public:
  StyledWriter();
@@ -2188,7 +2184,7 @@ private:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSON_API
+class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API
    StyledStreamWriter {
 public:
  /**
--- a/dep/jsoncpp/jsoncpp.cpp
+++ b/dep/jsoncpp/jsoncpp.cpp
@@ -6,28 +6,28 @@
 // //////////////////////////////////////////////////////////////////////

 /*
-The JsonCpp library's source code, including accompanying documentation,
+The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...

-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
+jurisdictions which recognize such a disclaimer. In such jurisdictions, 
 this software is released into the Public Domain.

 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).

-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
+In jurisdictions which recognize Public Domain property, the user of this 
+software may choose to accept it either as 1) Public Domain, 2) under the 
+conditions of the MIT License (see below), or 3) under the terms of dual 
 Public Domain/MIT License conditions described here, as they choose.

 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:

   http://en.wikipedia.org/wiki/MIT_License
-
+   
 The full text of the MIT License follows:

 ========================================================================
@@ -202,18 +202,14 @@ template <typename Iter> void fixNumericLocaleInput(Iter begin, Iter end) {
 * Return iterator that would be the new end of the range [begin,end), if we
 * were to delete zeros in the end of string, but not the last zero before '.'.
 */
-template <typename Iter>
-Iter fixZerosInTheEnd(Iter begin, Iter end, unsigned int precision) {
+template <typename Iter> Iter fixZerosInTheEnd(Iter begin, Iter end) {
  for (; begin != end; --end) {
    if (*(end - 1) != '0') {
      return end;
    }
    // Don't delete the last zero before the decimal point.
-    if (begin != (end - 1) && begin != (end - 2) && *(end - 2) == '.') {
-      if (precision) {
-        return end;
-      }
-      return end - 2;
+    if (begin != (end - 1) && *(end - 2) == '.') {
+      return end;
    }
  }
  return end;
@@ -342,7 +338,8 @@ bool Reader::parse(std::istream& is, Value& root, bool collectComments) {

  // Since String is reference-counted, this at least does not
  // create an extra copy.
-  String doc(std::istreambuf_iterator<char>(is), {});
+  String doc;
+  std::getline(is, doc, static_cast<char> EOF);
  return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
 }

@@ -1412,11 +1409,8 @@ bool OurReader::readToken(Token& token) {
    if (features_.allowSingleQuotes_) {
      token.type_ = tokenString;
      ok = readStringSingleQuote();
-    } else {
-      // If we don't allow single quotes, this is a failure case.
-      ok = false;
-    }
-    break;
+      break;
+    } // else fall through
  case '/':
    token.type_ = tokenComment;
    ok = readComment();
@@ -2158,7 +2152,7 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const {
    if (valid_keys.count(key))
      continue;
    if (invalid)
-      (*invalid)[key] = *si;
+      (*invalid)[std::move(key)] = *si;
    else
      return false;
  }
@@ -2673,7 +2667,7 @@ Value::CZString::CZString(const CZString& other) {
  storage_.length_ = other.storage_.length_;
 }

-Value::CZString::CZString(CZString&& other) noexcept
+Value::CZString::CZString(CZString&& other)
    : cstr_(other.cstr_), index_(other.index_) {
  other.cstr_ = nullptr;
 }
@@ -2699,7 +2693,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) {
  return *this;
 }

-Value::CZString& Value::CZString::operator=(CZString&& other) noexcept {
+Value::CZString& Value::CZString::operator=(CZString&& other) {
  cstr_ = other.cstr_;
  index_ = other.index_;
  other.cstr_ = nullptr;
@@ -2847,7 +2841,7 @@ Value::Value(const Value& other) {
  dupMeta(other);
 }

-Value::Value(Value&& other) noexcept {
+Value::Value(Value&& other) {
  initBasic(nullValue);
  swap(other);
 }
@@ -2862,7 +2856,7 @@ Value& Value::operator=(const Value& other) {
  return *this;
 }

-Value& Value::operator=(Value&& other) noexcept {
+Value& Value::operator=(Value&& other) {
  other.swap(*this);
  return *this;
 }
@@ -3326,8 +3320,7 @@ void Value::resize(ArrayIndex newSize) {
  if (newSize == 0)
    clear();
  else if (newSize > oldSize)
-    for (ArrayIndex i = oldSize; i < newSize; ++i)
-      (*this)[i];
+    this->operator[](newSize - 1);
  else {
    for (ArrayIndex index = newSize; index < oldSize; ++index) {
      value_.map_->erase(index);
@@ -3788,15 +3781,14 @@ bool Value::isObject() const { return type() == objectValue; }
 Value::Comments::Comments(const Comments& that)
    : ptr_{cloneUnique(that.ptr_)} {}

-Value::Comments::Comments(Comments&& that) noexcept
-    : ptr_{std::move(that.ptr_)} {}
+Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {}

 Value::Comments& Value::Comments::operator=(const Comments& that) {
  ptr_ = cloneUnique(that.ptr_);
  return *this;
 }

-Value::Comments& Value::Comments::operator=(Comments&& that) noexcept {
+Value::Comments& Value::Comments::operator=(Comments&& that) {
  ptr_ = std::move(that.ptr_);
  return *this;
 }
@@ -3812,11 +3804,13 @@ String Value::Comments::get(CommentPlacement slot) const {
 }

 void Value::Comments::set(CommentPlacement slot, String comment) {
-  if (slot >= CommentPlacement::numberOfCommentPlacement)
-    return;
-  if (!ptr_)
+  if (!ptr_) {
    ptr_ = std::unique_ptr<Array>(new Array());
-  (*ptr_)[slot] = std::move(comment);
+  }
+  // check comments array boundry.
+  if (slot < CommentPlacement::numberOfCommentPlacement) {
+    (*ptr_)[slot] = std::move(comment);
+  }
 }

 void Value::setComment(String comment, CommentPlacement placement) {
@@ -4130,7 +4124,7 @@ Value& Path::make(Value& root) const {

 #if !defined(isnan)
 // IEEE standard states that NaN values will not compare to themselves
-#define isnan(x) ((x) != (x))
+#define isnan(x) (x != x)
 #endif

 #if !defined(__APPLE__)
@@ -4216,18 +4210,16 @@ String valueToString(double value, bool useSpecialFloats,

  buffer.erase(fixNumericLocale(buffer.begin(), buffer.end()), buffer.end());

+  // strip the zero padding from the right
+  if (precisionType == PrecisionType::decimalPlaces) {
+    buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end()), buffer.end());
+  }
+
  // try to ensure we preserve the fact that this was given to us as a double on
  // input
  if (buffer.find('.') == buffer.npos && buffer.find('e') == buffer.npos) {
    buffer += ".0";
  }
-
-  // strip the zero padding from the right
-  if (precisionType == PrecisionType::decimalPlaces) {
-    buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end(), precision),
-                 buffer.end());
-  }
-
  return buffer;
 }
 } // namespace
@@ -4239,11 +4231,11 @@ String valueToString(double value, unsigned int precision,

 String valueToString(bool value) { return value ? "true" : "false"; }

-static bool doesAnyCharRequireEscaping(char const* s, size_t n) {
+static bool isAnyCharRequiredQuoting(char const* s, size_t n) {
  assert(s || !n);

  return std::any_of(s, s + n, [](unsigned char c) {
-    return c == '\\' || c == '"' || c < 0x20 || c > 0x7F;
+    return c == '\\' || c == '"' || !std::isprint(c);
  });
 }

@@ -4334,12 +4326,12 @@ static void appendHex(String& result, unsigned ch) {
  result.append("\\u").append(toHex16Bit(ch));
 }

-static String valueToQuotedStringN(const char* value, size_t length,
+static String valueToQuotedStringN(const char* value, unsigned length,
                                   bool emitUTF8 = false) {
  if (value == nullptr)
    return "";

-  if (!doesAnyCharRequireEscaping(value, length))
+  if (!isAnyCharRequiredQuoting(value, length))
    return String("\"") + value + "\"";
  // We have to walk value and escape any special characters.
  // Appending to String is not efficient, but this should be rare.
@@ -4412,7 +4404,7 @@ static String valueToQuotedStringN(const char* value, size_t length,
 }

 String valueToQuotedString(const char* value) {
-  return valueToQuotedStringN(value, strlen(value));
+  return valueToQuotedStringN(value, static_cast<unsigned int>(strlen(value)));
 }

 // Class Writer
@@ -4461,7 +4453,7 @@ void FastWriter::writeValue(const Value& value) {
    char const* end;
    bool ok = value.getString(&str, &end);
    if (ok)
-      document_ += valueToQuotedStringN(str, static_cast<size_t>(end - str));
+      document_ += valueToQuotedStringN(str, static_cast<unsigned>(end - str));
    break;
  }
  case booleanValue:
@@ -4484,7 +4476,8 @@ void FastWriter::writeValue(const Value& value) {
      const String& name = *it;
      if (it != members.begin())
        document_ += ',';
-      document_ += valueToQuotedStringN(name.data(), name.length());
+      document_ += valueToQuotedStringN(name.data(),
+                                        static_cast<unsigned>(name.length()));
      document_ += yamlCompatibilityEnabled_ ? ": " : ":";
      writeValue(value[name]);
    }
@@ -4529,7 +4522,7 @@ void StyledWriter::writeValue(const Value& value) {
    char const* end;
    bool ok = value.getString(&str, &end);
    if (ok)
-      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
+      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str)));
    else
      pushValue("");
    break;
@@ -4570,7 +4563,7 @@ void StyledWriter::writeValue(const Value& value) {
 }

 void StyledWriter::writeArrayValue(const Value& value) {
-  size_t size = value.size();
+  unsigned size = value.size();
  if (size == 0)
    pushValue("[]");
  else {
@@ -4579,7 +4572,7 @@ void StyledWriter::writeArrayValue(const Value& value) {
      writeWithIndent("[");
      indent();
      bool hasChildValue = !childValues_.empty();
-      ArrayIndex index = 0;
+      unsigned index = 0;
      for (;;) {
        const Value& childValue = value[index];
        writeCommentBeforeValue(childValue);
@@ -4602,7 +4595,7 @@ void StyledWriter::writeArrayValue(const Value& value) {
    {
      assert(childValues_.size() == size);
      document_ += "[ ";
-      for (size_t index = 0; index < size; ++index) {
+      for (unsigned index = 0; index < size; ++index) {
        if (index > 0)
          document_ += ", ";
        document_ += childValues_[index];
@@ -4747,7 +4740,7 @@ void StyledStreamWriter::writeValue(const Value& value) {
    char const* end;
    bool ok = value.getString(&str, &end);
    if (ok)
-      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
+      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str)));
    else
      pushValue("");
    break;
@@ -5021,8 +5014,8 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
    char const* end;
    bool ok = value.getString(&str, &end);
    if (ok)
-      pushValue(
-          valueToQuotedStringN(str, static_cast<size_t>(end - str), emitUTF8_));
+      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str),
+                                     emitUTF8_));
    else
      pushValue("");
    break;
@@ -5045,8 +5038,8 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
        String const& name = *it;
        Value const& childValue = value[name];
        writeCommentBeforeValue(childValue);
-        writeWithIndent(
-            valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
+        writeWithIndent(valueToQuotedStringN(
+            name.data(), static_cast<unsigned>(name.length()), emitUTF8_));
        *sout_ << colonSymbol_;
        writeValue(childValue);
        if (++it == members.end()) {
@@ -5280,7 +5273,7 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const {
    if (valid_keys.count(key))
      continue;
    if (invalid)
-      (*invalid)[key] = *si;
+      (*invalid)[std::move(key)] = *si;
    else
      return false;
  }
--- a/dep/nuget/packages.config
+++ b/dep/nuget/packages.config
@@ -10,13 +10,13 @@
  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
  <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.6.220404001" targetFramework="native" />
  <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.UI.Xaml" version="2.7.3-prerelease.220816001" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" developmentDependency="true" />

  <!-- Managed packages -->
  <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />
  <package id="Castle.Core" version="4.1.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
  <package id="Selenium.Support" version="3.5.0" targetFramework="net45" />
  <package id="Selenium.WebDriver" version="3.5.0" targetFramework="net45" />
 </packages>
--- a/doc/building.md
+++ b/doc/building.md
@@ -110,7 +110,7 @@ This takes quite some time, and only generates an `msix`. It does not install th

 ```powershell
 # If you haven't already:
-Import-Module .\tools\OpenConsole.psm1;
+Import-Module tools\OpenConsole.psm1;
 Set-MsBuildDevEnvironment;

 # The Set-MsBuildDevEnvironment call is needed for finding the path to
@@ -121,7 +121,7 @@ if ((Get-AppxPackage -Name 'WindowsTerminalDev*') -ne $null) {
 Remove-AppxPackage 'WindowsTerminalDev_0.0.1.0_x64__8wekyb3d8bbwe'
 };
 New-Item ..\loose -Type Directory -Force;
-makeappx unpack /v /o /p .\CascadiaPackage_0.0.1.0_x64_Debug.msix /d ..\loose\;
+makeappx unpack /v /o /p .\CascadiaPackage_0.0.1.0_x64_Debug.msix /d ..\Loose\;
 Add-AppxPackage -Path ..\loose\AppxManifest.xml -Register -ForceUpdateFromAnyVersion -ForceApplicationShutdown
 ```

--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -54,24 +54,6 @@
        }
      ]
    },
-    "BellSound": {
-      "default": "",
-      "description": "Sets the file location of the sound played when the application emits a BEL character. If the path is invalid no sound will be played. This property also accepts an array of sounds and the terminal will pick one at random.",
-      "oneOf": [
-      {
-        "type": [
-          "string",
-          "null"
-        ]
-      },
-      {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
-      }
-      ]
-    }, 
    "AppearanceConfig": {
      "properties": {
        "colorScheme": {
@@ -197,7 +179,7 @@
        },
        "intenseTextStyle": {
          "default": "bright",
-          "description": "Controls how 'intense' text is rendered when unfocused. Values are \"bold\", \"bright\", \"all\" and \"none\"",
+          "description": "Controls how 'intense' text is rendered. Values are \"bold\", \"bright\", \"all\" and \"none\"",
          "enum": [
            "none",
            "bold",
@@ -318,7 +300,6 @@
        "moveFocus",
        "movePane",
        "swapPane",
-        "markMode",
        "moveTab",
        "multipleActions",
        "newTab",
@@ -350,11 +331,8 @@
        "switchToTab",
        "tabSearch",
        "toggleAlwaysOnTop",
-        "toggleBlockSelection",
        "toggleFocusMode",
-        "selectAll",
        "setFocusMode",
-        "switchSelectionEndpoint",
        "toggleFullscreen",
        "setFullScreen",
        "setMaximized",
@@ -366,10 +344,6 @@
        "quit",
        "adjustOpacity",
        "restoreLastClosed",
-        "addMark",
-        "scrollToMark",
-        "clearMark",
-        "clearAllMarks",
        "unbound"
      ],
      "type": "string"
@@ -389,15 +363,6 @@
      ],
      "type": "string"
    },
-    "ScrollToMarkDirection": {
-      "enum": [
-        "previous",
-        "next",
-        "first",
-        "last"
-      ],
-      "type": "string"
-    },
    "ResizeDirection": {
      "enum": [
        "left",
@@ -747,30 +712,6 @@
        "direction"
      ]
    },
-    "ScrollToMarkAction": {
-      "description": "Arguments corresponding to a Scroll to Mark Action",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "scrollToMark"
-            },
-            "direction": {
-              "$ref": "#/$defs/ScrollToMarkDirection",
-              "default": "previous",
-              "description": "The direction to scroll to a mark."
-            }
-          }
-        }
-      ],
-      "required": [
-        "direction"
-      ]
-    },
    "SendInputAction": {
      "description": "Arguments corresponding to a Send Input Action",
      "allOf": [
@@ -878,27 +819,6 @@
        }
      ]
    },
-    "AddMarkAction": {
-      "description": "Arguments corresponding to an Add Mark Action",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "addMark"
-            },
-            "color": {
-              "$ref": "#/$defs/Color",
-              "default": null,
-              "description": "If provided, will set the mark's color to the given value."
-            }
-          }
-        }
-      ]
-    },
    "SetColorSchemeAction": {
      "description": "Arguments corresponding to a Set Color Scheme Action",
      "allOf": [
@@ -1727,16 +1647,6 @@
          "description": "When set to true, URLs will be detected by the Terminal. This will cause URLs to underline on hover and be clickable by pressing Ctrl.",
          "type": "boolean"
        },
-        "experimental.autoMarkPrompts": {
-          "default": false,
-          "description": "When set to true, prompts will automatically be marked.",
-          "type": "boolean"
-        },
-        "experimental.showMarksOnScrollbar": {
-          "default": false,
-          "description": "When set to true, marks added to the buffer via the addMark action will appear on the scrollbar.",
-          "type": "boolean"
-        },
        "disableAnimations": {
          "default": false,
          "description": "When set to `true`, visual animations will be disabled across the application.",
@@ -1779,11 +1689,6 @@
          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
          "type": "boolean"
        },
-        "experimental.useBackgroundImageForWindow": {
-          "default": false,
-          "description": "When set to true, the background image for the currently focused profile is expanded to encompass the entire window, beneath other panes.",
-          "type": "boolean"
-        },
        "initialCols": {
          "default": 120,
          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
@@ -2081,20 +1986,15 @@
          "description": "Controls what happens when the application emits a BEL character. When set to \"all\", the Terminal will play a sound, flash the taskbar icon (if the terminal window is not in focus) and flash the window. An array of specific behaviors can also be used. Supported array values include `audible`, `window` and `taskbar`. When set to \"none\", nothing will happen.",
          "$ref": "#/$defs/BellStyle"
        },
-        "bellSound": {
-          "description": "Sets the sound played when the application emits a BEL. When set to an array, the terminal will pick one of those sounds at random.",
-          "$ref": "#/$defs/BellSound"
-        },
        "closeOnExit": {
-          "default": "automatic",
-          "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"automatic\" (behave as \"graceful\" only for processes launched by terminal, behave as \"always\" otherwise)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
+          "default": "graceful",
+          "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
          "oneOf": [
            {
              "enum": [
                "never",
                "graceful",
-                "always",
-                "automatic"
+                "always"
              ],
              "type": "string"
            },
@@ -2209,17 +2109,6 @@
          ],
          "deprecated": true
        },
-        "intenseTextStyle": {
-          "default": "bright",
-          "description": "Controls how 'intense' text is rendered. Values are \"bold\", \"bright\", \"all\" and \"none\"",
-          "enum": [
-            "none",
-            "bold",
-            "bright",
-            "all"
-          ],
-          "type": "string"
-        },
        "foreground": {
          "$ref": "#/$defs/Color",
          "default": "#cccccc",
@@ -2315,10 +2204,7 @@
        },
        "startingDirectory": {
          "description": "The directory the shell starts in when it is loaded.",
-          "type": [
-            "string",
-            "null"
-          ]
+          "type": "string"
        },
        "suppressApplicationTitle": {
          "description": "When set to true, tabTitle overrides the default title of the tab and any title change messages from the application will be suppressed. When set to false, tabTitle behaves as normal.",
@@ -2497,4 +2383,4 @@
      ]
    }
  ]
-}
+}
--- a/doc/roadmap-2022.md
+++ b/doc/roadmap-2022.md
@@ -22,61 +22,21 @@ Below is the schedule for when milestones will be included in release builds of
 | Milestone End Date | Milestone Name | Preview Release Blog Post |
 | ------------------ | -------------- | ------------------------- |
 | 2020-06-18 | [1.1] in Windows Terminal Preview | [Windows Terminal Preview 1.1 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-1-release/) |
-| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release] |
-| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release] |
-| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release] |
-| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | [Windows Terminal Preview 1.5 Release] |
-| 2021-01-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | [Windows Terminal Preview 1.6 Release] |
-| 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release] |
-| 2021-04-14 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | [Windows Terminal Preview 1.8 Release] |
-| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release] |
-| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release] |
-| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release] |
-| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release] |
-| 2022-02-03 | [1.13] in Windows Terminal Preview<br>[1.12] in Windows Terminal | [Windows Terminal Preview 1.13 Release] |
-| 2022-05-24 | [1.14] in Windows Terminal Preview<br>[1.13] in Windows Terminal | [Windows Terminal Preview 1.14 Release] |
-|  | [1.15] in Windows Terminal Preview<br>[1.14] in Windows Terminal |  |
-|  | [1.16] in Windows Terminal Preview<br>[1.15] in Windows Terminal |  |
-|  | [1.17] in Windows Terminal Preview<br>[1.16] in Windows Terminal |  |
+| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/) |
+| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/) |
+| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/) |
+| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | [Windows Terminal Preview 1.5 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-5-release/) |
+| 2021-01-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | [Windows Terminal Preview 1.6 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-6-release/) |
+| 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/) |
+| 2021-04-14 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | [Windows Terminal Preview 1.8 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-8-release/) |
+| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
+| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
+| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
+| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
+|  | [1.13] in Windows Terminal Preview<br>[1.12] in Windows Terminal |  |
+|  | [1.14] in Windows Terminal Preview<br>[1.13] in Windows Terminal |  |


-### Release outline
-
-Below is a VERY vague outline of the remaining calendar year that was drafted late May 2022. This was drafted for internal planning purposes, as a guide. It is not meant to represent official dates. More often than not, releases are synced to official features landing, rather than arbitrary dates. Drift from this initial draft is entirely expected.
-
-```mermaid
-gantt
-    title Proposed Terminal Releases 1.14-1.18
-    dateFormat  YYYY-MM-DD
-    axisFormat  %d %b
-    section Terminal 1.14
-        Lock down & bake        :done, 2022-05-06, 2w
-        Release 1.14            :milestone, 2022-05-24
-    section Terminal 1.15
-        Features                :done, a1, 2022-05-06, 4w
-        Bugfix                  :active, a2, after a1  , 1w
-        Lock down & bake        :after a2  , 1w
-        Release 1.15            :milestone, 2022-06-21, 0
-        1.15 becomes Stable     :milestone, after b3, 0
-    section Terminal 1.16
-        Features                :b1, after a2, 4w
-        Bugfix                  :b2, after b1  , 2w
-        Lock down & bake        :b3, after b2  , 2w
-        Release 1.16            :milestone, after b3, 0
-        1.16 becomes Stable     :milestone, after c3, 0
-    section Terminal 1.17
-        Features                :c1, after b2, 4w
-        Bugfix                  :c2, after c1  , 2w
-        Lock down & bake        :c3, after c2  , 2w
-        Release 1.17            :milestone, after c3, 0
-        1.17 becomes Stable     :milestone, after d3, 0
-    section Terminal 1.18
-        Features                :d1, after c2, 4w
-        Bugfix                  :d2, after d1  , 2w
-        Lock down & bake        :d3, after d2  , 2w
-        Release 1.18            :milestone, after d3, 0
-```
-
 ## Issue Triage & Prioritization

 Incoming issues/asks/etc. are triaged several times a week, labeled appropriately, and assigned to a milestone in priority order:
@@ -102,9 +62,7 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [1.12]: https://github.com/microsoft/terminal/milestone/38
 [1.13]: https://github.com/microsoft/terminal/milestone/39
 [1.14]: https://github.com/microsoft/terminal/milestone/41
-[1.15]: https://github.com/microsoft/terminal/milestone/47
-[1.16]: https://github.com/microsoft/terminal/milestone/48
-[1.17]: https://github.com/microsoft/terminal/milestone/49
+

 [22H1]: https://github.com/microsoft/terminal/milestone/43
 [22H2]: https://github.com/microsoft/terminal/milestone/44
@@ -112,17 +70,3 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [Backlog]: https://github.com/microsoft/terminal/milestone/45

 [Terminal v2 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/terminal-v2-roadmap.md
-
-[Windows Terminal Preview 1.2 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/
-[Windows Terminal Preview 1.3 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/
-[Windows Terminal Preview 1.4 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/
-[Windows Terminal Preview 1.5 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-5-release/
-[Windows Terminal Preview 1.6 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-6-release/
-[Windows Terminal Preview 1.7 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/
-[Windows Terminal Preview 1.8 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-8-release/
-[Windows Terminal Preview 1.9 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/
-[Windows Terminal Preview 1.10 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/
-[Windows Terminal Preview 1.11 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/
-[Windows Terminal Preview 1.12 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/
-[Windows Terminal Preview 1.13 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-13-release/
-[Windows Terminal Preview 1.14 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-14-release/
--- a/doc/specs/#12570
+++ b/doc/specs/#12570
@@ -1,370 +0,0 @@
---
-author: Michael Niksa @miniksa
-created on: 2022-02-24
-last updated: 2022-02-24
-issue id: 12570
---
-
-# Show Hide operations on GetConsoleWindow via PTY
-
-## Abstract
-
-To maintain compatibility with command-line tools, utilities, and tests that desire to
-manipulate the final presentation window of their output through retrieving the raw
-console window handle and performing `user32` operations against it like [ShowWindow](https://docs.microsoft.com//windows/win32/api/winuser/nf-winuser-showwindow),
-we will create a compatibility layer that captures this intent and translates it into
-the nearest equivalent in the cross-platform virtual terminal language and implement the
-understanding of these sequences in our own Windows Terminal.
-
-## Inspiration
-
-When attempting to enable the Windows Terminal as the default terminal application on Windows
-(to supersede the execution of command-line utilities inside the classic console host window),
-we discovered that there were a bunch of automated tests, tools, and utilities that relied on
-showing and hiding the console window using the `::GetConsoleWindow()` API in conjunction with
-`::ShowWindow()`.
-
-When we initially invented the ConPTY, we worked to ensure that we built to the common
-denominator that would work cross-platform in all scenarios, avoiding situations that were
-dependent on Windows-isms like `user32k` including the full knowledge of how windowing occurs
-specific to the Windows platform.
-
-We also understood that on Windows, the [**CreateProcess**](https://docs.microsoft.com/windows/win32/procthread/process-creation-flags) API provides ample flags specifically
-for command-line applications to command the need for (or lack thereof) a window on startup
-such as `CREATE_NEW_CONSOLE`, `CREATE_NO_WINDOW`, and `DETACHED_PROCESS`. The understanding
-was that people who didn't need or want a window, or otherwise needed to manipulate the
-console session, would use those flags on process creation to dictate the session. Additionally,
-the `::CreateProcess` call will accept information in `STARTUPINFO` or `STARTUPINFOEX` that
-can dictate the placement, size, and visibility of a window... including some fields specific
-to console sessions. We had accepted those as ways applications would specify their intent.
-
-Those assumptions have proven incorrect. Because it was too easy to just `::CreateProcess` in
-the default manner and then get access to the session after-the-fact and manipulate it with
-APIs like `::GetConsoleWindow()`, tooling and tests organically grew to make use of this process.
-Instead of requesting up front that they didn't need a window or the overhead of a console session,
-they would create one anyway by default and then manipulate it afterward to hide it, move it off-
-screen, or otherwise push it around. Overall, this is terrible for their performance and overall
-reliability because they've obscured their intent by not asking for it upfront and impacted their
-performance by having the entire subsystem spin up interactive work when they intend to not use it.
-But Windows is the place for compatibility, so we must react and compensate for the existing
-non-ideal situation.
-
-We will implement a mechanism to compensate for these that attempts to capture the intent of the
-requests from the calling applications against the ConPTY and translates them into the "universal"
-Virtual Terminal language to the best of its ability to make the same effects as prior to the
-change to the new PTY + Terminal platform.
-
-## Solution Design
-
-Overall, there are three processes involved in this situation:
-
-1. The client command-line application utility, tool, or test that will manipulate the window.
-1. The console host (`conhost.exe` or `openconsole.exe`) operating in PTY mode.
-1. The terminal (`windowsterminal.exe` when it's Windows Terminal, but could be a third party).
-
-The following diagram shows the components and how they will interact.
-
-```txt
-   ┌─────────────────┐                   ┌──────────────────┐                   ┌──────────────────────┐
-   │                 │       1           │                  │                   │                      │
-   │   Command-Line  ├─────────────────► │   Console Host   │                   │   Windows Terminal   │
-   │   Tool or       │                   │   as ConPTY      │                   │   Backend            │
-   │   Utility       │       2           │                  │        6          │                      │
-   │                 │ ◄─────────────────┤                  ├─────────────────► │                      │
-   │                 │                   │                  │                   │                      │
-   │                 │                   │                  │                   │                      │
-   │                 │                   │                  │         9         │                      │
-   │                 │                   │                  │ ◄─────────────────┤                      │
-   │                 │                   │                  │                   │                      │
-   └─────┬───────────┘                   └───────────┬──────┘                   └─────────────────┬────┘
-         │                                        ▲  │                                   ▲        │
-         │                                        │  │                                   │        │
-         │                                        │  │10                                 │        │7
-         │3                                      5│  │                                   │8       │
-         │                                        │  ▼                                   │        ▼
-         │                                    ┌───┴────┐                              ┌──┴────┬───────┬─────────────────────────┐
-         ▼                                    │ Hidden │                              │       │       │                      v^x│
-   ┌─────────────────┐                        │ Fake   │                              ├───────┴───────┴─────────────────────────┤
-   │                 │          4             │ PTY    │                              │                                         │
-   │                 ├──────────────────────► │ Window │                              │                                         │
-   │   user32.dll    │                        └────────┘                              │      Windows Terminal                   │
-   │   Window APIs   │                                                                │      Displayed Window                   │
-   │                 │                                                                │                                         │
-   │                 │                                                                │                                         │
-   └─────────────────┘                                                                │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      │                                         │
-                                                                                      └─────────────────────────────────────────┘
-```
-
-1. The command-line tool calls `::GetConsoleWindow()` on the PTY host
-2. The PTY host returns the raw `HWND` to the *Hidden Fake PTY Window* in its control
-3. The command-line tool calls `::ShowWindow()` on the `user32.dll` API surface to manipulate that window.
-4. `user32.dll` sends a message to the window message queue on the *Fake PTY Window*
-5. The PTY host retrieves the message from the queue and translates it to a virtual terminal message
-6. The Windows Terminal connection layer receives the virtual terminal message and decodes it into a window operation.
-7. The true displayed *Windows Terminal Window* is told to change its status to show or hide.
-8. The changed Show/Hide status is returned to the back-end on completion.
-9. The Windows Terminal connection layer returns that information to the PTY host so it can remain in-the-know.
-10. The PTY updates its *Fake PTY Window* status to match the real one so it continues to receive appropriate messages from `user32`.
-
-This can be conceptually understood in a few phases:
-
- The client application grabs a handle and attempts to send a command via a back-channel through user32.
- User32 decides what message to send based on the window state of the handle.
- The message is translated by the PTY and propagated to the true visible window.
- The visible window state is returned back to the hidden/fake window to remain in synchronization so the next call to user32 can make the correct decision.
-
-The communication between the PTY and the hosting terminal application occurs with a virtual terminal sequence.
-Fortunately, *xterm* had already invented and implemented one for this behavior called **XTWINOPS** which means
-we should be able to utilize that one and not worry about inventing our own Microsoft-specific thing. This ensures
-that there is some precedence for what we're doing, guarantees a major third party terminal can support the same
-sequence, and induces a high probability of other terminals already using it given *xterm* is the defacto standard
-for terminal emulation.
-
-Information about **XTWINOPS** can be found at [Xterm control sequences](https://invisible-island.net/xterm/ctlseqs/ctlseqs.html). Search for *XTWINOPS*.
-The sequence is **CSI** *Ps*; *Ps*; *Ps* **t**. It starts with the common "control sequence initiator" of `ESC [` (`0x1B 0x5B`).
-Then between 1 and 3 numerical parameters are given, separated by semicolons (`0x3B`).
-And finally, the sequence is terminated with `t` (`0x74`).
-
-Specifically, the two parameter commands of `1` for *De-iconify window* and `2` for *Iconify window* appear relevant to our interests.
-In `user32` parlance, "iconify" traditionally corresponds to minimize/restore state and is a good proxy for overall visibility of the window.
-
-The theory then is to detect when the assorted calls to `::ShowWindow()` against the *Fake PTY Window* are asking for a command that
-maps to either "iconify" or "deiconify" and translate them into the corresponding message over the VT channel to the attached terminal.
-
-To detect this, we need to use some heuristics inside the [window procedure](https://docs.microsoft.com/windows/win32/winmsg/window-procedures) for the window owned by the PTY.
-Unfortunately, calls to `::ShowWindow()` on research with the team that owns `user32` do not go straight into the window message queue. Instead, they're dispatched straight into `win32k` to be analyzed and then trigger an array of follow on window messages into the queue depending on the `HWND`'s current state. Most specifically, they vary based on the `WS_VISIBLE` state of the `HWND`. (See [Window Styles](https://docs.microsoft.com/windows/win32/winmsg/window-styles) for details on the `WS_VISIBLE` flag.)
-
-I evaluated a handful of messages with the help of the IXP Essentials team to see which ones would telegraph the changes from `::ShowWindow()` into our window procedure:
-
- [WM_QUERYOPEN](https://docs.microsoft.com/windows/win32/winmsg/wm-queryopen) - This one allows us to accept/reject a minimize/restore call. Not really useful for finding out current state
- [WM_SYSCOMMAND](https://docs.microsoft.com/windows/win32/menurc/wm-syscommand) - This one is what is called when the minimize, maximize/restore, and exit buttons are called in the window toolbar. But apparently it is not generated for these requests coming from outside the window itself through the `user32` APIs.
- [WM_SHOWWINDOW](https://docs.microsoft.com/windows/win32/winmsg/wm-showwindow) - This one provides some insight in certain transitions, specifically around force hiding and showing. When the `lParam` is `0`, we're supposed to know that someone explicitly called `::ShowWindow()` to show or hide with the `wParam` being a `BOOL` where `TRUE` is "show" and `FALSE` is "hide". We can translate that into *de-iconify* and *iconify* respectively.
- [WM_WINDOWPOSCHANGING](https://docs.microsoft.com/windows/win32/winmsg/wm-windowposchanging) - This one I evaluated extensively as it looked to provide us insight into how the window was about to change before it did so and offered us the opportunity to veto some of those changes (for instance, if we wanted to remain invisible while propagating a "show" message). I'll detail more about this one in a sub-heading below.
- [WM_SIZE](https://docs.microsoft.com/windows/win32/winmsg/wm-size) - This one has a `wParam` that specifically sends `SIZE_MINIMIZED` (`1`) and `SIZE_RESTORED` (`0`) that should translate into *iconify* and *de-iconify respectively.
-
-#### WM_WINDOWPOSCHANGING data
-
-In investigating `WM_WINDOWPOSCHANGING`, I built a table of some of the states I observed while receiving messages from an external caller that was using `::ShowWindow()`:
-
-|integer|constant|flags|Should Hide?|minimizing|maximizing|showing|hiding|activating|`0x8000`|`SWP_NOCOPYBITS`|`SWP_SHOWWINDOW`|`SWP_FRAMECHANGED`|`SWP_NOACTIVATE`|`SWP_NOZORDER`|`SWP_NOMOVE`|`SWP_NOSIZE`|
-|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-|0|`SW_HIDE`|?|YES|?|?|?|?|?|?|?|?|?|?|?|?|?|
-|1|`SW_NORMAL`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
-|2|`SW_SHOWMINIMIZED`|`0x8160`|YES|T|F|T|F|T|X|X|X|X|||||
-|3|`SW_SHOWMAXIMIZED`|`0x8160`|NO|F|T|T|F|T|X|X|X|X|||||
-|4|`SW_SHOWNOACTIVATE`|`0x8070`|NO|F|F|T|F|F|X||X|X|X||||
-|5|`SW_SHOW`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
-|6|`SW_MINIMIZE`|`0x8170`|YES|T|F|T|F|F|X|X|X|X|X||||
-|7|`SW_SHOWMINNOACTIVE`|`0x57`|YES|T|F|T|F|F|||X||X|X|X|X|
-|8|`SW_SHOWNA`|`0x53`|NO|F|F|T|F|F|||X||X||X|X|
-|9|`SW_RESTORE`|`0x8160`|NO|F|F|T|F|T|||X|X|||||
-|10|`SW_SHOWDEFAULT`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
-|11|`SW_FORCEMINIMIZE`|?|YES|?|?|?|?|?|?|?|?|?|?|?|?|?|
-
-The headings are as follows:
-
- integer - The value of the Show Window constant `SW_*` (see [ShowWindow](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-showwindow))
- constant - The name of the Show Window constant
- flags - The `lParam` field is a pointer to a [**WINDOWPOS**](https://docs.microsoft.com/windows/win32/api/winuser/ns-winuser-windowpos) structure during this message. This the `UINT flags` field of that structure.
- Should Hide? - Whether or not I believe that the window should hide if this constant is seen. (Conversely, should show on the opposite.)
- minimizing - This is the `BOOL` response from a call to [**IsIconic()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-isiconic) during this message.
- maximizing - This is the `BOOL` response from a call to [**IsZoomed()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-iszoomed) during this message.
- showing - This is whether `SWP_SHOWWINDOW` is set on the `WINDOWPOS.flags` field during this message.
- hiding - This is whether `SWP_HIDEWINDOW` is set on the `WINDOWPOS.flags` field during this message.
- activating - This is the inverse of whether `SWP_NOACTIVATE` is set on the `WINDOWPOS.flags` field during this message.
- Remaining headings are `flags` values expanded to `X` is set and blank is unset. See [**SetWindowPos()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-setwindowpos) for the definitions of all the flags.
-
-From this data collection, I noticed a few things:
-
- The data in this table was unstable. The fields varied depending on the order in which I called the various constants against `ShowWindow()`. This is just one particular capture.
- Some of the states, I wouldn't see any message data at all (`SW_HIDE` and `SW_FORCEMINIMIZE`).
- There didn't seem to be a definitive way to use this data to reliably decide when to show or hide the window. I didn't have a reliable way of pulling this together with my *Should Hide?* column.
-
-On further investigation, it became apparent that the values received were sometimes not coming through or varying because the `WS_VISIBLE` state of the `HWND` affected how `win32k` decided to dispatch messages and what values they contained. This is where I determined that steps #8-10 in the diagram above were going to be necessary: to report the state of the real window back to the *fake window* so it could report status to `user32` and `win32k` and receive state-appropriate messages.
-
-For reporting back #8-10, I initially was going to use the `XTWINOPS` call with parameter `11`. The PTY could ask the attached terminal for its state and expect to hear back an answer of either `1` or `2` in the same format message depending on the state. However, on further consideration, I realized that the real window could change at a moments notice without prompting from the PTY, so I instead wrote the PTY to always listen for this and had the Windows Terminal send this back down unprompted.
-
-#### Refined WM_SHOWWINDOW and WM_SIZE data
-
-Upon setting up the synchronization for #8-10, I then tried again to build the table using just the two window messages that were giving me reliable data: `WM_SHOWWINDOW` and `WM_SIZE`:
-
-|integer|constant|Should Hide?|`WM_SHOWWINDOW` OR `WM_SIZE` reported hide?|
-|---|---|---|---|
-|0|`SW_HIDE`|YES|YES|
-|1|`SW_NORMAL`|NO|NO|
-|2|`SW_SHOWMINIMIZED`|YES|YES|
-|3|`SW_SHOWMAXIMIZED`|NO|NO|
-|4|`SW_SHOWNOACTIVATE`|NO|NO|
-|5|`SW_SHOW`|NO|NO|
-|6|`SW_MINIMIZE`|YES|YES|
-|7|`SW_SHOWMINNOACTIVE`|YES|YES|
-|8|`SW_SHOWNA`|NO|NO|
-|9|`SW_RESTORE`|NO|NO|
-|10|`SW_SHOWDEFAULT`|NO|NO|
-|11|`SW_FORCEMINIMIZE`|YES|YES|
-
-Since this now matched up perfectly with what I was suspecting should happen *and* it was easier to implement than picking apart the `WM_WINDOWPOSCHANGING` message, it is what I believe the design should be.
-
-Finally, with the *fake window* changing state to and from `WS_VISIBLE`... it was appearing on the screen and showing up in the taskbar and alt-tab. To resolve this, I utilized [**DWMWA_CLOAK**](https://docs.microsoft.com//windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute) which makes the window completely invisible even when in a normally `WS_VISIBLE` state. I then added the [**WS_EX_TOOLWINDOW**](https://docs.microsoft.com/windows/win32/winmsg/extended-window-styles) extended window style to hide it from alt-tab and taskbar.
-
-With this setup, the PTY now has a completely invisible window with a synchronized `WS_VISIBLE` state with the real terminal window, a bidirectional signal channel to adjust the state between the terminal and PTY, and the ability to catch `user32` calls being made against the *fake window* that the PTY stands up for the client command-line application.
-
-## UI/UX Design
-
-The visible change in behavior is that a call to `::ShowWindow()` against the `::GetConsoleWindow()`
-handle that is returned by the ConPTY will be propagated to the attached Terminal. As such, a
-user will see the entire window be shown or hidden if one of the underlying attached
-command-line applications requests a show or hide.
-
-At the initial moment, the fact that the Terminal contains tabbed and/or paned sessions and
-therefore multiple command-line clients on "different sessions" are attached to the same window
-is partially ignored. If one attached client calls "show", the entire window will be shown with
-all tabs. If another calls "hide", the entire window will be hidden including the other tab
-that just requested a show. In the opposite direction, when the window is shown, all attached
-PTYs for all tabs/panes will be alerted that they're now shown at once.
-
-## Capabilities
-
-### Accessibility
-
-Users of assistive devices will have the same experience that they did with the legacy Windows
-Console after this change. If a command-line application decides to show or hide the window
-through the API without their consent, they will receive notification of the showing/hiding
-window through our UIA framework.
-
-Prior to this change, the window would have always remained visible and there would be no
-action.
-
-Overall, the experience will be consistent between what is happening on-screen and what is
-presented through the UIA framework to assistive tools.
-
-For third party terminals, it will be up to them to decide what their reaction and experience is.
-
-### Security
-
-We will maintain the security and integrity of the Terminal application chosen for presentation
-by not revealing its true window handle information to the client process through the existing
-`::GetConsoleWindow()` API. Through our design for default terminal applications, the final
-presentation terminal could be Windows Terminal or it could be any third-party terminal that
-meets the same specifications for communication. Giving raw access to its `HWND` to a client
-application could disrupt its security.
-
-By maintaining a level of separation with this feature by generating a "fake window" in the
-ConPTY layer and only forwarding events, the attached terminal (whether ours or a 3rd party)
-maintains the final level of control on whether or not it processes the message. This is
-improved security over the legacy console host where the tool had full backdoor style access
-to all `user32` based window APIs.
-
-### Reliability
-
-This test doesn't improve overall reliability in the system because utilities that are relying
-on the behavior that this compatibility shim will restore are already introducing additional
-layers of complexity and additional processes into their operation than were strictly necessary
-simply by not stating their desires upfront at creation time.
-
-In some capacity, you could argue it increases reliability of the existing tests that were
-using this complex behavior in that they didn't work before and they will work now, but
-the entire process is fragile. We're just restoring the fragile process instead of having
-it not work at all.
-
-### Compatibility
-
-This change restores compatibility with existing applications that were relying on the behavior
-we had excluded from our initial designs.
-
-### Performance, Power, and Efficiency
-
-The performance of tooling that is leveraging this process to create a console and then hide
-or manipulate the session after the fact will be significantly worse when we enable the
-default Windows Terminal than it was with the old Windows Console. This is because the
-Terminal is significantly heavier weight (with its modern technologies like WinUI) and
-will take more time to start and more committed memory. Additionally, more processes
-will be in use because there will be the `conhost.exe` doing the ConPTY translation
-and then the `windowsterminal.exe` doing the presentation.
-
-However, this particular feature doesn't do anything to make that better or worse.
-
-The appropriate solution for any tooling, test, or scenario that has a need for
-performance and efficiency is to use the flags to `::CreateProcess` in the first place
-to specify that they did not need a console window session at all, or to direct its
-placement and visibility as a part of the creation call. We are working with
-Microsoft's test automation tooling (TAEF) as well as the Windows performance
-fundamentals (FUN) team to ensure that the test automation supports creating sessions
-without a console window and that our internal performance test suite uses those
-specifications on creation so we have accurate performance testing of the operating
-system.
-
-## Potential Issues
-
-### Multiple clients sharing the same window host
-
-With the initial design, multiple clients sharing the same window host will effectively
-share the window state. Two different tabs or panes with two different client applications
-could fight over the show/hide state of the window. In the initial revision, this is
-ignored because this feature is being driven by a narrow failure scenario in the test gates.
-In the reported scenario, a singular application is default-launched into a singular tab
-in a terminal window and then the application expects to be able to hide it after the creation.
-
-In the future, we may have to implement a conflict resolution or a graphical variance to
-compensate for multiple tabs.
-
-### Other verbs against the console window handle
-
-This scenario initially focuses on just the `::ShowWindow()` call against the window handle
-from `::GetConsoleWindow()`. Other functions from `user32` against the `HWND` will not
-necessarily be captured and forwarded to the attached terminal application. And even more
-specifically, we're focusing only on the Show and Hide state. Other state modifications that
-are subtle related to z-ordering, activation, maximizing, snapping, and so on are not considered.
-
-## Future considerations
-
-### Multiple clients
-
-If the multiple clients problem becomes more widespread, we may need to change the graphical
-behavior of the Windows Terminal window to only hide certain tabs or panes when a command
-comes in instead of hiding the entire window (unless of course there is only one tab/pane).
-
-We may also need to adjust that once consensus is reached among tabs/panes that it can then
-and only then propagate up to the entire window.
-
-We will decide on this after we receive feedback that it is a necessary scenario. Otherwise,
-we will hold for now.
-
-### Other verbs
-
-If it turns out that we discover tests/scenarios that need maximizing, activation, or other
-properties of the `::ShowWindow()` call to be propagated to maintain compatibility, we will
-be able to carry those through on the same channel and command. Most of them have an existing
-equivalent in `XTWINOPS`. Those that do not, we would want to probably avoid as they will not
-be implemented in any other terminal. We would extend the protocol as an absolute last resort
-and only after receiving feedback from the greater worldwide terminal community.
-
-### Z-ordering
-
-The channel we're establishing here to communicate information about the window and its
-placement may be useful for the z-ordering issues we have in #2988. In those scenarios,
-a console client application is attempting to launch and position a window on top of the
-terminal, wherever it is. Further synchronizing the state of the new fake-window in the
-ConPTY with the real window on the terminal side may enable those tools to function as
-they expect.
-
-This is another circumstance we didn't expect: having command-line applications create windows
-with a need for complex layout and ordering. These sorts of behaviors cannot be translated
-to a universal language and will not be available off the singular machine, so encouraged
-alternative methods like command-line based UI. However, for single-box scenarios, this
-behavior is engrained in some Windows tooling due to its ease of use.
-
-## Resources
-
- [Default Terminal spec](https://github.com/microsoft/terminal/pull/7414)
- [Z-ordering issue](https://github.com/microsoft/terminal/issues/2988)
- See all the embedded links in this document to Windows API resources
--- a/doc/specs/#1790
+++ b/doc/specs/#1790
@@ -60,7 +60,7 @@ Users will be able to add a new setting to their font objects (added in [#10433]
 There is one point to note here about clashing. For example, if a user has the old "weight" setting defined _as well as_ a "wght" axis defined, we will only use the "wght" axis value. We prioritize that value for a few reasons:

 1. It is the more recent addition to our settings model. Thus, it is likely that a user that has defined both values probably just forgot to remove the old value.
-2. It is the more precise value, it is a specific float value whereas the old "weight" setting is an enum (that eventually gets mapped to a float value).
+2. It is the more precise value, it is a specific float value whereas the the old "weight" setting is an enum (that eventually gets mapped to a float value).

 ## Capabilities

--- a/doc/specs/#4066
+++ b/doc/specs/#4066
@@ -1,79 +0,0 @@
---
-author: Ítalo Masserano arkthur/italo.masserano@gmail.com
-created on: 2022-03-02
-last updated: 2022-03-02
-issue id: 4066
---
-
-# Theme-controlled color scheme switch
-
-## Abstract
-
-The idea is for Windows Terminal to change automatically its color schemes according to what theme is selected, including the case where `system` theme is selected.
-
-## Inspiration
-
-I work remotely as a developer, so I have to spend a lot of hours in front of my PC screen. In my setup, right behind my desk I have a window, which is the only source of natural sunlight in my room.
-
-Normally I like dark modes in all the programs and apps I use, but when there's too much sunlight, it becomes annoying, and sometimes even painful, to work in dark mode. So, I have all the programs and apps I use (at least, those that can) set to switch their color themes to what the system has.
-
-The company I work for sent me a Macbook Pro, and my personal phone is an Android, both with automatic dark mode at sunset and light mode at sunrise, and in those devices it's been working relatively well. In Windows, as it is known, there's no such feature, so I manually change between dark and light mode when it's needed, and most of the programs and apps I use go along with this change. Windows Terminal, is not one of them.
-
-The theme changes just as expected, but in an app like this, this change only affects the top of the window, leaving almost all of the screen at the mercy of what the color scheme is, and it doesn't depend on the theme, which defeats any attempt to make a good use of the `system` theme feature.
-
-## Solution Design
-
-Could be implemented in the form of:
-
-```json
-"colorScheme": {
-    "light": "BlulocoLight",
-    "dark": "BlulocoDark"
-}
-```
-or:
-
-```json
-    "colorSchemeLight": "BlulocoLight",
-    "colorSchemeDark": "BlulocoDark"
-```
-
-## UI/UX Design
-
-In a first version it could look like the terminal in Visual Studio Code, and an improvement could be to have light mode specific color schemes, just like those already present in Windows terminal. A good idea could be to get an inspiration in Dark++ and Light++ VSCode color themes.
-
-A user could benefit from a more healthy light level contrast between the screen their looking at and the environment they are, reducing the risk of headache or developing/intensifying eye problems, and any other related eye conditions. Plus, it adds to a more consistent experience between different programs and apps, and the system itself.
-
-## Capabilities
-
-### Accessibility
-
-This feature improves accessibility more than any other capability, because the key is to be able to read and see anything better when the environment, both the external to the device, and the device's system itself, is in a certain mode (dark/light).
-
-### Security
-
-The proposed solution is based in the current way one sets Windows Terminal settings, so it isn't expected to add any security issues. 
-
-### Reliability
-
-Adding this feature would make Windows Terminal more reliable when it's expected that it changes it's visual theme/color scheme along with the whole system.
-
-### Compatibility
-
-The solution is not expected to break anything.
-
-### Performance, Power, and Efficiency
-
-It might increase the energy spent in the cases where people who were used to use the terminal in regular dark color schemes start using more light color schemes, but that is the case for any other program that shows lighter colors and I don't think the increment would be as high as to be even considered a downside.
-
-## Potential Issues
-
-Some users might not like the change in color schemes or be too used to the terminal being dark, but this may be avoided making the current schemes a default and adding this solution as an alternative setting.
-
-## Future considerations
-
-This solution might bring more attention to the color schemes setting, even more when considering light mode specific color schemes
-
-## Resources
-
-Inspired by what's been said in the issue comments. Credits to them.
--- a/Improvements.md
+++ b/Improvements.md
@@ -75,7 +75,7 @@ Some things we considered during this investigation:
  - We could theoretically build an RPC tunnel between content and window
    processes, and use the RPC connection to marshal the content process to the
    elevated window. However, then _we_ would need to be responsible for
-    securing access the RPC endpoint, and we feel even less confident doing
+    securing access the the RPC endpoint, and we feel even less confident doing
    that.
  - Attempts were also made to use a window-broker-content architecture, with
    the broker process having a static CLSID in the registry, and having the
@@ -456,7 +456,7 @@ accessible.

 Unfortunately, these issues are OS bugs that are largely out of our own control.
 We will continue to apply pressure to the centennial app team internally as we
-encounter these issues. They are the team best equipped to resolve these issues.
+encounter these issues. They are are team best equipped to resolve these issues.

 ### Default Terminal & auto-elevation

--- a/doc/specs/#5000
+++ b/doc/specs/#5000
@@ -317,7 +317,7 @@ Some things we considered during this investigation:
  - We could theoretically build an RPC tunnel between content and window
    processes, and use the RPC connection to marshal the content process to the
    elevated window. However, then _we_ would need to be responsible for
-    securing access the RPC endpoint, and we feel even less confident doing
+    securing access the the RPC endpoint, and we feel even less confident doing
    that.
  - Attempts were also made to use a window-broker-content architecture, with
    the broker process having a static CLSID in the registry, and having the
--- a/doc/specs/#607
+++ b/doc/specs/#607
@@ -35,7 +35,7 @@ through commandline arguments.

 ## User Stories

-Lets consider some different ways that a user or developer might want to
+Lets consider some different ways that a user or developer might want want to
 use commandline arguments, to help guide the design.

 1. A user wants to open the Windows Terminal with their default profile.
--- a/oss/interval_tree/IntervalTree.h
+++ b/oss/interval_tree/IntervalTree.h
@@ -6,7 +6,6 @@
 #include <iostream>
 #include <memory>
 #include <cassert>
-#include <limits>

 #ifdef USE_INTERVAL_TREE_NAMESPACE
 namespace interval_tree
--- a/oss/interval_tree/MAINTAINER_README.md
+++ b/oss/interval_tree/MAINTAINER_README.md
@@ -8,7 +8,7 @@ That provenance file is automatically read and inventoried by Microsoft systems

 ## What should be done to update this in the future?

-1. Go to the ekg/intervaltree repository on GitHub.
+1. Go to ekg/intervaltreerepository on GitHub.
 2. Take the file IntervalTree.h wholesale and drop it into the directory here.
 3. Don't change anything about it.
 4. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in the same directory as this readme.
--- a/oss/interval_tree/cgmanifest.json
+++ b/oss/interval_tree/cgmanifest.json
@@ -4,7 +4,7 @@
       "type": "git",
        "git": {
          "repositoryUrl": "https://github.com/ekg/intervaltree",
-          "commitHash": "aa5937755000f1cd007402d03b6f7ce4427c5d21"
+          "commitHash": "b90527f9e6d51cd36ecbb50429e4524d3a418ea5"
        }
       }
    }
--- a/oss/libpopcnt/cgmanifest.json
+++ b/oss/libpopcnt/cgmanifest.json
@@ -1,15 +1,13 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
+{"Registrations":[ 
    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/kimwalisch/libpopcnt",
-          "commitHash": "c49987e90e56191c399cab881ab87b5daecc9b8e"
-        }
-      }
+      "component": { 
+       "type": "git", 
+       "git": { 
+         "repositoryUrl": "https://github.com/kimwalisch/libpopcnt", 
+         "commitHash": "043a99fba31121a70bcb2f589faa17f534ae6085" 
+         }
+       }
    }
-  ],
-  "Version": 1
-}
+ ],
+ "Version": 1
+}
--- a/oss/libpopcnt/libpopcnt.h
+++ b/oss/libpopcnt/libpopcnt.h
--- a/scratch/ScratchIslandApp/Package/Package.wapproj
+++ b/scratch/ScratchIslandApp/Package/Package.wapproj
@@ -140,12 +140,12 @@
  <!-- **END VC LIBS HACK** -->

  <!-- This is required to get the package dependency in the AppXManifest. -->
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets'))" />
  </Target>


--- a/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj
+++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj
@@ -147,13 +147,13 @@
  <!-- ========================= Globals ======================== -->
  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />

-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" />
  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets'))" />
    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
  </Target>

--- a/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj
+++ b/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj
@@ -80,13 +80,13 @@
  </ItemGroup>


-  <Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" />
  <Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets'))" />
    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
  </Target>

--- a/scratch/ScratchIslandApp/SampleApp/packages.config
+++ b/scratch/ScratchIslandApp/SampleApp/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
-  <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
 </packages>
--- a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj
+++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj
@@ -137,14 +137,14 @@

  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />

-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" />
  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
  <Import Project="..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.0\build\native\Microsoft.UI.Xaml.targets'))" />
    <Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
    <Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
    <Error Condition="!Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets'))" />
--- a/scratch/ScratchIslandApp/WindowExe/packages.config
+++ b/scratch/ScratchIslandApp/WindowExe/packages.config
@@ -2,6 +2,6 @@
 <packages>
  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
  <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
-  <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native" />
  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
 </packages>
--- a/src/audio/dirs
+++ b/src/audio/dirs
@@ -1,2 +0,0 @@
-DIRS=midi \
-
--- a/src/audio/midi/MidiAudio.cpp
+++ b/src/audio/midi/MidiAudio.cpp
@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "precomp.h"
-#include "MidiAudio.hpp"
-#include "../terminal/parser/stateMachine.hpp"
-
-using Microsoft::WRL::ComPtr;
-using namespace std::chrono_literals;
-
-// The WAVE_DATA below is an 8-bit PCM encoding of a triangle wave form.
-// We just play this on repeat at varying frequencies to produce our notes.
-constexpr auto WAVE_SIZE = 16u;
-constexpr auto WAVE_DATA = std::array<byte, WAVE_SIZE>{ 128, 159, 191, 223, 255, 223, 191, 159, 128, 96, 64, 32, 0, 32, 64, 96 };
-
-void MidiAudio::_initialize(HWND windowHandle) noexcept
-{
-    _hwnd = windowHandle;
-    _directSoundModule.reset(LoadLibraryExW(L"dsound.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32));
-    if (_directSoundModule)
-    {
-        if (const auto createFunction = GetProcAddressByFunctionDeclaration(_directSoundModule.get(), DirectSoundCreate8))
-        {
-            if (SUCCEEDED(createFunction(nullptr, &_directSound, nullptr)))
-            {
-                if (SUCCEEDED(_directSound->SetCooperativeLevel(windowHandle, DSSCL_NORMAL)))
-                {
-                    _createBuffers();
-                }
-            }
-        }
-    }
-}
-
-void MidiAudio::BeginSkip() noexcept
-{
-    _skip.SetEvent();
-}
-
-void MidiAudio::EndSkip() noexcept
-{
-    _skip.ResetEvent();
-}
-
-void MidiAudio::PlayNote(HWND windowHandle, const int noteNumber, const int velocity, const std::chrono::milliseconds duration) noexcept
-try
-{
-    if (_skip.is_signaled())
-    {
-        return;
-    }
-
-    if (_hwnd != windowHandle)
-    {
-        _initialize(windowHandle);
-    }
-
-    const auto& buffer = _buffers.at(_activeBufferIndex);
-    if (velocity && buffer)
-    {
-        // The formula for frequency is 2^(n/12) * 440Hz, where n is zero for
-        // the A above middle C (A4). In MIDI terms, A4 is note number 69,
-        // which is why we subtract 69. We also need to multiply by the size
-        // of the wave form to determine the frequency that the sound buffer
-        // has to be played to achieve the equivalent note frequency.
-        const auto frequency = std::pow(2.0, (noteNumber - 69.0) / 12.0) * 440.0 * WAVE_SIZE;
-        buffer->SetFrequency(gsl::narrow_cast<DWORD>(frequency));
-        // For the volume, we're using the formula defined in the the General
-        // MIDI Level 2 specification: Gain in dB = 40 * log10(v/127). We need
-        // to multiply by 4000, though, because the SetVolume method expects
-        // the volume to be in hundredths of a decibel.
-        const auto volume = 4000.0 * std::log10(velocity / 127.0);
-        buffer->SetVolume(gsl::narrow_cast<LONG>(volume));
-        // Resetting the buffer to a position that is slightly off from the
-        // last position will help to produce a clearer separation between
-        // tones when repeating sequences of the same note.
-        buffer->SetCurrentPosition((_lastBufferPosition + 12) % WAVE_SIZE);
-    }
-
-    // By waiting on the skip event with a maximum duration of the note, we'll
-    // either be paused for the appropriate amount of time, or we'll break out early
-    // because BeginSkip() was called. This happens for Ctrl+C or during shutdown.
-    _skip.wait(::base::saturated_cast<DWORD>(duration.count()));
-
-    if (velocity && buffer)
-    {
-        // When the note ends, we just turn the volume down instead of stopping
-        // the sound buffer. This helps reduce unwanted static between notes.
-        buffer->SetVolume(DSBVOLUME_MIN);
-        buffer->GetCurrentPosition(&_lastBufferPosition, nullptr);
-    }
-
-    // Cycling between multiple buffers can also help reduce the static.
-    _activeBufferIndex = (_activeBufferIndex + 1) % _buffers.size();
-}
-CATCH_LOG()
-
-void MidiAudio::_createBuffers() noexcept
-{
-    auto waveFormat = WAVEFORMATEX{};
-    waveFormat.wFormatTag = WAVE_FORMAT_PCM;
-    waveFormat.nChannels = 1;
-    waveFormat.nSamplesPerSec = 8000;
-    waveFormat.wBitsPerSample = 8;
-    waveFormat.nBlockAlign = waveFormat.nChannels * waveFormat.wBitsPerSample / 8;
-    waveFormat.nAvgBytesPerSec = waveFormat.nSamplesPerSec * waveFormat.nBlockAlign;
-
-    auto bufferDescription = DSBUFFERDESC{};
-    bufferDescription.dwSize = sizeof(DSBUFFERDESC);
-    bufferDescription.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY | DSBCAPS_GLOBALFOCUS;
-    bufferDescription.dwBufferBytes = WAVE_SIZE;
-    bufferDescription.lpwfxFormat = &waveFormat;
-
-    for (auto& buffer : _buffers)
-    {
-        if (SUCCEEDED(_directSound->CreateSoundBuffer(&bufferDescription, &buffer, nullptr)))
-        {
-            LPVOID bufferPtr;
-            DWORD bufferSize;
-            if (SUCCEEDED(buffer->Lock(0, 0, &bufferPtr, &bufferSize, nullptr, nullptr, DSBLOCK_ENTIREBUFFER)))
-            {
-                std::memcpy(bufferPtr, WAVE_DATA.data(), WAVE_DATA.size());
-                buffer->Unlock(bufferPtr, bufferSize, nullptr, 0);
-            }
-            buffer->SetVolume(DSBVOLUME_MIN);
-            buffer->Play(0, 0, DSBPLAY_LOOPING);
-        }
-    }
-}
--- a/src/audio/midi/MidiAudio.hpp
+++ b/src/audio/midi/MidiAudio.hpp
@@ -1,38 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- MidiAudio.hpp
-
-Abstract:
-  This modules provide basic MIDI support with blocking sound output.
-  */
-
-#pragma once
-
-#include <array>
-
-struct IDirectSound8;
-struct IDirectSoundBuffer;
-
-class MidiAudio
-{
-public:
-    void BeginSkip() noexcept;
-    void EndSkip() noexcept;
-    void PlayNote(HWND windowHandle, const int noteNumber, const int velocity, const std::chrono::milliseconds duration) noexcept;
-
-private:
-    void _initialize(HWND windowHandle) noexcept;
-    void _createBuffers() noexcept;
-
-    wil::slim_event_manual_reset _skip;
-
-    HWND _hwnd = nullptr;
-    wil::unique_hmodule _directSoundModule;
-    wil::com_ptr<IDirectSound8> _directSound;
-    std::array<wil::com_ptr<IDirectSoundBuffer>, 2> _buffers;
-    size_t _activeBufferIndex = 0;
-    DWORD _lastBufferPosition = 0;
-};
--- a/src/audio/midi/dirs
+++ b/src/audio/midi/dirs
@@ -1,2 +0,0 @@
-DIRS=lib \
-
--- a/src/audio/midi/lib/midi.vcxproj
+++ b/src/audio/midi/lib/midi.vcxproj
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{3c67784e-1453-49c2-9660-483e2cc7f7ad}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>midi</RootNamespace>
-    <ProjectName>MidiAudio</ProjectName>
-    <TargetName>MidiAudio</TargetName>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)src\common.build.pre.props" />
-  <Import Project="$(SolutionDir)src\common.nugetversions.props" />
-  <ItemGroup>
-    <ClCompile Include="..\MidiAudio.cpp" />
-    <ClCompile Include="..\precomp.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\MidiAudio.hpp" />
-    <ClInclude Include="..\precomp.h" />
-  </ItemGroup>
-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(SolutionDir)src\common.build.post.props" />
-  <Import Project="$(SolutionDir)src\common.nugetversions.targets" />
-</Project>
--- a/src/audio/midi/lib/sources
+++ b/src/audio/midi/lib/sources
@@ -1,8 +0,0 @@
-!include ..\sources.inc
-
-# -------------------------------------
-# Program Information
-# -------------------------------------
-
-TARGETNAME              = ConAudioMidi
-TARGETTYPE              = LIBRARY
--- a/src/audio/midi/precomp.cpp
+++ b/src/audio/midi/precomp.cpp
@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "precomp.h"
--- a/src/audio/midi/precomp.h
+++ b/src/audio/midi/precomp.h
@@ -1,33 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- precomp.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
-
-// clang-format off
-
-// This includes support libraries from the CRT, STL, WIL, and GSL
-#include "LibraryIncludes.h"
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-#define NOMCX
-#define NOHELP
-#define NOCOMM
-#endif
-
-// Windows Header Files:
-#include <Windows.h>
-
-#include <mmeapi.h>
-#include <dsound.h>
-
-// clang-format on
--- a/src/audio/midi/sources.inc
+++ b/src/audio/midi/sources.inc
@@ -1,28 +0,0 @@
-!include ..\..\..\project.inc
-
-# -------------------------------------
-# Windows Console
-# - Console Audio Functions
-# -------------------------------------
-
-# -------------------------------------
-# Build System Settings
-# -------------------------------------
-
-# Code in the OneCore depot automatically excludes default Win32 libraries.
-
-# -------------------------------------
-# Sources, Headers, and Libraries
-# -------------------------------------
-
-PRECOMPILED_CXX         = 1
-PRECOMPILED_INCLUDE     = ..\precomp.h
-
-SOURCES = \
-    ..\MidiAudio.cpp \
-
-INCLUDES = \
-    $(INCLUDES); \
-    ..; \
-    ..\..\..\inc; \
-    $(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
--- a/src/buffer/out/AttrRow.cpp
+++ b/src/buffer/out/AttrRow.cpp
@@ -11,8 +11,8 @@
 // - attr - the default text attribute
 // Return Value:
 // - constructed object
-ATTR_ROW::ATTR_ROW(const til::CoordType width, const TextAttribute attr) :
-    _data(gsl::narrow_cast<uint16_t>(width), attr) {}
+ATTR_ROW::ATTR_ROW(const uint16_t width, const TextAttribute attr) :
+    _data(width, attr) {}

 // Routine Description:
 // - Sets all properties of the ATTR_ROW to default values
@@ -32,9 +32,9 @@ void ATTR_ROW::Reset(const TextAttribute attr)
 // - newWidth - The new width of the row.
 // Return Value:
 // - <none>, throws exceptions on failures.
-void ATTR_ROW::Resize(const til::CoordType newWidth)
+void ATTR_ROW::Resize(const uint16_t newWidth)
 {
-    _data.resize_trailing_extent(gsl::narrow<uint16_t>(newWidth));
+    _data.resize_trailing_extent(newWidth);
 }

 // Routine Description:
@@ -45,9 +45,9 @@ void ATTR_ROW::Resize(const til::CoordType newWidth)
 // - the text attribute at column
 // Note:
 // - will throw on error
-TextAttribute ATTR_ROW::GetAttrByColumn(const til::CoordType column) const
+TextAttribute ATTR_ROW::GetAttrByColumn(const uint16_t column) const
 {
-    return _data.at(gsl::narrow<uint16_t>(column));
+    return _data.at(column);
 }

 // Routine Description:
@@ -74,7 +74,7 @@ std::vector<uint16_t> ATTR_ROW::GetHyperlinks() const
 // - attr - Attribute (color) to fill remaining characters with
 // Return Value:
 // - <none>
-bool ATTR_ROW::SetAttrToEnd(const til::CoordType beginIndex, const TextAttribute attr)
+bool ATTR_ROW::SetAttrToEnd(const uint16_t beginIndex, const TextAttribute attr)
 {
    _data.replace(gsl::narrow<uint16_t>(beginIndex), _data.size(), attr);
    return true;
@@ -95,7 +95,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt

 // Routine Description:
 // - Takes an attribute, and merges it into this row from beginIndex (inclusive) to endIndex (exclusive).
-// - For example, if the current row was [{4, BLUE}], the merge arguments were
+// - For example, if the current row was was [{4, BLUE}], the merge arguments were
 //   { beginIndex = 1, endIndex = 3, newAttr = RED }, then the row would modified to be
 //   [{ 1, BLUE}, {2, RED}, {1, BLUE}].
 // Arguments:
@@ -103,9 +103,9 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
 // - newAttr: The attribute to merge into this row.
 // Return Value:
 // - <none>
-void ATTR_ROW::Replace(const til::CoordType beginIndex, const til::CoordType endIndex, const TextAttribute& newAttr)
+void ATTR_ROW::Replace(const uint16_t beginIndex, const uint16_t endIndex, const TextAttribute& newAttr)
 {
-    _data.replace(gsl::narrow<uint16_t>(beginIndex), gsl::narrow<uint16_t>(endIndex), newAttr);
+    _data.replace(beginIndex, endIndex, newAttr);
 }

 ATTR_ROW::const_iterator ATTR_ROW::begin() const noexcept
--- a/src/buffer/out/AttrRow.hpp
+++ b/src/buffer/out/AttrRow.hpp
@@ -30,7 +30,7 @@ class ATTR_ROW final
 public:
    using const_iterator = rle_vector::const_iterator;

-    ATTR_ROW(til::CoordType width, TextAttribute attr);
+    ATTR_ROW(uint16_t width, TextAttribute attr);

    ~ATTR_ROW() = default;

@@ -40,13 +40,13 @@ public:
    noexcept = default;
    ATTR_ROW& operator=(ATTR_ROW&&) noexcept = default;

-    TextAttribute GetAttrByColumn(til::CoordType column) const;
+    TextAttribute GetAttrByColumn(uint16_t column) const;
    std::vector<uint16_t> GetHyperlinks() const;

-    bool SetAttrToEnd(til::CoordType beginIndex, TextAttribute attr);
+    bool SetAttrToEnd(uint16_t beginIndex, TextAttribute attr);
    void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith);
-    void Resize(til::CoordType newWidth);
-    void Replace(til::CoordType beginIndex, til::CoordType endIndex, const TextAttribute& newAttr);
+    void Resize(uint16_t newWidth);
+    void Replace(uint16_t beginIndex, uint16_t endIndex, const TextAttribute& newAttr);

    const_iterator begin() const noexcept;
    const_iterator end() const noexcept;
--- a/src/buffer/out/CharRow.cpp
+++ b/src/buffer/out/CharRow.cpp
@@ -17,7 +17,7 @@
 // Note: will through if unable to allocate char/attribute buffers
 #pragma warning(push)
 #pragma warning(disable : 26447) // small_vector's constructor says it can throw but it should not given how we use it.  This suppresses this error for the AuditMode build.
-CharRow::CharRow(til::CoordType rowWidth, ROW* const pParent) noexcept :
+CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
    _data(rowWidth, value_type()),
    _pParent{ FAIL_FAST_IF_NULL(pParent) }
 {
@@ -30,9 +30,9 @@ CharRow::CharRow(til::CoordType rowWidth, ROW* const pParent) noexcept :
 // - <none>
 // Return Value:
 // - the size of the row
-til::CoordType CharRow::size() const noexcept
+size_t CharRow::size() const noexcept
 {
-    return gsl::narrow_cast<til::CoordType>(_data.size());
+    return _data.size();
 }

 // Routine Description:
@@ -55,7 +55,7 @@ void CharRow::Reset() noexcept
 // - newSize - the new width of the character and attributes rows
 // Return Value:
 // - S_OK on success, otherwise relevant error code
-[[nodiscard]] HRESULT CharRow::Resize(const til::CoordType newSize) noexcept
+[[nodiscard]] HRESULT CharRow::Resize(const size_t newSize) noexcept
 {
    try
    {
@@ -93,14 +93,14 @@ typename CharRow::const_iterator CharRow::cend() const noexcept
 // - <none>
 // Return Value:
 // - The calculated left boundary of the internal string.
-til::CoordType CharRow::MeasureLeft() const noexcept
+size_t CharRow::MeasureLeft() const noexcept
 {
-    auto it = _data.cbegin();
+    const_iterator it = _data.cbegin();
    while (it != _data.cend() && it->IsSpace())
    {
        ++it;
    }
-    return gsl::narrow_cast<til::CoordType>(it - _data.cbegin());
+    return it - _data.cbegin();
 }

 // Routine Description:
@@ -109,17 +109,17 @@ til::CoordType CharRow::MeasureLeft() const noexcept
 // - <none>
 // Return Value:
 // - The calculated right boundary of the internal string.
-til::CoordType CharRow::MeasureRight() const
+size_t CharRow::MeasureRight() const
 {
-    auto it = _data.crbegin();
+    const_reverse_iterator it = _data.crbegin();
    while (it != _data.crend() && it->IsSpace())
    {
        ++it;
    }
-    return gsl::narrow_cast<til::CoordType>(_data.crend() - it);
+    return _data.crend() - it;
 }

-void CharRow::ClearCell(const til::CoordType column)
+void CharRow::ClearCell(const size_t column)
 {
    _data.at(column).Reset();
 }
@@ -132,7 +132,7 @@ void CharRow::ClearCell(const til::CoordType column)
 // - True if there is valid text in this row. False otherwise.
 bool CharRow::ContainsText() const noexcept
 {
-    for (const auto& cell : _data)
+    for (const value_type& cell : _data)
    {
        if (!cell.IsSpace())
        {
@@ -149,7 +149,7 @@ bool CharRow::ContainsText() const noexcept
 // Return Value:
 // - the attribute
 // Note: will throw exception if column is out of bounds
-const DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column) const
+const DbcsAttribute& CharRow::DbcsAttrAt(const size_t column) const
 {
    return _data.at(column).DbcsAttr();
 }
@@ -161,7 +161,7 @@ const DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column) const
 // Return Value:
 // - the attribute
 // Note: will throw exception if column is out of bounds
-DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column)
+DbcsAttribute& CharRow::DbcsAttrAt(const size_t column)
 {
    return _data.at(column).DbcsAttr();
 }
@@ -173,7 +173,7 @@ DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column)
 // Return Value:
 // - <none>
 // Note: will throw exception if column is out of bounds
-void CharRow::ClearGlyph(const til::CoordType column)
+void CharRow::ClearGlyph(const size_t column)
 {
    _data.at(column).EraseChars();
 }
@@ -185,9 +185,9 @@ void CharRow::ClearGlyph(const til::CoordType column)
 // Return Value:
 // - text data at column
 // - Note: will throw exception if column is out of bounds
-const CharRow::reference CharRow::GlyphAt(const til::CoordType column) const
+const CharRow::reference CharRow::GlyphAt(const size_t column) const
 {
-    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));
+    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
    return { const_cast<CharRow&>(*this), column };
 }

@@ -198,9 +198,9 @@ const CharRow::reference CharRow::GlyphAt(const til::CoordType column) const
 // Return Value:
 // - text data at column
 // - Note: will throw exception if column is out of bounds
-CharRow::reference CharRow::GlyphAt(const til::CoordType column)
+CharRow::reference CharRow::GlyphAt(const size_t column)
 {
-    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));
+    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
    return { *this, column };
 }

@@ -209,7 +209,7 @@ std::wstring CharRow::GetText() const
    std::wstring wstr;
    wstr.reserve(_data.size());

-    for (til::CoordType i = 0; i < gsl::narrow_cast<til::CoordType>(_data.size()); ++i)
+    for (size_t i = 0; i < _data.size(); ++i)
    {
        const auto glyph = GlyphAt(i);
        if (!DbcsAttrAt(i).IsTrailing())
@@ -231,9 +231,9 @@ std::wstring CharRow::GetText() const
 // - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
 // Return Value:
 // - the delimiter class for the given char
-const DelimiterClass CharRow::DelimiterClassAt(const til::CoordType column, const std::wstring_view wordDelimiters) const
+const DelimiterClass CharRow::DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const
 {
-    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));
+    THROW_HR_IF(E_INVALIDARG, column >= _data.size());

    const auto glyph = *GlyphAt(column).begin();
    if (glyph <= UNICODE_SPACE)
@@ -265,10 +265,10 @@ const UnicodeStorage& CharRow::GetUnicodeStorage() const noexcept
 // Arguments:
 // - column - the column to generate the key for
 // Return Value:
-// - the til::point key for data access from UnicodeStorage for the column
-til::point CharRow::GetStorageKey(const til::CoordType column) const noexcept
+// - the COORD key for data access from UnicodeStorage for the column
+COORD CharRow::GetStorageKey(const size_t column) const noexcept
 {
-    return { column, _pParent->GetId() };
+    return { gsl::narrow<SHORT>(column), _pParent->GetId() };
 }

 // Routine Description:
--- a/src/buffer/out/CharRow.hpp
+++ b/src/buffer/out/CharRow.hpp
@@ -54,22 +54,22 @@ public:
    using const_reverse_iterator = typename boost::container::small_vector_base<value_type>::const_reverse_iterator;
    using reference = typename CharRowCellReference;

-    CharRow(til::CoordType rowWidth, ROW* const pParent) noexcept;
+    CharRow(size_t rowWidth, ROW* const pParent) noexcept;

-    til::CoordType size() const noexcept;
-    [[nodiscard]] HRESULT Resize(const til::CoordType newSize) noexcept;
-    til::CoordType MeasureLeft() const noexcept;
-    til::CoordType MeasureRight() const;
+    size_t size() const noexcept;
+    [[nodiscard]] HRESULT Resize(const size_t newSize) noexcept;
+    size_t MeasureLeft() const noexcept;
+    size_t MeasureRight() const;
    bool ContainsText() const noexcept;
-    const DbcsAttribute& DbcsAttrAt(const til::CoordType column) const;
-    DbcsAttribute& DbcsAttrAt(const til::CoordType column);
-    void ClearGlyph(const til::CoordType column);
+    const DbcsAttribute& DbcsAttrAt(const size_t column) const;
+    DbcsAttribute& DbcsAttrAt(const size_t column);
+    void ClearGlyph(const size_t column);

-    const DelimiterClass DelimiterClassAt(const til::CoordType column, const std::wstring_view wordDelimiters) const;
+    const DelimiterClass DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const;

    // working with glyphs
-    const reference GlyphAt(const til::CoordType column) const;
-    reference GlyphAt(const til::CoordType column);
+    const reference GlyphAt(const size_t column) const;
+    reference GlyphAt(const size_t column);

    // iterators
    iterator begin() noexcept;
@@ -82,7 +82,7 @@ public:

    UnicodeStorage& GetUnicodeStorage() noexcept;
    const UnicodeStorage& GetUnicodeStorage() const noexcept;
-    til::point GetStorageKey(const til::CoordType column) const noexcept;
+    COORD GetStorageKey(const size_t column) const noexcept;

    void UpdateParent(ROW* const pParent);

@@ -91,7 +91,7 @@ public:

 private:
    void Reset() noexcept;
-    void ClearCell(const til::CoordType column);
+    void ClearCell(const size_t column);
    std::wstring GetText() const;

 protected:
--- a/src/buffer/out/CharRowCellReference.cpp
+++ b/src/buffer/out/CharRowCellReference.cpp
@@ -110,7 +110,7 @@ CharRowCellReference::const_iterator CharRowCellReference::end() const

 bool operator==(const CharRowCellReference& ref, const std::vector<wchar_t>& glyph)
 {
-    const auto& dbcsAttr = ref._cellData().DbcsAttr();
+    const DbcsAttribute& dbcsAttr = ref._cellData().DbcsAttr();
    if (glyph.size() == 1 && dbcsAttr.IsGlyphStored())
    {
        return false;
--- a/src/buffer/out/CharRowCellReference.hpp
+++ b/src/buffer/out/CharRowCellReference.hpp
@@ -25,7 +25,7 @@ class CharRowCellReference final
 public:
    using const_iterator = const wchar_t*;

-    CharRowCellReference(CharRow& parent, const til::CoordType index) noexcept :
+    CharRowCellReference(CharRow& parent, const size_t index) noexcept :
        _parent{ parent },
        _index{ index }
    {
@@ -51,7 +51,7 @@ private:
    // what char row the object belongs to
    CharRow& _parent;
    // the index of the cell in the parent char row
-    til::CoordType _index;
+    const size_t _index;

    CharRowCell& _cellData();
    const CharRowCell& _cellData() const;
--- a/src/buffer/out/LineRendition.hpp
+++ b/src/buffer/out/LineRendition.hpp
@@ -21,16 +21,16 @@ enum class LineRendition
    DoubleHeightBottom
 };

-constexpr til::inclusive_rect ScreenToBufferLine(const til::inclusive_rect& line, const LineRendition lineRendition)
+constexpr SMALL_RECT ScreenToBufferLine(const SMALL_RECT& line, const LineRendition lineRendition)
 {
    // Use shift right to quickly divide the Left and Right by 2 for double width lines.
    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
    return { line.Left >> scale, line.Top, line.Right >> scale, line.Bottom };
 }

-constexpr til::inclusive_rect BufferToScreenLine(const til::inclusive_rect& line, const LineRendition lineRendition)
+constexpr SMALL_RECT BufferToScreenLine(const SMALL_RECT& line, const LineRendition lineRendition)
 {
    // Use shift left to quickly multiply the Left and Right by 2 for double width lines.
-    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    const SHORT scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
    return { line.Left << scale, line.Top, (line.Right << scale) + scale, line.Bottom };
 }
--- a/src/buffer/out/OutputCellIterator.cpp
+++ b/src/buffer/out/OutputCellIterator.cpp
@@ -97,14 +97,14 @@ OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text) :
 // Arguments:
 // - utf16Text - UTF-16 text range
 // - attribute - Color to apply over the entire range
-OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute& attribute, const size_t fillLimit) :
+OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute attribute) :
    _mode(Mode::Loose),
    _currentView(s_GenerateView(utf16Text, attribute)),
    _run(utf16Text),
    _attr(attribute),
    _distance(0),
    _pos(0),
-    _fillLimit(fillLimit)
+    _fillLimit(0)
 {
 }

@@ -302,7 +302,7 @@ OutputCellIterator& OutputCellIterator::operator++()
 // - Reference to self after advancement.
 OutputCellIterator OutputCellIterator::operator++(int)
 {
-    auto temp = *this;
+    auto temp(*this);
    operator++();
    return temp;
 }
@@ -478,7 +478,7 @@ OutputCellView OutputCellIterator::s_GenerateView(const wchar_t& wch, const Text
 // - Object representing the view into this cell
 OutputCellView OutputCellIterator::s_GenerateViewLegacyAttr(const WORD& legacyAttr) noexcept
 {
-    auto cleanAttr = legacyAttr;
+    WORD cleanAttr = legacyAttr;
    WI_ClearAllFlags(cleanAttr, COMMON_LVB_SBCSDBCS); // don't use legacy lead/trailing byte flags for colors

    const TextAttribute attr(cleanAttr);
@@ -531,16 +531,16 @@ OutputCellView OutputCellIterator::s_GenerateView(const OutputCell& cell)
 // - Gets the distance between two iterators relative to the input data given in.
 // Return Value:
 // - The number of items of the input run consumed between these two iterators.
-til::CoordType OutputCellIterator::GetInputDistance(OutputCellIterator other) const noexcept
+ptrdiff_t OutputCellIterator::GetInputDistance(OutputCellIterator other) const noexcept
 {
-    return gsl::narrow_cast<til::CoordType>(_pos - other._pos);
+    return _pos - other._pos;
 }

 // Routine Description:
 // - Gets the distance between two iterators relative to the number of cells inserted.
 // Return Value:
 // - The number of cells in the backing buffer filled between these two iterators.
-til::CoordType OutputCellIterator::GetCellDistance(OutputCellIterator other) const noexcept
+ptrdiff_t OutputCellIterator::GetCellDistance(OutputCellIterator other) const noexcept
 {
-    return gsl::narrow_cast<til::CoordType>(_distance - other._distance);
+    return _distance - other._distance;
 }
--- a/src/buffer/out/OutputCellIterator.hpp
+++ b/src/buffer/out/OutputCellIterator.hpp
@@ -29,7 +29,7 @@ class OutputCellIterator final
 public:
    using iterator_category = std::input_iterator_tag;
    using value_type = OutputCellView;
-    using difference_type = til::CoordType;
+    using difference_type = ptrdiff_t;
    using pointer = OutputCellView*;
    using reference = OutputCellView&;

@@ -38,7 +38,7 @@ public:
    OutputCellIterator(const wchar_t& wch, const TextAttribute& attr, const size_t fillLimit = 0) noexcept;
    OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit = 0) noexcept;
    OutputCellIterator(const std::wstring_view utf16Text);
-    OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute& attribute, const size_t fillLimit = 0);
+    OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute attribute);
    OutputCellIterator(const gsl::span<const WORD> legacyAttributes) noexcept;
    OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept;
    OutputCellIterator(const gsl::span<const OutputCell> cells);
@@ -48,9 +48,9 @@ public:

    operator bool() const noexcept;

-    til::CoordType GetCellDistance(OutputCellIterator other) const noexcept;
-    til::CoordType GetInputDistance(OutputCellIterator other) const noexcept;
-    friend til::CoordType operator-(OutputCellIterator one, OutputCellIterator two) = delete;
+    ptrdiff_t GetCellDistance(OutputCellIterator other) const noexcept;
+    ptrdiff_t GetInputDistance(OutputCellIterator other) const noexcept;
+    friend ptrdiff_t operator-(OutputCellIterator one, OutputCellIterator two) = delete;

    OutputCellIterator& operator++();
    OutputCellIterator operator++(int);
--- a/src/buffer/out/OutputCellRect.cpp
+++ b/src/buffer/out/OutputCellRect.cpp
@@ -21,11 +21,14 @@ OutputCellRect::OutputCellRect() noexcept :
 // Arguments:
 // - rows - Rows in the rectangle (height)
 // - cols - Columns in the rectangle (width)
-OutputCellRect::OutputCellRect(const til::CoordType rows, const til::CoordType cols) :
+OutputCellRect::OutputCellRect(const size_t rows, const size_t cols) :
    _rows(rows),
    _cols(cols)
 {
-    _storage.resize(gsl::narrow<size_t>(rows * cols));
+    size_t totalCells;
+    THROW_IF_FAILED(SizeTMult(rows, cols, &totalCells));
+
+    _storage.resize(totalCells);
 }

 // Routine Description:
@@ -34,7 +37,7 @@ OutputCellRect::OutputCellRect(const til::CoordType rows, const til::CoordType c
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Read/write span of OutputCells
-gsl::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
+gsl::span<OutputCell> OutputCellRect::GetRow(const size_t row)
 {
    return gsl::span<OutputCell>(_FindRowOffset(row), _cols);
 }
@@ -45,7 +48,7 @@ gsl::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Read-only iterator of OutputCells
-OutputCellIterator OutputCellRect::GetRowIter(const til::CoordType row) const
+OutputCellIterator OutputCellRect::GetRowIter(const size_t row) const
 {
    const gsl::span<const OutputCell> view(_FindRowOffset(row), _cols);

@@ -59,9 +62,9 @@ OutputCellIterator OutputCellRect::GetRowIter(const til::CoordType row) const
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Pointer to the location in the rectangle that represents the start of the requested row.
-OutputCell* OutputCellRect::_FindRowOffset(const til::CoordType row)
+OutputCell* OutputCellRect::_FindRowOffset(const size_t row)
 {
-    return &_storage.at(gsl::narrow_cast<size_t>(row * _cols));
+    return &_storage.at(row * _cols);
 }

 // Routine Description:
@@ -71,16 +74,16 @@ OutputCell* OutputCellRect::_FindRowOffset(const til::CoordType row)
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Pointer to the location in the rectangle that represents the start of the requested row.
-const OutputCell* OutputCellRect::_FindRowOffset(const til::CoordType row) const
+const OutputCell* OutputCellRect::_FindRowOffset(const size_t row) const
 {
-    return &_storage.at(gsl::narrow_cast<size_t>(row * _cols));
+    return &_storage.at(row * _cols);
 }

 // Routine Description:
 // - Gets the height of the rectangle
 // Return Value:
 // - Height
-til::CoordType OutputCellRect::Height() const noexcept
+size_t OutputCellRect::Height() const noexcept
 {
    return _rows;
 }
@@ -89,7 +92,7 @@ til::CoordType OutputCellRect::Height() const noexcept
 // - Gets the width of the rectangle
 // Return Value:
 // - Width
-til::CoordType OutputCellRect::Width() const noexcept
+size_t OutputCellRect::Width() const noexcept
 {
    return _cols;
 }
--- a/src/buffer/out/OutputCellRect.hpp
+++ b/src/buffer/out/OutputCellRect.hpp
@@ -30,20 +30,20 @@ class OutputCellRect final
 {
 public:
    OutputCellRect() noexcept;
-    OutputCellRect(const til::CoordType rows, const til::CoordType cols);
+    OutputCellRect(const size_t rows, const size_t cols);

-    gsl::span<OutputCell> GetRow(const til::CoordType row);
-    OutputCellIterator GetRowIter(const til::CoordType row) const;
+    gsl::span<OutputCell> GetRow(const size_t row);
+    OutputCellIterator GetRowIter(const size_t row) const;

-    til::CoordType Height() const noexcept;
-    til::CoordType Width() const noexcept;
+    size_t Height() const noexcept;
+    size_t Width() const noexcept;

 private:
    std::vector<OutputCell> _storage;

-    OutputCell* _FindRowOffset(const til::CoordType row);
-    const OutputCell* _FindRowOffset(const til::CoordType row) const;
+    OutputCell* _FindRowOffset(const size_t row);
+    const OutputCell* _FindRowOffset(const size_t row) const;

-    til::CoordType _cols;
-    til::CoordType _rows;
+    size_t _cols;
+    size_t _rows;
 };
--- a/src/buffer/out/OutputCellView.cpp
+++ b/src/buffer/out/OutputCellView.cpp
@@ -38,7 +38,7 @@ OutputCellView::OutputCellView(const std::wstring_view view,
 // - Reports how many columns we expect the Chars() text data to consume
 // Return Value:
 // - Count of column cells on the screen
-til::CoordType OutputCellView::Columns() const noexcept
+size_t OutputCellView::Columns() const noexcept
 {
    if (DbcsAttr().IsSingle())
    {
--- a/src/buffer/out/OutputCellView.hpp
+++ b/src/buffer/out/OutputCellView.hpp
@@ -31,7 +31,7 @@ public:
                   const TextAttributeBehavior behavior) noexcept;

    const std::wstring_view& Chars() const noexcept;
-    til::CoordType Columns() const noexcept;
+    size_t Columns() const noexcept;
    DbcsAttribute DbcsAttr() const noexcept;
    TextAttribute TextAttr() const noexcept;
    TextAttributeBehavior TextAttrBehavior() const noexcept;
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -16,7 +16,7 @@
 // - pParent - the text buffer that this row belongs to
 // Return Value:
 // - constructed object
-ROW::ROW(const til::CoordType rowId, const til::CoordType rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
+ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
    _id{ rowId },
    _rowWidth{ rowWidth },
    _charRow{ rowWidth, this },
@@ -58,7 +58,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - width - the new width, in cells
 // Return Value:
 // - S_OK if successful, otherwise relevant error
-[[nodiscard]] HRESULT ROW::Resize(const til::CoordType width)
+[[nodiscard]] HRESULT ROW::Resize(const unsigned short width)
 {
    RETURN_IF_FAILED(_charRow.Resize(width));
    try
@@ -78,7 +78,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - column - 0-indexed column index
 // Return Value:
 // - <none>
-void ROW::ClearColumn(const til::CoordType column)
+void ROW::ClearColumn(const size_t column)
 {
    THROW_HR_IF(E_INVALIDARG, column >= _charRow.size());
    _charRow.ClearCell(column);
@@ -103,7 +103,7 @@ const UnicodeStorage& ROW::GetUnicodeStorage() const noexcept
 // - limitRight - right inclusive column ID for the last write in this row. (optional, will just write to the end of row if nullopt)
 // Return Value:
 // - iterator to first cell that was not written to this row.
-OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType index, const std::optional<bool> wrap, std::optional<til::CoordType> limitRight)
+OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap, std::optional<size_t> limitRight)
 {
    THROW_HR_IF(E_INVALIDARG, index >= _charRow.size());
    THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= _charRow.size());
@@ -113,8 +113,8 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType i

    auto currentColor = it->TextAttr();
    uint16_t colorUses = 0;
-    auto colorStarts = gsl::narrow_cast<uint16_t>(index);
-    auto currentIndex = colorStarts;
+    uint16_t colorStarts = gsl::narrow_cast<uint16_t>(index);
+    uint16_t currentIndex = colorStarts;

    while (it && currentIndex <= finalColumnInRow)
    {
@@ -141,7 +141,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType i
        // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
        if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
        {
-            const auto fillingLastColumn = currentIndex == finalColumnInRow;
+            const bool fillingLastColumn = currentIndex == finalColumnInRow;

            // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
            // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
--- a/src/buffer/out/Row.hpp
+++ b/src/buffer/out/Row.hpp
@@ -32,9 +32,9 @@ class TextBuffer;
 class ROW final
 {
 public:
-    ROW(const til::CoordType rowId, const til::CoordType rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);
+    ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);

-    til::CoordType size() const noexcept { return _rowWidth; }
+    size_t size() const noexcept { return _rowWidth; }

    void SetWrapForced(const bool wrap) noexcept { _wrapForced = wrap; }
    bool WasWrapForced() const noexcept { return _wrapForced; }
@@ -51,19 +51,19 @@ public:
    LineRendition GetLineRendition() const noexcept { return _lineRendition; }
    void SetLineRendition(const LineRendition lineRendition) noexcept { _lineRendition = lineRendition; }

-    til::CoordType GetId() const noexcept { return _id; }
-    void SetId(const til::CoordType id) noexcept { _id = id; }
+    SHORT GetId() const noexcept { return _id; }
+    void SetId(const SHORT id) noexcept { _id = id; }

    bool Reset(const TextAttribute Attr);
-    [[nodiscard]] HRESULT Resize(const til::CoordType width);
+    [[nodiscard]] HRESULT Resize(const unsigned short width);

-    void ClearColumn(const til::CoordType column);
+    void ClearColumn(const size_t column);
    std::wstring GetText() const { return _charRow.GetText(); }

    UnicodeStorage& GetUnicodeStorage() noexcept;
    const UnicodeStorage& GetUnicodeStorage() const noexcept;

-    OutputCellIterator WriteCells(OutputCellIterator it, const til::CoordType index, const std::optional<bool> wrap = std::nullopt, std::optional<til::CoordType> limitRight = std::nullopt);
+    OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);

 #ifdef UNIT_TESTING
    friend constexpr bool operator==(const ROW& a, const ROW& b) noexcept;
@@ -74,8 +74,8 @@ private:
    CharRow _charRow;
    ATTR_ROW _attrRow;
    LineRendition _lineRendition;
-    til::CoordType _id;
-    til::CoordType _rowWidth;
+    SHORT _id;
+    unsigned short _rowWidth;
    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
    bool _wrapForced;
    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
--- a/src/buffer/out/TextAttribute.cpp
+++ b/src/buffer/out/TextAttribute.cpp
@@ -11,8 +11,6 @@ static_assert(sizeof(TextAttribute) == 14);
 static_assert(alignof(TextAttribute) == 2);
 // Ensure that we can memcpy() and memmove() the struct for performance.
 static_assert(std::is_trivially_copyable_v<TextAttribute>);
-// Assert that the use of memcmp() for comparisons is safe.
-static_assert(std::has_unique_object_representations_v<TextAttribute>);

 namespace
 {
@@ -114,10 +112,10 @@ TextAttribute TextAttribute::StripErroneousVT16VersionsOfLegacyDefaults(const Te
 // - a WORD with legacy-style attributes for this textattribute.
 WORD TextAttribute::GetLegacyAttributes() const noexcept
 {
-    const auto fgIndex = _foreground.GetLegacyIndex(s_legacyDefaultForeground);
-    const auto bgIndex = _background.GetLegacyIndex(s_legacyDefaultBackground);
+    const BYTE fgIndex = _foreground.GetLegacyIndex(s_legacyDefaultForeground);
+    const BYTE bgIndex = _background.GetLegacyIndex(s_legacyDefaultBackground);
    const WORD metaAttrs = _wAttrLegacy & META_ATTRS;
-    const auto brighten = IsIntense() && _foreground.CanBeBrightened();
+    const bool brighten = IsIntense() && _foreground.CanBeBrightened();
    return fgIndex | (bgIndex << 4) | metaAttrs | (brighten ? FOREGROUND_INTENSITY : 0);
 }

@@ -357,6 +355,11 @@ void TextAttribute::SetReverseVideo(bool isReversed) noexcept
    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_REVERSE_VIDEO, isReversed);
 }

+ExtendedAttributes TextAttribute::GetExtendedAttributes() const noexcept
+{
+    return _extendedAttrs;
+}
+
 // Routine Description:
 // - swaps foreground and background color
 void TextAttribute::Invert() noexcept
--- a/src/buffer/out/TextAttribute.hpp
+++ b/src/buffer/out/TextAttribute.hpp
@@ -76,15 +76,12 @@ public:

    void Invert() noexcept;

-    inline bool operator==(const TextAttribute& other) const noexcept
-    {
-        return memcmp(this, &other, sizeof(TextAttribute)) == 0;
-    }
-
-    inline bool operator!=(const TextAttribute& other) const noexcept
-    {
-        return memcmp(this, &other, sizeof(TextAttribute)) != 0;
-    }
+    friend constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexcept;
+    friend constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept;
+    friend constexpr bool operator==(const TextAttribute& attr, const WORD& legacyAttr) noexcept;
+    friend constexpr bool operator!=(const TextAttribute& attr, const WORD& legacyAttr) noexcept;
+    friend constexpr bool operator==(const WORD& legacyAttr, const TextAttribute& attr) noexcept;
+    friend constexpr bool operator!=(const WORD& legacyAttr, const TextAttribute& attr) noexcept;

    bool IsLegacy() const noexcept;
    bool IsIntense() const noexcept;
@@ -109,10 +106,7 @@ public:
    void SetOverlined(bool isOverlined) noexcept;
    void SetReverseVideo(bool isReversed) noexcept;

-    constexpr ExtendedAttributes GetExtendedAttributes() const noexcept
-    {
-        return _extendedAttrs;
-    }
+    ExtendedAttributes GetExtendedAttributes() const noexcept;

    bool IsHyperlink() const noexcept;

@@ -164,13 +158,6 @@ public:
    {
        return WI_IsAnyFlagSet(_wAttrLegacy, COMMON_LVB_GRID_HORIZONTAL | COMMON_LVB_GRID_LVERTICAL | COMMON_LVB_GRID_RVERTICAL | COMMON_LVB_UNDERSCORE);
    }
-    constexpr bool HasAnyExtendedAttributes() const noexcept
-    {
-        return GetExtendedAttributes() != ExtendedAttributes::Normal ||
-               IsAnyGridLineEnabled() ||
-               GetHyperlinkId() != 0 ||
-               IsReverseVideo();
-    }

 private:
    static std::array<TextColor, 16> s_legacyForegroundColorMap;
@@ -180,7 +167,7 @@ private:
    uint16_t _hyperlinkId; // sizeof: 2, alignof: 2
    TextColor _foreground; // sizeof: 4, alignof: 1
    TextColor _background; // sizeof: 4, alignof: 1
-    ExtendedAttributes _extendedAttrs; // sizeof: 2, alignof: 2
+    ExtendedAttributes _extendedAttrs; // sizeof: 1, alignof: 1

 #ifdef UNIT_TESTING
    friend class TextBufferTests;
@@ -197,6 +184,20 @@ enum class TextAttributeBehavior
    StoredOnly, // only use the contained text attribute and skip the insertion of anything else
 };

+constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexcept
+{
+    return a._wAttrLegacy == b._wAttrLegacy &&
+           a._foreground == b._foreground &&
+           a._background == b._background &&
+           a._extendedAttrs == b._extendedAttrs &&
+           a._hyperlinkId == b._hyperlinkId;
+}
+
+constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept
+{
+    return !(a == b);
+}
+
 #ifdef UNIT_TESTING

 #define LOG_ATTR(attr) (Log::Comment(NoThrowString().Format( \
--- a/src/buffer/out/TextColor.cpp
+++ b/src/buffer/out/TextColor.cpp
@@ -54,8 +54,6 @@ constexpr std::array<BYTE, 256> Index256ToIndex16 = {

 // We should only need 4B for TextColor. Any more than that is just waste.
 static_assert(sizeof(TextColor) == 4);
-// Assert that the use of memcmp() for comparisons is safe.
-static_assert(std::has_unique_object_representations_v<TextColor>);

 bool TextColor::CanBeBrightened() const noexcept
 {
@@ -113,8 +111,6 @@ void TextColor::SetIndex(const BYTE index, const bool isIndex256) noexcept
 {
    _meta = isIndex256 ? ColorType::IsIndex256 : ColorType::IsIndex16;
    _index = index;
-    _green = 0;
-    _blue = 0;
 }

 // Method Description:
@@ -127,9 +123,6 @@ void TextColor::SetIndex(const BYTE index, const bool isIndex256) noexcept
 void TextColor::SetDefault() noexcept
 {
    _meta = ColorType::IsDefault;
-    _red = 0;
-    _green = 0;
-    _blue = 0;
 }

 // Method Description:
--- a/src/buffer/out/TextColor.h
+++ b/src/buffer/out/TextColor.h
@@ -49,8 +49,6 @@ enum class ColorAlias : size_t
 {
    DefaultForeground,
    DefaultBackground,
-    FrameForeground,
-    FrameBackground,
    ENUM_COUNT // must be the last element in the enum class
 };

@@ -74,13 +72,10 @@ public:
    static constexpr BYTE BRIGHT_CYAN = 14;
    static constexpr BYTE BRIGHT_WHITE = 15;

-    // Entries 256 to 260 are reserved for XTerm compatibility.
-    static constexpr size_t DEFAULT_FOREGROUND = 261;
-    static constexpr size_t DEFAULT_BACKGROUND = 262;
-    static constexpr size_t FRAME_FOREGROUND = 263;
-    static constexpr size_t FRAME_BACKGROUND = 264;
-    static constexpr size_t CURSOR_COLOR = 265;
-    static constexpr size_t TABLE_SIZE = 266;
+    static constexpr size_t DEFAULT_FOREGROUND = 256;
+    static constexpr size_t DEFAULT_BACKGROUND = 257;
+    static constexpr size_t CURSOR_COLOR = 258;
+    static constexpr size_t TABLE_SIZE = 259;

    constexpr TextColor() noexcept :
        _meta{ ColorType::IsDefault },
@@ -106,15 +101,8 @@ public:
    {
    }

-    bool operator==(const TextColor& other) const noexcept
-    {
-        return memcmp(this, &other, sizeof(TextColor)) == 0;
-    }
-
-    bool operator!=(const TextColor& other) const noexcept
-    {
-        return memcmp(this, &other, sizeof(TextColor)) != 0;
-    }
+    friend constexpr bool operator==(const TextColor& a, const TextColor& b) noexcept;
+    friend constexpr bool operator!=(const TextColor& a, const TextColor& b) noexcept;

    bool CanBeBrightened() const noexcept;
    bool IsLegacy() const noexcept;
@@ -163,6 +151,19 @@ private:
 #endif
 };

+bool constexpr operator==(const TextColor& a, const TextColor& b) noexcept
+{
+    return a._meta == b._meta &&
+           a._red == b._red &&
+           a._green == b._green &&
+           a._blue == b._blue;
+}
+
+bool constexpr operator!=(const TextColor& a, const TextColor& b) noexcept
+{
+    return !(a == b);
+}
+
 #ifdef UNIT_TESTING

 namespace WEX
--- a/src/buffer/out/UnicodeStorage.cpp
+++ b/src/buffer/out/UnicodeStorage.cpp
@@ -47,7 +47,7 @@ void UnicodeStorage::Erase(const key_type key) noexcept
 // - rowMap - A map of the old row IDs to the new row IDs.
 // - width - The width of the new row. Remove any items that are beyond the row width.
 //         - Use nullopt if we're not resizing the width of the row, just renumbering the rows.
-void UnicodeStorage::Remap(const std::unordered_map<til::CoordType, til::CoordType>& rowMap, const std::optional<til::CoordType> width)
+void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width)
 {
    // Make a temporary map to hold all the new row positioning
    std::unordered_map<key_type, mapped_type> newMap;
@@ -87,7 +87,7 @@ void UnicodeStorage::Remap(const std::unordered_map<til::CoordType, til::CoordTy
        const auto newRowId = mapIter->second;

        // Generate a new coordinate with the same X as the old one, but a new Y value.
-        const auto newCoord = til::point{ oldCoord.X, newRowId };
+        const auto newCoord = COORD{ oldCoord.X, newRowId };

        // Put the adjusted coordinate into the map with the original value.
        newMap.emplace(newCoord, pair.second);
--- a/src/buffer/out/UnicodeStorage.hpp
+++ b/src/buffer/out/UnicodeStorage.hpp
@@ -20,11 +20,11 @@ Author(s):
 #include <til/bit.h>
 #include <til/hash.h>

-// std::unordered_map needs help to know how to hash a til::point
+// std::unordered_map needs help to know how to hash a COORD
 namespace std
 {
    template<>
-    struct hash<til::point>
+    struct hash<COORD>
    {
        // Routine Description:
        // - hashes a coord. coord will be hashed by storing the x and y values consecutively in the lower
@@ -33,9 +33,9 @@ namespace std
        // - coord - the coord to hash
        // Return Value:
        // - the hashed coord
-        constexpr size_t operator()(const til::point coord) const noexcept
+        constexpr size_t operator()(const COORD& coord) const noexcept
        {
-            return til::hash(til::bit_cast<uint64_t>(coord));
+            return til::hash(til::bit_cast<uint32_t>(coord));
        }
    };
 }
@@ -43,7 +43,7 @@ namespace std
 class UnicodeStorage final
 {
 public:
-    using key_type = typename til::point;
+    using key_type = typename COORD;
    using mapped_type = typename std::vector<wchar_t>;

    UnicodeStorage() noexcept;
@@ -54,7 +54,7 @@ public:

    void Erase(const key_type key) noexcept;

-    void Remap(const std::unordered_map<til::CoordType, til::CoordType>& rowMap, const std::optional<til::CoordType> width);
+    void Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width);

 private:
    std::unordered_map<key_type, mapped_type> _map;
--- a/src/buffer/out/cursor.cpp
+++ b/src/buffer/out/cursor.cpp
@@ -13,6 +13,7 @@
 // - ulSize - The height of the cursor within this buffer
 Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
    _parentBuffer{ parentBuffer },
+    _cPosition{ 0 },
    _fHasMoved(false),
    _fIsVisible(true),
    _fIsOn(true),
@@ -22,6 +23,7 @@ Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
    _fIsConversionArea(false),
    _fIsPopupShown(false),
    _fDelayedEolWrap(false),
+    _coordDelayedAt{ 0 },
    _fDeferCursorRedraw(false),
    _fHaveDeferredCursorRedraw(false),
    _ulSize(ulSize),
@@ -33,7 +35,7 @@ Cursor::~Cursor()
 {
 }

-til::point Cursor::GetPosition() const noexcept
+COORD Cursor::GetPosition() const noexcept
 {
    return _cPosition;
 }
@@ -190,58 +192,59 @@ void Cursor::_RedrawCursorAlways() noexcept
    CATCH_LOG();
 }

-void Cursor::SetPosition(const til::point cPosition) noexcept
+void Cursor::SetPosition(const COORD cPosition) noexcept
 {
    _RedrawCursor();
-    _cPosition = cPosition;
+    _cPosition.X = cPosition.X;
+    _cPosition.Y = cPosition.Y;
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::SetXPosition(const til::CoordType NewX) noexcept
+void Cursor::SetXPosition(const int NewX) noexcept
 {
    _RedrawCursor();
-    _cPosition.X = NewX;
+    _cPosition.X = gsl::narrow<SHORT>(NewX);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::SetYPosition(const til::CoordType NewY) noexcept
+void Cursor::SetYPosition(const int NewY) noexcept
 {
    _RedrawCursor();
-    _cPosition.Y = NewY;
+    _cPosition.Y = gsl::narrow<SHORT>(NewY);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::IncrementXPosition(const til::CoordType DeltaX) noexcept
+void Cursor::IncrementXPosition(const int DeltaX) noexcept
 {
    _RedrawCursor();
-    _cPosition.X += DeltaX;
+    _cPosition.X += gsl::narrow<SHORT>(DeltaX);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::IncrementYPosition(const til::CoordType DeltaY) noexcept
+void Cursor::IncrementYPosition(const int DeltaY) noexcept
 {
    _RedrawCursor();
-    _cPosition.Y += DeltaY;
+    _cPosition.Y += gsl::narrow<SHORT>(DeltaY);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::DecrementXPosition(const til::CoordType DeltaX) noexcept
+void Cursor::DecrementXPosition(const int DeltaX) noexcept
 {
    _RedrawCursor();
-    _cPosition.X -= DeltaX;
+    _cPosition.X -= gsl::narrow<SHORT>(DeltaX);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }

-void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
+void Cursor::DecrementYPosition(const int DeltaY) noexcept
 {
    _RedrawCursor();
-    _cPosition.Y -= DeltaY;
+    _cPosition.Y -= gsl::narrow<SHORT>(DeltaY);
    _RedrawCursor();
    ResetDelayEOLWrap();
 }
@@ -281,7 +284,7 @@ void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
    _cursorType = OtherCursor._cursorType;
 }

-void Cursor::DelayEOLWrap(const til::point coordDelayedAt) noexcept
+void Cursor::DelayEOLWrap(const COORD coordDelayedAt) noexcept
 {
    _coordDelayedAt = coordDelayedAt;
    _fDelayedEolWrap = true;
@@ -289,11 +292,11 @@ void Cursor::DelayEOLWrap(const til::point coordDelayedAt) noexcept

 void Cursor::ResetDelayEOLWrap() noexcept
 {
-    _coordDelayedAt = {};
+    _coordDelayedAt = { 0 };
    _fDelayedEolWrap = false;
 }

-til::point Cursor::GetDelayedAtPosition() const noexcept
+COORD Cursor::GetDelayedAtPosition() const noexcept
 {
    return _coordDelayedAt;
 }
--- a/src/buffer/out/cursor.h
+++ b/src/buffer/out/cursor.h
@@ -47,7 +47,7 @@ public:
    bool IsPopupShown() const noexcept;
    bool GetDelay() const noexcept;
    ULONG GetSize() const noexcept;
-    til::point GetPosition() const noexcept;
+    COORD GetPosition() const noexcept;

    const CursorType GetType() const noexcept;

@@ -66,19 +66,19 @@ public:
    void SetSize(const ULONG ulSize) noexcept;
    void SetStyle(const ULONG ulSize, const CursorType type) noexcept;

-    void SetPosition(const til::point cPosition) noexcept;
-    void SetXPosition(const til::CoordType NewX) noexcept;
-    void SetYPosition(const til::CoordType NewY) noexcept;
-    void IncrementXPosition(const til::CoordType DeltaX) noexcept;
-    void IncrementYPosition(const til::CoordType DeltaY) noexcept;
-    void DecrementXPosition(const til::CoordType DeltaX) noexcept;
-    void DecrementYPosition(const til::CoordType DeltaY) noexcept;
+    void SetPosition(const COORD cPosition) noexcept;
+    void SetXPosition(const int NewX) noexcept;
+    void SetYPosition(const int NewY) noexcept;
+    void IncrementXPosition(const int DeltaX) noexcept;
+    void IncrementYPosition(const int DeltaY) noexcept;
+    void DecrementXPosition(const int DeltaX) noexcept;
+    void DecrementYPosition(const int DeltaY) noexcept;

    void CopyProperties(const Cursor& OtherCursor) noexcept;

-    void DelayEOLWrap(const til::point coordDelayedAt) noexcept;
+    void DelayEOLWrap(const COORD coordDelayedAt) noexcept;
    void ResetDelayEOLWrap() noexcept;
-    til::point GetDelayedAtPosition() const noexcept;
+    COORD GetDelayedAtPosition() const noexcept;
    bool IsDelayedEOLWrap() const noexcept;

    void SetType(const CursorType type) noexcept;
@@ -90,7 +90,7 @@ private:

    // NOTE: If you are adding a property here, go add it to CopyProperties.

-    til::point _cPosition; // current position on screen (in screen buffer coords).
+    COORD _cPosition; // current position on screen (in screen buffer coords).

    bool _fHasMoved;
    bool _fIsVisible; // whether cursor is visible (set only through the API)
@@ -102,7 +102,7 @@ private:
    bool _fIsPopupShown; // if a popup is being shown, turn off, stop blinking.

    bool _fDelayedEolWrap; // don't wrap at EOL till the next char comes in.
-    til::point _coordDelayedAt; // coordinate the EOL wrap was delayed at.
+    COORD _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?
--- a/src/buffer/out/precomp.h
+++ b/src/buffer/out/precomp.h
@@ -35,6 +35,7 @@ Abstract:
 #include <intsafe.h>

 // private dependencies
+#include "../inc/operators.hpp"
 #include "../inc/unicode.hpp"
 #pragma warning(pop)

--- a/src/buffer/out/search.cpp
+++ b/src/buffer/out/search.cpp
@@ -50,7 +50,7 @@ Search::Search(IUiaData& uiaData,
               const std::wstring& str,
               const Direction direction,
               const Sensitivity sensitivity,
-               const til::point anchor) :
+               const COORD anchor) :
    _direction(direction),
    _sensitivity(sensitivity),
    _needle(s_CreateNeedleFromString(str)),
@@ -124,7 +124,7 @@ void Search::Color(const TextAttribute attr) const
 // been called and returned true.
 // Return Value:
 // - pair containing [start, end] coord positions of text found by search
-std::pair<til::point, til::point> Search::GetFoundLocation() const noexcept
+std::pair<COORD, COORD> Search::GetFoundLocation() const noexcept
 {
    return { _coordSelStart, _coordSelEnd };
 }
@@ -140,10 +140,10 @@ std::pair<til::point, til::point> Search::GetFoundLocation() const noexcept
 // - direction - The intended direction of the search
 // Return Value:
 // - Coordinate to start the search from.
-til::point Search::s_GetInitialAnchor(const IUiaData& uiaData, const Direction direction)
+COORD Search::s_GetInitialAnchor(IUiaData& uiaData, const Direction direction)
 {
    const auto& textBuffer = uiaData.GetTextBuffer();
-    const auto textBufferEndPosition = uiaData.GetTextBufferEndPosition();
+    const COORD textBufferEndPosition = uiaData.GetTextBufferEndPosition();
    if (uiaData.IsSelectionActive())
    {
        // Convert the screen position of the selection anchor into an equivalent
@@ -187,12 +187,12 @@ til::point Search::s_GetInitialAnchor(const IUiaData& uiaData, const Direction d
 // - end - If we found it, this is filled with the coordinate of the last character of the needle.
 // Return Value:
 // - True if we found it. False if not.
-bool Search::_FindNeedleInHaystackAt(const til::point pos, til::point& start, til::point& end) const
+bool Search::_FindNeedleInHaystackAt(const COORD pos, COORD& start, COORD& end) const
 {
-    start = {};
-    end = {};
+    start = { 0 };
+    end = { 0 };

-    auto bufferPos = pos;
+    COORD bufferPos = pos;

    for (const auto& needleCell : _needle)
    {
@@ -269,7 +269,7 @@ wchar_t Search::_ApplySensitivity(const wchar_t wch) const noexcept
 // - Helper to increment a coordinate in respect to the associated screen buffer
 // Arguments
 // - coord - Updated by function to increment one position (will wrap X and Y direction)
-void Search::_IncrementCoord(til::point& coord) const noexcept
+void Search::_IncrementCoord(COORD& coord) const noexcept
 {
    _uiaData.GetTextBuffer().GetSize().IncrementInBoundsCircular(coord);
 }
@@ -278,7 +278,7 @@ void Search::_IncrementCoord(til::point& coord) const noexcept
 // - Helper to decrement a coordinate in respect to the associated screen buffer
 // Arguments
 // - coord - Updated by function to decrement one position (will wrap X and Y direction)
-void Search::_DecrementCoord(til::point& coord) const noexcept
+void Search::_DecrementCoord(COORD& coord) const noexcept
 {
    _uiaData.GetTextBuffer().GetSize().DecrementInBoundsCircular(coord);
 }
@@ -307,14 +307,14 @@ void Search::_UpdateNextPosition()
    // We put the next position to:
    // Forward: (0, 0)
    // Backward: the position of the end of the text buffer
-    const auto bufferEndPosition = _uiaData.GetTextBufferEndPosition();
+    const COORD bufferEndPosition = _uiaData.GetTextBufferEndPosition();

    if (_coordNext.Y > bufferEndPosition.Y ||
        (_coordNext.Y == bufferEndPosition.Y && _coordNext.X > bufferEndPosition.X))
    {
        if (_direction == Direction::Forward)
        {
-            _coordNext = {};
+            _coordNext = { 0 };
        }
        else
        {
--- a/src/buffer/out/search.h
+++ b/src/buffer/out/search.h
@@ -49,33 +49,33 @@ public:
           const std::wstring& str,
           const Direction dir,
           const Sensitivity sensitivity,
-           const til::point anchor);
+           const COORD anchor);

    bool FindNext();
    void Select() const;
    void Color(const TextAttribute attr) const;

-    std::pair<til::point, til::point> GetFoundLocation() const noexcept;
+    std::pair<COORD, COORD> GetFoundLocation() const noexcept;

 private:
    wchar_t _ApplySensitivity(const wchar_t wch) const noexcept;
-    bool _FindNeedleInHaystackAt(const til::point pos, til::point& start, til::point& end) const;
+    bool _FindNeedleInHaystackAt(const COORD pos, COORD& start, COORD& end) const;
    bool _CompareChars(const std::wstring_view one, const std::wstring_view two) const noexcept;
    void _UpdateNextPosition();

-    void _IncrementCoord(til::point& coord) const noexcept;
-    void _DecrementCoord(til::point& coord) const noexcept;
+    void _IncrementCoord(COORD& coord) const noexcept;
+    void _DecrementCoord(COORD& coord) const noexcept;

-    static til::point s_GetInitialAnchor(const Microsoft::Console::Types::IUiaData& uiaData, const Direction dir);
+    static COORD s_GetInitialAnchor(Microsoft::Console::Types::IUiaData& uiaData, const Direction dir);

    static std::vector<std::vector<wchar_t>> s_CreateNeedleFromString(const std::wstring& wstr);

    bool _reachedEnd = false;
-    til::point _coordNext;
-    til::point _coordSelStart;
-    til::point _coordSelEnd;
+    COORD _coordNext = { 0 };
+    COORD _coordSelStart = { 0 };
+    COORD _coordSelEnd = { 0 };

-    const til::point _coordAnchor;
+    const COORD _coordAnchor;
    const std::vector<std::vector<wchar_t>> _needle;
    const Direction _direction;
    const Sensitivity _sensitivity;
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -68,7 +68,7 @@ namespace Microsoft::Console::Render
 class TextBuffer final
 {
 public:
-    TextBuffer(const til::size screenBufferSize,
+    TextBuffer(const COORD screenBufferSize,
               const TextAttribute defaultAttributes,
               const UINT cursorSize,
               const bool isActiveBuffer,
@@ -79,27 +79,27 @@ public:
    void CopyProperties(const TextBuffer& OtherBuffer) noexcept;

    // row manipulation
-    const ROW& GetRowByOffset(const til::CoordType index) const noexcept;
-    ROW& GetRowByOffset(const til::CoordType index) noexcept;
+    const ROW& GetRowByOffset(const size_t index) const;
+    ROW& GetRowByOffset(const size_t index);

-    TextBufferCellIterator GetCellDataAt(const til::point at) const;
-    TextBufferCellIterator GetCellLineDataAt(const til::point at) const;
-    TextBufferCellIterator GetCellDataAt(const til::point at, const Microsoft::Console::Types::Viewport limit) const;
-    TextBufferTextIterator GetTextDataAt(const til::point at) const;
-    TextBufferTextIterator GetTextLineDataAt(const til::point at) const;
-    TextBufferTextIterator GetTextDataAt(const til::point at, const Microsoft::Console::Types::Viewport limit) const;
+    TextBufferCellIterator GetCellDataAt(const COORD at) const;
+    TextBufferCellIterator GetCellLineDataAt(const COORD at) const;
+    TextBufferCellIterator GetCellDataAt(const COORD at, const Microsoft::Console::Types::Viewport limit) const;
+    TextBufferTextIterator GetTextDataAt(const COORD at) const;
+    TextBufferTextIterator GetTextLineDataAt(const COORD at) const;
+    TextBufferTextIterator GetTextDataAt(const COORD at, const Microsoft::Console::Types::Viewport limit) const;

    // Text insertion functions
    OutputCellIterator Write(const OutputCellIterator givenIt);

    OutputCellIterator Write(const OutputCellIterator givenIt,
-                             const til::point target,
+                             const COORD target,
                             const std::optional<bool> wrap = true);

    OutputCellIterator WriteLine(const OutputCellIterator givenIt,
-                                 const til::point target,
+                                 const COORD target,
                                 const std::optional<bool> setWrap = std::nullopt,
-                                 const std::optional<til::CoordType> limitRight = std::nullopt);
+                                 const std::optional<size_t> limitRight = std::nullopt);

    bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
    bool InsertCharacter(const std::wstring_view chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
@@ -109,36 +109,36 @@ public:
    // Scroll needs access to this to quickly rotate around the buffer.
    bool IncrementCircularBuffer(const bool inVtMode = false);

-    til::point GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;
+    COORD GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;

    Cursor& GetCursor() noexcept;
    const Cursor& GetCursor() const noexcept;

-    const til::CoordType GetFirstRowIndex() const noexcept;
+    const SHORT GetFirstRowIndex() const noexcept;

    const Microsoft::Console::Types::Viewport GetSize() const noexcept;

-    void ScrollRows(const til::CoordType firstRow, const til::CoordType size, const til::CoordType delta);
+    void ScrollRows(const SHORT firstRow, const SHORT size, const SHORT delta);

-    til::CoordType TotalRowCount() const noexcept;
+    UINT TotalRowCount() const noexcept;

    [[nodiscard]] TextAttribute GetCurrentAttributes() const noexcept;

    void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;

    void SetCurrentLineRendition(const LineRendition lineRendition);
-    void ResetLineRenditionRange(const til::CoordType startRow, const til::CoordType endRow) noexcept;
-    LineRendition GetLineRendition(const til::CoordType row) const noexcept;
-    bool IsDoubleWidthLine(const til::CoordType row) const noexcept;
+    void ResetLineRenditionRange(const size_t startRow, const size_t endRow);
+    LineRendition GetLineRendition(const size_t row) const;
+    bool IsDoubleWidthLine(const size_t row) const;

-    til::CoordType GetLineWidth(const til::CoordType row) const noexcept;
-    til::point ClampPositionWithinLine(const til::point position) const noexcept;
-    til::point ScreenToBufferPosition(const til::point position) const noexcept;
-    til::point BufferToScreenPosition(const til::point position) const noexcept;
+    SHORT GetLineWidth(const size_t row) const;
+    COORD ClampPositionWithinLine(const COORD position) const;
+    COORD ScreenToBufferPosition(const COORD position) const;
+    COORD BufferToScreenPosition(const COORD position) const;

    void Reset();

-    [[nodiscard]] HRESULT ResizeTraditional(const til::size newSize) noexcept;
+    [[nodiscard]] HRESULT ResizeTraditional(const COORD newSize) noexcept;

    const UnicodeStorage& GetUnicodeStorage() const noexcept;
    UnicodeStorage& GetUnicodeStorage() noexcept;
@@ -149,23 +149,23 @@ public:
    Microsoft::Console::Render::Renderer& GetRenderer() noexcept;

    void TriggerRedraw(const Microsoft::Console::Types::Viewport& viewport);
-    void TriggerRedrawCursor(const til::point position);
+    void TriggerRedrawCursor(const COORD position);
    void TriggerRedrawAll();
    void TriggerScroll();
-    void TriggerScroll(const til::point delta);
+    void TriggerScroll(const COORD delta);
    void TriggerNewTextNotification(const std::wstring_view newText);

-    til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;
+    const COORD GetWordStart(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    const COORD GetWordEnd(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToPreviousWord(COORD& pos, const std::wstring_view wordDelimiters) const;

-    til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    const til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
+    const til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
    bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false, std::optional<til::point> limitOptional = std::nullopt) const;
    bool MoveToPreviousGlyph(til::point& pos, std::optional<til::point> limitOptional = std::nullopt) const;

-    const std::vector<til::inclusive_rect> GetTextRects(til::point start, til::point end, bool blockSelection, bool bufferCoordinates) const;
+    const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection, bool bufferCoordinates) const;

    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
    std::wstring GetHyperlinkUriFromId(uint16_t id) const;
@@ -184,7 +184,7 @@ public:

    const TextAndColor GetText(const bool includeCRLF,
                               const bool trimTrailingWhitespace,
-                               const std::vector<til::inclusive_rect>& textRects,
+                               const std::vector<SMALL_RECT>& textRects,
                               std::function<std::pair<COLORREF, COLORREF>(const TextAttribute&)> GetAttributeColors = nullptr,
                               const bool formatWrappedRows = false) const;

@@ -200,8 +200,8 @@ public:

    struct PositionInformation
    {
-        til::CoordType mutableViewportTop{ 0 };
-        til::CoordType visibleViewportTop{ 0 };
+        short mutableViewportTop{ 0 };
+        short visibleViewportTop{ 0 };
    };

    static HRESULT Reflow(TextBuffer& oldBuffer,
@@ -212,7 +212,7 @@ public:
    const size_t AddPatternRecognizer(const std::wstring_view regexString);
    void ClearPatternRecognizers() noexcept;
    void CopyPatterns(const TextBuffer& OtherBuffer);
-    interval_tree::IntervalTree<til::point, size_t> GetPatterns(const til::CoordType firstRow, const til::CoordType lastRow) const;
+    interval_tree::IntervalTree<til::point, size_t> GetPatterns(const size_t firstRow, const size_t lastRow) const;

 private:
    void _UpdateSize();
@@ -220,7 +220,7 @@ private:
    std::vector<ROW> _storage;
    Cursor _cursor;

-    til::CoordType _firstRow; // indexes top row (not necessarily 0)
+    SHORT _firstRow; // indexes top row (not necessarily 0)

    TextAttribute _currentAttributes;

@@ -234,29 +234,29 @@ private:
    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
    uint16_t _currentHyperlinkId;

-    void _RefreshRowIDs(std::optional<til::CoordType> newRowWidth);
+    void _RefreshRowIDs(std::optional<SHORT> newRowWidth);

-    void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
+    void _SetFirstRowIndex(const SHORT FirstRowIndex) noexcept;

-    til::point _GetPreviousFromCursor() const noexcept;
+    COORD _GetPreviousFromCursor() const;

-    void _SetWrapOnCurrentRow() noexcept;
-    void _AdjustWrapOnCurrentRow(const bool fSet) noexcept;
+    void _SetWrapOnCurrentRow();
+    void _AdjustWrapOnCurrentRow(const bool fSet);

    // Assist with maintaining proper buffer state for Double Byte character sequences
    bool _PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute);
    bool _AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribute);

-    ROW& _GetFirstRow() noexcept;
+    ROW& _GetFirstRow();
    ROW& _GetPrevRowNoWrap(const ROW& row);

-    void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
+    void _ExpandTextRow(SMALL_RECT& selectionRow) const;

-    DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
-    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
+    const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
+    const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
+    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD limit) const;
+    const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const;

    void _PruneHyperlinks();

--- a/src/buffer/out/textBufferCellIterator.cpp
+++ b/src/buffer/out/textBufferCellIterator.cpp
@@ -19,7 +19,7 @@ using namespace Microsoft::Console::Types;
 // Arguments:
 // - buffer - Text buffer to seek through
 // - pos - Starting position to retrieve text data from (within screen buffer bounds)
-TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, til::point pos) :
+TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD pos) :
    TextBufferCellIterator(buffer, pos, buffer.GetSize())
 {
 }
@@ -30,7 +30,7 @@ TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, til::po
 // - buffer - Pointer to screen buffer to seek through
 // - pos - Starting position to retrieve text data from (within screen buffer bounds)
 // - limits - Viewport limits to restrict the iterator within the buffer bounds (smaller than the buffer itself)
-TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, til::point pos, const Viewport limits) :
+TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD pos, const Viewport limits) :
    _buffer(buffer),
    _pos(pos),
    _pRow(s_GetRow(buffer, pos)),
@@ -96,7 +96,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
 {
    // Note that this method is called intensively when the terminal is under heavy load.
    // We need to aggressively optimize it, comparing to the -= operator.
-    auto move = movement;
+    ptrdiff_t move = movement;
    if (move < 0)
    {
        // Early branching to leave the rare case to -= operator.
@@ -126,7 +126,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
    const auto oldX = _pos.X;
    const auto oldY = _pos.Y;

-    // Under MSVC writing the individual members of a til::point generates worse assembly
+    // Under MSVC writing the individual members of a COORD generates worse assembly
    // compared to having them be local variables. This causes a performance impact.
    auto newX = oldX;
    auto newY = oldY;
@@ -165,7 +165,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
        _attrIter += diff;
        _view.UpdateTextAttribute(*_attrIter);

-        const auto& charRow = _pRow->GetCharRow();
+        const CharRow& charRow = _pRow->GetCharRow();
        _view.UpdateText(charRow.GlyphAt(newX));
        _view.UpdateDbcsAttribute(charRow.DbcsAttrAt(newX));
        _pos.X = newX;
@@ -191,7 +191,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
 // - Reference to self after movement.
 TextBufferCellIterator& TextBufferCellIterator::operator-=(const ptrdiff_t& movement)
 {
-    auto move = movement;
+    ptrdiff_t move = movement;
    if (move < 0)
    {
        return (*this) += (-move);
@@ -233,7 +233,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator--()
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator++(int)
 {
-    auto temp = *this;
+    auto temp(*this);
    operator++();
    return temp;
 }
@@ -244,7 +244,7 @@ TextBufferCellIterator TextBufferCellIterator::operator++(int)
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator--(int)
 {
-    auto temp = *this;
+    auto temp(*this);
    operator--();
    return temp;
 }
@@ -257,7 +257,7 @@ TextBufferCellIterator TextBufferCellIterator::operator--(int)
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator+(const ptrdiff_t& movement)
 {
-    auto temp = *this;
+    auto temp(*this);
    temp += movement;
    return temp;
 }
@@ -270,7 +270,7 @@ TextBufferCellIterator TextBufferCellIterator::operator+(const ptrdiff_t& moveme
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator-(const ptrdiff_t& movement)
 {
-    auto temp = *this;
+    auto temp(*this);
    temp -= movement;
    return temp;
 }
@@ -289,7 +289,7 @@ ptrdiff_t TextBufferCellIterator::operator-(const TextBufferCellIterator& it)
 // - Sets the coordinate position that this iterator will inspect within the text buffer on dereference.
 // Arguments:
 // - newPos - The new coordinate position.
-void TextBufferCellIterator::_SetPos(const til::point newPos)
+void TextBufferCellIterator::_SetPos(const COORD newPos)
 {
    if (newPos.Y != _pos.Y)
    {
@@ -317,7 +317,7 @@ void TextBufferCellIterator::_SetPos(const til::point newPos)
 // - pos - Position inside screen buffer bounds to retrieve row
 // Return Value:
 // - Pointer to the underlying CharRow structure
-const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept
+const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const COORD pos)
 {
    return &buffer.GetRowByOffset(pos.Y);
 }
@@ -354,7 +354,7 @@ const OutputCellView* TextBufferCellIterator::operator->() const noexcept
    return &_view;
 }

-til::point TextBufferCellIterator::Pos() const noexcept
+COORD TextBufferCellIterator::Pos() const noexcept
 {
    return _pos;
 }
--- a/src/buffer/out/textBufferCellIterator.hpp
+++ b/src/buffer/out/textBufferCellIterator.hpp
@@ -25,8 +25,8 @@ class TextBuffer;
 class TextBufferCellIterator
 {
 public:
-    TextBufferCellIterator(const TextBuffer& buffer, til::point pos);
-    TextBufferCellIterator(const TextBuffer& buffer, til::point pos, const Microsoft::Console::Types::Viewport limits);
+    TextBufferCellIterator(const TextBuffer& buffer, COORD pos);
+    TextBufferCellIterator(const TextBuffer& buffer, COORD pos, const Microsoft::Console::Types::Viewport limits);

    operator bool() const noexcept;

@@ -47,12 +47,12 @@ public:
    const OutputCellView& operator*() const noexcept;
    const OutputCellView* operator->() const noexcept;

-    til::point Pos() const noexcept;
+    COORD Pos() const noexcept;

 protected:
-    void _SetPos(const til::point newPos);
+    void _SetPos(const COORD newPos);
    void _GenerateView();
-    static const ROW* s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept;
+    static const ROW* s_GetRow(const TextBuffer& buffer, const COORD pos);

    OutputCellView _view;

@@ -61,7 +61,7 @@ protected:
    const TextBuffer& _buffer;
    const Microsoft::Console::Types::Viewport _bounds;
    bool _exceeded;
-    til::point _pos;
+    COORD _pos;

 #if UNIT_TESTING
    friend class TextBufferIteratorTests;
--- a/src/buffer/out/ut_textbuffer/ReflowTests.cpp
+++ b/src/buffer/out/ut_textbuffer/ReflowTests.cpp
@@ -36,9 +36,9 @@ namespace

    struct TestBuffer
    {
-        til::size size;
+        COORD size;
        std::vector<TestRow> rows;
-        til::point cursor;
+        COORD cursor;
    };

    struct TestCase
@@ -737,7 +737,7 @@ class ReflowTests
    {
        auto buffer = std::make_unique<TextBuffer>(testBuffer.size, TextAttribute{ 0x7 }, 0, false, renderer);

-        til::CoordType i{};
+        size_t i{};
        for (const auto& testRow : testBuffer.rows)
        {
            auto& row{ buffer->GetRowByOffset(i) };
@@ -745,7 +745,7 @@ class ReflowTests
            auto& charRow{ row.GetCharRow() };
            row.SetWrapForced(testRow.wrap);

-            til::CoordType j{};
+            size_t j{};
            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
            {
                // Yes, we're about to manually create a buffer. It is unpleasant.
@@ -771,7 +771,7 @@ class ReflowTests
        return buffer;
    }

-    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const til::size newSize)
+    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const COORD newSize)
    {
        auto buffer = std::make_unique<TextBuffer>(newSize, TextAttribute{ 0x7 }, 0, false, renderer);
        TextBuffer::Reflow(originalBuffer, *buffer, std::nullopt, std::nullopt);
@@ -783,7 +783,7 @@ class ReflowTests
        VERIFY_ARE_EQUAL(testBuffer.cursor, buffer.GetCursor().GetPosition());
        VERIFY_ARE_EQUAL(testBuffer.size, buffer.GetSize().Dimensions());

-        til::CoordType i{};
+        size_t i{};
        for (const auto& testRow : testBuffer.rows)
        {
            NoThrowString indexString;
@@ -794,7 +794,7 @@ class ReflowTests
            indexString.Format(L"[Row %d]", i);
            VERIFY_ARE_EQUAL(testRow.wrap, row.WasWrapForced(), indexString);

-            til::CoordType j{};
+            size_t j{};
            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
            {
                indexString.Format(L"[Cell %d, %d; Text line index %d]", it - charRow.begin(), i, j);
--- a/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
@@ -45,7 +45,7 @@ void TextAttributeTests::TestRoundtripLegacy()
    WORD expectedLegacy = FOREGROUND_BLUE | BACKGROUND_RED;
    WORD bgOnly = expectedLegacy & BG_ATTRS;
    WORD bgShifted = bgOnly >> 4;
-    auto bgByte = (BYTE)(bgShifted);
+    BYTE bgByte = (BYTE)(bgShifted);

    VERIFY_ARE_EQUAL(FOREGROUND_RED, bgByte);

@@ -65,9 +65,9 @@ void TextAttributeTests::TestRoundtripMetaBits()
        COMMON_LVB_UNDERSCORE
    };

-    for (auto i = 0; i < ARRAYSIZE(metaFlags); ++i)
+    for (int i = 0; i < ARRAYSIZE(metaFlags); ++i)
    {
-        auto flag = metaFlags[i];
+        WORD flag = metaFlags[i];
        WORD expectedLegacy = FOREGROUND_BLUE | BACKGROUND_RED | flag;
        WORD metaOnly = expectedLegacy & META_ATTRS;
        VERIFY_ARE_EQUAL(flag, metaOnly);
@@ -114,9 +114,9 @@ void TextAttributeTests::TestRoundtripExhaustive()
 void TextAttributeTests::TestTextAttributeColorGetters()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const auto red = RGB(255, 0, 0);
-    const auto faintRed = RGB(127, 0, 0);
-    const auto green = RGB(0, 255, 0);
+    const COLORREF red = RGB(255, 0, 0);
+    const COLORREF faintRed = RGB(127, 0, 0);
+    const COLORREF green = RGB(0, 255, 0);
    TextAttribute attr(red, green);

    // verify that calculated foreground/background are the same as the direct
@@ -178,8 +178,8 @@ void TextAttributeTests::TestTextAttributeColorGetters()
 void TextAttributeTests::TestReverseDefaultColors()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const auto red = RGB(255, 0, 0);
-    const auto green = RGB(0, 255, 0);
+    const COLORREF red = RGB(255, 0, 0);
+    const COLORREF green = RGB(0, 255, 0);
    TextAttribute attr{};

    // verify that calculated foreground/background are the same as the direct
@@ -260,9 +260,9 @@ void TextAttributeTests::TestRoundtripDefaultColors()
 void TextAttributeTests::TestIntenseAsBright()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const auto darkBlack = til::at(colorTable, 0);
-    const auto brightBlack = til::at(colorTable, 8);
-    const auto darkGreen = til::at(colorTable, 2);
+    const COLORREF darkBlack = til::at(colorTable, 0);
+    const COLORREF brightBlack = til::at(colorTable, 8);
+    const COLORREF darkGreen = til::at(colorTable, 2);

    TextAttribute attr{};

--- a/src/buffer/out/ut_textbuffer/TextColorTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextColorTests.cpp
@@ -118,7 +118,7 @@ void TextColorTests::TestBrightIndexColor()

 void TextColorTests::TestRgbColor()
 {
-    auto myColor = RGB(7, 8, 9);
+    COLORREF myColor = RGB(7, 8, 9);
    TextColor rgbColor(myColor);

    VERIFY_IS_FALSE(rgbColor.IsDefault());
@@ -140,7 +140,7 @@ void TextColorTests::TestRgbColor()

 void TextColorTests::TestChangeColor()
 {
-    auto myColor = RGB(7, 8, 9);
+    COLORREF myColor = RGB(7, 8, 9);
    TextColor rgbColor(myColor);

    VERIFY_IS_FALSE(rgbColor.IsDefault());
--- a/src/buffer/out/ut_textbuffer/UnicodeStorageTests.cpp
+++ b/src/buffer/out/ut_textbuffer/UnicodeStorageTests.cpp
@@ -18,7 +18,7 @@ class UnicodeStorageTests
    TEST_METHOD(CanOverwriteEmoji)
    {
        UnicodeStorage storage;
-        const til::point coord{ 1, 3 };
+        const COORD coord{ 1, 3 };
        const std::vector<wchar_t> newMoon{ 0xD83C, 0xDF11 };
        const std::vector<wchar_t> fullMoon{ 0xD83C, 0xDF15 };

@@ -28,7 +28,7 @@ class UnicodeStorageTests
        // verify it was stored
        auto findIt = storage._map.find(coord);
        VERIFY_ARE_NOT_EQUAL(findIt, storage._map.end());
-        const auto& newMoonGlyph = findIt->second;
+        const std::vector<wchar_t>& newMoonGlyph = findIt->second;
        VERIFY_ARE_EQUAL(newMoonGlyph.size(), newMoon.size());
        for (size_t i = 0; i < newMoon.size(); ++i)
        {
@@ -41,7 +41,7 @@ class UnicodeStorageTests
        // verify the glyph was overwritten
        findIt = storage._map.find(coord);
        VERIFY_ARE_NOT_EQUAL(findIt, storage._map.end());
-        const auto& fullMoonGlyph = findIt->second;
+        const std::vector<wchar_t>& fullMoonGlyph = findIt->second;
        VERIFY_ARE_EQUAL(fullMoonGlyph.size(), fullMoon.size());
        for (size_t i = 0; i < fullMoon.size(); ++i)
        {
--- a/src/buffer/out/ut_textbuffer/precomp.h
+++ b/src/buffer/out/ut_textbuffer/precomp.h
@@ -37,6 +37,7 @@ Abstract:

 // private dependencies
 #include "../host/conddkrefs.h"
+#include "../inc/operators.hpp"
 #include "../inc/unicode.hpp"
 #pragma warning(pop)

--- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
+++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-
-  <PropertyGroup Label="NuGet Dependencies">
-    <TerminalMUX>true</TerminalMUX>
-  </PropertyGroup>
  <Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
  <PropertyGroup Label="Configuration">
    <!--
    These two properties are very important!
@@ -140,10 +135,6 @@
      <!-- 16.3.0 - remove non-resources.pri PRI files since we just forced them back in. -->
      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
      <AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
-
-      <!-- Remove all of the xaml files, because we are using embedded xbf payloads (saves about 500kb on disk!) -->
-      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(Extension)' == '.xaml'" />
-      <AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.xaml'" />
    </ItemGroup>
  </Target>

@@ -169,7 +160,13 @@
  </Target>

  <!-- This is required to get the package dependency in the AppXManifest. -->
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets'))" />
+  </Target>

  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
 </Project>
--- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
@@ -99,9 +99,7 @@
            <com:ComInterface>
                <com:ProxyStub Id="DEC4804D-56D1-4F73-9FBE-6828E7C85C56" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
-                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> <!-- ITerminalHandoff -->
-                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> <!-- ITerminalHandoff2 -->
-                <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
+                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
            </com:ComInterface>
        </com:Extension>
        <com:Extension Category="windows.comServer">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin L. Howett	3831418076	Migrate spelling-0.0.21 changes from main	2022-04-08 09:48:13 -07:00
Michael Niksa	99e8576d17	Put prefastv3 first	2022-04-08 09:48:13 -07:00
Michael Niksa	493a2292f8	ok we have no python. whatever.	2022-04-07 14:47:01 -07:00
Michael Niksa	cc889cf431	why not python	2022-04-07 13:34:36 -07:00
Michael Niksa	885540b834	One day I'll stop making typos. Today is not that day.	2022-04-07 13:31:49 -07:00
Michael Niksa	edfe48b17d	let's see what upgrading node does.	2022-04-07 11:20:56 -07:00
Michael Niksa	4e53ebd67d	s all the way down	2022-04-06 13:12:48 -07:00
Michael Niksa	ffb608939f	Revert "fetch depth?!" This reverts commit `a4f661a91d`.	2022-04-06 11:59:55 -07:00
Michael Niksa	4246321ba5	add comment	2022-04-06 11:59:52 -07:00
Michael Niksa	038af01cd8	banish subdirectory to the shadow realm	2022-04-06 11:57:47 -07:00
Michael Niksa	a4f661a91d	fetch depth?!	2022-04-06 11:31:53 -07:00
Michael Niksa	cc36a6e5f3	of course it needs npm	2022-04-05 11:23:18 -07:00
Michael Niksa	2ff5660047	I think it's 'template' and not 'steps' in this position.	2022-04-05 10:04:45 -07:00
Michael Niksa	c9656a166e	fix typos?	2022-04-05 10:01:39 -07:00
Michael Niksa	6dde9ba211	Attempt to use unified goverened templates for compliance.	2022-04-05 09:41:55 -07:00