Migrate spelling-0.0.21 changes from main

OpenConsole.sln

@@ -73,7 +73,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.unittest", "src\host\ut_lib\host.unittest.vcxproj", "{06EC74CB-9A12-429C-B551-8562EC954747}"
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
-		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Unit", "src\host\ut_host\Host.UnitTests.vcxproj", "{531C23E7-4B76-4C08-8AAD-04164CB628C9}"

build/Helix/OutputTestResults.ps1

@@ -21,7 +21,7 @@ Write-Host "Checking test results..."
 $queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
 Write-Host "queryUri = $queryUri"
 
-$testRuns = Invoke-RestMethodWithRetries $queryUri -Headers $azureDevOpsRestApiHeaders
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
 [System.Collections.Generic.List[string]]$failingTests = @()
 [System.Collections.Generic.List[string]]$unreliableTests = @()
 [System.Collections.Generic.List[string]]$unexpectedResultTest = @()
@@ -50,7 +50,7 @@ foreach ($testRun in ($testRuns.value | Sort-Object -Property "completedDate" -D
     $totalTestsExecutedCount += $testRun.totalTests
 
     $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
-    $testResults = Invoke-RestMethodWithRetries "$($testRun.url)/results?api-version=5.0" -Headers $azureDevOpsRestApiHeaders
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
         
     foreach ($testResult in $testResults.value)
     {

build/Helix/ProcessHelixFiles.ps1

@@ -20,31 +20,13 @@ function Generate-File-Links
         Out-File -FilePath $helixLinkFile -Append -InputObject "<ul>"
         foreach($file in $files)
         {
-            $url = Append-HelixAccessTokenToUrl $file.Link "{Your-Helix-Access-Token-Here}"
-            Out-File -FilePath $helixLinkFile -Append -InputObject "<li>$($url)</li>"
+            Out-File -FilePath $helixLinkFile -Append -InputObject "<li><a href=$($file.Link)>$($file.Name)</a></li>"
         }
         Out-File -FilePath $helixLinkFile -Append -InputObject "</ul>"
         Out-File -FilePath $helixLinkFile -Append -InputObject "</div>"
     }
 }
 
-function Append-HelixAccessTokenToUrl
-{
-    Param ([string]$url, [string]$token)
-    if($token)
-    {
-        if($url.Contains("?"))
-        {
-            $url = "$($url)&access_token=$($token)"
-        }
-        else
-        {
-            $url = "$($url)?access_token=$($token)"
-        }
-    }
-    return $url
-}
-
 #Create output directory
 New-Item $OutputFolder -ItemType Directory
 
@@ -81,8 +63,7 @@ foreach ($testRun in $testRuns.value)
         if (-not $workItems.Contains($workItem))
         {
             $workItems.Add($workItem)
-            $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files"
-            $filesQueryUri = Append-HelixAccessTokenToUrl $filesQueryUri $helixAccessToken
+            $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files$accessTokenParam"
             $files = Invoke-RestMethodWithRetries $filesQueryUri
 
             $screenShots = $files | where { $_.Name.EndsWith(".jpg") }
@@ -121,7 +102,6 @@ foreach ($testRun in $testRuns.value)
 
                     Write-Host "Downloading $link to $destination"
 
-                    $link = Append-HelixAccessTokenToUrl $link $HelixAccessToken
                     Download-FileWithRetries $link $destination
                 }
             }

build/Helix/UpdateUnreliableTests.ps1

@@ -23,7 +23,7 @@ Write-Host "queryUri = $queryUri"
 # To account for unreliable tests, we'll iterate through all of the tests associated with this build, check to see any tests that were unreliable
 # (denoted by being marked as "skipped"), and if so, we'll instead mark those tests with a warning and enumerate all of the attempted runs
 # with their pass/fail states as well as any relevant error messages for failed attempts.
-$testRuns = Invoke-RestMethodWithRetries $queryUri -Headers $azureDevOpsRestApiHeaders
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
 
 $timesSeenByRunName = @{}
       
@@ -32,10 +32,10 @@ foreach ($testRun in $testRuns.value)
     $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
         
     Write-Host "Marking test run `"$($testRun.name)`" as in progress so we can change its results to account for unreliable tests."
-    Invoke-RestMethod "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
 
     Write-Host "Retrieving test results..."
-    $testResults = Invoke-RestMethodWithRetries $testRunResultsUri -Headers $azureDevOpsRestApiHeaders
+    $testResults = Invoke-RestMethod -Uri $testRunResultsUri -Method Get -Headers $azureDevOpsRestApiHeaders
         
     foreach ($testResult in $testResults.value)
     {
@@ -54,8 +54,7 @@ foreach ($testRun in $testRuns.value)
             Write-Host "  Test $($testResult.testCaseTitle) was detected as unreliable. Updating..."
             
             # The errorMessage field contains a link to the JSON-encoded rerun result data.
-            $resultsJson = Download-StringWithRetries "Error results" $testResult.errorMessage
-            $rerunResults = ConvertFrom-Json $resultsJson
+            $rerunResults = ConvertFrom-Json (New-Object System.Net.WebClient).DownloadString($testResult.errorMessage)
             [System.Collections.Generic.List[System.Collections.Hashtable]]$rerunDataList = @()
             $attemptCount = 0
             $passCount = 0

build/pipelines/release.yml

@@ -1,487 +1,48 @@
-# This build should never run as CI or against a pull request.
 trigger: none
 pr: none
 
-pool: 
-  name: WinDevPool-L
-  demands: ImageOverride -equals WinDevVS16-latest
-
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-  - name: buildTerminal
-    displayName: "Build Windows Terminal MSIX"
-    type: boolean
-    default: true
-  - name: buildTerminalVPack
-    displayName: "Build Windows Terminal VPack"
-    type: boolean
-    default: false
-  - name: buildWPF
-    displayName: "Build Terminal WPF Control"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    displayName: "PGO Build Mode"
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-
 variables:
-  TerminalInternalPackageVersion: "0.0.7"
+  baseYearForVersioning: 2019 # Used by build-console-int
+  versionMajor: 0
+  versionMinor: 1
 
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
+# When we move off PackageES for Versioning, we'll need to switch
+# name to this format. For now, though, we need to use DayOfYear.Rev
+# to unique our builds, as mandated by PackageES's Setup task.
+# name: '$(versionMajor).$(versionMinor).$(DayOfYear)$(Rev:r).0'
+#
+# Build name/version number above must end with .0 to make the
+# store publication machinery happy.
+name: 'Terminal_$(date:yyMM).$(date:dd)$(rev:rrr)'
+
+# Build Arguments:
+#   WindowsTerminalOfficialBuild=[true,false]
+#     true - this is running on our build agent
+#     false - running locally
+#   WindowsTerminalBranding=[Dev,Preview,Release]
+#     <none>  - Development build resources (default)
+#     Preview - Preview build resources
+#     Release - regular build resources
 jobs:
-- job: Build
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ each platform in parameters.buildPlatforms }}:
-          ${{ config }}_${{ platform }}:
-            BuildConfiguration: ${{ config }}
-            BuildPlatform: ${{ platform }}
-  displayName: Build
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - task: PowerShell@2
-    displayName: Rationalize Build Platform
-    inputs:
-      targetType: inline
-      script: >-
-        $Arch = "$(BuildPlatform)"
+  - template: ./templates/build-console-audit-job.yml
+    parameters:
+      platform: x64
 
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
 
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 5.10
-    inputs:
-      versionSpec: 5.10
-  - task: NuGetCommand@2
-    displayName: NuGet custom
-    inputs:
-      command: custom
-      selectOrConfig: config
-      nugetConfigPath: NuGet.Config
-      arguments: restore OpenConsole.sln -SolutionDirectory $(Build.SourcesDirectory)
-  - task: UniversalPackages@0
-    displayName: Download terminal-internal Universal Package
-    inputs:
-      feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-      packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-      versionListDownload: $(TerminalInternalPackageVersion)
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: >-
-        src\cascadia\TerminalApp\Resources\en-US\Resources.resw
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x86
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
 
-        src\cascadia\TerminalControl\Resources\en-US\Resources.resw
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: arm64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
 
-        src\cascadia\TerminalConnection\Resources\en-US\Resources.resw
+  - template: ./templates/check-formatting.yml
 
-        src\cascadia\TerminalSettingsModel\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsEditor\Resources\en-US\Resources.resw
-
-        src\cascadia\WindowsTerminalUniversal\Resources\en-US\Resources.resw
-
-        src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      pseudoSetting: Included
-  - task: PowerShell@2
-    displayName: Move Loc files one level up
-    inputs:
-      targetType: inline
-      script: >-
-        $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-
-        $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-      pwsh: true
-  - task: PowerShell@2
-    displayName: Generate NOTICE.html from NOTICE.md
-    inputs:
-      filePath: .\build\scripts\Generate-ThirdPartyNotices.ps1
-      arguments: -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
-      pwsh: true
-  - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-    - task: PowerShell@2
-      displayName: Restore PGO Database
-      inputs:
-        filePath: tools/PGODatabase/restore-pgodb.ps1
-        workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /t:Terminal\CascadiaPackage;Terminal\WindowsTerminalUniversal /p:WindowsTerminalReleaseBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-        clean: true
-        maximumCpuCount: true
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: binlog'
-      condition: failed()
-      continueOnError: True
-      inputs:
-        PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
-        ArtifactName: binlog-$(BuildPlatform)
-    - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
-      - task: PowerShell@2
-        displayName: Validate binaries are optimized
-        condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-        inputs:
-          targetType: inline
-          script: >-
-            $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
-
-            foreach ($BinFile in $Binaries) {
-
-              & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/src/cascadia/CascadiaPackage/bin/$(BuildPlatform)/$(BuildConfiguration)/$BinFile"
-
-            }
-    - task: PowerShell@2
-      displayName: Check MSIX for common regressions
-      inputs:
-        targetType: inline
-        script: >-
-          $Package = Get-ChildItem -Recurse -Filter "CascadiaPackage_*.msix"
-
-          .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path $Package.FullName
-        pwsh: true
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for PublicTerminalCore
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-  - task: PowerShell@2
-    displayName: Source Index PDBs
-    inputs:
-      filePath: build\scripts\Index-Pdbs.ps1
-      arguments: -SearchDir '$(Build.SourcesDirectory)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-      errorActionPreference: silentlyContinue
-  - task: ComponentGovernanceComponentDetection@0
-    displayName: Component Detection
-  - task: PowerShell@2
-    displayName: Run Unit Tests
-    condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - task: PowerShell@2
-    displayName: Run Feature Tests
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy *.appx/*.msix to Artifacts
-      inputs:
-        Contents: >-
-          **/*.appx
-
-          **/*.msix
-
-          **/*.appxsym
-
-          !**/Microsoft.VCLibs*.appx
-        TargetFolder: $(Build.ArtifactStagingDirectory)/appx
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (appx)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
-        ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy PublicTerminalCore.dll to Artifacts
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        Contents: >-
-          **/PublicTerminalCore.dll
-
-          **/api-ms-win-core-synch-l1-2-0.dll
-        TargetFolder: $(Build.ArtifactStagingDirectory)/wpf
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (PublicTerminalCore)
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/wpf
-        ArtifactName: wpf-dll-$(BuildPlatform)-$(BuildConfiguration)
-  - task: PublishSymbols@2
-    displayName: Publish symbols path
-    continueOnError: True
-    inputs:
-      SearchPattern: '**/*.pdb'
-      IndexSources: false
-      SymbolServerType: TeamServices
-
-- ${{ if eq(parameters.buildTerminal, true) }}:
-  - job: BundleAndSign
-    displayName: Create and sign AppX/MSIX bundles
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Artifacts (*.appx, *.msix)
-      inputs:
-        downloadType: specific
-        itemPattern: >-
-          **/*.msix
-
-          **/*.appx
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Create WindowsTerminal*.msixbundle
-      inputs:
-        filePath: build\scripts\Create-AppxBundle.ps1
-        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion 0.0.0.0 -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-    - task: PowerShell@2
-      displayName: Create WindowsTerminalUniversal*.msixbundle
-      inputs:
-        filePath: build\scripts\Create-AppxBundle.ps1
-        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName WindowsTerminalUniversal -BundleVersion $(XES_APPXMANIFESTVERSION) -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminalUniversal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.msixbundle to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)
-        Pattern: Microsoft.WindowsTerminal*.msixbundle
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolSign",
-                  "Parameters": {
-                      "OpusName": "Microsoft",
-                      "OpusInfo": "http://www.microsoft.com",
-                      "FileDigest": "/fd \"SHA256\"",
-                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  },
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: appxbundle-signed'
-      inputs:
-        PathtoPublish: $(System.ArtifactsDirectory)
-        ArtifactName: appxbundle-signed
-
-- ${{ if eq(parameters.buildWPF, true) }}:
-  - job: PackageAndSignWPF
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (WPF Terminal Control)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - task: DownloadBuildArtifacts@0
-      displayName: Download x86 PublicTerminalCore
-      inputs:
-        artifactName: wpf-dll-x86-$(BuildConfiguration)
-        itemPattern: '**/*.dll'
-        downloadPath: bin\Win32\$(BuildConfiguration)\
-        extractTars: false
-    - task: DownloadBuildArtifacts@0
-      displayName: Download x64 PublicTerminalCore
-      inputs:
-        artifactName: wpf-dll-x64-$(BuildConfiguration)
-        itemPattern: '**/*.dll'
-        downloadPath: bin\x64\$(BuildConfiguration)\
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts up a level
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: >-
-          Get-ChildItem bin -Recurse -Directory -Filter wpf-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet restore copy
-      inputs:
-        selectOrConfig: config
-        nugetConfigPath: NuGet.Config
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for WPF Control
-      inputs:
-        solution: '**\OpenConsole.sln'
-        vsVersion: 16.0
-        msbuildArgs: /p:WindowsTerminalReleaseBuild=$(UseReleaseBranding);Version=$(XES_PACKAGEVERSIONNUMBER) /t:Pack
-        platform: Any CPU
-        configuration: $(BuildConfiguration)
-        maximumCpuCount: true
-    - task: PublishSymbols@2
-      displayName: Publish symbols path
-      continueOnError: True
-      inputs:
-        SearchPattern: '**/*.pdb'
-        IndexSources: false
-        SymbolServerType: TeamServices
-        SymbolsArtifactName: Symbols_WPF_$(BuildConfiguration)
-    - task: CopyFiles@2
-      displayName: Copy *.nupkg to Artifacts
-      inputs:
-        Contents: '**/*Wpf*.nupkg'
-        TargetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-        OverWrite: true
-        flattenFolders: true
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (nupkg)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
-        ArtifactName: wpf-nupkg-$(BuildConfiguration)
-
-- ${{ if eq(parameters.buildTerminalVPack, true) }}:
-  - job: VPack
-    displayName: Create Windows vPack
-    dependsOn: BundleAndSign
-    steps:
-    - checkout: self
-      clean: true
-      submodules: true
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Build Artifacts
-      inputs:
-        artifactName: appxbundle-signed
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Rename and stage packages for vpack
-      inputs:
-        targetType: inline
-        script: >-
-          # Rename to known/fixed name for Windows build system
-
-          Get-ChildItem Microsoft.WindowsTerminal_*.msixbundle | Rename-Item -NewName { 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle' }
-
-
-          # Create vpack directory and place item inside
-
-          mkdir WindowsTerminal.app
-
-          mv Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle .\WindowsTerminal.app\
-        workingDirectory: $(System.ArtifactsDirectory)\appxbundle-signed
-    - task: PkgESVPack@12
-      displayName: 'Package ES - VPack'
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        sourceDirectory: $(System.ArtifactsDirectory)\appxbundle-signed\WindowsTerminal.app
-        description: Windows Terminal pre-install application
-        pushPkgName: WindowsTerminal.app
-        owner: condev
-...
+  - template: ./templates/release-sign-and-bundle.yml

build/pipelines/templates/build-console-audit-job.yml

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

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

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

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

@@ -0,0 +1,31 @@
+parameters:
+  configuration: 'Release'
+  platform: ''
+  additionalBuildArguments: ''
+
+jobs:
+- job: Build${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    BuildPlatform: ${{ parameters.platform }}
+    PGOBuildMode: 'Optimize'
+
+  pool:
+    name: Package ES Lab E
+    demands:
+    - msbuild
+    - visualstudio
+    - vstest
+
+  steps:
+  - task: PkgESSetupBuild@10
+    displayName: 'Package ES - Setup Build'
+    inputs:
+      useDfs: false
+      productName: WindowsTerminal
+      disableOutputRedirect: true
+
+  - template: build-console-steps.yml
+    parameters:
+      additionalBuildArguments: "/p:XesUseOneStoreVersioning=true;XesBaseYearForStoreVersion=$(baseYearForVersioning) ${{ parameters.additionalBuildArguments }}"

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

@@ -3,7 +3,7 @@ parameters:
   platform: ''
   additionalBuildArguments: ''
   minimumExpectedTestsExecutedCount: 1  # Sanity check for minimum expected tests to be reported
-  rerunPassesRequiredToAvoidFailure: 5
+  rerunPassesRequiredToAvoidFailure: 0
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}
@@ -12,12 +12,9 @@ jobs:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
     PGOBuildMode: 'Instrument'
-  pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS16-latest
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }
 
   steps:
   - template: build-console-steps.yml

build/pipelines/templates/check-formatting.yml

@@ -11,7 +11,7 @@ jobs:
     clean: true
 
   - task: PowerShell@2
-    displayName: 'Code Formatting Check'
+    displayName: 'Code Formattting Check'
     inputs:
       targetType: filePath
       filePath: '.\build\scripts\Invoke-FormattingCheck.ps1'

build/pipelines/templates/helix-processtestresults-job.yml

@@ -22,7 +22,6 @@ jobs:
     condition: succeededOrFailed()
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
     inputs:
       targetType: filePath
       filePath: build\Helix\UpdateUnreliableTests.ps1
@@ -33,7 +32,6 @@ jobs:
     condition: succeededOrFailed()
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
     inputs:
       targetType: filePath
       filePath: build\Helix\OutputTestResults.ps1

build/pipelines/templates/helix-runtests-job.yml

@@ -15,7 +15,6 @@ parameters:
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
   openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -30,11 +29,11 @@ jobs:
     buildConfiguration: ${{ parameters.configuration }}
     buildPlatform: ${{ parameters.platform }}
     openHelixTargetQueues: ${{ parameters.openHelixTargetQueues }}
-    closedHelixTargetQueues: ${{ parameters.closedHelixTargetQueues }}
     artifactsDir: $(Build.SourcesDirectory)\Artifacts
     taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.60.210621002\build\Binaries\$(buildPlatform)
     helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'
 
+
   steps:
   - task: CmdLine@1
     displayName: 'Display build machine environment variables'
@@ -141,7 +140,6 @@ jobs:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run tests in Helix (open queues)'
-    condition: and(succeeded(),eq(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
@@ -149,15 +147,3 @@ jobs:
       projects: build\Helix\RunTestsInHelix.proj
       custom: msbuild
       arguments: '$(helixCommonArgs) /p:IsExternal=true /p:Creator=Terminal /p:HelixTargetQueues=$(openHelixTargetQueues)'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run tests in Helix (closed queues)'
-    condition: and(succeeded(),ne(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      command: custom
-      projects: build\Helix\RunTestsInHelix.proj
-      custom: msbuild
-      arguments: '$(helixCommonArgs) /p:HelixTargetQueues=$(closedHelixTargetQueues)'

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

@@ -20,15 +20,11 @@ jobs:
     inputs:
       artifactName: ${{ parameters.pgoArtifact }}
       downloadPath: $(artifactsPath)
-
-  - task: NuGetAuthenticate@0
-    inputs:
-      nuGetServiceConnections: 'Terminal Public Artifact Feed'
-
+  
   - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 5.8.0'
+    displayName: 'Use NuGet 5.2.0'
     inputs:
-      versionSpec: 5.8.0
+      versionSpec: 5.2.0
 
   - task: CopyFiles@2
     displayName: 'Copy pgd files to NuGet build directory'
@@ -62,11 +58,5 @@ jobs:
     displayName: 'NuGet push'
     inputs:
       command: push
-      nuGetFeedType: external
-      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
-      # The actual URL and PAT for this feed is configured at
-      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
-      # This is the name of that connection
-      publishFeedCredentials: 'Terminal Public Artifact Feed'
-      feedsToUse: config
-      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
+      publishVstsFeed: Terminal/TerminalDependencies
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg

build/pipelines/templates/release-sign-and-bundle.yml

@@ -0,0 +1,74 @@
+parameters:
+  configuration: 'Release'
+
+jobs:
+- job: SignDeploy${{ parameters.configuration }}
+  displayName: Sign and Deploy for ${{ parameters.configuration }}
+
+  dependsOn:
+    - Buildx64AuditMode
+    - Buildx64Release
+    - Buildx86Release
+    - Buildarm64Release
+    - CodeFormatCheck
+  condition: |
+    and
+    (
+      in(dependencies.Buildx64AuditMode.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildx64Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildx86Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.Buildarm64Release.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.CodeFormatCheck.result,   'Succeeded', 'SucceededWithIssues', 'Skipped')
+    )
+
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    AppxProjectName: CascadiaPackage
+    AppxBundleName: Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle
+
+  pool:
+    name: Package ES Lab E
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: PkgESSetupBuild@10
+    displayName: 'Package ES - Setup Build'
+    inputs:
+      useDfs: false
+      productName: WindowsTerminal
+      disableOutputRedirect: true
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download AppX artifacts
+    inputs:
+      artifactName: 'appx-$(BuildConfiguration)'
+      itemPattern: |
+        **/*.appx
+        **/*.msix
+      downloadPath: '$(Build.ArtifactStagingDirectory)\appx'
+
+  - task: PowerShell@2
+    displayName: 'Create $(AppxBundleName)'
+    inputs:
+      targetType: filePath
+      filePath: '.\build\scripts\Create-AppxBundle.ps1'
+      arguments: |
+        -InputPath "$(Build.ArtifactStagingDirectory)\appx" -ProjectName $(AppxProjectName) -BundleVersion 0.0.0.0 -OutputPath "$(Build.ArtifactStagingDirectory)\$(AppxBundleName)"
+
+  - task: PkgESCodeSign@10
+    displayName: 'Package ES - SignConfig.WindowsTerminal.xml'
+    inputs:
+      signConfigXml: 'build\config\SignConfig.WindowsTerminal.xml'
+      inPathRoot: '$(Build.ArtifactStagingDirectory)'
+      outPathRoot: '$(Build.ArtifactStagingDirectory)\signed'
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Signed AppX'
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)\signed'
+      ArtifactName: 'appxbundle-signed-$(BuildConfiguration)'

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>12</VersionMinor>
+    <VersionMinor>11</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/cascadia/profiles.schema.json

@@ -4,13 +4,13 @@
   "title": "Microsoft's Windows Terminal Settings Profile Schema",
   "definitions": {
     "KeyChordSegment": {
-      "pattern": "^(?:(?:ctrl|alt|shift|win)\\+)*(?:app|backspace|browser_(?:back|forward|refresh|stop|search|favorites|home)|comma|delete|down|end|enter|esc|escape|home|insert|left|menu|minus|pagedown|pageup|period|pgdn|pgup|plus|right|space|tab|up|f(?:1\\d?|2[0-4]?|[3-9])|numpad\\d|numpad_(?:\\d|add|decimal|divide|minus|multiply|period|plus|subtract)|(?:vk|sc)\\((?:[1-9]|1?\\d{2}|2[0-4]\\d|25[0-5])\\)|[^\\s+])(?:\\+(?:ctrl|alt|shift|win))*$",
+      "pattern": "^(?<modifier>(?<mod1>ctrl|alt|shift|win)(?:\\+(?<mod2>ctrl|alt|shift|win)(?<!\\k<mod1>))?(?:\\+(?<mod3>ctrl|alt|shift|win)(?<!\\k<mod1>|\\k<mod2>))?(?:\\+(?<mod4>ctrl|alt|shift|win)(?<!\\k<mod1>|\\k<mod2>|\\k<mod3>))?\\+)?(?<key>[^\\s+]|app|menu|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
       "type": "string",
-      "description": "The string should fit the format \"[ctrl+][alt+][shift+][win+]<KeyName>\", where each modifier is optional. KeyName is either any single key character, an explicit virtual key or scan code in the form vk(nnn) and sc(nnn) respectively, or one of the special names listed at https://docs.microsoft.com/en-us/windows/terminal/customize-settings/actions#accepted-modifiers-and-keys"
+      "description": "The string should fit the format \"[ctrl+][alt+][shift+][win+]<keyName>\", where each modifier is optional, separated by + symbols, and keyName is either one of the names listed in the table below, or any single key character. The string should be written in full lowercase.\napp, menu\tMENU key\nbackspace\tBACKSPACE key\ntab\tTAB key\nenter\tENTER key\nesc, escape\tESC key\nspace\tSPACEBAR\npgup, pageup\tPAGE UP key\npgdn, pagedown\tPAGE DOWN key\nend\tEND key\nhome\tHOME key\nleft\tLEFT ARROW key\nup\tUP ARROW key\nright\tRIGHT ARROW key\ndown\tDOWN ARROW key\ninsert\tINS key\ndelete\tDEL key\nnumpad_0-numpad_9, numpad0-numpad9\tNumeric keypad keys 0 to 9. Can't be combined with the shift modifier.\nnumpad_multiply\tNumeric keypad MULTIPLY key (*)\nnumpad_plus, numpad_add\tNumeric keypad ADD key (+)\nnumpad_minus, numpad_subtract\tNumeric keypad SUBTRACT key (-)\nnumpad_period, numpad_decimal\tNumeric keypad DECIMAL key (.). Can't be combined with the shift modifier.\nnumpad_divide\tNumeric keypad DIVIDE key (/)\nf1-f24\tF1 to F24 function keys\nplus\tADD key (+)"
     },
     "Color": {
       "default": "#",
-      "pattern": "^#[A-Fa-f0-9]{3}(?:[A-Fa-f0-9]{3})?$",
+      "pattern": "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$",
       "type": "string",
       "format": "color"
     },
@@ -154,17 +154,6 @@
           "description": "Sets how the background image aligns to the boundaries of the window when unfocused. Possible values: \"center\", \"left\", \"top\", \"right\", \"bottom\", \"topLeft\", \"topRight\", \"bottomLeft\", \"bottomRight\"",
           "type": "string"
         },
-        "intenseTextStyle": {
-          "default": "bright",
-          "description": "Controls how 'intense' text is rendered. Values are \"bold\", \"bright\", \"all\" and \"none\"",
-          "enum": [
-            "none",
-            "bold",
-            "bright",
-            "all"
-          ],
-          "type": "string"
-        },
         "experimental.retroTerminalEffect": {
           "description": "When set to true, enable retro terminal effects when unfocused. This is an experimental feature, and its continued existence is not guaranteed.",
           "type": "boolean"
@@ -215,22 +204,6 @@
               "type": "integer"
             }
           ]
-        },
-        "features": {
-          "description": "Sets the DWrite font features for the given font. For example, { \"ss01\": 1, \"liga\":0 } will enable ss01 and disable ligatures.",
-          "type": "object",
-          "patternProperties": {
-            "^(([A-Za-z0-9]){4})$": { "type": "integer" }
-          },
-          "additionalProperties": false
-        },
-        "axes": {
-          "description": "Sets the DWrite font axes for the given font. For example, { \"wght\": 200 } will set the font weight to 200.",
-          "type": "object",
-          "patternProperties": {
-            "^([A-Za-z]{4})$": { "type": "number" }
-          },
-          "additionalProperties": false
         }
       },
       "type": "object"
@@ -262,14 +235,10 @@
         "findMatch",
         "focusPane",
         "globalSummon",
-        "highlightCursor",
         "identifyWindow",
         "identifyWindows",
         "moveFocus",
-        "movePane",
-        "swapPane",
         "moveTab",
-        "multipleActions",
         "newTab",
         "newWindow",
         "nextTab",
@@ -301,7 +270,6 @@
         "toggleFocusMode",
         "toggleFullscreen",
         "togglePaneZoom",
-        "toggleSplitOrientation",
         "toggleReadOnlyMode",
         "toggleShaderEffects",
         "wt",
@@ -315,10 +283,7 @@
         "right",
         "up",
         "down",
-        "previous",
-        "nextInOrder",
-        "previousInOrder",
-        "first"
+        "previous"
       ],
       "type": "string"
     },
@@ -526,23 +491,6 @@
               "type": "integer",
               "default": 0,
               "description": "Which tab to switch to, with the first being 0"
-          }
-        }
-      }
-    ],
-    "required": [ "index" ]
-  },
-  "MovePaneAction": {
-      "description": "Arguments corresponding to a Move Pane Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "movePane" },
-            "index": {
-              "type": "integer",
-              "default": 0,
-              "description": "Which tab to move the pane to, with the first being 0"
             }
           }
         }
@@ -559,24 +507,7 @@
             "direction": {
               "$ref": "#/definitions/FocusDirection",
               "default": "left",
-              "description": "The direction to move focus in, between panes. Direction can be 'previous' to move to the most recently used pane, or 'nextInOrder' or 'previousInOrder' to move to the next or previous pane."
-            }
-          }
-        }
-      ],
-      "required": [ "direction" ]
-    },
-    "SwapPaneAction": {
-      "description": "Arguments corresponding to a Swap Pane Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "swapPane" },
-            "direction": {
-              "$ref": "#/definitions/FocusDirection",
-              "default": "left",
-              "description": "The direction to move the focus pane in, swapping panes. Direction can be 'previous' to swap with the most recently used pane, or 'nextInOrder' or 'previousInOrder' to move to the next or previous pane."
+              "description": "The direction to move focus in, between panes. Direction can be 'previous' to move to the most recently used pane."
             }
           }
         }
@@ -665,7 +596,7 @@
                 "defaultsFile",
                 "allFiles",
                 "settingsUI"
-
+                
               ]
             }
           }
@@ -827,24 +758,6 @@
       ],
       "required": [ "direction" ]
     },
-    "MultipleActionsAction": {
-      "description": "Arguments for the multiple actions command",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "multipleActions" },
-            "actions" : {
-              "$ref": "#/definitions/ShortcutAction",
-              "type": "array",
-              "minItems": 1,
-              "description": "A list of other actions."
-            }
-          }
-        }
-      ],
-      "required": [ "actions" ]
-    }, 
     "CommandPaletteAction": {
       "description": "Arguments for a commandPalette action",
       "allOf": [
@@ -1027,17 +940,6 @@
         }
       ]
     },
-    "HighlightCursorAction": {
-      "description": "The action to shine a spotlight on the current cursor location. If the cursor is off the screen, this action does nothing.",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "highlightCursor" }
-          }
-        }
-      ]
-    },
     "Keybinding": {
       "additionalProperties": false,
       "properties": {
@@ -1050,8 +952,6 @@
               { "$ref": "#/definitions/NewTabAction" },
               { "$ref": "#/definitions/SwitchToTabAction" },
               { "$ref": "#/definitions/MoveFocusAction" },
-              { "$ref": "#/definitions/MovePaneAction" },
-              { "$ref": "#/definitions/SwapPaneAction" },
               { "$ref": "#/definitions/ResizePaneAction" },
               { "$ref": "#/definitions/SendInputAction" },
               { "$ref": "#/definitions/SplitPaneAction" },
@@ -1074,7 +974,6 @@
               { "$ref": "#/definitions/FocusPaneAction" },
               { "$ref": "#/definitions/GlobalSummonAction" },
               { "$ref": "#/definitions/QuakeModeAction" },
-              { "$ref": "#/definitions/HighlightCursorAction" },
               { "type": "null" }
             ]
         },
@@ -1217,10 +1116,6 @@
           "description": "When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one.",
           "type": "boolean"
         },
-        "experimental.input.forceVT": {
-          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
-          "type": "boolean"
-        },
         "initialCols": {
           "default": 120,
           "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
@@ -1263,21 +1158,6 @@
           "minimum": 0,
           "type": [ "integer", "string" ],
           "deprecated": true
-        },
-        "minimizeToTray": {
-          "default": "false",
-          "description": "When set to true, minimizing a Terminal window will no longer appear in the taskbar. Instead, a Terminal icon will appear in the system tray through which the user can access their windows.",
-          "type": "boolean"
-        },
-        "alwaysShowTrayIcon": {
-          "default": "false",
-          "description": "When set to true, the Terminal's tray icon will always be shown in the system tray.",
-          "type": "boolean"
-        },
-        "useAcrylicInTabRow": {
-          "default": "false",
-          "description": "When set to true, the tab row will have an acrylic background with 50% opacity.",
-          "type": "boolean"
         },
 		"actions": {
 			"description": "Properties are specific to each custom action.",

doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md

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

doc/specs/#6900 - Actions Page/spec.md

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

doc/terminal-v2-roadmap.md

@@ -29,8 +29,8 @@ Below is the schedule for when milestones will be included in release builds of
 | 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/) |
 | 2021-04-14 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | [Windows Terminal Preview 1.8 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-8-release/) |
 | 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
-| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
-| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
+| 2021-07-31 | 1.10 in Windows Terminal Preview<br>[1.9] in Windows Terminal | |
+| 2021-08-30 | 1.11 in Windows Terminal Preview<br>1.10 in Windows Terminal | |
 | 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
 | 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
@@ -89,8 +89,6 @@ Feature Notes:
 [1.7]: https://github.com/microsoft/terminal/milestone/32
 [1.8]: https://github.com/microsoft/terminal/milestone/33
 [1.9]: https://github.com/microsoft/terminal/milestone/34
-[1.10]: https://github.com/microsoft/terminal/milestone/35
-[1.11]: https://github.com/microsoft/terminal/milestone/36
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
 [#6720]: https://github.com/microsoft/terminal/pull/6720

oss/boost/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @Austin-Lamb in December 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 
@@ -12,4 +12,4 @@ That provenance file is automatically read and inventoried by Microsoft systems
 2. Take the parts you want, but leave most of it behind since it's HUGE and will bloat the repo to take it all.  At the time of this writing, we only use small_vector.hpp and its dependencies as a header-only library.
 3. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in a version-specific subdirectory below this readme. 
    If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-4. Submit the pull.
+4. Submit the pull.

oss/chromium/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @miniksa in January 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 

oss/dynamic_bitset/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @miniksa in March 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 

oss/fmt/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @DHowett-MSFT in April 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 

oss/interval_tree/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @PankajBhojwani in September 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 

oss/libpopcnt/MAINTAINER_README.md

@@ -4,7 +4,7 @@ This was originally imported by @miniksa in March 2020.
 
 The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
 Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
+That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
 
 ## What should be done to update this in the future?
 

oss/xorg_apps_rgb/MAINTAINER_README.md

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

res/fonts/README.md

@@ -8,5 +8,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2108.26)
-   * from microsoft/cascadia-code@f91d08f703ee61cf4ae936b9700ca974de2748fe
+* Cascadia Code, Cascadia Mono (2106.17)
+   * from microsoft/cascadia-code@fb0bce69c1c12f6c298b8bc1c1d181868f5daa9a

scratch/ScratchIslandApp/SampleApp/MyPage.cpp

@@ -5,7 +5,7 @@
 #include "MyPage.h"
 #include <LibraryResources.h>
 #include "MyPage.g.cpp"
-#include "MySettings.h"
+#include "..\..\..\src\cascadia\UnitTests_Control\MockControlSettings.h"
 
 using namespace std::chrono_literals;
 using namespace winrt::Microsoft::Terminal;
@@ -26,24 +26,17 @@ namespace winrt::SampleApp::implementation
 
     void MyPage::Create()
     {
-        auto settings = winrt::make_self<implementation::MySettings>();
+        TerminalConnection::EchoConnection conn{};
+        auto settings = winrt::make_self<ControlUnitTests::MockControlSettings>();
 
-        auto connectionSettings{ TerminalConnection::ConptyConnection::CreateSettings(L"cmd.exe /k echo This TermControl is hosted in-proc...",
-                                                                                      winrt::hstring{},
-                                                                                      L"",
-                                                                                      nullptr,
-                                                                                      32,
-                                                                                      80,
-                                                                                      winrt::guid()) };
-
-        // "Microsoft.Terminal.TerminalConnection.ConptyConnection"
-        winrt::hstring myClass{ winrt::name_of<TerminalConnection::ConptyConnection>() };
-        TerminalConnection::ConnectionInformation connectInfo{ myClass, connectionSettings };
-
-        TerminalConnection::ITerminalConnection conn{ TerminalConnection::ConnectionInformation::CreateConnection(connectInfo) };
         Control::TermControl control{ *settings, conn };
 
         InProcContent().Children().Append(control);
+
+        // Once the control loads (and not before that), write some text for debugging:
+        control.Initialized([conn](auto&&, auto&&) {
+            conn.WriteInput(L"This TermControl is hosted in-proc...");
+        });
     }
 
     // Method Description:

scratch/ScratchIslandApp/SampleApp/MyPage.xaml

@@ -19,15 +19,10 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <StackPanel Orientation="Horizontal">
-            <TextBox x:Name="GuidInput"
-                     Width="400"
-                     PlaceholderText="{}{guid here}" />
-            <Button Grid.Row="0">
-                Create
-            </Button>
-
-        </StackPanel>
+        <Button x:Name="TabRow"
+                Grid.Row="0">
+            &quot;Tabs&quot;
+        </Button>
 
         <Grid x:Name="TabContent"
               Grid.Row="1"

scratch/ScratchIslandApp/SampleApp/MySettings.h

@@ -4,8 +4,6 @@ Licensed under the MIT license.
 --*/
 #pragma once
 #include "../../inc/cppwinrt_utils.h"
-#include "../types/inc/colorTable.hpp"
-
 #include <DefaultSettings.h>
 #include <conattrs.hpp>
 #include "MySettings.g.h"
@@ -14,6 +12,9 @@ namespace winrt::SampleApp::implementation
 {
     struct MySettings : MySettingsT<MySettings>
     {
+    public:
+        MySettings() = default;
+
         // --------------------------- Core Settings ---------------------------
         //  All of these settings are defined in ICoreSettings.
 
@@ -87,14 +88,6 @@ namespace winrt::SampleApp::implementation
         winrt::Microsoft::Terminal::Core::Color GetColorTableEntry(int32_t index) noexcept { return _ColorTable.at(index); }
         std::array<winrt::Microsoft::Terminal::Core::Color, 16> ColorTable() { return _ColorTable; }
         void ColorTable(std::array<winrt::Microsoft::Terminal::Core::Color, 16> /*colors*/) {}
-
-        MySettings()
-        {
-            const auto campbellSpan = ::Microsoft::Console::Utils::CampbellColorTable();
-            std::transform(campbellSpan.begin(), campbellSpan.end(), _ColorTable.begin(), [](auto&& color) {
-                return static_cast<winrt::Microsoft::Terminal::Core::Color>(til::color{ color });
-            });
-        }
     };
 }
 

scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj

@@ -48,10 +48,6 @@
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
-
-    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj">
-      <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
-    </ProjectReference>
   </ItemGroup>
 
 

src/buffer/out/CharRow.cpp

@@ -17,8 +17,8 @@
 // Note: will through if unable to allocate char/attribute buffers
 #pragma warning(push)
 #pragma warning(disable : 26447) // small_vector's constructor says it can throw but it should not given how we use it.  This suppresses this error for the AuditMode build.
-CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
-    _data(rowWidth, value_type()),
+CharRow::CharRow(CharRowCell* buffer, size_t rowWidth, ROW* const pParent) noexcept :
+    _data(buffer, rowWidth),
     _pParent{ FAIL_FAST_IF_NULL(pParent) }
 {
 }
@@ -53,38 +53,9 @@ void CharRow::Reset() noexcept
 // - resizes the width of the CharRowBase
 // Arguments:
 // - newSize - the new width of the character and attributes rows
-// Return Value:
-// - S_OK on success, otherwise relevant error code
-[[nodiscard]] HRESULT CharRow::Resize(const size_t newSize) noexcept
+void CharRow::Resize(CharRowCell* buffer, const size_t newSize) noexcept
 {
-    try
-    {
-        const value_type insertVals;
-        _data.resize(newSize, insertVals);
-    }
-    CATCH_RETURN();
-
-    return S_OK;
-}
-
-typename CharRow::iterator CharRow::begin() noexcept
-{
-    return _data.begin();
-}
-
-typename CharRow::const_iterator CharRow::cbegin() const noexcept
-{
-    return _data.cbegin();
-}
-
-typename CharRow::iterator CharRow::end() noexcept
-{
-    return _data.end();
-}
-
-typename CharRow::const_iterator CharRow::cend() const noexcept
-{
-    return _data.cend();
+    _data = {buffer, newSize};
 }
 
 // Routine Description:
@@ -95,12 +66,16 @@ typename CharRow::const_iterator CharRow::cend() const noexcept
 // - The calculated left boundary of the internal string.
 size_t CharRow::MeasureLeft() const noexcept
 {
-    const_iterator it = _data.cbegin();
-    while (it != _data.cend() && it->IsSpace())
+    const auto beg = _data.begin();
+    const auto end = _data.end();
+
+    auto it = beg;
+    while (it != end && it->IsSpace())
     {
         ++it;
     }
-    return it - _data.cbegin();
+
+    return it - beg;
 }
 
 // Routine Description:
@@ -111,17 +86,21 @@ size_t CharRow::MeasureLeft() const noexcept
 // - The calculated right boundary of the internal string.
 size_t CharRow::MeasureRight() const
 {
-    const_reverse_iterator it = _data.crbegin();
-    while (it != _data.crend() && it->IsSpace())
+    const auto beg = _data.rbegin();
+    const auto end = _data.rend();
+
+    auto it = beg;
+    while (it != end && it->IsSpace())
     {
         ++it;
     }
-    return _data.crend() - it;
+
+    return end - it;
 }
 
 void CharRow::ClearCell(const size_t column)
 {
-    _data.at(column).Reset();
+    _data[column].Reset();
 }
 
 // Routine Description:
@@ -132,7 +111,7 @@ void CharRow::ClearCell(const size_t column)
 // - True if there is valid text in this row. False otherwise.
 bool CharRow::ContainsText() const noexcept
 {
-    for (const value_type& cell : _data)
+    for (const auto& cell : _data)
     {
         if (!cell.IsSpace())
         {
@@ -151,7 +130,7 @@ bool CharRow::ContainsText() const noexcept
 // Note: will throw exception if column is out of bounds
 const DbcsAttribute& CharRow::DbcsAttrAt(const size_t column) const
 {
-    return _data.at(column).DbcsAttr();
+    return _data[column].DbcsAttr();
 }
 
 // Routine Description:
@@ -163,7 +142,7 @@ const DbcsAttribute& CharRow::DbcsAttrAt(const size_t column) const
 // Note: will throw exception if column is out of bounds
 DbcsAttribute& CharRow::DbcsAttrAt(const size_t column)
 {
-    return _data.at(column).DbcsAttr();
+    return _data[column].DbcsAttr();
 }
 
 // Routine Description:
@@ -175,7 +154,7 @@ DbcsAttribute& CharRow::DbcsAttrAt(const size_t column)
 // Note: will throw exception if column is out of bounds
 void CharRow::ClearGlyph(const size_t column)
 {
-    _data.at(column).EraseChars();
+    _data[column].EraseChars();
 }
 
 // Routine Description:

src/buffer/out/CharRow.hpp

@@ -49,15 +49,12 @@ class CharRow final
 public:
     using glyph_type = typename wchar_t;
     using value_type = typename CharRowCell;
-    using iterator = typename boost::container::small_vector_base<value_type>::iterator;
-    using const_iterator = typename boost::container::small_vector_base<value_type>::const_iterator;
-    using const_reverse_iterator = typename boost::container::small_vector_base<value_type>::const_reverse_iterator;
     using reference = typename CharRowCellReference;
 
-    CharRow(size_t rowWidth, ROW* const pParent) noexcept;
+    CharRow(CharRowCell* buffer, size_t rowWidth, ROW* const pParent) noexcept;
 
     size_t size() const noexcept;
-    [[nodiscard]] HRESULT Resize(const size_t newSize) noexcept;
+    void Resize(CharRowCell* buffer, const size_t newSize) noexcept;
     size_t MeasureLeft() const noexcept;
     size_t MeasureRight() const;
     bool ContainsText() const noexcept;
@@ -71,14 +68,25 @@ public:
     const reference GlyphAt(const size_t column) const;
     reference GlyphAt(const size_t column);
 
-    // iterators
-    iterator begin() noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator begin() const noexcept { return cbegin(); }
+    auto begin() noexcept
+    {
+        return _data.begin();
+    }
 
-    iterator end() noexcept;
-    const_iterator cend() const noexcept;
-    const_iterator end() const noexcept { return cend(); }
+    auto begin() const noexcept
+    {
+        return _data.begin();
+    }
+
+    auto end() noexcept
+    {
+        return _data.end();
+    }
+
+    auto end() const noexcept
+    {
+        return _data.end();
+    }
 
     UnicodeStorage& GetUnicodeStorage() noexcept;
     const UnicodeStorage& GetUnicodeStorage() const noexcept;
@@ -96,20 +104,21 @@ private:
 
 protected:
     // storage for glyph data and dbcs attributes
-    boost::container::small_vector<value_type, 120> _data;
+    gsl::span<CharRowCell> _data;
 
     // ROW that this CharRow belongs to
     ROW* _pParent;
 };
 
-template<typename InputIt1, typename InputIt2>
-void OverwriteColumns(InputIt1 startChars, InputIt1 endChars, InputIt2 startAttrs, CharRow::iterator outIt)
+template<typename InputIt1, typename InputIt2, typename OutputIt>
+void OverwriteColumns(InputIt1 startChars, InputIt1 endChars, InputIt2 startAttrs, OutputIt outIt)
 {
-    std::transform(startChars,
-                   endChars,
-                   startAttrs,
-                   outIt,
-                   [](const wchar_t wch, const DbcsAttribute attr) {
-                       return CharRow::value_type{ wch, attr };
-                   });
+    std::transform(
+        startChars,
+        endChars,
+        startAttrs,
+        outIt,
+        [](const wchar_t wch, const DbcsAttribute attr) {
+            return CharRow::value_type{ wch, attr };
+        });
 }

src/buffer/out/CharRowCellReference.cpp

@@ -41,7 +41,7 @@ CharRowCellReference::operator std::wstring_view() const
 // - ref to the CharRowCell
 CharRowCell& CharRowCellReference::_cellData()
 {
-    return _parent._data.at(_index);
+    return _parent._data[_index];
 }
 
 // Routine Description:
@@ -50,7 +50,7 @@ CharRowCell& CharRowCellReference::_cellData()
 // - ref to the CharRowCell
 const CharRowCell& CharRowCellReference::_cellData() const
 {
-    return _parent._data.at(_index);
+    return _parent._data[_index];
 }
 
 // Routine Description:

src/buffer/out/OutputCellView.hpp

@@ -6,7 +6,7 @@ Module Name:
 - OutputCellView.hpp
 
 Abstract:
-- Read view into a single cell of data that someone is attempting to write into the output buffer.
+- Read-only view into a single cell of data that someone is attempting to write into the output buffer.
 - This is done for performance reasons (avoid heap allocs and copies).
 
 Author:
@@ -36,21 +36,6 @@ public:
     TextAttribute TextAttr() const noexcept;
     TextAttributeBehavior TextAttrBehavior() const noexcept;
 
-    void UpdateText(const std::wstring_view& view) noexcept
-    {
-        _view = view;
-    };
-
-    void UpdateDbcsAttribute(const DbcsAttribute& dbcsAttr) noexcept
-    {
-        _dbcsAttr = dbcsAttr;
-    }
-
-    void UpdateTextAttribute(const TextAttribute& textAttr) noexcept
-    {
-        _textAttr = textAttr;
-    }
-
     bool operator==(const OutputCellView& view) const noexcept;
     bool operator!=(const OutputCellView& view) const noexcept;
 

src/buffer/out/Row.cpp

@@ -16,10 +16,9 @@
 // - pParent - the text buffer that this row belongs to
 // Return Value:
 // - constructed object
-ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
+ROW::ROW(const SHORT rowId, CharRowCell* buffer, const unsigned short rowWidth, const TextAttribute& fillAttribute, TextBuffer* const pParent) :
     _id{ rowId },
-    _rowWidth{ rowWidth },
-    _charRow{ rowWidth, this },
+    _charRow{ buffer, rowWidth, this },
     _attrRow{ rowWidth, fillAttribute },
     _lineRendition{ LineRendition::SingleWidth },
     _wrapForced{ false },
@@ -34,7 +33,7 @@ ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute f
 // - Attr - The default attribute (color) to fill
 // Return Value:
 // - <none>
-bool ROW::Reset(const TextAttribute Attr)
+bool ROW::Reset(const TextAttribute& Attr)
 {
     _lineRendition = LineRendition::SingleWidth;
     _wrapForced = false;
@@ -52,26 +51,6 @@ bool ROW::Reset(const TextAttribute Attr)
     return true;
 }
 
-// Routine Description:
-// - resizes ROW to new width
-// Arguments:
-// - width - the new width, in cells
-// Return Value:
-// - S_OK if successful, otherwise relevant error
-[[nodiscard]] HRESULT ROW::Resize(const unsigned short width)
-{
-    RETURN_IF_FAILED(_charRow.Resize(width));
-    try
-    {
-        _attrRow.Resize(width);
-    }
-    CATCH_RETURN();
-
-    _rowWidth = width;
-
-    return S_OK;
-}
-
 // Routine Description:
 // - clears char data in column in row
 // Arguments:

src/buffer/out/Row.hpp

@@ -32,9 +32,9 @@ class TextBuffer;
 class ROW final
 {
 public:
-    ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);
+    ROW(const SHORT rowId, CharRowCell* buffer, const unsigned short rowWidth, const TextAttribute& fillAttribute, TextBuffer* const pParent);
 
-    size_t size() const noexcept { return _rowWidth; }
+    size_t size() const noexcept { return _charRow.size(); }
 
     void SetWrapForced(const bool wrap) noexcept { _wrapForced = wrap; }
     bool WasWrapForced() const noexcept { return _wrapForced; }
@@ -54,8 +54,7 @@ public:
     SHORT GetId() const noexcept { return _id; }
     void SetId(const SHORT id) noexcept { _id = id; }
 
-    bool Reset(const TextAttribute Attr);
-    [[nodiscard]] HRESULT Resize(const unsigned short width);
+    bool Reset(const TextAttribute& Attr);
 
     void ClearColumn(const size_t column);
     std::wstring GetText() const { return _charRow.GetText(); }
@@ -74,13 +73,12 @@ private:
     CharRow _charRow;
     ATTR_ROW _attrRow;
     LineRendition _lineRendition;
+    TextBuffer* _pParent; // non ownership pointer
     SHORT _id;
-    unsigned short _rowWidth;
     // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
     bool _wrapForced;
     // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
     bool _doubleBytePadded;
-    TextBuffer* _pParent; // non ownership pointer
 };
 
 #ifdef UNIT_TESTING

src/buffer/out/TextAttribute.cpp

@@ -95,18 +95,16 @@ bool TextAttribute::IsLegacy() const noexcept
 // - defaultFgColor: the default foreground color rgb value.
 // - 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)
+// - blinkingIsFaint: true if blinking should be interpreted as faint.
 // Return Value:
 // - the foreground and background colors that should be displayed.
-std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
+std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                                 const COLORREF defaultFgColor,
                                                                 const COLORREF defaultBgColor,
                                                                 const bool reverseScreenMode,
-                                                                const bool blinkingIsFaint,
-                                                                const bool boldIsBright) const noexcept
+                                                                const bool blinkingIsFaint) const noexcept
 {
-    auto fg = _foreground.GetColor(colorTable, defaultFgColor, boldIsBright && IsBold());
+    auto fg = _foreground.GetColor(colorTable, defaultFgColor, IsBold());
     auto bg = _background.GetColor(colorTable, defaultBgColor);
     if (IsFaint() || (IsBlinking() && blinkingIsFaint))
     {

src/buffer/out/TextAttribute.hpp

@@ -64,12 +64,11 @@ public:
     static TextAttribute StripErroneousVT16VersionsOfLegacyDefaults(const TextAttribute& attribute) noexcept;
     WORD GetLegacyAttributes() const noexcept;
 
-    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
+    std::pair<COLORREF, COLORREF> CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                      const COLORREF defaultFgColor,
                                                      const COLORREF defaultBgColor,
                                                      const bool reverseScreenMode = false,
-                                                     const bool blinkingIsFaint = false,
-                                                     const bool boldIsBright = true) const noexcept;
+                                                     const bool blinkingIsFaint = false) const noexcept;
 
     bool IsLeadingByte() const noexcept;
     bool IsTrailingByte() const noexcept;

src/buffer/out/TextColor.cpp

@@ -50,9 +50,6 @@ constexpr std::array<BYTE, 256> Index256ToIndex16 = {
 
 // clang-format on
 
-// We should only need 4B for TextColor. Any more than that is just waste.
-static_assert(sizeof(TextColor) == 4);
-
 bool TextColor::CanBeBrightened() const noexcept
 {
     return IsIndex16() || IsDefault();
@@ -141,12 +138,15 @@ void TextColor::SetDefault() noexcept
 // - 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, 256>& colorTable, const COLORREF defaultColor, bool brighten) const noexcept
+COLORREF TextColor::GetColor(gsl::span<const COLORREF> colorTable,
+                             const COLORREF defaultColor,
+                             bool brighten) const noexcept
 {
     if (IsDefault())
     {
         if (brighten)
         {
+            FAIL_FAST_IF(colorTable.size() < 16);
             // See MSFT:20266024 for context on this fix.
             //      Additionally todo MSFT:20271956 to fix this better for 19H2+
             // If we're a default color, check to see if the defaultColor exists
@@ -156,61 +156,6 @@ COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const
             //      (Settings::_DefaultForeground==INVALID_COLOR, and the index
             //      from _wFillAttribute is being used instead.)
             // If we find a match, return instead the bright version of this color
-
-            static_assert(sizeof(COLORREF) * 8 == 32, "The vectorized code broke. If you can't fix COLORREF, just remove the vectorized code.");
-
-#pragma warning(push)
-#pragma warning(disable : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-#pragma warning(disable : 26490) // Don't use reinterpret_cast (type.1).
-#ifdef __AVX2__
-            // I wrote this vectorized code one day, because the sun was shining so nicely.
-            // There's no other reason for this to exist here, except for being pretty.
-            // This code implements the exact same for loop you can find below, but is ~3x faster.
-            //
-            // A brief explanation for people unfamiliar with vectorized instructions:
-            //   Vectorized instructions, like "SSE" or "AVX", allow you to run
-            //   common operations like additions, multiplications, comparisons,
-            //   or bitwise operations concurrently on multiple values at once.
-            //
-            // We want to find the given defaultColor in the first 8 values of colorTable.
-            // Coincidentally a COLORREF is a DWORD and 8 of them are exactly 256 bits.
-            // -- The size of a single AVX register.
-            //
-            // Thus, the code works like this:
-            // 1. Load all 8 DWORDs at once into one register
-            // 2. Set the same defaultColor 8 times in another register
-            // 3. Compare all 8 values at once
-            //    The result is either 0xffffffff or 0x00000000.
-            // 4. Extract the most significant bit of each DWORD
-            //    Assuming that no duplicate colors exist in colorTable,
-            //    the result will be something like 0b00100000.
-            // 5. Use BitScanForward (bsf) to find the index of the most significant 1 bit.
-            const auto haystack = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(colorTable.data())); // 1.
-            const auto needle = _mm256_set1_epi32(__builtin_bit_cast(int, defaultColor)); // 2.
-            const auto result = _mm256_cmpeq_epi32(haystack, needle); // 3.
-            const auto mask = _mm256_movemask_ps(_mm256_castsi256_ps(result)); // 4.
-            unsigned long index;
-            return _BitScanForward(&index, mask) ? til::at(colorTable, static_cast<size_t>(index) + 8) : defaultColor; // 5.
-#elif _M_AMD64
-            // If you look closely this SSE2 algorithm is the same as the AVX one.
-            // The two differences are that we need to:
-            // * do everything twice, because SSE is limited to 128 bits and not 256.
-            // * use _mm_packs_epi32 to merge two 128 bits vectors into one in step 3.5.
-            //   _mm_packs_epi32 takes two SSE registers and truncates all 8 DWORDs into 8 WORDs,
-            //   the latter of which fits into a single register (which is then used in the identical step 4).
-            // * since the result are now 8 WORDs, we need to use _mm_movemask_epi8 (there's no 16-bit variant),
-            //   which unlike AVX's step 4 results in in something like 0b0000110000000000.
-            //   --> the index returned by _BitScanForward must be divided by 2.
-            const auto haystack1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(colorTable.data() + 0));
-            const auto haystack2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(colorTable.data() + 4));
-            const auto needle = _mm_set1_epi32(__builtin_bit_cast(int, defaultColor));
-            const auto result1 = _mm_cmpeq_epi32(haystack1, needle);
-            const auto result2 = _mm_cmpeq_epi32(haystack2, needle);
-            const auto result = _mm_packs_epi32(result1, result2); // 3.5
-            const auto mask = _mm_movemask_epi8(result);
-            unsigned long index;
-            return _BitScanForward(&index, mask) ? til::at(colorTable, static_cast<size_t>(index / 2) + 8) : defaultColor;
-#else
             for (size_t i = 0; i < 8; i++)
             {
                 if (til::at(colorTable, i) == defaultColor)
@@ -218,8 +163,6 @@ COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const
                     return til::at(colorTable, i + 8);
                 }
             }
-#endif
-#pragma warning(pop)
         }
 
         return defaultColor;
@@ -256,7 +199,7 @@ BYTE TextColor::GetLegacyIndex(const BYTE defaultIndex) const noexcept
     }
     else if (IsIndex256())
     {
-        return til::at(Index256ToIndex16, GetIndex());
+        return Index256ToIndex16.at(GetIndex());
     }
     else
     {
@@ -265,7 +208,7 @@ BYTE TextColor::GetLegacyIndex(const BYTE defaultIndex) const noexcept
         const BYTE compressedRgb = (_red & 0b11100000) +
                                    ((_green >> 3) & 0b00011100) +
                                    ((_blue >> 6) & 0b00000011);
-        return til::at(CompressedRgbToIndex16, compressedRgb);
+        return CompressedRgbToIndex16.at(compressedRgb);
     }
 }
 

src/buffer/out/TextColor.h

@@ -86,7 +86,10 @@ public:
     void SetIndex(const BYTE index, const bool isIndex256) noexcept;
     void SetDefault() noexcept;
 
-    COLORREF GetColor(const std::array<COLORREF, 256>& colorTable, const COLORREF defaultColor, bool brighten = false) const noexcept;
+    COLORREF GetColor(gsl::span<const COLORREF> colorTable,
+                      const COLORREF defaultColor,
+                      const bool brighten = false) const noexcept;
+
     BYTE GetLegacyIndex(const BYTE defaultIndex) const noexcept;
 
     constexpr BYTE GetIndex() const noexcept
@@ -154,3 +157,5 @@ namespace WEX
     }
 }
 #endif
+
+static_assert(sizeof(TextColor) <= 4 * sizeof(BYTE), "We should only need 4B for an entire TextColor. Any more than that is just waste");

src/buffer/out/UnicodeStorage.cpp

@@ -47,7 +47,7 @@ void UnicodeStorage::Erase(const key_type key) noexcept
 // - rowMap - A map of the old row IDs to the new row IDs.
 // - width - The width of the new row. Remove any items that are beyond the row width.
 //         - Use nullopt if we're not resizing the width of the row, just renumbering the rows.
-void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width)
+void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, SHORT width)
 {
     // Make a temporary map to hold all the new row positioning
     std::unordered_map<key_type, mapped_type> newMap;
@@ -58,18 +58,10 @@ void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const
         // Extract the old coordinate position
         const auto oldCoord = pair.first;
 
-        // Only try to short-circuit based on width if we were told it changed
-        // by being given a new width value.
-        if (width.has_value())
+        // If the column index is at/beyond the row width, don't bother copying it to the new map.
+        if (oldCoord.X >= width)
         {
-            // Get the column ID
-            const auto oldColId = oldCoord.X;
-
-            // If the column index is at/beyond the row width, don't bother copying it to the new map.
-            if (oldColId >= width.value())
-            {
-                continue;
-            }
+            continue;
         }
 
         // Get the row ID from the position as that's what we need to remap

src/buffer/out/UnicodeStorage.hpp

@@ -55,7 +55,7 @@ public:
 
     void Erase(const key_type key) noexcept;
 
-    void Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width);
+    void Remap(const std::unordered_map<SHORT, SHORT>& rowMap, SHORT width);
 
 private:
     std::unordered_map<key_type, mapped_type> _map;

src/buffer/out/cursor.cpp

@@ -315,11 +315,6 @@ void Cursor::StartDeferDrawing() noexcept
     _fDeferCursorRedraw = true;
 }
 
-bool Cursor::IsDeferDrawing() noexcept
-{
-    return _fDeferCursorRedraw;
-}
-
 void Cursor::EndDeferDrawing() noexcept
 {
     if (_fHaveDeferredCursorRedraw)

src/buffer/out/cursor.h

@@ -55,7 +55,6 @@ public:
     const COLORREF GetColor() const noexcept;
 
     void StartDeferDrawing() noexcept;
-    bool IsDeferDrawing() noexcept;
     void EndDeferDrawing() noexcept;
 
     void SetHasMoved(const bool fHasMoved) noexcept;

src/buffer/out/lib/bufferout.vcxproj

@@ -44,7 +44,7 @@
     <ClInclude Include="..\Row.hpp" />
     <ClInclude Include="..\search.h" />
     <ClInclude Include="..\TextColor.h" />
-    <ClInclude Include="..\TextAttribute.hpp" />
+    <ClInclude Include="..\TextAttribute.h" />
     <ClInclude Include="..\textBuffer.hpp" />
     <ClInclude Include="..\textBufferCellIterator.hpp" />
     <ClInclude Include="..\textBufferTextIterator.hpp" />

src/buffer/out/textBuffer.cpp

@@ -31,26 +31,32 @@ TextBuffer::TextBuffer(const COORD screenBufferSize,
                        const TextAttribute defaultAttributes,
                        const UINT cursorSize,
                        Microsoft::Console::Render::IRenderTarget& renderTarget) :
-    _firstRow{ 0 },
     _currentAttributes{ defaultAttributes },
     _cursor{ cursorSize, *this },
-    _storage{},
-    _unicodeStorage{},
-    _renderTarget{ renderTarget },
-    _size{},
-    _currentHyperlinkId{ 1 },
-    _currentPatternId{ 0 }
+    _renderTarget{ renderTarget }
 {
-    // initialize ROWs
+    const auto dx = static_cast<size_t>(screenBufferSize.X);
+    const auto dy = static_cast<size_t>(screenBufferSize.Y);
+    auto buffer = static_cast<CharRowCell*>(VirtualAlloc(nullptr, dx * dy * sizeof(CharRowCell), MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
+    THROW_IF_NULL_ALLOC(buffer);
+
+    _charBuffer = buffer;
+
     _storage.reserve(static_cast<size_t>(screenBufferSize.Y));
-    for (size_t i = 0; i < static_cast<size_t>(screenBufferSize.Y); ++i)
+    for (SHORT i = 0; i < screenBufferSize.Y; ++i)
     {
-        _storage.emplace_back(static_cast<SHORT>(i), screenBufferSize.X, _currentAttributes, this);
+        _storage.emplace_back(i, buffer, screenBufferSize.X, _currentAttributes, this);
+        buffer += dx;
     }
 
     _UpdateSize();
 }
 
+TextBuffer::~TextBuffer()
+{
+    VirtualFree(_charBuffer, 0, MEM_RELEASE);
+}
+
 // Routine Description:
 // - Copies properties from another text buffer into this one.
 // - This is primarily to copy properties that would otherwise not be specified during CreateInstance
@@ -83,11 +89,9 @@ UINT TextBuffer::TotalRowCount() const noexcept
 // - const reference to the requested row. Asserts if out of bounds.
 const ROW& TextBuffer::GetRowByOffset(const size_t index) const
 {
-    const size_t totalRows = TotalRowCount();
-
     // Rows are stored circularly, so the index you ask for is offset by the start position and mod the total of rows.
-    const size_t offsetIndex = (_firstRow + index) % totalRows;
-    return _storage.at(offsetIndex);
+    const size_t offsetIndex = (_firstRow + index) % _storage.size();
+    return _storage[offsetIndex];
 }
 
 // Routine Description:
@@ -99,11 +103,9 @@ const ROW& TextBuffer::GetRowByOffset(const size_t index) const
 // - reference to the requested row. Asserts if out of bounds.
 ROW& TextBuffer::GetRowByOffset(const size_t index)
 {
-    const size_t totalRows = TotalRowCount();
-
     // Rows are stored circularly, so the index you ask for is offset by the start position and mod the total of rows.
-    const size_t offsetIndex = (_firstRow + index) % totalRows;
-    return _storage.at(offsetIndex);
+    const size_t offsetIndex = (_firstRow + index) % _storage.size();
+    return _storage[offsetIndex];
 }
 
 // Routine Description:
@@ -400,7 +402,7 @@ OutputCellIterator TextBuffer::WriteLine(const OutputCellIterator givenIt,
 //Return Value:
 // - true if we successfully inserted the character
 // - false otherwise (out of memory)
-bool TextBuffer::InsertCharacter(const std::wstring_view chars,
+bool TextBuffer::InsertCharacter(const std::wstring_view& chars,
                                  const DbcsAttribute dbcsAttribute,
                                  const TextAttribute attr)
 {
@@ -418,6 +420,7 @@ bool TextBuffer::InsertCharacter(const std::wstring_view chars,
 
         // Store character and double byte data
         CharRow& charRow = Row.GetCharRow();
+        short const cBufferWidth = GetSize().Width();
 
         try
         {
@@ -778,7 +781,7 @@ void TextBuffer::ScrollRows(const SHORT firstRow, const SHORT size, const SHORT
 
     // Renumber the IDs now that we've rearranged where the rows sit within the buffer.
     // Refreshing should also delegate to the UnicodeStorage to re-key all the stored unicode sequences (where applicable).
-    _RefreshRowIDs(std::nullopt);
+    _RefreshRowIDs(_size.Width());
 }
 
 Cursor& TextBuffer::GetCursor() noexcept
@@ -896,6 +899,11 @@ void TextBuffer::Reset()
 {
     RETURN_HR_IF(E_INVALIDARG, newSize.X < 0 || newSize.Y < 0);
 
+    const auto dx = static_cast<size_t>(newSize.X);
+    const auto dy = static_cast<size_t>(newSize.Y);
+    auto buffer = static_cast<CharRowCell*>(VirtualAlloc(nullptr, dx * dy * sizeof(CharRowCell), MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
+    RETURN_IF_NULL_ALLOC(buffer);
+
     try
     {
         const auto currentSize = GetSize().Dimensions();
@@ -909,12 +917,7 @@ void TextBuffer::Reset()
         const SHORT TopRowIndex = (GetFirstRowIndex() + TopRow) % currentSize.Y;
 
         // rotate rows until the top row is at index 0
-        for (int i = 0; i < TopRowIndex; i++)
-        {
-            _storage.emplace_back(std::move(_storage.front()));
-            _storage.erase(_storage.begin());
-        }
-
+        std::rotate(_storage.begin(), _storage.begin() + TopRowIndex, _storage.end());
         _SetFirstRowIndex(0);
 
         // realloc in the Y direction
@@ -926,19 +929,26 @@ void TextBuffer::Reset()
         // add rows if we're growing
         while (_storage.size() < static_cast<size_t>(newSize.Y))
         {
-            _storage.emplace_back(static_cast<short>(_storage.size()), newSize.X, attributes, this);
+            _storage.emplace_back(static_cast<short>(_storage.size()), nullptr, newSize.X, attributes, this);
         }
 
         // Now that we've tampered with the row placement, refresh all the row IDs.
         // Also take advantage of the row ID refresh loop to resize the rows in the X dimension
         // and cleanup the UnicodeStorage characters that might fall outside the resized buffer.
         _RefreshRowIDs(newSize.X);
+        _RefreshRowWidth(buffer, newSize.X);
 
         // Update the cached size value
         _UpdateSize();
     }
-    CATCH_RETURN();
+    catch (...)
+    {
+        VirtualFree(buffer, 0, MEM_RELEASE);
+        RETURN_CAUGHT_EXCEPTION();
+    };
 
+    VirtualFree(_charBuffer, 0, MEM_RELEASE);
+    _charBuffer = buffer;
     return S_OK;
 }
 
@@ -961,7 +971,7 @@ UnicodeStorage& TextBuffer::GetUnicodeStorage() noexcept
 //   any high unicode (UnicodeStorage) runs while we're already looping through the rows.
 // Arguments:
 // - newRowWidth - Optional new value for the row width.
-void TextBuffer::_RefreshRowIDs(std::optional<SHORT> newRowWidth)
+void TextBuffer::_RefreshRowIDs(SHORT width)
 {
     std::unordered_map<SHORT, SHORT> rowMap;
     SHORT i = 0;
@@ -975,17 +985,19 @@ void TextBuffer::_RefreshRowIDs(std::optional<SHORT> newRowWidth)
 
         // Also update the char row parent pointers as they can get shuffled up in the rotates.
         it.GetCharRow().UpdateParent(&it);
-
-        // Resize the rows in the X dimension if we have a new width
-        if (newRowWidth.has_value())
-        {
-            // Realloc in the X direction
-            THROW_IF_FAILED(it.Resize(newRowWidth.value()));
-        }
     }
 
     // Give the new mapping to Unicode Storage
-    _unicodeStorage.Remap(rowMap, newRowWidth);
+    _unicodeStorage.Remap(rowMap, width);
+}
+
+void TextBuffer::_RefreshRowWidth(CharRowCell *data, size_t width) noexcept
+{
+    for (auto& it : _storage)
+    {
+        it.GetCharRow().Resize(data, width);
+        data += width;
+    }
 }
 
 void TextBuffer::_NotifyPaint(const Viewport& viewport) const
@@ -1044,7 +1056,7 @@ Microsoft::Console::Render::IRenderTarget& TextBuffer::GetRenderTarget() noexcep
 // - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
 // Return Value:
 // - the delimiter class for the given char
-const DelimiterClass TextBuffer::_GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const
+const DelimiterClass TextBuffer::_GetDelimiterClassAt(const COORD pos, const std::wstring_view& wordDelimiters) const
 {
     return GetRowByOffset(pos.Y).GetCharRow().DelimiterClassAt(pos.X, wordDelimiters);
 }
@@ -1059,7 +1071,7 @@ const DelimiterClass TextBuffer::_GetDelimiterClassAt(const COORD pos, const std
 //                        (or a row boundary is encountered)
 // Return Value:
 // - The COORD for the first character on the "word" (inclusive)
-const COORD TextBuffer::GetWordStart(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode) const
+const COORD TextBuffer::GetWordStart(const COORD target, const std::wstring_view& wordDelimiters, bool accessibilityMode) const
 {
     // Consider a buffer with this text in it:
     // "  word   other  "
@@ -1104,7 +1116,7 @@ const COORD TextBuffer::GetWordStart(const COORD target, const std::wstring_view
 // - wordDelimiters - what characters are we considering for the separation of words
 // Return Value:
 // - The COORD for the first character on the current/previous READABLE "word" (inclusive)
-const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const
+const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const std::wstring_view& wordDelimiters) const
 {
     COORD result = target;
     const auto bufferSize = GetSize();
@@ -1149,7 +1161,7 @@ const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const
 // - wordDelimiters - what characters are we considering for the separation of words
 // Return Value:
 // - The COORD for the first character on the current word or delimiter run (stopped by the left margin)
-const COORD TextBuffer::_GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const
+const COORD TextBuffer::_GetWordStartForSelection(const COORD target, const std::wstring_view& wordDelimiters) const
 {
     COORD result = target;
     const auto bufferSize = GetSize();
@@ -1181,7 +1193,7 @@ const COORD TextBuffer::_GetWordStartForSelection(const COORD target, const std:
 //                        (or a row boundary is encountered)
 // Return Value:
 // - The COORD for the last character on the "word" (inclusive)
-const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode) const
+const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view& wordDelimiters, bool accessibilityMode) const
 {
     // Consider a buffer with this text in it:
     // "  word   other  "
@@ -1218,7 +1230,7 @@ const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view w
 // - lastCharPos - the position of the last nonspace character in the text buffer (to improve performance)
 // Return Value:
 // - The COORD for the first character of the next readable "word". If no next word, return one past the end of the buffer
-const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const
+const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view& wordDelimiters, const COORD lastCharPos) const
 {
     const auto bufferSize = GetSize();
     COORD result = target;
@@ -1266,7 +1278,7 @@ const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const st
 // - wordDelimiters - what characters are we considering for the separation of words
 // Return Value:
 // - The COORD for the last character of the current word or delimiter run (stopped by right margin)
-const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const
+const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::wstring_view& wordDelimiters) const
 {
     const auto bufferSize = GetSize();
 
@@ -1349,7 +1361,7 @@ void TextBuffer::_PruneHyperlinks()
 // Return Value:
 // - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
 // - pos - The COORD for the first character on the "word" (inclusive)
-bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, COORD lastCharPos) const
+bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view& wordDelimiters, COORD lastCharPos) const
 {
     // move to the beginning of the next word
     // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
@@ -1373,7 +1385,7 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
 // Return Value:
 // - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
 // - pos - The COORD for the first character on the "word" (inclusive)
-bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters) const
+bool TextBuffer::MoveToPreviousWord(COORD& pos, const std::wstring_view& wordDelimiters) const
 {
     // move to the beginning of the current word
     auto copy{ GetWordStart(pos, wordDelimiters, true) };
@@ -1649,14 +1661,13 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
 
             if (!cell.DbcsAttr().IsTrailing())
             {
-                const auto chars = cell.Chars();
-                selectionText.append(chars);
+                selectionText.append(cell.Chars());
 
                 if (copyTextColor)
                 {
                     const auto cellData = cell.TextAttr();
                     const auto [CellFgAttr, CellBkAttr] = GetAttributeColors(cellData);
-                    for (size_t j = 0; j < chars.size(); ++j)
+                    for (const wchar_t wch : cell.Chars())
                     {
                         selectionFgAttr.push_back(CellFgAttr);
                         selectionBkAttr.push_back(CellBkAttr);
@@ -1732,7 +1743,7 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
 // - string containing the generated HTML
 std::string TextBuffer::GenHTML(const TextAndColor& rows,
                                 const int fontHeightPoints,
-                                const std::wstring_view fontFaceName,
+                                const std::wstring_view& fontFaceName,
                                 const COLORREF backgroundColor)
 {
     try
@@ -1795,7 +1806,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows,
                 const auto writeAccumulatedChars = [&](bool includeCurrent) {
                     if (col >= startOffset)
                     {
-                        const auto unescapedText = ConvertToA(CP_UTF8, std::wstring_view(rows.text.at(row)).substr(startOffset, col - startOffset + includeCurrent));
+                        const auto unescapedText = ConvertToA(CP_UTF8, rows.text.at(row).substr(startOffset, col - startOffset + includeCurrent));
                         for (const auto c : unescapedText)
                         {
                             switch (c)
@@ -1921,7 +1932,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows,
 // - htmlTitle - value used in title tag of html header. Used to name the application
 // Return Value:
 // - string containing the generated RTF
-std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoints, const std::wstring_view fontFaceName, const COLORREF backgroundColor)
+std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoints, const std::wstring_view& fontFaceName, const COLORREF backgroundColor)
 {
     try
     {
@@ -1983,7 +1994,7 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
                 const auto writeAccumulatedChars = [&](bool includeCurrent) {
                     if (col >= startOffset)
                     {
-                        const auto unescapedText = ConvertToA(CP_UTF8, std::wstring_view(rows.text.at(row)).substr(startOffset, col - startOffset + includeCurrent));
+                        const auto unescapedText = ConvertToA(CP_UTF8, rows.text.at(row).substr(startOffset, col - startOffset + includeCurrent));
                         for (const auto c : unescapedText)
                         {
                             switch (c)
@@ -2361,9 +2372,9 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
 // - Adds or updates a hyperlink in our hyperlink table
 // Arguments:
 // - The hyperlink URI, the hyperlink id (could be new or old)
-void TextBuffer::AddHyperlinkToMap(std::wstring_view uri, uint16_t id)
+void TextBuffer::AddHyperlinkToMap(const std::wstring_view& uri, uint16_t id)
 {
-    _hyperlinkMap[id] = uri;
+    _hyperlinkMap.emplace(id, uri);
 }
 
 // Method Description:
@@ -2383,28 +2394,31 @@ std::wstring TextBuffer::GetHyperlinkUriFromId(uint16_t id) const
 // - The user-defined id
 // Return value:
 // - The internal hyperlink ID
-uint16_t TextBuffer::GetHyperlinkId(std::wstring_view uri, std::wstring_view id)
+uint16_t TextBuffer::GetHyperlinkId(const std::wstring_view& uri, const std::wstring_view& id)
 {
     uint16_t numericId = 0;
     if (id.empty())
     {
         // no custom id specified, return our internal count
-        numericId = _currentHyperlinkId;
-        ++_currentHyperlinkId;
+        numericId = _currentHyperlinkId++;
     }
     else
     {
-        // assign _currentHyperlinkId if the custom id does not already exist
-        std::wstring newId{ id };
-        // hash the URL and add it to the custom ID - GH#7698
-        newId += L"%" + std::to_wstring(std::hash<std::wstring_view>{}(uri));
-        const auto result = _hyperlinkCustomIdMap.emplace(newId, _currentHyperlinkId);
+        // We need to use both uri and id for hashing. See GH#7698
+        std::wstring key;
+        key.reserve(uri.size() + id.size());
+        key.append(uri);
+        key.append(id);
+
+        const auto result = _hyperlinkCustomIdMap.emplace(key, _currentHyperlinkId);
+        numericId = result.first->second;
+
         if (result.second)
         {
             // the custom id did not already exist
+            _hyperlinkCustomIdMapReverse.insert_or_assign(_currentHyperlinkId, key);
             ++_currentHyperlinkId;
         }
-        numericId = (*(result.first)).second;
     }
     // _currentHyperlinkId could overflow, make sure its not 0
     if (_currentHyperlinkId == 0)
@@ -2422,13 +2436,11 @@ uint16_t TextBuffer::GetHyperlinkId(std::wstring_view uri, std::wstring_view id)
 void TextBuffer::RemoveHyperlinkFromMap(uint16_t id) noexcept
 {
     _hyperlinkMap.erase(id);
-    for (const auto& customIdPair : _hyperlinkCustomIdMap)
+
+    if (auto it = _hyperlinkCustomIdMapReverse.find(id); it != _hyperlinkCustomIdMapReverse.end())
     {
-        if (customIdPair.second == id)
-        {
-            _hyperlinkCustomIdMap.erase(customIdPair.first);
-            break;
-        }
+        _hyperlinkCustomIdMap.erase(it->second);
+        _hyperlinkCustomIdMapReverse.erase(it);
     }
 }
 
@@ -2441,12 +2453,9 @@ void TextBuffer::RemoveHyperlinkFromMap(uint16_t id) noexcept
 // - The custom ID if there was one, empty string otherwise
 std::wstring TextBuffer::GetCustomIdFromId(uint16_t id) const
 {
-    for (auto customIdPair : _hyperlinkCustomIdMap)
+    if (auto it = _hyperlinkCustomIdMapReverse.find(id); it != _hyperlinkCustomIdMapReverse.end())
     {
-        if (customIdPair.second == id)
-        {
-            return customIdPair.first;
-        }
+        return it->second;
     }
     return {};
 }
@@ -2460,6 +2469,7 @@ void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
 {
     _hyperlinkMap = other._hyperlinkMap;
     _hyperlinkCustomIdMap = other._hyperlinkCustomIdMap;
+    _hyperlinkCustomIdMapReverse = other._hyperlinkCustomIdMapReverse;
     _currentHyperlinkId = other._currentHyperlinkId;
 }
 
@@ -2470,7 +2480,7 @@ void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
 // - The regex pattern
 // Return value:
 // - An ID that the caller should associate with the given pattern
-const size_t TextBuffer::AddPatternRecognizer(const std::wstring_view regexString)
+const size_t TextBuffer::AddPatternRecognizer(const std::wstring_view& regexString)
 {
     ++_currentPatternId;
     _idsAndPatterns.emplace(std::make_pair(_currentPatternId, regexString));

src/buffer/out/textBuffer.hpp

@@ -69,6 +69,9 @@ public:
                const TextAttribute defaultAttributes,
                const UINT cursorSize,
                Microsoft::Console::Render::IRenderTarget& renderTarget);
+
+    ~TextBuffer();
+
     TextBuffer(const TextBuffer& a) = delete;
 
     // Used for duplicating properties to another text buffer
@@ -98,7 +101,7 @@ public:
                                  const std::optional<size_t> limitRight = std::nullopt);
 
     bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
-    bool InsertCharacter(const std::wstring_view chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
+    bool InsertCharacter(const std::wstring_view& chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
     bool IncrementCursor();
     bool NewlineCursor();
 
@@ -141,10 +144,10 @@ public:
 
     Microsoft::Console::Render::IRenderTarget& GetRenderTarget() noexcept;
 
-    const COORD GetWordStart(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false) const;
-    const COORD GetWordEnd(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false) const;
-    bool MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, COORD lastCharPos) const;
-    bool MoveToPreviousWord(COORD& pos, const std::wstring_view wordDelimiters) const;
+    const COORD GetWordStart(const COORD target, const std::wstring_view& wordDelimiters, bool accessibilityMode = false) const;
+    const COORD GetWordEnd(const COORD target, const std::wstring_view& wordDelimiters, bool accessibilityMode = false) const;
+    bool MoveToNextWord(COORD& pos, const std::wstring_view& wordDelimiters, COORD lastCharPos) const;
+    bool MoveToPreviousWord(COORD& pos, const std::wstring_view& wordDelimiters) const;
 
     const til::point GetGlyphStart(const til::point pos) const;
     const til::point GetGlyphEnd(const til::point pos) const;
@@ -153,9 +156,9 @@ public:
 
     const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection, bool bufferCoordinates) const;
 
-    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
+    void AddHyperlinkToMap(const std::wstring_view& uri, uint16_t id);
     std::wstring GetHyperlinkUriFromId(uint16_t id) const;
-    uint16_t GetHyperlinkId(std::wstring_view uri, std::wstring_view id);
+    uint16_t GetHyperlinkId(const std::wstring_view& uri, const std::wstring_view& id);
     void RemoveHyperlinkFromMap(uint16_t id) noexcept;
     std::wstring GetCustomIdFromId(uint16_t id) const;
     void CopyHyperlinkMaps(const TextBuffer& OtherBuffer);
@@ -176,12 +179,12 @@ public:
 
     static std::string GenHTML(const TextAndColor& rows,
                                const int fontHeightPoints,
-                               const std::wstring_view fontFaceName,
+                               const std::wstring_view& fontFaceName,
                                const COLORREF backgroundColor);
 
     static std::string GenRTF(const TextAndColor& rows,
                               const int fontHeightPoints,
-                              const std::wstring_view fontFaceName,
+                              const std::wstring_view& fontFaceName,
                               const COLORREF backgroundColor);
 
     struct PositionInformation
@@ -195,60 +198,47 @@ public:
                           const std::optional<Microsoft::Console::Types::Viewport> lastCharacterViewport,
                           std::optional<std::reference_wrapper<PositionInformation>> positionInfo);
 
-    const size_t AddPatternRecognizer(const std::wstring_view regexString);
+    const size_t AddPatternRecognizer(const std::wstring_view& regexString);
     void ClearPatternRecognizers() noexcept;
     void CopyPatterns(const TextBuffer& OtherBuffer);
     interval_tree::IntervalTree<til::point, size_t> GetPatterns(const size_t firstRow, const size_t lastRow) const;
 
 private:
     void _UpdateSize();
-    Microsoft::Console::Types::Viewport _size;
-    std::vector<ROW> _storage;
-    Cursor _cursor;
-
-    SHORT _firstRow; // indexes top row (not necessarily 0)
-
-    TextAttribute _currentAttributes;
-
-    // storage location for glyphs that can't fit into the buffer normally
-    UnicodeStorage _unicodeStorage;
-
-    std::unordered_map<uint16_t, std::wstring> _hyperlinkMap;
-    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
-    uint16_t _currentHyperlinkId;
-
-    void _RefreshRowIDs(std::optional<SHORT> newRowWidth);
-
-    Microsoft::Console::Render::IRenderTarget& _renderTarget;
-
+    void _RefreshRowIDs(SHORT width);
+    void _RefreshRowWidth(CharRowCell* data, size_t width) noexcept;
     void _SetFirstRowIndex(const SHORT FirstRowIndex) noexcept;
-
     COORD _GetPreviousFromCursor() const;
-
     void _SetWrapOnCurrentRow();
     void _AdjustWrapOnCurrentRow(const bool fSet);
-
     void _NotifyPaint(const Microsoft::Console::Types::Viewport& viewport) const;
-
     // Assist with maintaining proper buffer state for Double Byte character sequences
     bool _PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute);
     bool _AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribute);
-
     ROW& _GetFirstRow();
     ROW& _GetPrevRowNoWrap(const ROW& row);
-
     void _ExpandTextRow(SMALL_RECT& selectionRow) const;
-
-    const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const;
-    const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
-
+    const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view& wordDelimiters) const;
+    const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view& wordDelimiters) const;
+    const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view& wordDelimiters) const;
+    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view& wordDelimiters, const COORD lastCharPos) const;
+    const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view& wordDelimiters) const;
     void _PruneHyperlinks();
 
+    Microsoft::Console::Render::IRenderTarget& _renderTarget;
+    std::vector<ROW> _storage;
+    std::unordered_map<uint16_t, std::wstring> _hyperlinkMap;
+    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
+    std::unordered_map<uint16_t, std::wstring> _hyperlinkCustomIdMapReverse;
     std::unordered_map<size_t, std::wstring> _idsAndPatterns;
-    size_t _currentPatternId;
+    TextAttribute _currentAttributes;
+    UnicodeStorage _unicodeStorage;
+    Cursor _cursor;
+    void* _charBuffer;
+    Microsoft::Console::Types::Viewport _size;
+    uint16_t _currentHyperlinkId{ 1 };
+    size_t _currentPatternId{ 0 };
+    SHORT _firstRow{ 0 }; // indexes top row (not necessarily 0)
 
 #ifdef UNIT_TESTING
     friend class TextBufferTests;

src/buffer/out/textBufferCellIterator.cpp

@@ -94,93 +94,20 @@ bool TextBufferCellIterator::operator!=(const TextBufferCellIterator& it) const
 // - Reference to self after movement.
 TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& movement)
 {
-    // Note that this method is called intensively when the terminal is under heavy load.
-    // We need to aggressively optimize it, comparing to the -= operator.
     ptrdiff_t move = movement;
-    if (move < 0)
+    auto newPos = _pos;
+    while (move > 0 && !_exceeded)
     {
-        // Early branching to leave the rare case to -= operator.
-        // This helps reducing the instruction count within this method, which is good for instruction cache.
-        return *this -= -move;
-    }
-
-    // The remaining code in this function is functionally equivalent to:
-    //   auto newPos = _pos;
-    //   while (move > 0 && !_exceeded)
-    //   {
-    //       _exceeded = !_bounds.IncrementInBounds(newPos);
-    //       move--;
-    //   }
-    //   _SetPos(newPos);
-    //
-    // _SetPos() necessitates calling _GenerateView() and thus the construction
-    // of a new OutputCellView(). This has a high performance impact (ICache spill?).
-    // The code below inlines _bounds.IncrementInBounds as well as SetPos.
-    // In the hot path (_pos.Y doesn't change) we modify the _view directly.
-
-    // Hoist these integers which will be used frequently later.
-    const auto boundsRightInclusive = _bounds.RightInclusive();
-    const auto boundsLeft = _bounds.Left();
-    const auto boundsBottomInclusive = _bounds.BottomInclusive();
-    const auto boundsTop = _bounds.Top();
-    const auto oldX = _pos.X;
-    const auto oldY = _pos.Y;
-
-    // Under MSVC writing the individual members of a COORD generates worse assembly
-    // compared to having them be local variables. This causes a performance impact.
-    auto newX = oldX;
-    auto newY = oldY;
-
-    while (move > 0)
-    {
-        if (newX == boundsRightInclusive)
-        {
-            newX = boundsLeft;
-            newY++;
-            if (newY > boundsBottomInclusive)
-            {
-                newY = boundsTop;
-                _exceeded = true;
-                break;
-            }
-        }
-        else
-        {
-            newX++;
-            _exceeded = false;
-        }
+        _exceeded = !_bounds.IncrementInBounds(newPos);
         move--;
     }
-
-    if (_exceeded)
+    while (move < 0 && !_exceeded)
     {
-        // Early return because nothing needs to be done here.
-        return *this;
+        _exceeded = !_bounds.DecrementInBounds(newPos);
+        move++;
     }
-
-    if (newY == oldY)
-    {
-        // hot path
-        const auto diff = gsl::narrow_cast<ptrdiff_t>(newX) - gsl::narrow_cast<ptrdiff_t>(oldX);
-        _attrIter += diff;
-        _view.UpdateTextAttribute(*_attrIter);
-
-        const CharRow& charRow = _pRow->GetCharRow();
-        _view.UpdateText(charRow.GlyphAt(newX));
-        _view.UpdateDbcsAttribute(charRow.DbcsAttrAt(newX));
-        _pos.X = newX;
-    }
-    else
-    {
-        // cold path (_GenerateView is slow)
-        _pRow = s_GetRow(_buffer, { newX, newY });
-        _attrIter = _pRow->GetAttrRow().cbegin() + newX;
-        _pos.X = newX;
-        _pos.Y = newY;
-        _GenerateView();
-    }
-
-    return *this;
+    _SetPos(newPos);
+    return (*this);
 }
 
 // Routine Description:
@@ -191,22 +118,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
 // - Reference to self after movement.
 TextBufferCellIterator& TextBufferCellIterator::operator-=(const ptrdiff_t& movement)
 {
-    ptrdiff_t move = movement;
-    if (move < 0)
-    {
-        return (*this) += (-move);
-    }
-
-    auto newPos = _pos;
-    while (move > 0 && !_exceeded)
-    {
-        _exceeded = !_bounds.DecrementInBounds(newPos);
-        move--;
-    }
-    _SetPos(newPos);
-
-    _GenerateView();
-    return (*this);
+    return this->operator+=(-movement);
 }
 
 // Routine Description:

src/buffer/out/ut_textbuffer/TextAttributeTests.cpp

@@ -22,11 +22,12 @@ class TextAttributeTests
     TEST_METHOD(TestTextAttributeColorGetters);
     TEST_METHOD(TestReverseDefaultColors);
     TEST_METHOD(TestRoundtripDefaultColors);
-    TEST_METHOD(TestBoldAsBright);
 
-    std::array<COLORREF, 256> _colorTable;
+    static const int COLOR_TABLE_SIZE = 16;
+    COLORREF _colorTable[COLOR_TABLE_SIZE];
     COLORREF _defaultFg = RGB(1, 2, 3);
     COLORREF _defaultBg = RGB(4, 5, 6);
+    gsl::span<const COLORREF> _GetTableView();
 };
 
 bool TextAttributeTests::ClassSetup()
@@ -50,6 +51,11 @@ bool TextAttributeTests::ClassSetup()
     return true;
 }
 
+gsl::span<const COLORREF> TextAttributeTests::_GetTableView()
+{
+    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+}
+
 void TextAttributeTests::TestRoundtripLegacy()
 {
     WORD expectedLegacy = FOREGROUND_BLUE | BACKGROUND_RED;
@@ -127,22 +133,23 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     const COLORREF faintRed = RGB(127, 0, 0);
     const COLORREF green = RGB(0, 255, 0);
     TextAttribute attr(red, green);
+    auto view = _GetTableView();
 
     // verify that calculated foreground/background are the same as the direct
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(view, _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, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 
     // reset the reverse video
     attr.SetReverseVideo(false);
@@ -151,17 +158,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //      while the background and getters stay the same
     attr.SetFaint(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(view, _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, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 
     // reset the reverse video and faint attributes
     attr.SetReverseVideo(false);
@@ -171,17 +178,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //       background, while getters stay the same
     attr.SetInvisible(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(view, _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, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 }
 
 void TextAttributeTests::TestReverseDefaultColors()
@@ -189,39 +196,40 @@ void TextAttributeTests::TestReverseDefaultColors()
     const COLORREF red = RGB(255, 0, 0);
     const COLORREF green = RGB(0, 255, 0);
     TextAttribute attr{};
+    auto view = _GetTableView();
 
     // verify that calculated foreground/background are the same as the direct
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(view, _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, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 
     attr.SetForeground(red);
     VERIFY_IS_TRUE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 
     attr.Invert();
     VERIFY_IS_FALSE(attr.IsReverseVideo());
     attr.SetDefaultForeground();
     attr.SetBackground(green);
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(view, _defaultFg));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(view, _defaultBg));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(view, _defaultFg, _defaultBg));
 }
 
 void TextAttributeTests::TestRoundtripDefaultColors()
@@ -264,56 +272,3 @@ void TextAttributeTests::TestRoundtripDefaultColors()
     // Reset the legacy default colors to white on black.
     TextAttribute::SetLegacyDefaultAttributes(FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
 }
-
-void TextAttributeTests::TestBoldAsBright()
-{
-    const COLORREF darkBlack = til::at(_colorTable, 0);
-    const COLORREF brightBlack = til::at(_colorTable, 8);
-    const COLORREF darkGreen = til::at(_colorTable, 2);
-
-    TextAttribute attr{};
-
-    // verify that calculated foreground/background are the same as the direct
-    //      values when not bold
-    VERIFY_IS_FALSE(attr.IsBold());
-
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    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, _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, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
-
-    attr.SetIndexedForeground(0);
-    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, _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, _defaultFg, _defaultBg, false, false, false));
-
-    attr.SetIndexedBackground(2);
-    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, _defaultFg, _defaultBg, false, false, true));
-    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, _defaultFg, _defaultBg, false, false, true));
-    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(8);
-    VERIFY_IS_TRUE(attr.IsBold());
-    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, _defaultFg, _defaultBg, false, false, false));
-}

src/buffer/out/ut_textbuffer/TextColorTests.cpp

@@ -23,9 +23,11 @@ class TextColorTests
     TEST_METHOD(TestRgbColor);
     TEST_METHOD(TestChangeColor);
 
-    std::array<COLORREF, 256> _colorTable;
+    static const int COLOR_TABLE_SIZE = 16;
+    COLORREF _colorTable[COLOR_TABLE_SIZE];
     COLORREF _defaultFg = RGB(1, 2, 3);
     COLORREF _defaultBg = RGB(4, 5, 6);
+    gsl::span<const COLORREF> _GetTableView();
 };
 
 bool TextColorTests::ClassSetup()
@@ -49,6 +51,11 @@ bool TextColorTests::ClassSetup()
     return true;
 }
 
+gsl::span<const COLORREF> TextColorTests::_GetTableView()
+{
+    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+}
+
 void TextColorTests::TestDefaultColor()
 {
     TextColor defaultColor;
@@ -57,16 +64,18 @@ void TextColorTests::TestDefaultColor()
     VERIFY_IS_FALSE(defaultColor.IsLegacy());
     VERIFY_IS_FALSE(defaultColor.IsRgb());
 
-    auto color = defaultColor.GetColor(_colorTable, _defaultFg, false);
+    auto view = _GetTableView();
+
+    auto color = defaultColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultFg, true);
+    color = defaultColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBg, false);
+    color = defaultColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBg, true);
+    color = defaultColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 }
 
@@ -78,16 +87,18 @@ void TextColorTests::TestDarkIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
+    auto view = _GetTableView();
+
+    auto color = indexColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFg, true);
+    color = indexColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, false);
+    color = indexColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, true);
+    color = indexColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -99,16 +110,18 @@ void TextColorTests::TestBrightIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
+    auto view = _GetTableView();
+
+    auto color = indexColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFg, true);
+    color = indexColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, false);
+    color = indexColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, true);
+    color = indexColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -121,16 +134,18 @@ void TextColorTests::TestRgbColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    auto view = _GetTableView();
+
+    auto color = rgbColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 }
 
@@ -143,55 +158,57 @@ void TextColorTests::TestChangeColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    auto view = _GetTableView();
+
+    auto color = rgbColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
     rgbColor.SetDefault();
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
     rgbColor.SetIndex(7, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
     rgbColor.SetIndex(15, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(view, _defaultFg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(view, _defaultFg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(view, _defaultBg, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(view, _defaultBg, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -397,10 +397,6 @@ namespace SettingsModelLocalTests
                 "name":"action6",
                 "command": { "action": "newWindow", "startingDirectory":"C:\\foo", "commandline": "bar.exe" }
             },
-            {
-                "name":"action7_startingDirectoryWithTrailingSlash",
-                "command": { "action": "newWindow", "startingDirectory":"C:\\", "commandline": "bar.exe" }
-            },
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -409,7 +405,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(8u, commands.Size());
+        VERIFY_ARE_EQUAL(7u, commands.Size());
 
         {
             auto command = commands.Lookup(L"action0");
@@ -507,20 +503,5 @@ namespace SettingsModelLocalTests
                 L"cmdline: \"%s\"", cmdline.c_str()));
             VERIFY_ARE_EQUAL(L"--startingDirectory \"C:\\foo\" -- \"bar.exe\"", terminalArgs.ToCommandline());
         }
-
-        {
-            auto command = commands.Lookup(L"action7_startingDirectoryWithTrailingSlash");
-            VERIFY_IS_NOT_NULL(command);
-            VERIFY_IS_NOT_NULL(command.ActionAndArgs());
-            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.ActionAndArgs().Action());
-            const auto& realArgs = command.ActionAndArgs().Args().try_as<NewWindowArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            const auto& terminalArgs = realArgs.TerminalArgs();
-            VERIFY_IS_NOT_NULL(terminalArgs);
-            auto cmdline = terminalArgs.ToCommandline();
-            Log::Comment(NoThrowString().Format(
-                L"cmdline: \"%s\"", cmdline.c_str()));
-            VERIFY_ARE_EQUAL(L"--startingDirectory \"C:\\\\\" -- \"bar.exe\"", terminalArgs.ToCommandline());
-        }
     }
 }

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -1971,9 +1971,9 @@ namespace SettingsModelLocalTests
         auto settings = implementation::CascadiaSettings::FromJson(settingsObject);
 
         VERIFY_ARE_EQUAL(3u, settings->_globals->_actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('A'), 0 }));
-        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('B'), 0 }));
-        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
+        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('a') }));
+        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('b') }));
+        VERIFY_IS_NULL(settings->_globals->_actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
 
         for (const auto& warning : settings->_globals->_keybindingsWarnings)
         {
@@ -2124,7 +2124,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(1u, nameMap.Size());
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('A'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('A') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -2141,7 +2141,7 @@ namespace SettingsModelLocalTests
         Log::Comment(L"Note that we're skipping ctrl+B, since that doesn't have `keys` set.");
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -2155,7 +2155,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('D'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -2169,7 +2169,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('E'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -2183,7 +2183,7 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('F'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -2841,7 +2841,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(0u, settings->_warnings.Size());
         VERIFY_ARE_EQUAL(1u, nameMap.Size());
 
-        const KeyChord expectedKeyChord{ true, false, true, false, static_cast<int>('W'), 0 };
+        const KeyChord expectedKeyChord{ true, false, true, static_cast<int>('W') };
         {
             // Verify NameMap returns correct value
             const auto& cmd{ nameMap.TryLookup(L"foo") };

src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp

@@ -36,15 +36,10 @@ namespace SettingsModelLocalTests
             TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
-        TEST_METHOD(KeyChords);
         TEST_METHOD(ManyKeysSameAction);
         TEST_METHOD(LayerKeybindings);
         TEST_METHOD(UnbindKeybindings);
 
-        TEST_METHOD(LayerScancodeKeybindings);
-
-        TEST_METHOD(TestExplicitUnbind);
-
         TEST_METHOD(TestArbitraryArgs);
         TEST_METHOD(TestSplitPaneArgs);
 
@@ -58,7 +53,6 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestMoveTabArgs);
 
         TEST_METHOD(TestGetKeyBindingForAction);
-        TEST_METHOD(KeybindingsWithoutVkey);
 
         TEST_CLASS_SETUP(ClassSetup)
         {
@@ -67,69 +61,6 @@ namespace SettingsModelLocalTests
         }
     };
 
-    void KeyBindingsTests::KeyChords()
-    {
-        struct testCase
-        {
-            VirtualKeyModifiers modifiers;
-            int32_t vkey;
-            int32_t scanCode;
-            std::wstring_view expected;
-        };
-
-        static constexpr std::array testCases{
-            testCase{
-                VirtualKeyModifiers::None,
-                'A',
-                0,
-                L"a",
-            },
-            testCase{
-                VirtualKeyModifiers::Control,
-                'A',
-                0,
-                L"ctrl+a",
-            },
-            testCase{
-                VirtualKeyModifiers::Control | VirtualKeyModifiers::Shift,
-                VK_OEM_PLUS,
-                0,
-                L"ctrl+shift+plus",
-            },
-            testCase{
-                VirtualKeyModifiers::Control | VirtualKeyModifiers::Menu | VirtualKeyModifiers::Shift | VirtualKeyModifiers::Windows,
-                255,
-                0,
-                L"win+ctrl+alt+shift+vk(255)",
-            },
-            testCase{
-                VirtualKeyModifiers::Control | VirtualKeyModifiers::Menu | VirtualKeyModifiers::Shift | VirtualKeyModifiers::Windows,
-                0,
-                123,
-                L"win+ctrl+alt+shift+sc(123)",
-            },
-        };
-
-        for (const auto& tc : testCases)
-        {
-            Log::Comment(NoThrowString().Format(L"Testing case:\"%s\"", tc.expected.data()));
-
-            const auto actualString = KeyChordSerialization::ToString({ tc.modifiers, tc.vkey, tc.scanCode });
-            VERIFY_ARE_EQUAL(tc.expected, actualString);
-
-            auto expectedVkey = tc.vkey;
-            if (!expectedVkey)
-            {
-                expectedVkey = MapVirtualKeyW(tc.scanCode, MAPVK_VSC_TO_VK_EX);
-            }
-
-            const auto actualKeyChord = KeyChordSerialization::FromString(actualString);
-            VERIFY_ARE_EQUAL(tc.modifiers, actualKeyChord.Modifiers());
-            VERIFY_ARE_EQUAL(expectedVkey, actualKeyChord.Vkey());
-            VERIFY_ARE_EQUAL(tc.scanCode, actualKeyChord.ScanCode());
-        }
-    }
-
     void KeyBindingsTests::ManyKeysSameAction()
     {
         const std::string bindings0String{ R"([ { "command": "copy", "keys": ["ctrl+c"] } ])" };
@@ -144,6 +75,7 @@ namespace SettingsModelLocalTests
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
 
         actionMap->LayerJson(bindings0Json);
@@ -167,6 +99,7 @@ namespace SettingsModelLocalTests
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
 
         actionMap->LayerJson(bindings0Json);
@@ -196,6 +129,7 @@ namespace SettingsModelLocalTests
         const auto bindings5Json = VerifyParseSucceeded(bindings5String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
 
         actionMap->LayerJson(bindings0Json);
@@ -208,7 +142,7 @@ namespace SettingsModelLocalTests
             L"Try unbinding a key using `\"unbound\"` to unbind the key"));
         actionMap->LayerJson(bindings2Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
+        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using `null` to unbind the key"));
@@ -218,7 +152,7 @@ namespace SettingsModelLocalTests
         // Then try layering in the bad setting
         actionMap->LayerJson(bindings3Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
+        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using an unrecognized command to unbind the key"));
@@ -228,7 +162,7 @@ namespace SettingsModelLocalTests
         // Then try layering in the bad setting
         actionMap->LayerJson(bindings4Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
+        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using a straight up invalid value to unbind the key"));
@@ -238,38 +172,13 @@ namespace SettingsModelLocalTests
         // Then try layering in the bad setting
         actionMap->LayerJson(bindings5Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
+        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key that wasn't bound at all"));
         actionMap->LayerJson(bindings2Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }));
-    }
-
-    void KeyBindingsTests::TestExplicitUnbind()
-    {
-        const std::string bindings0String{ R"([ { "command": "copy", "keys": ["ctrl+c"] } ])" };
-        const std::string bindings1String{ R"([ { "command": "unbound", "keys": ["ctrl+c"] } ])" };
-        const std::string bindings2String{ R"([ { "command": "copy", "keys": ["ctrl+c"] } ])" };
-
-        const auto bindings0Json = VerifyParseSucceeded(bindings0String);
-        const auto bindings1Json = VerifyParseSucceeded(bindings1String);
-        const auto bindings2Json = VerifyParseSucceeded(bindings2String);
-
-        const KeyChord keyChord{ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 };
-
-        auto actionMap = winrt::make_self<implementation::ActionMap>();
-        VERIFY_IS_FALSE(actionMap->IsKeyChordExplicitlyUnbound(keyChord));
-
-        actionMap->LayerJson(bindings0Json);
-        VERIFY_IS_FALSE(actionMap->IsKeyChordExplicitlyUnbound(keyChord));
-
-        actionMap->LayerJson(bindings1Json);
-        VERIFY_IS_TRUE(actionMap->IsKeyChordExplicitlyUnbound(keyChord));
-
-        actionMap->LayerJson(bindings2Json);
-        VERIFY_IS_FALSE(actionMap->IsKeyChordExplicitlyUnbound(keyChord));
+        VERIFY_IS_NULL(actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Control, static_cast<int32_t>('c') }));
     }
 
     void KeyBindingsTests::TestArbitraryArgs()
@@ -294,6 +203,7 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(10u, actionMap->_KeyMap.size());
@@ -301,9 +211,10 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` without args parses as Copy(SingleLine=false)"));
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_FALSE(realArgs.SingleLine());
         }
@@ -311,9 +222,10 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_FALSE(realArgs.SingleLine());
         }
@@ -321,9 +233,10 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
-            KeyChord kc{ false, true, true, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ false, true, true, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_TRUE(realArgs.SingleLine());
         }
@@ -331,10 +244,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` without args parses as NewTab(Index=null)"));
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('T'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('T') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<NewTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_NULL(realArgs.TerminalArgs().ProfileIndex());
@@ -342,10 +256,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` parses args correctly"));
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>('T'), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>('T') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<NewTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs().ProfileIndex());
@@ -355,10 +270,11 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` with an index greater than the legacy "
                 L"args afforded parses correctly"));
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>('Y'), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>('Y') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<NewTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs().ProfileIndex());
@@ -368,10 +284,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` ignores args it doesn't understand"));
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>('B'), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_FALSE(realArgs.SingleLine());
         }
@@ -379,10 +296,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` null as it's `args` parses as the default option"));
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>('B'), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_FALSE(realArgs.SingleLine());
         }
@@ -390,10 +308,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a positive delta parses args correctly"));
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('F'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<AdjustFontSizeArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(1, realArgs.Delta());
         }
@@ -401,10 +320,11 @@ namespace SettingsModelLocalTests
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a negative delta parses args correctly"));
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('G'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<AdjustFontSizeArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(-1, realArgs.Delta());
         }
@@ -422,39 +342,44 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(4u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('D'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SplitPaneArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('E'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SplitPaneArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('G'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SplitPaneArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('H'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SplitPaneArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
@@ -471,33 +396,37 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(3u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SetTabColorArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.TabColor());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('D'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SetTabColorArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.TabColor());
             // Remember that COLORREFs are actually BBGGRR order, while the string is in #RRGGBB order
             VERIFY_ARE_EQUAL(til::color(0x563412), til::color(realArgs.TabColor().Value()));
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('F'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<SetTabColorArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.TabColor());
         }
@@ -512,14 +441,16 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
-            const auto& realArgs = actionAndArgs.Args().as<CopyTextArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_FALSE(realArgs.SingleLine());
         }
@@ -539,56 +470,63 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(6u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ false, false, false, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ false, false, false, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollUp, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollUpArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollUpArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.RowsToScroll());
         }
         {
-            KeyChord kc{ false, false, false, false, static_cast<int32_t>(VK_DOWN), 0 };
+            KeyChord kc{ false, false, false, static_cast<int32_t>(VK_DOWN) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollDown, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollDownArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollDownArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.RowsToScroll());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollUp, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollUpArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollUpArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.RowsToScroll());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>(VK_DOWN), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>(VK_DOWN) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollDown, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollDownArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollDownArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NULL(realArgs.RowsToScroll());
         }
         {
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollUp, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollUpArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollUpArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.RowsToScroll());
             VERIFY_ARE_EQUAL(10u, realArgs.RowsToScroll().Value());
         }
         {
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>(VK_DOWN), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>(VK_DOWN) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ScrollDown, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ScrollDownArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ScrollDownArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_IS_NOT_NULL(realArgs.RowsToScroll());
             VERIFY_ARE_EQUAL(10u, realArgs.RowsToScroll().Value());
@@ -597,6 +535,7 @@ namespace SettingsModelLocalTests
             const std::string bindingsInvalidString{ R"([{ "keys": ["up"], "command": { "action": "scrollDown", "rowsToScroll": -1 } }])" };
             const auto bindingsInvalidJson = VerifyParseSucceeded(bindingsInvalidString);
             auto invalidActionMap = winrt::make_self<implementation::ActionMap>();
+            VERIFY_IS_NOT_NULL(invalidActionMap);
             VERIFY_ARE_EQUAL(0u, invalidActionMap->_KeyMap.size());
             VERIFY_THROWS(invalidActionMap->LayerJson(bindingsInvalidJson);, std::exception);
         }
@@ -612,23 +551,26 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(2u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ false, false, false, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ false, false, false, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::MoveTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<MoveTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<MoveTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(realArgs.Direction(), MoveTabDirection::Forward);
         }
         {
-            KeyChord kc{ false, false, false, false, static_cast<int32_t>(VK_DOWN), 0 };
+            KeyChord kc{ false, false, false, static_cast<int32_t>(VK_DOWN) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::MoveTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<MoveTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<MoveTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(realArgs.Direction(), MoveTabDirection::Backward);
         }
@@ -642,6 +584,7 @@ namespace SettingsModelLocalTests
             const std::string bindingsInvalidString{ R"([{ "keys": ["up"], "command": { "action": "moveTab", "direction": "bad" } }])" };
             const auto bindingsInvalidJson = VerifyParseSucceeded(bindingsInvalidString);
             auto invalidActionMap = winrt::make_self<implementation::ActionMap>();
+            VERIFY_IS_NOT_NULL(invalidActionMap);
             VERIFY_ARE_EQUAL(0u, invalidActionMap->_KeyMap.size());
             VERIFY_THROWS(invalidActionMap->LayerJson(bindingsInvalidJson);, std::exception);
         }
@@ -658,31 +601,35 @@ namespace SettingsModelLocalTests
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
         actionMap->LayerJson(bindings0Json);
         VERIFY_ARE_EQUAL(3u, actionMap->_KeyMap.size());
 
         {
-            KeyChord kc{ false, false, false, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ false, false, false, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ToggleCommandPalette, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ToggleCommandPaletteArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ToggleCommandPaletteArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(realArgs.LaunchMode(), CommandPaletteLaunchMode::Action);
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ToggleCommandPalette, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ToggleCommandPaletteArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ToggleCommandPaletteArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(realArgs.LaunchMode(), CommandPaletteLaunchMode::Action);
         }
         {
-            KeyChord kc{ true, false, true, false, static_cast<int32_t>(VK_UP), 0 };
+            KeyChord kc{ true, false, true, static_cast<int32_t>(VK_UP) };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::ToggleCommandPalette, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<ToggleCommandPaletteArgs>();
+            const auto& realArgs = actionAndArgs.Args().try_as<ToggleCommandPaletteArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(realArgs.LaunchMode(), CommandPaletteLaunchMode::CommandLine);
         }
@@ -690,6 +637,7 @@ namespace SettingsModelLocalTests
             const std::string bindingsInvalidString{ R"([{ "keys": ["up"], "command": { "action": "commandPalette", "launchMode": "bad" } }])" };
             const auto bindingsInvalidJson = VerifyParseSucceeded(bindingsInvalidString);
             auto invalidActionMap = winrt::make_self<implementation::ActionMap>();
+            VERIFY_IS_NOT_NULL(invalidActionMap);
             VERIFY_ARE_EQUAL(0u, invalidActionMap->_KeyMap.size());
             VERIFY_THROWS(invalidActionMap->LayerJson(bindingsInvalidJson);, std::exception);
         }
@@ -721,6 +669,7 @@ namespace SettingsModelLocalTests
         };
 
         auto actionMap = winrt::make_self<implementation::ActionMap>();
+        VERIFY_IS_NOT_NULL(actionMap);
         VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
 
         {
@@ -728,7 +677,7 @@ namespace SettingsModelLocalTests
             actionMap->LayerJson(bindings0Json);
             VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
             const auto& kbd{ actionMap->GetKeyBindingForAction(ShortcutAction::CloseWindow) };
-            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('A'), 0 }, kbd);
+            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('A') }, kbd);
         }
         {
             Log::Comment(L"command with args");
@@ -739,7 +688,7 @@ namespace SettingsModelLocalTests
             args->SingleLine(true);
 
             const auto& kbd{ actionMap->GetKeyBindingForAction(ShortcutAction::CopyText, *args) };
-            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('B'), 0 }, kbd);
+            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('B') }, kbd);
         }
         {
             Log::Comment(L"command with new terminal args");
@@ -751,7 +700,7 @@ namespace SettingsModelLocalTests
             auto args{ winrt::make_self<implementation::NewTabArgs>(*newTerminalArgs) };
 
             const auto& kbd{ actionMap->GetKeyBindingForAction(ShortcutAction::NewTab, *args) };
-            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('C'), 0 }, kbd);
+            VerifyKeyChordEquality({ VirtualKeyModifiers::Control, static_cast<int32_t>('C') }, kbd);
         }
         {
             Log::Comment(L"command with hidden args");
@@ -759,45 +708,7 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(4u, actionMap->_KeyMap.size());
 
             const auto& kbd{ actionMap->GetKeyBindingForAction(ShortcutAction::ToggleCommandPalette) };
-            VerifyKeyChordEquality({ VirtualKeyModifiers::Control | VirtualKeyModifiers::Shift, static_cast<int32_t>('P'), 0 }, kbd);
+            VerifyKeyChordEquality({ VirtualKeyModifiers::Control | VirtualKeyModifiers::Shift, static_cast<int32_t>('P') }, kbd);
         }
     }
-
-    void KeyBindingsTests::LayerScancodeKeybindings()
-    {
-        Log::Comment(L"Layering a keybinding with a character literal on top of"
-                     L" an equivalent sc() key should replace it.");
-
-        // Wrap the first one in `R"!(...)!"` because it has `()` internally.
-        const std::string bindings0String{ R"!([ { "command": "quakeMode", "keys":"win+sc(41)" } ])!" };
-        const std::string bindings1String{ R"([ { "keys": "win+`", "command": { "action": "globalSummon", "monitor": "any" } } ])" };
-        const std::string bindings2String{ R"([ { "keys": "ctrl+shift+`", "command": { "action": "quakeMode" } } ])" };
-
-        const auto bindings0Json = VerifyParseSucceeded(bindings0String);
-        const auto bindings1Json = VerifyParseSucceeded(bindings1String);
-        const auto bindings2Json = VerifyParseSucceeded(bindings2String);
-
-        auto actionMap = winrt::make_self<implementation::ActionMap>();
-        VERIFY_ARE_EQUAL(0u, actionMap->_KeyMap.size());
-
-        actionMap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size());
-
-        actionMap->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(1u, actionMap->_KeyMap.size(), L"Layering the second action should replace the first one.");
-
-        actionMap->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(2u, actionMap->_KeyMap.size());
-    }
-
-    void KeyBindingsTests::KeybindingsWithoutVkey()
-    {
-        const auto json = VerifyParseSucceeded(R"!([{"command": "quakeMode", "keys":"shift+sc(255)"}])!");
-
-        const auto actionMap = winrt::make_self<implementation::ActionMap>();
-        actionMap->LayerJson(json);
-
-        const auto action = actionMap->GetActionByKeyChord({ VirtualKeyModifiers::Shift, 0, 255 });
-        VERIFY_IS_NOT_NULL(action);
-    }
 }

src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp

@@ -37,13 +37,11 @@ namespace SettingsModelLocalTests
 
         TEST_METHOD(TestTerminalArgsForBinding);
 
-        TEST_METHOD(MakeSettingsForProfile);
+        TEST_METHOD(MakeSettingsForProfileThatDoesntExist);
         TEST_METHOD(MakeSettingsForDefaultProfileThatDoesntExist);
 
         TEST_METHOD(TestLayerProfileOnColorScheme);
 
-        TEST_METHOD(TestCommandlineToTitlePromotion);
-
         TEST_CLASS_SETUP(ClassSetup)
         {
             return true;
@@ -53,7 +51,6 @@ namespace SettingsModelLocalTests
     void TerminalSettingsTests::TryCreateWinRTType()
     {
         TerminalSettings settings;
-        VERIFY_IS_NOT_NULL(settings);
         auto oldFontSize = settings.FontSize();
         settings.FontSize(oldFontSize + 5);
         auto newFontSize = settings.FontSize();
@@ -62,10 +59,13 @@ namespace SettingsModelLocalTests
 
     void TerminalSettingsTests::TestTerminalArgsForBinding()
     {
-        const std::string settingsJson{ R"(
+        const winrt::guid guid0{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}") };
+        const winrt::guid guid1{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}") };
+
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": { "list": [
+            "profiles": [
                 {
                     "name": "profile0",
                     "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
@@ -84,9 +84,6 @@ namespace SettingsModelLocalTests
                     "commandline": "wsl.exe"
                 }
             ],
-            "defaults": {
-                "historySize": 29
-            } },
             "keybindings": [
                 { "keys": ["ctrl+a"], "command": { "action": "splitPane", "split": "vertical" } },
                 { "keys": ["ctrl+b"], "command": { "action": "splitPane", "split": "vertical", "profile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}" } },
@@ -103,11 +100,6 @@ namespace SettingsModelLocalTests
             ]
         })" };
 
-        const winrt::guid guid0{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}") };
-        const winrt::guid guid1{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}") };
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         auto actionMap = settings.GlobalSettings().ActionMap();
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -118,7 +110,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(12u, actionMapImpl->_KeyMap.size());
 
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('A'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('A') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -131,15 +123,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid0, profile.Guid());
+            VERIFY_ARE_EQUAL(guid0, guid);
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('B'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('B') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -153,15 +145,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid1, profile.Guid());
+            VERIFY_ARE_EQUAL(guid1, guid);
             VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('C'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -175,15 +167,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid1, profile.Guid());
+            VERIFY_ARE_EQUAL(guid1, guid);
             VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('D'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -197,15 +189,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(profile2Guid, profile.Guid());
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('E'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -219,24 +211,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            if constexpr (Feature_ShowProfileDefaultsInSettings::IsEnabled())
-            {
-                // This action specified a command but no profile; it gets reassigned to the base profile
-                VERIFY_ARE_EQUAL(settings.ProfileDefaults(), profile);
-                VERIFY_ARE_EQUAL(29, termSettings.HistorySize());
-            }
-            else
-            {
-                VERIFY_ARE_EQUAL(guid0, profile.Guid());
-                VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-            }
+            VERIFY_ARE_EQUAL(guid0, guid);
             VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('F'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
@@ -251,15 +234,15 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
             VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid1, profile.Guid());
+            VERIFY_ARE_EQUAL(guid1, guid);
             VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('G'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -271,15 +254,15 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid0, profile.Guid());
+            VERIFY_ARE_EQUAL(guid0, guid);
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('H'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -292,16 +275,16 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid0, profile.Guid());
+            VERIFY_ARE_EQUAL(guid0, guid);
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
             VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('I'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -315,16 +298,16 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
             VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(profile2Guid, profile.Guid());
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
             VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('J'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('J') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -337,16 +320,16 @@ namespace SettingsModelLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid0, profile.Guid());
+            VERIFY_ARE_EQUAL(guid0, guid);
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
             VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('K'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('K') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -360,16 +343,16 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
             VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(profile2Guid, profile.Guid());
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
             VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
         }
         {
-            KeyChord kc{ true, false, false, false, static_cast<int32_t>('L'), 0 };
+            KeyChord kc{ true, false, false, static_cast<int32_t>('L') };
             auto actionAndArgs = ::TestUtils::GetActionAndArgs(actionMap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
@@ -385,10 +368,10 @@ namespace SettingsModelLocalTests
             VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
             VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
 
-            const auto profile{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
             const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
             const auto termSettings = settingsStruct.DefaultSettings();
-            VERIFY_ARE_EQUAL(guid1, profile.Guid());
+            VERIFY_ARE_EQUAL(guid1, guid);
             VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
             VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
             VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
@@ -396,10 +379,10 @@ namespace SettingsModelLocalTests
         }
     }
 
-    void TerminalSettingsTests::MakeSettingsForProfile()
+    void TerminalSettingsTests::MakeSettingsForProfileThatDoesntExist()
     {
-        // Test that making settings generally works.
-        const std::string settingsString{ R"(
+        // Test that making settings throws when the GUID doesn't exist
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -415,36 +398,35 @@ namespace SettingsModelLocalTests
                 }
             ]
         })" };
-        CascadiaSettings settings{ til::u8u16(settingsString) };
 
         const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
-
-        const auto profile1 = settings.FindProfile(guid1);
-        const auto profile2 = settings.FindProfile(guid2);
+        const auto guid3 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-3333-49a3-80bd-e8fdd045185c}");
 
         try
         {
-            auto terminalSettings{ TerminalSettings::CreateWithProfile(settings, profile1, nullptr) };
+            auto terminalSettings{ TerminalSettings::CreateWithProfileByID(settings, guid1, nullptr) };
             VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
             VERIFY_ARE_EQUAL(1, terminalSettings.DefaultSettings().HistorySize());
         }
         catch (...)
         {
-            VERIFY_IS_TRUE(false, L"This call to CreateWithProfile should succeed");
+            VERIFY_IS_TRUE(false, L"This call to CreateWithProfileByID should succeed");
         }
 
         try
         {
-            auto terminalSettings{ TerminalSettings::CreateWithProfile(settings, profile2, nullptr) };
+            auto terminalSettings{ TerminalSettings::CreateWithProfileByID(settings, guid2, nullptr) };
             VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
             VERIFY_ARE_EQUAL(2, terminalSettings.DefaultSettings().HistorySize());
         }
         catch (...)
         {
-            VERIFY_IS_TRUE(false, L"This call to CreateWithProfile should succeed");
+            VERIFY_IS_TRUE(false, L"This call to CreateWithProfileByID should succeed");
         }
 
+        VERIFY_THROWS(auto terminalSettings = TerminalSettings::CreateWithProfileByID(settings, guid3, nullptr), wil::ResultException, L"This call to constructor should fail");
+
         try
         {
             const auto termSettings{ TerminalSettings::CreateWithNewTerminalArgs(settings, nullptr, nullptr) };
@@ -463,7 +445,7 @@ namespace SettingsModelLocalTests
         // defaultProfile that's not in the list, we validate the settings, and
         // then call MakeSettings(nullopt). The validation should ensure that
         // the default profile is something reasonable
-        const std::string settingsString{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -479,7 +461,6 @@ namespace SettingsModelLocalTests
                 }
             ]
         })" };
-        CascadiaSettings settings{ til::u8u16(settingsString) };
 
         VERIFY_ARE_EQUAL(2u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(2u, settings.ActiveProfiles().Size());
@@ -501,7 +482,7 @@ namespace SettingsModelLocalTests
         Log::Comment(NoThrowString().Format(
             L"Ensure that setting (or not) a property in the profile that should override a property of the color scheme works correctly."));
 
-        const std::string settings0String{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "profile5",
             "profiles": [
@@ -542,8 +523,6 @@ namespace SettingsModelLocalTests
             ]
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settings0String) };
-
         VERIFY_ARE_EQUAL(6u, settings.ActiveProfiles().Size());
         VERIFY_ARE_EQUAL(2u, settings.GlobalSettings().ColorSchemes().Size());
 
@@ -568,85 +547,4 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(ARGB(0, 0x45, 0x67, 0x89), terminalSettings4->CursorColor()); // from profile (no color scheme)
         VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings5->CursorColor()); // default
     }
-
-    void TerminalSettingsTests::TestCommandlineToTitlePromotion()
-    {
-        const std::string settingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": { "list": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "commandline": "cmd.exe"
-                },
-            ],
-            "defaults": {
-                "historySize": 29
-            } }
-        })" };
-
-        const winrt::guid guid0{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}") };
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
-        { // just a profile (profile wins)
-            NewTerminalArgs args{};
-            args.Profile(L"profile0");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"profile0", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        { // profile and command line -> no promotion (profile wins)
-            NewTerminalArgs args{};
-            args.Profile(L"profile0");
-            args.Commandline(L"foo.exe");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"profile0", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        { // just a title -> it is propagated
-            NewTerminalArgs args{};
-            args.TabTitle(L"Analog Kid");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"Analog Kid", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        { // title and command line -> no promotion
-            NewTerminalArgs args{};
-            args.TabTitle(L"Digital Man");
-            args.Commandline(L"foo.exe");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"Digital Man", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        { // just a commandline -> promotion
-            NewTerminalArgs args{};
-            args.Commandline(L"foo.exe");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"foo.exe", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        // various typesof commandline follow
-        {
-            NewTerminalArgs args{};
-            args.Commandline(L"foo.exe bar");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"foo.exe", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        {
-            NewTerminalArgs args{};
-            args.Commandline(L"\"foo exe.exe\" bar");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"foo exe.exe", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        {
-            NewTerminalArgs args{};
-            args.Commandline(L"\"\" grand designs");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"", settingsStruct.DefaultSettings().StartingTitle());
-        }
-        {
-            NewTerminalArgs args{};
-            args.Commandline(L" imagine a man");
-            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, args, nullptr) };
-            VERIFY_ARE_EQUAL(L"", settingsStruct.DefaultSettings().StartingTitle());
-        }
-    }
 }

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -56,7 +56,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(ParseComboCommandlineIntoArgs);
         TEST_METHOD(ParseFocusTabArgs);
         TEST_METHOD(ParseMoveFocusArgs);
-        TEST_METHOD(ParseSwapPaneArgs);
         TEST_METHOD(ParseArgumentsWithParsingTerminators);
         TEST_METHOD(ParseFocusPaneArgs);
 
@@ -1208,119 +1207,6 @@ namespace TerminalAppLocalTests
         }
     }
 
-    void CommandlineTest::ParseSwapPaneArgs()
-    {
-        const wchar_t* subcommand = L"swap-pane";
-
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand };
-            Log::Comment(NoThrowString().Format(
-                L"Just the subcommand, without a direction, should fail."));
-
-            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.Direction());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"right" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.Direction());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"up" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Up, myArgs.Direction());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"down" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Down, myArgs.Direction());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"badDirection" };
-            Log::Comment(NoThrowString().Format(
-                L"move-pane with an invalid direction should fail."));
-            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left", L";", subcommand, L"right" };
-            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
-
-            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.Direction());
-
-            actionAndArgs = appArgs._startupActions.at(2);
-            VERIFY_ARE_EQUAL(ShortcutAction::SwapPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            myArgs = actionAndArgs.Args().try_as<SwapPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.Direction());
-        }
-    }
-
     void CommandlineTest::ParseFocusPaneArgs()
     {
         BEGIN_TEST_METHOD_PROPERTIES()

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -79,7 +79,10 @@ namespace TerminalAppLocalTests
         // containing a ${profile.name} to replace. When we expand it, it should
         // have created one command for each profile.
 
-        const std::string settingsJson{ R"(
+        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
+        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -111,11 +114,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
-        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -207,7 +205,10 @@ namespace TerminalAppLocalTests
         // For this test, put an iterable command without a given `name` to
         // replace. When we expand it, it should still work.
 
-        const std::string settingsJson{ R"(
+        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
+        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -238,11 +239,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
-        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -335,7 +331,10 @@ namespace TerminalAppLocalTests
         // cause bad json to be filled in. Something like a profile with a name
         // of "Foo\"", so the trailing '"' might break the json parsing.
 
-        const std::string settingsJson{ R"(
+        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
+        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -367,11 +366,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        const auto guid0 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}");
-        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -468,7 +462,7 @@ namespace TerminalAppLocalTests
         //    ├─ first.com
         //    └─ second.com
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -508,8 +502,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -558,7 +550,7 @@ namespace TerminalAppLocalTests
         //       ├─ child1
         //       └─ child2
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -603,8 +595,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -691,7 +681,7 @@ namespace TerminalAppLocalTests
         //     ├─ Split pane, direction: vertical, profile: profile2
         //     └─ Split pane, direction: horizontal, profile: profile2
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -727,8 +717,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -828,7 +816,7 @@ namespace TerminalAppLocalTests
         //    ├─ Profile 2
         //    └─ Profile 3
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -864,8 +852,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -926,7 +912,7 @@ namespace TerminalAppLocalTests
         //       ├─ Split vertically
         //       └─ Split horizontally
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -967,8 +953,6 @@ namespace TerminalAppLocalTests
             "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
@@ -1071,7 +1055,7 @@ namespace TerminalAppLocalTests
         // containing a ${profile.name} to replace. When we expand it, it should
         // have created one command for each profile.
 
-        const std::string settingsJson{ R"(
+        CascadiaSettings settings{ LR"(
         {
             "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -1107,8 +1091,6 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
         // Since at least one profile does not reference a color scheme,
         // we add a warning saying "the color scheme is unknown"
         VERIFY_ARE_EQUAL(1u, settings.Warnings().Size());

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -82,8 +82,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(MoveFocusFromZoomedPane);
         TEST_METHOD(CloseZoomedPane);
 
-        TEST_METHOD(SwapPanes);
-
         TEST_METHOD(NextMRUTab);
         TEST_METHOD(VerifyCommandPaletteTabSwitcherOrder);
 
@@ -95,8 +93,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestPreviewDismissScheme);
         TEST_METHOD(TestPreviewSchemeWhilePreviewing);
 
-        TEST_METHOD(TestClampSwitchToTab);
-
         TEST_CLASS_SETUP(ClassSetup)
         {
             return true;
@@ -133,7 +129,6 @@ namespace TerminalAppLocalTests
         // Verify we can create a WinRT type we authored
         // Just creating it is enough to know that everything is working.
         TerminalSettings settings;
-        VERIFY_IS_NOT_NULL(settings);
         auto oldFontSize = settings.FontSize();
         settings.FontSize(oldFontSize + 5);
         auto newFontSize = settings.FontSize();
@@ -311,7 +306,7 @@ namespace TerminalAppLocalTests
         // TerminalPage and not only create them successfully, but also create a
         // tab using those settings successfully.
 
-        const std::string settingsJson0{ R"(
+        CascadiaSettings settings0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -328,9 +323,6 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
-        VERIFY_IS_NOT_NULL(settings0);
-
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
         // the lambda. We'll crash trying to get a weak_ref to the TerminalPage
@@ -357,7 +349,7 @@ namespace TerminalAppLocalTests
         //
         // Created to test GH#2455
 
-        const std::string settingsJson0{ R"(
+        CascadiaSettings settings0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -372,9 +364,9 @@ namespace TerminalAppLocalTests
                     "historySize": 2
                 }
             ]
-        })" };
+        })") };
 
-        const std::string settingsJson1{ R"(
+        CascadiaSettings settings1{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -386,12 +378,6 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
-        VERIFY_IS_NOT_NULL(settings0);
-
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
-        VERIFY_IS_NOT_NULL(settings1);
-
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
         const auto guid3 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-3333-49a3-80bd-e8fdd045185c}");
@@ -430,7 +416,7 @@ namespace TerminalAppLocalTests
         Log::Comment(L"Duplicate the tab, and don't crash");
         result = RunOnUIThread([&page]() {
             page->_DuplicateFocusedTab();
-            VERIFY_ARE_EQUAL(3u, page->_tabs.Size(), L"We should successfully duplicate a tab hosting a deleted profile.");
+            VERIFY_ARE_EQUAL(2u, page->_tabs.Size(), L"We should gracefully do nothing here - the profile no longer exists.");
         });
         VERIFY_SUCCEEDED(result);
     }
@@ -444,7 +430,7 @@ namespace TerminalAppLocalTests
         //
         // Created to test GH#2455
 
-        const std::string settingsJson0{ R"(
+        CascadiaSettings settings0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -461,7 +447,7 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        const std::string settingsJson1{ R"(
+        CascadiaSettings settings1{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "profiles": [
@@ -473,12 +459,6 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
-        VERIFY_IS_NOT_NULL(settings0);
-
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
-        VERIFY_IS_NOT_NULL(settings1);
-
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
         const auto guid3 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-3333-49a3-80bd-e8fdd045185c}");
@@ -530,9 +510,9 @@ namespace TerminalAppLocalTests
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(3,
+            VERIFY_ARE_EQUAL(2,
                              tab->GetLeafPaneCount(),
-                             L"We should successfully duplicate a pane hosting a deleted profile.");
+                             L"We should gracefully do nothing here - the profile no longer exists.");
         });
         VERIFY_SUCCEEDED(result);
 
@@ -558,7 +538,7 @@ namespace TerminalAppLocalTests
     // - The initialized TerminalPage, ready to use.
     winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> TabTests::_commonSetup()
     {
-        const std::string settingsJson0{ R"(
+        CascadiaSettings settings0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
             "showTabsInTitlebar": false,
@@ -659,9 +639,6 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
-        VERIFY_IS_NOT_NULL(settings0);
-
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
 
@@ -821,212 +798,6 @@ namespace TerminalAppLocalTests
         VERIFY_SUCCEEDED(result);
     }
 
-    void TabTests::SwapPanes()
-    {
-        auto page = _commonSetup();
-
-        Log::Comment(L"Setup 4 panes.");
-        // Create the following layout
-        // -------------------
-        // |   1    |   2    |
-        // |        |        |
-        // -------------------
-        // |   3    |   4    |
-        // |        |        |
-        // -------------------
-        uint32_t firstId = 0, secondId = 0, thirdId = 0, fourthId = 0;
-        TestOnUIThread([&]() {
-            VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            firstId = tab->_activePane->Id().value();
-            // We start with 1 tab, split vertically to get
-            // -------------------
-            // |   1    |   2    |
-            // |        |        |
-            // -------------------
-            page->_SplitPane(SplitState::Vertical, SplitType::Duplicate, 0.5f, nullptr);
-            secondId = tab->_activePane->Id().value();
-        });
-        Sleep(250);
-        TestOnUIThread([&]() {
-            // After this the `2` pane is focused, go back to `1` being focused
-            page->_MoveFocus(FocusDirection::Left);
-        });
-        Sleep(250);
-        TestOnUIThread([&]() {
-            // Split again to make the 3rd tab
-            // -------------------
-            // |   1    |        |
-            // |        |        |
-            // ---------|   2    |
-            // |   3    |        |
-            // |        |        |
-            // -------------------
-            page->_SplitPane(SplitState::Horizontal, SplitType::Duplicate, 0.5f, nullptr);
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            // Split again to make the 3rd tab
-            thirdId = tab->_activePane->Id().value();
-        });
-        Sleep(250);
-        TestOnUIThread([&]() {
-            // After this the `3` pane is focused, go back to `2` being focused
-            page->_MoveFocus(FocusDirection::Right);
-        });
-        Sleep(250);
-        TestOnUIThread([&]() {
-            // Split to create the final pane
-            // -------------------
-            // |   1    |   2    |
-            // |        |        |
-            // -------------------
-            // |   3    |   4    |
-            // |        |        |
-            // -------------------
-            page->_SplitPane(SplitState::Horizontal, SplitType::Duplicate, 0.5f, nullptr);
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            fourthId = tab->_activePane->Id().value();
-        });
-
-        Sleep(250);
-        TestOnUIThread([&]() {
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(4, tab->GetLeafPaneCount());
-            // just to be complete, make sure we actually have 4 different ids
-            VERIFY_ARE_NOT_EQUAL(firstId, fourthId);
-            VERIFY_ARE_NOT_EQUAL(secondId, fourthId);
-            VERIFY_ARE_NOT_EQUAL(thirdId, fourthId);
-            VERIFY_ARE_NOT_EQUAL(firstId, thirdId);
-            VERIFY_ARE_NOT_EQUAL(secondId, thirdId);
-            VERIFY_ARE_NOT_EQUAL(firstId, secondId);
-        });
-
-        // Gratuitous use of sleep to make sure that the UI has updated properly
-        // after each operation.
-        Sleep(250);
-        // Now try to move the pane through the tree
-        Log::Comment(L"Move pane to the left. This should swap panes 3 and 4");
-        // -------------------
-        // |   1    |   2    |
-        // |        |        |
-        // -------------------
-        // |   4    |   3    |
-        // |        |        |
-        // -------------------
-        TestOnUIThread([&]() {
-            // Set up action
-            SwapPaneArgs args{ FocusDirection::Left };
-            ActionEventArgs eventArgs{ args };
-
-            page->_HandleSwapPane(nullptr, eventArgs);
-        });
-
-        Sleep(250);
-
-        TestOnUIThread([&]() {
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(4, tab->GetLeafPaneCount());
-            // Our currently focused pane should be `4`
-            VERIFY_ARE_EQUAL(fourthId, tab->_activePane->Id().value());
-
-            // Inspect the tree to make sure we swapped
-            VERIFY_ARE_EQUAL(fourthId, tab->_rootPane->_firstChild->_secondChild->Id().value());
-            VERIFY_ARE_EQUAL(thirdId, tab->_rootPane->_secondChild->_secondChild->Id().value());
-        });
-
-        Sleep(250);
-
-        Log::Comment(L"Move pane to up. This should swap panes 1 and 4");
-        // -------------------
-        // |   4    |   2    |
-        // |        |        |
-        // -------------------
-        // |   1    |   3    |
-        // |        |        |
-        // -------------------
-        TestOnUIThread([&]() {
-            // Set up action
-            SwapPaneArgs args{ FocusDirection::Up };
-            ActionEventArgs eventArgs{ args };
-
-            page->_HandleSwapPane(nullptr, eventArgs);
-        });
-
-        Sleep(250);
-
-        TestOnUIThread([&]() {
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(4, tab->GetLeafPaneCount());
-            // Our currently focused pane should be `4`
-            VERIFY_ARE_EQUAL(fourthId, tab->_activePane->Id().value());
-
-            // Inspect the tree to make sure we swapped
-            VERIFY_ARE_EQUAL(fourthId, tab->_rootPane->_firstChild->_firstChild->Id().value());
-            VERIFY_ARE_EQUAL(firstId, tab->_rootPane->_firstChild->_secondChild->Id().value());
-        });
-
-        Sleep(250);
-
-        Log::Comment(L"Move pane to the right. This should swap panes 2 and 4");
-        // -------------------
-        // |   2    |   4    |
-        // |        |        |
-        // -------------------
-        // |   1    |   3    |
-        // |        |        |
-        // -------------------
-        TestOnUIThread([&]() {
-            // Set up action
-            SwapPaneArgs args{ FocusDirection::Right };
-            ActionEventArgs eventArgs{ args };
-
-            page->_HandleSwapPane(nullptr, eventArgs);
-        });
-
-        Sleep(250);
-
-        TestOnUIThread([&]() {
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(4, tab->GetLeafPaneCount());
-            // Our currently focused pane should be `4`
-            VERIFY_ARE_EQUAL(fourthId, tab->_activePane->Id().value());
-
-            // Inspect the tree to make sure we swapped
-            VERIFY_ARE_EQUAL(fourthId, tab->_rootPane->_secondChild->_firstChild->Id().value());
-            VERIFY_ARE_EQUAL(secondId, tab->_rootPane->_firstChild->_firstChild->Id().value());
-        });
-
-        Sleep(250);
-
-        Log::Comment(L"Move pane down. This should swap panes 3 and 4");
-        // -------------------
-        // |   2    |   3    |
-        // |        |        |
-        // -------------------
-        // |   1    |   4    |
-        // |        |        |
-        // -------------------
-        TestOnUIThread([&]() {
-            // Set up action
-            SwapPaneArgs args{ FocusDirection::Down };
-            ActionEventArgs eventArgs{ args };
-
-            page->_HandleSwapPane(nullptr, eventArgs);
-        });
-
-        Sleep(250);
-
-        TestOnUIThread([&]() {
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            VERIFY_ARE_EQUAL(4, tab->GetLeafPaneCount());
-            // Our currently focused pane should be `4`
-            VERIFY_ARE_EQUAL(fourthId, tab->_activePane->Id().value());
-
-            // Inspect the tree to make sure we swapped
-            VERIFY_ARE_EQUAL(fourthId, tab->_rootPane->_secondChild->_secondChild->Id().value());
-            VERIFY_ARE_EQUAL(thirdId, tab->_rootPane->_secondChild->_firstChild->Id().value());
-        });
-    }
-
     void TabTests::NextMRUTab()
     {
         // This is a test for GH#8025 - we want to make sure that we can do both
@@ -1552,55 +1323,4 @@ namespace TerminalAppLocalTests
         });
     }
 
-    void TabTests::TestClampSwitchToTab()
-    {
-        Log::Comment(L"Test that switching to a tab index higher than the number of tabs just clamps to the last tab.");
-
-        auto page = _commonSetup();
-        VERIFY_IS_NOT_NULL(page);
-
-        Log::Comment(L"Create a second tab");
-        TestOnUIThread([&page]() {
-            NewTerminalArgs newTerminalArgs{ 1 };
-            page->_OpenNewTab(newTerminalArgs);
-        });
-        VERIFY_ARE_EQUAL(2u, page->_tabs.Size());
-
-        Log::Comment(L"Create a third tab");
-        TestOnUIThread([&page]() {
-            NewTerminalArgs newTerminalArgs{ 2 };
-            page->_OpenNewTab(newTerminalArgs);
-        });
-        VERIFY_ARE_EQUAL(3u, page->_tabs.Size());
-
-        TestOnUIThread([&page]() {
-            auto focusedTabIndexOpt{ page->_GetFocusedTabIndex() };
-            VERIFY_IS_TRUE(focusedTabIndexOpt.has_value());
-            VERIFY_ARE_EQUAL(2u, focusedTabIndexOpt.value());
-        });
-
-        TestOnUIThread([&page]() {
-            Log::Comment(L"Switch to the first tab");
-            page->_SelectTab(0);
-        });
-
-        TestOnUIThread([&page]() {
-            auto focusedTabIndexOpt{ page->_GetFocusedTabIndex() };
-
-            VERIFY_IS_TRUE(focusedTabIndexOpt.has_value());
-            VERIFY_ARE_EQUAL(0u, focusedTabIndexOpt.value());
-        });
-
-        TestOnUIThread([&page]() {
-            Log::Comment(L"Switch to the tab 6, which is greater than number of tabs. This should switch to the third tab");
-            page->_SelectTab(6);
-        });
-
-        TestOnUIThread([&page]() {
-            auto focusedTabIndexOpt{ page->_GetFocusedTabIndex() };
-            VERIFY_IS_TRUE(focusedTabIndexOpt.has_value());
-            VERIFY_ARE_EQUAL(2u, focusedTabIndexOpt.value());
-        });
-    }
-
 }

src/cascadia/Remoting/Monarch.cpp

@@ -28,10 +28,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         CATCH_LOG();
     }
 
-    // This constructor is intended to be used in unit tests,
-    // but we need to make it public in order to use make_self
-    // in the tests. It's not exposed through the idl though
-    // so it's not _truly_ fully public which should be acceptable.
+    // This is a private constructor to be used in unit tests, where we don't
+    // want each Monarch to necessarily use the current PID.
     Monarch::Monarch(const uint64_t testPID) :
         _ourPID{ testPID }
     {
@@ -80,9 +78,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             peasant.IdentifyWindowsRequested({ this, &Monarch::_identifyWindows });
             peasant.RenameRequested({ this, &Monarch::_renameRequested });
 
-            peasant.ShowTrayIconRequested([this](auto&&, auto&&) { _ShowTrayIconRequestedHandlers(*this, nullptr); });
-            peasant.HideTrayIconRequested([this](auto&&, auto&&) { _HideTrayIconRequestedHandlers(*this, nullptr); });
-
             _peasants[newPeasantsId] = peasant;
 
             TraceLoggingWrite(g_hRemotingProvider,
@@ -206,12 +201,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             _clearOldMruEntries(id);
         }
 
-        TraceLoggingWrite(g_hRemotingProvider,
-                          "Monarch_lookupPeasantIdForName",
-                          TraceLoggingWideString(std::wstring{ name }.c_str(), "name", "the name we're looking for"),
-                          TraceLoggingUInt64(result, "peasantID", "the ID of the peasant with that name"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         return result;
     }
 
@@ -743,55 +732,24 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         try
         {
             args.FoundMatch(false);
-
-            // If a WindowID is provided from the args, use that first.
             uint64_t windowId = 0;
-            if (args.WindowID())
+            // If no name was provided, then just summon the MRU window.
+            if (searchedForName.empty())
             {
-                windowId = args.WindowID().Value();
+                // Use the value of the `desktop` arg to determine if we should
+                // limit to the current desktop (desktop:onCurrent) or not
+                // (desktop:any or desktop:toCurrent)
+                windowId = _getMostRecentPeasantID(args.OnCurrentDesktop(), false);
             }
             else
             {
-                // If no name was provided, then just summon the MRU window.
-                if (searchedForName.empty())
-                {
-                    // Use the value of the `desktop` arg to determine if we should
-                    // limit to the current desktop (desktop:onCurrent) or not
-                    // (desktop:any or desktop:toCurrent)
-                    windowId = _getMostRecentPeasantID(args.OnCurrentDesktop(), false);
-                }
-                else
-                {
-                    // Try to find a peasant that currently has this name
-                    windowId = _lookupPeasantIdForName(searchedForName);
-                }
+                // Try to find a peasant that currently has this name
+                windowId = _lookupPeasantIdForName(searchedForName);
             }
-
             if (auto targetPeasant{ _getPeasant(windowId) })
             {
                 targetPeasant.Summon(args.SummonBehavior());
                 args.FoundMatch(true);
-
-                TraceLoggingWrite(g_hRemotingProvider,
-                                  "Monarch_SummonWindow_Success",
-                                  TraceLoggingWideString(searchedForName.c_str(), "searchedForName", "The name of the window we tried to summon"),
-                                  TraceLoggingUInt64(windowId, "peasantID", "The id of the window we tried to summon"),
-                                  TraceLoggingBoolean(args.OnCurrentDesktop(), "OnCurrentDesktop", "true iff the window needs to be on the current virtual desktop"),
-                                  TraceLoggingBoolean(args.SummonBehavior().MoveToCurrentDesktop(), "MoveToCurrentDesktop", "if true, move the window to the current virtual desktop"),
-                                  TraceLoggingBoolean(args.SummonBehavior().ToggleVisibility(), "ToggleVisibility", "true if we should toggle the visibility of the window"),
-                                  TraceLoggingUInt32(args.SummonBehavior().DropdownDuration(), "DropdownDuration", "the duration to dropdown the window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-            }
-            else
-            {
-                TraceLoggingWrite(g_hRemotingProvider,
-                                  "Monarch_SummonWindow_NoPeasant",
-                                  TraceLoggingWideString(searchedForName.c_str(), "searchedForName", "The name of the window we tried to summon"),
-                                  TraceLoggingUInt64(windowId, "peasantID", "The id of the window we tried to summon"),
-                                  TraceLoggingBoolean(args.OnCurrentDesktop(), "OnCurrentDesktop", "true iff the window needs to be on the current virtual desktop"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
         catch (...)
@@ -804,56 +762,4 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
-
-    // Method Description:
-    // - This method creates a map of peasant IDs to peasant names
-    //   while removing dead peasants.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - A map of peasant IDs to their names.
-    Windows::Foundation::Collections::IMapView<uint64_t, winrt::hstring> Monarch::GetPeasantNames()
-    {
-        auto names = winrt::single_threaded_map<uint64_t, winrt::hstring>();
-
-        std::vector<uint64_t> peasantsToErase{};
-        for (const auto& [id, p] : _peasants)
-        {
-            try
-            {
-                names.Insert(id, p.WindowName());
-            }
-            catch (...)
-            {
-                LOG_CAUGHT_EXCEPTION();
-                peasantsToErase.push_back(id);
-            }
-        }
-
-        // Remove the dead peasants we came across while iterating.
-        for (const auto& id : peasantsToErase)
-        {
-            _peasants.erase(id);
-            _clearOldMruEntries(id);
-        }
-
-        return names.GetView();
-    }
-
-    void Monarch::SummonAllWindows()
-    {
-        auto callback = [](auto&& p, auto&& /*id*/) {
-            SummonWindowBehavior args{};
-            args.ToggleVisibility(false);
-            p.Summon(args);
-        };
-        auto onError = [](auto&& id) {
-            TraceLoggingWrite(g_hRemotingProvider,
-                              "Monarch_SummonAll_Failed",
-                              TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not summon"),
-                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-        };
-        _forAllPeasantsIgnoringTheDead(callback, onError);
-    }
 }

src/cascadia/Remoting/Monarch.h

@@ -41,7 +41,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     struct Monarch : public MonarchT<Monarch>
     {
         Monarch();
-        Monarch(const uint64_t testPID);
         ~Monarch();
 
         uint64_t GetPID();
@@ -52,14 +51,10 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void HandleActivatePeasant(const winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs& args);
         void SummonWindow(const Remoting::SummonWindowSelectionArgs& args);
 
-        void SummonAllWindows();
-        Windows::Foundation::Collections::IMapView<uint64_t, winrt::hstring> GetPeasantNames();
-
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
-        TYPED_EVENT(ShowTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(HideTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
 
     private:
+        Monarch(const uint64_t testPID);
         uint64_t _ourPID;
 
         uint64_t _nextPeasantID{ 1 };

src/cascadia/Remoting/Monarch.idl

@@ -28,7 +28,6 @@ namespace Microsoft.Terminal.Remoting
 
         Boolean FoundMatch;
         SummonWindowBehavior SummonBehavior;
-        Windows.Foundation.IReference<UInt64> WindowID;
     }
 
 
@@ -41,11 +40,6 @@ namespace Microsoft.Terminal.Remoting
         void HandleActivatePeasant(WindowActivatedArgs args);
         void SummonWindow(SummonWindowSelectionArgs args);
 
-        void SummonAllWindows();
-        Windows.Foundation.Collections.IMapView<UInt64, String> GetPeasantNames { get; };
-
         event Windows.Foundation.TypedEventHandler<Object, FindTargetWindowArgs> FindTargetWindowRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> ShowTrayIconRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> HideTrayIconRequested;
     };
 }

src/cascadia/Remoting/Peasant.cpp

@@ -20,10 +20,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     {
     }
 
-    // This constructor is intended to be used in unit tests,
-    // but we need to make it public in order to use make_self
-    // in the tests. It's not exposed through the idl though
-    // so it's not _truly_ fully public which should be acceptable.
+    // This is a private constructor to be used in unit tests, where we don't
+    // want each Peasant to necessarily use the current PID.
     Peasant::Peasant(const uint64_t testPID) :
         _ourPID{ testPID }
     {
@@ -33,7 +31,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     {
         _id = id;
     }
-
     uint64_t Peasant::GetID()
     {
         return _id;
@@ -225,36 +222,4 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
                           TraceLoggingKeyword(TIL_KEYWORD_TRACE));
     }
-
-    void Peasant::RequestShowTrayIcon()
-    {
-        try
-        {
-            _ShowTrayIconRequestedHandlers(*this, nullptr);
-        }
-        catch (...)
-        {
-            LOG_CAUGHT_EXCEPTION();
-        }
-        TraceLoggingWrite(g_hRemotingProvider,
-                          "Peasant_RequestShowTrayIcon",
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-    }
-
-    void Peasant::RequestHideTrayIcon()
-    {
-        try
-        {
-            _HideTrayIconRequestedHandlers(*this, nullptr);
-        }
-        catch (...)
-        {
-            LOG_CAUGHT_EXCEPTION();
-        }
-        TraceLoggingWrite(g_hRemotingProvider,
-                          "Peasant_RequestHideTrayIcon",
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-    }
 }

src/cascadia/Remoting/Peasant.h

@@ -28,8 +28,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void RequestIdentifyWindows();
         void DisplayWindowId();
         void RequestRename(const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args);
-        void RequestShowTrayIcon();
-        void RequestHideTrayIcon();
 
         winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs GetLastActivatedArgs();
 
@@ -42,8 +40,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         TYPED_EVENT(DisplayWindowIdRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(RenameRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::RenameRequestArgs);
         TYPED_EVENT(SummonRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior);
-        TYPED_EVENT(ShowTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(HideTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
 
     private:
         Peasant(const uint64_t testPID);

src/cascadia/Remoting/Peasant.idl

@@ -64,8 +64,6 @@ namespace Microsoft.Terminal.Remoting
         void RequestIdentifyWindows(); // Tells us to raise a IdentifyWindowsRequested
         void RequestRename(RenameRequestArgs args); // Tells us to raise a RenameRequested
         void Summon(SummonWindowBehavior behavior);
-        void RequestShowTrayIcon();
-        void RequestHideTrayIcon();
 
         event Windows.Foundation.TypedEventHandler<Object, WindowActivatedArgs> WindowActivated;
         event Windows.Foundation.TypedEventHandler<Object, CommandlineArgs> ExecuteCommandlineRequested;
@@ -73,8 +71,6 @@ namespace Microsoft.Terminal.Remoting
         event Windows.Foundation.TypedEventHandler<Object, Object> DisplayWindowIdRequested;
         event Windows.Foundation.TypedEventHandler<Object, RenameRequestArgs> RenameRequested;
         event Windows.Foundation.TypedEventHandler<Object, SummonWindowBehavior> SummonRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> ShowTrayIconRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> HideTrayIconRequested;
     };
 
     [default_interface] runtimeclass Peasant : IPeasant

src/cascadia/Remoting/SummonWindowSelectionArgs.h

@@ -34,8 +34,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         WINRT_PROPERTY(bool, FoundMatch, false);
         WINRT_PROPERTY(bool, OnCurrentDesktop, false);
         WINRT_PROPERTY(SummonWindowBehavior, SummonBehavior);
-
-        WINRT_PROPERTY(Windows::Foundation::IReference<uint64_t>, WindowID);
     };
 }
 

src/cascadia/Remoting/WindowManager.cpp

@@ -254,8 +254,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // window, and when the current monarch dies.
 
         _monarch.FindTargetWindowRequested({ this, &WindowManager::_raiseFindTargetWindowRequested });
-        _monarch.ShowTrayIconRequested([this](auto&&, auto&&) { _ShowTrayIconRequestedHandlers(*this, nullptr); });
-        _monarch.HideTrayIconRequested([this](auto&&, auto&&) { _HideTrayIconRequestedHandlers(*this, nullptr); });
 
         _BecameMonarchHandlers(*this, nullptr);
     }
@@ -511,57 +509,4 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         _monarch.SummonWindow(args);
     }
 
-    void WindowManager::SummonAllWindows()
-    {
-        if constexpr (Feature_TrayIcon::IsEnabled())
-        {
-            _monarch.SummonAllWindows();
-        }
-    }
-
-    Windows::Foundation::Collections::IMapView<uint64_t, winrt::hstring> WindowManager::GetPeasantNames()
-    {
-        // We should only get called when we're the monarch since the monarch
-        // is the only one that knows about all peasants.
-        return _monarch.GetPeasantNames();
-    }
-
-    // Method Description:
-    // - Ask the monarch to show a tray icon.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    winrt::fire_and_forget WindowManager::RequestShowTrayIcon()
-    {
-        co_await winrt::resume_background();
-        _peasant.RequestShowTrayIcon();
-    }
-
-    // Method Description:
-    // - Ask the monarch to hide its tray icon.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    winrt::fire_and_forget WindowManager::RequestHideTrayIcon()
-    {
-        auto strongThis{ get_strong() };
-        co_await winrt::resume_background();
-        _peasant.RequestHideTrayIcon();
-    }
-
-    bool WindowManager::DoesQuakeWindowExist()
-    {
-        const auto names = GetPeasantNames();
-        for (const auto [id, name] : names)
-        {
-            if (name == QuakeWindowName)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
 }

src/cascadia/Remoting/WindowManager.h

@@ -40,17 +40,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         bool IsMonarch();
         void SummonWindow(const Remoting::SummonWindowSelectionArgs& args);
 
-        void SummonAllWindows();
-        Windows::Foundation::Collections::IMapView<uint64_t, winrt::hstring> GetPeasantNames();
-
-        winrt::fire_and_forget RequestShowTrayIcon();
-        winrt::fire_and_forget RequestHideTrayIcon();
-        bool DoesQuakeWindowExist();
-
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
         TYPED_EVENT(BecameMonarch, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(ShowTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(HideTrayIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
 
     private:
         bool _shouldCreateWindow{ false };

src/cascadia/Remoting/WindowManager.idl

@@ -12,14 +12,7 @@ namespace Microsoft.Terminal.Remoting
         IPeasant CurrentWindow();
         Boolean IsMonarch { get; };
         void SummonWindow(SummonWindowSelectionArgs args);
-        void SummonAllWindows();
-        void RequestShowTrayIcon();
-        void RequestHideTrayIcon();
-        Boolean DoesQuakeWindowExist();
-        Windows.Foundation.Collections.IMapView<UInt64, String> GetPeasantNames();
         event Windows.Foundation.TypedEventHandler<Object, FindTargetWindowArgs> FindTargetWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> BecameMonarch;
-        event Windows.Foundation.TypedEventHandler<Object, Object> ShowTrayIconRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> HideTrayIconRequested;
     };
 }

src/cascadia/TerminalApp/App.xaml

@@ -45,7 +45,7 @@
                                      Color="{ThemeResource SystemErrorTextColor}" />
 
                     <!--  Suppress top padding  -->
-                    <Thickness x:Key="TabViewHeaderPadding">9,0,8,0</Thickness>
+                    <Thickness x:Key="TabViewHeaderPadding">8,0,8,0</Thickness>
 
                     <!--  Remove when implementing WinUI 2.6  -->
                     <Thickness x:Key="FlyoutContentPadding">12</Thickness>
@@ -55,18 +55,12 @@
                             <!--  Define resources for Dark mode here  -->
                             <SolidColorBrush x:Key="TabViewBackground"
                                              Color="#FF333333" />
-
-                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
-                                             Color="#FF333333" />
                         </ResourceDictionary>
 
                         <ResourceDictionary x:Key="Light">
                             <!--  Define resources for Light mode here  -->
                             <SolidColorBrush x:Key="TabViewBackground"
                                              Color="#FFCCCCCC" />
-
-                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
-                                             Color="#FFCCCCCC" />
                         </ResourceDictionary>
 
                     </ResourceDictionary.ThemeDictionaries>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -143,20 +143,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TerminalPage::_HandleMovePane(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
-    {
-        if (args == nullptr)
-        {
-            args.Handled(false);
-        }
-        else if (const auto& realArgs = args.ActionArgs().try_as<MovePaneArgs>())
-        {
-            auto moved = _MovePane(realArgs.TabIndex());
-            args.Handled(moved);
-        }
-    }
-
     void TerminalPage::_HandleSplitPane(const IInspectable& /*sender*/,
                                         const ActionEventArgs& args)
     {
@@ -175,13 +161,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TerminalPage::_HandleToggleSplitOrientation(const IInspectable& /*sender*/,
-                                                     const ActionEventArgs& args)
-    {
-        _ToggleSplitOrientation();
-        args.Handled(true);
-    }
-
     void TerminalPage::_HandleTogglePaneZoom(const IInspectable& /*sender*/,
                                              const ActionEventArgs& args)
     {
@@ -278,12 +257,12 @@ namespace winrt::TerminalApp::implementation
     {
         if (args == nullptr)
         {
-            LOG_IF_FAILED(_OpenNewTab(nullptr));
+            _OpenNewTab(nullptr);
             args.Handled(true);
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<NewTabArgs>())
         {
-            LOG_IF_FAILED(_OpenNewTab(realArgs.TerminalArgs()));
+            _OpenNewTab(realArgs.TerminalArgs());
             args.Handled(true);
         }
     }
@@ -328,29 +307,8 @@ namespace winrt::TerminalApp::implementation
             }
             else
             {
-                // Mark as handled only when the move succeeded (e.g. when there
-                // is a pane to move to), otherwise mark as unhandled so the
-                // keychord can propagate to the terminal (GH#6129)
-                const auto moveSucceeded = _MoveFocus(realArgs.FocusDirection());
-                args.Handled(moveSucceeded);
-            }
-        }
-    }
-
-    void TerminalPage::_HandleSwapPane(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
-    {
-        if (const auto& realArgs = args.ActionArgs().try_as<SwapPaneArgs>())
-        {
-            if (realArgs.Direction() == FocusDirection::None)
-            {
-                // Do nothing
-                args.Handled(false);
-            }
-            else
-            {
-                auto swapped = _SwapPane(realArgs.Direction());
-                args.Handled(swapped);
+                _MoveFocus(realArgs.FocusDirection());
+                args.Handled(true);
             }
         }
     }
@@ -753,10 +711,11 @@ namespace winrt::TerminalApp::implementation
             newTerminalArgs = NewTerminalArgs();
         }
 
-        const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
+        const auto profileGuid{ _settings.GetProfileForArgs(newTerminalArgs) };
+        const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings) };
 
         // Manually fill in the evaluated profile.
-        newTerminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profile.Guid()));
+        newTerminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profileGuid));
         _OpenNewWindow(false, newTerminalArgs);
         actionArgs.Handled(true);
     }
@@ -874,47 +833,4 @@ namespace winrt::TerminalApp::implementation
             }
         }
     }
-
-    void TerminalPage::_HandleHighlightCursor(const IInspectable& /*sender*/,
-                                              const ActionEventArgs& args)
-    {
-        if (const auto termControl{ _GetActiveControl() })
-        {
-            termControl.HighlightCursor();
-            args.Handled(true);
-        }
-    }
-
-    void TerminalPage::_HandleClearBuffer(const IInspectable& /*sender*/,
-                                          const ActionEventArgs& args)
-    {
-        if (args)
-        {
-            if (const auto& realArgs = args.ActionArgs().try_as<ClearBufferArgs>())
-            {
-                if (const auto termControl{ _GetActiveControl() })
-                {
-                    termControl.ClearBuffer(realArgs.Clear());
-                    args.Handled(true);
-                }
-            }
-        }
-    }
-
-    void TerminalPage::_HandleMultipleActions(const IInspectable& /*sender*/,
-                                              const ActionEventArgs& args)
-    {
-        if (args)
-        {
-            if (const auto& realArgs = args.ActionArgs().try_as<MultipleActionsArgs>())
-            {
-                for (const auto& action : realArgs.Actions())
-                {
-                    _actionDispatch->DoAction(action);
-                }
-
-                args.Handled(true);
-            }
-        }
-    }
 }

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -192,8 +192,6 @@ void AppCommandlineArgs::_buildParser()
     _buildSplitPaneParser();
     _buildFocusTabParser();
     _buildMoveFocusParser();
-    _buildMovePaneParser();
-    _buildSwapPaneParser();
     _buildFocusPaneParser();
 }
 
@@ -298,43 +296,6 @@ void AppCommandlineArgs::_buildSplitPaneParser()
     setupSubcommand(_newPaneCommand);
     setupSubcommand(_newPaneShort);
 }
-// Method Description:
-// - Adds the `move-pane` subcommand and related options to the commandline parser.
-// - Additionally adds the `mp` subcommand, which is just a shortened version of `move-pane`
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void AppCommandlineArgs::_buildMovePaneParser()
-{
-    _movePaneCommand = _app.add_subcommand("move-pane", RS_A(L"CmdMovePaneDesc"));
-    _movePaneShort = _app.add_subcommand("mp", RS_A(L"CmdMPDesc"));
-
-    auto setupSubcommand = [this](auto* subcommand) {
-        subcommand->add_option("-t,--tab",
-                               _movePaneTabIndex,
-                               RS_A(L"CmdMovePaneTabArgDesc"));
-
-        // When ParseCommand is called, if this subcommand was provided, this
-        // callback function will be triggered on the same thread. We can be sure
-        // that `this` will still be safe - this function just lets us know this
-        // command was parsed.
-        subcommand->callback([&, this]() {
-            // Build the action from the values we've parsed on the commandline.
-            ActionAndArgs movePaneAction{};
-
-            if (_movePaneTabIndex >= 0)
-            {
-                movePaneAction.Action(ShortcutAction::MovePane);
-                MovePaneArgs args{ static_cast<unsigned int>(_movePaneTabIndex) };
-                movePaneAction.Args(args);
-                _startupActions.push_back(movePaneAction);
-            }
-        });
-    };
-    setupSubcommand(_movePaneCommand);
-    setupSubcommand(_movePaneShort);
-}
 
 // Method Description:
 // - Adds the `focus-tab` subcommand and related options to the commandline parser.
@@ -380,11 +341,6 @@ void AppCommandlineArgs::_buildFocusTabParser()
             else if (_focusNextTab || _focusPrevTab)
             {
                 focusTabAction.Action(_focusNextTab ? ShortcutAction::NextTab : ShortcutAction::PrevTab);
-                // GH#10070 - make sure to not use the MRU order when switching
-                // tabs on the commandline. That wouldn't make any sense!
-                focusTabAction.Args(_focusNextTab ?
-                                        static_cast<IActionArgs>(NextTabArgs(TabSwitcherMode::Disabled)) :
-                                        static_cast<IActionArgs>(PrevTabArgs(TabSwitcherMode::Disabled)));
                 _startupActions.push_back(std::move(focusTabAction));
             }
         });
@@ -394,17 +350,6 @@ void AppCommandlineArgs::_buildFocusTabParser()
     setupSubcommand(_focusTabShort);
 }
 
-static const std::map<std::string, FocusDirection> focusDirectionMap = {
-    { "left", FocusDirection::Left },
-    { "right", FocusDirection::Right },
-    { "up", FocusDirection::Up },
-    { "down", FocusDirection::Down },
-    { "previous", FocusDirection::Previous },
-    { "nextInOrder", FocusDirection::NextInOrder },
-    { "previousInOrder", FocusDirection::PreviousInOrder },
-    { "first", FocusDirection::First },
-};
-
 // Method Description:
 // - Adds the `move-focus` subcommand and related options to the commandline parser.
 // - Additionally adds the `mf` subcommand, which is just a shortened version of `move-focus`
@@ -418,11 +363,18 @@ void AppCommandlineArgs::_buildMoveFocusParser()
     _moveFocusShort = _app.add_subcommand("mf", RS_A(L"CmdMFDesc"));
 
     auto setupSubcommand = [this](auto* subcommand) {
+        std::map<std::string, FocusDirection> map = {
+            { "left", FocusDirection::Left },
+            { "right", FocusDirection::Right },
+            { "up", FocusDirection::Up },
+            { "down", FocusDirection::Down }
+        };
+
         auto* directionOpt = subcommand->add_option("direction",
                                                     _moveFocusDirection,
                                                     RS_A(L"CmdMoveFocusDirectionArgDesc"));
 
-        directionOpt->transform(CLI::CheckedTransformer(focusDirectionMap, CLI::ignore_case));
+        directionOpt->transform(CLI::CheckedTransformer(map, CLI::ignore_case));
         directionOpt->required();
         // When ParseCommand is called, if this subcommand was provided, this
         // callback function will be triggered on the same thread. We can be sure
@@ -446,44 +398,6 @@ void AppCommandlineArgs::_buildMoveFocusParser()
     setupSubcommand(_moveFocusShort);
 }
 
-// Method Description:
-// - Adds the `swap-pane` subcommand and related options to the commandline parser.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void AppCommandlineArgs::_buildSwapPaneParser()
-{
-    _swapPaneCommand = _app.add_subcommand("swap-pane", RS_A(L"CmdSwapPaneDesc"));
-
-    auto setupSubcommand = [this](auto* subcommand) {
-        auto* directionOpt = subcommand->add_option("direction",
-                                                    _swapPaneDirection,
-                                                    RS_A(L"CmdSwapPaneDirectionArgDesc"));
-
-        directionOpt->transform(CLI::CheckedTransformer(focusDirectionMap, CLI::ignore_case));
-        directionOpt->required();
-        // When ParseCommand is called, if this subcommand was provided, this
-        // callback function will be triggered on the same thread. We can be sure
-        // that `this` will still be safe - this function just lets us know this
-        // command was parsed.
-        subcommand->callback([&, this]() {
-            if (_swapPaneDirection != FocusDirection::None)
-            {
-                SwapPaneArgs args{ _swapPaneDirection };
-
-                ActionAndArgs actionAndArgs{};
-                actionAndArgs.Action(ShortcutAction::SwapPane);
-                actionAndArgs.Args(args);
-
-                _startupActions.push_back(std::move(actionAndArgs));
-            }
-        });
-    };
-
-    setupSubcommand(_swapPaneCommand);
-}
-
 // Method Description:
 // - Adds the `focus-pane` subcommand and related options to the commandline parser.
 // - Additionally adds the `fp` subcommand, which is just a shortened version of `focus-pane`
@@ -660,9 +574,6 @@ bool AppCommandlineArgs::_noCommandsProvided()
              *_focusTabShort ||
              *_moveFocusCommand ||
              *_moveFocusShort ||
-             *_movePaneCommand ||
-             *_movePaneShort ||
-             *_swapPaneCommand ||
              *_focusPaneCommand ||
              *_focusPaneShort ||
              *_newPaneShort.subcommand ||
@@ -691,13 +602,11 @@ void AppCommandlineArgs::_resetStateToDefault()
     _splitPaneSize = 0.5f;
     _splitDuplicate = false;
 
-    _movePaneTabIndex = -1;
     _focusTabIndex = -1;
     _focusNextTab = false;
     _focusPrevTab = false;
 
     _moveFocusDirection = FocusDirection::None;
-    _swapPaneDirection = FocusDirection::None;
 
     _focusPaneTarget = -1;
 

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -82,9 +82,6 @@ private:
     CLI::App* _focusTabShort;
     CLI::App* _moveFocusCommand;
     CLI::App* _moveFocusShort;
-    CLI::App* _movePaneCommand;
-    CLI::App* _movePaneShort;
-    CLI::App* _swapPaneCommand;
     CLI::App* _focusPaneCommand;
     CLI::App* _focusPaneShort;
 
@@ -98,7 +95,6 @@ private:
     bool _suppressApplicationTitle{ false };
 
     winrt::Microsoft::Terminal::Settings::Model::FocusDirection _moveFocusDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };
-    winrt::Microsoft::Terminal::Settings::Model::FocusDirection _swapPaneDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };
 
     // _commandline will contain the command line with which we'll be spawning a new terminal
     std::vector<std::string> _commandline;
@@ -108,7 +104,6 @@ private:
     bool _splitDuplicate{ false };
     float _splitPaneSize{ 0.5f };
 
-    int _movePaneTabIndex{ -1 };
     int _focusTabIndex{ -1 };
     bool _focusNextTab{ false };
     bool _focusPrevTab{ false };
@@ -133,8 +128,6 @@ private:
     void _buildSplitPaneParser();
     void _buildFocusTabParser();
     void _buildMoveFocusParser();
-    void _buildMovePaneParser();
-    void _buildSwapPaneParser();
     void _buildFocusPaneParser();
     bool _noCommandsProvided();
     void _resetStateToDefault();

src/cascadia/TerminalApp/AppKeyBindings.cpp

@@ -21,11 +21,6 @@ namespace winrt::TerminalApp::implementation
         return false;
     }
 
-    bool AppKeyBindings::IsKeyChordExplicitlyUnbound(const KeyChord& kc)
-    {
-        return _actionMap.IsKeyChordExplicitlyUnbound(kc);
-    }
-
     void AppKeyBindings::SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch)
     {
         _dispatch = dispatch;

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -20,7 +20,6 @@ namespace winrt::TerminalApp::implementation
         AppKeyBindings() = default;
 
         bool TryKeyChord(winrt::Microsoft::Terminal::Control::KeyChord const& kc);
-        bool IsKeyChordExplicitlyUnbound(winrt::Microsoft::Terminal::Control::KeyChord const& kc);
 
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
         void SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap);

src/cascadia/TerminalApp/AppLogic.cpp

@@ -203,16 +203,12 @@ namespace winrt::TerminalApp::implementation
         _isElevated = _isUserAdmin();
         _root = winrt::make_self<TerminalPage>();
 
-        _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(winrt::Windows::System::DispatcherQueue::GetForCurrentThread(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
+        _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(_root->Dispatcher(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
             if (auto self{ weakSelf.get() })
             {
                 self->_ReloadSettings();
             }
         });
-
-        _languageProfileNotifier = winrt::make_self<LanguageProfileNotifier>([this]() {
-            _reloadSettings->Run();
-        });
     }
 
     // Method Description:
@@ -1129,11 +1125,28 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    winrt::TerminalApp::TaskbarState AppLogic::TaskbarState()
+    // Method Description:
+    // - Gets the taskbar state value from the last active control
+    // Return Value:
+    // - The taskbar state of the last active control
+    size_t AppLogic::GetLastActiveControlTaskbarState()
     {
         if (_root)
         {
-            return _root->TaskbarState();
+            return _root->GetLastActiveControlTaskbarState();
+        }
+        return {};
+    }
+
+    // Method Description:
+    // - Gets the taskbar progress value from the last active control
+    // Return Value:
+    // - The taskbar progress of the last active control
+    size_t AppLogic::GetLastActiveControlTaskbarProgress()
+    {
+        if (_root)
+        {
+            return _root->GetLastActiveControlTaskbarProgress();
         }
         return {};
     }
@@ -1216,11 +1229,6 @@ namespace winrt::TerminalApp::implementation
             auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(appArgs.GetStartupActions()));
 
             _root->ProcessStartupActions(actions, false, cwd);
-
-            if (appArgs.IsHandoffListener())
-            {
-                _root->SetInboundListener(true);
-            }
         }
         // Return the result of parsing with commandline, though it may or may not be used.
         return result;
@@ -1327,8 +1335,7 @@ namespace winrt::TerminalApp::implementation
                 {
                     // The string they provided wasn't an int, it wasn't "new"
                     // or "last", so whatever it is, that's the name they get.
-                    winrt::hstring winrtName{ til::u8u16(parsedTarget) };
-                    return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseName, winrtName);
+                    return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseName, til::u8u16(parsedTarget));
                 }
             }
         }
@@ -1442,39 +1449,4 @@ namespace winrt::TerminalApp::implementation
         return _root->IsQuakeWindow();
     }
 
-    bool AppLogic::GetMinimizeToTray()
-    {
-        if constexpr (Feature_TrayIcon::IsEnabled())
-        {
-            if (!_loadedInitialSettings)
-            {
-                // Load settings if we haven't already
-                LoadSettings();
-            }
-
-            return _settings.GlobalSettings().MinimizeToTray();
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    bool AppLogic::GetAlwaysShowTrayIcon()
-    {
-        if constexpr (Feature_TrayIcon::IsEnabled())
-        {
-            if (!_loadedInitialSettings)
-            {
-                // Load settings if we haven't already
-                LoadSettings();
-            }
-
-            return _settings.GlobalSettings().AlwaysShowTrayIcon();
-        }
-        else
-        {
-            return false;
-        }
-    }
 }

src/cascadia/TerminalApp/AppLogic.h

@@ -5,9 +5,8 @@
 
 #include "AppLogic.g.h"
 #include "FindTargetWindowResult.g.h"
-#include "Jumplist.h"
-#include "LanguageProfileNotifier.h"
 #include "TerminalPage.h"
+#include "Jumplist.h"
 
 #include <inc/cppwinrt_utils.h>
 #include <ThrottledFunc.h>
@@ -90,10 +89,8 @@ namespace winrt::TerminalApp::implementation
 
         void WindowCloseButtonClicked();
 
-        winrt::TerminalApp::TaskbarState TaskbarState();
-
-        bool GetMinimizeToTray();
-        bool GetAlwaysShowTrayIcon();
+        size_t GetLastActiveControlTaskbarState();
+        size_t GetLastActiveControlTaskbarProgress();
 
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> ShowDialog(winrt::Windows::UI::Xaml::Controls::ContentDialog dialog);
 
@@ -113,8 +110,12 @@ namespace winrt::TerminalApp::implementation
         // ALSO: If you add any UIElements as roots here, make sure they're
         // updated in _ApplyTheme. The root currently is _root.
         winrt::com_ptr<TerminalPage> _root{ nullptr };
+
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
 
+        wil::unique_folder_change_reader_nothrow _reader;
+        std::shared_ptr<ThrottledFuncTrailing<>> _reloadSettings;
+        til::throttled_func_trailing<> _reloadState;
         winrt::hstring _settingsLoadExceptionText;
         HRESULT _settingsLoadedResult = S_OK;
         bool _loadedInitialSettings = false;
@@ -123,15 +124,6 @@ namespace winrt::TerminalApp::implementation
 
         ::TerminalApp::AppCommandlineArgs _appArgs;
         ::TerminalApp::AppCommandlineArgs _settingsAppArgs;
-
-        std::shared_ptr<ThrottledFuncTrailing<>> _reloadSettings;
-        til::throttled_func_trailing<> _reloadState;
-
-        // These fields invoke _reloadSettings and must be destroyed before _reloadSettings.
-        // (C++ destroys members in reverse-declaration-order.)
-        winrt::com_ptr<LanguageProfileNotifier> _languageProfileNotifier;
-        wil::unique_folder_change_reader_nothrow _reader;
-
         static TerminalApp::FindTargetWindowResult _doFindTargetWindow(winrt::array_view<const hstring> args,
                                                                        const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior);
 

src/cascadia/TerminalApp/AppLogic.idl

@@ -68,10 +68,8 @@ namespace TerminalApp
         void TitlebarClicked();
         void WindowCloseButtonClicked();
 
-        TaskbarState TaskbarState{ get; };
-
-        Boolean GetMinimizeToTray();
-        Boolean GetAlwaysShowTrayIcon();
+        UInt64 GetLastActiveControlTaskbarState();
+        UInt64 GetLastActiveControlTaskbarProgress();
 
         FindTargetWindowResult FindTargetWindow(String[] args);
 

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -36,6 +36,7 @@ namespace winrt::TerminalApp::implementation
         _allCommands = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
         _tabActions = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
         _mruTabActions = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
+        _commandLineHistory = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
 
         _switchToMode(CommandPaletteMode::ActionMode);
 
@@ -244,28 +245,15 @@ namespace winrt::TerminalApp::implementation
                 _PreviewActionHandlers(*this, actionPaletteItem.Command());
             }
         }
-        else if (_currentMode == CommandPaletteMode::CommandlineMode)
-        {
-            if (filteredCommand)
-            {
-                SearchBoxPlaceholderText(filteredCommand.Item().Name());
-            }
-            else
-            {
-                SearchBoxPlaceholderText(RS_(L"CmdPalCommandlinePrompt"));
-            }
-        }
     }
 
     void CommandPalette::_previewKeyDownHandler(IInspectable const& /*sender*/,
                                                 Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
     {
-        const auto key = e.OriginalKey();
-        const auto scanCode = e.KeyStatus().ScanCode;
-        const auto coreWindow = CoreWindow::GetForCurrentThread();
-        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);
+        auto key = e.OriginalKey();
+        auto const ctrlDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
+        auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
+        auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
 
         // Some keypresses such as Tab, Return, Esc, and Arrow Keys are ignored by controls because
         // they're not considered input key presses. While they don't raise KeyDown events,
@@ -276,7 +264,7 @@ namespace winrt::TerminalApp::implementation
         // a really widely used keyboard navigation key.
         if (_currentMode == CommandPaletteMode::TabSwitchMode && _actionMap)
         {
-            winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, false, static_cast<int32_t>(key), static_cast<int32_t>(scanCode) };
+            winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast<int32_t>(key) };
             if (const auto cmd{ _actionMap.GetActionByKeyChord(kc) })
             {
                 if (cmd.ActionAndArgs().Action() == ShortcutAction::PrevTab)
@@ -375,17 +363,6 @@ namespace winrt::TerminalApp::implementation
             _searchBox().PasteFromClipboard();
             e.Handled(true);
         }
-        else if (key == VirtualKey::Right && _currentMode == CommandPaletteMode::CommandlineMode)
-        {
-            if (const auto command{ _filteredActionsView().SelectedItem().try_as<winrt::TerminalApp::FilteredCommand>() })
-            {
-                _searchBox().Text(command.Item().Name());
-                _searchBox().Select(_searchBox().Text().size(), 0);
-                _searchBox().Focus(FocusState::Programmatic);
-                _filteredActionsView().SelectedIndex(-1);
-                e.Handled(true);
-            }
-        }
     }
 
     // Method Description:
@@ -425,10 +402,9 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::_anchorKeyUpHandler()
     {
-        const auto coreWindow = CoreWindow::GetForCurrentThread();
-        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);
+        auto const ctrlDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
+        auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
+        auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
 
         if (!ctrlDown && !altDown && !shiftDown)
         {
@@ -608,7 +584,7 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSwitchMode:
             return _tabSwitcherMode == TabSwitcherMode::MostRecentlyUsed ? _mruTabActions : _tabActions;
         case CommandPaletteMode::CommandlineMode:
-            return _loadRecentCommands();
+            return _commandLineHistory;
         default:
             return _allCommands;
         }
@@ -741,10 +717,14 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::_dispatchCommandline(winrt::TerminalApp::FilteredCommand const& command)
     {
-        const auto filteredCommand = command ? command : _buildCommandLineCommand(winrt::hstring(_getTrimmedInput()));
+        const auto filteredCommand = command ? command : _buildCommandLineCommand(_getTrimmedInput());
         if (filteredCommand.has_value())
         {
-            _updateRecentCommands(filteredCommand.value().Item().Name());
+            if (_commandLineHistory.Size() == CommandLineHistoryLength)
+            {
+                _commandLineHistory.RemoveAtEnd();
+            }
+            _commandLineHistory.InsertAt(0, filteredCommand.value());
 
             TraceLoggingWrite(
                 g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
@@ -761,14 +741,15 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    std::optional<TerminalApp::FilteredCommand> CommandPalette::_buildCommandLineCommand(const hstring& commandLine)
+    std::optional<winrt::TerminalApp::FilteredCommand> CommandPalette::_buildCommandLineCommand(std::wstring const& commandLine)
     {
         if (commandLine.empty())
         {
             return std::nullopt;
         }
 
-        auto commandLinePaletteItem{ winrt::make<CommandLinePaletteItem>(commandLine) };
+        winrt::hstring cl{ commandLine };
+        auto commandLinePaletteItem{ winrt::make<winrt::TerminalApp::implementation::CommandLinePaletteItem>(cl) };
         return winrt::make<FilteredCommand>(commandLinePaletteItem);
     }
 
@@ -1233,81 +1214,4 @@ namespace winrt::TerminalApp::implementation
             itemContainer.DataContext(args.Item());
         }
     }
-
-    // Method Description:
-    // - Reads the list of recent commands from the persistent application state
-    // Return Value:
-    // - The list of FilteredCommand representing the ones stored in the state
-    IVector<TerminalApp::FilteredCommand> CommandPalette::_loadRecentCommands()
-    {
-        const auto recentCommands = ApplicationState::SharedInstance().RecentCommands();
-        // If this is the first time we've opened the commandline mode and
-        // there aren't any recent commands, then just return an empty vector.
-        if (!recentCommands)
-        {
-            return single_threaded_vector<TerminalApp::FilteredCommand>();
-        }
-
-        std::vector<TerminalApp::FilteredCommand> parsedCommands;
-        parsedCommands.reserve(std::min(recentCommands.Size(), CommandLineHistoryLength));
-
-        for (const auto& c : recentCommands)
-        {
-            if (parsedCommands.size() >= CommandLineHistoryLength)
-            {
-                // Don't load more than CommandLineHistoryLength commands
-                break;
-            }
-
-            if (const auto parsedCommand = _buildCommandLineCommand(c))
-            {
-                parsedCommands.push_back(*parsedCommand);
-            }
-        }
-        return single_threaded_vector(std::move(parsedCommands));
-    }
-
-    // Method Description:
-    // - Update recent commands by putting the provided command as most recent.
-    // Upon race condition might override an update made by another window.
-    // Return Value:
-    // - <none>
-    void CommandPalette::_updateRecentCommands(const hstring& command)
-    {
-        const auto recentCommands = ApplicationState::SharedInstance().RecentCommands();
-        // If this is the first time we've opened the commandline mode and
-        // there aren't any recent commands, then just store the new command.
-        if (!recentCommands)
-        {
-            ApplicationState::SharedInstance().RecentCommands(single_threaded_vector(std::move(std::vector{ command })));
-            return;
-        }
-
-        const auto numNewRecentCommands = std::min(recentCommands.Size() + 1, CommandLineHistoryLength);
-
-        std::vector<hstring> newRecentCommands;
-        newRecentCommands.reserve(numNewRecentCommands);
-
-        std::unordered_set<hstring> uniqueCommands;
-        uniqueCommands.reserve(numNewRecentCommands);
-
-        newRecentCommands.push_back(command);
-        uniqueCommands.insert(command);
-
-        for (const auto& c : recentCommands)
-        {
-            if (newRecentCommands.size() >= CommandLineHistoryLength)
-            {
-                // Don't store more than CommandLineHistoryLength commands
-                break;
-            }
-
-            if (uniqueCommands.emplace(c).second)
-            {
-                newRecentCommands.push_back(c);
-            }
-        }
-
-        ApplicationState::SharedInstance().RecentCommands(single_threaded_vector(std::move(newRecentCommands)));
-    }
 }

src/cascadia/TerminalApp/CommandPalette.h

@@ -123,16 +123,15 @@ namespace winrt::TerminalApp::implementation
         void _dispatchCommand(winrt::TerminalApp::FilteredCommand const& command);
         void _dispatchCommandline(winrt::TerminalApp::FilteredCommand const& command);
         void _switchToTab(winrt::TerminalApp::FilteredCommand const& command);
-        static std::optional<winrt::TerminalApp::FilteredCommand> _buildCommandLineCommand(const winrt::hstring& commandLine);
+        std::optional<winrt::TerminalApp::FilteredCommand> _buildCommandLineCommand(std::wstring const& commandLine);
 
         void _dismissPalette();
 
         void _scrollToIndex(uint32_t index);
         uint32_t _getNumVisibleItems();
 
-        static constexpr uint32_t CommandLineHistoryLength = 20;
-        static Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _loadRecentCommands();
-        static void _updateRecentCommands(const winrt::hstring& command);
+        static constexpr int CommandLineHistoryLength = 10;
+        Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _commandLineHistory{ nullptr };
         ::TerminalApp::AppCommandlineArgs _appArgs;
 
         void _choosingItemContainer(Windows::UI::Xaml::Controls::ListViewBase const& sender, Windows::UI::Xaml::Controls::ChoosingItemContainerEventArgs const& args);

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -19,7 +19,6 @@ namespace winrt::Microsoft::TerminalApp::implementation
             _wrappedConnection{ std::move(wrappedConnection) }
         {
         }
-        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {}
         ~DebugInputTapConnection() = default;
         void Start()
         {

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -13,7 +13,6 @@ namespace winrt::Microsoft::TerminalApp::implementation
     {
     public:
         explicit DebugTapConnection(Microsoft::Terminal::TerminalConnection::ITerminalConnection wrappedConnection);
-        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
         ~DebugTapConnection();
         void Start();
         void WriteInput(hstring const& data);

src/cascadia/TerminalApp/LanguageProfileNotifier.cpp

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "LanguageProfileNotifier.h"
-
-using namespace winrt::TerminalApp::implementation;
-
-LanguageProfileNotifier::LanguageProfileNotifier(std::function<void()>&& callback) :
-    _callback{ std::move(callback) },
-    _currentKeyboardLayout{ GetKeyboardLayout(0) }
-{
-    const auto manager = wil::CoCreateInstance<ITfThreadMgr>(CLSID_TF_ThreadMgr);
-    _source = manager.query<ITfSource>();
-    if (FAILED(_source->AdviseSink(IID_ITfInputProcessorProfileActivationSink, static_cast<ITfInputProcessorProfileActivationSink*>(this), &_cookie)))
-    {
-        _cookie = TF_INVALID_COOKIE;
-        THROW_LAST_ERROR();
-    }
-}
-
-LanguageProfileNotifier::~LanguageProfileNotifier()
-{
-    if (_cookie != TF_INVALID_COOKIE)
-    {
-        _source->UnadviseSink(_cookie);
-    }
-}
-
-STDMETHODIMP LanguageProfileNotifier::OnActivated(DWORD /*dwProfileType*/, LANGID /*langid*/, REFCLSID /*clsid*/, REFGUID /*catid*/, REFGUID /*guidProfile*/, HKL hkl, DWORD /*dwFlags*/)
-{
-    if (hkl && hkl != _currentKeyboardLayout)
-    {
-        _currentKeyboardLayout = hkl;
-        try
-        {
-            _callback();
-        }
-        CATCH_RETURN();
-    }
-    return S_OK;
-}

src/cascadia/TerminalApp/LanguageProfileNotifier.h

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-namespace winrt::TerminalApp::implementation
-{
-    class LanguageProfileNotifier : public winrt::implements<LanguageProfileNotifier, ITfInputProcessorProfileActivationSink>
-    {
-    public:
-        explicit LanguageProfileNotifier(std::function<void()>&& callback);
-        ~LanguageProfileNotifier();
-        STDMETHODIMP OnActivated(DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid, REFGUID guidProfile, HKL hkl, DWORD dwFlags);
-
-    private:
-        std::function<void()> _callback;
-        wil::com_ptr<ITfSource> _source;
-        DWORD _cookie = TF_INVALID_COOKIE;
-        HKL _currentKeyboardLayout;
-    };
-}

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -9,7 +9,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            d:DesignHeight="40"
+            d:DesignHeight="36"
             d:DesignWidth="400"
             Background="Transparent"
             Orientation="Horizontal"
@@ -124,9 +124,8 @@
                 tabs will be flush with the top of the window. See GH#2541 for
                 details.
             -->
-            <x:Double x:Key="CaptionButtonHeightWindowed">40.0</x:Double>
-            <!--  32 + 1 to compensate for GH#10746  -->
-            <x:Double x:Key="CaptionButtonHeightMaximized">33.0</x:Double>
+            <x:Double x:Key="CaptionButtonHeightWindowed">36.0</x:Double>
+            <x:Double x:Key="CaptionButtonHeightMaximized">32.0</x:Double>
 
             <Style x:Key="CaptionButton"
                    TargetType="Button">

src/cascadia/TerminalApp/Pane.h

@@ -21,18 +21,6 @@
 #pragma once
 
 #include "../../cascadia/inc/cppwinrt_utils.h"
-#include "TaskbarState.h"
-
-// fwdecl unittest classes
-namespace TerminalAppLocalTests
-{
-    class TabTests;
-};
-
-namespace winrt::TerminalApp::implementation
-{
-    struct TerminalTab;
-}
 
 enum class Borders : int
 {
@@ -47,21 +35,13 @@ DEFINE_ENUM_FLAG_OPERATORS(Borders);
 class Pane : public std::enable_shared_from_this<Pane>
 {
 public:
-    Pane(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
+    Pane(const GUID& profile,
          const winrt::Microsoft::Terminal::Control::TermControl& control,
          const bool lastFocused = false);
 
     std::shared_ptr<Pane> GetActivePane();
     winrt::Microsoft::Terminal::Control::TermControl GetTerminalControl();
-    winrt::Microsoft::Terminal::Settings::Model::Profile GetFocusedProfile();
-
-    // Method Description:
-    // - If this is a leaf pane, return its profile.
-    // - If this is a branch/root pane, return nullptr.
-    winrt::Microsoft::Terminal::Settings::Model::Profile GetProfile() const
-    {
-        return _profile;
-    }
+    std::optional<GUID> GetFocusedProfile();
 
     winrt::Windows::UI::Xaml::Controls::Grid GetRootElement();
 
@@ -71,23 +51,16 @@ public:
     void SetActive();
 
     void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& settings,
-                        const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
+                        const GUID& profile);
     void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
     void Relayout();
     bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
-    std::shared_ptr<Pane> NavigateDirection(const std::shared_ptr<Pane> sourcePane,
-                                            const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction,
-                                            const std::vector<uint32_t>& mruPanes);
-    bool SwapPanes(std::shared_ptr<Pane> first, std::shared_ptr<Pane> second);
-
-    std::shared_ptr<Pane> NextPane(const std::shared_ptr<Pane> pane);
-    std::shared_ptr<Pane> PreviousPane(const std::shared_ptr<Pane> pane);
+    bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
 
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
                                                                   const float splitSize,
-                                                                  const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
+                                                                  const GUID& profile,
                                                                   const winrt::Microsoft::Terminal::Control::TermControl& control);
-    bool ToggleSplitOrientation();
     float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
     std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target,
                                                                                                  const winrt::Windows::Foundation::Size parentSize) const;
@@ -98,10 +71,6 @@ public:
     void Shutdown();
     void Close();
 
-    std::shared_ptr<Pane> AttachPane(std::shared_ptr<Pane> pane,
-                                     winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
-    std::shared_ptr<Pane> DetachPane(std::shared_ptr<Pane> pane);
-
     int GetLeafPaneCount() const noexcept;
 
     void Maximize(std::shared_ptr<Pane> zoomedPane);
@@ -110,47 +79,15 @@ public:
     std::optional<uint32_t> Id() noexcept;
     void Id(uint32_t id) noexcept;
     bool FocusPane(const uint32_t id);
-    bool FocusPane(const std::shared_ptr<Pane> pane);
-    std::shared_ptr<Pane> FindPane(const uint32_t id);
 
     bool ContainsReadOnly() const;
 
-    // Method Description:
-    // - A helper method for ad-hoc recursion on a pane tree. Walks the pane
-    //   tree, calling a predicate on each pane in a depth-first pattern.
-    // - If the predicate returns true, recursion is stopped early.
-    // Arguments:
-    // - f: The function to be applied to each pane.
-    // Return Value:
-    // - true if the predicate returned true on any pane.
-    template<typename F>
-    //requires std::predicate<F, std::shared_ptr<Pane>>
-    bool WalkTree(F f)
-    {
-        if (f(shared_from_this()))
-        {
-            return true;
-        }
-
-        if (!_IsLeaf())
-        {
-            return _firstChild->WalkTree(f) || _secondChild->WalkTree(f);
-        }
-
-        return false;
-    }
-
-    void CollectTaskbarStates(std::vector<winrt::TerminalApp::TaskbarState>& states);
-
     WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
     DECLARE_EVENT(GotFocus, _GotFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
     DECLARE_EVENT(LostFocus, _LostFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
     DECLARE_EVENT(PaneRaiseBell, _PaneRaiseBellHandlers, winrt::Windows::Foundation::EventHandler<bool>);
-    DECLARE_EVENT(Detached, _PaneDetachedHandlers, winrt::delegate<std::shared_ptr<Pane>>);
 
 private:
-    struct PanePoint;
-    struct PaneNeighborSearch;
     struct SnapSizeResult;
     struct SnapChildrenSizeResult;
     struct LayoutSizeNode;
@@ -170,7 +107,7 @@ private:
     std::optional<uint32_t> _id;
 
     bool _lastActive{ false };
-    winrt::Microsoft::Terminal::Settings::Model::Profile _profile{ nullptr };
+    std::optional<GUID> _profile{ std::nullopt };
     winrt::event_token _connectionStateChangedToken{ 0 };
     winrt::event_token _firstClosedToken{ 0 };
     winrt::event_token _secondClosedToken{ 0 };
@@ -191,28 +128,18 @@ private:
 
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> _Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
                                                                    const float splitSize,
-                                                                   std::shared_ptr<Pane> newPane);
+                                                                   const GUID& profile,
+                                                                   const winrt::Microsoft::Terminal::Control::TermControl& control);
 
     void _CreateRowColDefinitions();
     void _ApplySplitDefinitions();
     void _SetupEntranceAnimation();
     void _UpdateBorders();
-    Borders _GetCommonBorders();
 
     bool _Resize(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+    bool _NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
 
-    std::shared_ptr<Pane> _FindParentOfPane(const std::shared_ptr<Pane> pane);
-    std::pair<PanePoint, PanePoint> _GetOffsetsForPane(const PanePoint parentOffset) const;
-    bool _IsAdjacent(const PanePoint firstOffset, const PanePoint secondOffset, const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction) const;
-    PaneNeighborSearch _FindNeighborForPane(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction,
-                                            PaneNeighborSearch searchResult,
-                                            const bool focusIsSecondSide,
-                                            const PanePoint offset);
-    PaneNeighborSearch _FindPaneAndNeighbor(const std::shared_ptr<Pane> sourcePane,
-                                            const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction,
-                                            const PanePoint offset);
-
-    void _CloseChild(const bool closeFirst, const bool isDetaching);
+    void _CloseChild(const bool closeFirst);
     winrt::fire_and_forget _CloseChildRoutine(const bool closeFirst);
 
     void _FocusFirstChild();
@@ -228,6 +155,7 @@ private:
     SnapChildrenSizeResult _CalcSnappedChildrenSizes(const bool widthOrHeight, const float fullSize) const;
     SnapSizeResult _CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
     void _AdvanceSnappedDimension(const bool widthOrHeight, LayoutSizeNode& sizeNode) const;
+
     winrt::Windows::Foundation::Size _GetMinSize() const;
     LayoutSizeNode _CreateMinSizeTree(const bool widthOrHeight) const;
     float _ClampSplitPosition(const bool widthOrHeight, const float requestedValue, const float totalSize) const;
@@ -272,21 +200,6 @@ private:
 
     static void _SetupResources();
 
-    struct PanePoint
-    {
-        float x;
-        float y;
-        float scaleX;
-        float scaleY;
-    };
-
-    struct PaneNeighborSearch
-    {
-        std::shared_ptr<Pane> source;
-        std::shared_ptr<Pane> neighbor;
-        PanePoint sourceOffset;
-    };
-
     struct SnapSizeResult
     {
         float lower;
@@ -323,7 +236,4 @@ private:
     private:
         void _AssignChildNode(std::unique_ptr<LayoutSizeNode>& nodeField, const LayoutSizeNode* const newNode);
     };
-
-    friend struct winrt::TerminalApp::implementation::TerminalTab;
-    friend class ::TerminalAppLocalTests::TabTests;
 };

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

@@ -282,16 +282,6 @@
   <data name="CmdFocusTabTargetArgDesc" xml:space="preserve">
     <value>Move focus the tab at the given index</value>
   </data>
-  <data name="CmdMovePaneTabArgDesc" xml:space="preserve">
-    <value>Move focused pane to the tab at the given index</value>
-  </data>
-  <data name="CmdMovePaneDesc" xml:space="preserve">
-    <value>Move focused pane to another tab</value>
-  </data>
-  <data name="CmdMPDesc" xml:space="preserve">
-    <value>An alias for the "move-pane" subcommand.</value>
-    <comment>{Locked="\"move-pane\""}</comment>
-  </data>
   <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
     <value>Specify the size as a percentage of the parent pane. Valid values are between (0,1), exclusive.</value>
   </data>
@@ -369,12 +359,6 @@
   <data name="CmdMoveFocusDirectionArgDesc" xml:space="preserve">
     <value>The direction to move focus in</value>
   </data>
-  <data name="CmdSwapPaneDesc" xml:space="preserve">
-    <value>Swap the focused pane with the adjacent pane in the specified direction</value>
-  </data>
-  <data name="CmdSwapPaneDirectionArgDesc" xml:space="preserve">
-    <value>The direction to move the focused pane in</value>
-  </data>
   <data name="CmdFocusDesc" xml:space="preserve">
     <value>Launch the window in focus mode</value>
   </data>
@@ -653,14 +637,6 @@
   <data name="CommandPaletteMenuItem" xml:space="preserve">
     <value>Command Palette</value>
   </data>
-  <data name="TrayIconFocusTerminal" xml:space="preserve">
-    <value>Focus Terminal</value>
-    <comment>This is displayed as a label for the context menu item that focuses the terminal.</comment>
-  </data>
-  <data name="TrayIconWindowSubmenu" xml:space="preserve">
-    <value>Windows</value>
-    <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
-  </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
     <value>Open in Windows Terminal (Dev)</value>
     <comment>{Locked} The dev build will never be seen in multiple languages</comment>
@@ -673,28 +649,4 @@
     <value>Open in Windows Terminal</value>
     <comment>{Locked="Windows"} This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal</comment>
   </data>
-  <data name="DropPathTabRun.Text" xml:space="preserve">
-    <value>Open a new tab in given starting directory</value>
-  </data>
-  <data name="SplitTabText" xml:space="preserve">
-    <value>Split Tab</value>
-  </data>
-  <data name="DropPathTabNewWindow.Text" xml:space="preserve">
-    <value>Open a new window with given starting directory</value>
-  </data>
-  <data name="DropPathTabSplit.Text" xml:space="preserve">
-    <value>Split the window and start in given directory</value>
-  </data>
-  <data name="ExportTabText" xml:space="preserve">
-    <value>Export Text</value>
-  </data>
-  <data name="ExportFailure" xml:space="preserve">
-    <value>Failed to export terminal content</value>
-  </data>
-  <data name="ExportSuccess" xml:space="preserve">
-    <value>Successfully exported terminal content</value>
-  </data>
-  <data name="PlainText" xml:space="preserve">
-    <value>Plain Text</value>
-  </data>
 </root>

src/cascadia/TerminalApp/TabManagement.cpp

@@ -28,9 +28,6 @@ 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::Windows::Storage;
-using namespace winrt::Windows::Storage::Pickers;
-using namespace winrt::Windows::Storage::Provider;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
@@ -59,13 +56,13 @@ namespace winrt::TerminalApp::implementation
     // - existingConnection: An optional connection that is already established to a PTY
     //   for this tab to host instead of creating one.
     //   If not defined, the tab will create the connection.
-    HRESULT TerminalPage::_OpenNewTab(const NewTerminalArgs& newTerminalArgs, winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection existingConnection)
+    void TerminalPage::_OpenNewTab(const NewTerminalArgs& newTerminalArgs, winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection existingConnection)
     try
     {
-        const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
+        const auto profileGuid{ _settings.GetProfileForArgs(newTerminalArgs) };
         const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings) };
 
-        _CreateNewTabWithProfileAndSettings(profile, settings, existingConnection);
+        _CreateNewTabFromSettings(profileGuid, settings, existingConnection);
 
         const uint32_t tabCount = _tabs.Size();
         const bool usedManualProfile = (newTerminalArgs != nullptr) &&
@@ -73,7 +70,7 @@ namespace winrt::TerminalApp::implementation
                                         newTerminalArgs.Profile().empty());
 
         // Lookup the name of the color scheme used by this profile.
-        const auto scheme = _settings.GetColorSchemeForProfile(profile);
+        const auto scheme = _settings.GetColorSchemeForProfile(profileGuid);
         // If they explicitly specified `null` as the scheme (indicating _no_ scheme), log
         // that as the empty string.
         const auto schemeName = scheme ? scheme.Name() : L"\0";
@@ -85,25 +82,48 @@ namespace winrt::TerminalApp::implementation
             TraceLoggingUInt32(1u, "EventVer", "Version of this event"),
             TraceLoggingUInt32(tabCount, "TabCount", "Count of tabs currently opened in TerminalApp"),
             TraceLoggingBool(usedManualProfile, "ProfileSpecified", "Whether the new tab specified a profile explicitly"),
-            TraceLoggingGuid(profile.Guid(), "ProfileGuid", "The GUID of the profile spawned in the new tab"),
+            TraceLoggingGuid(profileGuid, "ProfileGuid", "The GUID of the profile spawned in the new tab"),
             TraceLoggingBool(settings.DefaultSettings().UseAcrylic(), "UseAcrylic", "The acrylic preference from the settings"),
             TraceLoggingFloat64(settings.DefaultSettings().TintOpacity(), "TintOpacity", "Opacity preference from the settings"),
             TraceLoggingWideString(settings.DefaultSettings().FontFace().c_str(), "FontFace", "Font face chosen in the settings"),
             TraceLoggingWideString(schemeName.data(), "SchemeName", "Color scheme set in the settings"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
-
-        return S_OK;
     }
-    CATCH_RETURN();
+    CATCH_LOG();
 
     // Method Description:
-    // - Sets up state, event handlers, etc on a tab object that was just made.
+    // - Creates a new tab with the given settings. If the tab bar is not being
+    //      currently displayed, it will be shown.
     // Arguments:
-    // - newTabImpl: the uninitialized tab.
-    void TerminalPage::_InitializeTab(winrt::com_ptr<TerminalTab> newTabImpl)
+    // - profileGuid: ID to use to lookup profile settings for this connection
+    // - settings: the TerminalSettings object to use to create the TerminalControl with.
+    // - existingConnection: optionally receives a connection from the outside world instead of attempting to create one
+    void TerminalPage::_CreateNewTabFromSettings(GUID profileGuid, const TerminalSettingsCreateResult& settings, TerminalConnection::ITerminalConnection existingConnection)
     {
-        newTabImpl->Initialize();
+        // Initialize the new tab
+        // Create a connection based on the values in our settings object if we weren't given one.
+        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profileGuid, settings.DefaultSettings());
+
+        TerminalConnection::ITerminalConnection debugConnection{ nullptr };
+        if (_settings.GlobalSettings().DebugFeaturesEnabled())
+        {
+            const CoreWindow window = CoreWindow::GetForCurrentThread();
+            const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
+            const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
+            const bool bothAltsPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
+                                         WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
+            if (bothAltsPressed)
+            {
+                std::tie(connection, debugConnection) = OpenDebugTapConnection(connection);
+            }
+        }
+
+        // Give term control a child of the settings so that any overrides go in the child
+        // This way, when we do a settings reload we just update the parent and the overrides remain
+        auto term = _InitControl(settings, connection);
+
+        auto newTabImpl = winrt::make_self<TerminalTab>(profileGuid, term);
 
         // Add the new tab to the list of our tabs.
         _tabs.Append(*newTabImpl);
@@ -116,7 +136,7 @@ namespace winrt::TerminalApp::implementation
         _UpdateTabIndices();
 
         // Hookup our event handlers to the new terminal
-        _RegisterTabEvents(*newTabImpl);
+        _RegisterTerminalEvents(term, *newTabImpl);
 
         // Don't capture a strong ref to the tab. If the tab is removed as this
         // is called, we don't really care anymore about handling the event.
@@ -164,36 +184,14 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        newTabImpl->SplitTabRequested([weakTab, weakThis{ get_weak() }]() {
-            auto page{ weakThis.get() };
-            auto tab{ weakTab.get() };
-
-            if (page && tab)
-            {
-                page->_SplitTab(*tab);
-            }
-        });
-
-        newTabImpl->ExportTabRequested([weakTab, weakThis{ get_weak() }]() {
-            auto page{ weakThis.get() };
-            auto tab{ weakTab.get() };
-
-            if (page && tab)
-            {
-                page->_ExportTab(*tab);
-            }
-        });
-
         auto tabViewItem = newTabImpl->TabViewItem();
         _tabView.TabItems().Append(tabViewItem);
 
         // Set this tab's icon to the icon from the user's profile
-        if (const auto profile{ newTabImpl->GetFocusedProfile() })
+        const auto profile = _settings.FindProfile(profileGuid);
+        if (profile != nullptr && !profile.Icon().empty())
         {
-            if (!profile.Icon().empty())
-            {
-                newTabImpl->UpdateIcon(profile.Icon());
-            }
+            newTabImpl->UpdateIcon(profile.Icon());
         }
 
         tabViewItem.PointerReleased({ this, &TerminalPage::_OnTabClick });
@@ -226,71 +224,17 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        // This kicks off TabView::SelectionChanged, in response to which
-        // we'll attach the terminal's Xaml control to the Xaml root.
-        _tabView.SelectedItem(tabViewItem);
-    }
-
-    // Method Description:
-    // - Create a new tab using a specified pane as the root.
-    // Arguments:
-    // - pane: The pane to use as the root.
-    void TerminalPage::_CreateNewTabFromPane(std::shared_ptr<Pane> pane)
-    {
-        auto newTabImpl = winrt::make_self<TerminalTab>(pane);
-        _InitializeTab(newTabImpl);
-    }
-
-    // Method Description:
-    // - Creates a new tab with the given settings. If the tab bar is not being
-    //      currently displayed, it will be shown.
-    // Arguments:
-    // - profile: profile settings for this connection
-    // - settings: the TerminalSettings object to use to create the TerminalControl with.
-    // - existingConnection: optionally receives a connection from the outside world instead of attempting to create one
-    void TerminalPage::_CreateNewTabWithProfileAndSettings(const Profile& profile, const TerminalSettingsCreateResult& settings, TerminalConnection::ITerminalConnection existingConnection)
-    {
-        // Initialize the new tab
-        // Create a connection based on the values in our settings object if we weren't given one.
-        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profile, settings.DefaultSettings());
-
-        // If we had an `existingConnection`, then this is an inbound handoff from somewhere else.
-        // We need to tell it about our size information so it can match the dimensions of what
-        // we are about to present.
-        if (existingConnection)
-        {
-            connection.Resize(settings.DefaultSettings().InitialRows(), settings.DefaultSettings().InitialCols());
-        }
-
-        TerminalConnection::ITerminalConnection debugConnection{ nullptr };
-        if (_settings.GlobalSettings().DebugFeaturesEnabled())
-        {
-            const CoreWindow window = CoreWindow::GetForCurrentThread();
-            const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
-            const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
-            const bool bothAltsPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
-                                         WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
-            if (bothAltsPressed)
-            {
-                std::tie(connection, debugConnection) = OpenDebugTapConnection(connection);
-            }
-        }
-
-        // Give term control a child of the settings so that any overrides go in the child
-        // This way, when we do a settings reload we just update the parent and the overrides remain
-        auto term = _InitControl(settings, connection);
-
-        auto newTabImpl = winrt::make_self<TerminalTab>(profile, term);
-        _RegisterTerminalEvents(term);
-        _InitializeTab(newTabImpl);
-
         if (debugConnection) // this will only be set if global debugging is on and tap is active
         {
             auto newControl = _InitControl(settings, debugConnection);
-            _RegisterTerminalEvents(newControl);
+            _RegisterTerminalEvents(newControl, *newTabImpl);
             // Split (auto) with the debug tap.
-            newTabImpl->SplitPane(SplitState::Automatic, 0.5f, profile, newControl);
+            newTabImpl->SplitPane(SplitState::Automatic, 0.5f, profileGuid, newControl);
         }
+
+        // This kicks off TabView::SelectionChanged, in response to which
+        // we'll attach the terminal's Xaml control to the Xaml root.
+        _tabView.SelectedItem(tabViewItem);
     }
 
     // Method Description:
@@ -300,9 +244,19 @@ namespace winrt::TerminalApp::implementation
     // - tab: the Tab to update the title for.
     void TerminalPage::_UpdateTabIcon(TerminalTab& tab)
     {
-        if (const auto profile = tab.GetFocusedProfile())
+        const auto lastFocusedProfileOpt = tab.GetFocusedProfile();
+        if (lastFocusedProfileOpt.has_value())
         {
-            tab.UpdateIcon(profile.Icon());
+            const auto lastFocusedProfile = lastFocusedProfileOpt.value();
+            const auto matchingProfile = _settings.FindProfile(lastFocusedProfile);
+            if (matchingProfile)
+            {
+                tab.UpdateIcon(matchingProfile.Icon());
+            }
+            else
+            {
+                tab.UpdateIcon({});
+            }
         }
     }
 
@@ -356,18 +310,23 @@ namespace winrt::TerminalApp::implementation
     {
         try
         {
-            // TODO: GH#5047 - We're duplicating the whole profile, which might
-            // be a dangling reference to old settings.
+            // TODO: GH#5047 - In the future, we should get the Profile of
+            // the focused pane, and use that to build a new instance of the
+            // settings so we can duplicate this tab/pane.
             //
-            // In the future, it may be preferable to just duplicate the
-            // current control's live settings (which will include changes
-            // made through VT).
+            // Currently, if the profile doesn't exist anymore in our
+            // settings, we'll silently do nothing.
+            //
+            // In the future, it will be preferable to just duplicate the
+            // current control's settings, but we can't do that currently,
+            // because we won't be able to create a new instance of the
+            // connection without keeping an instance of the original Profile
+            // object around.
 
-            if (auto profile = tab.GetFocusedProfile())
+            const auto& profileGuid = tab.GetFocusedProfile();
+            if (profileGuid.has_value())
             {
-                // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
-                profile = GetClosestProfileForDuplicationOfProfile(profile);
-                const auto settingsCreateResult{ TerminalSettings::CreateWithProfile(_settings, profile, *_bindings) };
+                const auto settingsCreateResult{ TerminalSettings::CreateWithProfileByID(_settings, profileGuid.value(), *_bindings) };
                 const auto workingDirectory = tab.GetActiveTerminalControl().WorkingDirectory();
                 const auto validWorkingDirectory = !workingDirectory.empty();
                 if (validWorkingDirectory)
@@ -375,7 +334,7 @@ namespace winrt::TerminalApp::implementation
                     settingsCreateResult.DefaultSettings().StartingDirectory(workingDirectory);
                 }
 
-                _CreateNewTabWithProfileAndSettings(profile, settingsCreateResult);
+                _CreateNewTabFromSettings(profileGuid.value(), settingsCreateResult);
 
                 const auto runtimeTabText{ tab.GetTabText() };
                 if (!runtimeTabText.empty())
@@ -390,59 +349,6 @@ namespace winrt::TerminalApp::implementation
         CATCH_LOG();
     }
 
-    // Method Description:
-    // - Sets the specified tab as the focused tab and splits its active pane
-    // Arguments:
-    // - tab: tab to split
-    void TerminalPage::_SplitTab(TerminalTab& tab)
-    {
-        try
-        {
-            _SetFocusedTab(tab);
-            _SplitPane(tab, SplitState::Automatic, SplitType::Duplicate);
-        }
-        CATCH_LOG();
-    }
-
-    // Method Description:
-    // - Exports the content of the Terminal Buffer inside the tab
-    // Arguments:
-    // - tab: tab to export
-    winrt::fire_and_forget TerminalPage::_ExportTab(const TerminalTab& tab)
-    {
-        try
-        {
-            if (const auto control{ tab.GetActiveTerminalControl() })
-            {
-                const FileSavePicker savePicker;
-                savePicker.as<IInitializeWithWindow>()->Initialize(*_hostingHwnd);
-                savePicker.SuggestedStartLocation(PickerLocationId::Downloads);
-                const auto fileChoices = single_threaded_vector<hstring>({ L".txt" });
-                savePicker.FileTypeChoices().Insert(RS_(L"PlainText"), fileChoices);
-                savePicker.SuggestedFileName(control.Title());
-
-                const StorageFile file = co_await savePicker.PickSaveFileAsync();
-                if (file != nullptr)
-                {
-                    const auto buffer = control.ReadEntireBuffer();
-                    CachedFileManager::DeferUpdates(file);
-                    co_await FileIO::WriteTextAsync(file, buffer);
-                    const auto status = co_await CachedFileManager::CompleteUpdatesAsync(file);
-                    switch (status)
-                    {
-                    case FileUpdateStatus::Complete:
-                    case FileUpdateStatus::CompleteAndRenamed:
-                        _ShowControlNoticeDialog(RS_(L"NoticeInfo"), RS_(L"ExportSuccess"));
-                        break;
-                    default:
-                        _ShowControlNoticeDialog(RS_(L"NoticeError"), RS_(L"ExportFailure"));
-                    }
-                }
-            }
-        }
-        CATCH_LOG();
-    }
-
     // Method Description:
     // - Removes the tab (both TerminalControl and XAML) after prompting for approval
     // Arguments:
@@ -591,25 +497,24 @@ namespace winrt::TerminalApp::implementation
     //   TerminalPage::_OnTabSelectionChanged
     // Return Value:
     // true iff we were able to select that tab index, false otherwise
-    bool TerminalPage::_SelectTab(uint32_t tabIndex)
+    bool TerminalPage::_SelectTab(const uint32_t tabIndex)
     {
-        // GH#9369 - if the argument is out of range, then clamp to the number
-        // of available tabs. Previously, we'd just silently do nothing if the
-        // value was greater than the number of tabs.
-        tabIndex = std::clamp(tabIndex, 0u, _tabs.Size() - 1);
-
-        auto tab{ _tabs.GetAt(tabIndex) };
-        if (_startupState == StartupState::InStartup)
+        if (tabIndex >= 0 && tabIndex < _tabs.Size())
         {
-            _tabView.SelectedItem(tab.TabViewItem());
-            _UpdatedSelectedTab(tab);
-        }
-        else
-        {
-            _SetFocusedTab(tab);
-        }
+            auto tab{ _tabs.GetAt(tabIndex) };
+            if (_startupState == StartupState::InStartup)
+            {
+                _tabView.SelectedItem(tab.TabViewItem());
+                _UpdatedSelectedTab(tab);
+            }
+            else
+            {
+                _SetFocusedTab(tab);
+            }
 
-        return true;
+            return true;
+        }
+        return false;
     }
 
     // Method Description:

src/cascadia/TerminalApp/TabRowControl.cpp

@@ -5,19 +5,9 @@
 #include "TabRowControl.h"
 
 #include "TabRowControl.g.cpp"
-#include <LibraryResources.h>
-
-using namespace winrt::Windows::ApplicationModel::DataTransfer;
 
 using namespace winrt;
 using namespace winrt::Microsoft::UI::Xaml;
-using namespace winrt::Windows::UI::Text;
-
-namespace winrt
-{
-    namespace MUX = Microsoft::UI::Xaml;
-    namespace WUX = Windows::UI::Xaml;
-}
 
 namespace winrt::TerminalApp::implementation
 {
@@ -33,53 +23,4 @@ namespace winrt::TerminalApp::implementation
     void TabRowControl::OnNewTabButtonClick(IInspectable const&, Controls::SplitButtonClickEventArgs const&)
     {
     }
-
-    // Method Description:
-    // - Bound in Drag&Drop of the Xaml editor to the [+] button.
-    // Arguments:
-    // <unused>
-    void TabRowControl::OnNewTabButtonDrop(IInspectable const&, winrt::Windows::UI::Xaml::DragEventArgs const&)
-    {
-    }
-
-    // Method Description:
-    // - Bound in Drag-over of the Xaml editor to the [+] button.
-    // Allows drop of 'StorageItems' which will be used as StartingDirectory
-    // Arguments:
-    //  - <unused>
-    //  - e: DragEventArgs which hold the items
-    void TabRowControl::OnNewTabButtonDragOver(IInspectable const&, winrt::Windows::UI::Xaml::DragEventArgs const& e)
-    {
-        // We can only handle drag/dropping StorageItems (files).
-        // If the format on the clipboard is anything else, returning
-        // early here will prevent the drag/drop from doing anything.
-        if (!e.DataView().Contains(StandardDataFormats::StorageItems()))
-        {
-            return;
-        }
-
-        // Make sure to set the AcceptedOperation, so that we can later receive the path in the Drop event
-        e.AcceptedOperation(DataPackageOperation::Copy);
-
-        const auto modifiers = static_cast<uint32_t>(e.Modifiers());
-        if (WI_IsFlagSet(modifiers, static_cast<uint32_t>(DragDrop::DragDropModifiers::Alt)))
-        {
-            e.DragUIOverride().Caption(RS_(L"DropPathTabSplit/Text"));
-        }
-        else if (WI_IsFlagSet(modifiers, static_cast<uint32_t>(DragDrop::DragDropModifiers::Shift)))
-        {
-            e.DragUIOverride().Caption(RS_(L"DropPathTabNewWindow/Text"));
-        }
-        else
-        {
-            e.DragUIOverride().Caption(RS_(L"DropPathTabRun/Text"));
-        }
-
-        // Sets if the caption is visible
-        e.DragUIOverride().IsCaptionVisible(true);
-        // Sets if the dragged content is visible
-        e.DragUIOverride().IsContentVisible(false);
-        // Sets if the glyph is visible
-        e.DragUIOverride().IsGlyphVisible(false);
-    }
 }

src/cascadia/TerminalApp/TabRowControl.h

@@ -14,8 +14,6 @@ namespace winrt::TerminalApp::implementation
         TabRowControl();
 
         void OnNewTabButtonClick(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::Controls::SplitButtonClickEventArgs const& args);
-        void OnNewTabButtonDrop(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::DragEventArgs const& e);
-        void OnNewTabButtonDragOver(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::DragEventArgs const& e);
     };
 }
 

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -25,14 +25,11 @@
                              x:Uid="NewTabSplitButton"
                              HorizontalAlignment="Left"
                              VerticalAlignment="Stretch"
-                             AllowDrop="True"
                              AutomationProperties.AccessibilityView="Control"
                              BorderThickness="0"
                              Click="OnNewTabButtonClick"
                              Content=""
                              CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}"
-                             DragOver="OnNewTabButtonDragOver"
-                             Drop="OnNewTabButtonDrop"
                              FontFamily="Segoe MDL2 Assets"
                              FontSize="12"
                              FontWeight="SemiLight"