Remove the "set default terminal" banner (#16873)

**Default Terminal**: Everyone who cares to know, knows. Everyone who
doesn't, has an annoying bar above all terminals

I had to introduce a workaround for the fact that unknown dismissed
message keys in `state.json` result in Terminal exploding on launch.
😁 That's tracked in #16874.

Closes #11930 (but not in the way you'd expect)

(cherry picked from commit febfbebf9b)
Service-Card-Id: 92139784
Service-Version: 1.20

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

@@ -18,8 +18,6 @@ consvc
 copyable
 Counterintuitively
 CtrlDToClose
-CVS
-CUI
 cybersecurity
 dalet
 Dcs
@@ -83,24 +81,19 @@ noreply
 ogonek
 ok'd
 overlined
-perlw
 pipeline
 postmodern
 Powerline
 powerline
 ptys
-pwshw
 qof
 qps
-Remappings
-Retargets
 rclt
 reimplementation
 reserialization
 reserialize
 reserializes
 rlig
-rubyw
 runtimes
 servicebus
 shcha
@@ -121,7 +114,6 @@ toolset
 truthiness
 tshe
 ubuntu
-UEFI
 uiatextrange
 UIs
 und

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

@@ -1,12 +1,9 @@
-aalt
-abvm
 ACCEPTFILES
 ACCESSDENIED
 acl
 aclapi
 alignas
 alignof
-allocconsolewithoptions
 APPLYTOSUBMENUS
 appxrecipe
 bitfield
@@ -24,9 +21,7 @@ COLORPROPERTY
 colspan
 COMDLG
 commandlinetoargv
-commoncontrols
 comparand
-COPYFROMRESOURCE
 cstdint
 CXICON
 CYICON
@@ -38,7 +33,6 @@ delayimp
 DERR
 dlldata
 DNE
-dnom
 DONTADDTORECENT
 DWMSBT
 DWMWA
@@ -47,12 +41,10 @@ endfor
 ENDSESSION
 enumset
 environstrings
-EXACTSIZEONLY
 EXPCMDFLAGS
 EXPCMDSTATE
 filetime
 FILTERSPEC
-fina
 FORCEFILESYSTEM
 FORCEMINIMIZE
 frac
@@ -66,7 +58,6 @@ Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
 hinternet
-HIGHQUALITYSCALE
 HINTERNET
 hotkeys
 href
@@ -83,7 +74,6 @@ IBox
 IClass
 IComparable
 IComparer
-ICONINFO
 IConnection
 ICustom
 IDialog
@@ -93,7 +83,6 @@ IExplorer
 IFACEMETHOD
 IFile
 IGraphics
-IImage
 IInheritable
 IMap
 IMonarch
@@ -124,7 +113,6 @@ LSHIFT
 LTGRAY
 MAINWINDOW
 MAXIMIZEBOX
-medi
 memchr
 memicmp
 MENUCOMMAND
@@ -155,7 +143,6 @@ NOTIFYBYPOS
 NOTIFYICON
 NOTIFYICONDATA
 ntprivapi
-numr
 oaidl
 ocidl
 ODR
@@ -169,7 +156,6 @@ OUTLINETEXTMETRICW
 overridable
 PACL
 PAGESCROLL
-PALLOC
 PATINVERT
 PEXPLICIT
 PICKFOLDERS
@@ -181,11 +167,9 @@ REGCLS
 RETURNCMD
 rfind
 RLO
-rnrn
 ROOTOWNER
 roundf
 RSHIFT
-rvrn
 SACL
 schandle
 SEH

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

@@ -20,7 +20,6 @@ cpptools
 cppvsdbg
 CPRs
 cryptbase
-cscript
 DACL
 DACLs
 defaultlib
@@ -46,7 +45,6 @@ MSAA
 msixbundle
 MSVC
 MSVCP
-mtu
 muxc
 netcore
 Onefuzz
@@ -90,10 +88,8 @@ Virtualization
 visualstudio
 vscode
 VSTHRD
-WINBASEAPI
 winsdkver
 wlk
-wscript
 wslpath
 wtl
 wtt

.github/actions/spelling/excludes.txt

@@ -115,7 +115,6 @@
 ^src/terminal/parser/ut_parser/Base64Test.cpp$
 ^src/terminal/parser/ut_parser/run\.bat$
 ^src/tools/benchcat
-^src/tools/ConsoleBench
 ^src/tools/integrity/dirs$
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
 ^src/tools/RenderingTests/main\.cpp$

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

@@ -19,7 +19,6 @@ AFew
 AFill
 AFX
 AHelper
-ahicon
 ahz
 AImpl
 AInplace
@@ -185,7 +184,6 @@ chh
 chshdng
 CHT
 Cic
-CLASSSTRING
 CLE
 cleartype
 CLICKACTIVE
@@ -431,7 +429,6 @@ DECRQM
 DECRQPSR
 DECRQSS
 DECRQTSR
-DECRQUPSS
 DECRSPS
 decrst
 DECSACE
@@ -454,7 +451,6 @@ DECSTBM
 DECSTGLT
 DECSTR
 DECSWL
-DECSWT
 DECTABSR
 DECTCEM
 DECXCPR
@@ -847,9 +843,6 @@ IGNORELANGUAGE
 IHosted
 iid
 IIo
-ILC
-ILCo
-ILD
 ime
 IMPEXP
 inbox
@@ -1347,14 +1340,11 @@ pgomgr
 PGONu
 pguid
 phhook
-phico
-phicon
 phwnd
 pidl
 PIDLIST
 pids
 pii
-piml
 pinvoke
 pipename
 pipestr
@@ -1686,8 +1676,6 @@ slpit
 SManifest
 SMARTQUOTE
 SMTO
-snapcx
-snapcy
 SOLIDBOX
 Solutiondir
 somefile
@@ -1913,7 +1901,6 @@ UPDATEDISPLAY
 UPDOWN
 UPKEY
 UPSS
-upss
 uregex
 URegular
 usebackq

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

@@ -56,7 +56,6 @@ jobs:
   - task: PowerShell@2
     displayName: 'Run PGO Tests'
     inputs:
-      pwsh: true
       targetType: filePath
       filePath: build\scripts\Run-Tests.ps1
       arguments: >-

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

@@ -44,7 +44,6 @@ jobs:
   - task: PowerShell@2
     displayName: 'Run Unit Tests'
     inputs:
-      pwsh: true
       targetType: filePath
       filePath: build\scripts\Run-Tests.ps1
       arguments: -MatchPattern '*unit.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
@@ -53,7 +52,6 @@ jobs:
     - task: PowerShell@2
       displayName: 'Run Feature Tests'
       inputs:
-        pwsh: true
         targetType: filePath
         filePath: build\scripts\Run-Tests.ps1
         arguments: -MatchPattern '*feature.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"

build/pipelines/templates-v2/variables-onebranch-config.yml

@@ -1,2 +1,2 @@
 variables:
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:1.0.02566.28'

build/rules/ConsumeWinRTInterfacesStatically.targets

@@ -1,49 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OpenConsoleGetUtilityProjectWinMDReferencesDependsOn></OpenConsoleGetUtilityProjectWinMDReferencesDependsOn>
-
-    <OpenConsoleGetUtilityProjectWinMDReferencesDependsOn Condition="'$(TerminalCppWinRT)'=='true'">
-      GetCppWinRTProjectWinMDReferences;
-      $(OpenConsoleGetUtilityProjectWinMDReferencesDependsOn)
-    </OpenConsoleGetUtilityProjectWinMDReferencesDependsOn>
-    <OpenConsoleGetUtilityProjectWinMDReferencesDependsOn Condition="'$(TerminalMidlRT)'=='true'">
-      GetMidlRTProjectWinMDReferences;
-      $(OpenConsoleGetUtilityProjectWinMDReferencesDependsOn)
-    </OpenConsoleGetUtilityProjectWinMDReferencesDependsOn>
-
-    <CppWinRTResolveReferencesDependsOn>$(CppWinRTResolveReferencesDependsOn);OpenConsoleSwitchUpMergeInputs;</CppWinRTResolveReferencesDependsOn>
-    <MidlRTResolveReferencesDependsOn>$(MidlRTResolveReferencesDependsOn);OpenConsoleSwitchUpMergeInputs;</MidlRTResolveReferencesDependsOn>
-  </PropertyGroup>
-
-  <Target Name="OpenConsoleGetUtilityProjectWinMDReferences"
-          DependsOnTargets="ResolveProjectReferences;$(OpenConsoleGetUtilityProjectWinMDReferencesDependsOn)"
-          Returns="@(OpenConsoleUtilityProjectWinMDReferences)">
-    <ItemGroup>
-      <_OpenConsoleUtilityProjectReferences Remove="@(_OpenConsoleUtilityProjectReferences)"/>
-      <_OpenConsoleUtilityProjectReferences Include="@(_ResolvedProjectReferencePaths)"
-          Condition= "'%(_ResolvedProjectReferencePaths.ProjectType)'=='Utility' AND 
-                      '%(_ResolvedProjectReferencePaths.WinMDFile)' == 'true' AND
-                      '%(_ResolvedProjectReferencePaths.OpenConsoleImplementInterface)' == 'true'"/>
-    </ItemGroup>
-    <ItemGroup>
-      <OpenConsoleUtilityProjectWinMDReferences Remove="@(OpenConsoleUtilityProjectWinMDReferences)" />
-      <OpenConsoleUtilityProjectWinMDReferences Include="@(_OpenConsoleUtilityProjectReferences)">
-        <WinMDPath>%(FullPath)</WinMDPath>
-      </OpenConsoleUtilityProjectWinMDReferences>
-    </ItemGroup>
-  </Target>
-
-  <!-- Calculates the input files and metadata directories to be passed to MdMerge -->
-  <Target Name="OpenConsoleSwitchUpMergeInputs"
-          DependsOnTargets="OpenConsoleGetUtilityProjectWinMDReferences">
-    <ItemGroup>
-      <!-- Utility projects should be consumed statically, not as dynamic references. -->
-      <CppWinRTDynamicProjectWinMDReferences Remove="@(OpenConsoleUtilityProjectWinMDReferences)" />
-      <CppWinRTStaticProjectWinMDReferences Include="@(OpenConsoleUtilityProjectWinMDReferences)" />
-      <MidlRTDynamicProjectWinMDReferences Remove="@(OpenConsoleUtilityProjectWinMDReferences)" />
-      <MidlRTStaticProjectWinMDReferences Include="@(OpenConsoleUtilityProjectWinMDReferences)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
-

build/rules/GenerateFeatureFlags.proj

@@ -30,7 +30,6 @@
     <IntermediateOutputPath>$(SolutionDir)obj\$(Configuration)\GenerateFeatureFlags\</IntermediateOutputPath>
     <OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Configuration)\</OpenConsoleCommonOutDir>
 
-    <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Canary'">Canary</_WTBrandingName>
     <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Preview'">Preview</_WTBrandingName>
     <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Release'">Release</_WTBrandingName>
     <_WTBrandingName Condition="'$(_WTBrandingName)'==''">Dev</_WTBrandingName>

build/scripts/Run-Tests.ps1

@@ -16,48 +16,22 @@ Param(
 # Find test DLLs based on the provided root, match pattern, and recursion
 $testDlls = Get-ChildItem -Path $Root -Recurse -Filter $MatchPattern
 
-$teArgs = @()
+$args = @()
 
 # Check if the LogPath parameter is provided and enable WTT logging
 if ($LogPath) {
-    $teArgs += '/enablewttlogging'
-    $teArgs += '/appendwttlogging'
-    $teArgs += "/logFile:$LogPath"
+    $args += '/enablewttlogging'
+    $args += '/appendwttlogging'
+    $args += "/logFile:$LogPath"
     Write-Host "WTT Logging Enabled"
 }
 
-$rootTe = "$Root\te.exe"
+# Invoke the te.exe executable with arguments and test DLLs
+& "$Root\te.exe" $args $testDlls.FullName $AdditionalTaefArguments
 
-# Some of our test fixtures depend on resources.pri in the same folder as the .exe hosting them.
-# Unfortunately, that means that we need to run the te.exe *next to* each test DLL we discover.
-# This code establishes a mapping from te.exe to test DLL (or DLLs)
-$testDllTaefGroups = $testDlls | % {
-	$localTe = Get-Item (Join-Path (Split-Path $_ -Parent) "te.exe") -EA:Ignore
-	If ($null -eq $localTe) {
-		$finalTePath = $rootTe
-	} Else {
-		$finalTePath = $localTe.FullName
-	}
-	[PSCustomObject]@{
-		TePath = $finalTePath;
-		TestDll = $_;
-	}
-}
-
-# Invoke the te.exe executables with arguments and test DLLs
-$anyFailed = $false
-$testDllTaefGroups | Group-Object TePath | % {
-	$te = $_.Group[0].TePath
-	$dlls = $_.Group.TestDll
-	Write-Verbose "Running $te (for $($dlls.Name))"
-	& $te $teArgs $dlls.FullName $AdditionalTaefArguments
-	if ($LASTEXITCODE -ne 0) {
-		$anyFailed = $true
-	}
-}
-
-if ($anyFailed) {
-    Exit 1
+# Check the exit code of the te.exe process and exit accordingly
+if ($LASTEXITCODE -ne 0) {
+    Exit $LASTEXITCODE
 }
 
 Exit 0

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2024</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2023</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>21</VersionMinor>
+    <VersionMinor>20</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

dep/nuget/packages.config

@@ -10,7 +10,6 @@
   <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
   <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
 
   <!-- Managed packages -->
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />

doc/cascadia/profiles.schema.json

@@ -2791,6 +2791,11 @@
           "description": "Use to set a path to a pixel shader to use with the Terminal. Overrides `experimental.retroTerminalEffect`. This is an experimental feature, and its continued existence is not guaranteed.",
           "type": "string"
         },
+        "useAtlasEngine": {
+          "description": "Windows Terminal 1.16 and later ship with a new, performant text renderer. Set this to false to revert back to the old text renderer.",
+          "type": "boolean",
+          "default": true
+        },
         "fontFace": {
           "default": "Cascadia Mono",
           "description": "[deprecated] Define 'face' within the 'font' object instead.",

doc/specs/#6899 - Action IDs/#6899 - Action IDs.md

@@ -23,7 +23,7 @@ contexts without needing to replicate an entire json blob.
 
 This spec was largely inspired by the following diagram from @DHowett:
 
-![figure 1](data-mockup-002.png)
+![figure 1](data-mockup.png)
 
 The goal is to introduce an `id` parameter by which actions could be uniquely
 referred to. If we'd ever like to use an action outside the list of `actions`, we
@@ -36,54 +36,38 @@ Discussion with the team lead to the understanding that the name `actions` would
 be even better, as a way of making the meaning of the "list of actions" more
 obvious.
 
-We will then restructure `defaults.json`, and also users' settings files (via `fixUpUserSettings`), in the following manner:
-* Instead of each `command` json block containing both the `action` (along with additional arguments) and the `keys`, these will now be split up -
-    * There will now be one json block for just the `command`/`action`, which will also contain the `id`. These json blocks will be in their own list called `actions`.
-    * There will be another json block for the `keys`, which will refer to the action to be invoked by `id`. These json blocks will be in their own list called `keybindings`.
-
-For example, let's take a look at the `split pane right` action in `defaults.json` as we currently have it:
-
-`"actions": [..., { "command": { "action": "splitPane", "split": "right" }, "keys": "alt+shift+plus" }, ...]`
-
-This will now become:
-
-`"actions": [..., { "command": { "action": "splitPane", "split": "right" }, "id": "Terminal.SplitPaneRight" }, ...]`
-
-`"keybindings": [..., { "keys": "alt+shift+plus", "id": "Terminal.SplitPaneRight" }, ...]`
-
-Here is how we will parse settings file and construct the relevant settings model objects:
-* We will first scan the `actions` list. We'll
+When we're parsing `actions`, we'll make three passes:
+* The first pass will scan the list for objects with an `id` property. We'll
   attempt to parse those entries into `ActionAndArgs` which we'll store in the
-  global `id->ActionAndArgs` map. All actions defined in `defaults.json` must have an `id` specified, and all actions provided by fragments must also have `id`s. Any actions from the defaults or fragments that do not provide `id`s will be ignored. As for user-specified commands, if no `id` is set, we will auto-generate one for that command based on the action and any additional arguments. For example, the `split pane right` command above might result in an autogenerated id `User.SplitPaneRight`.
-    * Note: this step is also where we will generate _commands_. We will use the name provided in the entry if it's set or the action's `GenerateName` method.
-* Next we will scan the `keybindings` list. These entries will
-  create a `KeyChord->ActionAndArgs` entry in the keybindings map. Since these objects should all contain an `id`, we will simply use the `id->ActionAndArgs` map we created in the previous step. Any object with `keys` set but no `id` will be ignored.
+  global `id->ActionAndArgs` map. If any entry doesn't have an `id` set, we'll
+  skip it in this phase. If an entry doesn't have a `command` set, we'll ignore
+  it in this pass.
+* The second pass will scan for _keybindings_. Any entries with `keys` set will
+  create a `KeyChord->ActionAndArgs` entry in the keybindings map. If the entry
+  has an `id` set, then we'll simply re-use the action we've already parsed for
+  the `id`, from the action map. If there isn't an `id`, then we'll parse the
+  action manually at this time. Entries without a `keys` set will be ignored in
+  this pass.
+* The final pass will be to generate _commands_. Similar to the keybindings
+  pass, we'll attempt to lookup actions for entries with an `id` set. If there
+  isn't an `id`, then we'll parse the action manually at this time. We'll then
+  get the name for the entry, either from the `name` property if it's set, or
+  the action's `GenerateName` method.
 
-For a visual representation:
+For a visual representation, let's assume the user has the following in their
+`actions`:
 
-![figure 2](data-mockup-actions-ids-keys-maps.png)
+![figure 2](data-mockup-actions.png)
 
-### Nested actions
+We'll first parse the `actions` to generate the mapping of `id`->`Actions`:
 
-We allow certain actions that take a form like this:
+![figure 3](data-mockup-actions-and-ids.png)
 
-```
-        {
-            // Select color scheme...
-            "name": { "key": "SetColorSchemeParentCommandName" },
-            "commands": [
-                {
-                    "iterateOn": "schemes",
-                    "name": "${scheme.name}",
-                    "command": { "action": "setColorScheme", "colorScheme": "${scheme.name}" }
-                }
-            ]
-        }
-```
+Then, we'll parse the `actions` to generate the mapping of keys to actions, with
+some actions already being defined in the map of `id`->`Actions`:
 
-For this case, having an `id` on the top level could potentially make sense when it comes to using that `id` in a menu, but not in the case of using that `id` for a keybinding. For the initial implementation, we will not support an `id` for these types of actions, which leaves us open to revisiting this in the future.
+![figure 4](data-mockup-actions-and-ids-and-keys.png)
 
-### Layering
 
 When layering `actions`, if a later settings file contains an action with the
 same `id`, it will replace the current value. In this way, users can redefine
@@ -103,9 +87,6 @@ As we add additional menus to the Terminal, like the customization for the new
 tab dropdown, or the tab context menu, or the `TermControl` context menu, they
 could all refer to these actions by `id`, rather than duplicating the same json.
 
-As for fragments, all actions in fragments _must_ have an `id`. If a fragment provides an action without an `id`, or provides an `id` that clashes with one of the actions in `defaults.json`, that action will be ignored.
-
-> 👉 NOTE: This will mean that actions will now need an `OriginTag`, similar to profiles and color schemes
 
 ### Existing Scenarios
 

doc/specs/#7335 - Console Allocation Policy.md

@@ -1,396 +0,0 @@
----
-author: Dustin Howett @DHowett <duhowett@microsoft.com>
-created on: 2020-08-16
-last updated: 2023-12-12
-issue id: "#7335"
----
-
-# Console Allocation Policy
-
-## Abstract
-
-Due to the design of the console subsystem on Windows as it has existed since Windows 95, every application that is
-stamped with the `IMAGE_SUBSYSTEM_WINDOWS_CUI` subsystem in its PE header will be allocated a console by kernel32.
-
-Any application that is stamped `IMAGE_SUBSYSTEM_WINDOWS_GUI` will not automatically be allocated a console.
-
-This has worked fine for many years: when you double-click a console application in your GUI shell, it is allocated a
-console.  When you run a GUI application from your console shell, it is **not** allocated a console. The shell will
-**not** wait for it to exit before returning you to a prompt.
-
-There is a large class of applications that do not fit neatly into this mold. Take Python, Ruby, Perl, Lua, or even
-VBScript: These languages are not relegated to running in a console session; they can be used to write fully-fledged GUI
-applications like any other language.
-
-Because their interpreters are console subsystem applications, however, any user double-clicking a shortcut to a Python
-or Perl application will be presented with a console window that the language runtime may choose to garbage collect, or
-may choose not to.
-
-If the runtime chooses to hide the window, there will still be a brief period during which that window is visible. It is
-inescapable.
-
-Likewise, any user running that GUI application from a console shell will see their shell hang until the application
-terminates.
-
-All of these scripting languages worked around this by shipping two binaries each, identical in every way expect in
-their subsystem fields. python/pythonw, perl/perlw, ruby/rubyw, wscript/cscript.
-
-PowerShell[^1] is waiting to deal with this problem because they don't necessarily want to ship a `pwshw.exe` for all
-of their GUI-only authors. Every additional `*w` version of an application is an additional maintenance burden and
-source of cognitive overhead[^2] for users.
-
-On the other side, you have mostly-GUI applications that want to print output to a console **if there is one
-connected**.
-
-These applications are still primarily GUI-driven, but they might support arguments like `/?` or `--help`. They only
-need a console when they need to print out some text. Sometimes they'll allocate their own console (which opens a new
-window) to display in, and sometimes they'll reattach to the originating console. VSCode does the latter, and so when
-you run `code` from CMD, and then `exit` CMD, your console window sticks around because VSCode is still attached to it.
-It will never print anything, and your only option is to close it.
-
-There's another risk in reattaching, too. Given that the shell decides whether to wait based on the subsystem
-field, GUI subsystem applications that reattach to their owning consoles *just to print some text* end up stomping on
-the output of any shell that doesn't wait for them:
-
-```
-C:\> application --help
-
-application - the interesting application
-C:\> Usage: application [OPTIONS] ...
-```
-
-> _(the prompt is interleaved with the output)_
-
-## Solution Design
-
-I propose that we introduce a fusion manifest field, **consoleAllocationPolicy**, with the following values:
-
-* _absent_
-* `detached`
-
-This field allows an application to disable the automatic allocation of a console, regardless of the [process creation flags]
-passed to [`CreateProcess`] and its subsystem value.
-
-It would look (roughly) like this:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <application>
-    <windowsSettings>
-      <consoleAllocationPolicy xmlns="http://schemas.microsoft.com/SMI/2024/WindowsSettings">detached</consoleAllocationPolicy>
-    </windowsSettings>
-  </application>
-</assembly>
-```
-
-The effects of this field will only apply to binaries in the `IMAGE_SUBSYSTEM_WINDOWS_CUI` subsystem, as it pertains to
-the particulars of their console allocation.
-
-**All console inheritance will proceed as normal.** Since this field takes effect only in the absence of console
-inheritance, CUI applications will still be able to run inside an existing console session.
-
-| policy     | behavior                                                                                                            |
-| -          | -                                                                                                                   |
-| _absent_   | _default behavior_                                                                                                  |
-| `detached` | The new process is not attached to a console session (similar to `DETACHED_PROCESS`) unless one was inherited.      |
-
-An application that specifies the `detached` allocation policy will _not_ present a console window when launched by
-Explorer, Task Scheduler, etc.
-
-### Interaction with existing APIs
-
-[`CreateProcess`] supports a number of [process creation flags] that dictate how a spawned application will behave with
-regards to console allocation:
-
-* `DETACHED_PROCESS`: No console inheritance, no console host spawned for the new process.
-* `CREATE_NEW_CONSOLE`: No console inheritance, new console host **is** spawned for the new process.
-* `CREATE_NO_WINDOW`: No console inheritance, new console host **is** spawned for the new process.
-    * this is the same as `CREATE_NEW_CONSOLE`, except that the first connection packet specifies that the window should
-      be invisible
-
-Due to the design of [`CreateProcess`] and `ShellExecute`, this specification recommends that an allocation policy of
-`detached` _override_ the inclusion of `CREATE_NEW_CONSOLE` in the `dwFlags` parameter to [`CreateProcess`].
-
-> **Note**
-> `ShellExecute` passes `CREATE_NEW_CONSOLE` _by default_ on all invocations. This impacts our ability to resolve the
-> conflicts between these two APIs--`detached` policy and `CREATE_NEW_CONSOLE`--without auditing every call site in
-> every Windows application that calls `ShellExecute` on a console application. Doing so is infeasible.
-
-### Application impact
-
-An application that opts into the `detached` console allocation policy will **not** be allocated a console unless one is
-inherited. This presents an issue for applications like PowerShell that do want a console window when they are launched
-directly.
-
-Applications in this category can call `AllocConsole()` early in their startup to get fine-grained control over when a
-console is presented.
-
-The call to `AllocConsole()` will fail safely if the application has already inherited a console handle. It will succeed
-if the application does not currently have a console handle.
-
-> **Note**
-> **Backwards Compatibility**: The behavior of `AllocConsole()` is not changing in response to this specification;
-> therefore, applications that intend to run on older versions of Windows that do not support console allocation
-> policies, which call `AllocConsole()`, will continue to behave normally.
-
-### New APIs
-
-Because a console-subsystem application may still want fine-grained control over when and how its console window is
-spawned, we propose the inclusion of a new API, `AllocConsoleWithOptions(PALLOC_CONSOLE_OPTIONS)`.
-
-#### `AllocConsoleWithOptions`
-
-```c++
-// Console Allocation Modes
-typedef enum ALLOC_CONSOLE_MODE {
-    ALLOC_CONSOLE_MODE_DEFAULT    = 0,
-    ALLOC_CONSOLE_MODE_NEW_WINDOW = 1,
-    ALLOC_CONSOLE_MODE_NO_WINDOW  = 2
-} ALLOC_CONSOLE_MODE;
-
-typedef enum ALLOC_CONSOLE_RESULT {
-    ALLOC_CONSOLE_RESULT_NO_CONSOLE       = 0,
-    ALLOC_CONSOLE_RESULT_NEW_CONSOLE      = 1,
-    ALLOC_CONSOLE_RESULT_EXISTING_CONSOLE = 2
-} ALLOC_CONSOLE_RESULT, *PALLOC_CONSOLE_RESULT;
-
-typedef
-struct ALLOC_CONSOLE_OPTIONS
-{
-    ALLOC_CONSOLE_MODE mode;
-    BOOL useShowWindow;
-    WORD showWindow;
-} ALLOC_CONSOLE_OPTIONS, *PALLOC_CONSOLE_OPTIONS;
-
-WINBASEAPI
-HRESULT
-WINAPI
-AllocConsoleWithOptions(_In_opt_ PALLOC_CONSOLE_OPTIONS allocOptions, _Out_opt_ PALLOC_CONSOLE_RESULT result);
-```
-
-**AllocConsoleWithOptions** affords an application control over how and when it begins a console session.
-
-> [!NOTE]
-> Unlike `AllocConsole`, `AllocConsoleWithOptions` without a mode (`ALLOC_CONSOLE_MODE_DEFAULT`) will only allocate a console if one was
-> requested during `CreateProcess`.
->
-> To override this behavior, pass one of `ALLOC_CONSOLE_MODE_NEW_WINDOW` (which is equivalent to being spawned with
-> `CREATE_NEW_WINDOW`) or `ALLOC_CONSOLE_MODE_NO_WINDOW` (which is equivalent to being spawned with `CREATE_NO_CONSOLE`.)
-
-##### Parameters
-
-**allocOptions**: A pointer to a `ALLOC_CONSOLE_OPTIONS`.
-
-**result**: An optional out pointer, which will be populated with a member of the `ALLOC_CONSOLE_RESULT` enum.
-
-##### `ALLOC_CONSOLE_OPTIONS`
-
-###### Members
-
-**mode**: See the table below for the descriptions of the available modes.
-
-**useShowWindow**: Specifies whether the value in `showWindow` should be used.
-
-**showWindow**: If `useShowWindow` is set, specifies the ["show command"] used to display your
-console window.
-
-###### Return Value
-
-`AllocConsoleWithOptions` will return `S_OK` and populate `result` to indicate whether--and how--a console session was
-created.
-
-`AllocConsoleWithOptions` will return a failing `HRESULT` if the request could not be completed.
-
-###### Modes
-
-|             Mode                | Description                                                                                                                    |
-|:-------------------------------:| ------------------------------------------------------------------------------------------------------------------------------ |
-| `ALLOC_CONSOLE_MODE_DEFAULT`    | Allocate a console session if (and how) one was requested by the parent process.                                               |
-| `ALLOC_CONSOLE_MODE_NEW_WINDOW` | Allocate a console session with a window, even if this process was created with `CREATE_NO_CONSOLE` or `DETACHED_PROCESS`.     |
-| `ALLOC_CONSOLE_MODE_NO_WINDOW`  | Allocate a console session _without_ a window, even if this process was created with `CREATE_NEW_WINDOW` or `DETACHED_PROCESS` |
-
-###### Notes
-
-Applications seeking backwards compatibility are encouraged to delay-load `AllocConsoleWithOptions` or check for its presence in
-the `api-ms-win-core-console-l1` APISet.
-
-## Inspiration
-
-Fusion manifest entries are used to make application-scoped decisions like this all the time, like `longPathAware` and
-`heapType`.
-
-CUI applications that can spawn a UI (or GUI applications that can print to a console) are commonplace on other
-platforms because there is no subsystem differentiation.
-
-## UI/UX Design
-
-There is no UI for this feature.
-
-## Capabilities
-
-### Accessibility
-
-This should have no impact on accessibility.
-
-### Security
-
-One reviewer brought up the potential for a malicious actor to spawn an endless stream of headless daemon processes.
-
-This proposal in no way changes the facilities available to malicious people for causing harm: they could have simply
-used `IMAGE_SUBSYSTEM_WINDOWS_GUI` and not presented a UI--an option that has been available to them for 35 years.
-
-### Reliability
-
-This should have no impact on reliability.
-
-### Compatibility
-
-An existing application opting into **detached** may constitute a breaking change, but the scope of the breakage is
-restricted to that application and is expected to be managed by the application.
-
-All behavioral changes are opt-in.
-
-> **EXAMPLE**: If Python updates python.exe to specify an allocation policy of **detached**, graphical python applications
-> will become double-click runnable from the graphical shell without spawning a console window. _However_, console-based
-> python applications will no longer spawn a console window when double-clicked from the graphical shell.
->
-> In addition, if python.exe specifies **detached**, Console APIs will fail until a console is allocated.
-
-Python could work around this by calling [`AllocConsole`] or [new API `AllocConsoleWithOptions`](#allocconsolewithoptions)
-if it can be detected that console I/O is required.
-
-#### Downlevel
-
-On downlevel versions of Windows that do not understand (or expect) this manifest field, applications will allocate
-consoles as specified by their image subsystem (described in the [abstract](#abstract) above).
-
-### Performance, Power, and Efficiency
-
-This should have no impact on performance, power or efficiency.
-
-## Potential Issues
-
-### Shell Hang
-
-I am **not** proposing a change in how shells determine whether to wait for an application before returning to a prompt.
-This means that a console subsystem application that intends to primarily present a UI but occasionally print text to a
-console (therefore choosing the **detached** allocation policy) will cause the shell to "hang" and wait for it to
-exit.
-
-The decision to pause/wait is made entirely in the calling shell, and the console subsystem cannot influence that
-decision.
-
-Because the vast majority of shells on Windows "hang" by calling `WaitFor...Object` with a HANDLE to the spawned
-process, an application that wants to be a "hybrid" CUI/GUI application will be forced to spawn a separate process to
-detach from the shell and then terminate its main process.
-
-This is very similar to the forking model seen in many POSIX-compliant operating systems.
-
-### Launching interactively from Explorer, Task Scheduler, etc.
-
-Applications like PowerShell may wish to retain automatic console allocation, and **detached** would be unsuitable for
-them. If PowerShell specifies the `detached` console allocation policy, launching `pwsh.exe` from File Explorer it will
-no longer spawn a console. This would almost certainly break PowerShell for all users.
-
-Such applications can use `AllocConsole()` early in their startup.
-
-At the same time, PowerShell wants `-WindowStyle Hidden` to suppress the console _before it's created_.
-
-Applications in this category can use `AllocConsoleWithOptions()` to specify additional information about the new console window.
-
-PowerShell, and any other shell that wishes to maintain interactive launch from the graphical shell, can start in
-**detached** mode and then allocate a console as necessary. Therefore:
-
-* PowerShell will set `<consoleAllocationPolicy>detached</consoleAllocationPolicy>`
-* On startup, it will process its commandline arguments.
-* If `-WindowStyle Hidden` is **not** present (the default case), it can:
-   * `AllocConsole()` or `AllocConsoleWithOptions(NULL)`
-   * Either of these APIs will present a console window (or not) based on the flags passed through `STARTUPINFO` during
-     [`CreateProcess`].
-* If `-WindowStyle Hidden` is present, it can:
-   * `AllocConsoleWithOptions(&alloc)` where `alloc.mode` specifies `ALLOC_CONSOLE_MODE_HIDDEN`
-
-## Future considerations
-
-We're introducing a new manifest field today -- what if we want to introduce more? Should we have a `consoleSettings`
-manifest block?
-
-Are there other allocation policies we need to consider?
-
-## Resources
-
-### Rejected Solutions
-
-- A new PE subsystem, `IMAGE_SUBSYSTEM_WINDOWS_HYBRID`
-    - it would behave like **inheritOnly**
-    - relies on shells to update and check for this
-    - checking a subsystem doesn't work right with app execution aliases[^3]
-        - This is not a new problem, but it digs the hole a little deeper.
-    - requires standardization outside of Microsoft because the PE format is a dependency of the UEFI specification[^4]
-    - requires coordination between tooling teams both within and without Microsoft (regarding any tool that operates on
-      or produces PE files)
-
-- An exported symbol that shells can check for to determine whether to wait for the attached process to exit
-    - relies on shells to update and check for this
-    - cracking an executable to look for symbols is probably the last thing shells want to do
-        - we could provide an API to determine whether to wait or return?
-    - fragile, somewhat silly, exporting symbols from EXEs is annoying and uncommon
-
-An earlier version of this specification offered the **always** allocation policy, with the following behaviors:
-
-> **STRUCK FROM SPECIFICATION**
->
-> * A GUI subsystem application would always get a console window.
-> * A command-line shell would not wait for it to exit before returning a prompt.
-
-It was cut because a GUI application that wants a console window can simply attach to an existing console session or
-allocate a new one. We found no compelling use case that would require the forced allocation of a console session
-outside of the application's code.
-
-An earlier version of this specification offered the **inheritOnly** allocation policy, instead of the finer-grained
-**hidden** and **detached** policies. We deemed it insufficient for PowerShell's use case because any application
-launched by an **inheritOnly** PowerShell would immediately force the uncontrolled allocation of a console window.
-
-> **STRUCK FROM SPECIFICATION**
->
-> The move to **hidden** allows PowerShell to offer a fully-fledged console connection that can be itself inherited by a
-> downstream application.
-
-#### Additional allocation policies
-
-An earlier revision of this specification suggested two allocation policies:
-
-> **STRUCK FROM SPECIFICATION**
->
-> **hidden** is intended to be used by console applications that want finer-grained control over the visibility of their
-> console windows, but that still need a console host to service console APIs. This includes most scripting language
-> interpreters.
->
-> **detached** is intended to be used by primarily graphical applications that would like to operate against a console _if
-> one is present_ but do not mind its absence. This includes any graphical tool with a `--help` or `/?` argument.
-
-The `hidden` policy was rejected due to an incompatibility with modern console hosting, as `hidden` would require an
-application to interact with the console window via `GetConsoleWindow()` and explicitly show it.
-
-> **STRUCK FROM SPECIFICATION**
->
-> ##### ShowWindow and ConPTY
->
-> The pseudoconsole creates a hidden window to service `GetConsoleWindow()`, and it can be trivially shown using
-> `ShowWindow`. If we recommend that applications `ShowWindow` on startup, we will need to guard the pseudoconsole's
-> pseudo-window from being shown.
-
-[^1]: [Powershell -WindowStyle Hidden still shows a window briefly]
-[^2]: [StackOverflow: pythonw.exe or python.exe?]
-[^3]: [PowerShell: Windows Store applications incorrectly assumed to be console applications]
-[^4]: [UEFI spec 2.6 appendix Q.1]
-
-[Powershell -WindowStyle Hidden still shows a window briefly]: https://github.com/PowerShell/PowerShell/issues/3028
-[PowerShell: Windows Store applications incorrectly assumed to be console applications]: https://github.com/PowerShell/PowerShell/issues/9970
-[StackOverflow: pythonw.exe or python.exe?]: https://stackoverflow.com/questions/9705982/pythonw-exe-or-python-exe
-[UEFI spec 2.6 appendix Q.1]: https://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf
-[`AllocConsole`]: https://docs.microsoft.com/windows/console/allocconsole
-[`CreateProcess`]: https://docs.microsoft.com/windows/win32/api/processthreadsapi/nf-processthreadsapi-createprocessw
-[process creation flags]: https://docs.microsoft.com/en-us/windows/win32/procthread/process-creation-flags
-["show command"]: https://learn.microsoft.com/windows/win32/api/winuser/nf-winuser-showwindow

samples/PixelShaders/BackgroundImage.hlsl

@@ -1,23 +0,0 @@
-// Demo shader to show passing in an image using
-// experimental.pixelShaderImagePath. This shader simply displays the Terminal
-// contents on top of the given image.
-//
-// The image loaded by the terminal will be placed into the `image` texture.
-
-SamplerState samplerState;
-Texture2D shaderTexture : register(t0);
-Texture2D image : register(t1);
-
-cbuffer PixelShaderSettings {
-    float Time;
-    float Scale;
-    float2 Resolution;
-    float4 Background;
-};
-
-float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
-{
-    float4 terminalColor = shaderTexture.Sample(samplerState, tex);
-    float4 imageColor = image.Sample(samplerState, tex);
-    return lerp(imageColor, terminalColor, terminalColor.a);
-}

scratch/ScratchIslandApp/SampleApp/MyPage.cpp

@@ -31,12 +31,9 @@ namespace winrt::SampleApp::implementation
         auto connectionSettings{ TerminalConnection::ConptyConnection::CreateSettings(L"cmd.exe /k echo This TermControl is hosted in-proc...",
                                                                                       winrt::hstring{},
                                                                                       L"",
-                                                                                      false,
-                                                                                      L"",
                                                                                       nullptr,
                                                                                       32,
                                                                                       80,
-                                                                                      winrt::guid(),
                                                                                       winrt::guid()) };
 
         // "Microsoft.Terminal.TerminalConnection.ConptyConnection"

src/cascadia/ITerminalConnection/ITerminalConnection.vcxproj

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EFC0B7EF-BB0D-44EC-BFC9-772AE4391D17}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>Microsoft.Terminal.Connection.Interfaces</ProjectName>
-    <TargetName>Microsoft.Terminal.Connection.Interfaces</TargetName>
-    <ConfigurationType>Utility</ConfigurationType>
-    <RootNamespace>Microsoft.Terminal.TerminalConnection</RootNamespace>
-
-    <TerminalMidlRT>true</TerminalMidlRT>
-
-    <!-- Force our output directory -->
-    <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
-  <Import Project="$(OpenConsoleDir)src\common.build.pre.props" />
-
-  <ItemGroup>
-    <Midl Include="ITerminalConnection.idl" />
-  </ItemGroup>
-
-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
-</Project>

src/cascadia/ITerminalCore/ITerminalCore.vcxproj

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{40503EDC-E3E4-46AB-BC26-D293B956CAE8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>Microsoft.Terminal.Core.Interfaces</ProjectName>
-    <TargetName>Microsoft.Terminal.Core.Interfaces</TargetName>
-    <ConfigurationType>Utility</ConfigurationType>
-    <RootNamespace>Microsoft.Terminal.Core</RootNamespace>
-
-    <TerminalMidlRT>true</TerminalMidlRT>
-
-    <!-- Force our output directory -->
-    <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
-  <Import Project="$(OpenConsoleDir)src\common.build.pre.props" />
-
-  <ItemGroup>
-    <Midl Include="ICoreSettings.idl" />
-    <Midl Include="ICoreAppearance.idl" />
-  </ItemGroup>
-
-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
-  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
-</Project>

src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp

@@ -0,0 +1,404 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include "../TerminalSettingsModel/ColorScheme.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../types/inc/colorTable.hpp"
+#include "JsonTestClass.h"
+
+using namespace Microsoft::Console;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+using namespace WEX::Common;
+
+namespace SettingsModelLocalTests
+{
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
+    class ColorSchemeTests : public JsonTestClass
+    {
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(ColorSchemeTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
+
+        TEST_METHOD(ParseSimpleColorScheme);
+        TEST_METHOD(LayerColorSchemesOnArray);
+        TEST_METHOD(UpdateSchemeReferences);
+
+        static Core::Color rgb(uint8_t r, uint8_t g, uint8_t b) noexcept
+        {
+            return Core::Color{ r, g, b, 255 };
+        }
+    };
+
+    void ColorSchemeTests::ParseSimpleColorScheme()
+    {
+        const std::string campbellScheme{ "{"
+                                          "\"background\" : \"#0C0C0C\","
+                                          "\"black\" : \"#0C0C0C\","
+                                          "\"blue\" : \"#0037DA\","
+                                          "\"brightBlack\" : \"#767676\","
+                                          "\"brightBlue\" : \"#3B78FF\","
+                                          "\"brightCyan\" : \"#61D6D6\","
+                                          "\"brightGreen\" : \"#16C60C\","
+                                          "\"brightPurple\" : \"#B4009E\","
+                                          "\"brightRed\" : \"#E74856\","
+                                          "\"brightWhite\" : \"#F2F2F2\","
+                                          "\"brightYellow\" : \"#F9F1A5\","
+                                          "\"cursorColor\" : \"#FFFFFF\","
+                                          "\"cyan\" : \"#3A96DD\","
+                                          "\"foreground\" : \"#F2F2F2\","
+                                          "\"green\" : \"#13A10E\","
+                                          "\"name\" : \"Campbell\","
+                                          "\"purple\" : \"#881798\","
+                                          "\"red\" : \"#C50F1F\","
+                                          "\"selectionBackground\" : \"#131313\","
+                                          "\"white\" : \"#CCCCCC\","
+                                          "\"yellow\" : \"#C19C00\""
+                                          "}" };
+
+        const auto schemeObject = VerifyParseSucceeded(campbellScheme);
+        auto scheme = ColorScheme::FromJson(schemeObject);
+        VERIFY_ARE_EQUAL(L"Campbell", scheme->Name());
+        VERIFY_ARE_EQUAL(til::color(0xf2, 0xf2, 0xf2, 255), til::color{ scheme->Foreground() });
+        VERIFY_ARE_EQUAL(til::color(0x0c, 0x0c, 0x0c, 255), til::color{ scheme->Background() });
+        VERIFY_ARE_EQUAL(til::color(0x13, 0x13, 0x13, 255), til::color{ scheme->SelectionBackground() });
+        VERIFY_ARE_EQUAL(til::color(0xFF, 0xFF, 0xFF, 255), til::color{ scheme->CursorColor() });
+
+        std::array<COLORREF, COLOR_TABLE_SIZE> expectedCampbellTable;
+        const auto campbellSpan = std::span{ expectedCampbellTable };
+        Utils::InitializeColorTable(campbellSpan);
+
+        for (size_t i = 0; i < expectedCampbellTable.size(); i++)
+        {
+            const til::color expected{ expectedCampbellTable.at(i) };
+            const til::color actual{ scheme->Table().at(static_cast<uint32_t>(i)) };
+            VERIFY_ARE_EQUAL(expected, actual);
+        }
+
+        Log::Comment(L"Roundtrip Test for Color Scheme");
+        auto outJson{ scheme->ToJson() };
+        VERIFY_ARE_EQUAL(schemeObject, outJson);
+    }
+
+    void ColorSchemeTests::LayerColorSchemesOnArray()
+    {
+        static constexpr std::string_view inboxSettings{ R"({
+            "schemes": [
+                {
+                    "background": "#0C0C0C",
+                    "black": "#0C0C0C",
+                    "blue": "#0037DA",
+                    "brightBlack": "#767676",
+                    "brightBlue": "#3B78FF",
+                    "brightCyan": "#61D6D6",
+                    "brightGreen": "#16C60C",
+                    "brightPurple": "#B4009E",
+                    "brightRed": "#E74856",
+                    "brightWhite": "#F2F2F2",
+                    "brightYellow": "#F9F1A5",
+                    "cursorColor": "#FFFFFF",
+                    "cyan": "#3A96DD",
+                    "foreground": "#CCCCCC",
+                    "green": "#13A10E",
+                    "name": "Campbell",
+                    "purple": "#881798",
+                    "red": "#C50F1F",
+                    "selectionBackground": "#FFFFFF",
+                    "white": "#CCCCCC",
+                    "yellow": "#C19C00"
+                }
+            ]
+        })" };
+        static constexpr std::string_view userSettings{ R"({
+            "profiles": [
+                {
+                    "name" : "profile0"
+                }
+            ],
+            "schemes": [
+                {
+                    "background": "#121314",
+                    "black": "#121314",
+                    "blue": "#121314",
+                    "brightBlack": "#121314",
+                    "brightBlue": "#121314",
+                    "brightCyan": "#121314",
+                    "brightGreen": "#121314",
+                    "brightPurple": "#121314",
+                    "brightRed": "#121314",
+                    "brightWhite": "#121314",
+                    "brightYellow": "#121314",
+                    "cursorColor": "#121314",
+                    "cyan": "#121314",
+                    "foreground": "#121314",
+                    "green": "#121314",
+                    "name": "Campbell",
+                    "purple": "#121314",
+                    "red": "#121314",
+                    "selectionBackground": "#121314",
+                    "white": "#121314",
+                    "yellow": "#121314"
+                },
+                {
+                    "background": "#012456",
+                    "black": "#0C0C0C",
+                    "blue": "#0037DA",
+                    "brightBlack": "#767676",
+                    "brightBlue": "#3B78FF",
+                    "brightCyan": "#61D6D6",
+                    "brightGreen": "#16C60C",
+                    "brightPurple": "#B4009E",
+                    "brightRed": "#E74856",
+                    "brightWhite": "#F2F2F2",
+                    "brightYellow": "#F9F1A5",
+                    "cursorColor": "#FFFFFF",
+                    "cyan": "#3A96DD",
+                    "foreground": "#CCCCCC",
+                    "green": "#13A10E",
+                    "name": "Campbell Powershell",
+                    "purple": "#881798",
+                    "red": "#C50F1F",
+                    "selectionBackground": "#FFFFFF",
+                    "white": "#CCCCCC",
+                    "yellow": "#C19C00"
+                }
+            ]
+        })" };
+
+        const auto settings = winrt::make_self<CascadiaSettings>(userSettings, inboxSettings);
+
+        const auto colorSchemes = settings->GlobalSettings().ColorSchemes();
+        VERIFY_ARE_EQUAL(2u, colorSchemes.Size());
+
+        const auto scheme0 = winrt::get_self<ColorScheme>(colorSchemes.Lookup(L"Campbell"));
+        VERIFY_ARE_EQUAL(rgb(0x12, 0x13, 0x14), scheme0->Foreground());
+        VERIFY_ARE_EQUAL(rgb(0x12, 0x13, 0x14), scheme0->Background());
+
+        const auto scheme1 = winrt::get_self<ColorScheme>(colorSchemes.Lookup(L"Campbell Powershell"));
+        VERIFY_ARE_EQUAL(rgb(0xCC, 0xCC, 0xCC), scheme1->Foreground());
+        VERIFY_ARE_EQUAL(rgb(0x01, 0x24, 0x56), scheme1->Background());
+    }
+
+    void ColorSchemeTests::UpdateSchemeReferences()
+    {
+        static constexpr std::string_view settingsString{ R"json({
+            "defaultProfile": "Inherited reference",
+            "profiles": {
+                "defaults": {
+                    "colorScheme": "Campbell"
+                },
+                "list": [
+                    {
+                        "name": "Explicit scheme reference",
+                        "colorScheme": "Campbell"
+                    },
+                    {
+                        "name": "Explicit reference; hidden",
+                        "colorScheme": "Campbell",
+                        "hidden": true
+                    },
+                    {
+                        "name": "Inherited reference"
+                    },
+                    {
+                        "name": "Different reference",
+                        "colorScheme": "One Half Dark"
+                    },
+                    {
+                        "name": "rename neither",
+                        "colorScheme":
+                        {
+                            "dark": "One Half Dark",
+                            "light": "One Half Light"
+                        }
+                    },
+                    {
+                        "name": "rename only light",
+                        "colorScheme":
+                        {
+                            "dark": "One Half Dark",
+                            "light": "Campbell"
+                        }
+                    },
+                    {
+                        "name": "rename only dark",
+                        "colorScheme":
+                        {
+                            "dark": "Campbell",
+                            "light": "One Half Light"
+                        }
+                    }
+                ]
+            },
+            "schemes": [
+                {
+                    "background": "#0C0C0C",
+                    "black": "#0C0C0C",
+                    "blue": "#0037DA",
+                    "brightBlack": "#767676",
+                    "brightBlue": "#3B78FF",
+                    "brightCyan": "#61D6D6",
+                    "brightGreen": "#16C60C",
+                    "brightPurple": "#B4009E",
+                    "brightRed": "#E74856",
+                    "brightWhite": "#F2F2F2",
+                    "brightYellow": "#F9F1A5",
+                    "cursorColor": "#FFFFFF",
+                    "cyan": "#3A96DD",
+                    "foreground": "#CCCCCC",
+                    "green": "#13A10E",
+                    "name": "Campbell",
+                    "purple": "#881798",
+                    "red": "#C50F1F",
+                    "selectionBackground": "#FFFFFF",
+                    "white": "#CCCCCC",
+                    "yellow": "#C19C00"
+                },
+                {
+                    "background": "#0C0C0C",
+                    "black": "#0C0C0C",
+                    "blue": "#0037DA",
+                    "brightBlack": "#767676",
+                    "brightBlue": "#3B78FF",
+                    "brightCyan": "#61D6D6",
+                    "brightGreen": "#16C60C",
+                    "brightPurple": "#B4009E",
+                    "brightRed": "#E74856",
+                    "brightWhite": "#F2F2F2",
+                    "brightYellow": "#F9F1A5",
+                    "cursorColor": "#FFFFFF",
+                    "cyan": "#3A96DD",
+                    "foreground": "#CCCCCC",
+                    "green": "#13A10E",
+                    "name": "Campbell (renamed)",
+                    "purple": "#881798",
+                    "red": "#C50F1F",
+                    "selectionBackground": "#FFFFFF",
+                    "white": "#CCCCCC",
+                    "yellow": "#C19C00"
+                },
+                {
+                    "background": "#282C34",
+                    "black": "#282C34",
+                    "blue": "#61AFEF",
+                    "brightBlack": "#5A6374",
+                    "brightBlue": "#61AFEF",
+                    "brightCyan": "#56B6C2",
+                    "brightGreen": "#98C379",
+                    "brightPurple": "#C678DD",
+                    "brightRed": "#E06C75",
+                    "brightWhite": "#DCDFE4",
+                    "brightYellow": "#E5C07B",
+                    "cursorColor": "#FFFFFF",
+                    "cyan": "#56B6C2",
+                    "foreground": "#DCDFE4",
+                    "green": "#98C379",
+                    "name": "One Half Dark",
+                    "purple": "#C678DD",
+                    "red": "#E06C75",
+                    "selectionBackground": "#FFFFFF",
+                    "white": "#DCDFE4",
+                    "yellow": "#E5C07B"
+                },
+                {
+                    "name": "One Half Light",
+                    "foreground": "#383A42",
+                    "background": "#FAFAFA",
+                    "cursorColor": "#4F525D",
+                    "black": "#383A42",
+                    "red": "#E45649",
+                    "green": "#50A14F",
+                    "yellow": "#C18301",
+                    "blue": "#0184BC",
+                    "purple": "#A626A4",
+                    "cyan": "#0997B3",
+                    "white": "#FAFAFA",
+                    "brightBlack": "#4F525D",
+                    "brightRed": "#DF6C75",
+                    "brightGreen": "#98C379",
+                    "brightYellow": "#E4C07A",
+                    "brightBlue": "#61AFEF",
+                    "brightPurple": "#C577DD",
+                    "brightCyan": "#56B5C1",
+                    "brightWhite": "#FFFFFF"
+                }
+            ]
+        })json" };
+
+        const auto settings{ winrt::make_self<CascadiaSettings>(settingsString) };
+
+        const auto newName{ L"Campbell (renamed)" };
+
+        settings->UpdateColorSchemeReferences(L"Campbell", newName);
+
+        VERIFY_ARE_EQUAL(newName, settings->ProfileDefaults().DefaultAppearance().DarkColorSchemeName());
+        VERIFY_ARE_EQUAL(newName, settings->ProfileDefaults().DefaultAppearance().LightColorSchemeName());
+        VERIFY_IS_TRUE(settings->ProfileDefaults().DefaultAppearance().HasDarkColorSchemeName());
+        VERIFY_IS_TRUE(settings->ProfileDefaults().DefaultAppearance().HasLightColorSchemeName());
+
+        const auto& profiles{ settings->AllProfiles() };
+        {
+            const auto& prof{ profiles.GetAt(0) };
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(1) };
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(2) };
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_IS_FALSE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_FALSE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(3) };
+            VERIFY_ARE_EQUAL(L"One Half Dark", prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_ARE_EQUAL(L"One Half Dark", prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(4) };
+            VERIFY_ARE_EQUAL(L"One Half Dark", prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_ARE_EQUAL(L"One Half Light", prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(5) };
+            VERIFY_ARE_EQUAL(L"One Half Dark", prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+        {
+            const auto& prof{ profiles.GetAt(6) };
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().DarkColorSchemeName());
+            VERIFY_ARE_EQUAL(L"One Half Light", prof.DefaultAppearance().LightColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasDarkColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasLightColorSchemeName());
+        }
+    }
+}

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -15,11 +15,24 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class CommandTests : public JsonTestClass
     {
-        TEST_CLASS(CommandTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(CommandTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(ManyCommandsSameAction);
         TEST_METHOD(LayerCommand);

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -19,11 +19,24 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Control;
 using VirtualKeyModifiers = winrt::Windows::System::VirtualKeyModifiers;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class DeserializationTests : public JsonTestClass
     {
-        TEST_CLASS(DeserializationTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(DeserializationTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(ValidateProfilesExist);
         TEST_METHOD(ValidateDefaultProfileExists);
@@ -61,13 +74,6 @@ namespace SettingsModelUnitTests
         TEST_METHOD(TestInheritedCommand);
         TEST_METHOD(LoadFragmentsWithMultipleUpdates);
 
-        TEST_METHOD(FragmentActionSimple);
-        TEST_METHOD(FragmentActionNoKeys);
-        TEST_METHOD(FragmentActionNested);
-        TEST_METHOD(FragmentActionNestedNoName);
-        TEST_METHOD(FragmentActionIterable);
-        TEST_METHOD(FragmentActionRoundtrip);
-
         TEST_METHOD(MigrateReloadEnvVars);
 
     private:
@@ -2017,189 +2023,6 @@ namespace SettingsModelUnitTests
         VERIFY_ARE_EQUAL(L"NewName", loader.userSettings.profiles[0]->Name());
     }
 
-    void DeserializationTests::FragmentActionSimple()
-    {
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "command": { "action": "addMark" },
-                    "name": "Test Action"
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        const auto actionMap = winrt::get_self<implementation::ActionMap>(settings->GlobalSettings().ActionMap());
-        const auto actionsByName = actionMap->NameMap();
-        VERIFY_IS_NOT_NULL(actionsByName.TryLookup(L"Test Action"));
-    }
-
-    void DeserializationTests::FragmentActionNoKeys()
-    {
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "command": { "action": "addMark" },
-                    "keys": "ctrl+f",
-                    "name": "Test Action"
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        const auto actionMap = winrt::get_self<implementation::ActionMap>(settings->GlobalSettings().ActionMap());
-        const auto actionsByName = actionMap->NameMap();
-        VERIFY_IS_NOT_NULL(actionsByName.TryLookup(L"Test Action"));
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('F'), 0 }));
-    }
-
-    void DeserializationTests::FragmentActionNested()
-    {
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "name": "nested command",
-                    "commands": [
-                        {
-                            "name": "child1",
-                            "command": { "action": "newTab", "commandline": "ssh me@first.com" }
-                        },
-                        {
-                            "name": "child2",
-                            "command": { "action": "newTab", "commandline": "ssh me@second.com" }
-                        }
-                    ]
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        const auto actionMap = winrt::get_self<implementation::ActionMap>(settings->GlobalSettings().ActionMap());
-        const auto actionsByName = actionMap->NameMap();
-        const auto& nested{ actionsByName.TryLookup(L"nested command") };
-        VERIFY_IS_NOT_NULL(nested);
-        VERIFY_IS_TRUE(nested.HasNestedCommands());
-    }
-
-    void DeserializationTests::FragmentActionNestedNoName()
-    {
-        // Basically the same as TestNestedCommandWithoutName
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "commands": [
-                        {
-                            "name": "child1",
-                            "command": { "action": "newTab", "commandline": "ssh me@first.com" }
-                        },
-                        {
-                            "name": "child2",
-                            "command": { "action": "newTab", "commandline": "ssh me@second.com" }
-                        }
-                    ]
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-        VERIFY_ARE_EQUAL(0u, settings->Warnings().Size());
-    }
-    void DeserializationTests::FragmentActionIterable()
-    {
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "name": "nested",
-                    "commands": [
-                        {
-                            "iterateOn": "schemes",
-                            "name": "${scheme.name}",
-                            "command": { "action": "setColorScheme", "colorScheme": "${scheme.name}" }
-                        }
-                    ]
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        const auto actionMap = winrt::get_self<implementation::ActionMap>(settings->GlobalSettings().ActionMap());
-        const auto actionsByName = actionMap->NameMap();
-        const auto& nested{ actionsByName.TryLookup(L"nested") };
-        VERIFY_IS_NOT_NULL(nested);
-        VERIFY_IS_TRUE(nested.HasNestedCommands());
-        VERIFY_ARE_EQUAL(settings->GlobalSettings().ColorSchemes().Size(), nested.NestedCommands().Size());
-    }
-    void DeserializationTests::FragmentActionRoundtrip()
-    {
-        static constexpr std::wstring_view fragmentSource{ L"fragment" };
-        static constexpr std::string_view fragmentJson{ R"({
-            "actions": [
-                {
-                    "command": { "action": "addMark" },
-                    "name": "Test Action"
-                },
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
-        loader.FinalizeLayering();
-
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        const auto actionMap = winrt::get_self<implementation::ActionMap>(oldSettings->GlobalSettings().ActionMap());
-        const auto actionsByName = actionMap->NameMap();
-        VERIFY_IS_NOT_NULL(actionsByName.TryLookup(L"Test Action"));
-
-        const auto oldResult{ oldSettings->ToJson() };
-
-        Log::Comment(L"Now, create a _new_ settings object from the re-serialization of the first");
-        implementation::SettingsLoader newLoader{ toString(oldResult), DefaultJson };
-        // NOTABLY! Don't load the fragment here.
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-
-        const auto& newActionMap = winrt::get_self<implementation::ActionMap>(newSettings->GlobalSettings().ActionMap());
-        const auto newActionsByName = newActionMap->NameMap();
-        VERIFY_IS_NULL(newActionsByName.TryLookup(L"Test Action"));
-    }
-
     void DeserializationTests::MigrateReloadEnvVars()
     {
         static constexpr std::string_view settings1Json{ R"(

src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp

@@ -17,11 +17,24 @@ using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using VirtualKeyModifiers = winrt::Windows::System::VirtualKeyModifiers;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class KeyBindingsTests : public JsonTestClass
     {
-        TEST_CLASS(KeyBindingsTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(KeyBindingsTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(KeyChords);
         TEST_METHOD(ManyKeysSameAction);

src/cascadia/LocalTests_SettingsModel/NewTabMenuTests.cpp

@@ -18,11 +18,24 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class NewTabMenuTests : public JsonTestClass
     {
-        TEST_CLASS(NewTabMenuTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(NewTabMenuTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(DefaultsToRemainingProfiles);
         TEST_METHOD(ParseEmptyFolder);

src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp

@@ -15,11 +15,24 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class ProfileTests : public JsonTestClass
     {
-        TEST_CLASS(ProfileTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(ProfileTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(ProfileGeneratesGuid);
         TEST_METHOD(LayerProfileProperties);

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -16,11 +16,24 @@ using namespace WEX::Common;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Control;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class SerializationTests : public JsonTestClass
     {
-        TEST_CLASS(SerializationTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(SerializationTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(GlobalSettings);
         TEST_METHOD(Profile);
@@ -32,10 +45,6 @@ namespace SettingsModelUnitTests
         TEST_METHOD(RoundtripReloadEnvVars);
         TEST_METHOD(DontRoundtripNoReloadEnvVars);
 
-        TEST_METHOD(RoundtripUserModifiedColorSchemeCollision);
-        TEST_METHOD(RoundtripUserModifiedColorSchemeCollisionUnusedByProfiles);
-        TEST_METHOD(RoundtripUserDeletedColorSchemeCollision);
-
     private:
         // Method Description:
         // - deserializes and reserializes a json string representing a settings object model of type T
@@ -59,19 +68,6 @@ namespace SettingsModelUnitTests
             // written alphabetically.
             VERIFY_ARE_EQUAL(toString(json), toString(result));
         }
-
-        // Helper to remove the `$schema` property from a json object. We
-        // populate that based off the local path to the settings file. Of
-        // course, that's entirely unpredictable in tests. So cut it out before
-        // we do any sort of roundtrip testing.
-        static Json::Value removeSchema(Json::Value json)
-        {
-            if (json.isMember("$schema"))
-            {
-                json.removeMember("$schema");
-            }
-            return json;
-        }
     };
 
     void SerializationTests::GlobalSettings()
@@ -199,34 +195,9 @@ namespace SettingsModelUnitTests
                 "source": "local"
             })" };
 
-        static constexpr std::string_view profileWithIcon{ R"(
-            {
-                "guid" : "{8b039d4d-77ca-5a83-88e1-dfc8e895a127}",
-                "name": "profileWithIcon",
-                "hidden": false,
-                "icon": "foo.png"
-            })" };
-        static constexpr std::string_view profileWithNullIcon{ R"(
-            {
-                "guid" : "{8b039d4d-77ca-5a83-88e1-dfc8e895a127}",
-                "name": "profileWithNullIcon",
-                "hidden": false,
-                "icon": null
-            })" };
-        static constexpr std::string_view profileWithNoIcon{ R"(
-            {
-                "guid" : "{8b039d4d-77ca-5a83-88e1-dfc8e895a127}",
-                "name": "profileWithNoIcon",
-                "hidden": false,
-                "icon": "none"
-            })" };
-
         RoundtripTest<implementation::Profile>(profileString);
         RoundtripTest<implementation::Profile>(smallProfileString);
         RoundtripTest<implementation::Profile>(weirdProfileString);
-        RoundtripTest<implementation::Profile>(profileWithIcon);
-        RoundtripTest<implementation::Profile>(profileWithNullIcon);
-        RoundtripTest<implementation::Profile>(profileWithNoIcon);
     }
 
     void SerializationTests::ColorScheme()
@@ -291,6 +262,15 @@ namespace SettingsModelUnitTests
                                                 { "command": { "action": "adjustFontSize", "delta": 1.0 }, "keys": "ctrl+c" },
                                                 { "command": { "action": "adjustFontSize", "delta": 1.0 }, "keys": "ctrl+d" }
                                             ])" };
+        // GH#13323 - these can be fragile. In the past, the order these get
+        // re-serialized as has been not entirely stable. We don't really care
+        // about the order they get re-serialized in, but the tests aren't
+        // clever enough to compare the structure, only the literal string
+        // itself. Feel free to change as needed.
+        static constexpr std::string_view actionsString4B{ R"([
+                                                { "command": { "action": "findMatch", "direction": "prev" }, "keys": "ctrl+shift+r" },
+                                                { "command": { "action": "adjustFontSize", "delta": 1.0 }, "keys": "ctrl+d" }
+                                            ])" };
 
         // command with name and icon and multiple key chords
         static constexpr std::string_view actionsString5{ R"([
@@ -404,6 +384,7 @@ namespace SettingsModelUnitTests
 
         Log::Comment(L"complex commands with key chords");
         RoundtripTest<implementation::ActionMap>(actionsString4A);
+        RoundtripTest<implementation::ActionMap>(actionsString4B);
 
         Log::Comment(L"command with name and icon and multiple key chords");
         RoundtripTest<implementation::ActionMap>(actionsString5);
@@ -502,8 +483,7 @@ namespace SettingsModelUnitTests
         const auto settings{ winrt::make_self<implementation::CascadiaSettings>(settingsString) };
 
         const auto result{ settings->ToJson() };
-        VERIFY_ARE_EQUAL(toString(removeSchema(VerifyParseSucceeded(settingsString))),
-                         toString(removeSchema(result)));
+        VERIFY_ARE_EQUAL(toString(VerifyParseSucceeded(settingsString)), toString(result));
     }
 
     void SerializationTests::LegacyFontSettings()
@@ -646,306 +626,4 @@ namespace SettingsModelUnitTests
         VERIFY_IS_FALSE(newSettings->ProfileDefaults().HasReloadEnvironmentVariables(),
                         L"Ensure that the new settings object didn't find a reloadEnvironmentVariables");
     }
-
-    void SerializationTests::RoundtripUserModifiedColorSchemeCollision()
-    {
-        static constexpr std::string_view oldSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                },
-                {
-                    "name": "profile1",
-                    "colorScheme": "Tango Dark",
-                    "guid": "{d0a65a9d-8665-4128-97a4-a581aa747aa7}"
-                }
-            ],
-            "schemes": [
-                {
-                    "background": "#121314",
-                    "black": "#121314",
-                    "blue": "#121314",
-                    "brightBlack": "#121314",
-                    "brightBlue": "#121314",
-                    "brightCyan": "#121314",
-                    "brightGreen": "#121314",
-                    "brightPurple": "#121314",
-                    "brightRed": "#121314",
-                    "brightWhite": "#121314",
-                    "brightYellow": "#121314",
-                    "cursorColor": "#121314",
-                    "cyan": "#121314",
-                    "foreground": "#121314",
-                    "green": "#121314",
-                    "name": "Campbell",
-                    "purple": "#121314",
-                    "red": "#121314",
-                    "selectionBackground": "#121314",
-                    "white": "#121314",
-                    "yellow": "#121314"
-                },
-                {
-                    "background": "#000000",
-                    "black": "#000000",
-                    "blue": "#3465A4",
-                    "brightBlack": "#555753",
-                    "brightBlue": "#729FCF",
-                    "brightCyan": "#34E2E2",
-                    "brightGreen": "#8AE234",
-                    "brightPurple": "#AD7FA8",
-                    "brightRed": "#EF2929",
-                    "brightWhite": "#EEEEEC",
-                    "brightYellow": "#FCE94F",
-                    "cursorColor": "#FFFFFF",
-                    "cyan": "#06989A",
-                    "foreground": "#D3D7CF",
-                    "green": "#4E9A06",
-                    "name": "Tango Dark",
-                    "purple": "#75507B",
-                    "red": "#CC0000",
-                    "selectionBackground": "#FFFFFF",
-                    "white": "#D3D7CF",
-                    "yellow": "#C4A000"
-                },
-            ]
-        })" };
-
-        // Key differences: one fewer color scheme (Tango Dark has been deleted) and defaults.colorScheme is set.
-        static constexpr std::string_view newSettingsJson{ R"-(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles":
-            {
-                "defaults": {
-                    "colorScheme": "Campbell (modified)"
-                },
-                "list":
-                [
-                    {
-                        "name": "profile0",
-                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                    },
-                    {
-                        "name": "profile1",
-                        "colorScheme": "Tango Dark",
-                        "guid": "{d0a65a9d-8665-4128-97a4-a581aa747aa7}"
-                    }
-                ]
-            },
-            "actions": [ ],
-            "schemes": [
-                {
-                    "background": "#121314",
-                    "black": "#121314",
-                    "blue": "#121314",
-                    "brightBlack": "#121314",
-                    "brightBlue": "#121314",
-                    "brightCyan": "#121314",
-                    "brightGreen": "#121314",
-                    "brightPurple": "#121314",
-                    "brightRed": "#121314",
-                    "brightWhite": "#121314",
-                    "brightYellow": "#121314",
-                    "cursorColor": "#121314",
-                    "cyan": "#121314",
-                    "foreground": "#121314",
-                    "green": "#121314",
-                    "name": "Campbell",
-                    "purple": "#121314",
-                    "red": "#121314",
-                    "selectionBackground": "#121314",
-                    "white": "#121314",
-                    "yellow": "#121314"
-                }
-            ]
-        })-" };
-
-        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
-        oldLoader.MergeInboxIntoUserSettings();
-        oldLoader.FinalizeLayering();
-        VERIFY_IS_TRUE(oldLoader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
-        const auto oldResult{ oldSettings->ToJson() };
-
-        implementation::SettingsLoader newLoader{ newSettingsJson, DefaultJson };
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        newLoader.FixupUserSettings();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-        const auto newResult{ newSettings->ToJson() };
-
-        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
-    }
-
-    void SerializationTests::RoundtripUserModifiedColorSchemeCollisionUnusedByProfiles()
-    {
-        static constexpr std::string_view oldSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                }
-            ],
-            "schemes": [
-                {
-                    "background": "#111111",
-                    "black": "#111111",
-                    "blue": "#111111",
-                    "brightBlack": "#111111",
-                    "brightBlue": "#111111",
-                    "brightCyan": "#111111",
-                    "brightGreen": "#111111",
-                    "brightPurple": "#111111",
-                    "brightRed": "#111111",
-                    "brightWhite": "#111111",
-                    "brightYellow": "#111111",
-                    "cursorColor": "#111111",
-                    "cyan": "#111111",
-                    "foreground": "#111111",
-                    "green": "#111111",
-                    "name": "Tango Dark",
-                    "purple": "#111111",
-                    "red": "#111111",
-                    "selectionBackground": "#111111",
-                    "white": "#111111",
-                    "yellow": "#111111"
-                },
-            ]
-        })" };
-
-        // Key differences: Tango Dark has been renamed; nothing else has changed
-        static constexpr std::string_view newSettingsJson{ R"-(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles":
-            {
-                "list":
-                [
-                    {
-                        "name": "profile0",
-                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                    }
-                ]
-            },
-            "actions": [ ],
-            "schemes": [
-                {
-                    "background": "#111111",
-                    "black": "#111111",
-                    "blue": "#111111",
-                    "brightBlack": "#111111",
-                    "brightBlue": "#111111",
-                    "brightCyan": "#111111",
-                    "brightGreen": "#111111",
-                    "brightPurple": "#111111",
-                    "brightRed": "#111111",
-                    "brightWhite": "#111111",
-                    "brightYellow": "#111111",
-                    "cursorColor": "#111111",
-                    "cyan": "#111111",
-                    "foreground": "#111111",
-                    "green": "#111111",
-                    "name": "Tango Dark (modified)",
-                    "purple": "#111111",
-                    "red": "#111111",
-                    "selectionBackground": "#111111",
-                    "white": "#111111",
-                    "yellow": "#111111"
-                },
-            ]
-        })-" };
-
-        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
-        oldLoader.MergeInboxIntoUserSettings();
-        oldLoader.FinalizeLayering();
-        VERIFY_IS_TRUE(oldLoader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
-        const auto oldResult{ oldSettings->ToJson() };
-
-        implementation::SettingsLoader newLoader{ newSettingsJson, DefaultJson };
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        newLoader.FixupUserSettings();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-        const auto newResult{ newSettings->ToJson() };
-
-        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
-    }
-
-    void SerializationTests::RoundtripUserDeletedColorSchemeCollision()
-    {
-        static constexpr std::string_view oldSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                }
-            ],
-            "schemes": [
-                {
-                    "name": "Tango Dark",
-                    "foreground": "#D3D7CF",
-                    "background": "#000000",
-                    "cursorColor": "#FFFFFF",
-                    "black": "#000000",
-                    "red": "#CC0000",
-                    "green": "#4E9A06",
-                    "yellow": "#C4A000",
-                    "blue": "#3465A4",
-                    "purple": "#75507B",
-                    "cyan": "#06989A",
-                    "white": "#D3D7CF",
-                    "brightBlack": "#555753",
-                    "brightRed": "#EF2929",
-                    "brightGreen": "#8AE234",
-                    "brightYellow": "#FCE94F",
-                    "brightBlue": "#729FCF",
-                    "brightPurple": "#AD7FA8",
-                    "brightCyan": "#34E2E2",
-                    "brightWhite": "#EEEEEC"
-                }
-            ]
-        })" };
-
-        // Key differences: Tango Dark has been deleted, as it was identical to the inbox one.
-        static constexpr std::string_view newSettingsJson{ R"-(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles":
-            {
-                "list":
-                [
-                    {
-                        "name": "profile0",
-                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-                    }
-                ]
-            },
-            "actions": [ ],
-            "schemes": [ ]
-        })-" };
-
-        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
-        oldLoader.MergeInboxIntoUserSettings();
-        oldLoader.FinalizeLayering();
-        VERIFY_IS_TRUE(oldLoader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
-        const auto oldResult{ oldSettings->ToJson() };
-
-        implementation::SettingsLoader newLoader{ newSettingsJson, DefaultJson };
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        newLoader.FixupUserSettings();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-        const auto newResult{ newSettings->ToJson() };
-
-        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
-    }
 }

src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj

@@ -14,9 +14,9 @@
   <PropertyGroup>
     <ProjectGuid>{CA5CAD1A-9B68-456A-B13E-C8218070DC42}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SettingsModelUnitTests</RootNamespace>
-    <ProjectName>UnitTests_SettingsModel</ProjectName>
-    <TargetName>SettingsModel.Unit.Tests</TargetName>
+    <RootNamespace>SettingsModelLocalTests</RootNamespace>
+    <ProjectName>LocalTests_SettingsModel</ProjectName>
+    <TargetName>SettingsModel.LocalTests</TargetName>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
     <!-- TerminalCppWinrt is not set intentionally -->
@@ -64,6 +64,7 @@
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->
@@ -97,16 +98,4 @@
   <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
   <Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
-
-  <ItemGroup>
-    <ProjectPriFiles Include="$(TargetDir)\Microsoft.Terminal.Settings.Model.pri" />
-    <OutputPriFiles Include="$(TargetDir)\resources.pri" />
-  </ItemGroup>
-
-  <Target Name="AfterBuild" Inputs="@(ProjectPriFiles)" Outputs="@(OutputPriFiles)">
-    <Copy SourceFiles="@(ProjectPriFiles)"
-          DestinationFiles="@(OutputPriFiles)"
-          UseHardLinksIfPossible="true"
-          SkipUnchangedFiles="true" />
-  </Target>
 </Project>

src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp

@@ -16,11 +16,24 @@ using namespace WEX::Common;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Control;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class TerminalSettingsTests
     {
-        TEST_CLASS(TerminalSettingsTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(TerminalSettingsTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(TryCreateWinRTType);
         TEST_METHOD(TestTerminalArgsForBinding);
@@ -140,7 +153,7 @@ namespace SettingsModelUnitTests
                 g.Data4[7]);
         }
 
-        const auto tmpdir = std::filesystem::canonical(std::filesystem::temp_directory_path());
+        const auto tmpdir = std::filesystem::temp_directory_path();
         const auto dir1 = tmpdir / guid;
         const auto dir2 = tmpdir / (guid + L" two");
         const auto file1 = dir1 / L"file 1.exe";
@@ -160,13 +173,13 @@ namespace SettingsModelUnitTests
         {
             const auto commandLine = file2.native() + LR"( -foo "bar1 bar2" -baz)"s;
             const auto expected = file2.native() + L"\0-foo\0bar1 bar2\0-baz"s;
-            const auto actual = implementation::Profile::NormalizeCommandLine(commandLine.c_str());
+            const auto actual = implementation::CascadiaSettings::NormalizeCommandLine(commandLine.c_str());
             VERIFY_ARE_EQUAL(expected, actual);
         }
         {
             const auto commandLine = L"C:\\";
             const auto expected = L"C:\\";
-            const auto actual = implementation::Profile::NormalizeCommandLine(commandLine);
+            const auto actual = implementation::CascadiaSettings::NormalizeCommandLine(commandLine);
             VERIFY_ARE_EQUAL(expected, actual);
         }
     }

src/cascadia/LocalTests_SettingsModel/ThemeTests.cpp

@@ -17,11 +17,24 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelUnitTests
+namespace SettingsModelLocalTests
 {
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
     class ThemeTests : public JsonTestClass
     {
-        TEST_CLASS(ThemeTests);
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(ThemeTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
 
         TEST_METHOD(ParseSimpleTheme);
         TEST_METHOD(ParseEmptyTheme);

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -42,6 +42,7 @@ Author(s):
 #include <winrt/Windows.system.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
+#include <Windows.Graphics.Imaging.Interop.h>
 #include <winrt/windows.ui.core.h>
 #include <winrt/Windows.ui.input.h>
 #include <winrt/Windows.UI.ViewManagement.h>

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -4,7 +4,7 @@
 #include "pch.h"
 
 #include "../TerminalApp/TerminalPage.h"
-#include "../UnitTests_SettingsModel/TestUtils.h"
+#include "../LocalTests_SettingsModel/TestUtils.h"
 
 using namespace Microsoft::Console;
 using namespace WEX::Logging;

src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj

@@ -133,6 +133,7 @@
 
   <ItemGroup>
     <TestDll Include="$(OpenConsoleCommonOutDir)\LocalTests_TerminalApp\TerminalApp.LocalTests.dll" />
+    <TestDll Include="$(OpenConsoleCommonOutDir)\LocalTests_SettingsModel\SettingsModel.LocalTests.dll" />
   </ItemGroup>
 
   <Target Name="AfterBuild" Inputs="@(TestDll)" Outputs="@(TestDll->'$(TargetDir)'\%(Filename)%(Extension)')">

src/cascadia/TerminalApp/AppLogic.cpp

@@ -124,7 +124,8 @@ namespace winrt::TerminalApp::implementation
         return appLogic->GetSettings();
     }
 
-    AppLogic::AppLogic()
+    AppLogic::AppLogic() :
+        _reloadState{ std::chrono::milliseconds(100), []() { ApplicationState::SharedInstance().Reload(); } }
     {
         // 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,
@@ -326,6 +327,10 @@ namespace winrt::TerminalApp::implementation
                 {
                     _reloadSettings->Run();
                 }
+                else if (ApplicationState::SharedInstance().IsStatePath(modifiedBasename))
+                {
+                    _reloadState();
+                }
             });
     }
 

src/cascadia/TerminalApp/AppLogic.h

@@ -91,6 +91,7 @@ namespace winrt::TerminalApp::implementation
         ::TerminalApp::AppCommandlineArgs _settingsAppArgs;
 
         std::shared_ptr<ThrottledFuncTrailing<>> _reloadSettings;
+        til::throttled_func_trailing<> _reloadState;
 
         std::vector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> _warnings{};
 

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -843,6 +843,16 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                             const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
     {
+        // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
+        // is getting triggered because we set up the default value for that CommandPalette
+        // with an empty string. Therefore, to avoid the reset of the index when executing
+        // the Next/Prev tab command, we are skipping this execution.
+        // Check issue https://github.com/microsoft/terminal/issues/11146
+        if (_currentMode == CommandPaletteMode::TabSwitchMode)
+        {
+            return;
+        }
+
         if (_currentMode == CommandPaletteMode::CommandlineMode)
         {
             _evaluatePrefix();

src/cascadia/TerminalApp/CommandPalette.idl

@@ -2,12 +2,13 @@
 // Licensed under the MIT license.
 
 import "TabBase.idl";
+import "IDirectKeyListener.idl";
 import "HighlightedTextControl.idl";
 import "FilteredCommand.idl";
 
 namespace TerminalApp
 {
-    [default_interface] runtimeclass CommandPalette : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged, Microsoft.Terminal.UI.IDirectKeyListener
+    [default_interface] runtimeclass CommandPalette : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged, IDirectKeyListener
     {
         CommandPalette();
 

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -9,7 +9,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="using:TerminalApp"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:mtu="using:Microsoft.Terminal.UI"
+             xmlns:model="using:Microsoft.Terminal.Settings.Model"
              xmlns:mux="using:Microsoft.UI.Xaml.Controls"
              AllowFocusOnInteraction="True"
              AutomationProperties.Name="{x:Bind ControlName, Mode=OneWay}"
@@ -23,6 +23,12 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
+            <!--  This creates an instance of our CommandKeyChordVisibilityConverter we can reference below  -->
+            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter" />
+            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter" />
+            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter" />
+            <model:IconPathConverter x:Key="IconSourceConverter" />
+
             <DataTemplate x:Key="ListItemTemplate"
                           x:DataType="local:FilteredCommand">
                 <ListViewItem HorizontalContentAlignment="Stretch"
@@ -56,7 +62,8 @@
 
                     <!--
                         The block for the key chord is only visible
-                        when there's actual text set as the label.
+                        when there's actual text set as the label. See
+                        CommandKeyChordVisibilityConverter for details.
                         We're setting the accessibility view on the
                         border and text block to Raw because otherwise,
                         Narrator will read out the key chord. Problem is,
@@ -70,7 +77,7 @@
                             AutomationProperties.AccessibilityView="Raw"
                             Background="{ThemeResource FlyoutPresenterBackground}"
                             Style="{ThemeResource KeyChordBorderStyle}"
-                            Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Item.KeyChordText), Mode=OneWay}">
+                            Visibility="{x:Bind Item.KeyChordText, Mode=OneWay, Converter={StaticResource CommandKeyChordVisibilityConverter}}">
 
                         <TextBlock AutomationProperties.AccessibilityView="Raw"
                                    FontSize="12"
@@ -106,7 +113,8 @@
 
                     <!--
                         The block for the key chord is only visible
-                        when there's actual text set as the label.
+                        when there's actual text set as the label. See
+                        CommandKeyChordVisibilityConverter for details.
                         We're setting the accessibility view on the
                         border and text block to Raw because otherwise,
                         Narrator will read out the key chord. Problem is,
@@ -119,7 +127,7 @@
                             VerticalAlignment="Center"
                             AutomationProperties.AccessibilityView="Raw"
                             Style="{ThemeResource KeyChordBorderStyle}"
-                            Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Item.KeyChordText), Mode=OneWay}">
+                            Visibility="{x:Bind Item.KeyChordText, Mode=OneWay, Converter={StaticResource CommandKeyChordVisibilityConverter}}">
 
                         <TextBlock AutomationProperties.AccessibilityView="Raw"
                                    FontSize="12"
@@ -339,12 +347,12 @@
                        VerticalAlignment="Center"
                        FontSize="14"
                        Text="{x:Bind PrefixCharacter, Mode=OneWay}"
-                       Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(PrefixCharacter), Mode=OneWay}" />
+                       Visibility="{x:Bind PrefixCharacter, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}" />
 
             <StackPanel Grid.Row="1"
                         Margin="8,0,8,8"
                         Orientation="Horizontal"
-                        Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(ParentCommandName), Mode=OneWay}">
+                        Visibility="{x:Bind ParentCommandName, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}">
 
                 <Button x:Name="_parentCommandBackButton"
                         x:Uid="ParentCommandBackButton"
@@ -369,7 +377,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
                     Style="{ThemeResource ParsedCommandLineBorderStyle}"
-                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(ParsedCommandLineText), Mode=OneWay}">
+                    Visibility="{x:Bind ParsedCommandLineText, Mode=OneWay, Converter={StaticResource ParsedCommandLineTextVisibilityConverter}}">
 
                 <ScrollViewer MaxHeight="200"
                               VerticalScrollBarVisibility="Auto">

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -50,7 +50,6 @@ namespace winrt::Microsoft::TerminalApp::implementation
         void TerminalOutput(const winrt::event_token& token) noexcept { _wrappedConnection.TerminalOutput(token); };
         winrt::event_token StateChanged(const TypedEventHandler<ITerminalConnection, IInspectable>& handler) { return _wrappedConnection.StateChanged(handler); };
         void StateChanged(const winrt::event_token& token) noexcept { _wrappedConnection.StateChanged(token); };
-        winrt::guid SessionId() const noexcept { return {}; }
         ConnectionState State() const noexcept { return _wrappedConnection.State(); }
 
     private:
@@ -99,15 +98,6 @@ namespace winrt::Microsoft::TerminalApp::implementation
         _wrappedConnection = nullptr;
     }
 
-    guid DebugTapConnection::SessionId() const noexcept
-    {
-        if (const auto c = _wrappedConnection.get())
-        {
-            return c.SessionId();
-        }
-        return {};
-    }
-
     ConnectionState DebugTapConnection::State() const noexcept
     {
         if (auto strongConnection{ _wrappedConnection.get() })

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -19,8 +19,6 @@ namespace winrt::Microsoft::TerminalApp::implementation
         void WriteInput(const hstring& data);
         void Resize(uint32_t rows, uint32_t columns);
         void Close();
-
-        winrt::guid SessionId() const noexcept;
         winrt::Microsoft::Terminal::TerminalConnection::ConnectionState State() const noexcept;
 
         void SetInputTap(const Microsoft::Terminal::TerminalConnection::ITerminalConnection& inputTap);

src/cascadia/TerminalApp/EmptyStringVisibilityConverter.cpp

@@ -0,0 +1,38 @@
+#include "pch.h"
+#include "EmptyStringVisibilityConverter.h"
+#include "EmptyStringVisibilityConverter.g.cpp"
+
+using namespace winrt::Windows;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::TerminalApp::implementation
+{
+    // Method Description:
+    // - Attempt to convert something into another type. For the
+    //   EmptyStringVisibilityConverter, we're gonna check if `value` is a
+    //   string, and try and convert it into a Visibility value. If the input
+    //   param wasn't a string, or was the empty string, we'll return
+    //   Visibility::Collapsed. Otherwise, we'll return Visible.
+
+    // Arguments:
+    // - value: the input object to attempt to convert into a Visibility.
+    // Return Value:
+    // - Visible if the object was a string and wasn't the empty string.
+    Foundation::IInspectable EmptyStringVisibilityConverter::Convert(const Foundation::IInspectable& value,
+                                                                     const Windows::UI::Xaml::Interop::TypeName& /* targetType */,
+                                                                     const Foundation::IInspectable& /* parameter */,
+                                                                     const hstring& /* language */)
+    {
+        const auto& name = winrt::unbox_value_or<hstring>(value, L"");
+        return winrt::box_value(name.empty() ? Visibility::Collapsed : Visibility::Visible);
+    }
+
+    // unused for one-way bindings
+    Foundation::IInspectable EmptyStringVisibilityConverter::ConvertBack(const Foundation::IInspectable& /* value */,
+                                                                         const Windows::UI::Xaml::Interop::TypeName& /* targetType */,
+                                                                         const Foundation::IInspectable& /* parameter */,
+                                                                         const hstring& /* language */)
+    {
+        throw hresult_not_implemented();
+    }
+}

src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "EmptyStringVisibilityConverter.g.h"
+
+namespace winrt::TerminalApp::implementation
+{
+    struct EmptyStringVisibilityConverter : EmptyStringVisibilityConverterT<EmptyStringVisibilityConverter>
+    {
+        EmptyStringVisibilityConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value,
+                                                  const Windows::UI::Xaml::Interop::TypeName& targetType,
+                                                  const Windows::Foundation::IInspectable& parameter,
+                                                  const hstring& language);
+
+        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value,
+                                                      const Windows::UI::Xaml::Interop::TypeName& targetType,
+                                                      const Windows::Foundation::IInspectable& parameter,
+                                                      const hstring& language);
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(EmptyStringVisibilityConverter);
+}

src/cascadia/TerminalApp/EmptyStringVisibilityConverter.idl

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+    // See https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-quickstart
+
+    // We use the default attribute to declare IValueConverter as the default
+    // interface. In the listing, EmptyStringVisibilityConverter has only a
+    // constructor, and no methods, so no default interface is generated for it.
+    // The default attribute is optimal if you won't be adding instance members
+    // to EmptyStringVisibilityConverter, because no QueryInterface will be
+    // required to call the IValueConverter methods
+    runtimeclass EmptyStringVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        EmptyStringVisibilityConverter();
+    };
+
+}

src/cascadia/TerminalApp/IDirectKeyListener.idl

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+    // C++/winrt makes it difficult to share this idl between two projects,
+    // Instead, we just pin the uuid and include it in both TermControl and App
+    // If you update this one, please update the one in TerminalControl\TermControl.idl
+    // If you change this interface, please update the guid.
+    // If you press F7 or Alt and get a runtime error, go make sure both copies are the same.
+    [uuid("0ddf4edc-3fda-4dee-97ca-a417ee3dd510")] interface IDirectKeyListener {
+        Boolean OnDirectKeyEvent(UInt32 vkey, UInt8 scanCode, Boolean down);
+    }
+}

src/cascadia/TerminalApp/PaletteItem.cpp

@@ -17,7 +17,7 @@ namespace winrt::TerminalApp::implementation
 {
     Controls::IconElement PaletteItem::ResolvedIcon()
     {
-        const auto icon = Microsoft::Terminal::UI::IconPathConverter::IconWUX(Icon());
+        const auto icon = IconPathConverter::IconWUX(Icon());
         icon.Width(16);
         icon.Height(16);
         return icon;

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

@@ -771,19 +771,12 @@
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Termination behavior can be configured in advanced profile settings.</value>
   </data>
-  <data name="SetAsDefaultInfoBar.Message" xml:space="preserve">
-    <value>Windows Terminal can be set as the default terminal application in your settings.</value>
-  </data>
   <data name="InfoBarDismissButton.Content" xml:space="preserve">
     <value>Don't show again</value>
   </data>
   <data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>This Terminal window is running as Admin</value>
   </data>
-  <data name="SetAsDefaultTip_OpenSettingsLink.Content" xml:space="preserve">
-    <value>Open Settings</value>
-    <comment>This is a call-to-action hyperlink; it will open the settings.</comment>
-  </data>
   <data name="CommandPalette_MatchesAvailable" xml:space="preserve">
     <value>Suggestions found: {0}</value>
     <comment>{0} will be replaced with a number.</comment>

src/cascadia/TerminalApp/SettingsTab.cpp

@@ -114,7 +114,7 @@ namespace winrt::TerminalApp::implementation
 
         // The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
         Icon(winrt::hstring{ glyph });
-        TabViewItem().IconSource(Microsoft::Terminal::UI::IconPathConverter::IconSourceMUX(glyph, false));
+        TabViewItem().IconSource(IconPathConverter::IconSourceMUX(glyph, false));
     }
 
     winrt::Windows::UI::Xaml::Media::Brush SettingsTab::_BackgroundBrush()

src/cascadia/TerminalApp/SuggestionsControl.idl

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import "TabBase.idl";
+import "IDirectKeyListener.idl";
 import "HighlightedTextControl.idl";
 import "FilteredCommand.idl";
 
@@ -20,7 +21,7 @@ namespace TerminalApp
         BottomUp
     };
 
-    [default_interface] runtimeclass SuggestionsControl : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged, Microsoft.Terminal.UI.IDirectKeyListener
+    [default_interface] runtimeclass SuggestionsControl : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged, IDirectKeyListener
     {
         SuggestionsControl();
 

src/cascadia/TerminalApp/SuggestionsControl.xaml

@@ -10,7 +10,6 @@
              xmlns:local="using:TerminalApp"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:model="using:Microsoft.Terminal.Settings.Model"
-             xmlns:mtu="using:Microsoft.Terminal.UI"
              xmlns:mux="using:Microsoft.UI.Xaml.Controls"
              AllowFocusOnInteraction="True"
              AutomationProperties.Name="{x:Bind ControlName, Mode=OneWay}"
@@ -24,6 +23,9 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
+            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter" />
+            <model:IconPathConverter x:Key="IconSourceConverter" />
+
             <DataTemplate x:Key="ListItemTemplate"
                           x:DataType="local:FilteredCommand">
                 <ListViewItem Height="32"
@@ -159,7 +161,7 @@
             <StackPanel Grid.Row="1"
                         Margin="8,0,8,8"
                         Orientation="Horizontal"
-                        Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(ParentCommandName), Mode=OneWay}">
+                        Visibility="{x:Bind ParentCommandName, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}">
 
                 <Button x:Name="_parentCommandBackButton"
                         x:Uid="ParentCommandBackButton"

src/cascadia/TerminalApp/TabManagement.cpp

@@ -174,12 +174,11 @@ namespace winrt::TerminalApp::implementation
         // Set this tab's icon to the icon from the user's profile
         if (const auto profile{ newTabImpl->GetFocusedProfile() })
         {
-            const auto& icon = profile.EvaluatedIcon();
-            if (!icon.empty())
+            if (!profile.Icon().empty())
             {
                 const auto theme = _settings.GlobalSettings().CurrentTheme();
                 const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
-                newTabImpl->UpdateIcon(icon, iconStyle);
+                newTabImpl->UpdateIcon(profile.Icon(), iconStyle);
             }
         }
 
@@ -246,7 +245,7 @@ namespace winrt::TerminalApp::implementation
         {
             const auto theme = _settings.GlobalSettings().CurrentTheme();
             const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
-            tab.UpdateIcon(profile.EvaluatedIcon(), iconStyle);
+            tab.UpdateIcon(profile.Icon(), iconStyle);
         }
     }
 

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -130,6 +130,9 @@
       <DependentUpon>CommandPalette.xaml</DependentUpon>
     </ClInclude>
     <ClInclude Include="FilteredCommand.h" />
+    <ClInclude Include="EmptyStringVisibilityConverter.h">
+      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
+    </ClInclude>
     <ClInclude Include="Pane.h" />
     <ClInclude Include="ColorHelper.h" />
     <ClInclude Include="pch.h" />
@@ -229,6 +232,9 @@
       <DependentUpon>CommandPalette.xaml</DependentUpon>
     </ClCompile>
     <ClCompile Include="FilteredCommand.cpp" />
+    <ClCompile Include="EmptyStringVisibilityConverter.cpp">
+      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
+    </ClCompile>
     <ClCompile Include="Pane.cpp" />
     <ClCompile Include="Pane.LayoutSizeNode.cpp" />
     <ClCompile Include="ColorHelper.cpp">
@@ -274,6 +280,7 @@
     header in TerminalApp.vcxproj (as well as in this file) -->
     <Midl Include="ActionPaletteItem.idl" />
     <Midl Include="CommandLinePaletteItem.idl" />
+    <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="AboutDialog.idl">
       <DependentUpon>AboutDialog.xaml</DependentUpon>
     </Midl>
@@ -334,6 +341,7 @@
       <SubType>Code</SubType>
     </Midl>
     <Midl Include="FilteredCommand.idl" />
+    <Midl Include="EmptyStringVisibilityConverter.idl" />
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
@@ -377,9 +385,6 @@
       <Private>true</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
-    </ProjectReference>
 
   </ItemGroup>
   <PropertyGroup>
@@ -417,7 +422,12 @@
       <Private>false</Private>
       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     </Reference>
-    <!-- TODO VALIDATE DELETION -->
+    <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="$(WindowsSDK_MetadataPathVersioned)\Windows.UI.Xaml.Hosting.HostingContract\*\*.winmd">
       <WinMDFile>true</WinMDFile>
       <CopyLocal>false</CopyLocal>

src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters

@@ -98,6 +98,7 @@
     <Midl Include="ShortcutActionDispatch.idl">
       <Filter>settings</Filter>
     </Midl>
+    <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="SettingsTab.idl">
       <Filter>tab</Filter>
     </Midl>
@@ -115,6 +116,7 @@
     </Midl>
     <Midl Include="PaletteItemTemplateSelector.idl" />
     <Midl Include="TabBase.idl" />
+    <Midl Include="EmptyStringVisibilityConverter.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -185,4 +187,4 @@
       <Filter>app</Filter>
     </ApplicationDefinition>
   </ItemGroup>
-</Project>
+</Project>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -283,8 +283,6 @@ namespace winrt::TerminalApp::implementation
             _defaultPointerCursor = CoreWindow::GetForCurrentThread().PointerCursor();
         }
         CATCH_LOG();
-
-        ShowSetAsDefaultInfoBar();
     }
 
     Windows::UI::Xaml::Automation::Peers::AutomationPeer TerminalPage::OnCreateAutomationPeer()
@@ -1033,10 +1031,9 @@ namespace winrt::TerminalApp::implementation
 
         // If there's an icon set for this profile, set it as the icon for
         // this flyout item
-        const auto& iconPath = profile.EvaluatedIcon();
-        if (!iconPath.empty())
+        if (!profile.Icon().empty())
         {
-            const auto icon = _CreateNewTabFlyoutIcon(iconPath);
+            const auto icon = _CreateNewTabFlyoutIcon(profile.Icon());
             profileMenuItem.Icon(icon);
         }
 
@@ -1101,7 +1098,7 @@ namespace winrt::TerminalApp::implementation
             return nullptr;
         }
 
-        auto icon = UI::IconPathConverter::IconWUX(iconSource);
+        auto icon = IconPathConverter::IconWUX(iconSource);
         Automation::AutomationProperties::SetAccessibilityView(icon, Automation::Peers::AccessibilityView::Raw);
 
         return icon;
@@ -1211,7 +1208,7 @@ namespace winrt::TerminalApp::implementation
         TerminalConnection::ITerminalConnection connection{ nullptr };
 
         auto connectionType = profile.ConnectionType();
-        Windows::Foundation::Collections::ValueSet valueSet;
+        winrt::guid sessionGuid{};
 
         if (connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
             TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
@@ -1227,16 +1224,23 @@ namespace winrt::TerminalApp::implementation
                 connection = TerminalConnection::ConptyConnection{};
             }
 
-            valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
-                                                                            L".",
-                                                                            L"Azure",
-                                                                            false,
-                                                                            L"",
-                                                                            nullptr,
-                                                                            settings.InitialRows(),
-                                                                            settings.InitialCols(),
-                                                                            winrt::guid(),
-                                                                            profile.Guid());
+            auto valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
+                                                                                 L".",
+                                                                                 L"Azure",
+                                                                                 false,
+                                                                                 L"",
+                                                                                 nullptr,
+                                                                                 settings.InitialRows(),
+                                                                                 settings.InitialCols(),
+                                                                                 winrt::guid(),
+                                                                                 profile.Guid());
+
+            if constexpr (Feature_VtPassthroughMode::IsEnabled())
+            {
+                valueSet.Insert(L"passthroughMode", Windows::Foundation::PropertyValue::CreateBoolean(settings.VtPassthrough()));
+            }
+
+            connection.Initialize(valueSet);
         }
 
         else
@@ -1261,30 +1265,30 @@ namespace winrt::TerminalApp::implementation
             // process until later, on another thread, after we've already
             // restored the CWD to its original value.
             auto newWorkingDirectory{ _evaluatePathForCwd(settings.StartingDirectory()) };
-            connection = TerminalConnection::ConptyConnection{};
-            valueSet = TerminalConnection::ConptyConnection::CreateSettings(settings.Commandline(),
-                                                                            newWorkingDirectory,
-                                                                            settings.StartingTitle(),
-                                                                            settings.ReloadEnvironmentVariables(),
-                                                                            _WindowProperties.VirtualEnvVars(),
-                                                                            environment,
-                                                                            settings.InitialRows(),
-                                                                            settings.InitialCols(),
-                                                                            winrt::guid(),
-                                                                            profile.Guid());
+            auto conhostConn = TerminalConnection::ConptyConnection();
+            auto valueSet = TerminalConnection::ConptyConnection::CreateSettings(settings.Commandline(),
+                                                                                 newWorkingDirectory,
+                                                                                 settings.StartingTitle(),
+                                                                                 settings.ReloadEnvironmentVariables(),
+                                                                                 _WindowProperties.VirtualEnvVars(),
+                                                                                 environment,
+                                                                                 settings.InitialRows(),
+                                                                                 settings.InitialCols(),
+                                                                                 winrt::guid(),
+                                                                                 profile.Guid());
+
+            valueSet.Insert(L"passthroughMode", Windows::Foundation::PropertyValue::CreateBoolean(settings.VtPassthrough()));
 
             if (inheritCursor)
             {
                 valueSet.Insert(L"inheritCursor", Windows::Foundation::PropertyValue::CreateBoolean(true));
             }
-        }
 
-        if constexpr (Feature_VtPassthroughMode::IsEnabled())
-        {
-            valueSet.Insert(L"passthroughMode", Windows::Foundation::PropertyValue::CreateBoolean(settings.VtPassthrough()));
-        }
+            conhostConn.Initialize(valueSet);
 
-        connection.Initialize(valueSet);
+            sessionGuid = conhostConn.Guid();
+            connection = conhostConn;
+        }
 
         TraceLoggingWrite(
             g_hTerminalAppProvider,
@@ -1292,7 +1296,7 @@ namespace winrt::TerminalApp::implementation
             TraceLoggingDescription("Event emitted upon the creation of a connection"),
             TraceLoggingGuid(connectionType, "ConnectionTypeGuid", "The type of the connection"),
             TraceLoggingGuid(profile.Guid(), "ProfileGuid", "The profile's GUID"),
-            TraceLoggingGuid(connection.SessionId(), "SessionGuid", "The WT_SESSION's GUID"),
+            TraceLoggingGuid(sessionGuid, "SessionGuid", "The WT_SESSION's GUID"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
 
@@ -3862,9 +3866,6 @@ namespace winrt::TerminalApp::implementation
             // Request a summon of this window to the foreground
             _SummonWindowRequestedHandlers(*this, nullptr);
 
-            const IInspectable unused{ nullptr };
-            _SetAsDefaultDismissHandler(unused, unused);
-
             // TEMPORARY SOLUTION
             // If the connection has requested for the window to be maximized,
             // manually maximize it here. Ideally, we should be _initializing_
@@ -4046,35 +4047,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Method Description:
-    // - Displays a info popup guiding the user into setting their default terminal.
-    void TerminalPage::ShowSetAsDefaultInfoBar() const
-    {
-        if (::winrt::Windows::UI::Xaml::Application::Current().try_as<::winrt::TerminalApp::App>() == nullptr)
-        {
-            // Just ignore this in the tests (where the Application::Current()
-            // is not a TerminalApp::App)
-            return;
-        }
-        if (!CascadiaSettings::IsDefaultTerminalAvailable() || _IsMessageDismissed(InfoBarMessage::SetAsDefault))
-        {
-            return;
-        }
-
-        // If the user has already configured any terminal for hand-off we
-        // shouldn't inform them again about the possibility to do so.
-        if (CascadiaSettings::IsDefaultTerminalSet())
-        {
-            _DismissMessage(InfoBarMessage::SetAsDefault);
-            return;
-        }
-
-        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
-        {
-            infoBar.IsOpen(true);
-        }
-    }
-
     // Function Description:
     // - Helper function to get the OS-localized name for the "Touch Keyboard
     //   and Handwriting Panel Service". If we can't open up the service for any
@@ -4536,40 +4508,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Method Description:
-    // - Persists the user's choice not to show the information bar warning about "Windows Terminal can be set as your default terminal application"
-    // Then hides this information buffer.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void TerminalPage::_SetAsDefaultDismissHandler(const IInspectable& /*sender*/, const IInspectable& /*args*/)
-    {
-        _DismissMessage(InfoBarMessage::SetAsDefault);
-        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
-        {
-            infoBar.IsOpen(false);
-        }
-
-        TraceLoggingWrite(g_hTerminalAppProvider, "SetAsDefaultTipDismissed", TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
-        _FocusCurrentTab(true);
-    }
-
-    // Method Description:
-    // - Dismisses the Default Terminal tip and opens the settings.
-    void TerminalPage::_SetAsDefaultOpenSettingsHandler(const IInspectable& /*sender*/, const IInspectable& /*args*/)
-    {
-        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
-        {
-            infoBar.IsOpen(false);
-        }
-
-        TraceLoggingWrite(g_hTerminalAppProvider, "SetAsDefaultTipInteracted", TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
-        OpenSettingsUI();
-    }
-
     // Method Description:
     // - Checks whether information bar message was dismissed earlier (in the application state)
     // Arguments:
@@ -4925,7 +4863,7 @@ namespace winrt::TerminalApp::implementation
 
             if (!icon.empty())
             {
-                auto iconElement = UI::IconPathConverter::IconWUX(icon);
+                auto iconElement = IconPathConverter::IconWUX(icon);
                 Automation::AutomationProperties::SetAccessibilityView(iconElement, Automation::Peers::AccessibilityView::Raw);
                 button.Icon(iconElement);
             }

src/cascadia/TerminalApp/TerminalPage.h

@@ -145,7 +145,6 @@ namespace winrt::TerminalApp::implementation
         winrt::TerminalApp::TaskbarState TaskbarState() const;
 
         void ShowKeyboardServiceWarning() const;
-        void ShowSetAsDefaultInfoBar() const;
         winrt::hstring KeyboardServiceDisabledText();
 
         winrt::fire_and_forget IdentifyWindow();
@@ -507,8 +506,6 @@ namespace winrt::TerminalApp::implementation
         winrt::fire_and_forget _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
         void _CloseOnExitInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
         void _KeyboardServiceWarningInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
-        void _SetAsDefaultDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
-        void _SetAsDefaultOpenSettingsHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
         static bool _IsMessageDismissed(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
         static void _DismissMessage(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
 

src/cascadia/TerminalApp/TerminalPage.idl

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import "TaskbarState.idl";
+import "IDirectKeyListener.idl";
 
 namespace TerminalApp
 {
@@ -56,7 +57,7 @@ namespace TerminalApp
         Boolean IsQuakeWindow();
     };
 
-    [default_interface] runtimeclass TerminalPage : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged, Microsoft.Terminal.UI.IDirectKeyListener
+    [default_interface] runtimeclass TerminalPage : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged, IDirectKeyListener
     {
         TerminalPage(WindowProperties properties, ContentManager manager);
 

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -53,21 +53,6 @@
                             Click="_CloseOnExitInfoDismissHandler" />
                 </mux:InfoBar.ActionButton>
             </mux:InfoBar>
-
-            <mux:InfoBar x:Name="SetAsDefaultInfoBar"
-                         x:Uid="SetAsDefaultInfoBar"
-                         x:Load="False"
-                         CloseButtonClick="_SetAsDefaultDismissHandler"
-                         CornerRadius="0"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Severity="Informational">
-                <mux:InfoBar.ActionButton>
-                    <HyperlinkButton x:Uid="SetAsDefaultTip_OpenSettingsLink"
-                                     Click="_SetAsDefaultOpenSettingsHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
         </StackPanel>
 
         <Grid x:Name="TabContent"

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -304,7 +304,7 @@ namespace winrt::TerminalApp::implementation
         {
             Icon(_lastIconPath);
             bool isMonochrome = iconStyle == IconStyle::Monochrome;
-            TabViewItem().IconSource(Microsoft::Terminal::UI::IconPathConverter::IconSourceMUX(_lastIconPath, isMonochrome));
+            TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath, isMonochrome));
         }
     }
 
@@ -327,7 +327,7 @@ namespace winrt::TerminalApp::implementation
             else
             {
                 Icon(_lastIconPath);
-                TabViewItem().IconSource(Microsoft::Terminal::UI::IconPathConverter::IconSourceMUX(_lastIconPath, _lastIconStyle == IconStyle::Monochrome));
+                TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath, _lastIconStyle == IconStyle::Monochrome));
             }
             _iconHidden = hide;
         }

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -863,7 +863,7 @@ namespace winrt::TerminalApp::implementation
             auto focusedObject{ Windows::UI::Xaml::Input::FocusManager::GetFocusedElement(xamlRoot) };
             do
             {
-                if (auto keyListener{ focusedObject.try_as<UI::IDirectKeyListener>() })
+                if (auto keyListener{ focusedObject.try_as<IDirectKeyListener>() })
                 {
                     if (keyListener.OnDirectKeyEvent(vkey, scanCode, down))
                     {
@@ -891,7 +891,7 @@ namespace winrt::TerminalApp::implementation
                         // don't want to go around the loop again.
                         if (!focusedObject)
                         {
-                            if (auto keyListener{ _root.try_as<UI::IDirectKeyListener>() })
+                            if (auto keyListener{ _root.try_as<IDirectKeyListener>() })
                             {
                                 return keyListener.OnDirectKeyEvent(vkey, scanCode, down);
                             }

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -3,6 +3,7 @@
 
 import "TerminalPage.idl";
 import "ShortcutActionDispatch.idl";
+import "IDirectKeyListener.idl";
 
 namespace TerminalApp
 {
@@ -39,7 +40,7 @@ namespace TerminalApp
 
     // See IDialogPresenter and TerminalPage's DialogPresenter for more
     // information.
-    [default_interface] runtimeclass TerminalWindow : Microsoft.Terminal.UI.IDirectKeyListener, IDialogPresenter, Windows.UI.Xaml.Data.INotifyPropertyChanged
+    [default_interface] runtimeclass TerminalWindow : IDirectKeyListener, IDialogPresenter, Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         TerminalWindow(SettingsLoadEventArgs result, ContentManager manager);
 

src/cascadia/TerminalApp/dll/TerminalApp.vcxproj

@@ -68,15 +68,8 @@
     include Settings and Connection, since Control will include them for us) -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ITerminalCore\ITerminalCore.vcxproj">
-      <Private>false</Private>
-      <Project>{40503EDC-E3E4-46AB-BC26-D293B956CAE8}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
-    </ProjectReference>
     <!-- Reference TerminalAppLib here, so we can use its TerminalApp.winmd as
     our TerminalApp.winmd. This didn't work correctly in VS2017, you'd need to
     manually reference the lib -->
@@ -87,6 +80,18 @@
   </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>
+  </ItemGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>

src/cascadia/TerminalApp/pch.h

@@ -60,7 +60,6 @@
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
 #include <winrt/Microsoft.Terminal.Settings.Editor.h>
 #include <winrt/Microsoft.Terminal.Settings.Model.h>
-#include <winrt/Microsoft.Terminal.UI.h>
 #include <winrt/Windows.Services.Store.h>
 #include <winrt/Windows.Storage.h>
 #include <winrt/Windows.Storage.Provider.h>

src/cascadia/TerminalConnection/AzureConnection.cpp

@@ -65,18 +65,20 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         return AzureConnectionType;
     }
 
+    // This function exists because the clientID only gets added by the release pipelines
+    // and is not available on local builds, so we want to be able to make sure we don't
+    // try to make an Azure connection if its a local build
+    bool AzureConnection::IsAzureConnectionAvailable() noexcept
+    {
+        return (AzureClientID != L"0");
+    }
+
     void AzureConnection::Initialize(const Windows::Foundation::Collections::ValueSet& settings)
     {
         if (settings)
         {
-            _initialRows = unbox_prop_or<uint32_t>(settings, L"initialRows", _initialRows);
-            _initialCols = unbox_prop_or<uint32_t>(settings, L"initialCols", _initialCols);
-            _sessionId = unbox_prop_or<guid>(settings, L"sessionId", _sessionId);
-        }
-
-        if (_sessionId == guid{})
-        {
-            _sessionId = Utils::CreateGuid();
+            _initialRows = gsl::narrow<til::CoordType>(winrt::unbox_value_or<uint32_t>(settings.TryLookup(L"initialRows").try_as<Windows::Foundation::IPropertyValue>(), _initialRows));
+            _initialCols = gsl::narrow<til::CoordType>(winrt::unbox_value_or<uint32_t>(settings.TryLookup(L"initialCols").try_as<Windows::Foundation::IPropertyValue>(), _initialCols));
         }
     }
 

src/cascadia/TerminalConnection/AzureConnection.h

@@ -8,14 +8,15 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "BaseTerminalConnection.h"
+#include "ConnectionStateHolder.h"
 #include "AzureClient.h"
 
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
-    struct AzureConnection : AzureConnectionT<AzureConnection>, BaseTerminalConnection<AzureConnection>
+    struct AzureConnection : AzureConnectionT<AzureConnection>, ConnectionStateHolder<AzureConnection>
     {
         static winrt::guid ConnectionType() noexcept;
+        static bool IsAzureConnectionAvailable() noexcept;
 
         AzureConnection() = default;
         void Initialize(const Windows::Foundation::Collections::ValueSet& settings);

src/cascadia/TerminalConnection/AzureConnection.idl

@@ -1,11 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "ITerminalConnection.idl";
+
 namespace Microsoft.Terminal.TerminalConnection
 {
     [default_interface] runtimeclass AzureConnection : ITerminalConnection
     {
         static Guid ConnectionType { get; };
+        static Boolean IsAzureConnectionAvailable();
 
         AzureConnection();
     };

src/cascadia/TerminalConnection/ConnectionInformation.idl

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "ITerminalConnection.idl";
+
 namespace Microsoft.Terminal.TerminalConnection
 {
     [default_interface] runtimeclass ConnectionInformation

src/cascadia/TerminalConnection/ConnectionStateHolder.h

@@ -4,28 +4,13 @@
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
     template<typename T>
-    struct BaseTerminalConnection
+    struct ConnectionStateHolder
     {
     public:
-        winrt::guid SessionId() const noexcept
-        {
-            return _sessionId;
-        }
-
-        ConnectionState State() const noexcept
-        {
-            return _connectionState;
-        }
-
+        ConnectionState State() const noexcept { return _connectionState; }
         TYPED_EVENT(StateChanged, ITerminalConnection, winrt::Windows::Foundation::IInspectable);
 
     protected:
-        template<typename U>
-        U unbox_prop_or(const Windows::Foundation::Collections::ValueSet& blob, std::wstring_view key, U defaultValue)
-        {
-            return winrt::unbox_value_or<U>(blob.TryLookup(key).try_as<Windows::Foundation::IPropertyValue>(), defaultValue);
-        }
-
 #pragma warning(push)
 #pragma warning(disable : 26447) // Analyzer is still upset about noexcepts throwing even with function level try.
         // Method Description:
@@ -101,8 +86,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             return _isStateOneOf(ConnectionState::Connected);
         }
 
-        winrt::guid _sessionId{};
-
     private:
         std::atomic<ConnectionState> _connectionState{ ConnectionState::NotConnected };
         mutable std::mutex _stateMutex;

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -85,12 +85,18 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         auto environment = _initialEnv;
 
         {
-            // Ensure every connection has the unique identifier in the environment.
             // Convert connection Guid to string and ignore the enclosing '{}'.
-            environment.as_map().insert_or_assign(L"WT_SESSION", Utils::GuidToPlainString(_sessionId));
+            auto wsGuid{ Utils::GuidToString(_guid) };
+            wsGuid.pop_back();
+
+            const auto guidSubStr = std::wstring_view{ wsGuid }.substr(1);
+
+            // Ensure every connection has the unique identifier in the environment.
+            environment.as_map().insert_or_assign(L"WT_SESSION", guidSubStr.data());
 
             // The profile Guid does include the enclosing '{}'
-            environment.as_map().insert_or_assign(L"WT_PROFILE_ID", Utils::GuidToString(_profileGuid));
+            const auto profileGuid{ Utils::GuidToString(_profileGuid) };
+            environment.as_map().insert_or_assign(L"WT_PROFILE_ID", profileGuid.data());
 
             // WSLENV is a colon-delimited list of environment variables (+flags) that should appear inside WSL
             // https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows/
@@ -98,7 +104,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             if (_environment)
             {
                 // Order the environment variable names so that resolution order is consistent
-                std::set<std::wstring, til::env_key_sorter> keys{};
+                std::set<std::wstring, til::wstring_case_insensitive_compare> keys{};
                 for (const auto item : _environment)
                 {
                     keys.insert(item.Key().c_str());
@@ -165,7 +171,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             g_hTerminalConnectionProvider,
             "ConPtyConnected",
             TraceLoggingDescription("Event emitted when ConPTY connection is started"),
-            TraceLoggingGuid(_sessionId, "SessionGuid", "The WT_SESSION's GUID"),
+            TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"),
             TraceLoggingWideString(_clientName.c_str(), "Client", "The attached client process"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
@@ -183,6 +189,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                                        TERMINAL_STARTUP_INFO startupInfo) :
         _rows{ 25 },
         _cols{ 80 },
+        _guid{ Utils::CreateGuid() },
         _inPipe{ hIn },
         _outPipe{ hOut }
     {
@@ -242,6 +249,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         return vs;
     }
 
+    template<typename T>
+    T unbox_prop_or(const Windows::Foundation::Collections::ValueSet& blob, std::wstring_view key, T defaultValue)
+    {
+        return winrt::unbox_value_or<T>(blob.TryLookup(key).try_as<Windows::Foundation::IPropertyValue>(), defaultValue);
+    }
+
     void ConptyConnection::Initialize(const Windows::Foundation::Collections::ValueSet& settings)
     {
         if (settings)
@@ -255,7 +268,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             _startingTitle = unbox_prop_or<winrt::hstring>(settings, L"startingTitle", _startingTitle);
             _rows = unbox_prop_or<uint32_t>(settings, L"initialRows", _rows);
             _cols = unbox_prop_or<uint32_t>(settings, L"initialCols", _cols);
-            _sessionId = unbox_prop_or<winrt::guid>(settings, L"sessionId", _sessionId);
+            _guid = unbox_prop_or<winrt::guid>(settings, L"guid", _guid);
             _environment = settings.TryLookup(L"environment").try_as<Windows::Foundation::Collections::ValueSet>();
             if constexpr (Feature_VtPassthroughMode::IsEnabled())
             {
@@ -286,14 +299,19 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                     _initialEnv = til::env::from_current_environment();
                 }
             }
-        }
 
-        if (_sessionId == guid{})
-        {
-            _sessionId = Utils::CreateGuid();
+            if (_guid == guid{})
+            {
+                _guid = Utils::CreateGuid();
+            }
         }
     }
 
+    winrt::guid ConptyConnection::Guid() const noexcept
+    {
+        return _guid;
+    }
+
     winrt::hstring ConptyConnection::Commandline() const
     {
         return _commandline;
@@ -364,7 +382,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 g_hTerminalConnectionProvider,
                 "ConPtyConnectedToDefterm",
                 TraceLoggingDescription("Event emitted when ConPTY connection is started, for a defterm session"),
-                TraceLoggingGuid(_sessionId, "SessionGuid", "The WT_SESSION's GUID"),
+                TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"),
                 TraceLoggingWideString(_clientName.c_str(), "Client", "The attached client process"),
                 TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
                 TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
@@ -668,7 +686,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 TraceLoggingWrite(g_hTerminalConnectionProvider,
                                   "ReceivedFirstByte",
                                   TraceLoggingDescription("An event emitted when the connection receives the first byte"),
-                                  TraceLoggingGuid(_sessionId, "SessionGuid", "The WT_SESSION's GUID"),
+                                  TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"),
                                   TraceLoggingFloat64(delta.count(), "Duration"),
                                   TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
                                   TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));

src/cascadia/TerminalConnection/ConptyConnection.h

@@ -4,14 +4,14 @@
 #pragma once
 
 #include "ConptyConnection.g.h"
-#include "BaseTerminalConnection.h"
+#include "ConnectionStateHolder.h"
 
 #include "ITerminalHandoff.h"
 #include <til/env.h>
 
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
-    struct ConptyConnection : ConptyConnectionT<ConptyConnection>, BaseTerminalConnection<ConptyConnection>
+    struct ConptyConnection : ConptyConnectionT<ConptyConnection>, ConnectionStateHolder<ConptyConnection>
     {
         ConptyConnection(const HANDLE hSig,
                          const HANDLE hIn,
@@ -36,6 +36,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         void ReparentWindow(const uint64_t newParent);
 
+        winrt::guid Guid() const noexcept;
         winrt::hstring Commandline() const;
         winrt::hstring StartingTitle() const;
         WORD ShowWindow() const noexcept;
@@ -76,6 +77,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         hstring _startingTitle{};
         bool _initialVisibility{ true };
         Windows::Foundation::Collections::ValueSet _environment{ nullptr };
+        guid _guid{}; // A unique session identifier for connected client
         hstring _clientName{}; // The name of the process hosted by this ConPTY connection (as of launch).
 
         bool _receivedFirstByte{ false };

src/cascadia/TerminalConnection/ConptyConnection.idl

@@ -1,17 +1,26 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "ITerminalConnection.idl";
+
 namespace Microsoft.Terminal.TerminalConnection
 {
     delegate void NewConnectionHandler(ConptyConnection connection);
 
-    [default_interface] runtimeclass ConptyConnection : ITerminalConnection, ITerminalConnectionWithWindow, ITerminalConnectionWithBufferState
+    [default_interface] runtimeclass ConptyConnection : ITerminalConnection
     {
         ConptyConnection();
+        Guid Guid { get; };
         String Commandline { get; };
         String StartingTitle { get; };
         UInt16 ShowWindow { get; };
 
+        void ClearBuffer();
+
+        void ShowHide(Boolean show);
+
+        void ReparentWindow(UInt64 newParent);
+
         static event NewConnectionHandler NewConnection;
         static void StartInboundListener();
         static void StopInboundListener();

src/cascadia/TerminalConnection/EchoConnection.h

@@ -18,7 +18,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) const noexcept {};
 
-        winrt::guid SessionId() const noexcept { return {}; }
         ConnectionState State() const noexcept { return ConnectionState::Connected; }
 
         WINRT_CALLBACK(TerminalOutput, TerminalOutputHandler);

src/cascadia/TerminalConnection/EchoConnection.idl

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "ITerminalConnection.idl";
+
 namespace Microsoft.Terminal.TerminalConnection
 {
     [default_interface]

src/cascadia/TerminalConnection/ITerminalConnection.idl

@@ -25,20 +25,8 @@ namespace Microsoft.Terminal.TerminalConnection
         void Close();
 
         event TerminalOutputHandler TerminalOutput;
-        event Windows.Foundation.TypedEventHandler<ITerminalConnection, Object> StateChanged;
 
-        Guid SessionId { get; };
+        event Windows.Foundation.TypedEventHandler<ITerminalConnection, Object> StateChanged;
         ConnectionState State { get; };
     };
-
-    interface ITerminalConnectionWithWindow
-    {
-        void ShowHide(Boolean show);
-        void ReparentWindow(UInt64 newParent);
-    };
-
-    interface ITerminalConnectionWithBufferState
-    {
-        void ClearBuffer();
-    };
 }

src/cascadia/TerminalConnection/TerminalConnection.vcxproj

@@ -17,7 +17,6 @@
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
   <ItemGroup>
     <ClInclude Include="AzureClientID.h" />
-    <ClInclude Include="BaseTerminalConnection.h" />
     <ClInclude Include="ConnectionInformation.h">
       <DependentUpon>ConnectionInformation.idl</DependentUpon>
     </ClInclude>
@@ -55,6 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <Midl Include="ConnectionInformation.idl" />
+    <Midl Include="ITerminalConnection.idl" />
     <Midl Include="ConptyConnection.idl" />
     <Midl Include="EchoConnection.idl" />
     <Midl Include="AzureConnection.idl" />
@@ -82,10 +82,6 @@
     <ProjectReference Include="..\..\winconpty\lib\winconptylib.vcxproj">
       <Project>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\ITerminalConnection\ITerminalConnection.vcxproj">
-      <Project>{EFC0B7EF-BB0D-44EC-BFC9-772AE4391D17}</Project>
-      <OpenConsoleImplementInterface>true</OpenConsoleImplementInterface>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
   <ItemDefinitionGroup>
@@ -99,7 +95,6 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-  <Import Project="$(SolutionDir)build\rules\ConsumeWinRTInterfacesStatically.targets" />
 
   <!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />

src/cascadia/TerminalConnection/TerminalConnection.vcxproj.filters

@@ -26,7 +26,6 @@
     <ClInclude Include="AzureConnection.h" />
     <ClInclude Include="AzureClientID.h" />
     <ClInclude Include="CTerminalHandoff.h" />
-    <ClInclude Include="BaseTerminalConnection.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="ITerminalConnection.idl" />
@@ -35,9 +34,11 @@
     <Midl Include="ConptyConnection.idl" />
     <Midl Include="ConnectionInformation.idl" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
-    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="Resources\en-US\Resources.resw" />

src/cascadia/TerminalControl/ControlCore.cpp

@@ -17,6 +17,7 @@
 #include "EventArgs.h"
 #include "../../buffer/out/search.h"
 #include "../../renderer/atlas/AtlasEngine.h"
+#include "../../renderer/dx/DxRenderer.hpp"
 
 #include "ControlCore.g.cpp"
 #include "SelectionColor.g.cpp"
@@ -290,9 +291,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 newConnection.Resize(height, width);
             }
             // Window owner too.
-            if (auto withWindow{ newConnection.try_as<TerminalConnection::ITerminalConnectionWithWindow>() })
+            if (auto conpty{ newConnection.try_as<TerminalConnection::ConptyConnection>() })
             {
-                withWindow.ReparentWindow(_owningHwnd);
+                conpty.ReparentWindow(_owningHwnd);
             }
 
             // This event is explicitly revoked in the destructor: does not need weak_ref
@@ -334,7 +335,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 return false;
             }
 
-            _renderEngine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
+            if (_settings->UseAtlasEngine())
+            {
+                _renderEngine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
+            }
+            else
+            {
+                _renderEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
+            }
+
             _renderer->AddRenderEngine(_renderEngine.get());
 
             // Initialize our font with the renderer
@@ -350,7 +359,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             const auto viewInPixels = Viewport::FromDimensions({ 0, 0 }, windowSize);
             LOG_IF_FAILED(_renderEngine->SetWindowSize({ viewInPixels.Width(), viewInPixels.Height() }));
 
-            // Update AtlasEngine's SelectionBackground
+            // Update DxEngine's SelectionBackground
             _renderEngine->SetSelectionBackground(til::color{ _settings->SelectionBackground() });
 
             const auto vp = _renderEngine->GetViewportInCharacters(viewInPixels);
@@ -360,9 +369,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
             if (_owningHwnd != 0)
             {
-                if (auto withWindow{ _connection.try_as<TerminalConnection::ITerminalConnectionWithWindow>() })
+                if (auto conpty{ _connection.try_as<TerminalConnection::ConptyConnection>() })
                 {
-                    withWindow.ReparentWindow(_owningHwnd);
+                    conpty.ReparentWindow(_owningHwnd);
                 }
             }
 
@@ -387,7 +396,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
             _renderEngine->SetRetroTerminalEffect(_settings->RetroTerminalEffect());
             _renderEngine->SetPixelShaderPath(_settings->PixelShaderPath());
-            _renderEngine->SetPixelShaderImagePath(_settings->PixelShaderImagePath());
             _renderEngine->SetForceFullRepaintRendering(_settings->ForceFullRepaintRendering());
             _renderEngine->SetSoftwareRendering(_settings->SoftwareRendering());
 
@@ -861,7 +869,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         const auto lock = _terminal->LockForWriting();
 
-        _builtinGlyphs = _settings->EnableBuiltinGlyphs();
         _cellWidth = CSSLengthPercentage::FromString(_settings->CellWidth().c_str());
         _cellHeight = CSSLengthPercentage::FromString(_settings->CellHeight().c_str());
         _runtimeOpacity = std::nullopt;
@@ -908,14 +915,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // Update the terminal core with its new Core settings
         _terminal->UpdateAppearance(*newAppearance);
 
-        // Update AtlasEngine settings under the lock
+        // Update DxEngine settings under the lock
         if (_renderEngine)
         {
-            // Update AtlasEngine settings under the lock
+            // Update DxEngine settings under the lock
             _renderEngine->SetSelectionBackground(til::color{ newAppearance->SelectionBackground() });
             _renderEngine->SetRetroTerminalEffect(newAppearance->RetroTerminalEffect());
             _renderEngine->SetPixelShaderPath(newAppearance->PixelShaderPath());
-            _renderEngine->SetPixelShaderImagePath(newAppearance->PixelShaderImagePath());
 
             // Incase EnableUnfocusedAcrylic is disabled and Focused Acrylic is set to true,
             // the terminal should ignore the unfocused opacity from settings.
@@ -948,7 +954,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     void ControlCore::_updateAntiAliasingMode()
     {
         D2D1_TEXT_ANTIALIAS_MODE mode;
-        // Update AtlasEngine's AntialiasingMode
+        // Update DxEngine's AntialiasingMode
         switch (_settings->AntialiasingMode())
         {
         case TextAntialiasingMode::Cleartype:
@@ -1041,7 +1047,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _actualFont = { fontFace, 0, fontWeight.Weight, _desiredFont.GetEngineSize(), CP_UTF8, false };
         _actualFontFaceName = { fontFace };
 
-        _desiredFont.SetEnableBuiltinGlyphs(_builtinGlyphs);
         _desiredFont.SetCellSize(_cellWidth, _cellHeight);
 
         const auto before = _actualFont.GetSize();
@@ -2044,12 +2049,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         if (clearType == Control::ClearBufferType::Screen || clearType == Control::ClearBufferType::All)
         {
-            // Send a signal to clear the buffer.
-            if (auto withBuffer{ _connection.try_as<TerminalConnection::ITerminalConnectionWithBufferState>() })
+            // Send a signal to conpty to clear the buffer.
+            if (auto conpty{ _connection.try_as<TerminalConnection::ConptyConnection>() })
             {
                 // ConPTY will emit sequences to sync up our buffer with its new
                 // contents.
-                withBuffer.ClearBuffer();
+                conpty.ClearBuffer();
             }
         }
     }
@@ -2253,9 +2258,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         if (_initializedTerminal.load(std::memory_order_relaxed))
         {
             // show is true, hide is false
-            if (auto withWindow{ _connection.try_as<TerminalConnection::ITerminalConnectionWithWindow>() })
+            if (auto conpty{ _connection.try_as<TerminalConnection::ConptyConnection>() })
             {
-                withWindow.ShowHide(showOrHide);
+                conpty.ShowHide(showOrHide);
             }
         }
     }
@@ -2317,9 +2322,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         if (owner != _owningHwnd && _connection)
         {
-            if (auto withWindow{ _connection.try_as<TerminalConnection::ITerminalConnectionWithWindow>() })
+            if (auto conpty{ _connection.try_as<TerminalConnection::ConptyConnection>() })
             {
-                withWindow.ReparentWindow(owner);
+                conpty.ReparentWindow(owner);
             }
         }
         _owningHwnd = owner;

src/cascadia/TerminalControl/ControlCore.h

@@ -5,7 +5,7 @@
 // - ControlCore.h
 //
 // Abstract:
-// - This encapsulates a `Terminal` instance, a `AtlasEngine` and `Renderer`, and
+// - This encapsulates a `Terminal` instance, a `DxEngine` and `Renderer`, and
 //   an `ITerminalConnection`. This is intended to be everything that someone
 //   might need to stand up a terminal instance in a control, but without any
 //   regard for how the UX works.
@@ -316,7 +316,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         FontInfoDesired _desiredFont;
         FontInfo _actualFont;
         winrt::hstring _actualFontFaceName;
-        bool _builtinGlyphs = true;
         CSSLengthPercentage _cellWidth;
         CSSLengthPercentage _cellHeight;
 

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -14,6 +14,7 @@
 #include "InteractivityAutomationPeer.h"
 
 #include "ControlInteractivity.g.cpp"
+#include "TermControl.h"
 
 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Console::VirtualTerminal;

src/cascadia/TerminalControl/HwndTerminal.cpp

@@ -3,18 +3,11 @@
 
 #include "pch.h"
 #include "HwndTerminal.hpp"
-
-#include <DefaultSettings.h>
 #include <windowsx.h>
-
-#include "HwndTerminalAutomationPeer.hpp"
-#include "../../cascadia/TerminalCore/Terminal.hpp"
-#include "../../renderer/atlas/AtlasEngine.h"
-#include "../../renderer/base/renderer.hpp"
-#include "../../renderer/uia/UiaRenderer.hpp"
+#include <DefaultSettings.h>
 #include "../../types/viewport.cpp"
+#include "../../types/inc/GlyphWidth.hpp"
 
-using namespace ::Microsoft::Console::VirtualTerminal;
 using namespace ::Microsoft::Terminal::Core;
 
 static LPCWSTR term_window_class = L"HwndTerminalClass";
@@ -109,23 +102,25 @@ try
             }
             break;
         case WM_RBUTTONDOWN:
-            try
+            if (publicTerminal->_terminal && publicTerminal->_terminal->IsSelectionActive())
             {
-                if (publicTerminal->_terminal)
+                try
                 {
-                    const auto lock = publicTerminal->_terminal->LockForWriting();
-                    if (publicTerminal->_terminal->IsSelectionActive())
+                    Terminal::TextCopyData bufferData;
                     {
-                        const auto bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false, true, true);
-                        LOG_IF_FAILED(publicTerminal->_CopyTextToSystemClipboard(bufferData.plainText, bufferData.html, bufferData.rtf));
-                        publicTerminal->_ClearSelection();
-                        return 0;
+                        const auto lock = publicTerminal->_terminal->LockForWriting();
+                        bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false, true, true);
                     }
+                    LOG_IF_FAILED(publicTerminal->_CopyTextToSystemClipboard(bufferData.plainText, bufferData.html, bufferData.rtf));
+                    publicTerminal->_ClearSelection();
                 }
-                publicTerminal->_PasteTextFromClipboard();
-                return 0;
+                CATCH_LOG();
             }
-            CATCH_LOG();
+            else
+            {
+                publicTerminal->_PasteTextFromClipboard();
+            }
+            return 0;
         case WM_DESTROY:
             // Release Terminal's hwnd so Teardown doesn't try to destroy it again
             publicTerminal->_hwnd.release();
@@ -215,10 +210,10 @@ HRESULT HwndTerminal::Initialize()
     RETURN_HR_IF_NULL(E_POINTER, localPointerToThread);
     RETURN_IF_FAILED(localPointerToThread->Initialize(_renderer.get()));
 
-    auto engine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
-    RETURN_IF_FAILED(engine->SetHwnd(_hwnd.get()));
-    RETURN_IF_FAILED(engine->Enable());
-    _renderer->AddRenderEngine(engine.get());
+    auto dxEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
+    RETURN_IF_FAILED(dxEngine->SetHwnd(_hwnd.get()));
+    RETURN_IF_FAILED(dxEngine->Enable());
+    _renderer->AddRenderEngine(dxEngine.get());
 
     _UpdateFont(USER_DEFAULT_SCREEN_DPI);
     RECT windowRect;
@@ -229,9 +224,9 @@ HRESULT HwndTerminal::Initialize()
     // Fist set up the dx engine with the window size in pixels.
     // Then, using the font, get the number of characters that can fit.
     const auto viewInPixels = Viewport::FromDimensions({ 0, 0 }, windowSize);
-    RETURN_IF_FAILED(engine->SetWindowSize({ viewInPixels.Width(), viewInPixels.Height() }));
+    RETURN_IF_FAILED(dxEngine->SetWindowSize({ viewInPixels.Width(), viewInPixels.Height() }));
 
-    _renderEngine = std::move(engine);
+    _renderEngine = std::move(dxEngine);
 
     _terminal->Create({ 80, 25 }, 9001, *_renderer);
     _terminal->SetWriteInputCallback([=](std::wstring_view input) noexcept { _WriteTextToConnection(input); });
@@ -754,7 +749,7 @@ try
         ScreenToClient(_hwnd.get(), cursorPosition.as_win32_point());
     }
 
-    const Microsoft::Console::VirtualTerminal::TerminalInput::MouseButtonState state{
+    const TerminalInput::MouseButtonState state{
         WI_IsFlagSet(GetKeyState(VK_LBUTTON), KeyPressed),
         WI_IsFlagSet(GetKeyState(VK_MBUTTON), KeyPressed),
         WI_IsFlagSet(GetKeyState(VK_RBUTTON), KeyPressed)
@@ -899,7 +894,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
             [[gsl::suppress(bounds .3)]] renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
         }
 
-        publicTerminal->_terminal->SetCursorStyle(static_cast<Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle>(theme.CursorStyle));
+        publicTerminal->_terminal->SetCursorStyle(static_cast<DispatchTypes::CursorStyle>(theme.CursorStyle));
 
         publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, static_cast<float>(fontSize), CP_UTF8 };
         publicTerminal->_UpdateFont(newDpi);

src/cascadia/TerminalControl/HwndTerminal.hpp

@@ -3,31 +3,14 @@
 
 #pragma once
 
-#include "../../buffer/out/textBuffer.hpp"
-#include "../../renderer/inc/FontInfoDesired.hpp"
+#include "../../renderer/base/Renderer.hpp"
+#include "../../renderer/dx/DxRenderer.hpp"
+#include "../../renderer/uia/UiaRenderer.hpp"
+#include "../../cascadia/TerminalCore/Terminal.hpp"
 #include "../../types/IControlAccessibilityInfo.h"
+#include "HwndTerminalAutomationPeer.hpp"
 
-namespace Microsoft::Console::Render::Atlas
-{
-    class AtlasEngine;
-}
-
-namespace Microsoft::Console::Render
-{
-    using AtlasEngine = Atlas::AtlasEngine;
-    class IRenderData;
-    class Renderer;
-    class UiaEngine;
-}
-
-namespace Microsoft::Terminal::Core
-{
-    class Terminal;
-}
-
-class FontInfo;
-class FontInfoDesired;
-class HwndTerminalAutomationPeer;
+using namespace Microsoft::Console::VirtualTerminal;
 
 // Keep in sync with TerminalTheme.cs
 typedef struct _TerminalTheme
@@ -96,7 +79,7 @@ private:
     std::unique_ptr<::Microsoft::Terminal::Core::Terminal> _terminal;
 
     std::unique_ptr<::Microsoft::Console::Render::Renderer> _renderer;
-    std::unique_ptr<::Microsoft::Console::Render::AtlasEngine> _renderEngine;
+    std::unique_ptr<::Microsoft::Console::Render::DxEngine> _renderEngine;
     std::unique_ptr<::Microsoft::Console::Render::UiaEngine> _uiaEngine;
 
     bool _focused{ false };

src/cascadia/TerminalControl/IControlAppearance.idl

@@ -18,6 +18,5 @@ namespace Microsoft.Terminal.Control
         // Experimental settings
         Boolean RetroTerminalEffect { get; };
         String PixelShaderPath { get; };
-        String PixelShaderImagePath { get; };
     };
 }

src/cascadia/TerminalControl/IControlSettings.idl

@@ -35,13 +35,14 @@ namespace Microsoft.Terminal.Control
         Boolean EnableUnfocusedAcrylic;
         ScrollbarState ScrollState { get; };
 
+        Boolean UseAtlasEngine { get; };
+
         String FontFace { get; };
         Single FontSize { get; };
         Windows.UI.Text.FontWeight FontWeight { get; };
         String Padding { get; };
         Windows.Foundation.Collections.IMap<String, UInt32> FontFeatures { get; };
         Windows.Foundation.Collections.IMap<String, Single> FontAxes { get; };
-        Boolean EnableBuiltinGlyphs { get; };
         String CellWidth { get; };
         String CellHeight { get; };
 

src/cascadia/TerminalControl/IDirectKeyListener.idl

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Control
+{
+    // C++/winrt makes it difficult to share this idl between two projects,
+    // Instead, we just pin the uuid and include it in both TermControl and App
+    // If you update this one, please update TerminalApp\IDirectKeyListener.idl.
+    // If you change this interface, please update the guid.
+    // If you press F7 or Alt and get a runtime error, go make sure both copies are the same.
+    [uuid("0ddf4edc-3fda-4dee-97ca-a417ee3dd510")] interface IDirectKeyListener {
+        Boolean OnDirectKeyEvent(UInt32 vkey, UInt8 scanCode, Boolean down);
+    };
+}

src/cascadia/TerminalControl/ScrollBarVisualStateManager.cpp

@@ -5,8 +5,6 @@
 #include "ScrollBarVisualStateManager.h"
 #include "ScrollBarVisualStateManager.g.cpp"
 
-#include "TermControl.h"
-
 using namespace winrt::Windows::UI::Xaml::Media;
 
 namespace winrt::Microsoft::Terminal::Control::implementation

src/cascadia/TerminalControl/ScrollBarVisualStateManager.h

@@ -14,12 +14,12 @@
 #include <winrt/Windows.UI.Xaml.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
 
+#include "TermControl.h"
+
 #include "ScrollBarVisualStateManager.g.h"
 
 namespace winrt::Microsoft::Terminal::Control::implementation
 {
-    struct TermControl;
-
     struct ScrollBarVisualStateManager : ScrollBarVisualStateManagerT<ScrollBarVisualStateManager>
     {
         bool GoToStateCore(winrt::Windows::UI::Xaml::Controls::Control const& control, winrt::Windows::UI::Xaml::FrameworkElement const& templateRoot, hstring const& stateName, winrt::Windows::UI::Xaml::VisualStateGroup const& group, winrt::Windows::UI::Xaml::VisualState const& state, bool useTransitions);

src/cascadia/TerminalControl/TermControl.cpp

@@ -2404,14 +2404,25 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // then use it to measure how much space the requested rows and columns
         // will take up.
         // TODO: MSFT:21254947 - use a static function to do this instead of
-        // instantiating a AtlasEngine.
+        // instantiating a DxEngine/AtlasEngine.
         // GH#10211 - UNDER NO CIRCUMSTANCE should this fail. If it does, the
         // whole app will crash instantaneously on launch, which is no good.
-        const auto engine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
-        LOG_IF_FAILED(engine->UpdateDpi(dpi));
-        LOG_IF_FAILED(engine->UpdateFont(desiredFont, actualFont));
+        float scale;
+        if (settings.UseAtlasEngine())
+        {
+            auto engine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
+            LOG_IF_FAILED(engine->UpdateDpi(dpi));
+            LOG_IF_FAILED(engine->UpdateFont(desiredFont, actualFont));
+            scale = engine->GetScaling();
+        }
+        else
+        {
+            auto engine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
+            LOG_IF_FAILED(engine->UpdateDpi(dpi));
+            LOG_IF_FAILED(engine->UpdateFont(desiredFont, actualFont));
+            scale = engine->GetScaling();
+        }
 
-        const auto scale = engine->GetScaling();
         const auto actualFontSize = actualFont.GetSize();
 
         // UWP XAML scrollbars aren't guaranteed to be the same size as the

src/cascadia/TerminalControl/TermControl.h

@@ -7,6 +7,7 @@
 #include "XamlLights.h"
 #include "EventArgs.h"
 #include "../../renderer/base/Renderer.hpp"
+#include "../../renderer/dx/DxRenderer.hpp"
 #include "../../renderer/uia/UiaRenderer.hpp"
 #include "../../cascadia/TerminalCore/Terminal.hpp"
 #include "../buffer/out/search.h"

src/cascadia/TerminalControl/TermControl.idl

@@ -4,19 +4,13 @@
 import "IMouseWheelListener.idl";
 import "IControlSettings.idl";
 import "ControlInteractivity.idl";
+import "IDirectKeyListener.idl";
 import "EventArgs.idl";
 import "ICoreState.idl";
 import "ControlCore.idl";
 
 namespace Microsoft.Terminal.Control
 {
-    // This matches the definition in M.T.UI.
-    // Having it here prevents us from having to refer to M.T.UI in **all consuming projects**.
-    // WinRT is a trip.
-    [uuid("0ddf4edc-3fda-4dee-97ca-a417ee3dd510")]
-    interface IDirectKeyListener {
-        Boolean OnDirectKeyEvent(UInt32 vkey, UInt8 scanCode, Boolean down);
-    }
 
     enum CursorDisplayState
     {

src/cascadia/TerminalControl/TermControlAutomationPeer.h

@@ -28,6 +28,7 @@ Modifications:
 
 #pragma once
 
+#include "TermControl.h"
 #include "ControlInteractivity.h"
 #include "TermControlAutomationPeer.g.h"
 #include "../types/TermControlUiaProvider.hpp"
@@ -36,8 +37,6 @@ Modifications:
 
 namespace winrt::Microsoft::Terminal::Control::implementation
 {
-    struct TermControl;
-
     struct TermControlAutomationPeer :
         public TermControlAutomationPeerT<TermControlAutomationPeer>,
         ::Microsoft::Console::Types::IUiaEventDispatcher

src/cascadia/TerminalControl/TerminalControlLib.vcxproj

@@ -31,7 +31,7 @@
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
+  
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -122,6 +122,7 @@
     <Midl Include="ControlInteractivity.idl" />
     <Midl Include="ScrollBarVisualStateManager.idl" />
     <Midl Include="ICoreState.idl" />
+    <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="KeyChord.idl" />
     <Midl Include="EventArgs.idl" />
     <Midl Include="IKeyBindings.idl" />
@@ -165,26 +166,20 @@
     <ProjectReference Include="..\..\buffer\out\lib\bufferout.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\renderer\base\lib\base.vcxproj" />
     <ProjectReference Include="..\..\renderer\atlas\atlas.vcxproj" />
+    <ProjectReference Include="..\..\renderer\dx\lib\dx.vcxproj" />
     <ProjectReference Include="..\..\renderer\uia\lib\uia.vcxproj" />
     <ProjectReference Include="..\..\terminal\parser\lib\parser.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\terminal\input\lib\terminalinput.vcxproj" />
-
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj" />
-
-    <ProjectReference Include="..\ITerminalConnection\ITerminalConnection.vcxproj">
-      <Project>{EFC0B7EF-BB0D-44EC-BFC9-772AE4391D17}</Project>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     </ProjectReference>
-
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
       <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
-      <Private>false</Private>
-    </ProjectReference>
   </ItemGroup>
-
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>
     <ClCompile>
@@ -198,9 +193,6 @@
   <!-- ========================= Globals ======================== -->
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 
-  <Import Project="$(SolutionDir)build\rules\ConsumeWinRTInterfacesStatically.targets" />
-  <!-- TODO DH troubleshoot why ITerminalCore isn't rolling up into our winmd so our dependers don't need to know about it; namespace decollision? -->
-
   <!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
 

src/cascadia/TerminalControl/dll/TerminalControl.vcxproj

@@ -65,21 +65,26 @@
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
+  </ItemGroup>
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
+  <ItemGroup>
+    <!-- Manually add a reference to TerminalControl here. We need this so
+    MDMERGE will know where the TermControl types are defined. However, we need
+    to do it exactly like this so the packaging project won't roll up
+    TermControl's .xbf's from both the TermControl project and this one. -->
+    <Reference Include="Microsoft.Terminal.Core">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
       <Private>false</Private>
-    </ProjectReference>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
 
-    <!-- Dependency Interfaces -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ITerminalCore\ITerminalCore.vcxproj">
+    <Reference Include="Microsoft.Terminal.TerminalConnection">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
       <Private>false</Private>
-      <Project>{40503EDC-E3E4-46AB-BC26-D293B956CAE8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ITerminalConnection\ITerminalConnection.vcxproj">
-      <Private>false</Private>
-      <Project>{EFC0B7EF-BB0D-44EC-BFC9-772AE4391D17}</Project>
-    </ProjectReference>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
   </ItemGroup>
 
   <ItemDefinitionGroup>

src/cascadia/TerminalControl/pch.h

@@ -58,8 +58,6 @@
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
 #include <winrt/Microsoft.Terminal.Core.h>
 
-#include <winrt/Microsoft.Terminal.UI.h>
-
 #include <windows.ui.xaml.media.dxinterop.h>
 
 #include <TraceLoggingProvider.h>

src/cascadia/TerminalCore/ICoreSettings.idl

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "ICoreAppearance.idl";
+import "..\ICoreAppearance.idl";
 
 namespace Microsoft.Terminal.Core
 {

src/cascadia/TerminalCore/Terminal.cpp

@@ -1602,7 +1602,7 @@ til::point Terminal::GetViewportRelativeCursorPosition() const noexcept
 // These functions are used by TerminalInput, which must build in conhost
 // against OneCore compatible signatures. See the definitions in
 // VtApiRedirection.hpp (which we cannot include cross-project.)
-// Since we don't run on OneCore, we can dispense with the compatibility
+// Since we do nto run on OneCore, we can dispense with the compatibility
 // shims.
 extern "C" UINT OneCoreSafeMapVirtualKeyW(_In_ UINT uCode, _In_ UINT uMapType)
 {