Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
Disable default terminal dropdown on Stable (oops!)
2026-04-18 04:01:04 +00:00 · 2021-07-13 10:55:36 -05:00 · 2021-07-13 10:55:36 -05:00 · 2021-07-13 10:55:36 -05:00 · 2021-07-12 18:13:38 -05:00 · 2021-07-12 18:13:19 -05:00
560 changed files with 7987 additions and 28999 deletions
--- a/.github/ISSUE_TEMPLATE/Bug_Report.yml
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.yml
@@ -4,7 +4,7 @@ body:
 - type: markdown
  attributes:
    value: |
-      Please make sure to [search for existing issues](https://github.com/microsoft/terminal/issues) and [check the FAQ](https://github.com/microsoft/terminal/wiki/Frequently-Asked-Questions-(FAQ)) before filing a new one!
+      Please make sure to [search for existing issues](https://github.com/microsoft/terminal/issues) before filing a new one!

      If this is an application crash, please also provide a [Feedback Hub](https://aka.ms/terminal-feedback-hub) submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal" and choose "Share My Feedback" after submission to get the link.

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -100,6 +100,6 @@
        "**/bin/**": true,
        "**/obj/**": true,
        "**/packages/**": true,
-        "**/Generated Files/**": true
+        "**/generated files/**": true
    }
 }
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -73,7 +73,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.unittest", "src\host\ut_lib\host.unittest.vcxproj", "{06EC74CB-9A12-429C-B551-8562EC954747}"
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
-		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Unit", "src\host\ut_host\Host.UnitTests.vcxproj", "{531C23E7-4B76-4C08-8AAD-04164CB628C9}"
@@ -398,8 +397,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Control", "src\ca
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsTerminal.UIA.Tests", "src\cascadia\WindowsTerminal_UIATests\WindowsTerminal.UIA.Tests.csproj", "{F19DACD5-0C6E-40DC-B6E4-767A3200542C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api-ms-win-core-synch-l1-2-0", "src\api-ms-win-core-synch-l1-2-0\api-ms-win-core-synch-l1-2-0.vcxproj", "{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -3295,50 +3292,6 @@ Global
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C}.Release|x64.Build.0 = Release|x64
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C}.Release|x86.ActiveCfg = Release|Win32
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C}.Release|x86.Build.0 = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|x64.Build.0 = AuditMode|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|ARM.ActiveCfg = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|DotNet_x64Test.Build.0 = Debug|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|DotNet_x86Test.Build.0 = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|x64.ActiveCfg = Debug|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|x64.Build.0 = Debug|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|x86.ActiveCfg = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Debug|x86.Build.0 = Debug|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|ARM.ActiveCfg = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|ARM64.Build.0 = Release|ARM64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|DotNet_x64Test.ActiveCfg = Release|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|DotNet_x64Test.Build.0 = Release|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|DotNet_x86Test.Build.0 = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x64.ActiveCfg = Release|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x64.Build.0 = Release|x64
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.ActiveCfg = Release|Win32
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3437,7 +3390,6 @@ Global
 		{05D9052F-D78F-478F-968A-2DE38A6DB996} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{C323DAEE-B307-4C7B-ACE5-7293CBEFCB5B} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
-		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
--- a/Scratch.sln
+++ b/Scratch.sln
@@ -1,221 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31205.134
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Package", "scratch\ScratchIslandApp\Package\Package.wapproj", "{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleAppLib", "scratch\ScratchIslandApp\SampleApp\SampleAppLib.vcxproj", "{A4394404-37F7-41C1-802B-49788D3720E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "scratch\ScratchIslandApp\SampleApp\dll\SampleApp.vcxproj", "{26C51792-41A3-4FE0-AB5E-8B69D557BF91}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A4394404-37F7-41C1-802B-49788D3720E3} = {A4394404-37F7-41C1-802B-49788D3720E3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowExe", "scratch\ScratchIslandApp\WindowExe\WindowExe.vcxproj", "{B4427499-9FDE-4208-B456-5BC580637633}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91} = {26C51792-41A3-4FE0-AB5E-8B69D557BF91}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Props", "Common Props", "{53DD5520-E64C-4C06-B472-7CE62CA539C9}"
-	ProjectSection(SolutionItems) = preProject
-		src\common.build.post.props = src\common.build.post.props
-		src\common.build.pre.props = src\common.build.pre.props
-		src\common.build.tests.props = src\common.build.tests.props
-		common.openconsole.props = common.openconsole.props
-		src\cppwinrt.build.post.props = src\cppwinrt.build.post.props
-		src\cppwinrt.build.pre.props = src\cppwinrt.build.pre.props
-		src\wap-common.build.post.props = src\wap-common.build.post.props
-		src\wap-common.build.pre.props = src\wap-common.build.pre.props
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxproj", "{6BAE5851-50D5-4934-8D5E-30361A8A40F3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types", "src\types\lib\types.vcxproj", "{18D09A24-8240-42D6-8CB6-236EEE820263}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		AuditMode|ARM64 = AuditMode|ARM64
-		AuditMode|x64 = AuditMode|x64
-		AuditMode|x86 = AuditMode|x86
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Fuzzing|ARM64 = Fuzzing|ARM64
-		Fuzzing|x64 = Fuzzing|x64
-		Fuzzing|x86 = Fuzzing|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.Build.0 = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.Deploy.0 = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.ActiveCfg = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.Build.0 = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.Deploy.0 = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.ActiveCfg = Release|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.Build.0 = Release|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.Deploy.0 = Release|x86
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x64.ActiveCfg = Debug|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x64.Build.0 = Debug|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x86.ActiveCfg = Debug|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x86.Build.0 = Debug|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|ARM64.Build.0 = Release|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x64.ActiveCfg = Release|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x64.Build.0 = Release|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x86.ActiveCfg = Release|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x86.Build.0 = Release|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x64.Build.0 = AuditMode|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|ARM64.Build.0 = Debug|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x64.ActiveCfg = Debug|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x64.Build.0 = Debug|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x86.ActiveCfg = Debug|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x86.Build.0 = Debug|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|ARM64.ActiveCfg = Release|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|ARM64.Build.0 = Release|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x64.ActiveCfg = Release|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x64.Build.0 = Release|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x86.ActiveCfg = Release|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x86.Build.0 = Release|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x64.Build.0 = AuditMode|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x64.ActiveCfg = Debug|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x64.Build.0 = Debug|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x86.ActiveCfg = Debug|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x86.Build.0 = Debug|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|ARM64.Build.0 = Release|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x64.ActiveCfg = Release|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x64.Build.0 = Release|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.ActiveCfg = Release|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.Build.0 = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.ActiveCfg = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.Build.0 = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.ActiveCfg = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.Build.0 = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.Build.0 = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.ActiveCfg = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.Build.0 = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.ActiveCfg = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.Build.0 = Release|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x64.Build.0 = AuditMode|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|ARM64.Build.0 = Debug|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x64.ActiveCfg = Debug|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x64.Build.0 = Debug|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x86.ActiveCfg = Debug|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x86.Build.0 = Debug|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|ARM64.ActiveCfg = Release|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|ARM64.Build.0 = Release|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x64.ActiveCfg = Release|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x64.Build.0 = Release|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.ActiveCfg = Release|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
-		{18D09A24-8240-42D6-8CB6-236EEE820263} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {05EAE315-9188-4D7B-B889-7D5F480A8915}
-	EndGlobalSection
-EndGlobal
--- a/build/Helix/OutputTestResults.ps1
+++ b/build/Helix/OutputTestResults.ps1
@@ -21,7 +21,7 @@ Write-Host "Checking test results..."
 $queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
 Write-Host "queryUri = $queryUri"

-$testRuns = Invoke-RestMethodWithRetries $queryUri -Headers $azureDevOpsRestApiHeaders
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
 [System.Collections.Generic.List[string]]$failingTests = @()
 [System.Collections.Generic.List[string]]$unreliableTests = @()
 [System.Collections.Generic.List[string]]$unexpectedResultTest = @()
@@ -50,7 +50,7 @@ foreach ($testRun in ($testRuns.value | Sort-Object -Property "completedDate" -D
    $totalTestsExecutedCount += $testRun.totalTests

    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
-    $testResults = Invoke-RestMethodWithRetries "$($testRun.url)/results?api-version=5.0" -Headers $azureDevOpsRestApiHeaders
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
        
    foreach ($testResult in $testResults.value)
    {
--- a/build/Helix/PrepareHelixPayload.ps1
+++ b/build/Helix/PrepareHelixPayload.ps1
@@ -9,7 +9,7 @@ $payloadDir = "HelixPayload\$Configuration\$Platform"

 $repoDirectory = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\"
 $nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
-
+ 
 # Create the payload directory. Remove it if it already exists.
 If(test-path $payloadDir)
 {
@@ -19,8 +19,8 @@ New-Item -ItemType Directory -Force -Path $payloadDir

 # Copy files from nuget packages
 Copy-Item "$nugetPackagesDir\microsoft.windows.apps.test.1.0.181203002\lib\netcoreapp2.1\*.dll" $payloadDir
-Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.60.210621002\build\Binaries\$Platform\*" $payloadDir
-Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.60.210621002\build\Binaries\$Platform\NetFx4.5\*" $payloadDir
+Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Platform\*" $payloadDir
+Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Platform\NetFx4.5\*" $payloadDir
 New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
@@ -59,7 +59,7 @@ Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"
 Copy-Item "$repoDirectory\Artifacts\$ArtifactName\appx\CascadiaPackage_0.0.1.0_$Platform.msix" $payloadDir\CascadiaPackage.zip

 # Rename it to extension of ZIP because Expand-Archive is real sassy on the build machines
-# and refuses to unzip it because of its file extension while on a desktop, it just
+# and refuses to unzip it because of its file extension while on a desktop, it just 
 # does the job without complaining.

 # Extract the APPX package
--- a/build/Helix/ProcessHelixFiles.ps1
+++ b/build/Helix/ProcessHelixFiles.ps1
@@ -20,31 +20,13 @@ function Generate-File-Links
        Out-File -FilePath $helixLinkFile -Append -InputObject "<ul>"
        foreach($file in $files)
        {
-            $url = Append-HelixAccessTokenToUrl $file.Link "{Your-Helix-Access-Token-Here}"
-            Out-File -FilePath $helixLinkFile -Append -InputObject "<li>$($url)</li>"
+            Out-File -FilePath $helixLinkFile -Append -InputObject "<li><a href=$($file.Link)>$($file.Name)</a></li>"
        }
        Out-File -FilePath $helixLinkFile -Append -InputObject "</ul>"
        Out-File -FilePath $helixLinkFile -Append -InputObject "</div>"
    }
 }

-function Append-HelixAccessTokenToUrl
-{
-    Param ([string]$url, [string]$token)
-    if($token)
-    {
-        if($url.Contains("?"))
-        {
-            $url = "$($url)&access_token=$($token)"
-        }
-        else
-        {
-            $url = "$($url)?access_token=$($token)"
-        }
-    }
-    return $url
-}
-
 #Create output directory
 New-Item $OutputFolder -ItemType Directory

@@ -81,8 +63,7 @@ foreach ($testRun in $testRuns.value)
        if (-not $workItems.Contains($workItem))
        {
            $workItems.Add($workItem)
-            $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files"
-            $filesQueryUri = Append-HelixAccessTokenToUrl $filesQueryUri $helixAccessToken
+            $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files$accessTokenParam"
            $files = Invoke-RestMethodWithRetries $filesQueryUri

            $screenShots = $files | where { $_.Name.EndsWith(".jpg") }
@@ -121,7 +102,6 @@ foreach ($testRun in $testRuns.value)

                    Write-Host "Downloading $link to $destination"

-                    $link = Append-HelixAccessTokenToUrl $link $HelixAccessToken
                    Download-FileWithRetries $link $destination
                }
            }
--- a/build/Helix/UpdateUnreliableTests.ps1
+++ b/build/Helix/UpdateUnreliableTests.ps1
@@ -23,7 +23,7 @@ Write-Host "queryUri = $queryUri"
 # To account for unreliable tests, we'll iterate through all of the tests associated with this build, check to see any tests that were unreliable
 # (denoted by being marked as "skipped"), and if so, we'll instead mark those tests with a warning and enumerate all of the attempted runs
 # with their pass/fail states as well as any relevant error messages for failed attempts.
-$testRuns = Invoke-RestMethodWithRetries $queryUri -Headers $azureDevOpsRestApiHeaders
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders

 $timesSeenByRunName = @{}
      
@@ -32,10 +32,10 @@ foreach ($testRun in $testRuns.value)
    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
        
    Write-Host "Marking test run `"$($testRun.name)`" as in progress so we can change its results to account for unreliable tests."
-    Invoke-RestMethod "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null

    Write-Host "Retrieving test results..."
-    $testResults = Invoke-RestMethodWithRetries $testRunResultsUri -Headers $azureDevOpsRestApiHeaders
+    $testResults = Invoke-RestMethod -Uri $testRunResultsUri -Method Get -Headers $azureDevOpsRestApiHeaders
        
    foreach ($testResult in $testResults.value)
    {
@@ -54,8 +54,7 @@ foreach ($testRun in $testRuns.value)
            Write-Host "  Test $($testResult.testCaseTitle) was detected as unreliable. Updating..."
            
            # The errorMessage field contains a link to the JSON-encoded rerun result data.
-            $resultsJson = Download-StringWithRetries "Error results" $testResult.errorMessage
-            $rerunResults = ConvertFrom-Json $resultsJson
+            $rerunResults = ConvertFrom-Json (New-Object System.Net.WebClient).DownloadString($testResult.errorMessage)
            [System.Collections.Generic.List[System.Collections.Hashtable]]$rerunDataList = @()
            $attemptCount = 0
            $passCount = 0
--- a/build/Helix/packages.config
+++ b/build/Helix/packages.config
@@ -2,7 +2,7 @@
 <packages>
  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
  <package id="Microsoft.Internal.Windows.Terminal.TestContent" version="1.0.1" />
-  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
  <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
  <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
  <package id="runtime.win-x64.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
--- a/build/packages.config
+++ b/build/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
 </packages>
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@@ -1,487 +1,48 @@
-# This build should never run as CI or against a pull request.
 trigger: none
 pr: none

-pool: 
-  name: WinDevPool-L
-  demands: ImageOverride -equals WinDevVS16-latest
-
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-  - name: buildTerminal
-    displayName: "Build Windows Terminal MSIX"
-    type: boolean
-    default: true
-  - name: buildTerminalVPack
-    displayName: "Build Windows Terminal VPack"
-    type: boolean
-    default: false
-  - name: buildWPF
-    displayName: "Build Terminal WPF Control"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    displayName: "PGO Build Mode"
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-
 variables:
-  TerminalInternalPackageVersion: "0.0.7"
+  baseYearForVersioning: 2019 # Used by build-console-int
+  versionMajor: 0
+  versionMinor: 1

-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
+# When we move off PackageES for Versioning, we'll need to switch
+# name to this format. For now, though, we need to use DayOfYear.Rev
+# to unique our builds, as mandated by PackageES's Setup task.
+# name: '$(versionMajor).$(versionMinor).$(DayOfYear)$(Rev:r).0'
+#
+# Build name/version number above must end with .0 to make the
+# store publication machinery happy.
+name: 'Terminal_$(date:yyMM).$(date:dd)$(rev:rrr)'
+
+# Build Arguments:
+#   WindowsTerminalOfficialBuild=[true,false]
+#     true - this is running on our build agent
+#     false - running locally
+#   WindowsTerminalBranding=[Dev,Preview,Release]
+#     <none>  - Development build resources (default)
+#     Preview - Preview build resources
+#     Release - regular build resources
 jobs:
- job: Build
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ each platform in parameters.buildPlatforms }}:
-          ${{ config }}_${{ platform }}:
-            BuildConfiguration: ${{ config }}
-            BuildPlatform: ${{ platform }}
-  displayName: Build
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - task: PowerShell@2
-    displayName: Rationalize Build Platform
-    inputs:
-      targetType: inline
-      script: >-
-        $Arch = "$(BuildPlatform)"
+  - template: ./templates/build-console-audit-job.yml
+    parameters:
+      platform: x64

-        If ($Arch -Eq "x86") { $Arch = "Win32" }
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 5.10
-    inputs:
-      versionSpec: 5.10
-  - task: NuGetCommand@2
-    displayName: NuGet custom
-    inputs:
-      command: custom
-      selectOrConfig: config
-      nugetConfigPath: NuGet.Config
-      arguments: restore OpenConsole.sln -SolutionDirectory $(Build.SourcesDirectory)
-  - task: UniversalPackages@0
-    displayName: Download terminal-internal Universal Package
-    inputs:
-      feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-      packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-      versionListDownload: $(TerminalInternalPackageVersion)
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: >-
-        src\cascadia\TerminalApp\Resources\en-US\Resources.resw
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x86
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

-        src\cascadia\TerminalControl\Resources\en-US\Resources.resw
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: arm64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

-        src\cascadia\TerminalConnection\Resources\en-US\Resources.resw
+  - template: ./templates/check-formatting.yml

-        src\cascadia\TerminalSettingsModel\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsEditor\Resources\en-US\Resources.resw
-
-        src\cascadia\WindowsTerminalUniversal\Resources\en-US\Resources.resw
-
-        src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      pseudoSetting: Included
-  - task: PowerShell@2
-    displayName: Move Loc files one level up
-    inputs:
-      targetType: inline
-      script: >-
-        $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-
-        $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-      pwsh: true
-  - task: PowerShell@2
-    displayName: Generate NOTICE.html from NOTICE.md
-    inputs:
-      filePath: .\build\scripts\Generate-ThirdPartyNotices.ps1
-      arguments: -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
-      pwsh: true
-  - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-    - task: PowerShell@2
-      displayName: Restore PGO Database
-      inputs:
-        filePath: tools/PGODatabase/restore-pgodb.ps1
-        workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /t:Terminal\CascadiaPackage;Terminal\WindowsTerminalUniversal /p:WindowsTerminalReleaseBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-        clean: true
-        maximumCpuCount: true
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: binlog'
-      condition: failed()
-      continueOnError: True
-      inputs:
-        PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
-        ArtifactName: binlog-$(BuildPlatform)
-    - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-      - task: PowerShell@2
-        displayName: Validate binaries are optimized
-        condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-        inputs:
-          targetType: inline
-          script: >-
-            $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
-
-            foreach ($BinFile in $Binaries) {
-
-              & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/src/cascadia/CascadiaPackage/bin/$(BuildPlatform)/$(BuildConfiguration)/$BinFile"
-
-            }
-    - task: PowerShell@2
-      displayName: Check MSIX for common regressions
-      inputs:
-        targetType: inline
-        script: >-
-          $Package = Get-ChildItem -Recurse -Filter "CascadiaPackage_*.msix"
-
-          .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path $Package.FullName
-        pwsh: true
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for PublicTerminalCore
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
-        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
-  - task: ComponentGovernanceComponentDetection@0
-    displayName: Component Detection
-  - task: PowerShell@2
-    displayName: Run Unit Tests
-    condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - task: PowerShell@2
-    displayName: Run Feature Tests
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy *.appx/*.msix to Artifacts
-      inputs:
-        Contents: >-
-          **/*.appx
-
-          **/*.msix
-
-          **/*.appxsym
-
-          !**/Microsoft.VCLibs*.appx
-        TargetFolder: $(Build.ArtifactStagingDirectory)/appx
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (appx)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
-        ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy PublicTerminalCore.dll to Artifacts
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        Contents: >-
-          **/PublicTerminalCore.dll
-
-          **/api-ms-win-core-synch-l1-2-0.dll
-        TargetFolder: $(Build.ArtifactStagingDirectory)/wpf
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (PublicTerminalCore)
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/wpf
-        ArtifactName: wpf-dll-$(BuildPlatform)-$(BuildConfiguration)
-  - task: PublishSymbols@2
-    displayName: Publish symbols path
-    continueOnError: True
-    inputs:
-      SearchPattern: '**/*.pdb'
-      IndexSources: false
-      SymbolServerType: TeamServices
-
- ${{ if eq(parameters.buildTerminal, true) }}:
-  - job: BundleAndSign
-    displayName: Create and sign AppX/MSIX bundles
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Artifacts (*.appx, *.msix)
-      inputs:
-        downloadType: specific
-        itemPattern: >-
-          **/*.msix
-
-          **/*.appx
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Create WindowsTerminal*.msixbundle
-      inputs:
-        filePath: build\scripts\Create-AppxBundle.ps1
-        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion 0.0.0.0 -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-    - task: PowerShell@2
-      displayName: Create WindowsTerminalUniversal*.msixbundle
-      inputs:
-        filePath: build\scripts\Create-AppxBundle.ps1
-        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName WindowsTerminalUniversal -BundleVersion $(XES_APPXMANIFESTVERSION) -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminalUniversal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.msixbundle to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)
-        Pattern: Microsoft.WindowsTerminal*.msixbundle
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolSign",
-                  "Parameters": {
-                      "OpusName": "Microsoft",
-                      "OpusInfo": "http://www.microsoft.com",
-                      "FileDigest": "/fd \"SHA256\"",
-                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  },
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: appxbundle-signed'
-      inputs:
-        PathtoPublish: $(System.ArtifactsDirectory)
-        ArtifactName: appxbundle-signed
-
- ${{ if eq(parameters.buildWPF, true) }}:
-  - job: PackageAndSignWPF
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (WPF Terminal Control)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - task: DownloadBuildArtifacts@0
-      displayName: Download x86 PublicTerminalCore
-      inputs:
-        artifactName: wpf-dll-x86-$(BuildConfiguration)
-        itemPattern: '**/*.dll'
-        downloadPath: bin\Win32\$(BuildConfiguration)\
-        extractTars: false
-    - task: DownloadBuildArtifacts@0
-      displayName: Download x64 PublicTerminalCore
-      inputs:
-        artifactName: wpf-dll-x64-$(BuildConfiguration)
-        itemPattern: '**/*.dll'
-        downloadPath: bin\x64\$(BuildConfiguration)\
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts up a level
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: >-
-          Get-ChildItem bin -Recurse -Directory -Filter wpf-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet restore copy
-      inputs:
-        selectOrConfig: config
-        nugetConfigPath: NuGet.Config
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for WPF Control
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalReleaseBuild=$(UseReleaseBranding);Version=$(XES_PACKAGEVERSIONNUMBER) /t:Pack
-        platform: Any CPU
-        configuration: $(BuildConfiguration)
-        maximumCpuCount: true
-    - task: PublishSymbols@2
-      displayName: Publish symbols path
-      continueOnError: True
-      inputs:
-        SearchPattern: '**/*.pdb'
-        IndexSources: false
-        SymbolServerType: TeamServices
-        SymbolsArtifactName: Symbols_WPF_$(BuildConfiguration)
-    - task: CopyFiles@2
-      displayName: Copy *.nupkg to Artifacts
-      inputs:
-        Contents: '**/*Wpf*.nupkg'
-        TargetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-        OverWrite: true
-        flattenFolders: true
-    - 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: wpf-nupkg-$(BuildConfiguration)
-
- ${{ if eq(parameters.buildTerminalVPack, true) }}:
-  - job: VPack
-    displayName: Create Windows vPack
-    dependsOn: BundleAndSign
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Build Artifacts
-      inputs:
-        artifactName: appxbundle-signed
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Rename and stage packages for vpack
-      inputs:
-        targetType: inline
-        script: >-
-          # Rename to known/fixed name for Windows build system
-
-          Get-ChildItem Microsoft.WindowsTerminal_*.msixbundle | Rename-Item -NewName { 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle' }
-
-
-          # Create vpack directory and place item inside
-
-          mkdir WindowsTerminal.app
-
-          mv Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle .\WindowsTerminal.app\
-        workingDirectory: $(System.ArtifactsDirectory)\appxbundle-signed
-    - task: PkgESVPack@12
-      displayName: 'Package ES - VPack'
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        sourceDirectory: $(System.ArtifactsDirectory)\appxbundle-signed\WindowsTerminal.app
-        description: Windows Terminal pre-install application
-        pushPkgName: WindowsTerminal.app
-        owner: condev
-...
+  - template: ./templates/release-sign-and-bundle.yml
--- a/build/pipelines/templates/build-console-audit-job.yml
+++ b/build/pipelines/templates/build-console-audit-job.yml
@@ -8,12 +8,9 @@ jobs:
  variables:
    BuildConfiguration: AuditMode
    BuildPlatform: ${{ parameters.platform }}
-  pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS16-latest
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }

  steps:
  - checkout: self
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -11,12 +11,9 @@ jobs:
  variables:
    BuildConfiguration: ${{ parameters.configuration }}
    BuildPlatform: ${{ parameters.platform }}
-  pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS16-latest
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }

  steps:
  - template: build-console-steps.yml
@@ -35,8 +32,6 @@ jobs:
    dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
    condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
    testSuite: 'DevTestSuite'
-    platform: ${{ parameters.platform }}
-    configuration: ${{ parameters.configuration }}
    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
    
 - template: helix-processtestresults-job.yml
--- a/build/pipelines/templates/build-console-int.yml
+++ b/build/pipelines/templates/build-console-int.yml
@@ -0,0 +1,31 @@
+parameters:
+  configuration: 'Release'
+  platform: ''
+  additionalBuildArguments: ''
+
+jobs:
+- job: Build${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    BuildPlatform: ${{ parameters.platform }}
+    PGOBuildMode: 'Optimize'
+
+  pool:
+    name: Package ES Lab E
+    demands:
+    - msbuild
+    - visualstudio
+    - vstest
+
+  steps:
+  - task: PkgESSetupBuild@10
+    displayName: 'Package ES - Setup Build'
+    inputs:
+      useDfs: false
+      productName: WindowsTerminal
+      disableOutputRedirect: true
+
+  - template: build-console-steps.yml
+    parameters:
+      additionalBuildArguments: "/p:XesUseOneStoreVersioning=true;XesBaseYearForStoreVersion=$(baseYearForVersioning) ${{ parameters.additionalBuildArguments }}"
--- a/build/pipelines/templates/build-console-pgo.yml
+++ b/build/pipelines/templates/build-console-pgo.yml
@@ -3,7 +3,7 @@ parameters:
  platform: ''
  additionalBuildArguments: ''
  minimumExpectedTestsExecutedCount: 1  # Sanity check for minimum expected tests to be reported
-  rerunPassesRequiredToAvoidFailure: 5
+  rerunPassesRequiredToAvoidFailure: 0

 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}
@@ -12,12 +12,9 @@ jobs:
    BuildConfiguration: ${{ parameters.configuration }}
    BuildPlatform: ${{ parameters.platform }}
    PGOBuildMode: 'Instrument'
-  pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS16-latest
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }

  steps:
  - template: build-console-steps.yml
--- a/build/pipelines/templates/check-formatting.yml
+++ b/build/pipelines/templates/check-formatting.yml
@@ -11,7 +11,7 @@ jobs:
    clean: true

  - task: PowerShell@2
-    displayName: 'Code Formatting Check'
+    displayName: 'Code Formattting Check'
    inputs:
      targetType: filePath
      filePath: '.\build\scripts\Invoke-FormattingCheck.ps1'
--- a/build/pipelines/templates/helix-createprojfile-steps.yml
+++ b/build/pipelines/templates/helix-createprojfile-steps.yml
@@ -12,4 +12,4 @@ steps:
    inputs:
      targetType: filePath
      filePath: build\Helix\GenerateTestProjFile.ps1
-      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\$(BuildPlatform)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.60.210621002\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'
+      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\$(BuildPlatform)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'
--- a/build/pipelines/templates/helix-processtestresults-job.yml
+++ b/build/pipelines/templates/helix-processtestresults-job.yml
@@ -22,7 +22,6 @@ jobs:
    condition: succeededOrFailed()
    env:
      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
    inputs:
      targetType: filePath
      filePath: build\Helix\UpdateUnreliableTests.ps1
@@ -33,7 +32,6 @@ jobs:
    condition: succeededOrFailed()
    env:
      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
    inputs:
      targetType: filePath
      filePath: build\Helix\OutputTestResults.ps1
--- a/build/pipelines/templates/helix-runtests-job.yml
+++ b/build/pipelines/templates/helix-runtests-job.yml
@@ -15,7 +15,6 @@ parameters:
  # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
  useBuildOutputFromPipeline: $(System.DefinitionId)
  openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'

 jobs:
 - job: ${{ parameters.name }}
@@ -30,11 +29,11 @@ jobs:
    buildConfiguration: ${{ parameters.configuration }}
    buildPlatform: ${{ parameters.platform }}
    openHelixTargetQueues: ${{ parameters.openHelixTargetQueues }}
-    closedHelixTargetQueues: ${{ parameters.closedHelixTargetQueues }}
    artifactsDir: $(Build.SourcesDirectory)\Artifacts
-    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.60.210621002\build\Binaries\$(buildPlatform)
+    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\build\Binaries\$(buildPlatform)
    helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'

+
  steps:
  - task: CmdLine@1
    displayName: 'Display build machine environment variables'
@@ -141,7 +140,6 @@ jobs:

  - task: DotNetCoreCLI@2
    displayName: 'Run tests in Helix (open queues)'
-    condition: and(succeeded(),eq(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
    env:
      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
    inputs:
@@ -150,14 +148,3 @@ jobs:
      custom: msbuild
      arguments: '$(helixCommonArgs) /p:IsExternal=true /p:Creator=Terminal /p:HelixTargetQueues=$(openHelixTargetQueues)'

-  - task: DotNetCoreCLI@2
-    displayName: 'Run tests in Helix (closed queues)'
-    condition: and(succeeded(),ne(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      command: custom
-      projects: build\Helix\RunTestsInHelix.proj
-      custom: msbuild
-      arguments: '$(helixCommonArgs) /p:HelixTargetQueues=$(closedHelixTargetQueues)'
--- a/build/pipelines/templates/pgo-build-and-publish-nuget-job.yml
+++ b/build/pipelines/templates/pgo-build-and-publish-nuget-job.yml
@@ -20,15 +20,11 @@ jobs:
    inputs:
      artifactName: ${{ parameters.pgoArtifact }}
      downloadPath: $(artifactsPath)
-
-  - task: NuGetAuthenticate@0
-    inputs:
-      nuGetServiceConnections: 'Terminal Public Artifact Feed'
-
+  
  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 5.8.0'
+    displayName: 'Use NuGet 5.2.0'
    inputs:
-      versionSpec: 5.8.0
+      versionSpec: 5.2.0

  - task: CopyFiles@2
    displayName: 'Copy pgd files to NuGet build directory'
@@ -62,11 +58,5 @@ jobs:
    displayName: 'NuGet push'
    inputs:
      command: push
-      nuGetFeedType: external
-      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
-      # The actual URL and PAT for this feed is configured at
-      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
-      # This is the name of that connection
-      publishFeedCredentials: 'Terminal Public Artifact Feed'
-      feedsToUse: config
-      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
+      publishVstsFeed: Terminal/TerminalDependencies
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
--- a/build/pipelines/templates/release-sign-and-bundle.yml
+++ b/build/pipelines/templates/release-sign-and-bundle.yml
@@ -0,0 +1,74 @@
+parameters:
+  configuration: 'Release'
+
+jobs:
+- job: SignDeploy${{ parameters.configuration }}
+  displayName: Sign and Deploy for ${{ parameters.configuration }}
+
+  dependsOn:
+    - Buildx64AuditMode
+    - Buildx64Release
+    - Buildx86Release
+    - Buildarm64Release
+    - CodeFormatCheck
+  condition: |
+    and
+    (
+      in(dependencies.Buildx64AuditMode.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildx64Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildx86Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildarm64Release.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.CodeFormatCheck.result,   'Succeeded', 'SucceededWithIssues', 'Skipped')
+    )
+
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    AppxProjectName: CascadiaPackage
+    AppxBundleName: Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle
+
+  pool:
+    name: Package ES Lab E
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: PkgESSetupBuild@10
+    displayName: 'Package ES - Setup Build'
+    inputs:
+      useDfs: false
+      productName: WindowsTerminal
+      disableOutputRedirect: true
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download AppX artifacts
+    inputs:
+      artifactName: 'appx-$(BuildConfiguration)'
+      itemPattern: |
+        **/*.appx
+        **/*.msix
+      downloadPath: '$(Build.ArtifactStagingDirectory)\appx'
+
+  - task: PowerShell@2
+    displayName: 'Create $(AppxBundleName)'
+    inputs:
+      targetType: filePath
+      filePath: '.\build\scripts\Create-AppxBundle.ps1'
+      arguments: |
+        -InputPath "$(Build.ArtifactStagingDirectory)\appx" -ProjectName $(AppxProjectName) -BundleVersion 0.0.0.0 -OutputPath "$(Build.ArtifactStagingDirectory)\$(AppxBundleName)"
+
+  - task: PkgESCodeSign@10
+    displayName: 'Package ES - SignConfig.WindowsTerminal.xml'
+    inputs:
+      signConfigXml: 'build\config\SignConfig.WindowsTerminal.xml'
+      inPathRoot: '$(Build.ArtifactStagingDirectory)'
+      outPathRoot: '$(Build.ArtifactStagingDirectory)\signed'
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Signed AppX'
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)\signed'
+      ArtifactName: 'appxbundle-signed-$(BuildConfiguration)'
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -24,8 +24,6 @@
    "/doc/cascadia/",
    "/doc/user-docs/",
    "/src/tools/MonarchPeasantSample/",
-    "/scratch/",
-    "Scratch.sln",
  ],
  "SuffixFilters": [
    ".dbb",
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>12</VersionMinor>
+    <VersionMinor>9</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/dep/wil
+++ b/dep/wil
--- a/doc/TAEF.md
+++ b/doc/TAEF.md
@@ -16,7 +16,7 @@ If you have Visual Studio and related C++ components installed, and you have suc

 > Note that you cannot easily run TAEF tests directly through Visual Studio. The `Microsoft.Taef` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.

-In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development environment first:
+In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:

 ```shell
 .\tools\razzle.cmd
--- a/doc/cascadia/AddASetting.md
+++ b/doc/cascadia/AddASetting.md
@@ -6,9 +6,9 @@ Adding a setting to Windows Terminal is fairly straightforward. This guide serve

 The Terminal Settings Model (`Microsoft.Terminal.Settings.Model`) is responsible for (de)serializing and exposing settings.

-### `INHERITABLE_SETTING` macro
+### `GETSET_SETTING` macro

-The `INHERITABLE_SETTING` macro can be used to implement inheritance for your new setting and store the setting in the settings model. It takes three parameters:
+The `GETSET_SETTING` macro can be used to implement inheritance for your new setting and store the setting in the settings model. It takes three parameters:
 - `type`: the type that the setting will be stored as
 - `name`: the name of the variable for storage
 - `defaultValue`: the value to use if the user does not define the setting anywhere
@@ -20,7 +20,7 @@ This tutorial will add `CloseOnExitMode CloseOnExit` as a profile setting.
 1. In `Profile.h`, declare/define the setting:

 ```c++
-INHERITABLE_SETTING(CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful)
+GETSET_SETTING(CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful)
 ```

 2. In `Profile.idl`, expose the setting via WinRT:
@@ -141,7 +141,7 @@ struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
    OpenSettingsArgs() = default;

    // adds a getter/setter for your argument, and defines the json key
-    WINRT_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
+    GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
    static constexpr std::string_view TargetKey{ "target" };

    public:
@@ -213,9 +213,9 @@ Terminal-level settings are settings that affect a shell session. Generally, the
 - Declare the setting in `IControlSettings.idl` or `ICoreSettings.idl` (whichever is relevant to your setting). If your setting is an enum setting, declare the enum here instead of in the `TerminalSettingsModel` project.
 - In `TerminalSettings.h`, declare/define the setting...
 ```c++
-// The WINRT_PROPERTY macro declares/defines a getter setter for the setting.
-// Like INHERITABLE_SETTING, it takes in a type, name, and defaultValue.
-WINRT_PROPERTY(bool, UseAcrylic, false);
+// The GETSET_PROPERTY macro declares/defines a getter setter for the setting.
+// Like GETSET_SETTING, it takes in a type, name, and defaultValue.
+GETSET_PROPERTY(bool, UseAcrylic, false);
 ```
 - In `TerminalSettings.cpp`...
  - update `_ApplyProfileSettings` for profile settings
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -1,16 +1,16 @@
 {
  "$id": "https://github.com/microsoft/terminal/blob/main/doc/cascadia/profiles.schema.json",
-  "$schema": "https://json-schema.org/draft/2020-12/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
  "title": "Microsoft's Windows Terminal Settings Profile Schema",
  "definitions": {
    "KeyChordSegment": {
-      "pattern": "^(?:(?:ctrl|alt|shift|win)\\+)*(?:app|backspace|browser_(?:back|forward|refresh|stop|search|favorites|home)|comma|delete|down|end|enter|esc|escape|home|insert|left|menu|minus|pagedown|pageup|period|pgdn|pgup|plus|right|space|tab|up|f(?:1\\d?|2[0-4]?|[3-9])|numpad\\d|numpad_(?:\\d|add|decimal|divide|minus|multiply|period|plus|subtract)|(?:vk|sc)\\((?:[1-9]|1?\\d{2}|2[0-4]\\d|25[0-5])\\)|[^\\s+])(?:\\+(?:ctrl|alt|shift|win))*$",
+      "pattern": "^(?<modifier>(?<mod1>ctrl|alt|shift|win)(?:\\+(?<mod2>ctrl|alt|shift|win)(?<!\\k<mod1>))?(?:\\+(?<mod3>ctrl|alt|shift|win)(?<!\\k<mod1>|\\k<mod2>))?(?:\\+(?<mod4>ctrl|alt|shift|win)(?<!\\k<mod1>|\\k<mod2>|\\k<mod3>))?\\+)?(?<key>[^\\s+]|app|menu|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
      "type": "string",
-      "description": "The string should fit the format \"[ctrl+][alt+][shift+][win+]<KeyName>\", where each modifier is optional. KeyName is either any single key character, an explicit virtual key or scan code in the form vk(nnn) and sc(nnn) respectively, or one of the special names listed at https://docs.microsoft.com/en-us/windows/terminal/customize-settings/actions#accepted-modifiers-and-keys"
+      "description": "The string should fit the format \"[ctrl+][alt+][shift+][win+]<keyName>\", where each modifier is optional, separated by + symbols, and keyName is either one of the names listed in the table below, or any single key character. The string should be written in full lowercase.\napp, menu\tMENU key\nbackspace\tBACKSPACE key\ntab\tTAB key\nenter\tENTER key\nesc, escape\tESC key\nspace\tSPACEBAR\npgup, pageup\tPAGE UP key\npgdn, pagedown\tPAGE DOWN key\nend\tEND key\nhome\tHOME key\nleft\tLEFT ARROW key\nup\tUP ARROW key\nright\tRIGHT ARROW key\ndown\tDOWN ARROW key\ninsert\tINS key\ndelete\tDEL key\nnumpad_0-numpad_9, numpad0-numpad9\tNumeric keypad keys 0 to 9. Can't be combined with the shift modifier.\nnumpad_multiply\tNumeric keypad MULTIPLY key (*)\nnumpad_plus, numpad_add\tNumeric keypad ADD key (+)\nnumpad_minus, numpad_subtract\tNumeric keypad SUBTRACT key (-)\nnumpad_period, numpad_decimal\tNumeric keypad DECIMAL key (.). Can't be combined with the shift modifier.\nnumpad_divide\tNumeric keypad DIVIDE key (/)\nf1-f24\tF1 to F24 function keys\nplus\tADD key (+)"
    },
    "Color": {
      "default": "#",
-      "pattern": "^#[A-Fa-f0-9]{3}(?:[A-Fa-f0-9]{3})?$",
+      "pattern": "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$",
      "type": "string",
      "format": "color"
    },
@@ -154,17 +154,6 @@
          "description": "Sets how the background image aligns to the boundaries of the window when unfocused. Possible values: \"center\", \"left\", \"top\", \"right\", \"bottom\", \"topLeft\", \"topRight\", \"bottomLeft\", \"bottomRight\"",
          "type": "string"
        },
-        "intenseTextStyle": {
-          "default": "bright",
-          "description": "Controls how 'intense' text is rendered. Values are \"bold\", \"bright\", \"all\" and \"none\"",
-          "enum": [
-            "none",
-            "bold",
-            "bright",
-            "all"
-          ],
-          "type": "string"
-        },
        "experimental.retroTerminalEffect": {
          "description": "When set to true, enable retro terminal effects when unfocused. This is an experimental feature, and its continued existence is not guaranteed.",
          "type": "boolean"
@@ -176,65 +165,6 @@
      },
      "type": "object"
    },
-    "FontConfig": {
-      "properties": {
-        "face": {
-          "default": "Cascadia Mono",
-          "description": "Name of the font face used in the profile.",
-          "type": "string"
-        },
-        "size": {
-          "default": 12,
-          "description": "Size of the font in points.",
-          "minimum": 1,
-          "type": "integer"
-        },
-        "weight": {
-          "default": "normal",
-          "description": "Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values:\n -\"thin\"\n -\"extra-light\"\n -\"light\"\n -\"semi-light\"\n -\"normal\" (default)\n -\"medium\"\n -\"semi-bold\"\n -\"bold\"\n -\"extra-bold\"\n -\"black\"\n -\"extra-black\"\n or the corresponding numeric representation of OpenType font weight.",
-          "oneOf": [
-            {
-              "enum": [
-                "thin",
-                "extra-light",
-                "light",
-                "semi-light",
-                "normal",
-                "medium",
-                "semi-bold",
-                "bold",
-                "extra-bold",
-                "black",
-                "extra-black"
-              ],
-              "type": "string"
-            },
-            {
-              "maximum": 990,
-              "minimum": 100,
-              "type": "integer"
-            }
-          ]
-        },
-        "features": {
-          "description": "Sets the DWrite font features for the given font. For example, { \"ss01\": 1, \"liga\":0 } will enable ss01 and disable ligatures.",
-          "type": "object",
-          "patternProperties": {
-            "^(([A-Za-z0-9]){4})$": { "type": "integer" }
-          },
-          "additionalProperties": false
-        },
-        "axes": {
-          "description": "Sets the DWrite font axes for the given font. For example, { \"wght\": 200 } will set the font weight to 200.",
-          "type": "object",
-          "patternProperties": {
-            "^([A-Za-z]{4})$": { "type": "number" }
-          },
-          "additionalProperties": false
-        }
-      },
-      "type": "object"
-    },
    "ProfileGuid": {
      "default": "{}",
      "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
@@ -262,14 +192,10 @@
        "findMatch",
        "focusPane",
        "globalSummon",
-        "highlightCursor",
        "identifyWindow",
        "identifyWindows",
        "moveFocus",
-        "movePane",
-        "swapPane",
        "moveTab",
-        "multipleActions",
        "newTab",
        "newWindow",
        "nextTab",
@@ -301,7 +227,6 @@
        "toggleFocusMode",
        "toggleFullscreen",
        "togglePaneZoom",
-        "toggleSplitOrientation",
        "toggleReadOnlyMode",
        "toggleShaderEffects",
        "wt",
@@ -315,10 +240,7 @@
        "right",
        "up",
        "down",
-        "previous",
-        "nextInOrder",
-        "previousInOrder",
-        "first"
+        "previous"
      ],
      "type": "string"
    },
@@ -526,23 +448,6 @@
              "type": "integer",
              "default": 0,
              "description": "Which tab to switch to, with the first being 0"
-          }
-        }
-      }
-    ],
-    "required": [ "index" ]
-  },
-  "MovePaneAction": {
-      "description": "Arguments corresponding to a Move Pane Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "movePane" },
-            "index": {
-              "type": "integer",
-              "default": 0,
-              "description": "Which tab to move the pane to, with the first being 0"
            }
          }
        }
@@ -559,24 +464,7 @@
            "direction": {
              "$ref": "#/definitions/FocusDirection",
              "default": "left",
-              "description": "The direction to move focus in, between panes. Direction can be 'previous' to move to the most recently used pane, or 'nextInOrder' or 'previousInOrder' to move to the next or previous pane."
-            }
-          }
-        }
-      ],
-      "required": [ "direction" ]
-    },
-    "SwapPaneAction": {
-      "description": "Arguments corresponding to a Swap Pane Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "swapPane" },
-            "direction": {
-              "$ref": "#/definitions/FocusDirection",
-              "default": "left",
-              "description": "The direction to move the focus pane in, swapping panes. Direction can be 'previous' to swap with the most recently used pane, or 'nextInOrder' or 'previousInOrder' to move to the next or previous pane."
+              "description": "The direction to move focus in, between panes. Direction can be 'previous' to move to the most recently used pane."
            }
          }
        }
@@ -665,7 +553,7 @@
                "defaultsFile",
                "allFiles",
                "settingsUI"
-
+                
              ]
            }
          }
@@ -760,25 +648,6 @@
        }
      ]
    },
-    "CloseTabAction": {
-      "description": "Arguments for a closeTab action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "closeTab" },
-            "index": {
-              "oneOf": [
-                { "type": "integer" },
-                { "type": "null" }
-              ],
-              "default": null,
-              "description": "Close the tab at this index. If no index is provided, use the focused tab's index."
-            }
-          }
-        }
-      ]
-    },
    "ScrollUpAction": {
      "description": "Arguments for a scrollUp action",
      "allOf": [
@@ -827,24 +696,6 @@
      ],
      "required": [ "direction" ]
    },
-    "MultipleActionsAction": {
-      "description": "Arguments for the multiple actions command",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "multipleActions" },
-            "actions" : {
-              "$ref": "#/definitions/ShortcutAction",
-              "type": "array",
-              "minItems": 1,
-              "description": "A list of other actions."
-            }
-          }
-        }
-      ],
-      "required": [ "actions" ]
-    }, 
    "CommandPaletteAction": {
      "description": "Arguments for a commandPalette action",
      "allOf": [
@@ -1027,17 +878,6 @@
        }
      ]
    },
-    "HighlightCursorAction": {
-      "description": "The action to shine a spotlight on the current cursor location. If the cursor is off the screen, this action does nothing.",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "highlightCursor" }
-          }
-        }
-      ]
-    },
    "Keybinding": {
      "additionalProperties": false,
      "properties": {
@@ -1050,8 +890,6 @@
              { "$ref": "#/definitions/NewTabAction" },
              { "$ref": "#/definitions/SwitchToTabAction" },
              { "$ref": "#/definitions/MoveFocusAction" },
-              { "$ref": "#/definitions/MovePaneAction" },
-              { "$ref": "#/definitions/SwapPaneAction" },
              { "$ref": "#/definitions/ResizePaneAction" },
              { "$ref": "#/definitions/SendInputAction" },
              { "$ref": "#/definitions/SplitPaneAction" },
@@ -1061,7 +899,6 @@
              { "$ref": "#/definitions/WtAction" },
              { "$ref": "#/definitions/CloseOtherTabsAction" },
              { "$ref": "#/definitions/CloseTabsAfterAction" },
-              { "$ref": "#/definitions/CloseTabAction" },
              { "$ref": "#/definitions/ScrollUpAction" },
              { "$ref": "#/definitions/ScrollDownAction" },
              { "$ref": "#/definitions/MoveTabAction" },
@@ -1074,7 +911,6 @@
              { "$ref": "#/definitions/FocusPaneAction" },
              { "$ref": "#/definitions/GlobalSummonAction" },
              { "$ref": "#/definitions/QuakeModeAction" },
-              { "$ref": "#/definitions/HighlightCursorAction" },
              { "type": "null" }
            ]
        },
@@ -1217,10 +1053,6 @@
          "description": "When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one.",
          "type": "boolean"
        },
-        "experimental.input.forceVT": {
-          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
-          "type": "boolean"
-        },
        "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.",
@@ -1263,21 +1095,6 @@
          "minimum": 0,
          "type": [ "integer", "string" ],
          "deprecated": true
-        },
-        "minimizeToTray": {
-          "default": "false",
-          "description": "When set to true, minimizing a Terminal window will no longer appear in the taskbar. Instead, a Terminal icon will appear in the system tray through which the user can access their windows.",
-          "type": "boolean"
-        },
-        "alwaysShowTrayIcon": {
-          "default": "false",
-          "description": "When set to true, the Terminal's tray icon will always be shown in the system tray.",
-          "type": "boolean"
-        },
-        "useAcrylicInTabRow": {
-          "default": "false",
-          "description": "When set to true, the tab row will have an acrylic background with 50% opacity.",
-          "type": "boolean"
        },
 		"actions": {
 			"description": "Properties are specific to each custom action.",
@@ -1294,11 +1111,6 @@
          },
          "type": "array"
        },
-        "language": {
-          "default": "",
-          "description": "Sets an override for the app's preferred language, expressed as a BCP-47 language tag like en-US.",
-          "type": "string"
-        },
        "theme": {
          "default": "system",
          "description": "Sets the theme of the application. The special value \"system\" refers to the active Windows system theme.",
@@ -1427,11 +1239,6 @@
          "description": "Sets the appearance of the terminal when it is unfocused.",
          "type": ["object", "null"]
        },
-        "font": {
-          "$ref": "#/definitions/FontConfig",
-          "description": "Sets the font options of the terminal.",
-          "type": ["object", "null"]
-        },
        "backgroundImage": {
          "description": "Sets the file location of the image to draw over the window background.",
          "oneOf": [
@@ -1548,20 +1355,18 @@
        },
        "fontFace": {
          "default": "Cascadia Mono",
-          "description": "[deprecated] Define 'face' within the 'font' object instead.",
-          "type": "string",
-          "deprecated": true
+          "description": "Name of the font face used in the profile.",
+          "type": "string"
        },
        "fontSize": {
          "default": 12,
-          "description": "[deprecated] Define 'size' within the 'font' object instead.",
+          "description": "Size of the font in points.",
          "minimum": 1,
-          "type": "integer",
-          "deprecated": true
+          "type": "integer"
        },
        "fontWeight": {
          "default": "normal",
-          "description": "[deprecated] Define 'weight' within the 'font' object instead.",
+          "description": "Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values:\n -\"thin\"\n -\"extra-light\"\n -\"light\"\n -\"semi-light\"\n -\"normal\" (default)\n -\"medium\"\n -\"semi-bold\"\n -\"bold\"\n -\"extra-bold\"\n -\"black\"\n -\"extra-black\"\n or the corresponding numeric representation of OpenType font weight.",
          "oneOf": [
            {
              "enum": [
@@ -1584,8 +1389,7 @@
              "minimum": 100,
              "type": "integer"
            }
-          ],
-          "deprecated": true
+          ]
        },
        "foreground": {
          "$ref": "#/definitions/Color",
--- a/Terminal/spec.md
+++ b/Terminal/spec.md
@@ -9,7 +9,7 @@ issue id: #1043

 ## Abstract

-This spec is for task #1043 “Be able to set an initial position for the terminal”. It goes over the details of a new feature that allows users to set the initial position and size of the terminal. Expected behavior and design of this feature is included. Besides, future possible follow-up works are also addressed.
+This spec is for task #1043 “Be able to set an initial position for the terminal”. It goes over the details of a new feature that allows users to set the initial position and size of the terminal. Expected behavior and design of this feature is included. Besides, future possible follow-up works are also addressed.

 ## Inspiration

@@ -17,7 +17,7 @@ The idea is to allow users to set the initial position of the Terminal when they

 ## Solution Design

-For now, the Terminal window is put on a default initial position. The program uses CW_USEDEFAULT in the screen coordinates for top-left corner. We have two different types of window – client window and non-client window. However, code path for window creation (WM_CREATE message is shared by the two types of windows) are almost the same for the two types of windows, except that there are some differences in calculation of the width and height of the window.
+For now, the Terminal window is put on a default initial position. The program uses CW_USEDEFAULT in the screen coordinates for top-left corner. We have two different types of window – client window and non-client window. However, code path for window creation (WM_CREATE message is shared by the two types of windows) are almost the same for the two types of windows, except that there are some differences in calculation of the width and height of the window.

 Two new properties should be added in the json settings file:

@@ -92,9 +92,9 @@ For now, this feature only allows the user to set initial position and choose wh

 3. We may also consider more launch modes. Like full screen mode and minimized mode. 

-GitHub issue for future follow-ups: https://github.com/microsoft/terminal/issues/766
+Github issue for future follow-ups: https://github.com/microsoft/terminal/issues/766

 ## Resources

-GitHub issue:
+Github issue:
 https://github.com/microsoft/terminal/issues/1043
--- a/doc/specs/#1790
+++ b/doc/specs/#1790
@@ -1,105 +0,0 @@
---
-author: Pankaj Bhojwani, pabhojwa@microsoft.com
-created on: 2021-6-17
-last updated: 2021-6-23
-issue id: #1790
---
-
-# Font features and axes of variation
-
-## Abstract
-
-This spec outlines how we can allow users to specify font features and axes of variation for fonts in Windows Terminal. Font features include things like being able to specify whether ligatures should be used as well as the specific stylistic set used for a font. Axes of variation commonly include things like weight and slant but can also include fancier things like shadow distance, depending on the font.
-
-## Inspiration
-
-Reference: [#1790](https://github.com/microsoft/terminal/issues/1790)
-
-Currently, if a font has ligatures, we offer no way for a user to disable them. Many users would like the option to do so, and would also like the ability to choose stylistic sets for fonts - for example, at the time of this writing, Cascadia Code offers 4 stylistic sets but we offer no way for users to specify any of them.
-
-In a similar vein, many fonts allow for setting variations on the font along certain attributes, commonly referred to as 'axes of variation'. We can offer users more font customization options by allowing them to configure these font variations.
-
-## Solution Design
-
-### Font features
-
-It is already possible to pass in a list of [font feature structs](https://docs.microsoft.com/en-us/windows/win32/api/dwrite/ns-dwrite-dwrite_font_feature) to DWrite for it to handle. A font feature struct contains only 2 things: 
-
-1. A font feature tag
-2. A parameter value
-
-A font feature tag is constructed using a 4-character feature tag and the parameter value defines how the feature is applied. For most features, the parameter value is simply treated as a binary value - a value of 0 means the feature is not applied and a non-zero value means the feature is applied. For example, a font feature struct like {'ss03', 1} enables stylistic set 3 for the font and a font feature struct like {'liga', 0} disables ligatures. (Technically, the feature tag is _constructed_ with the 4-character tag and is not the 4-character tag itself, but they are treated the same in the example here for brevity's sake).
-
-Currently, we pass in to DWrite a null value for the list of features to apply to the font. This causes DWrite to automatically apply a ['standard' list](https://github.com/fdwr/TextLayoutSampler/blob/master/DrawableObject.ixx#L802) of font features to the font. Naturally, passing in our own list of font features to DWrite means DWrite will _only_ apply the features we defined, and no longer apply the standard list. Since the standard list contains 11 features, we need to consider how we can allow users to specify 1 additional feature or delete 1 of the standard features without needing to redefine all the others.
-
-We will do this by allowing users to define a dictionary in their settings.json file, where the keys are the 4-character feature tags and the values are the parameter values. This dictionary will then get applied to our internal dictionary (which will contain the standard list of 11 features with their parameter values), meaning that any new key-value pairs will get added to our dictionary and any existing key-value pairs will get updated. Finally, this 'merged' dictionary will be what we use to construct the list of features to pass into DWrite.
-
-### Axes of variation
-
-Specifying axes of variation is done in an extremely similar manner to the way font features are specified - a 4-character tag is used to specify which font axis is being modified and a numerical value is provided to specify the value the axis should be set to. For example, {'slnt', 20} specifies that the 'slant' axis should be set to 20.
-
-There is also a standard list of axes of variation, and each axis has its own default. We will approach this the same way we approached font features, by allowing users to specify additional features or omit features without needing to redefine the defaults.
-
-## UI/UX Design
-
-Users will be able to add a new setting to their font objects (added in [#10433](https://github.com/microsoft/terminal/pull/10433)). The resultant font object may look something like this
-
-```json
-"font": {
-    "face": "Cascadia Code",
-    "size": 12,
-    "features": {
-        "ss03": 1,
-        "liga": 0
-    },
-    "axes": {
-        "slnt": 20.5
-    }
-}
-```
-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 the old "weight" setting is an enum (that eventually gets mapped to a float value).
-
-## Capabilities
-
-### Accessibility
-
-Should not affect accessibility.
-
-### Security
-
-Should not affect security.
-
-### Reliability
-
-Aside from additional parsing required for the settings file (which inherently offers more locations for parsing to fail), we need to be careful about badly formed/non-existant feature tags or axes specified in the user-defined dictionaries. We must make sure to ignore such declarations (perhaps alongside emitting a warning to the user) and only apply those that are correctly formed and exist.
-
-### Compatibility
-
-Older versions of Windows may not have the DWrite updates that allow for defining font features and axes of variation. We must make sure to fallback to the current implementation in these cases.
-
-### Performance, Power, and Efficiency
-
-Currently when rendering a run of text, if we detect that the given run is simple we will use a shortcut to obtain the glyphs needed, skipping over an expensive `GetGlyphs` call to DWrite. However, when the default feature list is changed in any way (either by adding a new feature or removing one of the defaults), there is no way for us to detect beforehand how the font glyphs would change.
-
-This means that as long as the user requests a change to the default font feature list, we will _always_ skip the shortcut and call the expensive `GetGlyphs` function for every run of text.
-
-This will naturally cause a performance cost that we will have to bear for this feature. However, it is worth noting that there are a fair number of glyphs that will cause a run of text to be deemed "not simple" (and thus cause us to call `GetGlyphs` anyway), for example when using Cascadia Code, any run of text that has the letters 'i', 'j', 'l', 'n', 'w' or 'x' is not considered simple (because those glyphs have localized variants).
-
-## Potential Issues
-
-See performance issues above.
-
-## Future considerations
-
-DWrite additionally offers the ability to vary the font features across runs of text. However, for our initial implementation of this feature, we will only apply font features to the entire buffer. If/when we decide to allow specifying font features for particular runs of text, we can lean into our existing mechanisms of splitting up runs of text to implement that.
-
-We will also need to consider how we want to represent this in the settings UI. This is slightly more complex than other settings since users should be allowed to manually input 4-character tags.
-
-## Resources
-
-[DWRITE_FONT_FEATURE structure](https://docs.microsoft.com/en-us/windows/win32/api/dwrite/ns-dwrite-dwrite_font_feature)
-
-[DWRITE_FONT_AXIS_VALUE structure](https://docs.microsoft.com/en-us/windows/win32/api/dwrite_3/ns-dwrite_3-dwrite_font_axis_value)
--- a/Improvements.md
+++ b/Improvements.md
@@ -1,619 +0,0 @@
---
-author: Mike Griese @zadjii-msft
-created on: 2020-11-20
-last updated: 2021-08-17
-issue id: #1032
---
-
-# Elevation Quality of Life Improvements
-
-## Abstract
-
-For a long time, we've been researching adding support to the Windows Terminal
-for running both unelevated and elevated (admin) tabs side-by-side, in the same
-window. However, after much research, we've determined that there isn't a safe
-way to do this without opening the Terminal up as a potential
-escalation-of-privilege vector.
-
-Instead, we'll be adding a number of features to the Terminal to improve the
-user experience of working in elevated scenarios. These improvements include:
-
-* A visible indicator that the Terminal window is elevated ([#1939])
-* Configuring the Terminal to always run elevated ([#632])
-* Configuring a specific profile to always open elevated ([#632])
-* Allowing new tabs, panes to be opened elevated directly from an unelevated
-  window
-* Dynamic profile appearance that changes depending on if the Terminal is
-  elevated or not. ([#1939], [#8311])
-
-## Background
-
-_This section was originally authored in the [Process Model 2.0 Spec]. Please
-refer to it there for its original context._
-
-Let's presume that you're a user who wants to be able to open an elevated tab
-within an otherwise unelevated Terminal window. We call this scenario "mixed
-elevation" - the tabs within the Terminal can be running either unelevated _or_
-elevated client applications.
-
-It wouldn't be terribly difficult for the unelevated Terminal to request the
-permission of the user to spawn an elevated client application. The user would
-see a UAC prompt, they'd accept, and then they'd be able to have an elevated
-shell alongside their unelevated tabs.
-
-However, this creates an escalation of privilege vector. Now, there's an
-unelevated window which is connected directly to an elevated process. At this
-point, **any other unelevated application could send input to the Terminal's
-`HWND`**. This would make it possible for another unelevated process to "drive"
-the Terminal window, and send commands to the elevated client application.
-
-It was initially theorized that the window/content model architecture would also
-help enable "mixed elevation". With mixed elevation, tabs could run at different
-integrity levels within the same terminal window. However, after investigation
-and research, it has become apparent that this scenario is not possible to do
-safely after all. There are numerous technical difficulties involved, and each
-with their own security risks. At the end of the day, the team wouldn't be
-comfortable shipping a mixed-elevation solution, because there's simply no way
-for us to be confident that we haven't introduced an escalation-of-privilege
-vector utilizing the Terminal. No matter how small the attack surface might be,
-we wouldn't be confident that there are _no_ vectors for an attack.
-
-Some things we considered during this investigation:
-
-* If a user requests a new elevated tab from an otherwise unelevated window, we
-  could use UAC to create a new, elevated window process, and "move" all the
-  current tabs to that window process, as well as the new elevated client. Now,
-  the window process would be elevated, preventing it from input injection, and
-  it would still contains all the previously existing tabs. The original window
-  process could now be discarded, as the new elevated window process will
-  pretend to be the original window.
-  - However, it is unfortunately not possible with COM to have an elevated
-    client attach to an unelevated server that's registered at runtime. Even in
-    a packaged environment, the OS will reject the attempt to `CoCreateInstance`
-    the content process object. this will prevent elevated windows from
-    re-connecting to unelevated client processes.
-  - 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 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
-    window and content processes at mixed elevation levels `CoCreateInstance`
-    that broker. This however _also_ did not work across elevation levels. This
-    may be due to a lack of Packaged COM support for mixed elevation levels.
-
-    It's also possible that the author forgot that packaged WinRT doesn't play
-    nicely with creating objects in an elevated context. The Terminal has
-    previously needed to manually manifest all its classes in a SxS manifest for
-    Unpackaged WinRT to allow the classes to be activated, rather than relying
-    on the packaged catalog. It's theoretically possible that doing that would
-    have allowed the broker to be activated across integrity levels.
-
-    Even if this approach did end up working, we would still need to be
-    responsible for securing the elevated windows so that an unelevated attacker
-    couldn't hijack a content process and trigger unexpected code in the window
-    process. We didn't feel confident that we could properly secure this channel
-    either.
-
-We also considered allowing mixed content in windows that were _originally_
-elevated. If the window is already elevated, then it can launch new unelevated
-processes. We could allow elevated windows to still create unelevated
-connections. However, we'd want to indicate per-pane what the elevation state
-of each connection is. The user would then need to keep track themselves of
-which terminal instances are elevated, and which are not.
-
-This also marks a departure from the current behavior, where everything in an
-elevated window would be elevated by default. The user would need to specify for
-each thing in the elevated window that they'd want to create it elevated. Or the
-Terminal would need to provide some setting like
-`"autoElevateEverythingInAnElevatedWindow"`.
-
-We cannot support mixed elevation when starting in a unelevated window.
-Therefore, it doesn't make a lot of UX sense to support it in the other
-direction. It's a cleaner UX story to just have everything in a single window at
-the same elevation level.
-
-## Solution Design
-
-Instead of supporting mixed elevation in the same window, we'll introduce the
-following features to the Terminal. These are meant as a way of improving the
-quality of life for users who work in mixed-elevation (or even just elevated)
-environments.
-
-### Visible indicator for elevated windows
-
-As requested in [#1939], it would be nice if it was easy to visibly identify if
-a Terminal window was elevated or not.
-
-One easy way of doing this is by adding a simple UAC shield to the left of the
-tabs for elevated windows. This shield could be configured by the theme (see
-[#3327]). We could provide the following states:
-* Colored (the default)
-* Monochrome
-* Hidden, to hide the shield even on elevated windows. This is the current
-  behavior.
-
-![UAC-shield-in-titlebar](UAC-shield-in-titlebar.png)
-_figure 1: a monochrome UAC shield in the titlebar of the window, courtesy of @mdtauk_
-
-We could also simplify this to only allow a boolean true/false for displaying
-the shield. As we do often with other enums, we could define `true` to be the
-same as the default appearance, and `false` to be the hidden option. As always,
-the development of the Terminal is an iterative process, where we can
-incrementally improve from no setting, to a boolean setting, to a enum-backed
-one.
-
-### Configuring a profile to always run elevated
-
-Oftentimes, users might have a particular tool chain that only works when
-running elevated. In these scenarios, it would be convenient for the user to be
-able to identify that the profile should _always_ run elevated. That way, they
-could open the profile from the dropdown menu of an otherwise unelevated window
-and have the elevated window open with the profile automatically.
-
-We'll be adding the `"elevate": true|false` setting as a per-profile setting,
-with a default value of `false`. When set to `true`, we'll try to auto-elevate
-the profile whenever it's launched. We'll check to see if this window is
-elevated before creating the connection for this profile. If the window is not
-elevated, then we'll create a new window with the requested elevation level to
-handle the new connection.
-
-`"elevate": false` will do nothing. If the window is already elevated, then the
-profile won't open an un-elevated window.
-
-If the user tries to open an `"elevate": true` profile in a window that's
-already elevated, then a new tab/split will open in the existing window, rather
-than spawning an additional elevated window.
-
-There are three situations where we're creating new terminal instances: new
-tabs, new splits, and new windows. Currently, these are all actions that are
-also exposed in the `wt` commandline as subcommands. We can convert from the
-commandline arguments into these actions already. Therefore, it shouldn't be too
-challenging to convert these actions back into the equal commandline arguments.
-
-For the following examples, let's assume the user is currently in an unelevated
-Terminal window.
-
-When the user tries to create a new elevated **tab**, we'll need to create a new
-process, elevated, with the following commandline:
-
-```
-wt new-tab [args...]
-```
-
-When we create this new `wt` instance, it will obey the glomming rules as
-specified in [Session Management Spec]. It might end up glomming to another
-existing window at that elevation level, or possibly create its own window.
-
-Similarly, for a new elevated **window**, we can make sure to pass the `-w new`
-arguments to `wt`. These parameters indicate that we definitely want this
-command to run in a new window, regardless of the current glomming settings.
-
-```
-wt -w new new-tab [args...]
-```
-
-However, creating a new **pane** is a little trickier. Invoking the `wt
-split-pane [args...]` is straightforward enough.
-
-<!-- Discussion notes follow:
-If the current window doesn't have the same elevation level as the
-requested profile, do we always want to just create a new split? If the command
-ends up glomming to an existing window, does that even make sense? That invoking
-an elevated split in an unelevated window would end up splitting the elevated
-window? It's very possible that the user wanted a split in the tab they're
-currently in, in the unelevated window, but they don't want a split in the
-elevated window.
-
-What if there's not space in the elevated window to create the split (but there
-would be in the current window)? That would sure make it seem like nothing
-happened, silently.
-
-We could alternatively have cross-elevation splits default to always opening a
-new tab. That might mitigate some of the odd behaviors. Until we actually have
-support for running commands in existing windows, we'll always need to make a
-new window when running elevated. We'll need to make the new window for new tabs
-and splits, because there's no way to invoke another existing window.
-
-A third proposal is to pop a warning dialog at the user when they try to open an
-elevated split from and unelevated window. This dialog could be something like
-
-> What you requested couldn't be completed. Do you want to:
-> A. Make me a new tab instead.
-> B. Forget it and cancel. I'll go fix my config.
-
-I'm certainly leaning towards proposal 2 - always create a new tab. This is how
-it's implemented in [#8514]. In that PR, this seems to work sensibly.
-->
-
-After discussing with the team, we have decided that the most sensible approach
-for handling a cross-elevation `split-pane` is to just create a new tab in the
-elevated window. The user can always re-attach the pane as a split with the
-`move-pane` command once the new pane in the elevated window.
-
-#### Configure the Terminal to _always_ run elevated
-
-`elevate` is a per-profile property, not a global property. If a user
-wants to always have all instances of the Terminal run elevated, they
-could set `"elevate": true` in their profile defaults. That would cause _all_
-profiles they launch to always spawn as elevated windows.
-
-#### `elevate` in Actions
-
-Additionally, we'll add the `elevate` property to the `NewTerminalArgs` used in
-the `newTab`, `splitPane`, and `newWindow` actions. This is similar to how other
-properties of profiles can be overridden at launch time. This will allow
-windows, tabs and panes to all be created specifically as elevated windows.
-
-In the `NewTerminalArgs`, `elevate` will be an optional boolean, with the
-following behavior:
-* `null` (_default_): Don't modify the `elevate` property for this profile
-* `true`: This launch should act like the profile had `"elevate": true` in its
-  properties.
-* `false`: This launch should act like the profile had `"elevate": false` in its
-  properties.
-
-We'll also add an iterable command for opening a profile in an
-elevated tab, with the following json:
-
-```jsonc
-{
-    // New elevated tab...
-    "name": { "key": "NewElevatedTabParentCommandName", "icon": "UAC-Shield.png" },
-    "commands": [
-        {
-            "iterateOn": "profiles",
-            "icon": "${profile.icon}",
-            "name": "${profile.name}",
-            "command": { "action": "newTab", "profile": "${profile.name}", "elevated": true }
-        }
-    ]
-},
-```
-
-#### Elevation from the dropdown
-
-Currently, the new tab dropdown supports opening a new pane by
-<kbd>Alt+click</kbd>ing on a profile. We could similarly add support to open a
-tab elevated with <kbd>Ctrl+click</kbd>. This is similar to the behavior of the
-Windows taskbar. It supports creating an elevated instance of a program by
-<kbd>Ctrl+click</kbd>ing on entries as well.
-
-## Implementation Details
-
-### Starting an elevated process from an unelevated process
-
-It seems that we're able to create an elevated process by passing the `"runas"`
-verb to
-[`ShellExecute`](https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutea).
-So we could use something like
-
-```c++
-ShellExecute(nullptr,
-             L"runas",
-             L"wt.exe",
-             L"-w new new-tab [args...]",
-             nullptr,
-             SW_SHOWNORMAL);
-```
-
-This will ask the shell to perform a UAC prompt before spawning `wt.exe` as an
-elevated process.
-
-> 👉 NOTE: This mechanism won't always work on non-Desktop SKUs of Windows. For
-> more discussion, see [Elevation on OneCore SKUs](#Elevation-on-OneCore-SKUs).
-
-## Potential Issues
-
-<table>
-<tr>
-<td><strong>Accessibility</strong></td>
-<td>
-
-The set of changes proposed here are not expected to introduce any new
-accessibility issues. Users can already create elevated Terminal windows. Making
-it easier to create these windows doesn't really change our accessibility story.
-
-</td>
-</tr>
-<tr>
-<td><strong>Security</strong></td>
-<td>
-
-We won't be doing anything especially unique, so there aren't expected to be any
-substantial security risks associated with these changes. Users can already
-create elevated Terminal windows, so we're not really introducing any new
-functionality, from a security perspective.
-
-We're relying on the inherent security of the `runas` verb of `ShellExecute` to
-prevent any sort of unexpected escalation-of-privilege.
-
-<hr>
-
-One security concern is the fact that the `settings.json` file is currently a
-totally unsecured file. It's completely writable by any medium-IL process. That
-means it's totally possible for a malicious program to change the file. The
-malicious program could find a user's "Elevated PowerShell" profile, and change
-the commandline to `malicious.exe`. The user might then think that their
-"Elevated PowerShell" will run `powershell.exe` elevated, but will actually
-auto-elevate this attacker.
-
-If all we expose to the user is the name of the profile in the UAC dialog, then
-there's no way for the user to be sure that the program that's about to be
-launched is actually what they expect.
-
-To help mitigate this, we should _always_ pass the evaluated `commandline` as a
-part of the call to `ShellExecute`. the arguments that are passed to
-`ShellExecute` are visible to the user, though they need to click the "More
-Details" dropdown to reveal them.
-
-We will need to mitigate this vulnerability regardless of adding support for the
-auto-elevation of individual terminal tabs/panes. If a user is launching the
-Terminal elevated (i.e. from the Win+X menu in Windows 11), then it's possible
-for a malicious program to overwrite the `commandline` of their default profile.
-The user may now unknowingly invoke this malicious program while thinking they
-are simply launching the Terminal.
-
-To deal with this more broadly, we will display a dialog within the Terminal
-window before creating **any** elevated terminal instance. In that dialog, we'll
-display the commandline that will be executed, so the user can very easily
-confirm the commandline.
-
-This will need to happen for all elevated terminal instances. For an elevated
-Windows Terminal window, this means _all_ connections made by the Terminal.
-Every time the user opens a new profile or a new commandline in a pane, we'll
-need to prompt them first to confirm the commandline. This dialog within the
-elevated window will also prevent an attacker from editing the `settings.json`
-file while the user already has an elevated Terminal window open and hijacking a
-profile.
-
-The dialog options will certainly be annoying to users who don't want to be
-taken out of their flow to confirm the commandline that they wish to launch.
-There's precedent for a similar warning being implemented by VSCode, with their
-[Workspace Trust] feature. They too faced a similar backlash when the feature
-first shipped. However, in light of recent global cybersecurity attacks, this is
-seen as an acceptable UX degradation in the name of application trust. We don't
-want to provide an avenue that's too easy to abuse.
-
-When the user confirms the commandline of this profile as something safe to run,
-we'll add it to an elevated-only version of `state.json`. (see [#7972] for more
-details). This elevated version of the file will only be accessible by the
-elevated Terminal, so an attacker cannot hijack the contents of the file. This
-will help mitigate the UX discomfort caused by prompting on every commandline
-launched. This should mean that the discomfort is only limited to the first
-elevated launch of a particular profile. Subsequent launches (without modifying
-the `commandline`) will work as they always have.
-
-The dialog for confirming these commandlines should have a link to the docs for
-"Learn more...". Transparency in the face of this dialog should
-mitigate some dissatisfaction.
-
-The dialog will _not_ appear if the user does not have a split token - if the
-user's PC does not have UAC enabled, then they're _already_ running as an
-Administrator. Everything they do is elevated, so they shouldn't be prompted in
-this way.
-
-The Settings UI should also expose a way of viewing and removing these cached
-entries. This page should only be populated in the elevated version of the
-Terminal.
-
-</td>
-</tr>
-<tr>
-<td><strong>Reliability</strong></td>
-<td>
-
-No changes to our reliability are expected as a part of this change.
-
-</td>
-</tr>
-<tr>
-<td><strong>Compatibility</strong></td>
-<td>
-
-There are no serious compatibility concerns expected with this changelist. The
-new `elevate` property will be unset by default, so users will heed to opt-in
-to the new auto-elevating behavior.
-
-There is one minor concern regarding introducing the UAC shield on the window.
-We're planning on using themes to configure the appearance of the shield. That
-means we'll need to ship themes before the user will be able to hide the shield
-again.
-
-</td>
-</tr>
-<tr>
-<td><strong>Performance, Power, and Efficiency</strong></td>
-<td>
-
-No changes to our performance are expected as a part of this change.
-
-</td>
-</tr>
-</table>
-
-### Centennial Applications
-
-In the past, we've had a notoriously rough time with the Centennial app
-infrastructure and running the Terminal elevated. Notably, we've had to list all
-our WinRT classes in our SxS manifest so they could be activated using
-unpackaged WinRT while running elevated. Additionally, there are plenty of
-issues running the Terminal in an "over the shoulder" elevation (OTS) scenario.
-
-Specifically, we're concerned with the following scenario:
-  * the current user account has the Terminal installed,
-  * but they aren't an Administrator,
-  * the Administrator account doesn't have the Terminal installed.
-
-In that scenario, the user can run into issues launching the Terminal in an
-elevated context (even after entering the Admin's credentials in the UAC
-prompt).
-
-This spec proposes no new mitigations for dealing with these issues. It may in
-fact make them more prevalent, by making elevated contexts more easily
-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 are team best equipped to resolve these issues.
-
-### Default Terminal & auto-elevation
-
-In the future, when we support setting the Terminal as the "default terminal
-emulator" on Windows. When that lands, we will use the `profiles.defaults`
-settings to create the tab where we'll be hosting the commandline client. If the user has
-`"elevate": true` in their `profiles.defaults`, we'd usually try to
-auto-elevate the profile. In this scenario, however, we can't do that. The
-Terminal is being invoked on behalf of the client app launching, instead of the
-Terminal invoking the client application.
-
-**2021-08-17 edit**: Now that "defterm" has shipped, we're a little more aware
-of some of the limitations with packaged COM and elevation boundaries. Defterm
-cannot be used with elevated processes _at all_ currently (see [#10276]). When
-an elevated commandline application is launched, it will always just appear in
-`conhost.exe`. Furthermore, An unelevated peasant can't communicate with an
-elevated monarch so we can't toss the connection to the elevated monarch and
-have them handle it.
-
-The simplest solution here is to just _always_ ignore the `elevate` property for
-incoming defterm connections. This is not an ideal solution, and one that we're
-willing to revisit if/when [#10276] is ever fixed.
-
-### Elevation on OneCore SKUs
-
-This spec proposes using `ShellExecute` to elevate the Terminal window. However,
-not all Windows SKUs have support for `ShellExecute`. Notably, the non-Desktop
-SKUs, which are often referred to as "OneCore" SKUs. On these platforms, we
-won't be able to use `ShellExecute` to elevate the Terminal. There might not
-even be the concept of multiple elevation levels, or different users, depending
-on the SKU.
-
-Fortunately, this is a mostly hypothetical concern for the moment. Desktop is
-the only publicly supported SKU for the Terminal currently. If the Terminal ever
-does become available on those SKUs, we can use these proposals as mitigations.
-
-* If elevation is supported, there must be some other way of elevating a
-  process. We could always use that mechanism instead.
-* If elevation isn't supported (I'm thinking 10X is one of these), then we could
-  instead display a warning dialog whenever a user tries to open an elevated
-  profile.
-  - We could take the warning a step further. We could add another settings
-    validation step. This would warn the user if they try to mark any profiles
-    or actions as `"elevate":true`
-
-## Future considerations
-
-* If we wanted to go even further down the visual differentiation route, we
-  could consider allowing the user to set an entirely different theme ([#3327])
-  based on the elevation state. Something like `elevatedTheme`, to pick another
-  theme from the set of themes. This would allow them to force elevated windows
-  to have a red titlebar, for example.
-* Over the course of discussion concerning appearance objects ([#8345]), it
-  became clear that having separate "elevated" appearances defined for
-  `profile`s was overly complicated. This is left as a consideration for a
-  possible future extension that could handle this scenario in a cleaner way.
-* Similarly, we're going to leave [#3637] "different profiles when elevated vs
-  unelevated" for the future. This also plays into the design of "configure the
-  new tab dropdown" ([#1571]), and reconciling those two designs is out-of-scope
-  for this particular release.
-* Tangentially, we may want to have a separate Terminal icon we ship with the
-  UAC shield present on it. This would be especially useful for the tray icon.
-  Since there will be different tray icon instances for elevated and unelevated
-  windows, having unique icons may help users identify which is which.
-
-### De-elevating a Terminal
-
-the original version of this spec proposed that `"elevated":false` from an
-elevated Terminal window should create a new unelevated Terminal instance. The
-mechanism for doing this is described in [The Old New Thing: How can I launch an
-unelevated process from my elevated process, redux].
-
-This works well when the Terminal is running unpackaged. However, de-elevating a
-process does not play well with packaged centennial applications. When asking
-the OS to run the packaged application from an elevated context, the system will
-still create the child process _elevated_. This means the packaged version of
-the Terminal won't be able to create a new unelevated Terminal instance.
-
-From an internal mail thread:
-
-> App model intercepts the `CreateProcess` call and redirects it to a COM
-> service. The parent of a packaged app is not the launching app, it’s some COM
-> service. So none of the parent process nonsense will work because the
-> parameters you passed to `CreateProcess` aren’t being used to create the
-> process.
-
-If this is fixed in the future, we could theoretically re-introduce de-elevating
-a profile. The original spec proposed a `"elevated": bool?` setting, with the
-following behaviors:
-* `null` (_default_): Don't modify the elevation level when running this profile
-* `true`: If the current window is unelevated, try to create a new elevated
-  window to host this connection.
-* `false`: If the current window is elevated, try to create a new unelevated
-  window to host this connection.
-
-We could always re-introduce this setting, to supercede `elevate`.
-
-### Change profile appearance for elevated windows
-
-In [#3062] and [#8345], we're planning on allowing users to set different
-appearances for a profile whether it's focused or not. We could do similar thing
-to enable a profile to have a different appearance when elevated. In the
-simplest case, this could allow the user to set `"background": "#ff0000"`. This
-would make a profile always appear to have a red background when in an elevated
-window.
-
-The more specific details of this implementation are left to the spec
-[Configuration object for profiles].
-
-In discussion of that spec, we decided that it would be far too complicated to
-try and overload the `unfocusedAppearance` machinery for differentiating between
-elevated and unelevated versions of the same profile. Already, that would lead
-to 4 states: [`appearance`, `unfocusedAppearance`, `elevatedAppearance`,
-`elevatedUnfocusedAppearance`]. This would lead to a combinatorial explosion if
-we decided in the future that there should also be other states for a profile.
-
-This particular QoL improvement is currently being left as a future
-consideration, should someone come up with a clever way of defining
-elevated-specific settings.
-
-<!--
-Brainstorming notes for future readers:
-
-You could have a profile that layers on an existing profile, with elevated-specific settings:
-
-{
-  "name": "foo",
-  "background": "#0000ff",
-  "commandline": "cmd.exe /k echo I am unelevated"
-},
-{
-  "inheritsFrom": "foo",
-  "background": "#ff0000",
-  "elevate": true,
-  "commandline": "cmd.exe /k echo I am ELEVATED"
-}
-->
-
-<!-- Footnotes -->
-
-[#632]: https://github.com/microsoft/terminal/issues/632
-[#1032]: https://github.com/microsoft/terminal/issues/1032
-[#1571]: https://github.com/microsoft/terminal/issues/1571
-[#1939]: https://github.com/microsoft/terminal/issues/1939
-[#3062]: https://github.com/microsoft/terminal/issues/3062
-[#3327]: https://github.com/microsoft/terminal/issues/3327
-[#3637]: https://github.com/microsoft/terminal/issues/3637
-[#4472]: https://github.com/microsoft/terminal/issues/4472
-[#5000]: https://github.com/microsoft/terminal/issues/5000
-[#7972]: https://github.com/microsoft/terminal/pull/7972
-[#8311]: https://github.com/microsoft/terminal/issues/8311
-[#8345]: https://github.com/microsoft/terminal/issues/8345
-[#8514]: https://github.com/microsoft/terminal/issues/8514
-[#10276]: https://github.com/microsoft/terminal/issues/10276
-
-[Process Model 2.0 Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%235000%20-%20Process%20Model%202.0.md
-[Configuration object for profiles]: https://github.com/microsoft/terminal/blob/main/doc/specs/Configuration%20object%20for%20profiles.md
-[Session Management Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%234472%20-%20Windows%20Terminal%20Session%20Management.md
-[The Old New Thing: How can I launch an unelevated process from my elevated process, redux]: https://devblogs.microsoft.com/oldnewthing/20190425-00/?p=102443
-[Workspace Trust]: https://code.visualstudio.com/docs/editor/workspace-trust
--- a/2.0/UAC-shield-in-titlebar.png
+++ b/2.0/UAC-shield-in-titlebar.png
--- a/Search/spec.md
+++ b/Search/spec.md
@@ -123,4 +123,4 @@ This open issue tracks the phase features of Search: https://github.com/microsof

 ## Resources

-GitHub Issue: https://github.com/microsoft/terminal/issues/605
+Github Issue: https://github.com/microsoft/terminal/issues/605
--- a/Page/add-click.png
+++ b/Page/add-click.png
--- a/Page/add-keys.png
+++ b/Page/add-keys.png
--- a/Page/edit-click.png
+++ b/Page/edit-click.png
--- a/Page/edit-keys.png
+++ b/Page/edit-keys.png
--- a/doc/specs/#6900
+++ b/doc/specs/#6900
@@ -1,130 +0,0 @@
---
-author: Kayla Cinnamon - cinnamon-msft
-created on: 2021-03-04
-last updated: 2021-03-09
-issue id: 6900
---
-
-# Actions Page
-
-## Abstract
-
-We need to represent actions inside the settings UI. This spec goes through the possible use cases and reasoning for including specific features for actions inside the settings UI.
-
-## Background
-
-### Inspiration
-
-It would be ideal if we could get the settings UI to have parity with the JSON file. This will take some design work if we want every feature possible in relation to actions. There is also the option of not having parity with the JSON file in order to present a simpler UX.
-
-### User Stories
-
-All of these features are possible with the JSON file. This spec will go into discussion of which (possibly all) of these user stories need to be handled by the settings UI.
-
- Add key bindings to an action that does not already have keys assigned
- Edit key bindings for an action
- Remove key bindings from an action
- Add multiple key bindings for the same action
- Create an iterable action
- Create a nested action
- Choose which actions appear inside the command palette
- See all possible actions, regardless of keys
-
-Commands with properties:
- sendInput has "input"
- closeOtherTabs has "index"
- closeTabsAfter has "index"
- renameTab has "title"*
- setTabColor has "color"*
- newWindow has "commandline", "startingDirectory", "tabTitle", "index", "profile"
- splitPane has "split", "commandline", "startingDirectory", "tabTitle", "index", "profile", "splitMode", "size"
- copy has "singleLine", "copyFormatting"
- scrollUp has "rowsToScroll"
- scrollDown has "rowsToScroll"
- setColorScheme has "colorScheme"
-
-Majority of these commands listed above are intended for the command palette, so they wouldn't make much sense with keys assigned to them anyway.
-
-### Future Considerations
-
-One day we'll have actions that can be invoked by items in the dropdown menu. This setting will have to live somewhere. Also, once we get a status bar, people may want to invoke actions from there.
-
-## Solution Design
-
-### Proposal 1: Keyboard and Command Palette pages
-
-Implement a Keyboard page in place of the Actions page. Also plan for a Command Palette page in the future if it's something that's heavily requested. The Command Palette page would cover the missing use cases listed below.
-
-When users want to add a new key binding, the dropdown will list every action, regardless if it already has keys assigned. This page should show every key binding assigned to an action, even if there are multiple bindings to the same action.
-
-Users will be able to view every possible action from the command palette if they'd like.
-
-Use cases covered:
- Add key bindings to an action that does not already have keys assigned
- Edit key bindings for an action
- Remove key bindings from an action
- Add multiple key bindings for the same action
- See all actions that have keys assigned
-
-Use cases missing:
- Create an iterable action
- Create a nested action
- Choose which actions appear inside the command palette
- See all possible actions, regardless of keys
-
-* **Pros**:
- This allows people to edit their actions in most of their scenarios.
- This gives us some wiggle room to cover majority of the use cases we need and seeing if people want the other use cases that are missing.
-
-* **Cons**:
- Unfortunately we couldn't cover every single use case with this design.
- You can't edit the properties that are on some commands, however the default commands from the command palette include options with properties anyway. For example "decrease font size" has the `delta` property already included.
-
-### Proposal 2: Have everything on one Actions page
-
-Implement an Actions page that allows you to create actions designed for the command palette as well as actions with keys.
-
-Use cases covered:
- Add key bindings to an action that does not already have keys assigned
- Edit key bindings for an action
- Remove key bindings from an action
- Add multiple key bindings for the same action
- See all actions that have keys assigned
- Create an iterable action
- Create a nested action
- Choose which actions appear inside the command palette
- See all possible actions, regardless of keys
-
-I could not come up with a UX design that wasn't too complicated or confusing for this scenario.
-
-**Pros**:
- There is full parity with the JSON file.
-
-**Cons**:
- Could not come up with a simplistic design to represent all of the use cases (which makes the settings UI not as enticing since it promotes ease of use).
-
-## Conclusion
-
-We considered Proposal 2, however the design became cluttered very quickly and we agreed to create two pages and start off with Proposal 1.
-
-## UI/UX Design
-
-![Click edit on key binding](./edit-click.png)
-
-The Add new button is using the secondary color, to align with the button on the Color schemes page.
-
-![Edit key binding](./edit-keys.png)
-
-![Click add new](./add-click.png)
-
-![Add key binding](./add-keys.png)
-
-## Potential Issues
-
-This design is not 1:1 with the JSON file, so actions that don't have keys will not appear on this page. Additionally, you can't add a new action without keys with this current design.
-
-You also cannot specify properties on commands (like the `newTab` command) and these will have to be added through the JSON file. Considering there are only a few of these and we're planning to iterate on this and add a Command Palette page, we were okay with this decision.
-
-## Resources
-
-### Footnotes
--- a/doc/terminal-v2-roadmap.md
+++ b/doc/terminal-v2-roadmap.md
@@ -28,9 +28,9 @@ Below is the schedule for when milestones will be included in release builds of
 | 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-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | |
+| 2021-07-31 | 1.10 in Windows Terminal Preview<br>[1.9] in Windows Terminal | |
+| 2021-08-30 | 1.11 in Windows Terminal Preview<br>1.10 in Windows Terminal | |
 | 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
 | 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
@@ -89,8 +89,6 @@ Feature Notes:
 [1.7]: https://github.com/microsoft/terminal/milestone/32
 [1.8]: https://github.com/microsoft/terminal/milestone/33
 [1.9]: https://github.com/microsoft/terminal/milestone/34
-[1.10]: https://github.com/microsoft/terminal/milestone/35
-[1.11]: https://github.com/microsoft/terminal/milestone/36
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
 [#6720]: https://github.com/microsoft/terminal/pull/6720
--- a/oss/boost/MAINTAINER_README.md
+++ b/oss/boost/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @Austin-Lamb in December 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

@@ -12,4 +12,4 @@ That provenance file is automatically read and inventoried by Microsoft systems
 2. Take the parts you want, but leave most of it behind since it's HUGE and will bloat the repo to take it all.  At the time of this writing, we only use small_vector.hpp and its dependencies as a header-only library.
 3. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in a version-specific subdirectory below this readme. 
   If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-4. Submit the pull.
+4. Submit the pull.
--- a/oss/chromium/MAINTAINER_README.md
+++ b/oss/chromium/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @miniksa in January 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

--- a/oss/dynamic_bitset/MAINTAINER_README.md
+++ b/oss/dynamic_bitset/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @miniksa in March 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

--- a/oss/fmt/MAINTAINER_README.md
+++ b/oss/fmt/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @DHowett-MSFT in April 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

--- a/oss/interval_tree/MAINTAINER_README.md
+++ b/oss/interval_tree/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @PankajBhojwani in September 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

--- a/oss/libpopcnt/MAINTAINER_README.md
+++ b/oss/libpopcnt/MAINTAINER_README.md
@@ -4,7 +4,7 @@ This was originally imported by @miniksa in March 2020.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.

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

--- a/oss/xorg_apps_rgb/MAINTAINER_README.md
+++ b/oss/xorg_apps_rgb/MAINTAINER_README.md
@@ -4,4 +4,4 @@ This manifest anchors our usage of rgb.txt from the X11 distribution.

 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
--- a/res/fonts/CascadiaCode.ttf
+++ b/res/fonts/CascadiaCode.ttf
--- a/res/fonts/CascadiaCodeItalic.ttf
+++ b/res/fonts/CascadiaCodeItalic.ttf
--- a/res/fonts/CascadiaMono.ttf
+++ b/res/fonts/CascadiaMono.ttf
--- a/res/fonts/CascadiaMonoItalic.ttf
+++ b/res/fonts/CascadiaMonoItalic.ttf
--- a/res/fonts/README.md
+++ b/res/fonts/README.md
@@ -8,5 +8,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code, Cascadia Mono (2108.26)
-   * from microsoft/cascadia-code@f91d08f703ee61cf4ae936b9700ca974de2748fe
+* Cascadia Code, Cascadia Mono (2106.17)
+   * from microsoft/cascadia-code@fb0bce69c1c12f6c298b8bc1c1d181868f5daa9a
--- a/scratch/ScratchIslandApp/Package/Package.appxmanifest
+++ b/scratch/ScratchIslandApp/Package/Package.appxmanifest
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
-  xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap mp rescap uap3">
-
-  <Identity
-    Name="ScratchApplication"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="1.0.0.0" />
-
-  <Properties>
-    <DisplayName>Sample App</DisplayName>
-    <PublisherDisplayName>A Lone Developer</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="ms-resource:AppName"
-        Description="ms-resource:AppDescription"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile
-          Wide310x150Logo="Images\Wide310x150Logo.png"
-          Square71x71Logo="Images\SmallTile.png"
-          Square310x310Logo="Images\LargeTile.png"
-          ShortName="ms-resource:AppShortName">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-            <uap:ShowOn Tile="square310x310Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile>
-      </uap:VisualElements>
-
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-
-</Package>
--- a/scratch/ScratchIslandApp/Package/Package.wapproj
+++ b/scratch/ScratchIslandApp/Package/Package.wapproj
@@ -1,155 +0,0 @@
-<?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)'==''" />
-  <Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
-  <PropertyGroup Label="Configuration">
-    <!--
-    These two properties are very important!
-    Without them, msbuild will stomp MinVersion and MaxVersionTested in the
-    Package.appxmanifest and replace them with whatever our values for
-    TargetPlatformMinVersion and TargetPlatformVersion are.
-     -->
-    <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
-    <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectGuid>cf31505e-3bae-4c0a-81d7-f1eb279f40bb</ProjectGuid>
-    <EntryPointProjectUniqueName>..\WindowExe\WindowExe.vcxproj</EntryPointProjectUniqueName>
-    <DebuggerType>NativeOnly</DebuggerType>
-  </PropertyGroup>
-  <PropertyGroup Condition="!Exists('Package_TemporaryKey.pfx')">
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="Exists('Package_TemporaryKey.pfx')">
-    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <PackageCertificateKeyFile>Package_TemporaryKey.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <ItemGroup Condition="Exists('Package_TemporaryKey.pfx')">
-    <None Include="Package_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <!-- Resources -->
-    <!-- This resw only defines things that are used in this package's AppxManifest,
-         so it's not in the common resource items. -->
-    <PRIResource Include="Resources\en-US\Resources.resw" />
-    <PRIResource Include="Resources\Resources.resw" />
-    <OCResourceDirectory Include="Resources" />
-  </ItemGroup>
-
-  <Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\WindowExe\WindowExe.vcxproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.Terminal.TerminalConnection">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
-      <Implementation>$(OpenConsoleCommonOutDir)TerminalConnection\TerminalConnection.dll</Implementation>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.Control">
-      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd</HintPath>
-      <Implementation>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.dll</Implementation>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </Reference>
-  </ItemGroup>
-
-
-  <Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
-    <ItemGroup>
-      <!-- Stomp all "SourceProject" values for all incoming dependencies to flatten the package. -->
-      <_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />
-      <_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
-      <_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
-        <!-- Blank the SourceProject here to vend all files into the root of the package. -->
-        <SourceProject>
-        </SourceProject>
-      </_FilteredNonWapProjProjectOutput>
-    </ItemGroup>
-  </Target>
-  <!-- Move all the PRI files that would be packaged into the appx into _PriFile so that
-       GenerateProjectPriFile catches them. This requires us to move payload collection
-       up before GenerateProjectPriFile, when it is typically _after_ it (because the
-       DesktopBridge project type is built to only prepare the payload during appx manifest
-       generation.
-
-       Since PRI file generation is _before_ manifest generation (for possibly obvious or
-       important reasons), that doesn't work for us.
-  -->
-  <PropertyGroup>
-    <!-- Only for MSBuild versions < 16.3.0 -->
-    <_GenerateProjectPriFileDependsOn Condition="$(MSBuildVersion) &lt; '16.3.0'">OpenConsoleLiftDesktopBridgePriFiles;$(_GenerateProjectPriFileDependsOn)</_GenerateProjectPriFileDependsOn>
-  </PropertyGroup>
-  <Target Name="OpenConsoleLiftDesktopBridgePriFiles" DependsOnTargets="_ConvertItems">
-    <ItemGroup>
-      <_PriFile Include="@(_NonWapProjProjectOutput)" Condition="'%(Extension)' == '.pri'" />
-      <!-- Remove all other .pri files from the appx payload. -->
-      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(Extension)' == '.pri'" />
-    </ItemGroup>
-  </Target>
-  <!-- VS 16.3.0 added a rule to the WAP packaging project that removes all non-WAP payload, which we were relying on to
-       roll up our subproject resources. We have to suppress that rule but keep part of its logic, because that rule is
-       where the AppxPackagePayload items are created. -->
-  <PropertyGroup>
-    <WapProjBeforeGenerateAppxManifestDependsOn>
-        $([MSBuild]::Unescape('$(WapProjBeforeGenerateAppxManifestDependsOn.Replace('_RemoveAllNonWapUWPItems', '_OpenConsoleRemoveAllNonWapUWPItems'))'))
-    </WapProjBeforeGenerateAppxManifestDependsOn>
-  </PropertyGroup>
-  <Target Name="_OpenConsoleRemoveAllNonWapUWPItems">
-    <ItemGroup>
-      <AppxPackagePayload Include="@(WapProjPackageFile)" />
-      <AppxUploadPackagePayload Include="@(UploadWapProjPackageFile)" />
-      <!-- 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'" />
-    </ItemGroup>
-  </Target>
-
-  <!-- **BEGIN VC LIBS HACK** -->
-  <!--
-    For our release builds, we're just going to integrate the UWPDesktop CRT into our package and delete the package dependencies.
-    It's very difficult for users who do not have access to the store to get our dependency packages, and we want to be robust
-    and deployable everywhere. Since these libraries can be redistributed, it's easiest if we simply redistribute them.
-    See also the "VC LIBS HACK" section in WindowsTerminal.vcxproj.
-  -->
-  <!-- This target removes the FrameworkSdkReferences from before the AppX package targets manifest generation happens.
-       This is part of the generic machinery that applies to every AppX. -->
-  <Target Name="_OpenConsoleStripAllDependenciesFromPackageFirstManifest" BeforeTargets="_GenerateCurrentProjectAppxManifest">
-    <ItemGroup Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
-      <FrameworkSdkReference Remove="@(FrameworkSdkReference)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- This target removes the FrameworkSdkPackages from before the *desktop bridge* manifest generation happens. -->
-  <Target Name="_OpenConsoleStripAllDependenciesFromPackageSecondManifest" BeforeTargets="_GenerateDesktopBridgeAppxManifest" DependsOnTargets="_ResolveVCLibDependencies">
-    <ItemGroup Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
-      <FrameworkSdkPackage Remove="@(FrameworkSdkPackage)" />
-    </ItemGroup>
-  </Target>
-  <!-- **END VC LIBS HACK** -->
-
-  <!-- This is required to get the package dependency in the AppXManifest. -->
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets'))" />
-  </Target>
-
-
-
-
-  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-</Project>
--- a/scratch/ScratchIslandApp/Package/Resources/Resources.resw
+++ b/scratch/ScratchIslandApp/Package/Resources/Resources.resw
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppName" xml:space="preserve">
-    <value>Scratch XAML Island App</value>
-  </data>
-  <data name="AppShortName" xml:space="preserve">
-    <value>Scratch App</value>
-  </data>
-</root>
--- a/scratch/ScratchIslandApp/Package/Resources/en-US/Resources.resw
+++ b/scratch/ScratchIslandApp/Package/Resources/en-US/Resources.resw
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppDescription" xml:space="preserve">
-    <value>A scratch app for XAML Islands tests</value>
-  </data>
-</root>
--- a/scratch/ScratchIslandApp/SampleApp/App.base.h
+++ b/scratch/ScratchIslandApp/SampleApp/App.base.h
@@ -1,32 +0,0 @@
-#pragma once
-
-namespace winrt::SampleApp::implementation
-{
-    template<typename D, typename... I>
-    struct App_baseWithProvider : public App_base<D, ::winrt::Windows::UI::Xaml::Markup::IXamlMetadataProvider>
-    {
-        using IXamlType = ::winrt::Windows::UI::Xaml::Markup::IXamlType;
-
-        IXamlType GetXamlType(::winrt::Windows::UI::Xaml::Interop::TypeName const& type)
-        {
-            return _appProvider.GetXamlType(type);
-        }
-
-        IXamlType GetXamlType(::winrt::hstring const& fullName)
-        {
-            return _appProvider.GetXamlType(fullName);
-        }
-
-        ::winrt::com_array<::winrt::Windows::UI::Xaml::Markup::XmlnsDefinition> GetXmlnsDefinitions()
-        {
-            return _appProvider.GetXmlnsDefinitions();
-        }
-
-    private:
-        bool _contentLoaded{ false };
-        winrt::SampleApp::XamlMetaDataProvider _appProvider;
-    };
-
-    template<typename D, typename... I>
-    using AppT2 = App_baseWithProvider<D, I...>;
-}
--- a/scratch/ScratchIslandApp/SampleApp/App.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/App.cpp
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "App.h"
-#include "App.g.cpp"
-
-using namespace winrt;
-using namespace winrt::Windows::ApplicationModel::Activation;
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-
-namespace winrt::SampleApp::implementation
-{
-    App::App()
-    {
-        // This is the same trick that Initialize() is about to use to figure out whether we're coming
-        // from a UWP context or from a Win32 context
-        // See https://github.com/windows-toolkit/Microsoft.Toolkit.Win32/blob/52611c57d89554f357f281d0c79036426a7d9257/Microsoft.Toolkit.Win32.UI.XamlApplication/XamlApplication.cpp#L42
-        const auto dispatcherQueue = ::winrt::Windows::System::DispatcherQueue::GetForCurrentThread();
-        if (dispatcherQueue)
-        {
-            _isUwp = true;
-        }
-
-        Initialize();
-
-        // Disable XAML's automatic backplating of text when in High Contrast
-        // mode: we want full control of and responsibility for the foreground
-        // and background colors that we draw in XAML.
-        HighContrastAdjustment(::winrt::Windows::UI::Xaml::ApplicationHighContrastAdjustment::None);
-    }
-
-    SampleAppLogic App::Logic()
-    {
-        static SampleAppLogic logic;
-        return logic;
-    }
-
-    /// <summary>
-    /// Invoked when the application is launched normally by the end user.  Other entry points
-    /// will be used such as when the application is launched to open a specific file.
-    /// </summary>
-    /// <param name="e">Details about the launch request and process.</param>
-    void App::OnLaunched(LaunchActivatedEventArgs const& /*e*/)
-    {
-        // if this is a UWP... it means its our problem to hook up the content to the window here.
-        if (_isUwp)
-        {
-            auto content = Window::Current().Content();
-            if (content == nullptr)
-            {
-                auto logic = Logic();
-                logic.Create();
-
-                auto page = logic.GetRoot().as<MyPage>();
-
-                Window::Current().Content(page);
-                Window::Current().Activate();
-            }
-        }
-    }
-}
--- a/scratch/ScratchIslandApp/SampleApp/App.h
+++ b/scratch/ScratchIslandApp/SampleApp/App.h
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "App.g.h"
-#include "App.base.h"
-
-namespace winrt::SampleApp::implementation
-{
-    struct App : AppT2<App>
-    {
-    public:
-        App();
-        void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const&);
-
-        SampleApp::SampleAppLogic Logic();
-
-    private:
-        bool _isUwp = false;
-    };
-}
-
-namespace winrt::SampleApp::factory_implementation
-{
-    struct App : AppT<App, implementation::App>
-    {
-    };
-}
--- a/scratch/ScratchIslandApp/SampleApp/App.idl
+++ b/scratch/ScratchIslandApp/SampleApp/App.idl
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "SampleAppLogic.idl";
-
-namespace SampleApp
-{
-    // ADD ARBITRARY APP LOGIC TO SampleAppLogic.idl, NOT HERE.
-    // This is for XAML platform setup only.
-    [default_interface] runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
-    {
-        App();
-
-        SampleAppLogic Logic { get; };
-    }
-}
--- a/scratch/ScratchIslandApp/SampleApp/App.xaml
+++ b/scratch/ScratchIslandApp/SampleApp/App.xaml
@@ -1,71 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
-->
-<Toolkit:XamlApplication x:Class="SampleApp.App"
-                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:TA="using:SampleApp"
-                         xmlns:Toolkit="using:Microsoft.Toolkit.Win32.UI.XamlHost"
-                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                         xmlns:local="using:SampleApp"
-                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                         mc:Ignorable="d">
-    <!--
-        If you want to prove this works, then add `RequestedTheme="Light"` to
-        the properties on the XamlApplication
-    -->
-    <Toolkit:XamlApplication.Resources>
-
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <!--  Include the MUX Controls resources  -->
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <ResourceDictionary>
-
-                    <!--
-                        We're going to apply this style to the root Grid acting
-                        as the tab row, because we need to be able to set its
-                        `Background` property to "{ThemeResource
-                        ApplicationPageBackgroundThemeBrush}" so it will be colored
-                        appropriately for the theme, regardless of what we set the
-                        RequestedTheme to
-                    -->
-                    <Style x:Name="BackgroundGridThemeStyle"
-                           TargetType="Grid">
-                        <Setter Property="Background" Value="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
-                    </Style>
-
-                    <!--
-                        We need to manually create the error text brush as a
-                        theme-dependent brush. SystemControlErrorTextForegroundBrush
-                        is unfortunately static.
-                    -->
-                    <SolidColorBrush x:Name="ErrorTextBrush"
-                                     Color="{ThemeResource SystemErrorTextColor}" />
-
-                    <!--  Suppress top padding  -->
-                    <Thickness x:Key="TabViewHeaderPadding">8,0,8,0</Thickness>
-
-                    <ResourceDictionary.ThemeDictionaries>
-                        <ResourceDictionary x:Key="Dark">
-                            <!--  Define resources for Dark mode here  -->
-                            <SolidColorBrush x:Key="TabViewBackground"
-                                             Color="#FF333333" />
-                        </ResourceDictionary>
-
-                        <ResourceDictionary x:Key="Light">
-                            <!--  Define resources for Light mode here  -->
-                            <SolidColorBrush x:Key="TabViewBackground"
-                                             Color="#FFCCCCCC" />
-                        </ResourceDictionary>
-
-                    </ResourceDictionary.ThemeDictionaries>
-
-                </ResourceDictionary>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-
-
-    </Toolkit:XamlApplication.Resources>
-</Toolkit:XamlApplication>
--- a/scratch/ScratchIslandApp/SampleApp/MyPage.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/MyPage.cpp
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "MyPage.h"
-#include <LibraryResources.h>
-#include "MyPage.g.cpp"
-#include "MySettings.h"
-
-using namespace std::chrono_literals;
-using namespace winrt::Microsoft::Terminal;
-
-namespace winrt
-{
-    namespace MUX = Microsoft::UI::Xaml;
-    namespace WUX = Windows::UI::Xaml;
-    using IInspectable = Windows::Foundation::IInspectable;
-}
-
-namespace winrt::SampleApp::implementation
-{
-    MyPage::MyPage()
-    {
-        InitializeComponent();
-    }
-
-    void MyPage::Create()
-    {
-        auto settings = winrt::make_self<implementation::MySettings>();
-
-        auto connectionSettings{ TerminalConnection::ConptyConnection::CreateSettings(L"cmd.exe /k echo This TermControl is hosted in-proc...",
-                                                                                      winrt::hstring{},
-                                                                                      L"",
-                                                                                      nullptr,
-                                                                                      32,
-                                                                                      80,
-                                                                                      winrt::guid()) };
-
-        // "Microsoft.Terminal.TerminalConnection.ConptyConnection"
-        winrt::hstring myClass{ winrt::name_of<TerminalConnection::ConptyConnection>() };
-        TerminalConnection::ConnectionInformation connectInfo{ myClass, connectionSettings };
-
-        TerminalConnection::ITerminalConnection conn{ TerminalConnection::ConnectionInformation::CreateConnection(connectInfo) };
-        Control::TermControl control{ *settings, conn };
-
-        InProcContent().Children().Append(control);
-    }
-
-    // Method Description:
-    // - Gets the title of the currently focused terminal control. If there
-    //   isn't a control selected for any reason, returns "Windows Terminal"
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - the title of the focused control if there is one, else "Windows Terminal"
-    hstring MyPage::Title()
-    {
-        return { L"Sample Application" };
-    }
-
-}
--- a/scratch/ScratchIslandApp/SampleApp/MyPage.h
+++ b/scratch/ScratchIslandApp/SampleApp/MyPage.h
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "MyPage.g.h"
-#include "../../../src/cascadia/inc/cppwinrt_utils.h"
-
-namespace winrt::SampleApp::implementation
-{
-    struct MyPage : MyPageT<MyPage>
-    {
-    public:
-        MyPage();
-
-        void Create();
-
-        hstring Title();
-
-    private:
-        friend struct MyPageT<MyPage>; // for Xaml to bind events
-    };
-}
-
-namespace winrt::SampleApp::factory_implementation
-{
-    BASIC_FACTORY(MyPage);
-}
--- a/scratch/ScratchIslandApp/SampleApp/MyPage.idl
+++ b/scratch/ScratchIslandApp/SampleApp/MyPage.idl
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace SampleApp
-{
-    [default_interface] runtimeclass MyPage : Windows.UI.Xaml.Controls.Page
-    {
-        MyPage();
-    }
-}
--- a/scratch/ScratchIslandApp/SampleApp/MyPage.xaml
+++ b/scratch/ScratchIslandApp/SampleApp/MyPage.xaml
@@ -1,61 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
-->
-<Page x:Class="SampleApp.MyPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:SampleApp"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:mux="using:Microsoft.UI.Xaml.Controls"
-      xmlns:terminal="using:Microsoft.Terminal.Control"
-      mc:Ignorable="d">
-
-    <Grid x:Name="Root"
-          Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <StackPanel Orientation="Horizontal">
-            <TextBox x:Name="GuidInput"
-                     Width="400"
-                     PlaceholderText="{}{guid here}" />
-            <Button Grid.Row="0">
-                Create
-            </Button>
-
-        </StackPanel>
-
-        <Grid x:Name="TabContent"
-              Grid.Row="1"
-              HorizontalAlignment="Stretch"
-              VerticalAlignment="Stretch">
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Grid x:Name="InProcContent"
-                  Grid.Column="0"
-                  Padding="16"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  Background="#ff0000" />
-
-            <Grid x:Name="OutOfProcContent"
-                  Grid.Column="1"
-                  Padding="16"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  Background="#0000ff" />
-
-
-
-        </Grid>
-
-    </Grid>
-</Page>
--- a/scratch/ScratchIslandApp/SampleApp/MySettings.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/MySettings.cpp
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-
-#include "MySettings.h"
-#include "MySettings.g.cpp"
-
-namespace winrt::SampleApp::implementation
-{
-}
--- a/scratch/ScratchIslandApp/SampleApp/MySettings.h
+++ b/scratch/ScratchIslandApp/SampleApp/MySettings.h
@@ -1,104 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
--*/
-#pragma once
-#include "../../inc/cppwinrt_utils.h"
-#include "../types/inc/colorTable.hpp"
-
-#include <DefaultSettings.h>
-#include <conattrs.hpp>
-#include "MySettings.g.h"
-
-namespace winrt::SampleApp::implementation
-{
-    struct MySettings : MySettingsT<MySettings>
-    {
-        // --------------------------- Core Settings ---------------------------
-        //  All of these settings are defined in ICoreSettings.
-
-        WINRT_PROPERTY(til::color, DefaultForeground, DEFAULT_FOREGROUND);
-        WINRT_PROPERTY(til::color, DefaultBackground, DEFAULT_BACKGROUND);
-        WINRT_PROPERTY(til::color, SelectionBackground, DEFAULT_FOREGROUND);
-        WINRT_PROPERTY(int32_t, HistorySize, DEFAULT_HISTORY_SIZE);
-        WINRT_PROPERTY(int32_t, InitialRows, 30);
-        WINRT_PROPERTY(int32_t, InitialCols, 80);
-
-        WINRT_PROPERTY(bool, SnapOnInput, true);
-        WINRT_PROPERTY(bool, AltGrAliasing, true);
-        WINRT_PROPERTY(til::color, CursorColor, DEFAULT_CURSOR_COLOR);
-        WINRT_PROPERTY(winrt::Microsoft::Terminal::Core::CursorStyle, CursorShape, winrt::Microsoft::Terminal::Core::CursorStyle::Vintage);
-        WINRT_PROPERTY(uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);
-        WINRT_PROPERTY(winrt::hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS);
-        WINRT_PROPERTY(bool, CopyOnSelect, false);
-        WINRT_PROPERTY(bool, InputServiceWarning, true);
-        WINRT_PROPERTY(bool, FocusFollowMouse, false);
-
-        WINRT_PROPERTY(winrt::Windows::Foundation::IReference<winrt::Microsoft::Terminal::Core::Color>, TabColor, nullptr);
-
-        WINRT_PROPERTY(winrt::Windows::Foundation::IReference<winrt::Microsoft::Terminal::Core::Color>, StartingTabColor, nullptr);
-
-        winrt::Microsoft::Terminal::Core::ICoreAppearance UnfocusedAppearance() { return {}; };
-
-        WINRT_PROPERTY(bool, TrimBlockSelection, false);
-        // ------------------------ End of Core Settings -----------------------
-
-        WINRT_PROPERTY(winrt::hstring, ProfileName);
-        WINRT_PROPERTY(bool, UseAcrylic, false);
-        WINRT_PROPERTY(double, TintOpacity, 0.5);
-        WINRT_PROPERTY(winrt::hstring, Padding, DEFAULT_PADDING);
-        WINRT_PROPERTY(winrt::hstring, FontFace, L"Consolas");
-        WINRT_PROPERTY(int32_t, FontSize, DEFAULT_FONT_SIZE);
-
-        WINRT_PROPERTY(winrt::Windows::UI::Text::FontWeight, FontWeight);
-
-        WINRT_PROPERTY(winrt::hstring, BackgroundImage);
-        WINRT_PROPERTY(double, BackgroundImageOpacity, 1.0);
-
-        WINRT_PROPERTY(winrt::Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, winrt::Windows::UI::Xaml::Media::Stretch::UniformToFill);
-        WINRT_PROPERTY(winrt::Windows::UI::Xaml::HorizontalAlignment, BackgroundImageHorizontalAlignment, winrt::Windows::UI::Xaml::HorizontalAlignment::Center);
-        WINRT_PROPERTY(winrt::Windows::UI::Xaml::VerticalAlignment, BackgroundImageVerticalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment::Center);
-
-        WINRT_PROPERTY(winrt::Microsoft::Terminal::Control::IKeyBindings, KeyBindings, nullptr);
-
-        WINRT_PROPERTY(winrt::hstring, Commandline);
-        WINRT_PROPERTY(winrt::hstring, StartingDirectory);
-        WINRT_PROPERTY(winrt::hstring, StartingTitle);
-        WINRT_PROPERTY(bool, SuppressApplicationTitle);
-        WINRT_PROPERTY(winrt::hstring, EnvironmentVariables);
-
-        WINRT_PROPERTY(winrt::Microsoft::Terminal::Control::ScrollbarState, ScrollState, winrt::Microsoft::Terminal::Control::ScrollbarState::Visible);
-
-        WINRT_PROPERTY(winrt::Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, winrt::Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale);
-
-        WINRT_PROPERTY(bool, RetroTerminalEffect, false);
-        WINRT_PROPERTY(bool, ForceFullRepaintRendering, false);
-        WINRT_PROPERTY(bool, SoftwareRendering, false);
-        WINRT_PROPERTY(bool, ForceVTInput, false);
-
-        WINRT_PROPERTY(winrt::hstring, PixelShaderPath);
-
-        WINRT_PROPERTY(bool, DetectURLs, true);
-
-    private:
-        std::array<winrt::Microsoft::Terminal::Core::Color, COLOR_TABLE_SIZE> _ColorTable;
-
-    public:
-        winrt::Microsoft::Terminal::Core::Color GetColorTableEntry(int32_t index) noexcept { return _ColorTable.at(index); }
-        std::array<winrt::Microsoft::Terminal::Core::Color, 16> ColorTable() { return _ColorTable; }
-        void ColorTable(std::array<winrt::Microsoft::Terminal::Core::Color, 16> /*colors*/) {}
-
-        MySettings()
-        {
-            const auto campbellSpan = ::Microsoft::Console::Utils::CampbellColorTable();
-            std::transform(campbellSpan.begin(), campbellSpan.end(), _ColorTable.begin(), [](auto&& color) {
-                return static_cast<winrt::Microsoft::Terminal::Core::Color>(til::color{ color });
-            });
-        }
-    };
-}
-
-namespace winrt::SampleApp::factory_implementation
-{
-    BASIC_FACTORY(MySettings);
-}
--- a/scratch/ScratchIslandApp/SampleApp/MySettings.idl
+++ b/scratch/ScratchIslandApp/SampleApp/MySettings.idl
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace SampleApp
-{
-    [default_interface] runtimeclass MySettings : Microsoft.Terminal.Core.ICoreSettings,
-                                                  Microsoft.Terminal.Control.IControlSettings,
-                                                  Microsoft.Terminal.Core.ICoreAppearance,
-                                                  Microsoft.Terminal.Control.IControlAppearance
-
-    {
-        MySettings();
-    }
-}
--- a/scratch/ScratchIslandApp/SampleApp/Resources/en-US/Resources.resw
+++ b/scratch/ScratchIslandApp/SampleApp/Resources/en-US/Resources.resw
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj
+++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{a4394404-37f7-41c1-802b-49788d3720e3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SampleApp</RootNamespace>
-    <ProjectName>SampleAppLib</ProjectName>
-    <TargetName>SampleAppLib</TargetName>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <SubSystem>Console</SubSystem>
-    <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
-    <!--
-      This is an override that, puzzlingly, _forces XBF (XAML binary) embedding_.
-      We have to do this to overcome a layout issue in the WAP packaging project.
-      When we do this, the XBF ends up in resources.pri.
-    -->
-    <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
-    <XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
-  </PropertyGroup>
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
-  <ItemDefinitionGroup>
-
-    <ClCompile>
-      <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
-      on being compiled with RTTI (/GR). -->
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- ========================= XAML files ======================== -->
-  <ItemGroup>
-    <!-- HERE BE DRAGONS:
-      For any types that use XAML information, if their .idl and .h aren't
-      marked DependentUpon the corresponding .xaml file, XamlTypeInfo.g.h won't
-      pick it up correctly. -->
-    <ApplicationDefinition Include="App.xaml">
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-  </ItemGroup>
-  <!-- When we add other user controls, they should go in here as so: -->
-  <ItemGroup>
-    <Page Include="MyPage.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <!-- ========================= Headers ======================== -->
-  <ItemGroup>
-    <ClInclude Include="App.base.h" />
-    <ClInclude Include="MySettings.h" />
-    <ClInclude Include="MyPage.h">
-      <DependentUpon>MyPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="App.h">
-      <DependentUpon>App.xaml</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="SampleAppLogic.h">
-      <DependentUpon>SampleAppLogic.idl</DependentUpon>
-    </ClInclude>
-  </ItemGroup>
-  <!-- ========================= Cpp Files ======================== -->
-  <ItemGroup>
-    <ClCompile Include="init.cpp" />
-    <ClCompile Include="MySettings.cpp" />
-    <ClCompile Include="MyPage.cpp">
-      <DependentUpon>MyPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="App.cpp">
-      <DependentUpon>App.xaml</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="SampleAppLogic.cpp">
-      <DependentUpon>SampleAppLogic.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-
-  </ItemGroup>
-  <!-- ========================= idl Files ======================== -->
-  <ItemGroup>
-    <!-- If you add idl files here, make sure to include their implementation's
-    header in SampleApp.vcxproj (as well as in this file) -->
-    <Midl Include="App.idl">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Midl>
-    <Midl Include="SampleAppLogic.idl" />
-    <Midl Include="MySettings.idl" />
-    <Midl Include="MyPage.idl">
-      <DependentUpon>MyPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
-  </ItemGroup>
-  <!-- ========================= Misc Files ======================== -->
-  <ItemGroup>
-    <PRIResource Include="Resources\en-US\Resources.resw" />
-    <OCResourceDirectory Include="Resources" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <!-- ========================= Project References ======================== -->
-  <PropertyGroup>
-    <!-- This is a hack to get the ARM64 CI build working. See
-    https://github.com/Microsoft/msbuild/issues/3746 - it looks like MsBuild
-    just has a bug in it.-->
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>Warning</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-  </PropertyGroup>
-  <!-- ========================== Other References ========================= -->
-  <ItemGroup>
-    <!-- Manually add references to each of our dependent winmds. Mark them as
-    private=false and CopyLocalSatelliteAssemblies=false, so that we don't
-    propagate them upwards (which can make referencing this project result in
-    duplicate type definitions)-->
-    <Reference Include="Microsoft.Terminal.Core">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.TerminalConnection">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.Control">
-      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-  </ItemGroup>
-  <!-- ====================== Compiler & Linker Flags ===================== -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
-      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(OpenConsoleCommonOutDir)\ConTypes.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- ========================= Globals ======================== -->
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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>
-
-  <!--
-    By default, the PRI file will contain resource paths beginning with the
-    project name. Since we enabled XBF embedding, this *also* includes App.xbf.
-    Well, App.xbf is hardcoded by the framework to be found at the resource ROOT.
-    To make that happen, we have to disable the prepending of the project name
-    to the App xaml files.
-  -->
-  <PropertyGroup>
-    <_GenerateProjectPriFileDependsOn>OpenConsolePlaceAppXbfAtRootOfResourceTree;$(_GenerateProjectPriFileDependsOn)</_GenerateProjectPriFileDependsOn>
-  </PropertyGroup>
-  <Target Name="OpenConsolePlaceAppXbfAtRootOfResourceTree" DependsOnTargets="GetPackagingOutputs">
-    <ItemGroup>
-      <_RelocatedAppXamlData Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'App' and ('%(Extension)' == '.xaml' or '%(Extension)' == '.xbf')" />
-      <PackagingOutputs Remove="@(_RelocatedAppXamlData)" />
-      <PackagingOutputs Include="@(_RelocatedAppXamlData)">
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
-  </Target>
-
-  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-</Project>
--- a/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.cpp
@@ -1,84 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SampleAppLogic.h"
-#include "SampleAppLogic.g.cpp"
-
-#include <LibraryResources.h>
-
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::System;
-
-namespace winrt
-{
-    namespace MUX = Microsoft::UI::Xaml;
-    using IInspectable = Windows::Foundation::IInspectable;
-}
-
-namespace winrt::SampleApp::implementation
-{
-    // Function Description:
-    // - Get the SampleAppLogic for the current active Xaml application, or null if there isn't one.
-    // Return value:
-    // - A pointer (bare) to the SampleAppLogic, or nullptr. The app logic outlives all other objects,
-    //   unless the application is in a terrible way, so this is "safe."
-    SampleAppLogic* SampleAppLogic::Current() noexcept
-    try
-    {
-        if (auto currentXamlApp{ winrt::Windows::UI::Xaml::Application::Current().try_as<winrt::SampleApp::App>() })
-        {
-            if (auto SampleAppLogicPointer{ winrt::get_self<SampleAppLogic>(currentXamlApp.Logic()) })
-            {
-                return SampleAppLogicPointer;
-            }
-        }
-        return nullptr;
-    }
-    catch (...)
-    {
-        LOG_CAUGHT_EXCEPTION();
-        return nullptr;
-    }
-
-    SampleAppLogic::SampleAppLogic()
-    {
-        // For your own sanity, it's better to do setup outside the ctor.
-        // If you do any setup in the ctor that ends up throwing an exception,
-        // then it might look like App just failed to activate, which will
-        // cause you to chase down the rabbit hole of "why is App not
-        // registered?" when it definitely is.
-
-        // The MyPage has to be constructed during our construction, to
-        // make sure that there's a terminal page for callers of
-        // SetTitleBarContent
-        _root = winrt::make_self<MyPage>();
-    }
-
-    // Method Description:
-    // - Build the UI for the terminal app. Before this method is called, it
-    //   should not be assumed that the SampleApp is usable. The Settings
-    //   should be loaded before this is called, either with LoadSettings or
-    //   GetLaunchDimensions (which will call LoadSettings)
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void SampleAppLogic::Create()
-    {
-        _root->Create();
-    }
-
-    UIElement SampleAppLogic::GetRoot() noexcept
-    {
-        return _root.as<winrt::Windows::UI::Xaml::Controls::Control>();
-    }
-
-    hstring SampleAppLogic::Title()
-    {
-        return _root->Title();
-    }
-
-}
--- a/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.h
+++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.h
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "SampleAppLogic.g.h"
-#include "MyPage.h"
-#include "../../../src/cascadia/inc/cppwinrt_utils.h"
-
-namespace winrt::SampleApp::implementation
-{
-    struct SampleAppLogic : SampleAppLogicT<SampleAppLogic>
-    {
-    public:
-        static SampleAppLogic* Current() noexcept;
-
-        SampleAppLogic();
-        ~SampleAppLogic() = default;
-
-        void Create();
-
-        Windows::UI::Xaml::UIElement GetRoot() noexcept;
-
-        winrt::hstring Title();
-
-    private:
-        // If you add controls here, but forget to null them either here or in
-        // the ctor, you're going to have a bad time. It'll mysteriously fail to
-        // activate the SampleAppLogic.
-        // ALSO: If you add any UIElements as roots here, make sure they're
-        // updated in _ApplyTheme. The root currently is _root.
-        winrt::com_ptr<MyPage> _root{ nullptr };
-    };
-}
-
-namespace winrt::SampleApp::factory_implementation
-{
-    struct SampleAppLogic : SampleAppLogicT<SampleAppLogic, implementation::SampleAppLogic>
-    {
-    };
-}
--- a/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.idl
+++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLogic.idl
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-
-namespace SampleApp
-{
-
-    [default_interface] runtimeclass SampleAppLogic
-    {
-        SampleAppLogic();
-
-        void Create();
-
-        Windows.UI.Xaml.UIElement GetRoot();
-
-        String Title { get; };
-
-    }
-}
--- a/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.def
+++ b/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.def
@@ -1,3 +0,0 @@
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
--- a/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj
+++ b/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{26c51792-41a3-4fe0-ab5e-8b69d557bf91}</ProjectGuid>
-    <ProjectName>SampleApp</ProjectName>
-    <RootNamespace>SampleApp</RootNamespace>
-    <!-- cppwinrt.build.pre.props depends on these settings: -->
-    <!-- build a dll, not exe (Application) -->
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <SubSystem>Console</SubSystem>
-    <!-- sets a bunch of Windows Universal properties -->
-    <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
-  </PropertyGroup>
-  <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
-  <!-- ========================= XAML files ======================== -->
-  <ItemGroup>
-    <!-- DON'T PUT XAML FILES HERE! Put them in SampleAppLib.vcxproj -->
-  </ItemGroup>
-  <!-- ========================= Headers ======================== -->
-  <ItemGroup>
-    <!-- Only put headers for winrt types in here. Don't put other header files
-    in here - put them in SampleAppLib.vcxproj instead! -->
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <!-- ========================= Cpp Files ======================== -->
-  <ItemGroup>
-    <!-- Don't put source files in here - put them in SampleAppLib.vcxproj instead! -->
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <!-- ========================= idl Files ======================== -->
-  <ItemGroup>
-    <!-- DON'T PUT IDL FILES HERE! Put them in App.vcxproj -->
-  </ItemGroup>
-  <!-- ========================= Misc Files ======================== -->
-  <ItemGroup>
-    <None Include="$(ProjectName).def" />
-  </ItemGroup>
-  <!-- ========================= Project References ======================== -->
-  <ItemGroup>
-    <!-- Reference SampleAppLib here, so we can use it's App.winmd as
-    our App.winmd. This didn't work correctly in VS2017, you'd need to
-    manually reference the lib -->
-    <ProjectReference Include="$(OpenConsoleDir)scratch\ScratchIslandApp\SampleApp\SampleAppLib.vcxproj">
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </ProjectReference>
-
-    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj">
-      <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
-    </ProjectReference>
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <!-- Manually include the Terminal.Core winmd, so we know where those types
-    are defined. We don't want to include it as a project reference, because
-    that would make us link that lib into our own binary. -->
-    <Reference Include="Microsoft.Terminal.Core">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.TerminalConnection">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.Control">
-      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-  </ItemGroup>
-
-
-  <Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <!-- SampleAppLib contains a DllMain that we need to force the use of. -->
-      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-</Project>
--- a/scratch/ScratchIslandApp/SampleApp/dll/pch.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/dll/pch.cpp
@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
--- a/scratch/ScratchIslandApp/SampleApp/dll/pch.h
+++ b/scratch/ScratchIslandApp/SampleApp/dll/pch.h
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-//
-// pch.h
-// Header for platform projection include files
-//
-
-#pragma once
-
-// This file can be empty - the pch.h in SampleApp/lib does the heavy lifting
-// of including all the headers we need. As this project is just a dll wrapper,
-// we don't actually need anything in here.
--- a/scratch/ScratchIslandApp/SampleApp/init.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/init.cpp
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include <LibraryResources.h>
-#include <WilErrorReporting.h>
-
-BOOL WINAPI DllMain(HINSTANCE /*hInstDll*/, DWORD /*reason*/, LPVOID /*reserved*/)
-{
-    return TRUE;
-}
-
-UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"SampleApp/Resources")
--- a/scratch/ScratchIslandApp/SampleApp/packages.config
+++ b/scratch/ScratchIslandApp/SampleApp/packages.config
@@ -1,6 +0,0 @@
-<?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.5.0-prerelease.201202003" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210309.3" targetFramework="native" />
-</packages>
--- a/scratch/ScratchIslandApp/SampleApp/pch.cpp
+++ b/scratch/ScratchIslandApp/SampleApp/pch.cpp
@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
--- a/scratch/ScratchIslandApp/SampleApp/pch.h
+++ b/scratch/ScratchIslandApp/SampleApp/pch.h
@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-//
-// pch.h
-// Header for platform projection include files
-//
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMCX
-#define NOHELP
-#define NOCOMM
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
-#include <LibraryIncludes.h>
-// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
-//      SDK definition of this function, so the only fix is to undef it.
-// from WinBase.h
-// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
-#include <wil/cppwinrt.h>
-
-#include <unknwn.h>
-
-#include <hstring.h>
-
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.Foundation.Metadata.h>
-#include <winrt/Windows.Graphics.Display.h>
-#include <winrt/windows.ui.core.h>
-#include <winrt/Windows.ui.input.h>
-#include <winrt/Windows.UI.Text.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Windows.UI.Xaml.Data.h>
-#include <winrt/Windows.ui.xaml.media.h>
-#include <winrt/Windows.UI.Xaml.Media.Animation.h>
-#include <winrt/Windows.ui.xaml.input.h>
-#include <winrt/Windows.UI.Xaml.Hosting.h>
-#include "winrt/Windows.UI.Xaml.Markup.h"
-#include "winrt/Windows.UI.ViewManagement.h"
-
-#include <winrt/Microsoft.Toolkit.Win32.UI.XamlHost.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
-
-#include <winrt/Windows.System.h>
-
-// Including TraceLogging essentials for the binary
-#include <TraceLoggingProvider.h>
-#include <winmeta.h>
-TRACELOGGING_DECLARE_PROVIDER(g_hSampleAppProvider);
-#include <telemetry/ProjectTelemetry.h>
-#include <TraceLoggingActivity.h>
-
-#include <shellapi.h>
-#include <shobjidl_core.h>
-
-#include <winrt/Microsoft.Terminal.Core.h>
-#include <winrt/Microsoft.Terminal.Control.h>
-#include <winrt/Microsoft.Terminal.TerminalConnection.h>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#include "til.h"
--- a/scratch/ScratchIslandApp/WindowExe/SampleAppHost.cpp
+++ b/scratch/ScratchIslandApp/WindowExe/SampleAppHost.cpp
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SampleAppHost.h"
-#include "../types/inc/Viewport.hpp"
-#include "../types/inc/utils.hpp"
-#include "../types/inc/User32Utils.hpp"
-#include "resource.h"
-
-using namespace winrt::Windows::UI;
-using namespace winrt::Windows::UI::Composition;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Hosting;
-using namespace winrt::Windows::Foundation::Numerics;
-using namespace ::Microsoft::Console;
-using namespace ::Microsoft::Console::Types;
-
-SampleAppHost::SampleAppHost() noexcept :
-    _app{},
-    _logic{ nullptr }, // don't make one, we're going to take a ref on app's
-    _window{ nullptr }
-{
-    _logic = _app.Logic(); // get a ref to app's logic
-
-    _window = std::make_unique<SampleIslandWindow>();
-    _window->MakeWindow();
-}
-
-SampleAppHost::~SampleAppHost()
-{
-    // destruction order is important for proper teardown here
-    _window = nullptr;
-    _app.Close();
-    _app = nullptr;
-}
-// Method Description:
-// - Initializes the XAML island, creates the terminal app, and sets the
-//   island's content to that of the terminal app's content. Also registers some
-//   callbacks with TermApp.
-// !!! IMPORTANT!!!
-// This must be called *AFTER* WindowsXamlManager::InitializeForCurrentThread.
-// If it isn't, then we won't be able to create the XAML island.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void SampleAppHost::Initialize()
-{
-    _window->Initialize();
-
-    _logic.Create();
-
-    _window->UpdateTitle(_logic.Title());
-
-    // Set up the content of the application. If the app has a custom titlebar,
-    // set that content as well.
-    _window->SetContent(_logic.GetRoot());
-
-    _window->OnAppInitialized();
-
-    // THIS IS A HACK
-    //
-    // We've got a weird crash that happens terribly inconsistently, only in
-    // Debug mode. Apparently, there's some weird ref-counting magic that goes
-    // on during teardown, and our Application doesn't get closed quite right,
-    // which can cause us to crash into the debugger. This of course, only
-    // happens on exit, and happens somewhere in the XamlHost.dll code.
-    //
-    // Crazily, if we _manually leak the Application_ here, then the crash
-    // doesn't happen. This doesn't matter, because we really want the
-    // Application to live for _the entire lifetime of the process_, so the only
-    // time when this object would actually need to get cleaned up is _during
-    // exit_. So we can safely leak this Application object, and have it just
-    // get cleaned up normally when our process exits.
-    ::winrt::SampleApp::App a{ _app };
-    ::winrt::detach_abi(a);
-}
--- a/scratch/ScratchIslandApp/WindowExe/SampleAppHost.h
+++ b/scratch/ScratchIslandApp/WindowExe/SampleAppHost.h
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-
-#include "SampleIslandWindow.h"
-
-class SampleAppHost
-{
-public:
-    SampleAppHost() noexcept;
-    virtual ~SampleAppHost();
-
-    void Initialize();
-
-private:
-    std::unique_ptr<SampleIslandWindow> _window;
-    winrt::SampleApp::App _app;
-    winrt::SampleApp::SampleAppLogic _logic;
-};
--- a/scratch/ScratchIslandApp/WindowExe/SampleBaseWindow.h
+++ b/scratch/ScratchIslandApp/WindowExe/SampleBaseWindow.h
@@ -1,228 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-// Custom window messages
-#define CM_UPDATE_TITLE (WM_USER)
-
-#include <wil/resource.h>
-
-template<typename T>
-class BaseWindow
-{
-public:
-    virtual ~BaseWindow() = 0;
-    static T* GetThisFromHandle(HWND const window) noexcept
-    {
-        return reinterpret_cast<T*>(GetWindowLongPtr(window, GWLP_USERDATA));
-    }
-
-    [[nodiscard]] static LRESULT __stdcall WndProc(HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
-    {
-        WINRT_ASSERT(window);
-
-        if (WM_NCCREATE == message)
-        {
-            auto cs = reinterpret_cast<CREATESTRUCT*>(lparam);
-            T* that = static_cast<T*>(cs->lpCreateParams);
-            WINRT_ASSERT(that);
-            WINRT_ASSERT(!that->_window);
-            that->_window = wil::unique_hwnd(window);
-
-            return that->_OnNcCreate(wparam, lparam);
-        }
-        else if (T* that = GetThisFromHandle(window))
-        {
-            return that->MessageHandler(message, wparam, lparam);
-        }
-
-        return DefWindowProc(window, message, wparam, lparam);
-    }
-
-    [[nodiscard]] virtual LRESULT MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
-    {
-        switch (message)
-        {
-        case WM_DPICHANGED:
-        {
-            return HandleDpiChange(_window.get(), wparam, lparam);
-        }
-
-        case WM_DESTROY:
-        {
-            PostQuitMessage(0);
-            return 0;
-        }
-
-        case WM_SIZE:
-        {
-            UINT width = LOWORD(lparam);
-            UINT height = HIWORD(lparam);
-
-            switch (wparam)
-            {
-            case SIZE_MAXIMIZED:
-                [[fallthrough]];
-            case SIZE_RESTORED:
-                if (_minimized)
-                {
-                    _minimized = false;
-                    OnRestore();
-                }
-
-                // We always need to fire the resize event, even when we're transitioning from minimized.
-                // We might be transitioning directly from minimized to maximized, and we'll need
-                // to trigger any size-related content changes.
-                OnResize(width, height);
-                break;
-            case SIZE_MINIMIZED:
-                if (!_minimized)
-                {
-                    _minimized = true;
-                    OnMinimize();
-                }
-                break;
-            default:
-                // do nothing.
-                break;
-            }
-            break;
-        }
-        case CM_UPDATE_TITLE:
-        {
-            SetWindowTextW(_window.get(), _title.c_str());
-            break;
-        }
-        }
-
-        return DefWindowProc(_window.get(), message, wparam, lparam);
-    }
-
-    // DPI Change handler. on WM_DPICHANGE resize the window
-    [[nodiscard]] LRESULT HandleDpiChange(const HWND hWnd, const WPARAM wParam, const LPARAM lParam)
-    {
-        _inDpiChange = true;
-        const HWND hWndStatic = GetWindow(hWnd, GW_CHILD);
-        if (hWndStatic != nullptr)
-        {
-            const UINT uDpi = HIWORD(wParam);
-
-            // Resize the window
-            auto lprcNewScale = reinterpret_cast<RECT*>(lParam);
-
-            SetWindowPos(hWnd, nullptr, lprcNewScale->left, lprcNewScale->top, lprcNewScale->right - lprcNewScale->left, lprcNewScale->bottom - lprcNewScale->top, SWP_NOZORDER | SWP_NOACTIVATE);
-
-            _currentDpi = uDpi;
-        }
-        _inDpiChange = false;
-        return 0;
-    }
-
-    virtual void OnResize(const UINT width, const UINT height) = 0;
-    virtual void OnMinimize() = 0;
-    virtual void OnRestore() = 0;
-
-    RECT GetWindowRect() const noexcept
-    {
-        RECT rc = { 0 };
-        ::GetWindowRect(_window.get(), &rc);
-        return rc;
-    }
-
-    HWND GetHandle() const noexcept
-    {
-        return _window.get();
-    }
-
-    float GetCurrentDpiScale() const noexcept
-    {
-        const auto dpi = ::GetDpiForWindow(_window.get());
-        const auto scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
-        return scale;
-    }
-
-    // Gets the physical size of the client area of the HWND in _window
-    SIZE GetPhysicalSize() const noexcept
-    {
-        RECT rect = {};
-        GetClientRect(_window.get(), &rect);
-        const auto windowsWidth = rect.right - rect.left;
-        const auto windowsHeight = rect.bottom - rect.top;
-        return SIZE{ windowsWidth, windowsHeight };
-    }
-
-    // Gets the logical (in DIPs) size of a physical size specified by the parameter physicalSize
-    // Remarks:
-    // XAML coordinate system is always in Display Independent Pixels (a.k.a DIPs or Logical). However Win32 GDI (because of legacy reasons)
-    // in DPI mode "Per-Monitor and Per-Monitor (V2) DPI Awareness" is always in physical pixels.
-    // The formula to transform is:
-    //     logical = (physical / dpi) + 0.5 // 0.5 is to ensure that we pixel snap correctly at the edges, this is necessary with odd DPIs like 1.25, 1.5, 1, .75
-    // See also:
-    //   https://docs.microsoft.com/en-us/windows/desktop/LearnWin32/dpi-and-device-independent-pixels
-    //   https://docs.microsoft.com/en-us/windows/desktop/hidpi/high-dpi-desktop-application-development-on-windows#per-monitor-and-per-monitor-v2-dpi-awareness
-    winrt::Windows::Foundation::Size GetLogicalSize(const SIZE physicalSize) const noexcept
-    {
-        const auto scale = GetCurrentDpiScale();
-        // 0.5 is to ensure that we pixel snap correctly at the edges, this is necessary with odd DPIs like 1.25, 1.5, 1, .75
-        const auto logicalWidth = (physicalSize.cx / scale) + 0.5f;
-        const auto logicalHeight = (physicalSize.cy / scale) + 0.5f;
-        return winrt::Windows::Foundation::Size(logicalWidth, logicalHeight);
-    }
-
-    winrt::Windows::Foundation::Size GetLogicalSize() const noexcept
-    {
-        return GetLogicalSize(GetPhysicalSize());
-    }
-
-    // Method Description:
-    // - Sends a message to our message loop to update the title of the window.
-    // Arguments:
-    // - newTitle: a string to use as the new title of the window.
-    // Return Value:
-    // - <none>
-    void UpdateTitle(std::wstring_view newTitle)
-    {
-        _title = newTitle;
-        PostMessageW(_window.get(), CM_UPDATE_TITLE, 0, reinterpret_cast<LPARAM>(nullptr));
-    }
-
-    // Method Description:
-    // Reset the current dpi of the window. This method is only called after we change the
-    // initial launch position. This makes sure the dpi is consistent with the monitor on which
-    // the window will launch
-    void RefreshCurrentDPI()
-    {
-        _currentDpi = GetDpiForWindow(_window.get());
-    }
-
-protected:
-    using base_type = BaseWindow<T>;
-    wil::unique_hwnd _window;
-
-    unsigned int _currentDpi = 0;
-    bool _inDpiChange = false;
-
-    std::wstring _title = L"";
-
-    bool _minimized = false;
-
-    // Method Description:
-    // - This method is called when the window receives the WM_NCCREATE message.
-    // Return Value:
-    // - The value returned from the window proc.
-    virtual [[nodiscard]] LRESULT _OnNcCreate(WPARAM wParam, LPARAM lParam) noexcept
-    {
-        SetWindowLongPtr(_window.get(), GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
-
-        EnableNonClientDpiScaling(_window.get());
-        _currentDpi = GetDpiForWindow(_window.get());
-
-        return DefWindowProc(_window.get(), WM_NCCREATE, wParam, lParam);
-    };
-};
-
-template<typename T>
-inline BaseWindow<T>::~BaseWindow()
-{
-}
--- a/scratch/ScratchIslandApp/WindowExe/SampleIslandWindow.cpp
+++ b/scratch/ScratchIslandApp/WindowExe/SampleIslandWindow.cpp
@@ -1,220 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SampleIslandWindow.h"
-#include "../types/inc/Viewport.hpp"
-#include "resource.h"
-#include "icon.h"
-
-extern "C" IMAGE_DOS_HEADER __ImageBase;
-
-using namespace winrt::Windows::UI;
-using namespace winrt::Windows::UI::Composition;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Hosting;
-using namespace winrt::Windows::Foundation::Numerics;
-using namespace ::Microsoft::Console::Types;
-
-#define XAML_HOSTING_WINDOW_CLASS_NAME L"SCRATCH_HOSTING_WINDOW_CLASS"
-
-SampleIslandWindow::SampleIslandWindow() noexcept :
-    _interopWindowHandle{ nullptr },
-    _rootGrid{ nullptr },
-    _source{ nullptr }
-{
-}
-
-SampleIslandWindow::~SampleIslandWindow()
-{
-    _source.Close();
-}
-
-// Method Description:
-// - Create the actual window that we'll use for the application.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void SampleIslandWindow::MakeWindow() noexcept
-{
-    WNDCLASS wc{};
-    wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
-    wc.hInstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-    wc.lpszClassName = XAML_HOSTING_WINDOW_CLASS_NAME;
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc = WndProc;
-    wc.hIcon = LoadIconW(wc.hInstance, MAKEINTRESOURCEW(IDI_APPICON));
-    RegisterClass(&wc);
-    WINRT_ASSERT(!_window);
-
-    // Create the window with the default size here - During the creation of the
-    // window, the system will give us a chance to set its size in WM_CREATE.
-    // WM_CREATE will be handled synchronously, before CreateWindow returns.
-    WINRT_VERIFY(CreateWindowEx(0,
-                                wc.lpszClassName,
-                                L"ScratchApp",
-                                WS_OVERLAPPEDWINDOW,
-                                CW_USEDEFAULT,
-                                CW_USEDEFAULT,
-                                CW_USEDEFAULT,
-                                CW_USEDEFAULT,
-                                nullptr,
-                                nullptr,
-                                wc.hInstance,
-                                this));
-
-    WINRT_ASSERT(_window);
-}
-
-// Method Description:
-// - Called when no tab is remaining to close the window.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void SampleIslandWindow::Close()
-{
-    PostQuitMessage(0);
-}
-
-// Method Description:
-// - Handles a WM_CREATE message. Calls our create callback, if one's been set.
-// Arguments:
-// - wParam: unused
-// - lParam: the lParam of a WM_CREATE, which is a pointer to a CREATESTRUCTW
-// Return Value:
-// - <none>
-void SampleIslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam) noexcept
-{
-    // Get proposed window rect from create structure
-    CREATESTRUCTW* pcs = reinterpret_cast<CREATESTRUCTW*>(lParam);
-    RECT rc;
-    rc.left = pcs->x;
-    rc.top = pcs->y;
-    rc.right = rc.left + pcs->cx;
-    rc.bottom = rc.top + pcs->cy;
-
-    ShowWindow(_window.get(), SW_SHOW);
-
-    UpdateWindow(_window.get());
-
-    UpdateWindowIconForActiveMetrics(_window.get());
-}
-
-void SampleIslandWindow::Initialize()
-{
-    const bool initialized = (_interopWindowHandle != nullptr);
-
-    _source = DesktopWindowXamlSource{};
-
-    auto interop = _source.as<IDesktopWindowXamlSourceNative>();
-    winrt::check_hresult(interop->AttachToWindow(_window.get()));
-
-    // stash the child interop handle so we can resize it when the main hwnd is resized
-    interop->get_WindowHandle(&_interopWindowHandle);
-
-    _rootGrid = winrt::Windows::UI::Xaml::Controls::Grid();
-    _source.Content(_rootGrid);
-}
-
-void SampleIslandWindow::OnSize(const UINT width, const UINT height)
-{
-    // update the interop window size
-    SetWindowPos(_interopWindowHandle, nullptr, 0, 0, width, height, SWP_SHOWWINDOW | SWP_NOACTIVATE);
-
-    if (_rootGrid)
-    {
-        const auto size = GetLogicalSize();
-        _rootGrid.Width(size.Width);
-        _rootGrid.Height(size.Height);
-    }
-}
-
-[[nodiscard]] LRESULT SampleIslandWindow::MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
-{
-    switch (message)
-    {
-    case WM_CREATE:
-    {
-        _HandleCreateWindow(wparam, lparam);
-        return 0;
-    }
-    case WM_SETFOCUS:
-    {
-        if (_interopWindowHandle != nullptr)
-        {
-            // send focus to the child window
-            SetFocus(_interopWindowHandle);
-            return 0;
-        }
-        break;
-    }
-    case WM_MENUCHAR:
-    {
-        // GH#891: return this LRESULT here to prevent the app from making a
-        // bell when alt+key is pressed. A menu is active and the user presses a
-        // key that does not correspond to any mnemonic or accelerator key,
-        return MAKELRESULT(0, MNC_CLOSE);
-    }
-    case WM_THEMECHANGED:
-        UpdateWindowIconForActiveMetrics(_window.get());
-        return 0;
-    }
-
-    return base_type::MessageHandler(message, wparam, lparam);
-}
-
-// Method Description:
-// - Called when the window has been resized (or maximized)
-// Arguments:
-// - width: the new width of the window _in pixels_
-// - height: the new height of the window _in pixels_
-void SampleIslandWindow::OnResize(const UINT width, const UINT height)
-{
-    if (_interopWindowHandle)
-    {
-        OnSize(width, height);
-    }
-}
-
-// Method Description:
-// - Called when the window is minimized to the taskbar.
-void SampleIslandWindow::OnMinimize()
-{
-}
-
-// Method Description:
-// - Called when the window is restored from having been minimized.
-void SampleIslandWindow::OnRestore()
-{
-}
-
-void SampleIslandWindow::SetContent(winrt::Windows::UI::Xaml::UIElement content)
-{
-    _rootGrid.Children().Clear();
-    _rootGrid.Children().Append(content);
-}
-
-void SampleIslandWindow::OnAppInitialized()
-{
-    // Do a quick resize to force the island to paint
-    const auto size = GetPhysicalSize();
-    OnSize(size.cx, size.cy);
-}
-
-// Method Description:
-// - Called when the app wants to change its theme. We'll update the root UI
-//   element of the entire XAML tree, so that all UI elements get the theme
-//   applied.
-// Arguments:
-// - arg: the ElementTheme to use as the new theme for the UI
-// Return Value:
-// - <none>
-void SampleIslandWindow::OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme)
-{
-    _rootGrid.RequestedTheme(requestedTheme);
-    // Invalidate the window rect, so that we'll repaint any elements we're
-    // drawing ourselves to match the new theme
-    ::InvalidateRect(_window.get(), nullptr, false);
-}
--- a/scratch/ScratchIslandApp/WindowExe/SampleIslandWindow.h
+++ b/scratch/ScratchIslandApp/WindowExe/SampleIslandWindow.h
@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SampleBaseWindow.h"
-#include "../../../src/cascadia/inc/cppwinrt_utils.h"
-
-class SampleIslandWindow :
-    public BaseWindow<SampleIslandWindow>
-{
-public:
-    SampleIslandWindow() noexcept;
-    virtual ~SampleIslandWindow() override;
-
-    virtual void MakeWindow() noexcept;
-    void Close();
-
-    virtual void OnSize(const UINT width, const UINT height);
-
-    [[nodiscard]] virtual LRESULT MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept override;
-    void OnResize(const UINT width, const UINT height) override;
-    void OnMinimize() override;
-    void OnRestore() override;
-    virtual void OnAppInitialized();
-    virtual void SetContent(winrt::Windows::UI::Xaml::UIElement content);
-    virtual void OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
-
-    virtual void Initialize();
-
-protected:
-    void ForceResize()
-    {
-        // Do a quick resize to force the island to paint
-        const auto size = GetPhysicalSize();
-        OnSize(size.cx, size.cy);
-    }
-
-    HWND _interopWindowHandle;
-
-    winrt::Windows::UI::Xaml::Hosting::DesktopWindowXamlSource _source;
-
-    winrt::Windows::UI::Xaml::Controls::Grid _rootGrid;
-
-    void _HandleCreateWindow(const WPARAM wParam, const LPARAM lParam) noexcept;
-};
--- a/scratch/ScratchIslandApp/WindowExe/SampleMain.cpp
+++ b/scratch/ScratchIslandApp/WindowExe/SampleMain.cpp
@@ -1,122 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SampleAppHost.h"
-#include "resource.h"
-#include "../types/inc/User32Utils.hpp"
-#include <WilErrorReporting.h>
-
-using namespace winrt;
-using namespace winrt::Windows::UI;
-using namespace winrt::Windows::UI::Composition;
-using namespace winrt::Windows::UI::Xaml::Hosting;
-using namespace winrt::Windows::Foundation::Numerics;
-
-// Routine Description:
-// - Takes an image architecture and locates a string resource that maps to that architecture.
-// Arguments:
-// - imageArchitecture - An IMAGE_FILE_MACHINE architecture enum value
-//                     - See https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants
-// Return Value:
-// - A string value representing the human-readable name of this architecture.
-static std::wstring ImageArchitectureToString(USHORT imageArchitecture)
-{
-    // clang-format off
-    const auto id = imageArchitecture == IMAGE_FILE_MACHINE_I386 ? IDS_X86_ARCHITECTURE :
-                    imageArchitecture == IMAGE_FILE_MACHINE_AMD64 ? IDS_AMD64_ARCHITECTURE :
-                    imageArchitecture == IMAGE_FILE_MACHINE_ARM64 ? IDS_ARM64_ARCHITECTURE :
-                    imageArchitecture == IMAGE_FILE_MACHINE_ARM ? IDS_ARM_ARCHITECTURE :
-                    IDS_UNKNOWN_ARCHITECTURE;
-    // clang-format on
-
-    return GetStringResource(id);
-}
-
-// Routine Description:
-// - Blocks the user from launching the application with a message box dialog and early exit
-//   if the process architecture doesn't match the system platform native architecture.
-// - This is because the conhost.exe must match the condrv.sys on the system and the PTY
-//   infrastructure that powers everything won't work if we have a mismatch.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-static void EnsureNativeArchitecture()
-{
-    USHORT processMachine{};
-    USHORT nativeMachine{};
-    THROW_IF_WIN32_BOOL_FALSE(IsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine));
-    if (processMachine != IMAGE_FILE_MACHINE_UNKNOWN && processMachine != nativeMachine)
-    {
-        const auto formatPattern = GetStringResource(IDS_ERROR_ARCHITECTURE_FORMAT);
-
-        const auto nativeArchitecture = ImageArchitectureToString(nativeMachine);
-        const auto processArchitecture = ImageArchitectureToString(processMachine);
-
-        auto buffer{ wil::str_printf<std::wstring>(formatPattern.data(), nativeArchitecture.data(), processArchitecture.data()) };
-
-        MessageBoxW(nullptr,
-                    buffer.data(),
-                    GetStringResource(IDS_ERROR_DIALOG_TITLE).data(),
-                    MB_OK | MB_ICONERROR);
-
-        ExitProcess(0);
-    }
-}
-
-static bool _messageIsF7Keypress(const MSG& message)
-{
-    return (message.message == WM_KEYDOWN || message.message == WM_SYSKEYDOWN) && message.wParam == VK_F7;
-}
-static bool _messageIsAltKeyup(const MSG& message)
-{
-    return (message.message == WM_KEYUP || message.message == WM_SYSKEYUP) && message.wParam == VK_MENU;
-}
-
-int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
-{
-    // If Terminal is spawned by a shortcut that requests that it run in a new process group
-    // while attached to a console session, that request is nonsense. That request will, however,
-    // cause WT to start with Ctrl-C disabled. This wouldn't matter, because it's a Windows-subsystem
-    // application. Unfortunately, that state is heritable. In short, if you start WT using cmd in
-    // a weird way, ^C stops working _inside_ the terminal. Mad.
-    SetConsoleCtrlHandler(NULL, FALSE);
-
-    // Block the user from starting if they launched the incorrect architecture version of the project.
-    // This should only be applicable to developer versions. The package installation process
-    // should choose and install the correct one from the bundle.
-    EnsureNativeArchitecture();
-
-    // Make sure to call this so we get WM_POINTER messages.
-    EnableMouseInPointer(true);
-
-    // !!! LOAD BEARING !!!
-    // We must initialize the main thread as a single-threaded apartment before
-    // constructing any Xaml objects. Failing to do so will cause some issues
-    // in accessibility somewhere down the line when a UIAutomation object will
-    // be queried on the wrong thread at the wrong time.
-    // We used to initialize as STA only _after_ initializing the application
-    // host, which loaded the settings. The settings needed to be loaded in MTA
-    // because we were using the Windows.Storage APIs. Since we're no longer
-    // doing that, we can safely init as STA before any WinRT dispatches.
-    winrt::init_apartment(winrt::apartment_type::single_threaded);
-
-    // Create the SampleAppHost object, which will create both the window and the
-    // Terminal App. This MUST BE constructed before the Xaml manager as TermApp
-    // provides an implementation of Windows.UI.Xaml.Application.
-    SampleAppHost host;
-
-    // Initialize the xaml content. This must be called AFTER the
-    // WindowsXamlManager is initialized.
-    host.Initialize();
-
-    MSG message;
-
-    while (GetMessage(&message, nullptr, 0, 0))
-    {
-        TranslateMessage(&message);
-        DispatchMessage(&message);
-    }
-    return 0;
-}
--- a/scratch/ScratchIslandApp/WindowExe/WindowExe.def
+++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.def
@@ -1 +0,0 @@
-
--- a/scratch/ScratchIslandApp/WindowExe/WindowExe.manifest
+++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.manifest
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-        <!-- Windows 10 1903 -->
-        <!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands -->
-        <!-- "maxversiontested" is CASE SENSITIVE. Do not change this.-->
-        <maxversiontested Id="10.0.18362.0"/>
-        <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
-    </windowsSettings>
-  </application>
-</assembly>
--- a/scratch/ScratchIslandApp/WindowExe/WindowExe.rc
+++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.rc
@@ -1,97 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-
-IDI_APPICON             ICON                    "..\\..\\..\\res\\terminal.ico"
-IDI_APPICON_HC_BLACK    ICON                    "..\\..\\..\\res\\terminal\\images\\terminal_contrast-black.ico"
-IDI_APPICON_HC_WHITE    ICON                    "..\\..\\..\\res\\terminal\\images\\terminal_contrast-white.ico"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDS_ERROR_DIALOG_TITLE  "Error"
-    IDS_HELP_DIALOG_TITLE  "Help"
-    IDS_ERROR_ARCHITECTURE_FORMAT
-                            "This sample is designed to run on your system's native architecture (%s).\nYou are currently using the %s version.\n\nPlease use the version of this sample that matches your system's native architecture."
-    IDS_X86_ARCHITECTURE    "i386"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_AMD64_ARCHITECTURE  "AMD64"
-    IDS_ARM64_ARCHITECTURE  "ARM64"
-    IDS_ARM_ARCHITECTURE    "ARM"
-    IDS_UNKNOWN_ARCHITECTURE "Unknown"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj
+++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
-
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{b4427499-9fde-4208-b456-5bc580637633}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>WindowExe</RootNamespace>
-    <ProjectName>WindowExe</ProjectName>
-    <TargetName>WindowExe</TargetName>
-    <ConfigurationType>Application</ConfigurationType>
-    <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsStoreApp>true</WindowsStoreApp>
-    <WindowsAppContainer>false</WindowsAppContainer>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <GenerateManifest>true</GenerateManifest>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-  <!-- Source Files -->
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="icon.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="SampleAppHost.h" />
-    <ClInclude Include="SampleBaseWindow.h" />
-    <ClInclude Include="SampleIslandWindow.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="icon.cpp" />
-    <ClCompile Include="SampleMain.cpp" />
-    <ClCompile Include="SampleAppHost.cpp" />
-    <ClCompile Include="SampleIslandWindow.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="WindowExe.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="WindowExe.manifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-
-  <!-- ========================= Project References ======================== -->
-  <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)scratch\ScratchIslandApp\SampleApp\dll\SampleApp.vcxproj" />
-  </ItemGroup>
-
-  <!-- ========================== Other References ========================= -->
-  <ItemGroup>
-    <!--
-    !! LOAD BEARING !!
-    Make sure these winmd's are all Private=true,
-    CopyLocalSatelliteAssemblies=true, at this layer. Those will force the
-    packaging project to actually include those winmd's in our final package. If
-    they're missing, then WinRT will have a hard time marshalling those types
-    across a process boundary.
-
-    Particularly tricky is Microsoft.Terminal.Core.winmd. That winmd doesn't
-    have its own DLL (it doesn't have any activatable classes, only structs and
-    interfaces). However, it too is necessary for Terminal.Control to be able to
-    marshall the Core types across the boundary.
-    -->
-    <Reference Include="Microsoft.Terminal.Core">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.TerminalConnection">
-      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
-      <Implementation>$(OpenConsoleCommonOutDir)TerminalConnection\TerminalConnection.dll</Implementation>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </Reference>
-    <Reference Include="Microsoft.Terminal.Control">
-      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd</HintPath>
-      <Implementation>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.dll</Implementation>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </Reference>
-  </ItemGroup>
-  <!--
-    This ItemGroup and the Globals PropertyGroup below it are required in order
-    to enable F5 debugging for the unpackaged application
-    -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_general.xml" />
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_local_windows.xml" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\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'))" />
-  </Target>
-
-  <!-- Override GetPackagingOutputs to roll up all our dependencies.
-       This ensures that when the WAP packaging project asks what files go into
-       the package, we tell it.
-       This is a heavily stripped version of the one in Microsoft.*.AppxPackage.targets.
-  -->
-  <PropertyGroup>
-    <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true</_ContinueOnError>
-    <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false</_ContinueOnError>
-  </PropertyGroup>
-  <Target Name="GetPackagingOutputs" Returns="@(PackagingOutputs)">
-    <MSBuild
-      Projects="@(ProjectReferenceWithConfiguration)"
-      Targets="GetPackagingOutputs"
-      BuildInParallel="$(BuildInParallel)"
-      Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
-      Condition="'@(ProjectReferenceWithConfiguration)' != ''
-                 and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
-                 and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
-      ContinueOnError="$(_ContinueOnError)">
-      <Output TaskParameter="TargetOutputs" ItemName="_PackagingOutputsFromOtherProjects"/>
-    </MSBuild>
-
-    <ItemGroup>
-      <PackagingOutputs Include="@(_PackagingOutputsFromOtherProjects)" />
-    </ItemGroup>
-
-    <!-- **BEGIN VC LIBS HACK** -->
-    <PropertyGroup>
-      <ReasonablePlatform Condition="'$(Platform)'=='Win32'">x86</ReasonablePlatform>
-      <ReasonablePlatform Condition="'$(ReasonablePlatform)'==''">$(Platform)</ReasonablePlatform>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'$(WindowExeOfficialBuild)'=='true'">
-      <!-- Add all the CRT libs as content; these must be inside a Target as they are wildcards. -->
-      <_OpenConsoleVCLibToCopy Include="$(VCToolsRedistInstallDir)\$(ReasonablePlatform)\Microsoft.VC142.CRT\*.dll" />
-
-      <PackagingOutputs Include="@(_OpenConsoleVCLibToCopy)">
-        <ProjectName>$(ProjectName)</ProjectName>
-        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
-    <!-- **END VC LIBS HACK** -->
-
-
-    <!-- **BEGIN TERMINAL CONNECTION HACK** -->
-    <!-- This is the same as the above VC libs hack, but for TerminalConnection.
-    TerminalConnection depends on cpprest*.dll, and if we don't include it in
-    the packaging output, we'll crash as soon as we try to load
-    TerminalConnection.dll.
-
-    The Sample sln needs to do this manually - the real exe has a
-    ProjectReference to TerminalConnection.vcxproj and can figure this out on
-    its own. -->
-    <ItemGroup>
-      <_TerminalConnectionDlls Include="$(OpenConsoleCommonOutDir)\TerminalConnection\*.dll" />
-
-      <PackagingOutputs Include="@(_TerminalConnectionDlls)">
-        <ProjectName>$(ProjectName)</ProjectName>
-        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
-    <!-- **END TERMINAL CONNECTION HACK** -->
-
-    <!-- Same thing again here, with WindowsTerminal.exe -->
-    <ItemGroup>
-      <_WindowsTerminalExe Include="$(OpenConsoleCommonOutDir)\WindowsTerminal\*.exe" />
-
-      <PackagingOutputs Include="@(_WindowsTerminalExe)">
-        <ProjectName>$(ProjectName)</ProjectName>
-        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
-  </Target>
-
-
-
-
-
-  <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
-  <Import Project="..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets" Condition="Exists('..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets')" />
-</Project>
-
--- a/scratch/ScratchIslandApp/WindowExe/icon.cpp
+++ b/scratch/ScratchIslandApp/WindowExe/icon.cpp
@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "resource.h"
-
-static int _GetActiveAppIconResource()
-{
-    auto iconResource{ IDI_APPICON };
-
-    HIGHCONTRASTW hcInfo{};
-    hcInfo.cbSize = sizeof(hcInfo);
-
-    if (SystemParametersInfoW(SPI_GETHIGHCONTRAST, sizeof(hcInfo), &hcInfo, 0))
-    {
-        if (WI_IsFlagSet(hcInfo.dwFlags, HCF_HIGHCONTRASTON))
-        {
-            iconResource = IDI_APPICON_HC_BLACK;
-
-            if (0x00FFFFFF == GetSysColor(COLOR_WINDOW)) // white window color == white high contrast
-            {
-                iconResource = IDI_APPICON_HC_WHITE;
-            }
-        }
-    }
-
-    return iconResource;
-}
-
-void UpdateWindowIconForActiveMetrics(HWND window)
-{
-    auto iconResource{ MAKEINTRESOURCEW(_GetActiveAppIconResource()) };
-
-    // These handles are loaded with LR_SHARED, so they are safe to "leak".
-    HANDLE smallIcon{ LoadImageW(wil::GetModuleInstanceHandle(), iconResource, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) };
-    LOG_LAST_ERROR_IF_NULL(smallIcon);
-
-    HANDLE largeIcon{ LoadImageW(wil::GetModuleInstanceHandle(), iconResource, IMAGE_ICON, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), LR_SHARED) };
-    LOG_LAST_ERROR_IF_NULL(largeIcon);
-
-    if (smallIcon)
-    {
-        SendMessageW(window, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(smallIcon));
-    }
-    if (largeIcon)
-    {
-        SendMessageW(window, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(largeIcon));
-    }
-}
--- a/scratch/ScratchIslandApp/WindowExe/icon.h
+++ b/scratch/ScratchIslandApp/WindowExe/icon.h
@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-void UpdateWindowIconForActiveMetrics(HWND window);
--- a/scratch/ScratchIslandApp/WindowExe/packages.config
+++ b/scratch/ScratchIslandApp/WindowExe/packages.config
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210309.3" targetFramework="native" />
-  <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
-  <package id="Microsoft.UI.Xaml" version="2.5.0-prerelease.201202003" targetFramework="native" />
-  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
-</packages>
--- a/scratch/ScratchIslandApp/WindowExe/pch.cpp
+++ b/scratch/ScratchIslandApp/WindowExe/pch.cpp
@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
--- a/scratch/ScratchIslandApp/WindowExe/pch.h
+++ b/scratch/ScratchIslandApp/WindowExe/pch.h
@@ -1,82 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- pch.h
-
-Abstract:
- Contains external headers to include in the precompile phase of console build process.
- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
--*/
-
-#pragma once
-
-// Ignore checked iterators warning from VC compiler.
-#define _SCL_SECURE_NO_WARNINGS
-
-// Block minwindef.h min/max macros to prevent <algorithm> conflict
-#define NOMINMAX
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMCX
-#define NOHELP
-#define NOCOMM
-
-#include <unknwn.h>
-
-#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
-
-#include <windows.h>
-#include <UIAutomation.h>
-#include <cstdlib>
-#include <cstring>
-#include <shellscalingapi.h>
-#include <windowsx.h>
-#include <ShObjIdl.h>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
-#include "../inc/LibraryIncludes.h"
-
-// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
-//      SDK definition of this function, so the only fix is to undef it.
-// from WinBase.h
-// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
-#include <wil/cppwinrt.h>
-
-// Needed just for XamlIslands to work at all:
-#include <winrt/Windows.system.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.UI.Xaml.Hosting.h>
-#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
-
-// Additional headers for various xaml features. We need:
-//  * Core so we can resume_foreground with CoreDispatcher
-//  * Controls for grid
-//  * Media for ScaleTransform
-#include <winrt/Windows.UI.Core.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.ui.xaml.media.h>
-
-#include <winrt/SampleApp.h>
-
-#include <wil/resource.h>
-#include <wil/win32_helpers.h>
-
-// Including TraceLogging essentials for the binary
-#include <TraceLoggingProvider.h>
-#include <winmeta.h>
-TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider);
-#include <telemetry/ProjectTelemetry.h>
-#include <TraceLoggingActivity.h>
-
-// For commandline argument processing
-#include <shellapi.h>
-#include <processenv.h>
-#include <WinUser.h>
-#include "til.h"
--- a/scratch/ScratchIslandApp/WindowExe/resource.h
+++ b/scratch/ScratchIslandApp/WindowExe/resource.h
@@ -1,27 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by WindowsTerminal.rc
-//
-#define IDI_APPICON 101
-#define IDI_APPICON_HC_BLACK 102
-#define IDI_APPICON_HC_WHITE 103
-
-#define IDS_ERROR_DIALOG_TITLE 105
-#define IDS_HELP_DIALOG_TITLE 106
-#define IDS_ERROR_ARCHITECTURE_FORMAT 110
-#define IDS_X86_ARCHITECTURE 111
-#define IDS_AMD64_ARCHITECTURE 112
-#define IDS_ARM64_ARCHITECTURE 113
-#define IDS_ARM_ARCHITECTURE 114
-#define IDS_UNKNOWN_ARCHITECTURE 115
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 104
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
--- a/src/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.vcxproj
+++ b/src/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.vcxproj
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{9cf74355-f018-4c19-81ad-9dc6b7f2c6f5}</ProjectGuid>
-    <RootNamespace>apimswincoresynchl120</RootNamespace>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)src\common.build.pre.props" />
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="definitions.def" />
-  </ItemGroup>
-  <Import Project="$(SolutionDir)src\common.build.post.props" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>definitions.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
--- a/src/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.vcxproj.filters
+++ b/src/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.vcxproj.filters
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="definitions.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
--- a/src/api-ms-win-core-synch-l1-2-0/definitions.def
+++ b/src/api-ms-win-core-synch-l1-2-0/definitions.def
@@ -1,19 +0,0 @@
-LIBRARY
-EXPORTS
-	DeleteSynchronizationBarrier = kernel32.DeleteSynchronizationBarrier
-	EnterSynchronizationBarrier = kernel32.EnterSynchronizationBarrier
-	InitOnceBeginInitialize = kernel32.InitOnceBeginInitialize
-	InitOnceComplete = kernel32.InitOnceComplete
-	InitOnceExecuteOnce = kernel32.InitOnceExecuteOnce
-	InitOnceInitialize = kernel32.InitOnceInitialize
-	InitializeConditionVariable = kernel32.InitializeConditionVariable
-	InitializeSynchronizationBarrier = kernel32.InitializeSynchronizationBarrier
-	SignalObjectAndWait = kernel32.SignalObjectAndWait
-	Sleep = kernel32.Sleep
-	SleepConditionVariableCS = kernel32.SleepConditionVariableCS
-	SleepConditionVariableSRW = kernel32.SleepConditionVariableSRW
-	WaitOnAddress
-	WakeAllConditionVariable = kernel32.WakeAllConditionVariable
-	WakeByAddressAll
-	WakeByAddressSingle
-	WakeConditionVariable = kernel32.WakeConditionVariable
--- a/src/api-ms-win-core-synch-l1-2-0/main.cpp
+++ b/src/api-ms-win-core-synch-l1-2-0/main.cpp
@@ -1,189 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-//
-// The code in this file was adapted from the STL on the 2021-07-05. Commit:
-// https://github.com/microsoft/STL/blob/e745bad3b1d05b5b19ec652d68abb37865ffa454/stl/src/atomic_wait.cpp
-//
-// It backports the following Windows 8 functions to Windows 7:
-// * WaitOnAddress
-// * WakeByAddressSingle
-// * WakeByAddressAll
-//
-
-#include <cstdint>
-#include <new>
-
-#include <winsdkver.h>
-#define _WIN32_WINNT 0x0601
-#include <sdkddkver.h>
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#include <intrin.h>
-
-namespace
-{
-    class [[nodiscard]] SRWLockGuard
-    {
-    public:
-        explicit SRWLockGuard(SRWLOCK & lock) noexcept :
-            _lock(&lock)
-        {
-            AcquireSRWLockExclusive(_lock);
-        }
-
-        ~SRWLockGuard()
-        {
-            ReleaseSRWLockExclusive(_lock);
-        }
-
-        SRWLockGuard(const SRWLockGuard&) = delete;
-        SRWLockGuard& operator=(const SRWLockGuard&) = delete;
-
-        SRWLockGuard(SRWLockGuard &&) = delete;
-        SRWLockGuard& operator=(SRWLockGuard&&) = delete;
-
-    private:
-        SRWLOCK* _lock;
-    };
-
-    struct WaitContext
-    {
-        const volatile void* address;
-        WaitContext* next;
-        WaitContext* prev;
-        CONDITION_VARIABLE cv;
-    };
-
-    struct [[nodiscard]] GuardedWaitContext : WaitContext
-    {
-        GuardedWaitContext(const volatile void* storage, WaitContext* head) noexcept :
-            WaitContext{ storage, head, head->prev, CONDITION_VARIABLE_INIT }
-        {
-            prev->next = this;
-            next->prev = this;
-        }
-
-        ~GuardedWaitContext()
-        {
-            const auto n = next;
-            const auto p = prev;
-            next->prev = p;
-            prev->next = n;
-        }
-
-        GuardedWaitContext(const GuardedWaitContext&) = delete;
-        GuardedWaitContext& operator=(const GuardedWaitContext&) = delete;
-
-        GuardedWaitContext(GuardedWaitContext &&) = delete;
-        GuardedWaitContext& operator=(GuardedWaitContext&&) = delete;
-    };
-
-#pragma warning(push)
-#pragma warning(disable : 4324) // structure was padded due to alignment specifier
-    struct alignas(std::hardware_destructive_interference_size) WaitTableEntry
-    {
-        SRWLOCK lock = SRWLOCK_INIT;
-        WaitContext head = { nullptr, &head, &head, CONDITION_VARIABLE_INIT };
-    };
-#pragma warning(pop)
-
-    [[nodiscard]] WaitTableEntry& GetWaitTableEntry(const volatile void* const storage) noexcept
-    {
-        // A prime number for the hash table size was chosen to prevent collisions.
-        constexpr size_t size = 251;
-        constexpr std::hash<uintptr_t> hasher;
-
-        static WaitTableEntry table[size];
-#pragma warning(suppress : 26446) // Prefer to use gsl::at() instead of unchecked subscript operator
-#pragma warning(suppress : 26482) // Only index into arrays using constant expressions
-#pragma warning(suppress : 26490) // Don't use reinterpret_cast
-        return table[hasher(reinterpret_cast<uintptr_t>(storage)) % size];
-    }
-
-#pragma warning(suppress : 26429) // Symbol 'comparand' is never tested for nullness, it can be marked as not_null
-    bool AreEqual(const volatile void* storage, const void* comparand, size_t size) noexcept
-    {
-        switch (size)
-        {
-        case 1:
-            return __iso_volatile_load8(static_cast<const volatile __int8*>(storage)) == *static_cast<const __int8*>(comparand);
-        case 2:
-            return __iso_volatile_load16(static_cast<const volatile __int16*>(storage)) == *static_cast<const __int16*>(comparand);
-        case 4:
-            return __iso_volatile_load32(static_cast<const volatile __int32*>(storage)) == *static_cast<const __int32*>(comparand);
-        case 8:
-            return __iso_volatile_load64(static_cast<const volatile __int64*>(storage)) == *static_cast<const __int64*>(comparand);
-        default:
-            abort();
-        }
-    }
-} // unnamed namespace
-
-extern "C" BOOL WINAPI WaitOnAddress(_In_reads_bytes_(AddressSize) volatile VOID* Address, _In_reads_bytes_(AddressSize) PVOID CompareAddress, _In_ SIZE_T AddressSize, _In_opt_ DWORD dwMilliseconds)
-{
-    auto& entry = GetWaitTableEntry(Address);
-
-    SRWLockGuard guard{ entry.lock };
-    GuardedWaitContext context{ Address, &entry.head };
-
-    for (;;)
-    {
-        // NOTE: under lock to prevent lost wakes
-        if (!AreEqual(Address, CompareAddress, AddressSize))
-        {
-            return TRUE;
-        }
-
-        if (!SleepConditionVariableSRW(&context.cv, &entry.lock, dwMilliseconds, 0))
-        {
-#ifndef NDEBUG
-            if (GetLastError() != ERROR_TIMEOUT)
-            {
-                abort();
-            }
-#endif
-            return FALSE;
-        }
-
-        if (dwMilliseconds != INFINITE)
-        {
-            // spurious wake to recheck the clock
-            return TRUE;
-        }
-    }
-}
-
-extern "C" VOID WINAPI WakeByAddressSingle(_In_ PVOID Address)
-{
-    auto& entry = GetWaitTableEntry(Address);
-    SRWLockGuard guard(entry.lock);
-
-    for (auto context = entry.head.next; context != &entry.head; context = context->next)
-    {
-        if (context->address == Address)
-        {
-            // Can't move wake outside SRWLOCKed section: SRWLOCK also protects the context itself
-            WakeAllConditionVariable(&context->cv);
-            // This break; is the difference between WakeByAddressSingle and WakeByAddressAll
-            break;
-        }
-    }
-}
-
-extern "C" VOID WINAPI WakeByAddressAll(_In_ PVOID Address)
-{
-    auto& entry = GetWaitTableEntry(Address);
-    SRWLockGuard guard(entry.lock);
-
-    for (auto context = entry.head.next; context != &entry.head; context = context->next)
-    {
-        if (context->address == Address)
-        {
-            // Can't move wake outside SRWLOCKed section: SRWLOCK also protects the context itself
-            WakeAllConditionVariable(&context->cv);
-        }
-    }
-}
--- a/src/buffer/out/OutputCellView.hpp
+++ b/src/buffer/out/OutputCellView.hpp
@@ -6,7 +6,7 @@ Module Name:
 - OutputCellView.hpp

 Abstract:
- Read view into a single cell of data that someone is attempting to write into the output buffer.
+- Read-only view into a single cell of data that someone is attempting to write into the output buffer.
 - This is done for performance reasons (avoid heap allocs and copies).

 Author:
@@ -36,21 +36,6 @@ public:
    TextAttribute TextAttr() const noexcept;
    TextAttributeBehavior TextAttrBehavior() const noexcept;

-    void UpdateText(const std::wstring_view& view) noexcept
-    {
-        _view = view;
-    };
-
-    void UpdateDbcsAttribute(const DbcsAttribute& dbcsAttr) noexcept
-    {
-        _dbcsAttr = dbcsAttr;
-    }
-
-    void UpdateTextAttribute(const TextAttribute& textAttr) noexcept
-    {
-        _textAttr = textAttr;
-    }
-
    bool operator==(const OutputCellView& view) const noexcept;
    bool operator!=(const OutputCellView& view) const noexcept;

--- a/Show More
+++ b/Show More