Update common.build.post.props

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -10,21 +10,14 @@ body:
 
 - type: input
   attributes:
-    label: Windows Terminal version
+    label: Windows Terminal version (or Windows build number)
-    placeholder: "1.7.3651.0"
+    placeholder: "10.0.19042.0, 1.7.3651.0"
     description: |
-      You can find the version in the about dialog, or by running `wt -v` at the commandline.
+      If you are reporting an issue in Windows Terminal, you can find the version in the about dialog.
+
+      If you are reporting an issue with the Windows Console, please run `ver` or `[Environment]::OSVersion`.
   validations:
-    required: false
+    required: true
-    
-- type: input
-  attributes:
-    label: Windows build number
-    placeholder: "10.0.19042.0"
-    description: |
-      Please run `ver` or `[Environment]::OSVersion`.
-  validations:
-    required: false
 
 - type: textarea
   attributes:

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

@@ -1,14 +1,12 @@
-admins
 apc
-Apc
-bsd
 calt
 ccmp
 changelog
+cybersecurity
+Apc
 clickable
 clig
 copyable
-cybersecurity
 dalet
 dcs
 Dcs
@@ -32,22 +30,20 @@ hyperlink
 hyperlinking
 hyperlinks
 img
-inlined
 It'd
 kje
 liga
 lje
-Llast
-Lmid
 locl
 lorem
+Llast
+Lmid
 Lorigin
 maxed
 mkmk
-mnt
 mru
-nje
 noreply
+nje
 ogonek
 ok'd
 overlined

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

@@ -1,7 +1,5 @@
 ACCEPTFILES
 ACCESSDENIED
-acl
-aclapi
 alignas
 alignof
 APPLYTOSUBMENUS
@@ -23,7 +21,6 @@ commandlinetoargv
 cstdint
 CXICON
 CYICON
-Dacl
 dataobject
 dcomp
 DERR
@@ -120,19 +117,15 @@ OSVERSIONINFOEXW
 otms
 OUTLINETEXTMETRICW
 overridable
-PACL
 PAGESCROLL
-PEXPLICIT
 PICKFOLDERS
 pmr
-ptstr
 rcx
 REGCLS
 RETURNCMD
 rfind
 roundf
 RSHIFT
-SACL
 schandle
 semver
 serializer
@@ -169,7 +162,6 @@ toupper
 TTask
 TVal
 UChar
-UFIELD
 ULARGE
 UPDATEINIFILE
 userenv

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

@@ -9,7 +9,6 @@ Diviness
 dsafa
 duhowett
 ekg
-eryksun
 ethanschoonover
 Firefox
 Gatta

.github/actions/spelling/excludes.txt

@@ -61,7 +61,6 @@ SUMS$
 ^src/host/runft\.bat$
 ^src/host/runut\.bat$
 ^src/interactivity/onecore/BgfxEngine\.
-^src/renderer/atlas/
 ^src/renderer/wddmcon/WddmConRenderer\.
 ^src/terminal/adapter/ut_adapter/run\.bat$
 ^src/terminal/parser/delfuzzpayload\.bat$

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

@@ -508,7 +508,6 @@ dealloc
 Debian
 debolden
 debugtype
-DECAC
 DECALN
 DECANM
 DECAUPSS
@@ -1761,6 +1760,7 @@ PFONTENUMDATA
 PFS
 pgd
 pgdn
+PGONu
 pgorepro
 pgort
 PGU

.github/actions/spelling/patterns/patterns.txt

@@ -4,7 +4,7 @@ https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
 https://www\.vt100\.net/docs/[-a-zA-Z0-9#_\/.]*
 https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
 https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
-https://(?:[a-z-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.+]*
+https://(?:[a-z-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.]*
 https://www.xfree86.org/[-a-zA-Z0-9?&=\/_#]*
 [Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
 (?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)

.vsconfig

@@ -17,7 +17,7 @@
     "Microsoft.Net.Component.4.5.TargetingPack",
     "Microsoft.VisualStudio.Component.DiagnosticTools",
     "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.Windows10SDK.22000",
+    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
     "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
     "Microsoft.VisualStudio.Component.VC.CoreIde",
     "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",

CONTRIBUTING.md

@@ -99,29 +99,15 @@ If you don't have any additional info/context to add but would like to indicate
 
 ## Contributing fixes / features
 
-If you're able & willing to help fix issues and/or implement features, we'd love your contribution!
+For those able & willing to help fix issues and/or implement features ...
-
-The best place to start is the list of ["Easy Starter"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+label%3A%22Easy+Starter%22+) issues. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find an issue your interested in and hop in!
-
-Generally, we categorize issues in the following way, which is largely derived from our old internal work tracking system:
-* ["Bugs"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Bug%22+) are parts of the Terminal & Console that are not quite working the right way. There's code to already support some scenario, but it's not quite working right. Fixing these is generally a matter of debugging the broken functionality and fixing the wrong code.
-* ["Tasks"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Task%22+) are usually new pieces of functionality that aren't yet implemented for the Terminal/Console. These are usually smaller features, which we believe
-  - could be a single, atomic PR
-  - Don't require much design consideration, or we've already written the spec for the larger feature they belong to.
-* ["Features"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Feature%22+) are larger pieces of new functionality. These are usually things we believe would require larger discussion of how they should be implemented, or they'll require some complicated new settings. They might just be features that are composed of many individual tasks. Often times, with features, we like to have a spec written before development work is started, to make sure we're all on the same page (see below).
-
-Bugs and tasks are obviously the easiest to get started with, but don't feel afraid of features either! We've had some community members contribute some amazing "feature"-level work to the Terminal (albeit, with lots of discussion 😄).
-
-
-Often, we like to assign issues that generally belong to somebody's area of expertise to the team member that owns that area. This doesn't mean the community can't jump in -- they should reach out and have a chat with the assignee to see if it'd okay to take. If an issue's been assigned more than a month ago, there's a good chance it's fair game to try yourself.
 
 ### To Spec or not to Spec
 
 Some issues/features may be quick and simple to describe and understand. For such scenarios, once a team member has agreed with your approach, skip ahead to the section headed "Fork, Branch, and Create your PR", below.
 
-Small issues that do not require a spec will be labelled `Issue-Bug` or `Issue-Task`.
+Small issues that do not require a spec will be labelled Issue-Bug or Issue-Task.
 
-However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled `Issue-Feature`. More often than not, we'll add such features to the ["Specification Tracker" project](https://github.com/microsoft/terminal/projects/1).
+However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled Issue-Feature.
 
 Specs help collaborators discuss different approaches to solve a problem, describe how the feature will behave, how the feature will impact the user, what happens if something goes wrong, etc. Driving towards agreement in a spec, before any code is written, often results in simpler code, and less wasted effort in the long run.
 

NuGet.Config

@@ -10,6 +10,8 @@
         <clear />
     </disabledPackageSources>
     <config>
+        <!-- TODO: TEMPORARY UNTIL PGO-Helpers is updated to search both. We shouldn't need to keep the globals path here. -->
+        <add key="globalPackagesFolder" value=".\packages" />
         <add key="repositorypath" value=".\packages" />
     </config>
 </configuration>

OpenConsole.sln

@@ -400,8 +400,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsTerminal.UIA.Tests",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api-ms-win-core-synch-l1-2-0", "src\api-ms-win-core-synch-l1-2-0\api-ms-win-core-synch-l1-2-0.vcxproj", "{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererAtlas", "src\renderer\atlas\atlas.vcxproj", "{8222900C-8B6C-452A-91AC-BE95DB04B95F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -3341,46 +3339,6 @@ Global
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x64.Build.0 = Release|x64
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.ActiveCfg = Release|Win32
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.Build.0 = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x64.Build.0 = AuditMode|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM.ActiveCfg = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.ActiveCfg = Debug|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.Build.0 = Debug|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x86.ActiveCfg = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x86.Build.0 = Debug|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|Any CPU.ActiveCfg = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM.ActiveCfg = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.Build.0 = Release|ARM64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.ActiveCfg = Release|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.Build.0 = Release|x64
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.ActiveCfg = Release|Win32
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3480,7 +3438,6 @@ Global
 		{C323DAEE-B307-4C7B-ACE5-7293CBEFCB5B} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
-		{8222900C-8B6C-452A-91AC-BE95DB04B95F} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

build/packages.config

@@ -2,4 +2,5 @@
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
+  <package id="Microsoft.PGO-Helpers.Cpp" version="0.2.22" />
 </packages>

build/pgo/PGO.DB.proj

@@ -0,0 +1,4 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Terminal.PGO.props" />
+  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.targets" />
+</Project>

build/pgo/Terminal.PGO.DB.nuspec

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.Internal.Windows.Terminal.PGODatabase</id>
+    <version>0</version>
+    <title>Windows Terminal PGO Database</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Windows Terminal PGO Database</description>
+  </metadata>
+  <files>
+    <!-- The target directories for pgd files need to remain as is.  PGO optimization pass will rely on this exact directory layout. -->
+    <file src="x64\*.pgd" target="tools\x64"/>
+  </files>
+</package>

build/pgo/Terminal.PGO.props

@@ -0,0 +1,41 @@
+<Project>
+  <PropertyGroup>
+    <NuGetPackageDirectory>$(MSBuildThisFileDirectory)..\..\packages</NuGetPackageDirectory>
+    <PkgMicrosoft_PGO_Helpers_Cpp>$(NuGetPackageDirectory)\Microsoft.PGO-Helpers.Cpp.0.2.22</PkgMicrosoft_PGO_Helpers_Cpp>
+  </PropertyGroup>
+
+  <!-- Get version information -->
+  <Import Project="$(MSBuildThisFileDirectory)..\..\custom.props" />
+
+  <PropertyGroup>
+    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
+    <PGOBranch>dev/miniksa/pgo</PGOBranch>
+
+    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
+    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
+
+    <!-- Mandatory.  Major version number of the PGO database which should match the version of the product.  This can be hardcoded or obtained from other sources in build system. -->
+    <PGOPackageVersionMajor>$(VersionMajor)</PGOPackageVersionMajor>
+
+    <!-- Mandatory.  Minor version number of the PGO database which should match the version of the product.  This can be hardcoded or obtained from other sources in build system. -->
+    <PGOPackageVersionMinor>$(VersionMinor)</PGOPackageVersionMinor>
+
+    <!-- Mandatory.  Path to nuget.config file for the project.  Path is relative to where the props file will be. -->
+    <PGONuGetConfigPath>$(MSBuildThisFileDirectory)..\..\nuget.config</PGONuGetConfigPath>
+
+    <!-- Mandatory.  Path to PGO database NuSpec, see section below. -->
+    <PGONuspecPath>$(MSBuildThisFileDirectory)Terminal.PGO.DB.nuspec</PGONuspecPath>
+
+    <!-- Optional, defaults to true.  Should verification result in build failure or error? -->
+    <PGOVerifyFailureTreatedAsError>true</PGOVerifyFailureTreatedAsError>
+
+    <!-- Optional, defaults to $(IntDir)\Nuspec.  Temporary path where PGD files are copied to. -->
+    <PGONuspecBasePath>$(PGDPathForAllArch)</PGONuspecBasePath>
+
+    <!-- Optional, defaults to true.  Specifies whether to use default information for PGD files. -->
+    <PGOUseDefaultPGDFileInfo>true</PGOUseDefaultPGDFileInfo>
+  </PropertyGroup>
+
+  <!-- Import PGO-Helpers -->
+  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.props" />
+</Project>

build/pipelines/release.yml

@@ -89,6 +89,16 @@ jobs:
     displayName: Use NuGet 5.10
     inputs:
       versionSpec: 5.10
+  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
+  # This should be `task: NuGetCommand@2`
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: Restore NuGet packages for extraneous build actions
+    inputs:
+      command: restore
+      feedsToUse: config
+      configPath: NuGet.config
+      restoreSolution: build/packages.config
+      restoreDirectory: '$(Build.SourcesDirectory)\packages'
   - task: NuGetCommand@2
     displayName: NuGet custom
     inputs:
@@ -140,12 +150,6 @@ jobs:
       filePath: .\build\scripts\Generate-ThirdPartyNotices.ps1
       arguments: -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
       pwsh: true
-  - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-    - task: PowerShell@2
-      displayName: Restore PGO Database
-      inputs:
-        filePath: tools/PGODatabase/restore-pgodb.ps1
-        workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
   - ${{ if eq(parameters.buildTerminal, true) }}:
     - task: VSBuild@1
       displayName: Build solution **\OpenConsole.sln
@@ -164,20 +168,6 @@ jobs:
       inputs:
         PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
         ArtifactName: binlog-$(BuildPlatform)
-    - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-      - task: PowerShell@2
-        displayName: Validate binaries are optimized
-        condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-        inputs:
-          targetType: inline
-          script: >-
-            $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
-
-            foreach ($BinFile in $Binaries) {
-
-              & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/src/cascadia/CascadiaPackage/bin/$(BuildPlatform)/$(BuildConfiguration)/$BinFile"
-
-            }
     - task: PowerShell@2
       displayName: Check MSIX for common regressions
       inputs:

build/pipelines/templates/build-console-pgo.yml

@@ -22,7 +22,7 @@ jobs:
   steps:
   - template: build-console-steps.yml
     parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
+      additionalBuildArguments: '${{ parameters.additionalBuildArguments }}'
 
 - template: helix-runtests-job.yml
   parameters:
@@ -52,3 +52,4 @@ jobs:
     - ProcessTestResults
     pgoArtifact: 'PGO'
     platform: ${{ parameters.platform }}
+    configuration: ${{ parameters.configuration }}

build/pipelines/templates/build-console-steps.yml

@@ -12,17 +12,10 @@ steps:
   inputs:
     versionSpec: 5.2.0
 
+- task: NuGetAuthenticate@0
+
 # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
 # This should be `task: NuGetCommand@2`
-- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  displayName: Restore NuGet packages for solution
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: OpenConsole.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\packages'
-
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
   displayName: Restore NuGet packages for extraneous build actions
   inputs:
@@ -32,6 +25,15 @@ steps:
     restoreSolution: build/packages.config
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+  displayName: Restore NuGet packages for solution
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: OpenConsole.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'
+
 # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
 - script: |
     "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
@@ -47,14 +49,6 @@ steps:
   inputs:
     filename: 'set'
 
-- task: powershell@2
-  displayName: 'Restore PGO database'
-  condition: eq(variables['PGOBuildMode'], 'Optimize')
-  inputs:
-    targetType: filePath
-    workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
-    filePath: $(Build.SourcesDirectory)\tools\PGODatabase\restore-pgodb.ps1
-
 - task: VSBuild@1
   displayName: 'Build solution **\OpenConsole.sln'
   inputs:
@@ -62,7 +56,7 @@ steps:
     vsVersion: 16.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: "${{ parameters.additionalBuildArguments }}"
+    msbuildArgs: "${{ parameters.additionalBuildArguments }} /p:PGOBuildMode=$(PGOBuildMode) /p:PGOCopyRuntime=true"
     clean: true
     maximumCpuCount: true
 
@@ -95,18 +89,6 @@ steps:
       If ($Arch -Eq "x86") { $Arch = "Win32" }
       Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
 
-- task: PowerShell@2
-  displayName: 'Validate binaries are optimized'
-  condition: eq(variables['pgoBuildMode'], 'Optimize')
-  inputs:
-    targetType: inline
-    script: |
-      $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
-      foreach ($BinFile in $Binaries)
-      {
-        & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/$BinFile"
-      }
-
 - task: PowerShell@2
   displayName: 'Run Unit Tests'
   inputs:

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

@@ -11,7 +11,7 @@ jobs:
     vmImage: 'windows-2019'
   variables:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
-    pgoToolsPath: $(Build.SourcesDirectory)\tools\PGODatabase
+    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
     nuspecPath: $(pgoToolsPath)\NuSpecs
     nuspecFilename: PGO.nuspec
 
@@ -30,28 +30,22 @@ jobs:
     inputs:
       versionSpec: 5.8.0
 
-  - task: CopyFiles@2
+  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
-    displayName: 'Copy pgd files to NuGet build directory'
+  # This should be `task: NuGetCommand@2`
-    inputs:
-      sourceFolder: $(artifactsPath)\${{ parameters.pgoArtifact }}
-      contents: '**\*.pgd'
-      targetFolder: $(nuspecPath)\tools
-
-  - task: powershell@2
-    displayName: 'Generate NuSpec file'
-    inputs:
-      targetType: filePath
-      filePath: $(pgoToolsPath)\generate-nuspec.ps1
-      workingDirectory: $(pgoToolsPath)
-      arguments: $(nuspecPath)\$(nuspecFilename).template $(nuspecPath)\$(nuspecFilename)
-
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: 'NuGet pack'
+    displayName: Restore NuGet packages for extraneous build actions
     inputs:
-      command: pack
+      command: restore
-      packagesToPack: '$(nuspecPath)\$(nuspecFilename)'
+      feedsToUse: config
-      basePath: '$(nuspecPath)'
+      configPath: NuGet.config
-      packDestination: '$(Build.ArtifactStagingDirectory)'
+      restoreSolution: build/packages.config
+      restoreDirectory: '$(Build.SourcesDirectory)\packages'
+
+  - task: MSBuild@1
+    displayName: 'Create PGO Nuget'
+    inputs:
+      solution: $(pgoToolsPath)\PGO.DB.proj
+      msbuildArguments: '/t:CreatePGONuGet /p:PGDPathForAllArch=$(artifactsPath)\${{ parameters.pgoArtifact }} /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -69,4 +63,4 @@ jobs:
       # This is the name of that connection
       publishFeedCredentials: 'Terminal Public Artifact Feed'
       feedsToUse: config
-      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'

build/pipelines/templates/pgo-merge-pgd-job.yml

@@ -2,6 +2,7 @@ parameters:
   dependsOn: ''
   pgoArtifact: PGO
   platform: ''
+  configuration: ''
 
 jobs:
 - job: MergePGD
@@ -12,6 +13,7 @@ jobs:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
     pgoArtifactsPath: $(artifactsPath)\${{ parameters.pgoArtifact }}
     buildPlatform: ${{ parameters.platform }}
+    buildConfiguration: ${{ parameters.configuration }}
 
   steps:
   # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
@@ -24,58 +26,36 @@ jobs:
       echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
     displayName: 'Retrieve VC tools directory'
 
+  - task: NuGetToolInstaller@0
+    displayName: 'Use NuGet 5.2.0'
+    inputs:
+      versionSpec: 5.2.0
+
+  - task: NuGetAuthenticate@0
+
+  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
+  # This should be `task: NuGetCommand@2`
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: Restore NuGet packages for extraneous build actions
+    inputs:
+      command: restore
+      feedsToUse: config
+      configPath: NuGet.config
+      restoreSolution: build/packages.config
+      restoreDirectory: '$(Build.SourcesDirectory)\packages'
+
   - task: DownloadBuildArtifacts@0
     inputs:
       artifactName: ${{ parameters.pgoArtifact }}
       downloadPath: $(artifactsPath)
 
-  - script: |
+  - task: MSBuild@1
-      cd $(buildPlatform)
+    displayName: Merge counts into PGD
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge WindowsTerminal*.pgc WindowsTerminal.pgd
+    inputs:
-    displayName: 'Merge Terminal pgc files into pgd'
+      solution: $(Build.SourcesDirectory)\OpenConsole.sln
-    workingDirectory: $(pgoArtifactsPath)
+      platform: $(buildPlatform)
-
+      configuration: $(buildConfiguration)
-  - script: |
+      msbuildArguments: '/t:MergePGOCounts /p:PGDPath=$(pgoArtifactsPath)\$(buildPlatform) /p:PGCRootPath=$(pgoArtifactsPath)\$(buildPlatform)'
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge OpenConsole*.pgc OpenConsole.pgd
-    displayName: 'Merge OpenConsole pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Control*.pgc Microsoft.Terminal.Control.pgd
-    displayName: 'Merge Microsoft.Terminal.Control pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Remoting*.pgc Microsoft.Terminal.Remoting.pgd
-    displayName: 'Merge Microsoft.Terminal.Remoting pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Editor*.pgc Microsoft.Terminal.Settings.Editor.pgd
-    displayName: 'Merge Microsoft.Terminal.Settings.Editor pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Model*.pgc Microsoft.Terminal.Settings.Model.pgd
-    displayName: 'Merge Microsoft.Terminal.Settings.Model pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalApp*.pgc TerminalApp.pgd
-    displayName: 'Merge TerminalApp pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
-
-  - script: |
-      cd $(buildPlatform)
-      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalConnection*.pgc TerminalConnection.pgd
-    displayName: 'Merge TerminalConnection pgc files into pgd'
-    workingDirectory: $(pgoArtifactsPath)
 
   - task: CopyFiles@2
     displayName: 'Copy merged pgd to artifact staging'

build/rules/GenerateFeatureFlags.proj

@@ -63,14 +63,8 @@
     Outputs="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
     DependsOnTargets="_GenerateBranchAndBrandingCache">
     <MakeDir Directories="$(OpenConsoleCommonOutDir)\inc" />
-    <!-- This commandline is escaped like:
-
-    powershell -Command "&'$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1' -Path '%(FeatureFlagFile.FullPath)'' -Branding $(_WTBrandingName)"
-
-    which was the only way I could find to get it to obey spaces in the SolutionDir
-    -->
     <Exec
-      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;&amp;&apos;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&apos; -Path &apos;%(FeatureFlagFile.FullPath)&apos; -Branding $(_WTBrandingName)&quot;"
+      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&quot; -Path &quot;%(FeatureFlagFile.FullPath)&quot; -Branding $(_WTBrandingName)"
       ConsoleToMsBuild="true"
       StandardOutputImportance="low">
       <Output TaskParameter="ConsoleOutput" ItemName="_FeatureFlagFileLines" />

build/scripts/Create-AppxBundle.ps1

@@ -22,7 +22,7 @@ Param(
     [Parameter(HelpMessage="Path to makeappx.exe")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86\MakeAppx.exe"
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\MakeAppx.exe"
 )
 
 If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -8,7 +8,7 @@ Param(
     [Parameter(HelpMessage="Path to Windows Kit")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0"
+    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0"
 )
 
 $ErrorActionPreference = "Stop"

doc/cascadia/Unittesting-CppWinRT-Xaml.md

@@ -380,7 +380,7 @@ Here's the AppxManifest we're using:
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
@@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest:
 
 ```xml
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj

@@ -23,7 +23,7 @@
     <ProjectGuid>{96274800-9574-423E-892A-909FBE2AC8BE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EchoCon</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -163,4 +163,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

scratch/ScratchIslandApp/Package/Package.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj

@@ -118,23 +118,6 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 
-  <!--
-  BODGY
-
-  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
-  executable we put in the package. But we DON'T produce a winmd. This makes the
-  FastUpToDate check fail every time, and leads to the whole wapproj build
-  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
-
-  Setting GenerateWindowsMetadata=false is enough to tell the build system that
-  we don't produce one, and get it off our backs.
-  -->
-  <ItemDefinitionGroup>
-    <Link>
-        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 
   <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />

src/buffer/out/TextAttribute.cpp

@@ -128,22 +128,22 @@ bool TextAttribute::IsLegacy() const noexcept
 // - Calculates rgb colors based off of current color table and active modification attributes.
 // Arguments:
 // - colorTable: the current color table rgb values.
-// - defaultFgIndex: the color table index of the default foreground color.
+// - defaultFgColor: the default foreground color rgb value.
-// - defaultBgIndex: the color table index of the default background color.
+// - defaultBgColor: the default background color rgb value.
 // - reverseScreenMode: true if the screen mode is reversed.
 // - blinkingIsFaint: true if blinking should be interpreted as faint. (defaults to false)
 // - boldIsBright: true if "bold" should be interpreted as bright. (defaults to true)
 // Return Value:
 // - the foreground and background colors that should be displayed.
-std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable,
+std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
-                                                                const size_t defaultFgIndex,
+                                                                const COLORREF defaultFgColor,
-                                                                const size_t defaultBgIndex,
+                                                                const COLORREF defaultBgColor,
                                                                 const bool reverseScreenMode,
                                                                 const bool blinkingIsFaint,
                                                                 const bool boldIsBright) const noexcept
 {
-    auto fg = _foreground.GetColor(colorTable, defaultFgIndex, boldIsBright && IsBold());
+    auto fg = _foreground.GetColor(colorTable, defaultFgColor, boldIsBright && IsBold());
-    auto bg = _background.GetColor(colorTable, defaultBgIndex);
+    auto bg = _background.GetColor(colorTable, defaultBgColor);
     if (IsFaint() || (IsBlinking() && blinkingIsFaint))
     {
         fg = (fg >> 1) & 0x7F7F7F; // Divide foreground color components by two.

src/buffer/out/TextAttribute.hpp

@@ -64,9 +64,9 @@ public:
     static TextAttribute StripErroneousVT16VersionsOfLegacyDefaults(const TextAttribute& attribute) noexcept;
     WORD GetLegacyAttributes() const noexcept;
 
-    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable,
+    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
-                                                     const size_t defaultFgIndex,
+                                                     const COLORREF defaultFgColor,
-                                                     const size_t defaultBgIndex,
+                                                     const COLORREF defaultBgColor,
                                                      const bool reverseScreenMode = false,
                                                      const bool blinkingIsFaint = false,
                                                      const bool boldIsBright = true) const noexcept;

src/buffer/out/TextColor.cpp

@@ -139,16 +139,14 @@ void TextColor::SetDefault() noexcept
 // Arguments:
 // - colorTable: The table of colors we should use to look up the value of
 //      an indexed attribute from.
-// - defaultIndex: The color table index to use if we're a default attribute.
+// - defaultColor: The color value to use if we're a default attribute.
 // - brighten: if true, we'll brighten a dark color table index.
 // Return Value:
 // - a COLORREF containing the real value of this TextColor.
-COLORREF TextColor::GetColor(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable, const size_t defaultIndex, bool brighten) const noexcept
+COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const COLORREF defaultColor, bool brighten) const noexcept
 {
     if (IsDefault())
     {
-        const auto defaultColor = til::at(colorTable, defaultIndex);
-
         if (brighten)
         {
             // See MSFT:20266024 for context on this fix.

src/buffer/out/TextColor.h

@@ -65,11 +65,6 @@ public:
     static constexpr BYTE BRIGHT_CYAN = 14;
     static constexpr BYTE BRIGHT_WHITE = 15;
 
-    static constexpr size_t DEFAULT_FOREGROUND = 256;
-    static constexpr size_t DEFAULT_BACKGROUND = 257;
-    static constexpr size_t CURSOR_COLOR = 258;
-    static constexpr size_t TABLE_SIZE = 259;
-
     constexpr TextColor() noexcept :
         _meta{ ColorType::IsDefault },
         _red{ 0 },
@@ -108,7 +103,7 @@ public:
     void SetIndex(const BYTE index, const bool isIndex256) noexcept;
     void SetDefault() noexcept;
 
-    COLORREF GetColor(const std::array<COLORREF, TABLE_SIZE>& colorTable, const size_t defaultIndex, bool brighten = false) const noexcept;
+    COLORREF GetColor(const std::array<COLORREF, 256>& colorTable, const COLORREF defaultColor, bool brighten = false) const noexcept;
     BYTE GetLegacyIndex(const BYTE defaultIndex) const noexcept;
 
     constexpr BYTE GetIndex() const noexcept

src/buffer/out/cursor.cpp

@@ -27,7 +27,9 @@ Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
     _fDeferCursorRedraw(false),
     _fHaveDeferredCursorRedraw(false),
     _ulSize(ulSize),
-    _cursorType(CursorType::Legacy)
+    _cursorType(CursorType::Legacy),
+    _fUseColor(false),
+    _color(s_InvertCursorColor)
 {
 }
 
@@ -141,9 +143,10 @@ void Cursor::SetSize(const ULONG ulSize) noexcept
     _RedrawCursor();
 }
 
-void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
+void Cursor::SetStyle(const ULONG ulSize, const COLORREF color, const CursorType type) noexcept
 {
     _ulSize = ulSize;
+    _color = color;
     _cursorType = type;
 
     _RedrawCursor();
@@ -282,6 +285,7 @@ void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
     // Size will be handled separately in the resize operation.
     //_ulSize                       = OtherCursor._ulSize;
     _cursorType = OtherCursor._cursorType;
+    _color = OtherCursor._color;
 }
 
 void Cursor::DelayEOLWrap(const COORD coordDelayedAt) noexcept
@@ -331,6 +335,21 @@ const CursorType Cursor::GetType() const noexcept
     return _cursorType;
 }
 
+const bool Cursor::IsUsingColor() const noexcept
+{
+    return GetColor() != INVALID_COLOR;
+}
+
+const COLORREF Cursor::GetColor() const noexcept
+{
+    return _color;
+}
+
+void Cursor::SetColor(const unsigned int color) noexcept
+{
+    _color = gsl::narrow_cast<COLORREF>(color);
+}
+
 void Cursor::SetType(const CursorType type) noexcept
 {
     _cursorType = type;

src/buffer/out/cursor.h

@@ -24,6 +24,7 @@ class TextBuffer;
 class Cursor final
 {
 public:
+    static const unsigned int s_InvertCursorColor = INVALID_COLOR;
     // the following values are used to create the textmode cursor.
     static constexpr unsigned int CURSOR_SMALL_SIZE = 25; // large enough to be one pixel on a six pixel font
 
@@ -50,6 +51,8 @@ public:
     COORD GetPosition() const noexcept;
 
     const CursorType GetType() const noexcept;
+    const bool IsUsingColor() const noexcept;
+    const COLORREF GetColor() const noexcept;
 
     void StartDeferDrawing() noexcept;
     bool IsDeferDrawing() noexcept;
@@ -64,7 +67,7 @@ public:
     void SetIsPopupShown(const bool fIsPopupShown) noexcept;
     void SetDelay(const bool fDelay) noexcept;
     void SetSize(const ULONG ulSize) noexcept;
-    void SetStyle(const ULONG ulSize, const CursorType type) noexcept;
+    void SetStyle(const ULONG ulSize, const COLORREF color, const CursorType type) noexcept;
 
     void SetPosition(const COORD cPosition) noexcept;
     void SetXPosition(const int NewX) noexcept;
@@ -81,6 +84,7 @@ public:
     COORD GetDelayedAtPosition() const noexcept;
     bool IsDelayedEOLWrap() const noexcept;
 
+    void SetColor(const unsigned int color) noexcept;
     void SetType(const CursorType type) noexcept;
 
 private:
@@ -113,4 +117,6 @@ private:
     void _RedrawCursorAlways() noexcept;
 
     CursorType _cursorType;
+    bool _fUseColor;
+    COLORREF _color;
 };

src/buffer/out/ut_textbuffer/TextAttributeTests.cpp

@@ -24,11 +24,9 @@ class TextAttributeTests
     TEST_METHOD(TestRoundtripDefaultColors);
     TEST_METHOD(TestBoldAsBright);
 
-    std::array<COLORREF, TextColor::TABLE_SIZE> _colorTable;
+    std::array<COLORREF, 256> _colorTable;
-    const COLORREF _defaultFg = RGB(1, 2, 3);
+    COLORREF _defaultFg = RGB(1, 2, 3);
-    const COLORREF _defaultBg = RGB(4, 5, 6);
+    COLORREF _defaultBg = RGB(4, 5, 6);
-    const size_t _defaultFgIndex = TextColor::DEFAULT_FOREGROUND;
-    const size_t _defaultBgIndex = TextColor::DEFAULT_BACKGROUND;
 };
 
 bool TextAttributeTests::ClassSetup()
@@ -49,8 +47,6 @@ bool TextAttributeTests::ClassSetup()
     _colorTable[13] = RGB(180, 0, 158); // Bright Magenta
     _colorTable[14] = RGB(249, 241, 165); // Bright Yellow
     _colorTable[15] = RGB(242, 242, 242); // White
-    _colorTable[_defaultFgIndex] = _defaultFg;
-    _colorTable[_defaultBgIndex] = _defaultBg;
     return true;
 }
 
@@ -136,17 +132,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // reset the reverse video
     attr.SetReverseVideo(false);
@@ -155,17 +151,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //      while the background and getters stay the same
     attr.SetFaint(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched, and the background fainter, while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // reset the reverse video and faint attributes
     attr.SetReverseVideo(false);
@@ -175,17 +171,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //       background, while getters stay the same
     attr.SetInvisible(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // with reverse video set, the calculated background value should match
     //      the foreground, while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 }
 
 void TextAttributeTests::TestReverseDefaultColors()
@@ -198,34 +194,34 @@ void TextAttributeTests::TestReverseDefaultColors()
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched while getters stay the same
     attr.SetReverseVideo(true);
     VERIFY_IS_TRUE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     attr.SetForeground(red);
     VERIFY_IS_TRUE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 
     attr.Invert();
     VERIFY_IS_FALSE(attr.IsReverseVideo());
     attr.SetDefaultForeground();
     attr.SetBackground(green);
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
 }
 
 void TextAttributeTests::TestRoundtripDefaultColors()
@@ -281,43 +277,43 @@ void TextAttributeTests::TestBoldAsBright()
     //      values when not bold
     VERIFY_IS_FALSE(attr.IsBold());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 
     // with bold set, calculated foreground/background values shouldn't change for the default colors.
     attr.SetBold(true);
     VERIFY_IS_TRUE(attr.IsBold());
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 
     attr.SetIndexedForeground(TextColor::DARK_BLACK);
     VERIFY_IS_TRUE(attr.IsBold());
 
     Log::Comment(L"Foreground should be bright black when bold is bright is enabled");
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
 
     Log::Comment(L"Foreground should be dark black when bold is bright is disabled");
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 
     attr.SetIndexedBackground(TextColor::DARK_GREEN);
     VERIFY_IS_TRUE(attr.IsBold());
 
     Log::Comment(L"background should be unaffected by 'bold is bright'");
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 
     attr.SetBold(false);
     VERIFY_IS_FALSE(attr.IsBold());
     Log::Comment(L"when not bold, 'bold is bright' changes nothing");
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 
     Log::Comment(L"When set to a bright color, and bold, 'bold is bright' changes nothing");
     attr.SetBold(true);
     attr.SetIndexedForeground(TextColor::BRIGHT_BLACK);
     VERIFY_IS_TRUE(attr.IsBold());
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
 }

src/buffer/out/ut_textbuffer/TextColorTests.cpp

@@ -23,11 +23,9 @@ class TextColorTests
     TEST_METHOD(TestRgbColor);
     TEST_METHOD(TestChangeColor);
 
-    std::array<COLORREF, TextColor::TABLE_SIZE> _colorTable;
+    std::array<COLORREF, 256> _colorTable;
-    const COLORREF _defaultFg = RGB(1, 2, 3);
+    COLORREF _defaultFg = RGB(1, 2, 3);
-    const COLORREF _defaultBg = RGB(4, 5, 6);
+    COLORREF _defaultBg = RGB(4, 5, 6);
-    const size_t _defaultFgIndex = TextColor::DEFAULT_FOREGROUND;
-    const size_t _defaultBgIndex = TextColor::DEFAULT_BACKGROUND;
 };
 
 bool TextColorTests::ClassSetup()
@@ -48,8 +46,6 @@ bool TextColorTests::ClassSetup()
     _colorTable[13] = RGB(180, 0, 158); // Bright Magenta
     _colorTable[14] = RGB(249, 241, 165); // Bright Yellow
     _colorTable[15] = RGB(242, 242, 242); // White
-    _colorTable[_defaultFgIndex] = _defaultFg;
-    _colorTable[_defaultBgIndex] = _defaultBg;
     return true;
 }
 
@@ -61,16 +57,16 @@ void TextColorTests::TestDefaultColor()
     VERIFY_IS_FALSE(defaultColor.IsLegacy());
     VERIFY_IS_FALSE(defaultColor.IsRgb());
 
-    auto color = defaultColor.GetColor(_colorTable, _defaultFgIndex, false);
+    auto color = defaultColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = defaultColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = defaultColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = defaultColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 }
 
@@ -82,16 +78,16 @@ void TextColorTests::TestDarkIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFgIndex, false);
+    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = indexColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = indexColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = indexColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -103,16 +99,16 @@ void TextColorTests::TestBrightIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFgIndex, false);
+    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = indexColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = indexColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = indexColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -125,16 +121,16 @@ void TextColorTests::TestRgbColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
+    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 }
 
@@ -147,55 +143,55 @@ void TextColorTests::TestChangeColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
+    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
     rgbColor.SetDefault();
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
     rgbColor.SetIndex(7, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
     rgbColor.SetIndex(15, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -61,26 +61,13 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
   <Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
-
   <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
+    <ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
-      <Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
+    <ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
-    </ProjectReference>
+    <ProjectReference Include="..\..\host\proxy\Host.Proxy.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
+    <ProjectReference Include="..\TerminalAzBridge\TerminalAzBridge.vcxproj" />
-      <Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
+    <ProjectReference Include="..\ShellExtension\WindowsTerminalShellExt.vcxproj" />
-    </ProjectReference>
+    <ProjectReference Include="..\wt\wt.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
-      <Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\wt\wt.vcxproj">
-      <Project>{506fd703-baa7-4f6e-9361-64f550ec8fca}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\host\exe\Host.EXE.vcxproj">
-      <Project>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\host\proxy\Host.Proxy.vcxproj">
-      <Project>{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}</Project>
-    </ProjectReference>
   </ItemGroup>
 
   <Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -26,7 +26,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml

@@ -28,7 +28,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest

@@ -9,7 +9,7 @@
     <uap:SupportedUsers>multiple</uap:SupportedUsers>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
   <Resources>
     <Resource Language="x-generate" />

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -239,8 +239,8 @@ HRESULT HwndTerminal::Initialize()
     _terminal->SetBackgroundCallback([](auto) {});
 
     _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
-    _terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, RGB(12, 12, 12));
+    _terminal->SetDefaultBackground(RGB(12, 12, 12));
-    _terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, RGB(204, 204, 204));
+    _terminal->SetDefaultForeground(RGB(204, 204, 204));
     _terminal->SetWriteInputCallback([=](std::wstring& input) noexcept { _WriteTextToConnection(input); });
     localPointerToThread->EnablePainting();
 
@@ -781,8 +781,8 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
     {
         auto lock = publicTerminal->_terminal->LockForWriting();
 
-        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, theme.DefaultForeground);
+        publicTerminal->_terminal->SetDefaultForeground(theme.DefaultForeground);
-        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, theme.DefaultBackground);
+        publicTerminal->_terminal->SetDefaultBackground(theme.DefaultBackground);
         publicTerminal->_renderEngine->SetSelectionBackground(theme.DefaultSelectionBackground, theme.SelectionBackgroundAlpha);
 
         // Set the font colors

src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj

@@ -29,9 +29,6 @@
     <ProjectReference Include="$(SolutionDir)src\types\lib\types.vcxproj">
       <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)src\renderer\atlas\atlas.vcxproj">
-      <Project>{8222900C-8B6C-452A-91AC-BE95DB04B95F}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)src\renderer\base\lib\base.vcxproj">
       <Project>{af0a096a-8b3a-4949-81ef-7df8f0fee91f}</Project>
     </ProjectReference>

src/cascadia/TerminalApp/AppLogic.cpp

@@ -12,8 +12,6 @@
 #include <WtExeUtils.h>
 #include <wil/token_helpers.h >
 
-#include "../../types/inc/utils.hpp"
-
 using namespace winrt::Windows::ApplicationModel;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::UI::Xaml;
@@ -133,6 +131,38 @@ static Documents::Run _BuildErrorRun(const winrt::hstring& text, const ResourceD
     return textRun;
 }
 
+// Method Description:
+// - Returns whether the user is either a member of the Administrators group or
+//   is currently elevated.
+// - This will return **FALSE** if the user has UAC disabled entirely, because
+//   there's no separation of power between the user and an admin in that case.
+// Return Value:
+// - true if the user is an administrator
+static bool _isUserAdmin() noexcept
+try
+{
+    wil::unique_handle processToken{ GetCurrentProcessToken() };
+    const auto elevationType = wil::get_token_information<TOKEN_ELEVATION_TYPE>(processToken.get());
+    const auto elevationState = wil::get_token_information<TOKEN_ELEVATION>(processToken.get());
+    if (elevationType == TokenElevationTypeDefault && elevationState.TokenIsElevated)
+    {
+        // In this case, the user has UAC entirely disabled. This is sort of
+        // weird, we treat this like the user isn't an admin at all. There's no
+        // separation of powers, so the things we normally want to gate on
+        // "having special powers" doesn't apply.
+        //
+        // See GH#7754, GH#11096
+        return false;
+    }
+
+    return wil::test_token_membership(nullptr, SECURITY_NT_AUTHORITY, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS);
+}
+catch (...)
+{
+    LOG_CAUGHT_EXCEPTION();
+    return false;
+}
+
 namespace winrt::TerminalApp::implementation
 {
     // Function Description:
@@ -184,7 +214,7 @@ namespace winrt::TerminalApp::implementation
         // The TerminalPage has to be constructed during our construction, to
         // make sure that there's a terminal page for callers of
         // SetTitleBarContent
-        _isElevated = ::Microsoft::Console::Utils::IsElevated();
+        _isElevated = _isUserAdmin();
         _root = winrt::make_self<TerminalPage>();
 
         _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(winrt::Windows::System::DispatcherQueue::GetForCurrentThread(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
@@ -880,6 +910,8 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_RegisterSettingsChange()
     {
         const std::filesystem::path settingsPath{ std::wstring_view{ CascadiaSettings::SettingsPath() } };
+        const std::filesystem::path statePath{ std::wstring_view{ ApplicationState::SharedInstance().FilePath() } };
+
         _reader.create(
             settingsPath.parent_path().c_str(),
             false,
@@ -888,29 +920,14 @@ namespace winrt::TerminalApp::implementation
             // editors, who will write a temp file, then rename it to be the
             // actual file you wrote. So listen for that too.
             wil::FolderChangeEvents::FileName | wil::FolderChangeEvents::LastWriteTime,
-            [this, settingsBasename = settingsPath.filename()](wil::FolderChangeEvent, PCWSTR fileModified) {
+            [this, settingsBasename = settingsPath.filename(), stateBasename = statePath.filename()](wil::FolderChangeEvent, PCWSTR fileModified) {
-                // DO NOT create a static reference to ApplicationState::SharedInstance here.
+                const auto modifiedBasename = std::filesystem::path{ fileModified }.filename();
-                //
-                // ApplicationState::SharedInstance already caches its own
-                // static ref. If _we_ keep a static ref to the member in
-                // AppState, then our reference will keep ApplicationState alive
-                // after the `ActionToStringMap` gets cleaned up. Then, when we
-                // try to persist the actions in the window state, we won't be
-                // able to. We'll try to look up the action and the map just
-                // won't exist. We'll explode, even though the Terminal is
-                // tearing down anyways. So we'll just die, but still invoke
-                // WinDBG's post-mortem debugger, who won't be able to attach to
-                // the process that's already exiting.
-                //
-                // So DON'T ~give a mouse a cookie~ take a static ref here.
-
-                const winrt::hstring modifiedBasename{ std::filesystem::path{ fileModified }.filename().c_str() };
 
                 if (modifiedBasename == settingsBasename)
                 {
                     _reloadSettings->Run();
                 }
-                else if (ApplicationState::SharedInstance().IsStatePath(modifiedBasename))
+                else if (modifiedBasename == stateBasename)
                 {
                     _reloadState();
                 }

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -318,29 +318,7 @@
     </ProjectReference>
     <!-- For whatever reason, we can't include the TerminalControl and
     TerminalSettings projects' winmds via project references. So we'll have to
-    manually include the winmds as References below
+    manually include the winmds as References below -->
-
-    BODGY: we do need to add a ProjectReference to TerminalControl.vcxproj,
-    with Private=true, ReferenceOutputAssembly=false, so that Visual Studio's
-    "Fast Up-to-date Check" will work with this project. If we don't, the Fast
-    Up-to-date Check will look for the .xaml files from that project in our
-    output, which won't actually be there.
-
-    We do still need to separately reference the winmds manually below, which is annoying.
-    -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
-      <!-- Private:true and ReferenceOutputAssembly:false, in combination with
-      the manual reference to TerminalControl.winmd below make sure that this
-      project will compile correct, and that we won't roll up the TermControl
-      xbf's into the packaging project twice. -->
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj">
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-
   </ItemGroup>
   <PropertyGroup>
     <!-- This is a hack to get the ARM64 CI build working. See

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -3,38 +3,38 @@
 
 #include "pch.h"
 #include "TerminalPage.h"
-#include "TerminalPage.g.cpp"
+#include "Utils.h"
-#include "RenameWindowRequestedArgs.g.cpp"
+#include "../../types/inc/utils.hpp"
 
 #include <filesystem>
-
-#include <inc/WindowingBehavior.h>
 #include <LibraryResources.h>
-#include <TerminalCore/ControlKeyStates.hpp>
-#include <til/latch.h>
 
-#include "../../types/inc/utils.hpp"
+#include "TerminalPage.g.cpp"
+#include <winrt/Windows.Storage.h>
+
+#include "TabRowControl.h"
 #include "ColorHelper.h"
 #include "DebugTapConnection.h"
 #include "SettingsTab.h"
-#include "TabRowControl.h"
+#include "RenameWindowRequestedArgs.g.cpp"
+#include "../inc/WindowingBehavior.h"
+
+#include <til/latch.h>
 
 using namespace winrt;
-using namespace winrt::Microsoft::Terminal::Control;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
-using namespace winrt::Microsoft::Terminal;
-using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::System;
-using namespace winrt::Windows::System;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::UI::Text;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
+using namespace winrt::Windows::UI::Core;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::ApplicationModel::DataTransfer;
+using namespace winrt::Windows::UI::Text;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Control;
+using namespace winrt::Microsoft::Terminal::TerminalConnection;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;
 using namespace ::Microsoft::Console;
-using namespace ::Microsoft::Terminal::Core;
 using namespace std::chrono_literals;
 
 #define HOOKUP_ACTION(action) _actionDispatch->action({ this, &TerminalPage::_Handle##action });
@@ -300,7 +300,10 @@ namespace winrt::TerminalApp::implementation
     // - true if the ApplicationState should be used.
     bool TerminalPage::ShouldUsePersistedLayout(CascadiaSettings& settings) const
     {
+        // GH#5000 Until there is a separate state file for elevated sessions we should just not
+        // save at all while in an elevated window.
         return Feature_PersistedWindowLayout::IsEnabled() &&
+               !IsElevated() &&
                settings.GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedWindowLayout;
     }
 
@@ -1038,153 +1041,29 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Called when the users pressed keyBindings while CommandPalette is open.
+    // Called when the users pressed keyBindings while CommandPalette is open.
-    // - This method is effectively an extract of TermControl::_KeyHandler and TermControl::_TryHandleKeyBinding.
     // Arguments:
     // - e: the KeyRoutedEventArgs containing info about the keystroke.
     // Return Value:
     // - <none>
     void TerminalPage::_KeyDownHandler(Windows::Foundation::IInspectable const& /*sender*/, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
     {
-        const auto keyStatus = e.KeyStatus();
+        const auto key = e.OriginalKey();
-        const auto vkey = gsl::narrow_cast<WORD>(e.OriginalKey());
+        const auto scanCode = e.KeyStatus().ScanCode;
-        const auto scanCode = gsl::narrow_cast<WORD>(keyStatus.ScanCode);
+        const auto coreWindow = CoreWindow::GetForCurrentThread();
-        const auto modifiers = _GetPressedModifierKeys();
+        const auto ctrlDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
+        const auto altDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
+        const auto shiftDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
 
-        // GH#11076:
+        winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, false, static_cast<int32_t>(key), static_cast<int32_t>(scanCode) };
-        // For some weird reason we sometimes receive a WM_KEYDOWN
+        if (const auto cmd{ _settings.ActionMap().GetActionByKeyChord(kc) })
-        // message without vkey or scanCode if a user drags a tab.
-        // The KeyChord constructor has a debug assertion ensuring that all KeyChord
-        // either have a valid vkey/scanCode. This is important, because this prevents
-        // accidential insertion of invalid KeyChords into classes like ActionMap.
-        if (!vkey && !scanCode)
         {
-            return;
+            if (CommandPalette().Visibility() == Visibility::Visible && cmd.ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
-        }
-
-        // Alt-Numpad# input will send us a character once the user releases
-        // Alt, so we should be ignoring the individual keydowns. The character
-        // will be sent through the TSFInputControl. See GH#1401 for more
-        // details
-        if (modifiers.IsAltPressed() && (vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9))
-        {
-            return;
-        }
-
-        // GH#2235: Terminal::Settings hasn't been modified to differentiate
-        // between AltGr and Ctrl+Alt yet.
-        // -> Don't check for key bindings if this is an AltGr key combination.
-        if (modifiers.IsAltGrPressed())
-        {
-            return;
-        }
-
-        const auto actionMap = _settings.ActionMap();
-        if (!actionMap)
-        {
-            return;
-        }
-
-        const auto cmd = actionMap.GetActionByKeyChord({
-            modifiers.IsCtrlPressed(),
-            modifiers.IsAltPressed(),
-            modifiers.IsShiftPressed(),
-            modifiers.IsWinPressed(),
-            vkey,
-            scanCode,
-        });
-        if (!cmd)
-        {
-            return;
-        }
-
-        if (!_actionDispatch->DoAction(cmd.ActionAndArgs()))
-        {
-            return;
-        }
-
-        if (const auto p = CommandPalette(); p.Visibility() == Visibility::Visible && cmd.ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
-        {
-            p.Visibility(Visibility::Collapsed);
-        }
-
-        // Let's assume the user has bound the dead key "^" to a sendInput command that sends "b".
-        // If the user presses the two keys "^a" it'll produce "bâ", despite us marking the key event as handled.
-        // The following is used to manually "consume" such dead keys and clear them from the keyboard state.
-        _ClearKeyboardState(vkey, scanCode);
-        e.Handled(true);
-    }
-
-    // Method Description:
-    // - Get the modifier keys that are currently pressed. This can be used to
-    //   find out which modifiers (ctrl, alt, shift) are pressed in events that
-    //   don't necessarily include that state.
-    // - This is a copy of TermControl::_GetPressedModifierKeys.
-    // Return Value:
-    // - The Microsoft::Terminal::Core::ControlKeyStates representing the modifier key states.
-    ControlKeyStates TerminalPage::_GetPressedModifierKeys() noexcept
-    {
-        const CoreWindow window = CoreWindow::GetForCurrentThread();
-        // DONT USE
-        //      != CoreVirtualKeyStates::None
-        // OR
-        //      == CoreVirtualKeyStates::Down
-        // Sometimes with the key down, the state is Down | Locked.
-        // Sometimes with the key up, the state is Locked.
-        // IsFlagSet(Down) is the only correct solution.
-
-        struct KeyModifier
-        {
-            VirtualKey vkey;
-            ControlKeyStates flags;
-        };
-
-        constexpr std::array<KeyModifier, 7> modifiers{ {
-            { VirtualKey::RightMenu, ControlKeyStates::RightAltPressed },
-            { VirtualKey::LeftMenu, ControlKeyStates::LeftAltPressed },
-            { VirtualKey::RightControl, ControlKeyStates::RightCtrlPressed },
-            { VirtualKey::LeftControl, ControlKeyStates::LeftCtrlPressed },
-            { VirtualKey::Shift, ControlKeyStates::ShiftPressed },
-            { VirtualKey::RightWindows, ControlKeyStates::RightWinPressed },
-            { VirtualKey::LeftWindows, ControlKeyStates::LeftWinPressed },
-        } };
-
-        ControlKeyStates flags;
-
-        for (const auto& mod : modifiers)
-        {
-            const auto state = window.GetKeyState(mod.vkey);
-            const auto isDown = WI_IsFlagSet(state, CoreVirtualKeyStates::Down);
-
-            if (isDown)
             {
-                flags |= mod.flags;
+                CommandPalette().Visibility(Visibility::Collapsed);
             }
-        }
+            _actionDispatch->DoAction(cmd.ActionAndArgs());
-
+            e.Handled(true);
-        return flags;
-    }
-
-    // Method Description:
-    // - Discards currently pressed dead keys.
-    // - This is a copy of TermControl::_ClearKeyboardState.
-    // Arguments:
-    // - vkey: The vkey of the key pressed.
-    // - scanCode: The scan code of the key pressed.
-    void TerminalPage::_ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept
-    {
-        std::array<BYTE, 256> keyState;
-        if (!GetKeyboardState(keyState.data()))
-        {
-            return;
-        }
-
-        // As described in "Sometimes you *want* to interfere with the keyboard's state buffer":
-        //   http://archives.miloush.net/michkap/archive/2006/09/10/748775.html
-        // > "The key here is to keep trying to pass stuff to ToUnicode until -1 is not returned."
-        std::array<wchar_t, 16> buffer;
-        while (ToUnicodeEx(vkey, scanCode, keyState.data(), buffer.data(), gsl::narrow_cast<int>(buffer.size()), 0b1, nullptr) < 0)
-        {
         }
     }
 

src/cascadia/TerminalApp/TerminalPage.h

@@ -14,17 +14,12 @@
 
 static constexpr uint32_t DefaultRowsToScroll{ 3 };
 static constexpr std::wstring_view TabletInputServiceKey{ L"TabletInputService" };
-
+// fwdecl unittest classes
 namespace TerminalAppLocalTests
 {
     class TabTests;
     class SettingsTests;
-}
+};
-
-namespace Microsoft::Terminal::Core
-{
-    class ControlKeyStates;
-}
 
 namespace winrt::TerminalApp::implementation
 {
@@ -230,8 +225,6 @@ namespace winrt::TerminalApp::implementation
         void _ThirdPartyNoticesOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
 
         void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
-        static ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() noexcept;
-        static void _ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept;
         void _HookupKeyBindings(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap) noexcept;
         void _RegisterActionCallbacks();
 

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

@@ -68,22 +68,5 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!--
-  BODGY
-
-  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
-  executable we put in the package. But we DON'T produce a winmd. This makes the
-  FastUpToDate check fail every time, and leads to the whole wapproj build
-  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
-
-  Setting GenerateWindowsMetadata=false is enough to tell the build system that
-  we don't produce one, and get it off our backs.
-  -->
-  <ItemDefinitionGroup>
-    <Link>
-        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
 </Project>

src/cascadia/TerminalConnection/TerminalConnection.vcxproj

@@ -97,39 +97,4 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-
+</Project>
-  <!--
-  BODGY:
-
-  We depend on `cpprest142*.dll`, which comes from our vcpkg dependency. As a
-  part of the vcpkg dependency restore, msbuild will call the `deployBinary()`
-  function in
-  `packages\vcpkg-cpprestsdk.2.10.14\scripts\BuildSystems\msbuild\AppLocal.ps1`.
-  That function does the actual job of copying the file. It copies it outside of
-  MsBuild. MsBuild then, in the `_CopyFilesMarkedCopyLocal` target, determines
-  that it needs to copy `cpprest142*.dll`, because that dll is a member of
-  `@(ReferencesCopiedInThisBuild)`. However, the file's already been copied, so
-  MsBuild never copies it. But that also prevents MsBuild from setting
-  `WroteAtLeastOneFile`, which then means that MsBuild will never create the
-  .CopyComplete file for this project.
-
-  Because that file is missing, MsBuild will never think the project is up to
-  date, and the FastUpToDate check in VS will always force MsBuild to run a pass
-  on this project.
-
-  To mitigate this, we're adding this other target here, which runs after
-  _CopyFilesMarkedCopyLocal, and always creates the CopyUpToDateMarker. This
-  makes the FastUpToDate check succeed.
-  -->
-
-  <Target
-      Name="_Post_CopyFilesMarkedCopyLocal"
-      AfterTargets="_CopyFilesMarkedCopyLocal"
-      Condition="'@(ReferenceCopyLocalPaths)' != ''">
-
-    <Touch Files="@(CopyUpToDateMarker)"
-      AlwaysCreate="true" />
-  </Target>
-
-
-</Project>

src/cascadia/TerminalControl/ControlCore.cpp

@@ -3,18 +3,16 @@
 
 #include "pch.h"
 #include "ControlCore.h"
-
+#include <argb.h>
 #include <DefaultSettings.h>
 #include <unicode.hpp>
 #include <Utf16Parser.hpp>
+#include <Utils.h>
 #include <WinUser.h>
 #include <LibraryResources.h>
-
-#include "EventArgs.h"
 #include "../../types/inc/GlyphWidth.hpp"
+#include "../../types/inc/Utils.hpp"
 #include "../../buffer/out/search.h"
-#include "../../renderer/atlas/AtlasEngine.h"
-#include "../../renderer/dx/DxRenderer.hpp"
 
 #include "ControlCore.g.cpp"
 
@@ -204,8 +202,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                                  const double actualHeight,
                                  const double compositionScale)
     {
-        assert(_settings);
-
         _panelWidth = actualWidth;
         _panelHeight = actualHeight;
         _compositionScale = compositionScale;
@@ -226,16 +222,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 return false;
             }
 
-            if (Feature_AtlasEngine::IsEnabled() && _settings.UseAtlasEngine())
+            // Set up the DX Engine
-            {
+            auto dxEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
-                _renderEngine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
+            _renderer->AddRenderEngine(dxEngine.get());
-            }
+            _renderEngine = std::move(dxEngine);
-            else
-            {
-                _renderEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
-            }
-
-            _renderer->AddRenderEngine(_renderEngine.get());
 
             // Initialize our font with the renderer
             // We don't have to care about DPI. We'll get a change message immediately if it's not 96
@@ -281,12 +271,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             _renderEngine->SetSoftwareRendering(_settings.SoftwareRendering());
             _renderEngine->SetIntenseIsBold(_settings.IntenseIsBold());
 
-            _updateAntiAliasingMode();
+            _updateAntiAliasingMode(_renderEngine.get());
 
             // GH#5098: Inform the engine of the opacity of the default text background.
             // GH#11315: Always do this, even if they don't have acrylic on.
-            const auto backgroundIsOpaque = _settings.Opacity() == 1.0 && _settings.BackgroundImage().empty();
+            _renderEngine->SetDefaultTextBackgroundOpacity(::base::saturated_cast<float>(_settings.Opacity()));
-            _renderEngine->SetDefaultTextBackgroundOpacity(static_cast<float>(backgroundIsOpaque));
 
             THROW_IF_FAILED(_renderEngine->Enable());
 
@@ -627,7 +616,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _renderEngine->SetForceFullRepaintRendering(_settings.ForceFullRepaintRendering());
         _renderEngine->SetSoftwareRendering(_settings.SoftwareRendering());
 
-        _updateAntiAliasingMode();
+        _updateAntiAliasingMode(_renderEngine.get());
 
         // Refresh our font with the renderer
         const auto actualFontOldSize = _actualFont.GetSize();
@@ -661,24 +650,22 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
     }
 
-    void ControlCore::_updateAntiAliasingMode()
+    void ControlCore::_updateAntiAliasingMode(::Microsoft::Console::Render::DxEngine* const dxEngine)
     {
-        D2D1_TEXT_ANTIALIAS_MODE mode;
+        // Update DxEngine's AntialiasingMode
-
         switch (_settings.AntialiasingMode())
         {
         case TextAntialiasingMode::Cleartype:
-            mode = D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE;
+            dxEngine->SetAntialiasingMode(D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE);
             break;
         case TextAntialiasingMode::Aliased:
-            mode = D2D1_TEXT_ANTIALIAS_MODE_ALIASED;
+            dxEngine->SetAntialiasingMode(D2D1_TEXT_ANTIALIAS_MODE_ALIASED);
             break;
+        case TextAntialiasingMode::Grayscale:
         default:
-            mode = D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;
+            dxEngine->SetAntialiasingMode(D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE);
             break;
         }
-
-        _renderEngine->SetAntialiasingMode(mode);
     }
 
     // Method Description:
@@ -1089,7 +1076,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     til::color ControlCore::BackgroundColor() const
     {
-        return _terminal->GetColorTableEntry(TextColor::DEFAULT_BACKGROUND);
+        return _terminal->GetDefaultBackground();
     }
 
     // Method Description:
@@ -1309,8 +1296,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         if (_renderEngine)
         {
             auto lock = _terminal->LockForWriting();
-            const auto backgroundIsOpaque = opacity == 1.0 && _settings.BackgroundImage().empty();
+            _renderEngine->SetDefaultTextBackgroundOpacity(::base::saturated_cast<float>(opacity));
-            _renderEngine->SetDefaultTextBackgroundOpacity(static_cast<float>(backgroundIsOpaque));
         }
     }
 

src/cascadia/TerminalControl/ControlCore.h

@@ -15,8 +15,11 @@
 
 #pragma once
 
+#include "EventArgs.h"
 #include "ControlCore.g.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"
 #include "cppwinrt_utils.h"
@@ -185,7 +188,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // As _renderer has a dependency on _renderEngine (through a raw pointer)
         // we must ensure the _renderer is deallocated first.
         // (C++ class members are destroyed in reverse order.)
-        std::unique_ptr<::Microsoft::Console::Render::IRenderEngine> _renderEngine{ nullptr };
+        std::unique_ptr<::Microsoft::Console::Render::DxEngine> _renderEngine{ nullptr };
         std::unique_ptr<::Microsoft::Console::Render::Renderer> _renderer{ nullptr };
 
         IControlSettings _settings{ nullptr };
@@ -245,7 +248,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 #pragma endregion
 
         void _raiseReadOnlyWarning();
-        void _updateAntiAliasingMode();
+        void _updateAntiAliasingMode(::Microsoft::Console::Render::DxEngine* const dxEngine);
         void _connectionOutputHandler(const hstring& hstr);
         void _updateHoveredCell(const std::optional<til::point> terminalPosition);
 

src/cascadia/TerminalControl/ControlInteractivity.h

@@ -22,7 +22,6 @@
 #include "cppwinrt_utils.h"
 
 #include "ControlCore.h"
-#include "../../renderer/uia/UiaRenderer.hpp"
 
 namespace ControlUnitTests
 {

src/cascadia/TerminalControl/IControlSettings.idl

@@ -27,11 +27,10 @@ namespace Microsoft.Terminal.Control
     interface IControlSettings requires Microsoft.Terminal.Core.ICoreSettings, Microsoft.Terminal.Control.IControlAppearance
     {
         String ProfileName;
-        String ProfileSource;
 
         Boolean UseAcrylic;
         ScrollbarState ScrollState;
-        Boolean UseAtlasEngine;
+
         String FontFace;
         Int32 FontSize;
         Windows.UI.Text.FontWeight FontWeight;

src/cascadia/TerminalControl/TermControl.cpp

@@ -3,16 +3,17 @@
 
 #include "pch.h"
 #include "TermControl.h"
-
+#include <argb.h>
+#include <DefaultSettings.h>
 #include <unicode.hpp>
 #include <Utf16Parser.hpp>
+#include <Utils.h>
 #include <LibraryResources.h>
-
-#include "TermControlAutomationPeer.h"
 #include "../../types/inc/GlyphWidth.hpp"
-#include "../../renderer/atlas/AtlasEngine.h"
+#include "../../types/inc/Utils.hpp"
 
 #include "TermControl.g.cpp"
+#include "TermControlAutomationPeer.h"
 
 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Console::VirtualTerminal;
@@ -773,15 +774,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _HidePointerCursorHandlers(*this, nullptr);
 
         const auto ch = e.Character();
-        const auto keyStatus = e.KeyStatus();
+        const auto scanCode = gsl::narrow_cast<WORD>(e.KeyStatus().ScanCode);
-        const auto scanCode = gsl::narrow_cast<WORD>(keyStatus.ScanCode);
         auto modifiers = _GetPressedModifierKeys();
-
+        if (e.KeyStatus().IsExtendedKey)
-        if (keyStatus.IsExtendedKey)
         {
             modifiers |= ControlKeyStates::EnhancedKey;
         }
-
         const bool handled = _core.SendCharEvent(ch, scanCode, modifiers);
         e.Handled(handled);
     }
@@ -876,11 +874,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         const auto scanCode = gsl::narrow_cast<WORD>(keyStatus.ScanCode);
         auto modifiers = _GetPressedModifierKeys();
 
-        if (keyStatus.IsExtendedKey)
-        {
-            modifiers |= ControlKeyStates::EnhancedKey;
-        }
-
         // GH#11076:
         // For some weird reason we sometimes receive a WM_KEYDOWN
         // message without vkey or scanCode if a user drags a tab.
@@ -914,6 +907,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return;
         }
 
+        if (keyStatus.IsExtendedKey)
+        {
+            modifiers |= ControlKeyStates::EnhancedKey;
+        }
+
         // Alt-Numpad# input will send us a character once the user releases
         // Alt, so we should be ignoring the individual keydowns. The character
         // will be sent through the TSFInputControl. See GH#1401 for more
@@ -991,7 +989,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // Arguments:
     // - vkey: The vkey of the key pressed.
     // - scanCode: The scan code of the key pressed.
-    void TermControl::_ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept
+    void TermControl::_ClearKeyboardState(const WORD vkey, const WORD scanCode) const noexcept
     {
         std::array<BYTE, 256> keyState;
         if (!GetKeyboardState(keyState.data()))
@@ -1830,7 +1828,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         const winrt::Windows::Foundation::Size initialSize{ cols, rows };
 
-        return GetProposedDimensions(settings, dpi, initialSize);
+        return GetProposedDimensions(initialSize,
+                                     settings.FontSize(),
+                                     settings.FontWeight(),
+                                     settings.FontFace(),
+                                     settings.ScrollState(),
+                                     settings.Padding(),
+                                     dpi);
     }
 
     // Function Description:
@@ -1851,15 +1855,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     //   caller knows what monitor the control is about to appear on.
     // Return Value:
     // - a size containing the requested dimensions in pixels.
-    winrt::Windows::Foundation::Size TermControl::GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi, const winrt::Windows::Foundation::Size& initialSizeInChars)
+    winrt::Windows::Foundation::Size TermControl::GetProposedDimensions(const winrt::Windows::Foundation::Size& initialSizeInChars,
+                                                                        const int32_t& fontHeight,
+                                                                        const winrt::Windows::UI::Text::FontWeight& fontWeight,
+                                                                        const winrt::hstring& fontFace,
+                                                                        const ScrollbarState& scrollState,
+                                                                        const winrt::hstring& padding,
+                                                                        const uint32_t dpi)
     {
         const auto cols = ::base::saturated_cast<int>(initialSizeInChars.Width);
         const auto rows = ::base::saturated_cast<int>(initialSizeInChars.Height);
-        const auto fontSize = settings.FontSize();
-        const auto fontWeight = settings.FontWeight();
-        const auto fontFace = settings.FontFace();
-        const auto scrollState = settings.ScrollState();
-        const auto padding = settings.Padding();
 
         // Initialize our font information.
         // The font width doesn't terribly matter, we'll only be using the
@@ -1868,39 +1873,28 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         //      The family is only used to determine if the font is truetype or
         //      not, but DX doesn't use that info at all.
         //      The Codepage is additionally not actually used by the DX engine at all.
-        FontInfo actualFont = { fontFace, 0, fontWeight.Weight, { 0, gsl::narrow_cast<short>(fontSize) }, CP_UTF8, false };
+        FontInfo actualFont = { fontFace, 0, fontWeight.Weight, { 0, gsl::narrow_cast<short>(fontHeight) }, CP_UTF8, false };
         FontInfoDesired desiredFont = { actualFont };
 
         // Create a DX engine and initialize it with our font and DPI. We'll
         // 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 DxEngine/AtlasEngine.
+        // instantiating a DxEngine
         // GH#10211 - UNDER NO CIRCUMSTANCE should this fail. If it does, the
         // whole app will crash instantaneously on launch, which is no good.
-        double scale;
+        auto dxEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
-        if (Feature_AtlasEngine::IsEnabled() && settings.UseAtlasEngine())
+        LOG_IF_FAILED(dxEngine->UpdateDpi(dpi));
-        {
+        LOG_IF_FAILED(dxEngine->UpdateFont(desiredFont, actualFont));
-            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 actualFontSize = actualFont.GetSize();
+        const auto scale = dxEngine->GetScaling();
+        const auto fontSize = actualFont.GetSize();
 
         // UWP XAML scrollbars aren't guaranteed to be the same size as the
         // ComCtl scrollbars, but it's certainly close enough.
         const auto scrollbarSize = GetSystemMetricsForDpi(SM_CXVSCROLL, dpi);
 
-        double width = cols * actualFontSize.X;
+        double width = cols * fontSize.X;
 
         // Reserve additional space if scrollbar is intended to be visible
         if (scrollState == ScrollbarState::Visible)
@@ -1908,7 +1902,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             width += scrollbarSize;
         }
 
-        double height = rows * actualFontSize.Y;
+        double height = rows * fontSize.Y;
         const auto thickness = ParseThicknessFromPadding(padding);
         // GH#2061 - make sure to account for the size the padding _will be_ scaled to
         width += scale * (thickness.Left + thickness.Right);
@@ -1968,7 +1962,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             const winrt::Windows::Foundation::Size minSize{ 1, 1 };
             const double scaleFactor = DisplayInformation::GetForCurrentView().RawPixelsPerViewPixel();
             const auto dpi = ::base::saturated_cast<uint32_t>(USER_DEFAULT_SCREEN_DPI * scaleFactor);
-            return GetProposedDimensions(_settings, dpi, minSize);
+            return GetProposedDimensions(minSize,
+                                         _settings.FontSize(),
+                                         _settings.FontWeight(),
+                                         _settings.FontFace(),
+                                         _settings.ScrollState(),
+                                         _settings.Padding(),
+                                         dpi);
         }
     }
 
@@ -2063,7 +2063,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     //   don't necessarily include that state.
     // Return Value:
     // - The Microsoft::Terminal::Core::ControlKeyStates representing the modifier key states.
-    ControlKeyStates TermControl::_GetPressedModifierKeys() noexcept
+    ControlKeyStates TermControl::_GetPressedModifierKeys() const
     {
         const CoreWindow window = CoreWindow::GetForCurrentThread();
         // DONT USE
@@ -2271,42 +2271,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                     }
 
                     std::wstring fullPath{ item.Path() };
-
-                    // Fix path for WSL
-                    if (_settings.ProfileSource() == L"Windows.Terminal.Wsl")
-                    {
-                        std::replace(fullPath.begin(), fullPath.end(), L'\\', L'/');
-
-                        if (fullPath.size() >= 2 && fullPath.at(1) == L':')
-                        {
-                            // C:/foo/bar -> Cc/foo/bar
-                            fullPath.at(1) = til::tolower_ascii(fullPath.at(0));
-                            // Cc/foo/bar -> /mnt/c/foo/bar
-                            fullPath.replace(0, 1, L"/mnt/");
-                        }
-                        else
-                        {
-                            static constexpr std::wstring_view wslPathPrefixes[] = { L"//wsl.localhost/", L"//wsl$/" };
-                            for (auto prefix : wslPathPrefixes)
-                            {
-                                if (til::starts_with(fullPath, prefix))
-                                {
-                                    if (const auto idx = fullPath.find(L'/', prefix.size()); idx != std::wstring::npos)
-                                    {
-                                        // //wsl.localhost/Ubuntu-18.04/foo/bar -> /foo/bar
-                                        fullPath.erase(0, idx);
-                                    }
-                                    else
-                                    {
-                                        // //wsl.localhost/Ubuntu-18.04 -> /
-                                        fullPath = L"/";
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
                     const auto containsSpaces = std::find(fullPath.begin(),
                                                           fullPath.end(),
                                                           L' ') != fullPath.end();
@@ -2319,7 +2283,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
                     allPaths += fullPath;
                 }
-
                 _core.PasteText(winrt::hstring{ allPaths });
             }
         }

src/cascadia/TerminalControl/TermControl.h

@@ -92,7 +92,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void Settings(IControlSettings newSettings);
 
         static Windows::Foundation::Size GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi);
-        static Windows::Foundation::Size GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi, const winrt::Windows::Foundation::Size& initialSizeInChars);
+        static Windows::Foundation::Size GetProposedDimensions(const winrt::Windows::Foundation::Size& initialSizeInChars,
+                                                               const int32_t& fontSize,
+                                                               const winrt::Windows::UI::Text::FontWeight& fontWeight,
+                                                               const winrt::hstring& fontFace,
+                                                               const ScrollbarState& scrollState,
+                                                               const winrt::hstring& padding,
+                                                               const uint32_t dpi);
 
         void BellLightOn();
 
@@ -245,9 +251,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void _UpdateAutoScroll(Windows::Foundation::IInspectable const& sender, Windows::Foundation::IInspectable const& e);
 
         void _KeyHandler(Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e, const bool keyDown);
-        static ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() noexcept;
+        ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() const;
         bool _TryHandleKeyBinding(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers) const;
-        static void _ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept;
+        void _ClearKeyboardState(const WORD vkey, const WORD scanCode) const noexcept;
         bool _TrySendKeyEvent(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const bool keyDown);
 
         const til::point _toTerminalOrigin(winrt::Windows::Foundation::Point cursorPosition);

src/cascadia/TerminalControl/TerminalControlLib.vcxproj

@@ -147,7 +147,6 @@
     <ProjectReference Include="..\..\types\lib\types.vcxproj" />
     <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" />

src/cascadia/TerminalCore/ITerminalApi.hpp

@@ -40,10 +40,13 @@ namespace Microsoft::Terminal::Core
         virtual bool WarningBell() noexcept = 0;
         virtual bool SetWindowTitle(std::wstring_view title) noexcept = 0;
 
-        virtual COLORREF GetColorTableEntry(const size_t tableIndex) const noexcept = 0;
+        virtual bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept = 0;
-        virtual bool SetColorTableEntry(const size_t tableIndex, const COLORREF color) noexcept = 0;
 
         virtual bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept = 0;
+        virtual bool SetCursorColor(const DWORD color) noexcept = 0;
+
+        virtual bool SetDefaultForeground(const DWORD color) noexcept = 0;
+        virtual bool SetDefaultBackground(const DWORD color) noexcept = 0;
 
         virtual bool SetInputMode(const ::Microsoft::Console::VirtualTerminal::TerminalInput::Mode mode, const bool enabled) noexcept = 0;
 

src/cascadia/TerminalCore/Terminal.cpp

@@ -41,6 +41,8 @@ Terminal::Terminal() :
     _mutableViewport{ Viewport::Empty() },
     _title{},
     _colorTable{},
+    _defaultFg{ RGB(255, 255, 255) },
+    _defaultBg{ ARGB(0, 0, 0, 0) },
     _screenReversed{ false },
     _pfnWriteInput{ nullptr },
     _scrollOffset{ 0 },
@@ -59,14 +61,6 @@ Terminal::Terminal() :
 
     _stateMachine = std::make_unique<StateMachine>(std::move(engine));
 
-    // Until we have a true pass-through mode (GH#1173), the decision as to
-    // whether C1 controls are interpreted or not is made at the conhost level.
-    // If they are being filtered out, then we will simply never receive them.
-    // But if they are being accepted by conhost, there's a chance they may get
-    // passed through in some situations, so it's important that our state
-    // machine is always prepared to accept them.
-    _stateMachine->SetParserMode(StateMachine::Mode::AcceptC1, true);
-
     auto passAlongInput = [&](std::deque<std::unique_ptr<IInputEvent>>& inEventsToWrite) {
         if (!_pfnWriteInput)
         {
@@ -79,10 +73,6 @@ Terminal::Terminal() :
     _terminalInput = std::make_unique<TerminalInput>(passAlongInput);
 
     _InitializeColorTable();
-
-    _colorTable.at(TextColor::DEFAULT_FOREGROUND) = RGB(255, 255, 255);
-    _colorTable.at(TextColor::DEFAULT_BACKGROUND) = ARGB(0, 0, 0, 0);
-    _colorTable.at(TextColor::CURSOR_COLOR) = INVALID_COLOR;
 }
 
 void Terminal::Create(COORD viewportSize, SHORT scrollbackLines, IRenderTarget& renderTarget)
@@ -182,13 +172,9 @@ void Terminal::UpdateAppearance(const ICoreAppearance& appearance)
 {
     // Set the default background as transparent to prevent the
     // DX layer from overwriting the background image or acrylic effect
-    const til::color newBackgroundColor{ appearance.DefaultBackground() };
+    til::color newBackgroundColor{ appearance.DefaultBackground() };
-    _colorTable.at(TextColor::DEFAULT_BACKGROUND) = newBackgroundColor.with_alpha(0);
+    _defaultBg = newBackgroundColor.with_alpha(0);
-    const til::color newForegroundColor{ appearance.DefaultForeground() };
+    _defaultFg = appearance.DefaultForeground();
-    _colorTable.at(TextColor::DEFAULT_FOREGROUND) = newForegroundColor;
-    const til::color newCursorColor{ appearance.CursorColor() };
-    _colorTable.at(TextColor::CURSOR_COLOR) = newCursorColor;
-
     _intenseIsBright = appearance.IntenseIsBright();
     _adjustIndistinguishableColors = appearance.AdjustIndistinguishableColors();
 
@@ -227,7 +213,9 @@ void Terminal::UpdateAppearance(const ICoreAppearance& appearance)
 
     if (_buffer)
     {
-        _buffer->GetCursor().SetStyle(appearance.CursorHeight(), cursorShape);
+        _buffer->GetCursor().SetStyle(appearance.CursorHeight(),
+                                      til::color{ appearance.CursorColor() },
+                                      cursorShape);
     }
 
     _defaultCursorShape = cursorShape;

src/cascadia/TerminalCore/Terminal.hpp

@@ -106,9 +106,11 @@ public:
     bool EraseInDisplay(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::EraseType eraseType) noexcept override;
     bool WarningBell() noexcept override;
     bool SetWindowTitle(std::wstring_view title) noexcept override;
-    COLORREF GetColorTableEntry(const size_t tableIndex) const noexcept override;
     bool SetColorTableEntry(const size_t tableIndex, const COLORREF color) noexcept override;
     bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept override;
+    bool SetCursorColor(const COLORREF color) noexcept override;
+    bool SetDefaultForeground(const COLORREF color) noexcept override;
+    bool SetDefaultBackground(const COLORREF color) noexcept override;
 
     bool SetInputMode(const ::Microsoft::Console::VirtualTerminal::TerminalInput::Mode mode, const bool enabled) noexcept override;
 
@@ -210,6 +212,7 @@ public:
     void ClearPatternTree() noexcept;
 
     const std::optional<til::color> GetTabColor() const noexcept;
+    til::color GetDefaultBackground() const noexcept;
 
     Microsoft::Console::Render::BlinkingState& GetBlinkingState() const noexcept;
 
@@ -278,7 +281,9 @@ private:
     std::optional<til::color> _startingTabColor;
 
     // This is still stored as a COLORREF because it interacts with some code in ConTypes
-    std::array<COLORREF, TextColor::TABLE_SIZE> _colorTable;
+    std::array<COLORREF, XTERM_COLOR_TABLE_SIZE> _colorTable;
+    til::color _defaultFg;
+    til::color _defaultBg;
     CursorType _defaultCursorShape;
     bool _screenReversed;
     mutable Microsoft::Console::Render::BlinkingState _blinkingState;

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -69,6 +69,14 @@ COORD Terminal::GetCursorPosition() noexcept
     return newPos;
 }
 
+bool Terminal::SetCursorColor(const COLORREF color) noexcept
+try
+{
+    _buffer->GetCursor().SetColor(color);
+    return true;
+}
+CATCH_RETURN_FALSE()
+
 // Method Description:
 // - Moves the cursor down one line, and possibly also to the leftmost column.
 // Arguments:
@@ -362,22 +370,6 @@ try
 }
 CATCH_RETURN_FALSE()
 
-// Method Description:
-// - Retrieves the value in the colortable at the specified index.
-// Arguments:
-// - tableIndex: the index of the color table to retrieve.
-// Return Value:
-// - the COLORREF value for the color at that index in the table.
-COLORREF Terminal::GetColorTableEntry(const size_t tableIndex) const noexcept
-try
-{
-    return _colorTable.at(tableIndex);
-}
-catch (...)
-{
-    return INVALID_COLOR;
-}
-
 // Method Description:
 // - Updates the value in the colortable at index tableIndex to the new color
 //   color. color is a COLORREF, format 0x00BBGGRR.
@@ -391,11 +383,6 @@ try
 {
     _colorTable.at(tableIndex) = color;
 
-    if (tableIndex == TextColor::DEFAULT_BACKGROUND)
-    {
-        _pfnBackgroundColorChanged(color);
-    }
-
     // Repaint everything - the colors might have changed
     _buffer->GetRenderTarget().TriggerRedrawAll();
     return true;
@@ -455,6 +442,46 @@ bool Terminal::SetCursorStyle(const DispatchTypes::CursorStyle cursorStyle) noex
     return true;
 }
 
+// Method Description:
+// - Updates the default foreground color from a COLORREF, format 0x00BBGGRR.
+// Arguments:
+// - color: the new COLORREF to use as the default foreground color
+// Return Value:
+// - true
+bool Terminal::SetDefaultForeground(const COLORREF color) noexcept
+try
+{
+    _defaultFg = color;
+
+    // Repaint everything - the colors might have changed
+    _buffer->GetRenderTarget().TriggerRedrawAll();
+    return true;
+}
+CATCH_RETURN_FALSE()
+
+// Method Description:
+// - Updates the default background color from a COLORREF, format 0x00BBGGRR.
+// Arguments:
+// - color: the new COLORREF to use as the default background color
+// Return Value:
+// - true
+bool Terminal::SetDefaultBackground(const COLORREF color) noexcept
+try
+{
+    _defaultBg = color;
+    _pfnBackgroundColorChanged(color);
+
+    // Repaint everything - the colors might have changed
+    _buffer->GetRenderTarget().TriggerRedrawAll();
+    return true;
+}
+CATCH_RETURN_FALSE()
+
+til::color Terminal::GetDefaultBackground() const noexcept
+{
+    return _defaultBg;
+}
+
 bool Terminal::SetInputMode(const TerminalInput::Mode mode, const bool enabled) noexcept
 try
 {

src/cascadia/TerminalCore/TerminalDispatch.cpp

@@ -227,7 +227,7 @@ CATCH_LOG_RETURN_FALSE()
 bool TerminalDispatch::SetCursorColor(const DWORD color) noexcept
 try
 {
-    return _terminalApi.SetColorTableEntry(TextColor::CURSOR_COLOR, color);
+    return _terminalApi.SetCursorColor(color);
 }
 CATCH_LOG_RETURN_FALSE()
 
@@ -247,7 +247,7 @@ CATCH_LOG_RETURN_FALSE()
 bool TerminalDispatch::SetDefaultForeground(const DWORD color) noexcept
 try
 {
-    return _terminalApi.SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, color);
+    return _terminalApi.SetDefaultForeground(color);
 }
 CATCH_LOG_RETURN_FALSE()
 
@@ -260,7 +260,7 @@ CATCH_LOG_RETURN_FALSE()
 bool TerminalDispatch::SetDefaultBackground(const DWORD color) noexcept
 try
 {
-    return _terminalApi.SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, color);
+    return _terminalApi.SetDefaultBackground(color);
 }
 CATCH_LOG_RETURN_FALSE()
 

src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj

@@ -37,9 +37,6 @@
     <ProjectReference Include="$(OpenConsoleDir)src\terminal\parser\lib\parser.vcxproj">
       <Project>{3ae13314-1939-4dfa-9c14-38ca0834050c}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\renderer\atlas\atlas.vcxproj">
-      <Project>{8222900C-8B6C-452A-91AC-BE95DB04B95F}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\renderer\dx\lib\dx.vcxproj">
       <Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
     </ProjectReference>

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -73,19 +73,19 @@ std::pair<COLORREF, COLORREF> Terminal::GetAttributeColors(const TextAttribute&
         if (attr.IsReverseVideo() ^ _screenReversed)
         {
             colors.first = _adjustedForegroundColors[fgIndex][bgIndex];
-            colors.second = fgTextColor.GetColor(_colorTable, TextColor::DEFAULT_FOREGROUND);
+            colors.second = fgTextColor.GetColor(_colorTable, _defaultFg);
         }
         else
         {
             colors.first = _adjustedForegroundColors[bgIndex][fgIndex];
-            colors.second = bgTextColor.GetColor(_colorTable, TextColor::DEFAULT_BACKGROUND);
+            colors.second = bgTextColor.GetColor(_colorTable, _defaultBg);
         }
     }
     else
     {
         colors = attr.CalculateRgbColors(_colorTable,
-                                         TextColor::DEFAULT_FOREGROUND,
+                                         _defaultFg,
-                                         TextColor::DEFAULT_BACKGROUND,
+                                         _defaultBg,
                                          _screenReversed,
                                          _blinkingState.IsBlinkingFaint(),
                                          _intenseIsBright);
@@ -135,7 +135,7 @@ CursorType Terminal::GetCursorStyle() const noexcept
 
 COLORREF Terminal::GetCursorColor() const noexcept
 {
-    return _colorTable.at(TextColor::CURSOR_COLOR);
+    return _buffer->GetCursor().GetColor();
 }
 
 bool Terminal::IsCursorDoubleWidth() const
@@ -312,8 +312,8 @@ void Terminal::_MakeAdjustedColorArray()
     // to include the default background and default foreground colors
     std::array<COLORREF, 18> colorTableWithDefaults;
     std::copy_n(std::begin(_colorTable), 16, std::begin(colorTableWithDefaults));
-    colorTableWithDefaults[DefaultBgIndex] = _colorTable.at(TextColor::DEFAULT_BACKGROUND);
+    colorTableWithDefaults[DefaultBgIndex] = _defaultBg;
-    colorTableWithDefaults[DefaultFgIndex] = _colorTable.at(TextColor::DEFAULT_FOREGROUND);
+    colorTableWithDefaults[DefaultFgIndex] = _defaultFg;
     for (auto fgIndex = 0; fgIndex < 18; ++fgIndex)
     {
         const auto fg = til::at(colorTableWithDefaults, fgIndex);

src/cascadia/TerminalSettingsEditor/Profiles.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "Profiles.h"
-
 #include "PreviewConnection.h"
 #include "Profiles.g.cpp"
 #include "EnumEntry.h"
@@ -11,54 +10,6 @@
 #include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
-// This function is a copy of DxFontInfo::_NearbyCollection() with
-// * the call to DxFontInfo::s_GetNearbyFonts() inlined
-// * checkForUpdates for GetSystemFontCollection() set to true
-static wil::com_ptr<IDWriteFontCollection1> NearbyCollection(IDWriteFactory* dwriteFactory)
-{
-    // The convenience interfaces for loading fonts from files
-    // are only available on Windows 10+.
-    wil::com_ptr<IDWriteFactory6> factory6;
-    // wil's query() facilities don't work inside WinRT land at the moment.
-    // They produce a compilation error due to IUnknown and winrt::Windows::Foundation::IUnknown being ambiguous.
-    if (!SUCCEEDED(dwriteFactory->QueryInterface(__uuidof(IDWriteFactory6), factory6.put_void())))
-    {
-        return nullptr;
-    }
-
-    wil::com_ptr<IDWriteFontCollection1> systemFontCollection;
-    THROW_IF_FAILED(factory6->GetSystemFontCollection(false, systemFontCollection.addressof(), true));
-
-    wil::com_ptr<IDWriteFontSet> systemFontSet;
-    THROW_IF_FAILED(systemFontCollection->GetFontSet(systemFontSet.addressof()));
-
-    wil::com_ptr<IDWriteFontSetBuilder2> fontSetBuilder2;
-    THROW_IF_FAILED(factory6->CreateFontSetBuilder(fontSetBuilder2.addressof()));
-
-    THROW_IF_FAILED(fontSetBuilder2->AddFontSet(systemFontSet.get()));
-
-    {
-        const std::filesystem::path module{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
-        const auto folder{ module.parent_path() };
-
-        for (const auto& p : std::filesystem::directory_iterator(folder))
-        {
-            if (til::ends_with(p.path().native(), L".ttf"))
-            {
-                fontSetBuilder2->AddFontFile(p.path().c_str());
-            }
-        }
-    }
-
-    wil::com_ptr<IDWriteFontSet> fontSet;
-    THROW_IF_FAILED(fontSetBuilder2->CreateFontSet(fontSet.addressof()));
-
-    wil::com_ptr<IDWriteFontCollection1> fontCollection;
-    THROW_IF_FAILED(factory6->CreateFontCollectionFromFontSet(fontSet.get(), &fontCollection));
-
-    return fontCollection;
-}
-
 using namespace winrt::Windows::UI::Text;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Controls;
@@ -156,7 +107,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             reinterpret_cast<::IUnknown**>(factory.put())));
 
         // get the font collection; subscribe to updates
-        const auto fontCollection = NearbyCollection(factory.get());
+        com_ptr<IDWriteFontCollection> fontCollection;
+        THROW_IF_FAILED(factory->GetSystemFontCollection(fontCollection.put(), TRUE));
 
         for (UINT32 i = 0; i < fontCollection->GetFontFamilyCount(); ++i)
         {
@@ -294,9 +246,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _profile.HasUnfocusedAppearance();
     }
 
-    bool ProfileViewModel::EditableUnfocusedAppearance() const noexcept
+    bool ProfileViewModel::EditableUnfocusedAppearance()
     {
-        return Feature_EditableUnfocusedAppearance::IsEnabled();
+        if constexpr (Feature_EditableUnfocusedAppearance::IsEnabled())
+        {
+            return true;
+        }
+        return false;
     }
 
     bool ProfileViewModel::ShowUnfocusedAppearance()
@@ -330,11 +286,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _unfocusedAppearanceViewModel;
     }
 
-    bool ProfileViewModel::AtlasEngineAvailable() const noexcept
-    {
-        return Feature_AtlasEngine::IsEnabled();
-    }
-
     bool ProfileViewModel::UseParentProcessDirectory()
     {
         return StartingDirectory().empty();

src/cascadia/TerminalSettingsEditor/Profiles.h

@@ -61,12 +61,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Editor::AppearanceViewModel DefaultAppearance();
         Editor::AppearanceViewModel UnfocusedAppearance();
         bool HasUnfocusedAppearance();
-        bool EditableUnfocusedAppearance() const noexcept;
+        bool EditableUnfocusedAppearance();
         bool ShowUnfocusedAppearance();
+
         void CreateUnfocusedAppearance(const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& schemes,
                                        const IHostedInWindow& windowRoot);
         void DeleteUnfocusedAppearance();
-        bool AtlasEngineAvailable() const noexcept;
 
         WINRT_PROPERTY(bool, IsBaseLayer, false);
 
@@ -95,7 +95,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         OBSERVABLE_PROJECTED_SETTING(_profile, SnapOnInput);
         OBSERVABLE_PROJECTED_SETTING(_profile, AltGrAliasing);
         OBSERVABLE_PROJECTED_SETTING(_profile, BellStyle);
-        OBSERVABLE_PROJECTED_SETTING(_profile, UseAtlasEngine);
 
     private:
         Model::Profile _profile;

src/cascadia/TerminalSettingsEditor/Profiles.idl

@@ -32,7 +32,6 @@ namespace Microsoft.Terminal.Settings.Editor
         Boolean EditableUnfocusedAppearance { get; };
         Boolean ShowUnfocusedAppearance { get; };
         AppearanceViewModel UnfocusedAppearance { get; };
-        Boolean AtlasEngineAvailable { get; };
 
         void CreateUnfocusedAppearance(Windows.Foundation.Collections.IMapView<String, Microsoft.Terminal.Settings.Model.ColorScheme> Schemes, IHostedInWindow WindowRoot);
         void DeleteUnfocusedAppearance();
@@ -62,7 +61,6 @@ namespace Microsoft.Terminal.Settings.Editor
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SnapOnInput);
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AltGrAliasing);
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.BellStyle, BellStyle);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, UseAtlasEngine);
     }
 
     runtimeclass DeleteProfileEventArgs

src/cascadia/TerminalSettingsEditor/Profiles.xaml

@@ -319,7 +319,7 @@
                         </StackPanel>
                         <StackPanel>
                             <StackPanel Orientation="Horizontal"
-                                        Visibility="{x:Bind State.Profile.EditableUnfocusedAppearance}">
+                                        Visibility="{x:Bind State.Profile.EditableUnfocusedAppearance, Mode=OneWay}">
                                 <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
                                            Style="{StaticResource TitleTextBlockStyle}" />
                                 <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
@@ -477,15 +477,6 @@
                                           IsChecked="{x:Bind IsBellStyleFlagSet(4), BindBack=SetBellStyleTaskbar, Mode=TwoWay}" />
                             </StackPanel>
                         </local:SettingContainer>
-
-                        <!--  AtlasEngine  -->
-                        <local:SettingContainer x:Uid="Profile_UseAtlasEngine"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearUseAtlasEngine}"
-                                                HasSettingValue="{x:Bind State.Profile.HasUseAtlasEngine, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.UseAtlasEngineOverrideSource, Mode=OneWay}"
-                                                Visibility="{x:Bind State.Profile.AtlasEngineAvailable}">
-                            <ToggleSwitch IsOn="{x:Bind State.Profile.UseAtlasEngine, Mode=TwoWay}" />
-                        </local:SettingContainer>
                     </StackPanel>
                 </ScrollViewer>
             </PivotItem>

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

@@ -927,10 +927,6 @@
     <value>Controls what happens when the application emits a BEL character.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
-  <data name="Profile_UseAtlasEngine.Header" xml:space="preserve">
-    <value>Enable experimental text rendering engine</value>
-    <comment>An option to enable an experimental text rendering engine</comment>
-  </data>
   <data name="Profile_BellStyleAudible.Content" xml:space="preserve">
     <value>Audible</value>
     <comment>An option to choose from for the "bell style" setting. When selected, an audible cue is used to notify the user.</comment>

src/cascadia/TerminalSettingsEditor/pch.h

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 //
 // pch.h
@@ -51,7 +51,8 @@
 
 #include <shlobj.h>
 #include <shobjidl_core.h>
-#include <dwrite_3.h>
+#include <dwrite.h>
+#include <dwrite_1.h>
 
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"

src/cascadia/TerminalSettingsModel/ApplicationState.cpp

@@ -9,11 +9,8 @@
 #include "ActionAndArgs.h"
 #include "JsonUtils.h"
 #include "FileUtils.h"
-#include "../../types/inc/utils.hpp"
 
 static constexpr std::wstring_view stateFileName{ L"state.json" };
-static constexpr std::wstring_view elevatedStateFileName{ L"elevated-state.json" };
-
 static constexpr std::string_view TabLayoutKey{ "tabLayout" };
 static constexpr std::string_view InitialPositionKey{ "initialPosition" };
 static constexpr std::string_view InitialSizeKey{ "initialSize" };
@@ -88,9 +85,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         return trait.FromJson(root);
     }
 
-    ApplicationState::ApplicationState(const std::filesystem::path& stateRoot) noexcept :
+    // Returns the application-global ApplicationState object.
-        _sharedPath{ stateRoot / stateFileName },
+    Microsoft::Terminal::Settings::Model::ApplicationState ApplicationState::SharedInstance()
-        _elevatedPath{ stateRoot / elevatedStateFileName },
+    {
+        static auto state = winrt::make_self<ApplicationState>(GetBaseSettingsPath() / stateFileName);
+        return *state;
+    }
+
+    ApplicationState::ApplicationState(std::filesystem::path path) noexcept :
+        _path{ std::move(path) },
         _throttler{ std::chrono::seconds(1), [this]() { _write(); } }
     {
         _read();
@@ -99,21 +102,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // The destructor ensures that the last write is flushed to disk before returning.
     ApplicationState::~ApplicationState()
     {
-        TraceLoggingWrite(g_hSettingsModelProvider,
-                          "ApplicationState_Dtor_Start",
-                          TraceLoggingDescription("Event at the start of the ApplicationState destructor"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-
         // This will ensure that we not just cancel the last outstanding timer,
         // but instead force it to run as soon as possible and wait for it to complete.
         _throttler.flush();
-
-        TraceLoggingWrite(g_hSettingsModelProvider,
-                          "ApplicationState_Dtor_End",
-                          TraceLoggingDescription("Event at the end of the ApplicationState destructor"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
     }
 
     // Re-read the state.json from disk.
@@ -122,13 +113,34 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         _read();
     }
 
-    bool ApplicationState::IsStatePath(const winrt::hstring& filename)
+    // Returns the state.json path on the disk.
+    winrt::hstring ApplicationState::FilePath() const noexcept
     {
-        static const auto sharedPath{ _sharedPath.filename() };
+        return winrt::hstring{ _path.wstring() };
-        static const auto elevatedPath{ _elevatedPath.filename() };
-        return filename == sharedPath || filename == elevatedPath;
     }
 
+    // Generate all getter/setters
+#define MTSM_APPLICATION_STATE_GEN(type, name, key, ...)    \
+    type ApplicationState::name() const noexcept            \
+    {                                                       \
+        const auto state = _state.lock_shared();            \
+        const auto& value = state->name;                    \
+        return value ? *value : type{ __VA_ARGS__ };        \
+    }                                                       \
+                                                            \
+    void ApplicationState::name(const type& value) noexcept \
+    {                                                       \
+        {                                                   \
+            auto state = _state.lock();                     \
+            state->name.emplace(value);                     \
+            state->name##Changed = true;                    \
+        }                                                   \
+                                                            \
+        _throttler();                                       \
+    }
+    MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
+#undef MTSM_APPLICATION_STATE_GEN
+
     // Method Description:
     // - See GH#11119. Removes all of the data in this ApplicationState object
     //   and resets it to the defaults. This will delete the state file! That's
@@ -144,58 +156,57 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     void ApplicationState::Reset() noexcept
     try
     {
-        LOG_LAST_ERROR_IF(!DeleteFile(_sharedPath.c_str()));
+        LOG_LAST_ERROR_IF(!DeleteFile(_path.c_str()));
-        LOG_LAST_ERROR_IF(!DeleteFile(_elevatedPath.c_str()));
         *_state.lock() = {};
     }
     CATCH_LOG()
 
-    // Deserializes the state.json and user-state (or elevated-state if
+    Json::Value ApplicationState::_getRoot(const locked_hfile& file) const noexcept
-    // elevated) into this ApplicationState.
+    {
+        Json::Value root;
+        try
+        {
+            const auto data = ReadUTF8FileLocked(file);
+            if (data.empty())
+            {
+                return root;
+            }
+
+            std::string errs;
+            std::unique_ptr<Json::CharReader> reader{ Json::CharReaderBuilder::CharReaderBuilder().newCharReader() };
+
+            if (!reader->parse(data.data(), data.data() + data.size(), &root, &errs))
+            {
+                throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
+            }
+        }
+        CATCH_LOG()
+
+        return root;
+    }
+
+    // Deserializes the state.json at _path into this ApplicationState.
     // * ANY errors during app state will result in the creation of a new empty state.
     // * ANY errors during runtime will result in changes being partially ignored.
     void ApplicationState::_read() const noexcept
     try
     {
-        std::string errs;
+        auto state = _state.lock();
-        std::unique_ptr<Json::CharReader> reader{ Json::CharReaderBuilder::CharReaderBuilder().newCharReader() };
+        const auto file = OpenFileReadSharedLocked(_path);
 
-        // First get shared state out of `state.json`.
+        auto root = _getRoot(file);
-        const auto sharedData = _readSharedContents().value_or(std::string{});
+        // GetValueForKey() comes in two variants:
-        if (!sharedData.empty())
+        // * take a std::optional<T> reference
-        {
+        // * return std::optional<T> by value
-            Json::Value root;
+        // At the time of writing the former version skips missing fields in the json,
-            if (!reader->parse(sharedData.data(), sharedData.data() + sharedData.size(), &root, &errs))
+        // but we want to explicitly clear state fields that were removed from state.json.
-            {
+#define MTSM_APPLICATION_STATE_GEN(type, name, key, ...)                         \
-                throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
+    if (!state->name##Changed)                                                   \
-            }
+    {                                                                            \
-
+        state->name = JsonUtils::GetValueForKey<std::optional<type>>(root, key); \
-            // - If we're elevated, we want to only load the Shared properties
+    }
-            //   from state.json. We'll then load the Local props from
+        MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
-            //   `elevated-state.json`
+#undef MTSM_APPLICATION_STATE_GEN
-            // - If we're unelevated, then load _everything_ from state.json.
-            if (::Microsoft::Console::Utils::IsElevated())
-            {
-                // Only load shared properties if we're elevated
-                FromJson(root, FileSource::Shared);
-
-                // Then, try and get anything in elevated-state
-                if (const auto localData{ _readLocalContents().value_or(std::string{}) }; !localData.empty())
-                {
-                    Json::Value root;
-                    if (!reader->parse(localData.data(), localData.data() + localData.size(), &root, &errs))
-                    {
-                        throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
-                    }
-                    FromJson(root, FileSource::Local);
-                }
-            }
-            else
-            {
-                // If we're unelevated, then load everything.
-                FromJson(root, FileSource::Shared | FileSource::Local);
-            }
-        }
     }
     CATCH_LOG()
 
@@ -203,191 +214,29 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // * Errors are only logged.
     // * _state->_writeScheduled is set to false, signaling our
     //   setters that _synchronize() needs to be called again.
-    void ApplicationState::_write() const noexcept
+    void ApplicationState::_write() noexcept
     try
     {
-        Json::StreamWriterBuilder wbuilder;
+        // re-read the state so that we can only update the properties that were changed.
-
+        Json::Value root{};
-        // When we're elevated, we've got to be tricky. We don't want to write
-        // our window state, allowed commandlines, and other Local properties
-        // into the shared `state.json`. But, if we only serialize the Shared
-        // properties to a json blob, then we'll omit windowState entirely,
-        // _removing_ the window state of the unelevated instance. Oh no!
-        //
-        // So, to be tricky, we'll first _load_ the shared state to a json blob.
-        // We'll then serialize our view of the shared properties on top of that
-        // blob. Then we'll write that blob back to the file. This will
-        // round-trip the Local properties for the unelevated instances
-        // untouched in state.json
-        //
-        // After that's done, we'll write our Local properties into
-        // elevated-state.json.
-        if (::Microsoft::Console::Utils::IsElevated())
         {
-            std::string errs;
+            auto state = _state.lock();
-            std::unique_ptr<Json::CharReader> reader{ Json::CharReaderBuilder::CharReaderBuilder().newCharReader() };
+            const auto file = OpenFileRWExclusiveLocked(_path);
-            Json::Value root;
+            root = _getRoot(file);
 
-            // First load the contents of state.json into a json blob. This will
+#define MTSM_APPLICATION_STATE_GEN(type, name, key, ...)   \
-            // contain the Shared properties and the unelevated instance's Local
+    if (state->name##Changed)                              \
-            // properties.
+    {                                                      \
-            const auto sharedData = _readSharedContents().value_or(std::string{});
+        JsonUtils::SetValueForKey(root, key, state->name); \
-            if (!sharedData.empty())
+        state->name##Changed = false;                      \
-            {
+    }
-                if (!reader->parse(sharedData.data(), sharedData.data() + sharedData.size(), &root, &errs))
+            MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
-                {
+#undef MTSM_APPLICATION_STATE_GEN
-                    throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
-                }
-            }
-            // Layer our shared properties on top of the blob from state.json,
-            // and write it back out.
-            _writeSharedContents(Json::writeString(wbuilder, _toJsonWithBlob(root, FileSource::Shared)));
 
-            // Finally, write our Local properties back to elevated-state.json
+            Json::StreamWriterBuilder wbuilder;
-            _writeLocalContents(Json::writeString(wbuilder, ToJson(FileSource::Local)));
+            const auto content = Json::writeString(wbuilder, root);
-        }
+            WriteUTF8FileLocked(file, content);
-        else
-        {
-            // We're unelevated, this is easy. Just write everything back out.
-            _writeLocalContents(Json::writeString(wbuilder, ToJson(FileSource::Local | FileSource::Shared)));
         }
     }
     CATCH_LOG()
-
-    // Returns the application-global ApplicationState object.
-    Microsoft::Terminal::Settings::Model::ApplicationState ApplicationState::SharedInstance()
-    {
-        std::filesystem::path root{ GetBaseSettingsPath() };
-        static auto state = winrt::make_self<ApplicationState>(root);
-        return *state;
-    }
-
-    // Method Description:
-    // - Loads data from the given json blob. Will only read the data that's in
-    //   the specified parseSource - so if we're reading the Local state file,
-    //   we won't destroy previously parsed Shared data.
-    // - READ: there's no layering for app state.
-    void ApplicationState::FromJson(const Json::Value& root, FileSource parseSource) const noexcept
-    {
-        auto state = _state.lock();
-        // GetValueForKey() comes in two variants:
-        // * take a std::optional<T> reference
-        // * return std::optional<T> by value
-        // At the time of writing the former version skips missing fields in the json,
-        // but we want to explicitly clear state fields that were removed from state.json.
-        //
-        // GH#11222: We only load properties that are of the same type (Local or
-        // Shared) which we requested. If we didn't want to load this type of
-        // property, just skip it.
-#define MTSM_APPLICATION_STATE_GEN(source, type, name, key, ...) \
-    if (WI_IsFlagSet(parseSource, source))                       \
-        state->name = JsonUtils::GetValueForKey<std::optional<type>>(root, key);
-
-        MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
-#undef MTSM_APPLICATION_STATE_GEN
-    }
-
-    Json::Value ApplicationState::ToJson(FileSource parseSource) const noexcept
-    {
-        Json::Value root{ Json::objectValue };
-        return _toJsonWithBlob(root, parseSource);
-    }
-
-    Json::Value ApplicationState::_toJsonWithBlob(Json::Value& root, FileSource parseSource) const noexcept
-    {
-        {
-            auto state = _state.lock_shared();
-
-            // GH#11222: We only write properties that are of the same type (Local
-            // or Shared) which we requested. If we didn't want to serialize this
-            // type of property, just skip it.
-#define MTSM_APPLICATION_STATE_GEN(source, type, name, key, ...) \
-    if (WI_IsFlagSet(parseSource, source))                       \
-        JsonUtils::SetValueForKey(root, key, state->name);
-
-            MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
-#undef MTSM_APPLICATION_STATE_GEN
-        }
-        return root;
-    }
-
-    // Generate all getter/setters
-#define MTSM_APPLICATION_STATE_GEN(source, type, name, key, ...) \
-    type ApplicationState::name() const noexcept                 \
-    {                                                            \
-        const auto state = _state.lock_shared();                 \
-        const auto& value = state->name;                         \
-        return value ? *value : type{ __VA_ARGS__ };             \
-    }                                                            \
-                                                                 \
-    void ApplicationState::name(const type& value) noexcept      \
-    {                                                            \
-        {                                                        \
-            auto state = _state.lock();                          \
-            state->name.emplace(value);                          \
-        }                                                        \
-                                                                 \
-        _throttler();                                            \
-    }
-    MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
-#undef MTSM_APPLICATION_STATE_GEN
-
-    // Method Description:
-    // - Read the contents of our "shared" state - state that should be shared
-    //   for elevated and unelevated instances. This is things like the list of
-    //   generated profiles, the command palette commandlines.
-    std::optional<std::string> ApplicationState::_readSharedContents() const
-    {
-        return ReadUTF8FileIfExists(_sharedPath);
-    }
-
-    // Method Description:
-    // - Read the contents of our "local" state - state that should be kept in
-    //   separate files for elevated and unelevated instances. This is things
-    //   like the persisted window state, and the approved commandlines (though,
-    //   those don't matter when unelevated).
-    // - When elevated, this will DELETE `elevated-state.json` if it has bad
-    //   permissions, so we don't potentially read malicious data.
-    std::optional<std::string> ApplicationState::_readLocalContents() const
-    {
-        return ::Microsoft::Console::Utils::IsElevated() ?
-                   ReadUTF8FileIfExists(_elevatedPath, true) :
-                   ReadUTF8FileIfExists(_sharedPath, false);
-    }
-
-    // Method Description:
-    // - Write the contents of our "shared" state - state that should be shared
-    //   for elevated and unelevated instances. This will atomically write to
-    //   `state.json`
-    void ApplicationState::_writeSharedContents(const std::string_view content) const
-    {
-        WriteUTF8FileAtomic(_sharedPath, content);
-    }
-
-    // Method Description:
-    // - Write the contents of our "local" state - state that should be kept in
-    //   separate files for elevated and unelevated instances. When elevated,
-    //   this will write to `elevated-state.json`, and when unelevated, this
-    //   will atomically write to `user-state.json`
-    void ApplicationState::_writeLocalContents(const std::string_view content) const
-    {
-        if (::Microsoft::Console::Utils::IsElevated())
-        {
-            // DON'T use WriteUTF8FileAtomic, which will write to a temporary file
-            // then rename that file to the final filename. That actually lets us
-            // overwrite the elevate file's contents even when unelevated, because
-            // we're effectively deleting the original file, then renaming a
-            // different file in it's place.
-            //
-            // We're not worried about someone else doing that though, if they do
-            // that with the wrong permissions, then we'll just ignore the file and
-            // start over.
-            WriteUTF8File(_elevatedPath, content, true);
-        }
-        else
-        {
-            WriteUTF8FileAtomic(_sharedPath, content);
-        }
-    }
-
 }

src/cascadia/TerminalSettingsModel/ApplicationState.h

@@ -16,30 +16,21 @@ Abstract:
 #include "WindowLayout.g.h"
 
 #include <inc/cppwinrt_utils.h>
+#include <til/mutex.h>
+#include <til/throttled_func.h>
+#include "FileUtils.h"
 #include <JsonUtils.h>
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
-{
-    // If a property is Shared, then it'll be stored in `state.json`, and used
-    // in both elevated and unelevated instances of the Terminal. If a property
-    // is marked Local, then it will have separate values for elevated and
-    // unelevated instances.
-    enum FileSource : int
-    {
-        Shared = 0x1,
-        Local = 0x2
-    };
-    DEFINE_ENUM_FLAG_OPERATORS(FileSource);
-
 // This macro generates all getters and setters for ApplicationState.
 // It provides X with the following arguments:
-//   (source, type, function name, JSON key, ...variadic construction arguments)
+//   (type, function name, JSON key, ...variadic construction arguments)
-#define MTSM_APPLICATION_STATE_FIELDS(X)                                                                                                                                  \
+namespace winrt::Microsoft::Terminal::Settings::Model::implementation
-    X(FileSource::Shared, std::unordered_set<winrt::guid>, GeneratedProfiles, "generatedProfiles")                                                                        \
+{
-    X(FileSource::Local, Windows::Foundation::Collections::IVector<Model::WindowLayout>, PersistedWindowLayouts, "persistedWindowLayouts")                                \
+#define MTSM_APPLICATION_STATE_FIELDS(X)                                                                                \
-    X(FileSource::Shared, Windows::Foundation::Collections::IVector<hstring>, RecentCommands, "recentCommands")                                                           \
+    X(std::unordered_set<winrt::guid>, GeneratedProfiles, "generatedProfiles")                                          \
-    X(FileSource::Shared, Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage>, DismissedMessages, "dismissedMessages") \
+    X(Windows::Foundation::Collections::IVector<Model::WindowLayout>, PersistedWindowLayouts, "persistedWindowLayouts") \
-    X(FileSource::Local, Windows::Foundation::Collections::IVector<hstring>, AllowedCommandlines, "allowedCommandlines")
+    X(Windows::Foundation::Collections::IVector<hstring>, RecentCommands, "recentCommands")                             \
+    X(Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage>, DismissedMessages, "dismissedMessages")
 
     struct WindowLayout : WindowLayoutT<WindowLayout>
     {
@@ -53,26 +44,23 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         friend ::Microsoft::Terminal::Settings::Model::JsonUtils::ConversionTrait<Model::WindowLayout>;
     };
 
-    struct ApplicationState : public ApplicationStateT<ApplicationState>
+    struct ApplicationState : ApplicationStateT<ApplicationState>
     {
         static Microsoft::Terminal::Settings::Model::ApplicationState SharedInstance();
 
-        ApplicationState(const std::filesystem::path& stateRoot) noexcept;
+        ApplicationState(std::filesystem::path path) noexcept;
         ~ApplicationState();
 
         // Methods
         void Reload() const noexcept;
         void Reset() noexcept;
 
-        void FromJson(const Json::Value& root, FileSource parseSource) const noexcept;
-        Json::Value ToJson(FileSource parseSource) const noexcept;
-
         // General getters/setters
-        bool IsStatePath(const winrt::hstring& filename);
+        winrt::hstring FilePath() const noexcept;
 
         // State getters/setters
-#define MTSM_APPLICATION_STATE_GEN(source, type, name, key, ...) \
+#define MTSM_APPLICATION_STATE_GEN(type, name, key, ...) \
-    type name() const noexcept;                                  \
+    type name() const noexcept;                          \
     void name(const type& value) noexcept;
         MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
 #undef MTSM_APPLICATION_STATE_GEN
@@ -80,24 +68,21 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     private:
         struct state_t
         {
-#define MTSM_APPLICATION_STATE_GEN(source, type, name, key, ...) std::optional<type> name{ __VA_ARGS__ };
+#define MTSM_APPLICATION_STATE_GEN(type, name, key, ...) \
+    std::optional<type> name{ __VA_ARGS__ };             \
+    bool name##Changed = false;
+
             MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
 #undef MTSM_APPLICATION_STATE_GEN
         };
-        til::shared_mutex<state_t> _state;
-        std::filesystem::path _sharedPath;
-        std::filesystem::path _elevatedPath;
-        til::throttled_func_trailing<> _throttler;
 
-        void _write() const noexcept;
+        Json::Value _getRoot(const winrt::Microsoft::Terminal::Settings::Model::locked_hfile& file) const noexcept;
+        void _write() noexcept;
         void _read() const noexcept;
 
-        Json::Value _toJsonWithBlob(Json::Value& root, FileSource parseSource) const noexcept;
+        std::filesystem::path _path;
-
+        til::shared_mutex<state_t> _state;
-        std::optional<std::string> _readSharedContents() const;
+        til::throttled_func_trailing<> _throttler;
-        void _writeSharedContents(const std::string_view content) const;
-        std::optional<std::string> _readLocalContents() const;
-        void _writeLocalContents(const std::string_view content) const;
     };
 }
 

src/cascadia/TerminalSettingsModel/ApplicationState.idl

@@ -30,15 +30,12 @@ namespace Microsoft.Terminal.Settings.Model
         void Reload();
         void Reset();
 
-        Boolean IsStatePath(String filename);
+        String FilePath { get; };
 
         Windows.Foundation.Collections.IVector<WindowLayout> PersistedWindowLayouts { get; set; };
 
         Windows.Foundation.Collections.IVector<String> RecentCommands { get; set; };
 
         Windows.Foundation.Collections.IVector<InfoBarMessage> DismissedMessages { get; set; };
-
-        Windows.Foundation.Collections.IVector<String> AllowedCommandlines { get; set; };
-
     }
 }

src/cascadia/TerminalSettingsModel/FileUtils.cpp

@@ -8,10 +8,6 @@
 #include <shlobj.h>
 #include <WtExeUtils.h>
 
-#include <aclapi.h>
-#include <sddl.h>
-#include <wil/token_helpers.h>
-
 static constexpr std::string_view Utf8Bom{ u8"\uFEFF" };
 static constexpr std::wstring_view UnpackagedSettingsFolderName{ L"Microsoft\\Windows Terminal\\" };
 
@@ -43,44 +39,86 @@ namespace winrt::Microsoft::Terminal::Settings::Model
         return baseSettingsPath;
     }
 
-    // Function Description:
+    locked_hfile OpenFileReadSharedLocked(const std::filesystem::path& path)
-    // - Checks the permissions on this file, to make sure it can only be opened
-    //   for writing by admins. We will be checking to see if the file is owned
-    //   by the Builtin\Administrators group. If it's not, then it was likely
-    //   tampered with.
-    // Arguments:
-    // - handle: a HANDLE to the file to check
-    // Return Value:
-    // - true if it had the expected permissions. False otherwise.
-    static bool _isOwnedByAdministrators(const HANDLE& handle)
     {
-        // If the file is owned by the administrators group, trust the
+        wil::unique_hfile file{ CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr) };
-        // administrators instead of checking the DACL permissions. It's simpler
+        THROW_LAST_ERROR_IF(!file);
-        // and more flexible.
+        // just lock the entire file
-
+        OVERLAPPED sOverlapped;
-        wil::unique_hlocal_security_descriptor sd;
+        sOverlapped.Offset = 0;
-        PSID psidOwner{ nullptr };
+        sOverlapped.OffsetHigh = 0;
-        // The psidOwner pointer references the security descriptor, so it
+        // Shared lock
-        // doesn't have to be freed separate from sd.
+        THROW_LAST_ERROR_IF(!LockFileEx(file.get(),
-        const auto status = GetSecurityInfo(handle,
+                                        0, // lock shared, wait to return until lock is obtained
-                                            SE_FILE_OBJECT,
+                                        0, // reserved, does nothing
-                                            OWNER_SECURITY_INFORMATION,
+                                        INT_MAX, // lock INT_MAX bytes
-                                            &psidOwner,
+                                        0, // higher-order bytes, if our state file is greater than 2GB I guess this will be a problem
-                                            nullptr,
+                                        &sOverlapped));
-                                            nullptr,
+        return { std::move(file), sOverlapped };
-                                            nullptr,
-                                            wil::out_param_ptr<PSECURITY_DESCRIPTOR*>(sd));
-        THROW_IF_WIN32_ERROR(status);
-
-        wil::unique_any_psid psidAdmins{ nullptr };
-        THROW_IF_WIN32_BOOL_FALSE(
-            ConvertStringSidToSidW(L"BA", wil::out_param_ptr<PSID*>(psidAdmins)));
-
-        return EqualSid(psidOwner, psidAdmins.get());
     }
+
+    locked_hfile OpenFileRWExclusiveLocked(const std::filesystem::path& path)
+    {
+        wil::unique_hfile file{ CreateFileW(path.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr) };
+        THROW_LAST_ERROR_IF(!file);
+        // just lock the entire file
+        OVERLAPPED sOverlapped;
+        sOverlapped.Offset = 0;
+        sOverlapped.OffsetHigh = 0;
+        // Shared lock
+        THROW_LAST_ERROR_IF(!LockFileEx(file.get(),
+                                        LOCKFILE_EXCLUSIVE_LOCK, // lock exclusive, wait to return until lock is obtained
+                                        0, // reserved, does nothing
+                                        INT_MAX, // lock INT_MAX bytes
+                                        0, // higher-order bytes, if our state file is greater than 2GB I guess this will be a problem
+                                        &sOverlapped));
+        return { std::move(file), sOverlapped };
+    }
+
+    std::string ReadUTF8FileLocked(const locked_hfile& file)
+    {
+        const auto fileSize = GetFileSize(file.get(), nullptr);
+        THROW_LAST_ERROR_IF(fileSize == INVALID_FILE_SIZE);
+
+        // By making our buffer just slightly larger we can detect if
+        // the file size changed and we've failed to read the full file.
+        std::string buffer(static_cast<size_t>(fileSize) + 1, '\0');
+        DWORD bytesRead = 0;
+        THROW_IF_WIN32_BOOL_FALSE(ReadFile(file.get(), buffer.data(), gsl::narrow<DWORD>(buffer.size()), &bytesRead, nullptr));
+
+        // As mentioned before our buffer was allocated oversized.
+        buffer.resize(bytesRead);
+
+        if (til::starts_with(buffer, Utf8Bom))
+        {
+            // Yeah this memmove()s the entire content.
+            // But I don't really want to deal with UTF8 BOMs any more than necessary,
+            // as basically not a single editor writes a BOM for UTF8.
+            buffer.erase(0, Utf8Bom.size());
+        }
+
+        return buffer;
+    }
+
+    void WriteUTF8FileLocked(const locked_hfile& file, const std::string_view& content)
+    {
+        // truncate the file because we want to overwrite it
+        SetFilePointer(file.get(), 0, nullptr, FILE_BEGIN);
+        THROW_IF_WIN32_BOOL_FALSE(SetEndOfFile(file.get()));
+
+        const auto fileSize = gsl::narrow<DWORD>(content.size());
+        DWORD bytesWritten = 0;
+        THROW_IF_WIN32_BOOL_FALSE(WriteFile(file.get(), content.data(), fileSize, &bytesWritten, nullptr));
+
+        if (bytesWritten != fileSize)
+        {
+            THROW_WIN32_MSG(ERROR_WRITE_FAULT, "failed to write whole file");
+        }
+    }
+
     // Tries to read a file somewhat atomically without locking it.
     // Strips the UTF8 BOM if it exists.
-    std::string ReadUTF8File(const std::filesystem::path& path, const bool elevatedOnly)
+    std::string ReadUTF8File(const std::filesystem::path& path)
     {
         // From some casual observations we can determine that:
         // * ReadFile() always returns the requested amount of data (unless the file is smaller)
@@ -88,40 +126,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model
         // -> Lets add a retry-loop just in case, to not fail if the file size changed while reading.
         for (int i = 0; i < 3; ++i)
         {
-            wil::unique_hfile file{ CreateFileW(path.c_str(),
+            wil::unique_hfile file{ CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr) };
-                                                GENERIC_READ,
-                                                FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                                nullptr,
-                                                OPEN_EXISTING,
-                                                FILE_ATTRIBUTE_NORMAL,
-                                                nullptr) };
             THROW_LAST_ERROR_IF(!file);
 
-            // Open the file _first_, then check if it has the right
-            // permissions. This prevents a "Time-of-check to time-of-use"
-            // vulnerability where a malicious exe could delete the file and
-            // replace it between us checking the permissions, and reading the
-            // contents. We've got a handle to the file now, which means we're
-            // going to read the contents of that instance of the file
-            // regardless. If someone replaces the file on us before we get to
-            // the GetSecurityInfo call below, then only the subsequent call to
-            // ReadUTF8File will notice it.
-            if (elevatedOnly)
-            {
-                const bool hadExpectedPermissions{ _isOwnedByAdministrators(file.get()) };
-                if (!hadExpectedPermissions)
-                {
-                    // Close the handle
-                    file.reset();
-
-                    // delete the file. It's been compromised.
-                    LOG_LAST_ERROR_IF(!DeleteFile(path.c_str()));
-
-                    // Exit early, because obviously there's nothing to read from the deleted file.
-                    return "";
-                }
-            }
-
             const auto fileSize = GetFileSize(file.get(), nullptr);
             THROW_LAST_ERROR_IF(fileSize == INVALID_FILE_SIZE);
 
@@ -159,11 +166,11 @@ namespace winrt::Microsoft::Terminal::Settings::Model
     }
 
     // Same as ReadUTF8File, but returns an empty optional, if the file couldn't be opened.
-    std::optional<std::string> ReadUTF8FileIfExists(const std::filesystem::path& path, const bool elevatedOnly)
+    std::optional<std::string> ReadUTF8FileIfExists(const std::filesystem::path& path)
     {
         try
         {
-            return { ReadUTF8File(path, elevatedOnly) };
+            return { ReadUTF8File(path) };
         }
         catch (const wil::ResultException& exception)
         {
@@ -176,70 +183,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model
         }
     }
 
-    void WriteUTF8File(const std::filesystem::path& path,
+    void WriteUTF8File(const std::filesystem::path& path, const std::string_view& content)
-                       const std::string_view& content,
-                       const bool elevatedOnly)
     {
-        SECURITY_ATTRIBUTES sa;
+        wil::unique_hfile file{ CreateFileW(path.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr) };
-        // stash the security descriptor here, so it will stay in context until
-        // after the call to CreateFile. If it gets cleaned up before that, then
-        // CreateFile will fail
-        wil::unique_hlocal_security_descriptor sd;
-        if (elevatedOnly)
-        {
-            // Initialize the security descriptor so only admins can write the
-            // file. We'll initialize the SECURITY_DESCRIPTOR with a
-            // single entry (ACE) -- a mandatory label (i.e. a
-            // LABEL_SECURITY_INFORMATION) that sets the file integrity level to
-            // "high",  with a no-write-up policy.
-            //
-            // When accessed from a security context at a lower integrity level,
-            // the no-write-up policy filters out rights that aren't in the
-            // object type's generic read and execute set (for the file type,
-            // that's FILE_GENERIC_READ | FILE_GENERIC_EXECUTE).
-            //
-            // Another option we considered here was manually setting the ACLs
-            // on this file such that Builtin\Admins could read&write the file,
-            // and all users could only read.
-            //
-            // Big thanks to @eryksun in GH#11222 for helping with this. This
-            // alternative method was chosen because it's considerably simpler.
-
-            // The required security descriptor can be created easily from the
-            // SDDL string: "S:(ML;;NW;;;HI)"
-            // (i.e. SACL:mandatory label;;no write up;;;high integrity level)
-            unsigned long cb;
-            THROW_IF_WIN32_BOOL_FALSE(
-                ConvertStringSecurityDescriptorToSecurityDescriptor(L"S:(ML;;NW;;;HI)",
-                                                                    SDDL_REVISION_1,
-                                                                    wil::out_param_ptr<PSECURITY_DESCRIPTOR*>(sd),
-                                                                    &cb));
-
-            // Initialize a security attributes structure.
-            sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-            sa.lpSecurityDescriptor = sd.get();
-            sa.bInheritHandle = false;
-
-            // If we're running in an elevated context, when this file is
-            // created, it will automatically be owned by
-            // Builtin\Administrators, which will pass the above
-            // _isOwnedByAdministrators check.
-            //
-            // Programs running in an elevated context will be free to write the
-            // file, and unelevated processes will be able to read the file. An
-            // unelevated process could always delete the file and rename a new
-            // file in it's place (a la the way `vim.exe` saves files), but if
-            // they do that, the new file _won't_ be owned by Administrators,
-            // failing the above check.
-        }
-
-        wil::unique_hfile file{ CreateFileW(path.c_str(),
-                                            GENERIC_WRITE,
-                                            FILE_SHARE_READ | FILE_SHARE_DELETE,
-                                            elevatedOnly ? &sa : nullptr,
-                                            CREATE_ALWAYS,
-                                            FILE_ATTRIBUTE_NORMAL,
-                                            nullptr) };
         THROW_LAST_ERROR_IF(!file);
 
         const auto fileSize = gsl::narrow<DWORD>(content.size());
@@ -252,8 +198,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model
         }
     }
 
-    void WriteUTF8FileAtomic(const std::filesystem::path& path,
+    void WriteUTF8FileAtomic(const std::filesystem::path& path, const std::string_view& content)
-                             const std::string_view& content)
     {
         // GH#10787: rename() will replace symbolic links themselves and not the path they point at.
         // It's thus important that we first resolve them before generating temporary path.

src/cascadia/TerminalSettingsModel/FileUtils.h

@@ -1,11 +1,41 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#pragma once
+
 namespace winrt::Microsoft::Terminal::Settings::Model
 {
+    // I couldn't find a wil helper for this so I made it myself
+    class locked_hfile
+    {
+    public:
+        wil::unique_hfile file;
+        OVERLAPPED lockedRegion;
+
+        ~locked_hfile()
+        {
+            if (file)
+            {
+                // Need to unlock the file before it is closed
+                UnlockFileEx(file.get(), 0, INT_MAX, 0, &lockedRegion);
+            }
+        }
+
+        HANDLE get() const noexcept
+        {
+            return file.get();
+        }
+    };
+
     std::filesystem::path GetBaseSettingsPath();
-    std::string ReadUTF8File(const std::filesystem::path& path, const bool elevatedOnly = false);
+
-    std::optional<std::string> ReadUTF8FileIfExists(const std::filesystem::path& path, const bool elevatedOnly = false);
+    locked_hfile OpenFileReadSharedLocked(const std::filesystem::path& path);
-    void WriteUTF8File(const std::filesystem::path& path, const std::string_view& content, const bool elevatedOnly = false);
+    locked_hfile OpenFileRWExclusiveLocked(const std::filesystem::path& path);
+    std::string ReadUTF8FileLocked(const locked_hfile& file);
+    void WriteUTF8FileLocked(const locked_hfile& file, const std::string_view& content);
+
+    std::string ReadUTF8File(const std::filesystem::path& path);
+    std::optional<std::string> ReadUTF8FileIfExists(const std::filesystem::path& path);
+    void WriteUTF8File(const std::filesystem::path& path, const std::string_view& content);
     void WriteUTF8FileAtomic(const std::filesystem::path& path, const std::string_view& content);
 }

src/cascadia/TerminalSettingsModel/JsonUtils.h

@@ -382,6 +382,7 @@ namespace Microsoft::Terminal::Settings::Model::JsonUtils
     };
 
     template<typename T>
+
     struct ConversionTrait<std::unordered_map<std::string, T>>
     {
         std::unordered_map<std::string, T> FromJson(const Json::Value& json) const

src/cascadia/TerminalSettingsModel/MTSMSettings.h

@@ -73,8 +73,7 @@ Author(s):
     X(hstring, Icon, "icon", L"\uE756")                                                                                                                        \
     X(CloseOnExitMode, CloseOnExit, "closeOnExit", CloseOnExitMode::Graceful)                                                                                  \
     X(hstring, TabTitle, "tabTitle")                                                                                                                           \
-    X(Model::BellStyle, BellStyle, "bellStyle", BellStyle::Audible)                                                                                            \
+    X(Model::BellStyle, BellStyle, "bellStyle", BellStyle::Audible)
-    X(bool, UseAtlasEngine, "experimental.useAtlasEngine", false)
 
 #define MTSM_FONT_SETTINGS(X)                                                          \
     X(hstring, FontFace, "face", DEFAULT_FONT_FACE)                                    \

src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj

@@ -197,29 +197,9 @@
       <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-
     <!-- For whatever reason, we can't include the TerminalControl and
     TerminalSettings projects' winmds via project references. So we'll have to
-    manually include the winmds as References below
+    manually include the winmds as References below -->
-
-    BODGY: we do need to add a ProjectReference to TerminalControl.vcxproj,
-    with Private=true, ReferenceOutputAssembly=false, so that Visual Studio's
-    "Fast Up-to-date Check" will work with this project. If we don't, the Fast
-    Up-to-date Check will look for the .xaml files from that project in our
-    output, which won't actually be there.
-
-    We do still need to separately reference the winmds manually below, which is annoying.
-    -->
-
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
-      <!-- Private:true and ReferenceOutputAssembly:false, in combination with
-      the manual reference to TerminalControl.winmd below make sure that this
-      project will compile correct, and that we won't roll up the TermControl
-      xbf's into the packaging project twice. -->
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-
   </ItemGroup>
   <ItemGroup>
     <!-- Manually add references to each of our dependent winmds. Mark them as
@@ -286,5 +266,4 @@
   </Target>
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
   <Import Project="..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
-
 </Project>

src/cascadia/TerminalSettingsModel/Profile.idl

@@ -79,6 +79,5 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_PROFILE_SETTING(Boolean, SnapOnInput);
         INHERITABLE_PROFILE_SETTING(Boolean, AltGrAliasing);
         INHERITABLE_PROFILE_SETTING(BellStyle, BellStyle);
-        INHERITABLE_PROFILE_SETTING(Boolean, UseAtlasEngine);
     }
 }

src/cascadia/TerminalSettingsModel/TerminalSettings.cpp

@@ -275,7 +275,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         // Fill in the remaining properties from the profile
         _ProfileName = profile.Name();
-        _ProfileSource = profile.Source();
         _UseAcrylic = profile.UseAcrylic();
 
         _FontFace = profile.FontInfo().FontFace();
@@ -298,7 +297,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             _SuppressApplicationTitle = profile.SuppressApplicationTitle();
         }
 
-        _UseAtlasEngine = profile.UseAtlasEngine();
         _ScrollState = profile.ScrollState();
 
         _AntialiasingMode = profile.AntialiasingMode();

src/cascadia/TerminalSettingsModel/TerminalSettings.h

@@ -119,8 +119,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // ------------------------ End of Core Settings -----------------------
 
         INHERITABLE_SETTING(Model::TerminalSettings, hstring, ProfileName);
-        INHERITABLE_SETTING(Model::TerminalSettings, hstring, ProfileSource);
-
         INHERITABLE_SETTING(Model::TerminalSettings, bool, UseAcrylic, false);
         INHERITABLE_SETTING(Model::TerminalSettings, double, Opacity, UseAcrylic() ? 0.5 : 1.0);
         INHERITABLE_SETTING(Model::TerminalSettings, hstring, Padding, DEFAULT_PADDING);
@@ -148,7 +146,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         INHERITABLE_SETTING(Model::TerminalSettings, hstring, EnvironmentVariables);
 
         INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::ScrollbarState, ScrollState, Microsoft::Terminal::Control::ScrollbarState::Visible);
-        INHERITABLE_SETTING(Model::TerminalSettings, bool, UseAtlasEngine, false);
 
         INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale);
 

src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj

@@ -65,7 +65,7 @@
     </ProjectReference>
 
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
-      <!-- Private:true and ReferenceOutputAssembly:false, in combination with
+      <!-- Private:false and ReferenceOutputAssembly:false, in combination with
       the manual reference to TerminalControl.winmd below make sure that this
       project will compile correct, and that we won't roll up the TermControl
       xbf's into the packaging project twice. -->

src/cascadia/TerminalSettingsModel/pch.h

@@ -53,6 +53,3 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
 
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
-
-#include <til/mutex.h>
-#include <til/throttled_func.h>

src/cascadia/UnitTests_Control/MockControlSettings.h

@@ -51,7 +51,6 @@ namespace ControlUnitTests
         // ------------------------ End of Core Settings -----------------------
 
         WINRT_PROPERTY(winrt::hstring, ProfileName);
-        WINRT_PROPERTY(winrt::hstring, ProfileSource);
         WINRT_PROPERTY(bool, UseAcrylic, false);
         WINRT_PROPERTY(double, Opacity, .5);
         WINRT_PROPERTY(winrt::hstring, Padding, DEFAULT_PADDING);
@@ -76,7 +75,6 @@ namespace ControlUnitTests
         WINRT_PROPERTY(winrt::hstring, EnvironmentVariables);
 
         WINRT_PROPERTY(winrt::Microsoft::Terminal::Control::ScrollbarState, ScrollState, winrt::Microsoft::Terminal::Control::ScrollbarState::Visible);
-        WINRT_PROPERTY(bool, UseAtlasEngine, false);
 
         WINRT_PROPERTY(winrt::Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, winrt::Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale);
 

src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp

@@ -96,10 +96,9 @@ class TerminalCoreUnitTests::ConptyRoundtripTests final
         auto& g = ServiceLocator::LocateGlobals();
         auto& gci = g.getConsoleInformation();
 
-        gci.SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, INVALID_COLOR);
+        gci.SetDefaultForegroundColor(INVALID_COLOR);
-        gci.SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, INVALID_COLOR);
+        gci.SetDefaultBackgroundColor(INVALID_COLOR);
         gci.SetFillAttribute(0x07); // DARK_WHITE on DARK_BLACK
-        gci.CalculateDefaultColorIndices();
 
         m_state->PrepareNewTextBufferInfo(true, TerminalViewWidth, TerminalViewHeight);
         auto& currentBuffer = gci.GetActiveOutputBuffer();

src/cascadia/UnitTests_TerminalCore/TerminalApiTest.cpp

@@ -59,6 +59,7 @@ void TerminalApiTest::SetColorTableEntry()
     VERIFY_IS_TRUE(term.SetColorTableEntry(128, 100));
     VERIFY_IS_TRUE(term.SetColorTableEntry(255, 100));
 
+    VERIFY_IS_FALSE(term.SetColorTableEntry(256, 100));
     VERIFY_IS_FALSE(term.SetColorTableEntry(512, 100));
 }
 
@@ -270,7 +271,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlink()
     auto& stateMachine = *(term._stateMachine);
 
     // Process the opening osc 8 sequence
-    stateMachine.ProcessString(L"\x1b]8;;test.url\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;;test.url\x9c");
     VERIFY_IS_TRUE(tbi.GetCurrentAttributes().IsHyperlink());
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkUriFromId(tbi.GetCurrentAttributes().GetHyperlinkId()), L"test.url");
 
@@ -280,7 +281,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlink()
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkUriFromId(tbi.GetCurrentAttributes().GetHyperlinkId()), L"test.url");
 
     // Process the closing osc 8 sequences
-    stateMachine.ProcessString(L"\x1b]8;;\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;;\x9c");
     VERIFY_IS_FALSE(tbi.GetCurrentAttributes().IsHyperlink());
 }
 
@@ -296,7 +297,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlinkCustomId()
     auto& stateMachine = *(term._stateMachine);
 
     // Process the opening osc 8 sequence
-    stateMachine.ProcessString(L"\x1b]8;id=myId;test.url\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;id=myId;test.url\x9c");
     VERIFY_IS_TRUE(tbi.GetCurrentAttributes().IsHyperlink());
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkUriFromId(tbi.GetCurrentAttributes().GetHyperlinkId()), L"test.url");
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkId(L"test.url", L"myId"), tbi.GetCurrentAttributes().GetHyperlinkId());
@@ -308,7 +309,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlinkCustomId()
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkId(L"test.url", L"myId"), tbi.GetCurrentAttributes().GetHyperlinkId());
 
     // Process the closing osc 8 sequences
-    stateMachine.ProcessString(L"\x1b]8;;\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;;\x9c");
     VERIFY_IS_FALSE(tbi.GetCurrentAttributes().IsHyperlink());
 }
 
@@ -324,7 +325,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlinkCustomIdDifferentUri()
     auto& stateMachine = *(term._stateMachine);
 
     // Process the opening osc 8 sequence
-    stateMachine.ProcessString(L"\x1b]8;id=myId;test.url\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;id=myId;test.url\x9c");
     VERIFY_IS_TRUE(tbi.GetCurrentAttributes().IsHyperlink());
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkUriFromId(tbi.GetCurrentAttributes().GetHyperlinkId()), L"test.url");
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkId(L"test.url", L"myId"), tbi.GetCurrentAttributes().GetHyperlinkId());
@@ -332,7 +333,7 @@ void TerminalCoreUnitTests::TerminalApiTest::AddHyperlinkCustomIdDifferentUri()
     const auto oldAttributes{ tbi.GetCurrentAttributes() };
 
     // Send any other text
-    stateMachine.ProcessString(L"\x1b]8;id=myId;other.url\x1b\\");
+    stateMachine.ProcessString(L"\x1b]8;id=myId;other.url\x9c");
     VERIFY_IS_TRUE(tbi.GetCurrentAttributes().IsHyperlink());
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkUriFromId(tbi.GetCurrentAttributes().GetHyperlinkId()), L"other.url");
     VERIFY_ARE_EQUAL(tbi.GetHyperlinkId(L"other.url", L"myId"), tbi.GetCurrentAttributes().GetHyperlinkId());
@@ -355,58 +356,58 @@ void TerminalCoreUnitTests::TerminalApiTest::SetTaskbarProgress()
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(0));
 
     // Set some values for taskbar state and progress through state machine
-    stateMachine.ProcessString(L"\x1b]9;4;1;50\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;1;50\x9c");
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(1));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(50));
 
     // Reset to 0
-    stateMachine.ProcessString(L"\x1b]9;4;0;0\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;0;0\x9c");
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(0));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(0));
 
     // Set an out of bounds value for state
-    stateMachine.ProcessString(L"\x1b]9;4;5;50\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;5;50\x9c");
     // Nothing should have changed (dispatch should have returned false)
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(0));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(0));
 
     // Set an out of bounds value for progress
-    stateMachine.ProcessString(L"\x1b]9;4;1;999\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;1;999\x9c");
     // Progress should have been clamped to 100
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(1));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(100));
 
     // Don't specify any params
-    stateMachine.ProcessString(L"\x1b]9;4\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4\x9c");
     // State and progress should both be reset to 0
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(0));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(0));
 
     // Specify additional params
-    stateMachine.ProcessString(L"\x1b]9;4;1;80;123\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;1;80;123\x9c");
     // Additional params should be ignored, state and progress still set normally
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(1));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(80));
 
     // Edge cases + trailing semicolon testing
-    stateMachine.ProcessString(L"\x1b]9;4;2;\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;2;\x9c");
     // String should be processed correctly despite the trailing semicolon,
     // taskbar progress should remain unchanged from previous value
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(2));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(80));
 
-    stateMachine.ProcessString(L"\x1b]9;4;3;75\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;3;75\x9c");
     // Given progress value should be ignored because this is the indeterminate state,
     // so the progress value should remain unchanged
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(3));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(80));
 
-    stateMachine.ProcessString(L"\x1b]9;4;0;50\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;0;50\x9c");
     // Taskbar progress should be 0 (the given value should be ignored)
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(0));
     VERIFY_ARE_EQUAL(term.GetTaskbarProgress(), gsl::narrow<size_t>(0));
 
-    stateMachine.ProcessString(L"\x1b]9;4;2;\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;4;2;\x9c");
     // String should be processed correctly despite the trailing semicolon,
     // taskbar progress should be set to a 'minimum', non-zero value
     VERIFY_ARE_EQUAL(term.GetTaskbarState(), gsl::narrow<size_t>(2));
@@ -426,45 +427,45 @@ void TerminalCoreUnitTests::TerminalApiTest::SetWorkingDirectory()
     VERIFY_IS_TRUE(term.GetWorkingDirectory().empty());
 
     // Invalid sequences should not change CWD
-    stateMachine.ProcessString(L"\x1b]9;9\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9\x9c");
     VERIFY_IS_TRUE(term.GetWorkingDirectory().empty());
 
-    stateMachine.ProcessString(L"\x1b]9;9\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9\"\x9c");
     VERIFY_IS_TRUE(term.GetWorkingDirectory().empty());
 
-    stateMachine.ProcessString(L"\x1b]9;9\"C:\\\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9\"C:\\\"\x9c");
     VERIFY_IS_TRUE(term.GetWorkingDirectory().empty());
 
     // Valid sequences should change CWD
-    stateMachine.ProcessString(L"\x1b]9;9;\"C:\\\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"C:\\\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"C:\\");
 
-    stateMachine.ProcessString(L"\x1b]9;9;\"C:\\Program Files\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"C:\\Program Files\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"C:\\Program Files");
 
-    stateMachine.ProcessString(L"\x1b]9;9;\"D:\\中文\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"D:\\中文\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"D:\\中文");
 
     // Test OSC 9;9 sequences without quotation marks
-    stateMachine.ProcessString(L"\x1b]9;9;C:\\\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;C:\\\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"C:\\");
 
-    stateMachine.ProcessString(L"\x1b]9;9;C:\\Program Files\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;C:\\Program Files\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"C:\\Program Files");
 
-    stateMachine.ProcessString(L"\x1b]9;9;D:\\中文\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;D:\\中文\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"D:\\中文");
 
     // These OSC 9;9 sequences will result in invalid CWD. We shouldn't crash on these.
-    stateMachine.ProcessString(L"\x1b]9;9;\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"\"");
 
-    stateMachine.ProcessString(L"\x1b]9;9;\"\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"\"\"");
 
-    stateMachine.ProcessString(L"\x1b]9;9;\"\"\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"\"\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"\"");
 
-    stateMachine.ProcessString(L"\x1b]9;9;\"\"\"\"\x1b\\");
+    stateMachine.ProcessString(L"\x1b]9;9;\"\"\"\"\x9c");
     VERIFY_ARE_EQUAL(term.GetWorkingDirectory(), L"\"\"");
 }

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -845,30 +845,8 @@ winrt::Windows::Foundation::IAsyncAction AppHost::_SaveWindowLayouts()
 
     if (_logic.ShouldUsePersistedLayout())
     {
-        try
+        const auto layoutJsons = _windowManager.GetAllWindowLayouts();
-        {
+        _logic.SaveWindowLayoutJsons(layoutJsons);
-            TraceLoggingWrite(g_hWindowsTerminalProvider,
-                              "AppHost_SaveWindowLayouts_Collect",
-                              TraceLoggingDescription("Logged when collecting window state"),
-                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-            const auto layoutJsons = _windowManager.GetAllWindowLayouts();
-            TraceLoggingWrite(g_hWindowsTerminalProvider,
-                              "AppHost_SaveWindowLayouts_Save",
-                              TraceLoggingDescription("Logged when writing window state"),
-                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-            _logic.SaveWindowLayoutJsons(layoutJsons);
-        }
-        catch (...)
-        {
-            LOG_CAUGHT_EXCEPTION();
-            TraceLoggingWrite(g_hWindowsTerminalProvider,
-                              "AppHost_SaveWindowLayouts_Failed",
-                              TraceLoggingDescription("An error occurred when collecting or writing window state"),
-                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-        }
     }
 
     co_return;
@@ -889,12 +867,6 @@ winrt::fire_and_forget AppHost::_SaveWindowLayoutsRepeat()
     // per 10 seconds, if a save is requested by another source simultaneously.
     if (_getWindowLayoutThrottler.has_value())
     {
-        TraceLoggingWrite(g_hWindowsTerminalProvider,
-                          "AppHost_requestGetLayout",
-                          TraceLoggingDescription("Logged when triggering a throttled write of the window state"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-
         _getWindowLayoutThrottler.value()();
     }
 }

src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj

@@ -115,23 +115,6 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 
-  <!--
-  BODGY
-
-  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
-  executable we put in the package. But we DON'T produce a winmd. This makes the
-  FastUpToDate check fail every time, and leads to the whole wapproj build
-  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
-
-  Setting GenerateWindowsMetadata=false is enough to tell the build system that
-  we don't produce one, and get it off our backs.
-  -->
-  <ItemDefinitionGroup>
-    <Link>
-        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 
   <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />

src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest

@@ -18,7 +18,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/WindowsTerminalUniversal/Package.appxmanifest

@@ -18,7 +18,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
@@ -9,16 +9,25 @@ namespace WindowsTerminal.UIA.Tests.Common
 {
     public static class PgoManager
     {
+        private static string TrimExtension(string str)
+        {
+            if (str.EndsWith(".exe") || str.EndsWith(".dll"))
+            {
+                return str.Substring(0, str.Length - 4);
+            }
+            return str;
+        }
+
         public static void PgoSweepIfInstrumented(TestContext context, string assemblyName)
         {
-#if PGO_INSTRUMENT
+#if true
             string pgcFileName = context.TestName;
             Log.Comment($"Running pgosweep on '{assemblyName}' for test: {pgcFileName}");
             try
             {
                 var startInfo = new ProcessStartInfo() {
                     FileName = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, "pgosweep.exe")),
-                    Arguments = $"{assemblyName} {assemblyName}-{pgcFileName}.pgc",
+                    Arguments = $"{assemblyName} {TrimExtension(assemblyName)}!{pgcFileName}.pgc",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 };

src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj

@@ -117,6 +117,8 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- Install an empty one for projects that don't PGO. -->
+  <Target Name="MergePGOCounts" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj

@@ -29,6 +29,9 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- Install an empty one for CSPROJ projects as they don't PGO. -->
+  <Target Name="MergePGOCounts" />
+
   <Target Name="CollectNativePackContents">
     <ItemGroup>
       <None Include="$(RepoBinPath)\Win32\$(Configuration)\PublicTerminalCore.dll">

src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml

@@ -29,7 +29,7 @@
     <Description>TAEF Packaged Cwa FullTrust Application Host Process</Description>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

src/common.build.post.props

@@ -33,9 +33,7 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
-  <!-- PGO -->
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(Platform)'=='x64'" Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.targets" />
-  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Optimize'" Project="$(SolutionDir)packages\$(PGODatabaseId).$(PGODatabaseVersion)\build\PGO.targets" />
-  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Instrument'" Project="$(SolutionDir)\src\common.pgo.runtime.props" />
 
   <!-- Exclude our dependencies from static analysis. CAExcludePath can only be
        set after we've imported Microsoft.Cpp.targets -->

src/common.build.pre.props

@@ -75,7 +75,7 @@
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.22000.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)' == ''">10.0.18362.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
@@ -174,8 +174,10 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <Import Condition="'$(PgoTarget)' == 'true' And '$(Configuration)' == 'Release'" Project="$(SolutionDir)\src\common.pgo.compile.props" />
+  <!-- Install an empty one for projects that won't have one.
-  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Optimize'" Project="$(SolutionDir)\tools\PGODatabase\PGO.version.props" />
+       The following import will override it when it needs to happen. -->
+  <Target Name="MergePGOCounts" />
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(Platform)'=='x64'" Project="$(SolutionDir)\build\PGO\Terminal.PGO.props" />
 
   <!-- For Win32 (x86) ONLY ... we use all defaults for AMD64. No def for those. -->
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">

src/common.pgo.compile.props

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- From our friends at MUX: https://github.com/microsoft/microsoft-ui-xaml/blob/main/PGO.compile.props -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Condition="'$(PGOBuildMode)' == 'Instrument'">
-        <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-
-    <!-- Enable PGO optimization only for Release builds. -->
-    <ItemDefinitionGroup Condition="'$(PGOBuildMode)' == 'Instrument'">
-        <Link>
-            <AdditionalOptions>/GENPROFILE %(AdditionalOptions)</AdditionalOptions>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-            <AdditionalDependencies Condition="'$(Platform)'=='ARM'">$(VC_ReferencesPath_VC_ARM)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='ARM64'">$(VC_ReferencesPath_VC_ARM64)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='Win32'">$(VC_ReferencesPath_VC_x86)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='x64'">$(VC_ReferencesPath_VC_x64)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-        </Link>
-    </ItemDefinitionGroup>
-</Project>

src/common.pgo.runtime.props

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- From our friends at MUX: https://github.com/microsoft/microsoft-ui-xaml/blob/main/PGO.runtime.props -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <PlatformShortName Condition="'$(PlatformShortName)'==''">$(Platform)</PlatformShortName>
-        <PlatformShortName Condition="'$(PlatformShortName)'=='Win32'">x86</PlatformShortName>
-        <PlatformShortName Condition="'$(PlatformShortName)'=='AnyCPU' and '$(Prefer32Bit)'==''">x64</PlatformShortName>
-        <PlatformShortName Condition="'$(PlatformShortName)'=='AnyCPU' and '$(Prefer32Bit)'=='true'">x64</PlatformShortName>
-        <PlatformShortName Condition="'$(PlatformShortName)'=='AnyCPU' and '$(Prefer32Bit)'=='false'">x64</PlatformShortName>
-        <HostFolderName Condition="'$(VCToolArchitecture)'=='Native32Bit'">Hostx86</HostFolderName>
-        <HostFolderName Condition="'$(VCToolArchitecture)'=='Native64Bit'">Hostx64</HostFolderName>
-        <PGOFilesDir>$(VCToolsInstallDir)bin\$(HostFolderName)\$(PlatformShortName)</PGOFilesDir>
-        <PGOFilesDir Condition="'$(PlatformShortName)'=='ARM' or '$(PlatformShortName)'=='ARM64'">$(VCToolsInstallDir)bin\$(PlatformShortName)</PGOFilesDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="$(PGOFilesDir)\pgort140.dll">
-            <Link>%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Include="$(PGOFilesDir)\pgosweep.exe">
-            <Link>%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Include="$(PGOFilesDir)\vcruntime140.dll" Condition="Exists('$(PGOFilesDir)\vcruntime140.dll')">
-            <Link>%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>

src/features.xml

@@ -79,14 +79,4 @@
         <!-- This feature will not ship to Stable until it is complete. -->
         <alwaysDisabledReleaseTokens />
     </feature>
-
-    <feature>
-        <name>Feature_AtlasEngine</name>
-        <description>If enabled, AtlasEngine and the experimental.useAtlasEngine setting are compiled into the project</description>
-        <stage>AlwaysEnabled</stage>
-        <alwaysDisabledBrandingTokens>
-            <brandingToken>Release</brandingToken>
-            <brandingToken>WindowsInbox</brandingToken>
-        </alwaysDisabledBrandingTokens>
-    </feature>
 </featureStaging>

src/host/consoleInformation.cpp

@@ -219,6 +219,36 @@ InputBuffer* const CONSOLE_INFORMATION::GetActiveInputBuffer() const
     return pInputBuffer;
 }
 
+// Method Description:
+// - Return the default foreground color of the console. If the settings are
+//      configured to have a default foreground color (separate from the color
+//      table), this will return that value. Otherwise it will return the value
+//      from the colortable corresponding to our default attributes.
+// Arguments:
+// - <none>
+// Return Value:
+// - the default foreground color of the console.
+COLORREF CONSOLE_INFORMATION::GetDefaultForeground() const noexcept
+{
+    const auto fg = GetDefaultForegroundColor();
+    return fg != INVALID_COLOR ? fg : GetLegacyColorTableEntry(LOBYTE(GetFillAttribute()) & FG_ATTRS);
+}
+
+// Method Description:
+// - Return the default background color of the console. If the settings are
+//      configured to have a default background color (separate from the color
+//      table), this will return that value. Otherwise it will return the value
+//      from the colortable corresponding to our default attributes.
+// Arguments:
+// - <none>
+// Return Value:
+// - the default background color of the console.
+COLORREF CONSOLE_INFORMATION::GetDefaultBackground() const noexcept
+{
+    const auto bg = GetDefaultBackgroundColor();
+    return bg != INVALID_COLOR ? bg : GetLegacyColorTableEntry((LOBYTE(GetFillAttribute()) & BG_ATTRS) >> 4);
+}
+
 // Method Description:
 // - Get the colors of a particular text attribute, using our color table,
 //      and our configured default attributes.
@@ -227,12 +257,26 @@ InputBuffer* const CONSOLE_INFORMATION::GetActiveInputBuffer() const
 // Return Value:
 // - The color values of the attribute's foreground and background.
 std::pair<COLORREF, COLORREF> CONSOLE_INFORMATION::LookupAttributeColors(const TextAttribute& attr) const noexcept
+{
+    return LookupAttributeColors(attr, GetDefaultForeground(), GetDefaultBackground());
+}
+
+// Method Description:
+// - Get the colors of a particular text attribute, using our color table,
+//      and the given default color values.
+// Arguments:
+// - attr: the TextAttribute to retrieve the foreground and background color of.
+// - defaultFg: the COLORREF to use for a default foreground color.
+// - defaultBg: the COLORREF to use for a default background color.
+// Return Value:
+// - The color values of the attribute's foreground and background.
+std::pair<COLORREF, COLORREF> CONSOLE_INFORMATION::LookupAttributeColors(const TextAttribute& attr, const COLORREF defaultFg, const COLORREF defaultBg) const noexcept
 {
     _blinkingState.RecordBlinkingUsage(attr);
     return attr.CalculateRgbColors(
         GetColorTable(),
-        GetDefaultForegroundIndex(),
+        defaultFg,
-        GetDefaultBackgroundIndex(),
+        defaultBg,
         IsScreenReversed(),
         _blinkingState.IsBlinkingFaint());
 }

src/host/exe/Host.EXE.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="..\..\renderer\base\lib\base.vcxproj">
       <Project>{af0a096a-8b3a-4949-81ef-7df8f0fee91f}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\renderer\atlas\atlas.vcxproj">
-      <Project>{8222900C-8B6C-452A-91AC-BE95DB04B95F}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\renderer\dx\lib\dx.vcxproj">
       <Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
     </ProjectReference>