build: pass branding into the nuget variable template (#16122)

This fixes a cosmetic issue with the version number in the unpackaged
builds and NuGet packages.

They were showing up as `-preview`, even when they were stable, because
the variable template didn't know about the branding.

(cherry picked from commit 544cdd78af)
Service-Card-Id: 91211923
Service-Version: 1.17

.clang-format

@@ -1,25 +1,57 @@
----
-Language: Cpp
-BasedOnStyle: Microsoft
+
 AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AllowAllArgumentsOnNextLine: true
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AllowAllConstructorInitializersOnNextLine: true
 AlignEscapedNewlines: Left
+AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortFunctionsOnASingleLine: All
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+#AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
   AfterUnion: true
   AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 ColumnLimit: 0
 CommentPragmas: "suppress"
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
+DeriveLineEnding: true
+DerivePointerAlignment: false
 FixNamespaceComments: false
 IncludeBlocks: Regroup
 IncludeCategories:
@@ -31,13 +63,35 @@ IncludeCategories:
       Priority: 2
     - Regex: '.*'
       Priority: 3
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: "BEGIN_TEST_METHOD_PROPERTIES|BEGIN_MODULE|BEGIN_TEST_CLASS|BEGIN_TEST_METHOD"
 MacroBlockEnd: "END_TEST_METHOD_PROPERTIES|END_MODULE|END_TEST_CLASS|END_TEST_METHOD"
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
 PointerAlignment: Left
 ReflowComments: false
 SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Latest
+TabWidth: 4
+UseTab: Never

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "XamlStyler.Console": {
-      "version": "3.2311.2",
+      "version": "3.2206.4",
       "commands": [
         "xstyler"
       ]

.github/actions/spelling/advice.md

@@ -6,6 +6,8 @@
 
 By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
 
+:warning: The command is written for posix shells. If it doesn't work for you, you can manually _add_ (one word per line) / _remove_ items to `expect.txt` and the `excludes.txt` files.
+
 If the listed items are:
 
 * ... **misspelled**, then please *correct* them instead of using the command.
@@ -34,9 +36,7 @@ https://www.regexplanet.com/advanced/perl/) yours before committing to verify it
 
 * well-formed pattern.
 
-  If you can write a [pattern](
-https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-) that would match it,
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
   try adding it to the `patterns.txt` file.
 
   Patterns are Perl 5 Regular Expressions - you can [test](

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

@@ -1,4 +1,3 @@
-aci
 admins
 allcolors
 Apc
@@ -9,13 +8,11 @@ breadcrumbs
 bsd
 calt
 ccmp
-ccon
 changelog
 clickable
 clig
 CMMI
 copyable
-Counterintuitively
 CtrlDToClose
 cybersecurity
 dalet
@@ -55,7 +52,6 @@ hyperlinks
 iconify
 img
 inlined
-issuetitle
 It'd
 kje
 libfuzzer
@@ -82,8 +78,6 @@ ok'd
 overlined
 pipeline
 postmodern
-Powerline
-powerline
 ptys
 qof
 qps
@@ -94,15 +88,11 @@ reserialize
 reserializes
 rlig
 runtimes
-servicebus
 shcha
-similaritytolerance
 slnt
 Sos
 ssh
-sustainability
 stakeholders
-sxn
 timeline
 timelines
 timestamped
@@ -110,7 +100,6 @@ TLDR
 tokenizes
 tonos
 toolset
-truthiness
 tshe
 ubuntu
 uiatextrange
@@ -119,12 +108,8 @@ und
 unregister
 versioned
 vsdevcmd
-walkthrough
-walkthroughs
 We'd
-westus
 wildcards
-workarounds
 XBox
 YBox
 yeru

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

@@ -28,14 +28,14 @@ CYICON
 Dacl
 dataobject
 dcomp
-debugbreak
-delayimp
 DERR
+delayimp
 dlldata
 DNE
 DONTADDTORECENT
 DWMSBT
 DWMWA
+DWMWA
 DWORDLONG
 endfor
 ENDSESSION
@@ -53,7 +53,6 @@ futex
 GETDESKWALLPAPER
 GETHIGHCONTRAST
 GETMOUSEHOVERTIME
-GETTEXTLENGTH
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
@@ -90,7 +89,6 @@ IObject
 iosfwd
 IPackage
 IPeasant
-isa
 ISetup
 isspace
 IStorage
@@ -112,14 +110,12 @@ lsass
 LSHIFT
 LTGRAY
 MAINWINDOW
-MAXIMIZEBOX
 memchr
 memicmp
 MENUCOMMAND
 MENUDATA
 MENUINFO
 MENUITEMINFOW
-MINIMIZEBOX
 mmeapi
 MOUSELEAVE
 mov
@@ -166,7 +162,6 @@ rcx
 REGCLS
 RETURNCMD
 rfind
-RLO
 ROOTOWNER
 roundf
 RSHIFT
@@ -188,7 +183,6 @@ snprintf
 spsc
 sregex
 SRWLOC
-srwlock
 SRWLOCK
 STDCPP
 STDMETHOD
@@ -205,12 +199,10 @@ TABROW
 TASKBARCREATED
 TBPF
 THEMECHANGED
-THICKFRAME
 tlg
 TME
 tmp
 tmpdir
-tokeninfo
 tolower
 toupper
 TRACKMOUSEEVENT
@@ -221,19 +213,15 @@ UFIELD
 ULARGE
 UOI
 UPDATEINIFILE
-urlmon
 userenv
 USEROBJECTFLAGS
 Vcpp
 Viewbox
 virtualalloc
-vsnwprintf
-wcsnlen
 wcsstr
 wcstoui
 WDJ
 winhttp
-wininet
 winmain
 winsta
 winstamin
@@ -267,4 +255,3 @@ xtree
 xutility
 YIcon
 YMax
-zwstring

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

@@ -4,17 +4,14 @@ advapi
 altform
 altforms
 appendwttlogging
-appinstaller
 appx
 appxbundle
 appxerror
 appxmanifest
 ATL
-autoexec
 backplating
 bitmaps
 BOMs
-COMPUTERNAME
 CPLs
 cpptools
 cppvsdbg
@@ -29,7 +26,6 @@ dotnetfeed
 DTDs
 DWINRT
 enablewttlogging
-HOMESHARE
 Intelli
 IVisual
 libucrt
@@ -60,15 +56,13 @@ PRIINFO
 propkey
 pscustomobject
 QWORD
-rdpclip
 regedit
 resfiles
 robocopy
 SACLs
-sdkddkver
 segoe
+sdkddkver
 Shobjidl
-sid
 Skype
 SRW
 sxs
@@ -81,7 +75,6 @@ tdbuildteamid
 ucrt
 ucrtd
 unvirtualized
-USERDNSDOMAIN
 VCRT
 vcruntime
 Virtualization

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

@@ -6,7 +6,6 @@ bhoj
 Bhojwani
 Bluloco
 carlos
-craigloewen
 dhowett
 Diviness
 dsafa
@@ -55,7 +54,6 @@ mikegr
 mikemaccana
 miloush
 miniksa
-nguyen
 niksa
 nvaccess
 nvda

.github/actions/spelling/candidate.patterns

@@ -1,37 +1,23 @@
 # marker to ignore all code on line
 ^.*/\* #no-spell-check-line \*/.*$
-# marker to ignore all code on line
-^.*\bno-spell-check(?:-line|)(?:\s.*|)$
-
-# https://cspell.org/configuration/document-settings/
-# cspell inline
-^.*\b[Cc][Ss][Pp][Ee][Ll]{2}:\s*[Dd][Ii][Ss][Aa][Bb][Ll][Ee]-[Ll][Ii][Nn][Ee]\b
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
 
 # patch hunk comments
 ^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
 # git index header
-index (?:[0-9a-z]{7,40},|)[0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
-
-# file permissions
-['"`\s][-bcdLlpsw](?:[-r][-w][-Ssx]){2}[-r][-w][-SsTtx]\+?['"`\s]
-
-# css url wrappings
-\burl\([^)]+\)
+index [0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
 
 # cid urls
 (['"])cid:.*?\g{-1}
 
 # data url in parens
-#\(data:(?:[^) ][^)]*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
-
+\(data:[^)]*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
 # data url in quotes
-([`'"])data:(?:[^ `'"].*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
+([`'"])data:.*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
 # data url
 data:[-a-zA-Z=;:/0-9+]*,\S*
 
-# https/http/file urls
-(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]
-
 # mailto urls
 mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
 
@@ -49,9 +35,6 @@ magnet:[?=:\w]+
 # asciinema
 \basciinema\.org/a/[0-9a-zA-Z]+
 
-# asciinema v2
-^\[\d+\.\d+, "[io]", ".*"\]$
-
 # apple
 \bdeveloper\.apple\.com/[-\w?=/]+
 # Apple music
@@ -106,7 +89,7 @@ vpc-\w+
 # Google Drive
 \bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
 # Google Groups
-\bgroups\.google\.com(?:/[a-z]+/(?:#!|)[^/\s"]+)*
+\bgroups\.google\.com/(?:(?:forum/#!|d/)(?:msg|topics?|searchin)|a)/[^/\s"]+/[-a-zA-Z0-9$]+(?:/[-a-zA-Z0-9]+)*
 # Google Maps
 \bmaps\.google\.com/maps\?[\w&;=]*
 # Google themes
@@ -134,8 +117,6 @@ themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
 (?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
 # GitHub SHAs
 \bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
-# GitHub SHA refs
-\[([0-9a-f]+)\]\(https://(?:www\.|)github.com/[-\w]+/[-\w]+/commit/\g{-1}[0-9a-f]*
 # GitHub wiki
 \bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
 # githubusercontent
@@ -147,9 +128,9 @@ themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
 # git.io
 \bgit\.io/[0-9a-zA-Z]+
 # GitHub JSON
-"node_id": "[-a-zA-Z=;:/0-9+_]*"
+"node_id": "[-a-zA-Z=;:/0-9+]*"
 # Contributor
-\[[^\]]+\]\(https://github\.com/[^/\s"]+/?\)
+\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
 # GHSA
 GHSA(?:-[0-9a-z]{4}){3}
 
@@ -162,8 +143,8 @@ GHSA(?:-[0-9a-z]{4}){3}
 # GitLab commits
 \bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
 
-# binance
-accounts\.binance\.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
+# binanace
+accounts.binance.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
 
 # bitbucket diff
 \bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
@@ -299,9 +280,9 @@ slack://[a-zA-Z0-9?&=]+
 \bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
 
 # ipfs protocol
-ipfs://[0-9a-zA-Z]{3,}
+ipfs://[0-9a-z]*
 # ipfs url
-/ipfs/[0-9a-zA-Z]{3,}
+/ipfs/[0-9a-z]*
 
 # w3
 \bw3\.org/[-0-9a-zA-Z/#.]+
@@ -378,25 +359,16 @@ ipfs://[0-9a-zA-Z]{3,}
 # tinyurl
 \btinyurl\.com/\w+
 
-# codepen
-\bcodepen\.io/[\w/]+
-
-# registry.npmjs.org
-\bregistry\.npmjs\.org/(?:@[^/"']+/|)[^/"']+/-/[-\w@.]+
-
 # getopts
 \bgetopts\s+(?:"[^"]+"|'[^']+')
 
 # ANSI color codes
-(?:\\(?:u00|x)1[Bb]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+|)m
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
 
 # URL escaped characters
-\%[0-9A-F][A-F](?=[A-Za-z])
-# lower URL escaped characters
-\%[0-9a-f][a-f](?=[a-z]{2,})
+\%[0-9A-F][A-F]
 # IPv6
-#\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
-
+\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
 # c99 hex digits (not the full format, just one I've seen)
 0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
 # Punycode
@@ -404,7 +376,7 @@ ipfs://[0-9a-zA-Z]{3,}
 # sha
 sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
 # sha-... -- uses a fancy capture
-(\\?['"]|")[0-9a-f]{40,}\g{-1}
+(['"]|")[0-9a-f]{40,}\g{-1}
 # hex runs
 \b[0-9a-fA-F]{16,}\b
 # hex in url queries
@@ -419,21 +391,18 @@ sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
 # Well known gpg keys
 .well-known/openpgpkey/[\w./]+
 
-# pki
------BEGIN.*-----END
-
 # uuid:
 \b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
 # hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
 # integrity
-integrity=(['"])(?:\s*sha\d+-[-a-zA-Z=;:/0-9+]{40,})+\g{-1}
+integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
 
 # https://www.gnu.org/software/groff/manual/groff.html
 # man troff content
 \\f[BCIPR]
-# '/"
-\\\([ad]q
+# '
+\\\(aq
 
 # .desktop mime types
 ^MimeTypes?=.*$
@@ -442,33 +411,21 @@ integrity=(['"])(?:\s*sha\d+-[-a-zA-Z=;:/0-9+]{40,})+\g{-1}
 # Localized .desktop content
 Name\[[^\]]+\]=.*
 
-# IServiceProvider / isAThing
-\b(?:I|isA)(?=(?:[A-Z][a-z]{2,})+\b)
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
 
 # crypt
-(['"])\$2[ayb]\$.{56}\g{-1}
+"\$2[ayb]\$.{56}"
 
 # scrypt / argon
 \$(?:scrypt|argon\d+[di]*)\$\S+
 
-# go.sum
-\bh1:\S+
-
-# scala modules
-("[^"]+"\s*%%?\s*){2,3}"[^"]+"
-
 # Input to GitHub JSON
-content: (['"])[-a-zA-Z=;:/0-9+]*=\g{-1}
+content: "[-a-zA-Z=;:/0-9+]*="
 
-# This does not cover multiline strings, if your repository has them,
-# you'll want to remove the `(?=.*?")` suffix.
-# The `(?=.*?")` suffix should limit the false positives rate
-# printf
-#%(?:(?:(?:hh?|ll?|[jzt])?[diuoxn]|l?[cs]|L?[fega]|p)(?=[a-z]{2,})|(?:X|L?[FEGA]|p)(?=[a-zA-Z]{2,}))(?=[_a-zA-Z]+\b)(?!%)(?=.*?['"])
-
-# Python string prefix / binary prefix
+# Python stringprefix / binaryprefix
 # Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
-(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?=[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
+(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
 
 # Regular expressions for (P|p)assword
 \([A-Z]\|[a-z]\)[a-z]+
@@ -484,35 +441,16 @@ content: (['"])[-a-zA-Z=;:/0-9+]*=\g{-1}
 ^\s*/\\[b].*/[gim]*\s*(?:\)(?:;|$)|,$)
 # javascript replace regex
 \.replace\(/[^/\s"]*/[gim]*\s*,
-# assign regex
-= /[^*]*?(?:[a-z]{3,}|[A-Z]{3,}|[A-Z][a-z]{2,}).*/
-# perl regex test
-[!=]~ (?:/.*/|m\{.*?\}|m<.*?>|m([|!/@#,;']).*?\g{-1})
-
-# perl qr regex
-(?<!\$)\bqr(?:\{.*?\}|<.*?>|\(.*?\)|([|!/@#,;']).*?\g{-1})
 
 # Go regular expressions
 regexp?\.MustCompile\(`[^`]*`\)
 
-# regex choice
-\(\?:[^)]+\|[^)]+\)
-
-# proto
-^\s*(\w+)\s\g{-1} =
-
 # sed regular expressions
 sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
 
-# node packages
-(["'])\@[^/'" ]+/[^/'" ]+\g{-1}
-
 # go install
 go install(?:\s+[a-z]+\.[-@\w/.]+)+
 
-# jetbrains schema https://youtrack.jetbrains.com/issue/RSRP-489571
-urn:shemas-jetbrains-com
-
 # kubernetes pod status lists
 # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
 \w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
@@ -524,47 +462,19 @@ urn:shemas-jetbrains-com
 -[0-9a-f]{10}-\w{5}\s
 
 # posthog secrets
-([`'"])phc_[^"',]+\g{-1}
+posthog\.init\((['"])phc_[^"',]+\g{-1},
 
 # xcode
 
 # xcodeproject scenes
-(?:Controller|destination|ID|id)="\w{3}-\w{2}-\w{3}"
+(?:Controller|ID|id)="\w{3}-\w{2}-\w{3}"
 
 # xcode api botches
 customObjectInstantitationMethod
 
-# configure flags
-.* \| --\w{2,}.*?(?=\w+\s\w+)
-
 # font awesome classes
 \.fa-[-a-z0-9]+
 
-# bearer auth
-(['"])Bear[e][r] .*?\g{-1}
-
-# basic auth
-(['"])Basic [-a-zA-Z=;:/0-9+]{3,}\g{-1}
-
-# base64 encoded content
-#([`'"])[-a-zA-Z=;:/0-9+]+=\g{-1}
-# base64 encoded content in xml/sgml
->[-a-zA-Z=;:/0-9+]+=</
-# base64 encoded content, possibly wrapped in mime
-#(?:^|[\s=;:?])[-a-zA-Z=;:/0-9+]{50,}(?:[\s=;:?]|$)
-
-# encoded-word
-=\?[-a-zA-Z0-9"*%]+\?[BQ]\?[^?]{0,75}\?=
-
-# Time Zones
-\b(?:Africa|Atlantic|America|Antarctica|Asia|Australia|Europe|Indian|Pacific)(?:/\w+)+
-
-# linux kernel info
-^(?:bugs|flags|Features)\s+:.*
-
-# systemd mode
-systemd.*?running in system mode \([-+].*\)$
-
 # Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
 # grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
 # Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
@@ -575,62 +485,32 @@ systemd.*?running in system mode \([-+].*\)$
 (?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*
 
 # Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*|[a-zA-Z]{3,}[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]|[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3,}
-
-# highlighted letters
-\[[A-Z]\][a-z]+
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
 
 # French
 # This corpus only had capital letters, but you probably want lowercase ones as well.
 \b[LN]'+[a-z]{2,}\b
 
-# latex (check-spelling <= 0.0.21)
-#\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
-
-# latex (check-spelling >= 0.0.22)
-\\\w{2,}\{
-
-# eslint
-"varsIgnorePattern": ".+"
-
-# Windows short paths
-[/\\][^/\\]{5,6}~\d{1,2}[/\\]
-
-# in check-spelling@v0.0.22+, printf markers aren't automatically consumed
-# printf markers
-#(?<!\\)\\[nrt](?=[a-z]{2,})
-
-# alternate markers if you run into latex and friends
-#(?<!\\)\\[nrt](?=[a-z]{2,})(?=.*['"`])
-
-# apache
-a2(?:en|dis)
-
-# weak e-tag
-W/"[^"]+"
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
 
 # the negative lookahead here is to allow catching 'templatesz' as a misspelling
 # but to otherwise recognize a Windows path with \templates\foo.template or similar:
-#\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
-
+\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
 # ignore long runs of a single character:
 \b([A-Za-z])\g{-1}{3,}\b
-
+# Note that the next example is no longer necessary if you are using
+# to match a string starting with a `#`, use a character-class:
+[#]backwards
 # version suffix <word>v#
 (?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
-
-# Compiler flags (Unix, Java/Scala)
-# Use if you have things like `-Pdocker` and want to treat them as `docker`
-#(?:^|[\t ,>"'`=(])-(?:(?:J-|)[DPWXY]|[Llf])(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# Compiler flags (Windows / PowerShell)
-# This is a subset of the more general compiler flags pattern.
-# It avoids matching `-Path` to prevent it from being treated as `ath`
-#(?:^|[\t ,"'`=(])-(?:[DPL](?=[A-Z]{2,})|[WXYlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,}))
+# Compiler flags (Scala)
+(?:^|[\t ,>"'`=(])-J-[DPWXY](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+# Compiler flags
+#(?:^|[\t ,"'`=(])-[DPWXYLlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
 
 # Compiler flags (linker)
 ,-B
-
 # curl arguments
 \b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
 # set arguments

.github/actions/spelling/excludes.txt

@@ -1,24 +1,21 @@
 # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:(?i)\.png$)
 (?:^|/)(?i)COPYRIGHT
 (?:^|/)(?i)LICEN[CS]E
 (?:^|/)3rdparty/
 (?:^|/)dirs$
+(?:^|/)go\.mod$
 (?:^|/)go\.sum$
 (?:^|/)package(?:-lock|)\.json$
-(?:^|/)Pipfile$
-(?:^|/)pyproject.toml
-(?:^|/)requirements(?:-dev|-doc|-test|)\.txt$
 (?:^|/)sources(?:|\.dep)$
 (?:^|/)vendor/
 \.a$
 \.ai$
-\.all-contributorsrc$
 \.avi$
 \.bmp$
 \.bz2$
 \.cer$
 \.class$
-\.coveragerc$
 \.crl$
 \.crt$
 \.csr$
@@ -30,15 +27,11 @@
 \.eps$
 \.exe$
 \.gif$
-\.git-blame-ignore-revs$
 \.gitattributes$
-\.gitignore$
-\.gitkeep$
 \.graffle$
 \.gz$
 \.icns$
 \.ico$
-\.ipynb$
 \.jar$
 \.jks$
 \.jpeg$
@@ -48,62 +41,61 @@
 \.lock$
 \.map$
 \.min\..
-\.mo$
 \.mod$
 \.mp3$
 \.mp4$
 \.o$
 \.ocf$
 \.otf$
-\.p12$
-\.parquet$
 \.pbxproj$
 \.pdf$
 \.pem$
-\.pfx$
 \.png$
 \.psd$
 \.pyc$
-\.pylintrc$
-\.qm$
 \.runsettings$
 \.s$
 \.sig$
 \.so$
 \.svg$
 \.svgz$
-\.sys$
+\.svgz?$
 \.tar$
 \.tgz$
 \.tiff?$
 \.ttf$
-\.vcxproj\.filters$
 \.vsdx$
 \.wav$
 \.webm$
 \.webp$
 \.woff
+\.woff2?$
 \.xcf$
+\.xls
 \.xlsx?$
 \.xpm$
-\.xz$
+\.yml$
 \.zip$
 ^\.github/actions/spelling/
+^\.github/fabricbot.json$
+^\.gitignore$
+^\Q.git-blame-ignore-revs\E$
 ^\Q.github/workflows/spelling.yml\E$
-^\Qbuild/config/release.gdnbaselines\E$
+^\Qdoc/reference/windows-terminal-logo.ans\E$
+^\Qsamples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj.filters\E$
+^\Qsrc/host/exe/Host.EXE.vcxproj.filters\E$
 ^\Qsrc/host/ft_host/chafa.txt\E$
-^\Qsrc/host/ft_uia/run.bat\E$
-^\Qsrc/host/runft.bat\E$
-^\Qsrc/tools/lnkd/lnkd.bat\E$
-^\Qsrc/tools/pixels/pixels.bat\E$
+^\Qsrc/tools/closetest/CloseTest.vcxproj.filters\E$
+^\XamlStyler.json$
 ^build/config/
 ^consolegit2gitfilters\.json$
 ^dep/
-^doc/reference/master-sequence-list\.csv$
+^doc/reference/master-sequence-list.csv$
 ^doc/reference/UTF8-torture-test\.txt$
-^doc/reference/windows-terminal-logo\.ans$
 ^oss/
-^samples/PixelShaders/Screenshots/
+^src/host/ft_uia/run\.bat$
+^src/host/runft\.bat$
+^src/host/runut\.bat$
 ^src/interactivity/onecore/BgfxEngine\.
 ^src/renderer/atlas/
 ^src/renderer/wddmcon/WddmConRenderer\.
@@ -114,14 +106,13 @@
 ^src/terminal/parser/ft_fuzzwrapper/run\.bat$
 ^src/terminal/parser/ut_parser/Base64Test.cpp$
 ^src/terminal/parser/ut_parser/run\.bat$
-^src/tools/benchcat
-^src/tools/integrity/dirs$
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
-^src/tools/RenderingTests/main\.cpp$
+^src/tools/lnkd/lnkd\.bat$
+^src/tools/pixels/pixels\.bat$
 ^src/tools/texttests/fira\.txt$
-^src/tools/U8U16Test/(?!en)..\.
-^src/types/ColorFix\.cpp$
-^src/types/ut_types/UtilsTests\.cpp$
-^tools/ReleaseEngineering/ServicingPipeline\.ps1$
-^XamlStyler\.json$
+^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
+^src/types/ColorFix.cpp
+^src/types/ut_types/UtilsTests.cpp$
+^tools/ReleaseEngineering/ServicingPipeline.ps1$
 ignore$
+SUMS$

.github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt

@@ -1,5 +0,0 @@
-EOB
-swrapped
-wordi
-wordiswrapped
-wrappe

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

@@ -9,7 +9,6 @@ ABCDEFGHIJ
 abcdefghijk
 ABCDEFGHIJKLMNO
 abcdefghijklmnop
-ABCDEFGHIJKLMNOPQRS
 ABCDEFGHIJKLMNOPQRST
 ABCG
 ABE
@@ -19,16 +18,11 @@ BBBBBBBB
 BBBBBCCC
 BBBBCCCCC
 BBGGRR
-efg
 EFG
-efgh
 EFGh
-KLMNOQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJ
-QQQQQQQQQQABCDEFGHIJKLMNOPQRS
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
-QQQQQQQQQQABCDEFGHIJPQRST
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty

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

@@ -1,6 +1,6 @@
+WCAG
 winui
 appshellintegration
 mdtauk
 gfycat
 Guake
-xkcd

.github/actions/spelling/line_forbidden.patterns

@@ -1,6 +1,4 @@
-# reject `m_data` as VxWorks defined it and that breaks things if it's used elsewhere
-# see [fprime](https://github.com/nasa/fprime/commit/d589f0a25c59ea9a800d851ea84c2f5df02fb529)
-# and [Qt](https://github.com/qtproject/qt-solutions/blame/fb7bc42bfcc578ff3fa3b9ca21a41e96eb37c1c7/qtscriptclassic/src/qscriptbuffer_p.h#L46)
+# reject `m_data` as there's a certain OS which has evil defines that break things if it's used elsewhere
 # \bm_data\b
 
 # If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
@@ -8,72 +6,40 @@
 # to use this:
 #\bfit\(
 
-# s.b. anymore
-\bany more[,.]
-
 # s.b. GitHub
-(?<![&*.]|// |\btype )\bGithub\b(?![{)])
+\bGithub\b
 
 # s.b. GitLab
-(?<![&*.]|// |\btype )\bGitlab\b(?![{)])
+\bGitlab\b
 
 # s.b. JavaScript
 \bJavascript\b
 
-# s.b. macOS or Mac OS X or ...
-\bMacOS\b
-
 # s.b. Microsoft
 \bMicroSoft\b
 
-# s.b. TypeScript
-\bTypescript\b
-
 # s.b. another
 \ban[- ]other\b
 
-# s.b. deprecation warning
-\b[Dd]epreciation [Ww]arnings?\b
-
 # s.b. greater than
 \bgreater then\b
 
-# s.b. in front of
-\bin from of\b
-
 # s.b. into
-# when not phrasal and when `in order to` would be wrong:
-# https://thewritepractice.com/into-vs-in-to/
-#\sin to\s(?!if\b)
-
-# s.b. is obsolete
-\bis obsolescent\b
-
-# s.b. it's or its
-\bits['’]
+#\sin to\s
 
 # s.b. opt-in
-#(?<!\sfor)\sopt in\s
+\sopt in\s
 
 # s.b. less than
 \bless then\b
 
-# s.b. one of
-\bon of\b
-
 # s.b. otherwise
 \bother[- ]wise\b
 
-# s.b. or (more|less)
-\bore (?:more|less)\b
-
 # s.b. nonexistent
 \bnon existing\b
 \b[Nn]o[nt][- ]existent\b
 
-# s.b. brief / details/ param / return / retval
-(?:^\s*|(?:\*|//|/*)\s+`)[\\@](?:breif|(?:detail|detials)|(?:params(?!\.)|prama?)|ret(?:uns?)|retvl)\b
-
 # s.b. preexisting
 [Pp]re[- ]existing
 
@@ -83,37 +49,14 @@
 # s.b. preemptively
 [Pp]re[- ]emptively
 
-# s.b. recently changed or recent changes
-[Rr]ecent changed
-
 # s.b. reentrancy
 [Rr]e[- ]entrancy
 
 # s.b. reentrant
 [Rr]e[- ]entrant
 
-# s.b. understand
-\bunder stand\b
+# s.b. workaround(s)
+#\bwork[- ]arounds?\b
 
-# s.b. workarounds
-#\bwork[- ]arounds\b
-
-# s.b. workaround
-(?:(?:[Aa]|[Tt]he|ugly)\swork[- ]around\b|\swork[- ]around\s+for)
-
-# s.b. (coarse|fine)-grained
-\b(?:coarse|fine) grained\b
-
-# s.b. neither/nor -- or reword
-#\bnot\b[^.?!"/(]+\bnor\b
-
-# probably a double negative
-# s.b. neither/nor (plus rewording the beginning)
-\bnot\b[^.?!"/]*\bneither\b[^.?!"/(]*\bnor\b
-
-# In English, it is generally wrong to have the same word twice in a row without punctuation.
-# Duplicated words are generally mistakes.
-# There are a few exceptions where it is acceptable (e.g. "that that").
-# If the highlighted doubled word pair is in a code snippet, you can write a pattern to mask it.
-# If the highlighted doubled word pair is in prose, have someone read the English before you dismiss this error.
+# Reject duplicate words
 \s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s

.github/actions/spelling/patterns/0_n.txt

@@ -0,0 +1,2 @@
+\\native(?![a-z])
+\\nihilist(?![a-z])

.github/actions/spelling/patterns/0_r.txt

@@ -0,0 +1,8 @@
+\\registry(?![a-z])
+\\release(?![a-z])
+\\resources?(?![a-z])
+\\result(?![a-z])
+\\resultmacros(?![a-z])
+\\rules(?![a-z])
+\\renderer(?![a-z])
+\\rectread(?![a-z])

.github/actions/spelling/patterns/0_t.txt

@@ -0,0 +1,13 @@
+\\telemetry(?![a-z])
+\\templates(?![a-z])
+\\term(?![a-z])
+\\terminal(?![a-z])
+\\terminalcore(?![a-z])
+\\terminalinput(?![a-z])
+\\testlist(?![a-z])
+\\testmd(?![a-z])
+\\testpasses(?![a-z])
+\\tests(?![a-z])
+\\thread(?![a-z])
+\\tools(?![a-z])
+\\types(?![a-z])

.github/actions/spelling/patterns/README.md

@@ -7,6 +7,10 @@ Note: order of the contents of these files can matter.
 Lines from an individual file are handled in file order.
 Files are selected in alphabetical order.
 
+* [n](0_n.txt), [r](0_r.txt), and [t](0_t.txt) are specifically to work around
+a quirk in the spell checker:
+it often sees C strings of the form "Hello\nwerld". And would prefer to
+spot the typo of `werld`.
 * [patterns](patterns.txt) is the main list -- there is nothing
 particularly special about the file name (beyond the extension which is
 important).

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

@@ -3,7 +3,7 @@
 https?://\S+
 [Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
 (?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
-(?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}(?!\[)[Uu]?[Ll]{0,2}\b
+(?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
 microsoft/cascadia-code\@[0-9a-fA-F]{40}
 \d+x\d+Logo
 Scro\&ll
@@ -12,6 +12,7 @@ Scro\&ll
 TestUtils::VerifyExpectedString\(tb, L"[^"]+"
 (?:hostSm|mach)\.ProcessString\(L"[^"]+"
 \b([A-Za-z])\g{-1}{3,}\b
+0x[0-9A-Za-z]+
 Base64::s_(?:En|De)code\(L"[^"]+"
 VERIFY_ARE_EQUAL\(L"[^"]+"
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
@@ -23,129 +24,64 @@ ROY\sG\.\sBIV
 !(?:(?i)ESC)!\[
 !(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
 
-# SSE intrinsics like "_mm_subs_epu16"
-\b_mm(?:|256|512)_\w+\b
-
-# ARM NEON intrinsics like "vsubq_u16"
-\bv\w+_[fsu](?:8|16|32|64)\b
-
-# color floating numbers
-0x[0-9a-f](?:\.[0-9a-f]*p)[-+]\d+f
-
-# AppX package
-_\d[0-9a-z]{12}['\.]
-
-# string test
-equals_insensitive_ascii\("\w+", "\w+"
+# Python stringprefix / binaryprefix
+\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'
 
 # Automatically suggested patterns
-# hit-count: 3788 file-count: 599
-# IServiceProvider / isAThing
-\b(?:I|isA)(?=(?:[A-Z][a-z]{2,})+\b)
+# hit-count: 3831 file-count: 582
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
 
-# hit-count: 314 file-count: 21
-# hex runs
-\b[0-9a-fA-F]{16,}\b
+# hit-count: 71 file-count: 35
+# Compiler flags
+(?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
+(?:^|[\t ,"'`=(])-[X](?!aml)(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
 
-# hit-count: 47 file-count: 11
-# special cased printf markers
-\\r\\n(?=[a-z])|(?<!\\)\\[nrt](?=[a-z]{2,})(?=.*(?:<.*['"`]|"(?:[;,]|\);)$|\) \+$))
-
-# ConsoleArgumentsTests
---headless\\.*?"
-
-# hit-count: 109 file-count: 62
-# Compiler flags (Unix, Java/Scala)
-# Use if you have things like `-Pdocker` and want to treat them as `docker`
-(?:^|[\t ,>"'`=(])-(?:D(?=[A-Z])|[WX]|f(?=[ms]))(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# hit-count: 60 file-count: 35
+# hit-count: 41 file-count: 28
 # version suffix <word>v#
 (?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
 
-# hit-count: 2 file-count: 2
-# This does not cover multiline strings, if your repository has them,
-# you'll want to remove the `(?=.*?")` suffix.
-# The `(?=.*?")` suffix should limit the false positives rate
-# printf
-%(?:s)(?!ize)(?=[a-z]{2,})
+# hit-count: 20 file-count: 9
+# hex runs
+\b[0-9a-fA-F]{16,}\b
 
-# hit-count: 16 file-count: 10
+# hit-count: 10 file-count: 7
 # uuid:
 \b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
 
-# hit-count: 13 file-count: 4
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*|[a-zA-Z]{3,}[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]|[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3,}
-
-# hit-count: 7 file-count: 5
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
-
-# hit-count: 7 file-count: 1
-# regex choice
-\(\?:[^)]+\|[^)]+\)
-
 # hit-count: 4 file-count: 4
-# tar arguments
-\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
-
-# hit-count: 4 file-count: 1
-# ANSI color codes
-(?:\\(?:u00|x)1[Bb]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+|)m
-
-# hit-count: 4 file-count: 1
-# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
-# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
-# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
-## Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
-## You could manually change `(?i)X...` to use `[Xx]...`
-## or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
-# Lorem
-(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*
-
-# hit-count: 3 file-count: 3
 # mailto urls
 mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
 
+# hit-count: 4 file-count: 1
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
 # hit-count: 2 file-count: 1
-# Python string prefix / binary prefix
-# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
-(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?=[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
 
 # hit-count: 1 file-count: 1
-# Punycode
-\bxn--[-0-9a-z]+
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
 
 # hit-count: 1 file-count: 1
-# latex (check-spelling >= 0.0.22)
-\\\w{2,}\{
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
 
 # hit-count: 1 file-count: 1
-# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
-\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
-
-# Questionably acceptable forms of `in to`
-# Personally, I prefer `log into`, but people object
-# https://www.tprteaching.com/log-into-log-in-to-login/
-\b(?:[Ll]og|[Ss]ign) in to\b
-
-# to opt in
-\bto opt in\b
+# French
+# This corpus only had capital letters, but you probably want lowercase ones as well.
+\b[LN]'+[a-z]{2,}\b
 
 # acceptable duplicates
 # ls directory listings
-[-bcdlpsw](?:[-r][-w][-Ssx]){3}\s+\d+\s+\S+\s+\S+\s+\d+\s+
-# mount
-\bmount\s+-t\s+(\w+)\s+\g{-1}\b
-# C types and repeated CSS values
-\s(auto|center|div|Guid|inherit|long|LONG|none|normal|solid|that|thin|transparent|very)(?: \g{-1})+\s
-# C struct
-\bstruct\s+(\w+)\s+\g{-1}\b
-# go templates
-\s(\w+)\s+\g{-1}\s+\`(?:graphql|inject|json|yaml):
-# doxygen / javadoc / .net
-(?:[\\@](?:brief|groupname|t?param|return|retval)|(?:public|private|\[Parameter(?:\(.+\)|)\])(?:\s+static|\s+override|\s+readonly)*)(?:\s+\{\w+\}|)\s+(\w+)\s+\g{-1}\s
+[-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+
+# C/idl types + English ...
+\s(Guid|long|LONG|that) \g{-1}\s
+
+# javadoc / .net
+(?:[\\@](?:groupname|param)|(?:public|private)(?:\s+static|\s+readonly)*)\s+(\w+)\s+\g{-1}\s
 
 # Commit message -- Signed-off-by and friends
 ^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$

.github/actions/spelling/reject.txt

@@ -1,7 +1,6 @@
 ^attache$
 ^attacher$
 ^attachers$
-^bellow$
 benefitting
 occurences?
 ^dependan.*

.github/policies/resourceManagement.yml

@@ -1,751 +0,0 @@
-id: 
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner: 
-resource: repository
-disabled: false
-where: 
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - hasLabel:
-          label: No-Recent-Activity
-      - noActivitySince:
-          days: 3
-      actions:
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - noActivitySince:
-          days: 4
-      - isNotLabeledWith:
-          label: No-Recent-Activity
-      actions:
-      - addLabel:
-          label: No-Recent-Activity
-      - addReply:
-          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Duplicate
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - hasLabel:
-          label: No-Recent-Activity
-      - noActivitySince:
-          days: 7
-      actions:
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - noActivitySince:
-          days: 7
-      - isNotLabeledWith:
-          label: No-Recent-Activity
-      actions:
-      - addLabel:
-          label: No-Recent-Activity
-      - addReply:
-          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
-    eventResponderTasks:
-    - if:
-      - payloadType: Issues
-      - or:
-        - and:
-          - isAction:
-              action: Opened
-          - not:
-              hasLabel:
-                label: ⛺ Reserved
-      then:
-      - addLabel:
-          label: Needs-Triage
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isAction:
-          action: Created
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - addLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issues
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isAction:
-          action: Submitted
-      - isReviewState:
-          reviewState: Changes_requested
-      then:
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - isActivitySender:
-          issueAuthor: True
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: AutoMerge
-      then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: AutoMerge
-      then:
-      - disableAutoMerge
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - and:
-          - isLabeled
-          - hasLabel:
-              label: Mass-Chaos
-        - isOpen
-        - isLabeled
-      - not:
-          hasLabel:
-            label: Needs-Tag-Fix
-      - or:
-        - and:
-          - not:
-              hasLabel:
-                label: Area-Accessibility
-          - not:
-              hasLabel:
-                label: Area-Build
-          - not:
-              hasLabel:
-                label: Area-Extensibility
-          - not:
-              hasLabel:
-                label: Area-Fonts
-          - not:
-              hasLabel:
-                label: Area-Input
-          - not:
-              hasLabel:
-                label: Area-Interaction
-          - not:
-              hasLabel:
-                label: Area-Interop
-          - not:
-              hasLabel:
-                label: Area-Output
-          - not:
-              hasLabel:
-                label: Area-Performance
-          - not:
-              hasLabel:
-                label: Area-Rendering
-          - not:
-              hasLabel:
-                label: Area-Server
-          - not:
-              hasLabel:
-                label: Area-Settings
-          - not:
-              hasLabel:
-                label: Area-TerminalConnection
-          - not:
-              hasLabel:
-                label: Area-TerminalControl
-          - not:
-              hasLabel:
-                label: Area-User Interface
-          - not:
-              hasLabel:
-                label: Area-VT
-          - not:
-              hasLabel:
-                label: Area-CodeHealth
-          - not:
-              hasLabel:
-                label: Area-Quality
-          - not:
-              hasLabel:
-                label: Area-AzureShell
-          - not:
-              hasLabel:
-                label: Area-Schema
-          - not:
-              hasLabel:
-                label: Area-Commandline
-          - not:
-              hasLabel:
-                label: Area-ShellExtension
-          - not:
-              hasLabel:
-                label: Area-WPFControl
-          - not:
-              hasLabel:
-                label: Area-Settings UI
-          - not:
-              hasLabel:
-                label: Area-DefApp
-          - not:
-              hasLabel:
-                label: Area-Remoting
-          - not:
-              hasLabel:
-                label: Area-Windowing
-          - not:
-              hasLabel:
-                label: Area-Theming
-          - not:
-              hasLabel:
-                label: Area-Localization
-        - and:
-          - not:
-              hasLabel:
-                label: Issue-Bug
-          - not:
-              hasLabel:
-                label: Issue-Docs
-          - not:
-              hasLabel:
-                label: Issue-Feature
-          - not:
-              hasLabel:
-                label: Issue-Question
-          - not:
-              hasLabel:
-                label: Issue-Samples
-          - not:
-              hasLabel:
-                label: Issue-Task
-          - not:
-              hasLabel:
-                label: Issue-Scenario
-        - and:
-          - not:
-              hasLabel:
-                label: Product-Cmd.exe
-          - not:
-              hasLabel:
-                label: Product-Colortool
-          - not:
-              hasLabel:
-                label: Product-Conhost
-          - not:
-              hasLabel:
-                label: Product-Conpty
-          - not:
-              hasLabel:
-                label: Product-Meta
-          - not:
-              hasLabel:
-                label: Product-Powershell
-          - not:
-              hasLabel:
-                label: Product-Terminal
-          - not:
-              hasLabel:
-                label: Product-WSL
-        - and:
-          - not: isOpen
-          - and:
-            - not:
-                hasLabel:
-                  label: Resolution-Answered
-            - not:
-                hasLabel:
-                  label: Resolution-By-Design
-            - not:
-                hasLabel:
-                  label: Resolution-Duplicate
-            - not:
-                hasLabel:
-                  label: Resolution-External
-            - not:
-                hasLabel:
-                  label: Resolution-Fix-Available
-            - not:
-                hasLabel:
-                  label: Resolution-Fix-Committed
-            - not:
-                hasLabel:
-                  label: Resolution-Won't-Fix
-      - not:
-          hasLabel:
-            label: Needs-Triage
-      - not:
-          hasLabel:
-            label: Resolution-Duplicate
-      - not:
-          hasLabel:
-            label: ⛺ Reserved
-      - not:
-          hasLabel:
-            label: Tracking-External
-      then:
-      - addLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Issues
-      - and:
-        - isLabeled
-        - hasLabel:
-            label: Needs-Tag-Fix
-      - and:
-        - or:
-          - hasLabel:
-              label: Area-Accessibility
-          - hasLabel:
-              label: Area-Build
-          - hasLabel:
-              label: Area-Extensibility
-          - hasLabel:
-              label: Area-Fonts
-          - hasLabel:
-              label: Area-Input
-          - hasLabel:
-              label: Area-Interaction
-          - hasLabel:
-              label: Area-Interop
-          - hasLabel:
-              label: Area-Output
-          - hasLabel:
-              label: Area-Performance
-          - hasLabel:
-              label: Area-Rendering
-          - hasLabel:
-              label: Area-Server
-          - hasLabel:
-              label: Area-Settings
-          - hasLabel:
-              label: Area-TerminalConnection
-          - hasLabel:
-              label: Area-TerminalControl
-          - hasLabel:
-              label: Area-User Interface
-          - hasLabel:
-              label: Area-VT
-          - hasLabel:
-              label: Area-CodeHealth
-          - hasLabel:
-              label: Area-Quality
-          - hasLabel:
-              label: Area-Schema
-          - hasLabel:
-              label: Area-AzureShell
-          - hasLabel:
-              label: Area-Commandline
-          - hasLabel:
-              label: Area-ShellExtension
-          - hasLabel:
-              label: Area-WPFControl
-          - hasLabel:
-              label: Area-Settings UI
-          - hasLabel:
-              label: Area-DefApp
-          - hasLabel:
-              label: Area-Localization
-          - hasLabel:
-              label: Area-Windowing
-          - hasLabel:
-              label: Area-Theming
-          - hasLabel:
-              label: Area-AtlasEngine
-          - hasLabel:
-              label: Area-CmdPal
-        - or:
-          - hasLabel:
-              label: Issue-Bug
-          - hasLabel:
-              label: Issue-Docs
-          - hasLabel:
-              label: Issue-Feature
-          - hasLabel:
-              label: Issue-Question
-          - hasLabel:
-              label: Issue-Samples
-          - hasLabel:
-              label: Issue-Task
-          - hasLabel:
-              label: Issue-Scenario
-        - or:
-          - hasLabel:
-              label: Product-Cmd.exe
-          - hasLabel:
-              label: Product-Colortool
-          - hasLabel:
-              label: Product-Conhost
-          - hasLabel:
-              label: Product-Conpty
-          - hasLabel:
-              label: Product-Meta
-          - hasLabel:
-              label: Product-Powershell
-          - hasLabel:
-              label: Product-Terminal
-          - hasLabel:
-              label: Product-WSL
-        - or:
-          - isOpen
-          - and:
-            - not: isOpen
-            - or:
-              - hasLabel:
-                  label: Resolution-Answered
-              - hasLabel:
-                  label: Resolution-By-Design
-              - hasLabel:
-                  label: Resolution-Duplicate
-              - hasLabel:
-                  label: Resolution-External
-              - hasLabel:
-                  label: Resolution-Fix-Available
-              - hasLabel:
-                  label: Resolution-Fix-Committed
-              - hasLabel:
-                  label: Resolution-Won't-Fix
-              - hasLabel:
-                  label: Tracking-External
-      then:
-      - removeLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - inPrLabel:
-          label: In-PR
-      description: 
-    - if:
-      - payloadType: Issues
-      - hasLabel:
-          label: Needs-Tag-Fix
-      - hasLabel:
-          label: Resolution-Duplicate
-      then:
-      - removeLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - titleContains:
-            pattern: ^\s*Bug Report \(IF I DO NOT CHANGE THIS THE ISSUE WILL BE AUTO-CLOSED\)\s*$
-            isRegex: True
-        - titleContains:
-            pattern: ^\s*Bug Report\s*$
-            isRegex: True
-      - or:
-        - isAction:
-            action: Opened
-        - isAction:
-            action: Reopened
-      - not:
-          activitySenderHasPermission:
-            permission: Write
-      - not:
-          activitySenderHasPermission:
-            permission: Admin
-      then:
-      - closeIssue
-      - addLabel:
-          label: Needs-Author-Feedback
-      - addReply:
-          reply: Hi! Thanks for attempting to open an issue. Unfortunately, your title wasn't changed from the original template which makes it very hard for us to track and triage. You are welcome to fix up the title and try again with a new issue.
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - isAction:
-            action: Opened
-        - isAction:
-            action: Reopened
-      - or:
-        - not:
-            bodyContains:
-              pattern: .+
-              isRegex: True
-      then:
-      - closeIssue
-      - addLabel:
-          label: Needs-Author-Feedback
-      - addReply:
-          reply: "Hi! Thanks for attempting to open an issue. Unfortunately, you didn't write anything in the body which makes it impossible to understand your concern. You are welcome to fix up the issue and try again by opening another issue with the body filled out. "
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - isLabeled
-      - hasLabel:
-          label: Needs-Second
-      - isOpen
-      then:
-      - requestReview:
-          reviewer: zadjii-msft
-      - requestReview:
-          reviewer: PankajBhojwani
-      - requestReview:
-          reviewer: carlos-zamora
-      - requestReview:
-          reviewer: dhowett
-      - requestReview:
-          reviewer: lhecker
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - not: isOpen
-      - hasLabel:
-          label: Needs-Second
-      then:
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issues
-      - hasLabel:
-          label: In-PR
-      - hasLabel:
-          label: Help Wanted
-      - isLabeled
-      then:
-      - removeLabel:
-          label: Help-Wanted
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/dup(licate|e)?(\s+of)?\s+\#[\d]+'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!
-      - closeIssue
-      - removeLabel:
-          label: Needs-Triage
-      - addLabel:
-          label: Resolution-Duplicate
-      - removeLabel:
-          label: Needs-Tag-Fix
-      - removeLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      - removeLabel:
-          label: Needs-Repro
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/feedback'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: >2-
-
-            Hi there!<br><br>Can you please send us feedback with the [Feedback Hub](https://support.microsoft.com/en-us/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332) with this issue? Make sure to click the "Start recording" button, then reproduce the issue before submitting the feedback. Once it's submitted, paste the link here so we can more easily find your crash information on the back end?<br><br>Thanks!<br><br>![image](https://user-images.githubusercontent.com/18356694/140811502-a068f78b-89d2-4587-925a-73e19652b830.png)<br><br>![image](https://user-images.githubusercontent.com/18356694/140811557-cdc22a0f-fa6a-4f6a-953e-73b51f5548a3.png)<br><br>![image](https://user-images.githubusercontent.com/18221333/62478649-6de55400-b760-11e9-806e-5aab7e085a9f.png)
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      then:
-      - cleanEmailReply
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - labelSync:
-          pattern: Issue-
-      - labelSync:
-          pattern: Area-
-      - labelSync:
-          pattern: Priority-
-      - labelSync:
-          pattern: Product-
-      - labelSync:
-          pattern: Severity-
-      - labelSync:
-          pattern: Impact-
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/dup(licate|e)?(\s+of)?\s+https'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: Hi! We've identified this issue as a duplicate of one that exists on somebody else's Issue Tracker. Please make sure you subscribe to the referenced external issue for future updates. Thanks for your report!
-      - closeIssue
-      - removeLabel:
-          label: Needs-Triage
-      - addLabel:
-          label: Resolution-External
-      - removeLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      - removeLabel:
-          label: Needs-Bisect
-      - removeLabel:
-          label: Needs-Repro
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: /?
-          isRegex: False
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - removeLabel:
-          label: Needs-Attention
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-onFailure: 
-onSuccess: 

.github/workflows/addToProject.yml

@@ -7,13 +7,13 @@ on:
       - labeled
       - unlabeled
 
-permissions: {}
+permissions: {}
 jobs:
   add-to-project:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v0.3.0
         with:
           project-url: https://github.com/orgs/microsoft/projects/159
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.github/workflows/similarIssues.yml

@@ -1,32 +0,0 @@
-name: GitGudSimilarIssues comments
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  getSimilarIssues:
-    runs-on: ubuntu-latest
-    outputs:
-      message: ${{ steps.getBody.outputs.message }}
-    steps:
-      - id: getBody
-        uses: craigloewen-msft/GitGudSimilarIssues@main
-        with:
-          issuetitle: ${{ github.event.issue.title }}
-          repo: ${{ github.repository }}
-          similaritytolerance: "0.75"
-  add-comment:
-    needs: getSimilarIssues
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    if: needs.getSimilarIssues.outputs.message != ''
-    steps:
-      - name: Add comment
-        run: gh issue comment "$NUMBER" --repo "$REPO" --body "$BODY"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NUMBER: ${{ github.event.issue.number }}
-          REPO: ${{ github.repository }}
-          BODY: ${{ needs.getSimilarIssues.outputs.message }}

.github/workflows/spelling2.yml

@@ -5,7 +5,7 @@ name: Spell checking
 # https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
 #
 # `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
-#   (in odd cases, it might actually run just to collapse a comment, but that's fairly rare)
+#   (in odd cases, it might actually run just to collapse a commment, but that's fairly rare)
 #   it needs `contents: write` in order to add a comment.
 #
 # `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
@@ -34,29 +34,6 @@ name: Spell checking
 #
 #   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
 
-# Sarif reporting
-#
-# Access to Sarif reports is generally restricted (by GitHub) to members of the repository.
-#
-# Requires enabling `security-events: write`
-# and configuring the action with `use_sarif: 1`
-#
-#   For information on the feature, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Sarif-output
-
-# Minimal workflow structure:
-#
-# on:
-#   push:
-#     ...
-#   pull_request_target:
-#     ...
-# jobs:
-#   # you only want the spelling job, all others should be omitted
-#   spelling:
-#     # remove `security-events: write` and `use_sarif: 1`
-#     # remove `experimental_apply_changes_via_bot: 1`
-#     ... otherwise adjust the `with:` as you wish
-
 on:
   push:
     branches:
@@ -66,6 +43,8 @@ on:
   pull_request_target:
     branches:
     - "**"
+    tags-ignore:
+    - "**"
     types:
     - 'opened'
     - 'reopened'
@@ -81,11 +60,10 @@ jobs:
       contents: read
       pull-requests: read
       actions: read
-      security-events: write
     outputs:
       followup: ${{ steps.spelling.outputs.followup }}
     runs-on: ubuntu-latest
-    if: ${{ contains(github.event_name, 'pull_request') || github.event_name == 'push' }}
+    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
     concurrency:
       group: spelling-${{ github.event.pull_request.number || github.ref }}
       # note: If you use only_check_changed_files, you do not want cancel-in-progress
@@ -93,50 +71,35 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@v0.0.21
       with:
-        suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
+        suppress_push_for_open_pull_request: 1
         checkout: true
         check_file_names: 1
-        spell_check_this: microsoft/terminal@main
+        spell_check_this: check-spelling/spell-check-this@prerelease
         post_comment: 0
         use_magic_file: 1
-        report-timing: 1
-        warnings: bad-regex,binary-file,deprecated-feature,ignored-expect-variant,large-file,limited-references,no-newline-at-eof,noisy-file,non-alpha-in-dictionary,token-is-substring,unexpected-line-ending,whitespace-in-dictionary,minified-file,unsupported-configuration,no-files-to-check
-        experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
-        use_sarif: ${{ (!github.event.pull_request || (github.event.pull_request.head.repo.full_name == github.repository)) && 1 }}
-        extra_dictionary_limit: 20
+        extra_dictionary_limit: 10
         extra_dictionaries:
-          cspell:software-terms/dict/softwareTerms.txt
-          cspell:cpp/src/stdlib-cpp.txt
-          cspell:lorem-ipsum/dictionary.txt
-          cspell:cpp/src/stdlib-c.txt
-          cspell:php/dict/php.txt
-          cspell:filetypes/filetypes.txt
-          cspell:java/src/java.txt
-          cspell:python/src/common/extra.txt
-          cspell:node/dict/node.txt
-          cspell:java/src/java-terms.txt
-          cspell:aws/aws.txt
-          cspell:typescript/dict/typescript.txt
-          cspell:dotnet/dict/dotnet.txt
-          cspell:golang/dict/go.txt
-          cspell:fullstack/dict/fullstack.txt
-          cspell:cpp/src/compiler-msvc.txt
+          cspell:software-terms/src/software-terms.txt
           cspell:python/src/python/python-lib.txt
-          cspell:mnemonics/src/mnemonics.txt
-          cspell:cpp/src/stdlib-cmath.txt
-          cspell:css/dict/css.txt
+          cspell:node/node.txt
+          cspell:cpp/src/stdlib-c.txt
+          cspell:cpp/src/stdlib-cpp.txt
+          cspell:fullstack/fullstack.txt
+          cspell:filetypes/filetypes.txt
+          cspell:html/html.txt
+          cspell:cpp/src/compiler-msvc.txt
+          cspell:python/src/common/extra.txt
+          cspell:powershell/powershell.txt
+          cspell:aws/aws.txt
           cspell:cpp/src/lang-keywords.txt
-          cspell:django/dict/django.txt
+          cspell:npm/npm.txt
+          cspell:dotnet/dotnet.txt
           cspell:python/src/python/python.txt
-          cspell:html/dict/html.txt
-          cspell:cpp/src/ecosystem.txt
-          cspell:cpp/src/compiler-clang-attributes.txt
-          cspell:npm/dict/npm.txt
-          cspell:r/src/r.txt
-          cspell:powershell/dict/powershell.txt
-          cspell:csharp/csharp.txt
+          cspell:css/css.txt
+          cspell:cpp/src/stdlib-cmath.txt
+        check_extra_dictionaries: ''
 
   comment-push:
     name: Report (Push)
@@ -148,10 +111,10 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@v0.0.21
       with:
         checkout: true
-        spell_check_this: microsoft/terminal@main
+        spell_check_this: check-spelling/spell-check-this@prerelease
         task: ${{ needs.spelling.outputs.followup }}
 
   comment-pr:
@@ -160,38 +123,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: spelling
     permissions:
-      contents: read
       pull-requests: write
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@v0.0.21
       with:
         checkout: true
-        spell_check_this: microsoft/terminal@main
+        spell_check_this: check-spelling/spell-check-this@prerelease
         task: ${{ needs.spelling.outputs.followup }}
-        experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
-
-  update:
-    name: Update PR
-    permissions:
-      contents: write
-      pull-requests: write
-      actions: read
-    runs-on: ubuntu-latest
-    if: ${{
-        github.repository_owner != 'microsoft' &&
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '@check-spelling-bot apply')
-      }}
-    concurrency:
-      group: spelling-update-${{ github.event.issue.number }}
-      cancel-in-progress: false
-    steps:
-    - name: apply spelling updates
-      uses: check-spelling/check-spelling@v0.0.22
-      with:
-        experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
-        checkout: true
-        ssh_key: "${{ secrets.CHECK_SPELLING }}"

.github/workflows/winget.yml

@@ -5,7 +5,7 @@ on:
     types: [published]
 
 env:
-  REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
+  REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_Win10_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
 
 jobs:
   publish:
@@ -14,7 +14,7 @@ jobs:
       - name: Publish Windows Terminal ${{ github.event.release.prerelease && 'Preview' || 'Stable' }}
         run: |
           $assets = '${{ toJSON(github.event.release.assets) }}' | ConvertFrom-Json
-          $wingetRelevantAsset = $assets | Where-Object { $_.name -like '*.msixbundle' } | Select-Object -First 1
+          $wingetRelevantAsset = $assets | Where-Object { $_.name -like '*Win10*' } | Select-Object -First 1
           $regex = [Regex]::New($env:REGEX)
           $version = $regex.Match($wingetRelevantAsset.name).Groups[1].Value
 

.vscode/settings.json

@@ -6,7 +6,7 @@
     "C_Cpp.loggingLevel": "None",
     "files.associations": {
         "xstring": "cpp",
-        "*.idl": "midl3",
+        "*.idl": "cpp",
         "array": "cpp",
         "future": "cpp",
         "istream": "cpp",
@@ -103,9 +103,7 @@
     "files.exclude": {
         "**/bin/**": true,
         "**/obj/**": true,
+        "**/packages/**": true,
         "**/Generated Files/**": true
-    },
-    "search.exclude": {
-        "**/packages/**": true
     }
-}
+}

CONTRIBUTING.md

@@ -14,7 +14,7 @@ The point of doing all this work in public is to ensure that we are holding ours
 
 The team triages new issues several times a week. During triage, the team uses labels to categorize, manage, and drive the project workflow.
 
-We employ [a bot engine](./doc/bot.md) to help us automate common processes within our workflow.
+We employ [a bot engine](https://github.com/microsoft/terminal/blob/main/doc/bot.md) to help us automate common processes within our workflow.
 
 We drive the bot by tagging issues with specific labels which cause the bot engine to close issues, merge branches, etc. This bot engine helps us keep the repo clean by automating the process of notifying appropriate parties if/when information/follow-up is needed, and closing stale issues/PRs after reminders have remained unanswered for several days.
 
@@ -101,7 +101,7 @@ If you don't have any additional info/context to add but would like to indicate
 
 If you're able & willing to help fix issues and/or implement features, we'd love your contribution!
 
-The best place to start is the list of ["walkthroughs"](https://aka.ms/terminal-walkthroughs). This is a collection of issues where we've written a "walkthrough", little guides to help get started with a particular issue. These are usually good first issues, and are a great way to get familiar with the codebase. Additionally, the list of ["good first issue"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22++label%3A%22good+first+issue%22+)s is another set of issues that might be easier for first-time contributors. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find any issue you're interested in and hop in!
+The best place to start is the list of ["good first issue"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22++label%3A%22good+first+issue%22+)s. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find an issue you're interested in and hop in!
 
 Generally, we categorize issues in the following way, which is largely derived from our old internal work tracking system:
 * ["Bugs"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Bug%22+) are parts of the Terminal & Console that are not quite working the right way. There's code to already support some scenario, but it's not quite working right. Fixing these is generally a matter of debugging the broken functionality and fixing the wrong code.

NOTICE.md

@@ -276,31 +276,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
-## stb
-
-**Source**: [https://github.com/nothings/stb](https://github.com/nothings/stb)
-
-### License
-
-```
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
 ## Oklab
 **Source**: [https://bottosson.github.io/posts/oklab/](https://bottosson.github.io/posts/oklab/)
 

OpenConsole.sln

@@ -239,6 +239,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{89CDCC
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types.Unit.Tests", "src\types\ut_types\Types.Unit.Tests.vcxproj", "{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PublicTerminalCore", "src\cascadia\PublicTerminalCore\PublicTerminalCore.vcxproj", "{84848BFA-931D-42CE-9ADF-01EE54DE7890}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalControl", "src\cascadia\WpfTerminalControl\WpfTerminalControl.csproj", "{376FE273-6B84-4EB5-8B30-8DE9D21B022C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
@@ -332,7 +334,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
 	EndProjectSection
 EndProject
@@ -416,12 +418,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MidiAudio", "src\audio\midi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalStress", "src\tools\TerminalStress\TerminalStress.csproj", "{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingTests", "src\tools\RenderingTests\RenderingTests.vcxproj", "{37C995E0-2349-4154-8E77-4A52C0C7F46D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchcat", "src\tools\benchcat\benchcat.vcxproj", "{2C836962-9543-4CE5-B834-D28E1F124B66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleMonitor", "src\tools\ConsoleMonitor\ConsoleMonitor.vcxproj", "{328729E9-6723-416E-9C98-951F1473BBE1}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -1709,6 +1705,34 @@ Global
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x64.Build.0 = Release|x64
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.ActiveCfg = Release|Win32
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.Build.0 = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.Build.0 = AuditMode|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.Build.0 = Debug|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.ActiveCfg = Debug|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.Build.0 = Debug|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.Build.0 = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|Any CPU.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.ActiveCfg = Release|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.Build.0 = Release|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.ActiveCfg = Release|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.Build.0 = Release|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.Build.0 = Release|Win32
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.ActiveCfg = Debug|Any CPU
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.Build.0 = Debug|Any CPU
@@ -2746,66 +2770,6 @@ Global
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x64.Build.0 = Release|Any CPU
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|x64.ActiveCfg = Release|x64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|x86.ActiveCfg = Release|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|ARM.ActiveCfg = Debug|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x64.ActiveCfg = Debug|x64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x86.ActiveCfg = Debug|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM.ActiveCfg = Release|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x64.ActiveCfg = Release|x64
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x64.ActiveCfg = Release|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x86.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|ARM.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|x64.ActiveCfg = Debug|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|x86.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|Any CPU.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|ARM.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|x64.ActiveCfg = Release|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|x86.ActiveCfg = Release|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.AuditMode|x64.ActiveCfg = Release|x64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.AuditMode|x86.ActiveCfg = Release|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Debug|ARM.ActiveCfg = Debug|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Debug|x64.ActiveCfg = Debug|x64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Debug|x86.ActiveCfg = Debug|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Release|Any CPU.ActiveCfg = Release|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Release|ARM.ActiveCfg = Release|Win32
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Release|x64.ActiveCfg = Release|x64
-		{328729E9-6723-416E-9C98-951F1473BBE1}.Release|x86.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2864,6 +2828,7 @@ Global
 		{05500DEF-2294-41E3-AF9A-24E580B82836} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{1E4A062E-293B-4817-B20D-BF16B979E350} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202}
@@ -2910,9 +2875,6 @@ Global
 		{40BD8415-DD93-4200-8D82-498DDDC08CC8} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{2C836962-9543-4CE5-B834-D28E1F124B66} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{328729E9-6723-416E-9C98-951F1473BBE1} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

README.md

@@ -1,4 +1,4 @@
-![terminal-logos](https://github.com/microsoft/terminal/assets/91625426/333ddc76-8ab2-4eb4-a8c0-4d7b953b1179)
+![terminal-logos](https://user-images.githubusercontent.com/48369326/115790869-4c852b00-a37c-11eb-97f1-f61972c7800c.png)
 
 # Welcome to the Windows Terminal, Console and Command-Line repo
 
@@ -8,8 +8,8 @@ This repository contains the source code for:
 * [Windows Terminal Preview](https://aka.ms/terminal-preview)
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
-* [ColorTool](./src/tools/ColorTool)
-* [Sample projects](./samples)
+* [ColorTool](https://github.com/microsoft/terminal/tree/main/src/tools/ColorTool)
+* [Sample projects](https://github.com/microsoft/terminal/tree/main/samples)
   that show how to consume the Windows Console APIs
 
 Related repositories include:
@@ -21,8 +21,7 @@ Related repositories include:
 
 ## Installing and running Windows Terminal
 
-> [!NOTE]
-> Windows Terminal requires Windows 10 2004 (build 19041) or later
+> **Note**: Windows Terminal requires Windows 10 2004 (build 19041) or later
 
 ### Microsoft Store [Recommended]
 
@@ -53,10 +52,9 @@ fails for any reason, you can try the following command at a PowerShell prompt:
 Add-AppxPackage Microsoft.WindowsTerminal_<versionNumber>.msixbundle
 ```
 
-> [!NOTE]
-> If you install Terminal manually:
+> **Note**: If you install Terminal manually:
 >
-> * You may need to install the [VC++ v14 Desktop Framework Package](https://docs.microsoft.com/troubleshoot/cpp/c-runtime-packages-desktop-bridge#how-to-install-and-update-desktop-framework-packages).
+> * You may need to install the [VC++ v14 Desktop Framework Package](https://docs.microsoft.com/troubleshoot/cpp/c-runtime-packages-desktop-bridge#how-to-install-and-update-desktop-framework-packages).  
 >   This should only be necessary on older builds of Windows 10 and only if you get an error about missing framework packages.
 > * Terminal will not auto-update when new builds are released so you will need
 >   to regularly install the latest Terminal release to receive all the latest
@@ -72,9 +70,6 @@ package:
 winget install --id Microsoft.WindowsTerminal -e
 ```
 
-> [!NOTE]
-> Dependency support is available in WinGet version [1.6.2631 or later](https://github.com/microsoft/winget-cli/releases). To install the Terminal stable release 1.18 or later, please make sure you have the updated version of the WinGet client.
-
 #### Via Chocolatey (unofficial)
 
 [Chocolatey](https://chocolatey.org) users can download and install the latest
@@ -118,31 +113,9 @@ repository.
 
 ---
 
-## Installing Windows Terminal Canary
-Windows Terminal Canary is a nightly build of Windows Terminal. This build has the latest code from our `main` branch, giving you an opportunity to try features before they make it to Windows Terminal Preview.
-
-Windows Terminal Canary is our least stable offering, so you may discover bugs before we have had a chance to find them.
-
-Windows Terminal Canary is available as an App Installer distribution and a Portable ZIP distribution.
-
-The App Installer distribution supports automatic updates. Due to platform limitations, this installer only works on Windows 11.
-
-The Portable ZIP distribution is a portable application. It will not automatically update and will not automatically check for updates. This portable ZIP distribution works on Windows 10 (19041+) and Windows 11.
-
-| Distribution  | Architecture    | Link                                                 |
-|---------------|:---------------:|------------------------------------------------------|
-| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
-| Portable ZIP  | x64             | [download](https://aka.ms/terminal-canary-zip-x64)   |
-| Portable ZIP  | ARM64           | [download](https://aka.ms/terminal-canary-zip-arm64) |
-| Portable ZIP  | x86             | [download](https://aka.ms/terminal-canary-zip-x86)   |
-
-_Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._
-
----
-
 ## Windows Terminal Roadmap
 
-The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and
+The plan for the Windows Terminal [is described here](/doc/roadmap-2022.md) and
 will be updated as the project proceeds.
 
 ## Project Build Status
@@ -262,8 +235,7 @@ Cause: You're launching the incorrect solution in Visual Studio.
 Solution: Make sure you're building & deploying the `CascadiaPackage` project in
 Visual Studio.
 
-> [!NOTE]
-> `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
+> **Note**: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
 > Windows Console that hosts Windows' command-line infrastructure. OpenConsole
 > is used by Windows Terminal to connect to and communicate with command-line
 > applications (via
@@ -286,7 +258,7 @@ enhance Windows Terminal\!
 
 ***BEFORE you start work on a feature/fix***, please read & follow our
 [Contributor's
-Guide](./CONTRIBUTING.md) to
+Guide](https://github.com/microsoft/terminal/blob/main/CONTRIBUTING.md) to
 help avoid any wasted or duplicate effort.
 
 ## Communicating with the Team
@@ -299,10 +271,10 @@ similar open/closed preexisting issues before creating a new issue.**
 If you would like to ask a question that you feel doesn't warrant an issue
 (yet), please reach out to us via Twitter:
 
-* Christopher Nguyen, Product Manager:
-  [@nguyen_dows](https://twitter.com/nguyen_dows)
+* Kayla Cinnamon, Program Manager:
+  [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Mike Griese, Senior Developer: [@zadjii@mastodon.social](https://mastodon.social/@zadjii)
+* Mike Griese, Senior Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
 * Pankaj Bhojwani, Developer
 * Leonard Hecker, Developer: [@LeonardHecker](https://twitter.com/LeonardHecker)
@@ -387,10 +359,10 @@ Please review these brief docs below about our coding practices.
 This is a work in progress as we learn what we'll need to provide people in
 order to be effective contributors to our project.
 
-* [Coding Style](./doc/STYLE.md)
-* [Code Organization](./doc/ORGANIZATION.md)
-* [Exceptions in our legacy codebase](./doc/EXCEPTIONS.md)
-* [Helpful smart pointers and macros for interfacing with Windows in WIL](./doc/WIL.md)
+* [Coding Style](https://github.com/microsoft/terminal/blob/main/doc/STYLE.md)
+* [Code Organization](https://github.com/microsoft/terminal/blob/main/doc/ORGANIZATION.md)
+* [Exceptions in our legacy codebase](https://github.com/microsoft/terminal/blob/main/doc/EXCEPTIONS.md)
+* [Helpful smart pointers and macros for interfacing with Windows in WIL](https://github.com/microsoft/terminal/blob/main/doc/WIL.md)
 
 ---
 

SUPPORT.md

@@ -14,4 +14,4 @@ Support for Windows Terminal is limited to the resources listed above.
 [gh-bug]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Bug&template=bug_report.md&title=
 [gh-feature]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Feature&template=Feature_Request.md&title=
 [docs]: https://docs.microsoft.com/windows/terminal
-[contributor]: ./CONTRIBUTING.md
+[contributor]: https://github.com/microsoft/terminal/blob/main/CONTRIBUTING.md

build/Helix/ConvertWttLogToXUnit.ps1

@@ -20,7 +20,9 @@ Param(
 $helixResultsContainerUri = $Env:HELIX_RESULTS_CONTAINER_URI
 $helixResultsContainerRsas = $Env:HELIX_RESULTS_CONTAINER_RSAS
 
+$rerunPassesRequiredToAvoidFailure = $env:rerunPassesRequiredToAvoidFailure
+
 Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
 
 $testResultParser = [HelixTestHelpers.TestResultParser]::new($TestNamePrefix, $helixResultsContainerUri, $helixResultsContainerRsas)
-$testResultParser.ConvertWttLogToXUnitLog($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath, $XUnitOutputPath)
+$testResultParser.ConvertWttLogToXUnitLog($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath, $XUnitOutputPath, $rerunPassesRequiredToAvoidFailure)

build/Helix/HelixTestHelpers.cs

@@ -20,13 +20,32 @@ namespace HelixTestHelpers
         public string Name { get; set; }
         public string SourceWttFile { get; set; }
         public bool Passed { get; set; }
-        public bool Skipped { get; set; }
         public bool CleanupPassed { get; set; }
         public TimeSpan ExecutionTime { get; set; }
         public string Details { get; set; }
 
         public List<string> Screenshots { get; private set; }
         public List<TestResult> RerunResults { get; private set; }
+
+        // Returns true if the test pass rate is sufficient to avoid being counted as a failure.
+        public bool PassedOrUnreliable(int requiredNumberOfPasses)
+        {
+            if(Passed)
+            {
+                return true;
+            }
+            else
+            {
+                if(RerunResults.Count == 1)
+                {
+                    return RerunResults[0].Passed;
+                }
+                else
+                {
+                    return RerunResults.Where(r => r.Passed).Count() >= requiredNumberOfPasses;
+                }
+            }
+        }
     }
     
     //
@@ -202,9 +221,7 @@ namespace HelixTestHelpers
                         testsExecuting--;
 
                         // If any inner test fails, we'll still fail the outer
-                        var value = element.Attribute("Result").Value;
-                        currentResult.Passed = value == "Pass";
-                        currentResult.Skipped = value == "Skipped";
+                        currentResult.Passed &= element.Attribute("Result").Value == "Pass";
 
                         // Only gather execution data if this is the outer test we ran initially
                         if (testsExecuting == 0)
@@ -481,7 +498,7 @@ namespace HelixTestHelpers
             return subResultsJsonByMethod;
         }
 
-        public void ConvertWttLogToXUnitLog(string wttInputPath, string wttSingleRerunInputPath, string wttMultipleRerunInputPath, string xunitOutputPath)
+        public void ConvertWttLogToXUnitLog(string wttInputPath, string wttSingleRerunInputPath, string wttMultipleRerunInputPath, string xunitOutputPath, int requiredPassRateThreshold)
         {
             TestPass testPass = TestPass.ParseTestWttFileWithReruns(wttInputPath, wttSingleRerunInputPath, wttMultipleRerunInputPath, cleanupFailuresAreRegressions: true, truncateTestNames: false);
             var results = testPass.TestResults;
@@ -493,8 +510,8 @@ namespace HelixTestHelpers
             // If the test failed sufficiently often enough for it to count as a failed test (determined by a property on the
             // Azure DevOps job), we'll later mark it as failed during test results processing.
 
-            int failedCount = results.Where(r => !r.Passed).Count();
-            int skippedCount = results.Where(r => (!r.Passed && r.Skipped)).Count();
+            int failedCount = results.Where(r => !r.PassedOrUnreliable(requiredPassRateThreshold)).Count();
+            int skippedCount = results.Where(r => !r.Passed && r.PassedOrUnreliable(requiredPassRateThreshold)).Count();
 
             var root = new XElement("assemblies");
 
@@ -540,13 +557,12 @@ namespace HelixTestHelpers
                 
                 string resultString = string.Empty;
                 
-                if (result.Passed && !result.Skipped)
+                if (result.Passed)
                 {
                     resultString = "Pass";
                 }
-                else if (result.Skipped)
+                else if(result.PassedOrUnreliable(requiredPassRateThreshold))
                 {
-
                     resultString = "Skip";
                 }
                 else
@@ -555,25 +571,31 @@ namespace HelixTestHelpers
                 }
 
                 
+                test.SetAttributeValue("result", resultString);
+
                 if (!result.Passed)
                 {
-                    if (result.Skipped)
+                    // If a test failed, we'll have rerun it multiple times.
+                    // We'll save the subresults to a JSON text file that we'll upload to the helix results container -
+                    // this allows it to be as long as we want, whereas the reason field in Azure DevOps has a 4000 character limit.
+                    string subResultsFileName = methodName + "_subresults.json";
+                    string subResultsFilePath = Path.Combine(Path.GetDirectoryName(wttInputPath), subResultsFileName);
+					
+                    if (result.PassedOrUnreliable(requiredPassRateThreshold))
                     {
                         var reason = new XElement("reason");
-                        reason.Add(new XCData("Test skipped"));
+                        reason.Add(new XCData(GetUploadedFileUrl(subResultsFileName, helixResultsContainerUri, helixResultsContainerRsas)));
                         test.Add(reason);
                     }
-                    else {
+                    else
+                    {
                         var failure = new XElement("failure");
                         var message = new XElement("message");
-                        message.Add(new XCData("Test failed"));
+						message.Add(new XCData(GetUploadedFileUrl(subResultsFileName, helixResultsContainerUri, helixResultsContainerRsas)));
                         failure.Add(message);
                         test.Add(failure);
                     }
                 }
-
-                test.SetAttributeValue("result", resultString);
-
                 collection.Add(test);
             }
 

build/Helix/OutputTestErrorsForAzureDevops.ps1

@@ -1,38 +0,0 @@
-Param(
-    [Parameter(Mandatory = $true)]
-    [string]$XUnitOutputPath
-)
-
-# This script is used to parse the XUnit output from the test runs and print out
-# the tests that failed.
-#
-# Why you might ask? Well, it sure seems like Azure DevOps doesn't like the fact
-# that we just call our tests in a powershell script. It can't seemingly find
-# the actual errors in the TAEF logs. That means when you just go to the
-# "Checks" page on GitHub, the Azure DevOps integration doesn't have anything
-# meaningful to say other than "PowerShell exited with code '1'". If we however,
-# just manually emit the test names formatted with "#[error]" in front of them,
-# well, then the integration will all work like magic.
-
-# Load the test results as a XML object
-$testResults = [xml](Get-Content -Path $XUnitOutputPath)
-
-# Our XML looks like:
-# <assemblies>
-#   <assembly name="MUXControls.Test.dll" test-framework="TAEF" run-date="2023-08-14" run-time="11:38:01" total="524" passed="520" failed="4" skipped="1" time="8943" errors="0">
-#     <collection total="524" passed="520" failed="4" skipped="1" name="Test collection" time="8943">
-#       <test name="ControlCoreTests::TestSimpleClickSelection" type="ControlCoreTests" method="TestSimpleClickSelection" time="0.016" result="Fail">
-
-# Iterate over all the assemblies and print all the tests that failed
-foreach ($assembly in $testResults.assemblies.assembly) {
-    foreach ($collection in $assembly.collection) {
-        foreach ($test in $collection.test) {
-            if ($test.result -eq "Fail") {
-                # This particular format is taken from the Azure DevOps documentation:
-                # https://github.com/microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
-                # This will treat this line as an error message
-                Write-Output "##vso[task.logissue type=error]$($test.name) Failed"
-            }
-        }
-    }
-}

build/config/esrp.build.batch.wpf.json

@@ -1,7 +1,7 @@
 [
     {
         "MatchedPath": [
-            "Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll"
+            "PublicTerminalCore.dll"
         ],
         "SigningInfo": {
             "Operations": [

build/config/template.appinstaller

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AppInstaller
-  xmlns="http://schemas.microsoft.com/appx/appinstaller/2017/2"
-  Version="1.0.0.0"
-  Uri="$$ROOT$$$$NAME$$.appinstaller">
-
-  <MainBundle
-    Name="$$NAME$$"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="$$VERSION$$"
-    Uri="$$ROOT$$$$PACKAGE$$" />
-
-  <Dependencies>
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="x64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x64.appx" />
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="x86"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x86.appx" />
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="arm64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.arm64.appx" />
-  </Dependencies>
-
-  <UpdateSettings>
-    <OnLaunch
-      HoursBetweenUpdateChecks="6" />
-  </UpdateSettings>
-</AppInstaller>

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>main</PGOBranch>
+    <PGOBranch>release-1.17</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

build/pipelines/ci.yml

@@ -102,7 +102,7 @@ stages:
 
   - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
     - stage: CodeIndexer
-      displayName: GitHub CodeNav Indexer
+      displayName: Github CodeNav Indexer
       dependsOn: []
       jobs:
         - template: ./templates-v2/job-index-github-codenav.yml

build/pipelines/nightly.yml

@@ -0,0 +1,23 @@
+trigger: none
+pr: none
+schedules:
+  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
+    displayName: "Nightly Terminal Build"
+    branches:
+      include:
+        - main
+    always: false # only run if there's code changes!
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+extends:
+  template: templates-v2\pipeline-full-release-build.yml
+  parameters:
+    branding: Canary
+    buildTerminal: true
+    pgoBuildMode: Optimize
+    codeSign: true
+    generateSbom: true
+    publishSymbolsToPublic: true
+    publishVpackToWindows: false
+    symbolExpiryTime: 15 # Nightly builds do not keep symbols for very long!

build/pipelines/ob-nightly.yml

@@ -35,13 +35,9 @@ extends:
     symbolExpiryTime: 15
     ${{ if eq(true, parameters.publishToAzure) }}:
       extraPublishJobs:
-        - template: build/pipelines/templates-v2/job-deploy-to-azure-storage.yml@self
+        - template: job-deploy-to-azure-storage.yml
           parameters:
             pool: { type: windows }
-            variables:
-              ob_git_checkout: false # This job checks itself out
-              ob_git_skip_checkout_none: true
-              ob_outputDirectory: "$(Build.SourcesDirectory)/_none"
             dependsOn: [PublishSymbols]
             storagePublicRootURL: $(AppInstallerRootURL)
             subscription: $(AzureSubscriptionName)

build/pipelines/release.yml

@@ -0,0 +1,88 @@
+trigger: none
+pr: none
+
+# Expose all of these parameters for user configuration.
+parameters:
+  - name: branding
+    displayName: "Branding (Build Type)"
+    type: string
+    default: Release
+    values:
+      - Release
+      - Preview
+      - Dev
+  - name: buildTerminal
+    displayName: "Build Windows Terminal MSIX"
+    type: boolean
+    default: true
+  - name: buildConPTY
+    displayName: "Build ConPTY NuGet"
+    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
+    displayName: "Build Configurations"
+    type: object
+    default:
+      - Release
+  - name: buildPlatforms
+    displayName: "Build Platforms"
+    type: object
+    default:
+      - x64
+      - x86
+      - arm64
+  - name: codeSign
+    displayName: "Sign all build outputs"
+    type: boolean
+    default: true
+  - name: generateSbom
+    displayName: "Generate a Bill of Materials"
+    type: boolean
+    default: true
+  - name: terminalInternalPackageVersion
+    displayName: "Terminal Internal Package Version"
+    type: string
+    default: '0.0.8'
+
+  - name: runCompliance
+    displayName: "Run Compliance and Security Build"
+    type: boolean
+    default: true
+  - name: publishSymbolsToPublic
+    displayName: "Publish Symbols to MSDL"
+    type: boolean
+    default: true
+  - name: publishVpackToWindows
+    displayName: "Publish VPack to Windows"
+    type: boolean
+    default: false
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+extends:
+  template: templates-v2/pipeline-full-release-build.yml
+  parameters:
+    branding: ${{ parameters.branding }}
+    buildTerminal: ${{ parameters.buildTerminal }}
+    buildConPTY: ${{ parameters.buildConPTY }}
+    buildWPF: ${{ parameters.buildWPF }}
+    pgoBuildMode: ${{ parameters.pgoBuildMode }}
+    buildConfigurations: ${{ parameters.buildConfigurations }}
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    codeSign: ${{ parameters.codeSign }}
+    generateSbom: ${{ parameters.generateSbom }}
+    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
+    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
+    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

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

@@ -92,11 +92,6 @@ jobs:
     # Yup.
     BuildTargetParameter: ' '
     SelectedSigningFragments: ' '
-    # When building the unpackaged distribution, build it in portable mode if it's Canary-branded
-    ${{ if eq(parameters.branding, 'Canary') }}:
-      UnpackagedBuildArguments: -PortableMode
-    ${{ else }}:
-      UnpackagedBuildArguments: ' '
     JobOutputDirectory: $(Terminal.BinDir)
     JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
     ${{ insert }}: ${{ parameters.variables }}
@@ -122,7 +117,7 @@ jobs:
           $SignFragments += "wpfdotnet"
         }
         If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
+          $BuildTargets += "Terminal\wpf\PublicTerminalCore"
           $SignFragments += "wpf"
         }
         If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
@@ -274,7 +269,7 @@ jobs:
     - pwsh: |-
         $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
         $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_unpackaged" -ErrorAction:Ignore
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 $(UnpackagedBuildArguments) -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
+        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
       displayName: Build Unpackaged Distribution (from MSIX)
       condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
 

build/pipelines/templates-v2/job-deploy-to-azure-storage.yml

@@ -1,92 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: buildPlatforms
-    type: object
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: variables
-    type: object
-    default: {}
-  - name: environment
-    type: string
-  - name: storagePublicRootURL
-    type: string
-  - name: subscription
-    type: string
-  - name: storageAccount
-    type: string
-  - name: storageContainer
-    type: string
-
-jobs:
-- job: DeployAzure
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Publish to Azure Storage (Prod)
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - download: none
-
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download MSIX Bundle Artifact
-    inputs:
-      artifactName: appxbundle-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-      downloadPath: '$(Build.SourcesDirectory)/_out'
-      itemPattern: '**/*.msixbundle'
-
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download unpackaged build for ${{ platform }} ${{ parameters.buildConfiguration }}
-      inputs:
-        artifactName: build-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        downloadPath: '$(Build.SourcesDirectory)/_unpackaged'
-        itemPattern: '**/_unpackaged/*.zip'
-
-  - pwsh: |-
-      $b = Get-Item _out/*.msixbundle
-      ./build/scripts/New-AppInstallerFromTemplateAndBundle.ps1 -BundlePath $b.FullName -AppInstallerTemplatePath ./build/config/template.appinstaller -AppInstallerRoot "${{ parameters.storagePublicRootURL }}" -OutputPath _out/Microsoft.WindowsTerminalCanary.appinstaller
-    displayName: "Produce AppInstaller for MSIX bundle"
-
-  - pwsh: |-
-      $zips = Get-ChildItem -Recurse -Filter *.zip _unpackaged
-      $zips | ForEach-Object {
-        $name = $_.Name
-        $parts = $name.Split('_')
-        $parts[1] = "latest"
-        $name = [String]::Join('_', $parts)
-        $_ | Move-Item -Destination (Join-Path "_out" $name)
-      }
-    displayName: "Wrangle Unpackaged builds into place, rename"
-
-  - powershell: |-
-      Get-PackageProvider -Name NuGet -ForceBootstrap
-      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
-    displayName: Install Azure Module Dependencies
-
-  - task: AzureFileCopy@5
-    displayName: Publish to Storage Account
-    inputs:
-      sourcePath: _out/*
-      Destination: AzureBlob
-      azureSubscription: ${{ parameters.subscription }}
-      storage: ${{ parameters.storageAccount }}
-      ContainerName: ${{ parameters.storageContainer }}
-      AdditionalArgumentsForBlobCopy: "--content-type application/octet-stream"
-

build/pipelines/templates-v2/job-index-github-codenav.yml

@@ -1,6 +1,6 @@
 jobs:
 - job: CodeNavIndexer
-  displayName: Run GitHub CodeNav Indexer
+  displayName: Run Github CodeNav Indexer
   pool: { vmImage: windows-2022 }
 
   steps:

build/pipelines/templates-v2/job-merge-msix-into-bundle.yml

@@ -51,8 +51,6 @@ jobs:
       BundleStemName: Microsoft.WindowsTerminal
     ${{ elseif eq(parameters.branding, 'Preview') }}:
       BundleStemName: Microsoft.WindowsTerminalPreview
-    ${{ elseif eq(parameters.branding, 'Canary') }}:
-      BundleStemName: Microsoft.WindowsTerminalCanary
     ${{ else }}:
       BundleStemName: WindowsTerminalDev
     JobOutputDirectory: '$(System.ArtifactsDirectory)/bundle'

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

@@ -65,6 +65,7 @@ jobs:
         -LogPath '${{ parameters.testLogPath }}'
         -Root "$(Terminal.BinDir)"
         -AdditionalTaefArguments '/select:(@IsPGO=true)','/p:WTTestContent=$(TerminalTestContentPath)'
+    condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
 
   - task: CopyFiles@2
     displayName: 'Copy PGO outputs to Artifacts'

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

@@ -47,6 +47,7 @@ jobs:
       targetType: filePath
       filePath: build\scripts\Run-Tests.ps1
       arguments: -MatchPattern '*unit.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
+    condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
 
   - ${{ if or(eq(parameters.platform, 'x64'), eq(parameters.platform, 'arm64')) }}:
     - task: PowerShell@2
@@ -55,26 +56,19 @@ jobs:
         targetType: filePath
         filePath: build\scripts\Run-Tests.ps1
         arguments: -MatchPattern '*feature.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
+      condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
 
   - task: PowerShell@2
     displayName: 'Convert Test Logs from WTL to xUnit format'
-    condition: always()
     inputs:
       targetType: filePath
       filePath: build\Helix\ConvertWttLogToXUnit.ps1
       arguments: -WttInputPath '${{ parameters.testLogPath }}' -WttSingleRerunInputPath 'unused.wtl' -WttMultipleRerunInputPath 'unused2.wtl' -XUnitOutputPath 'onBuildMachineResults.xml' -TestNamePrefix '$(BuildConfiguration).$(BuildPlatform)'
-
-  - task: PowerShell@2
-    displayName: 'Manually log test failures'
-    condition: always()
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\OutputTestErrorsForAzureDevops.ps1
-      arguments: -XUnitOutputPath 'onBuildMachineResults.xml'
+    condition: ne(variables['PGOBuildMode'], 'Instrument')
 
   - task: PublishTestResults@2
     displayName: 'Upload converted test logs'
-    condition: always()
+    condition: ne(variables['PGOBuildMode'], 'Instrument')
     inputs:
       testResultsFormat: 'xUnit' # Options: JUnit, NUnit, VSTest, xUnit, cTest
       testResultsFiles: '**/onBuildMachineResults.xml'
@@ -84,7 +78,6 @@ jobs:
 
   - task: CopyFiles@2
     displayName: 'Copy result logs to Artifacts'
-    condition: always()
     inputs:
       Contents: |
        **/*.wtl

build/pipelines/templates-v2/pipeline-full-release-build.yml

@@ -51,9 +51,6 @@ parameters:
     type: boolean
     default: false
 
-  - name: extraPublishJobs
-    type: object
-    default: []
   - name: pool
     type: object
     default:
@@ -177,5 +174,4 @@ stages:
           includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
           symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
 
-      - ${{ parameters.extraPublishJobs }}
 ...

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -46,9 +46,6 @@ parameters:
   - name: publishSymbolsToPublic
     type: boolean
     default: true
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
   - name: publishVpackToWindows
     type: boolean
     default: false
@@ -205,15 +202,10 @@ extends:
                 generateSbom: false # Handled by onebranch
                 codeSign: ${{ parameters.codeSign }}
                 afterBuildSteps:
-                  # This directory has to exist, even if we aren't using createvpack, because the Guardian rules demand it.
                   - pwsh: |-
-                      New-Item "$(JobOutputDirectory)/vpack" -Type Directory
-                    displayName: Make sure the vpack directory exists
-
-                  - ${{ if parameters.publishVpackToWindows }}:
-                    - pwsh: |-
-                        Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path "$(JobOutputDirectory)/vpack" 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
-                      displayName: Stage msixbundle for vpack
+                      $d = New-Item "$(JobOutputDirectory)/vpack" -Type Directory
+                      Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path $d 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
+                    displayName: Stage msixbundle for vpack
 
           - ${{ if eq(parameters.buildConPTY, true) }}:
             - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
@@ -254,7 +246,6 @@ extends:
               pool: { type: windows }
               includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
               symbolPatGoesInTaskInputs: true # onebranch tries to muck with the PAT variable, so we need to change how it get the PAT
-              symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
               variables:
                 ob_git_checkout: false # This job checks itself out
                 ob_git_skip_checkout_none: true

build/rules/Branding.targets

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Canary'">WT_BRANDING_CANARY</_WTBrandingPreprocessorToken>
     <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Preview'">WT_BRANDING_PREVIEW</_WTBrandingPreprocessorToken>
     <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Release'">WT_BRANDING_RELEASE</_WTBrandingPreprocessorToken>
     <_WTBrandingPreprocessorToken Condition="'$(_WTBrandingPreprocessorToken)'==''">WT_BRANDING_DEV</_WTBrandingPreprocessorToken>

build/rules/GenerateSxsManifestsFromWinmds.targets

@@ -30,7 +30,7 @@
           DependsOnTargets="_ConsoleMapWinmdsToManifestFiles">
 
     <!-- This target is batched and a new Exec is spawned for each entry in _ConsoleWinmdManifest. -->
-    <Exec Command="mt.exe -winmd:&quot;%(_ConsoleWinmdManifest.WinMDPath)&quot; -dll:%(_ConsoleWinmdManifest.Implementation) -out:&quot;%(_ConsoleWinmdManifest.Identity)&quot;" />
+    <Exec Command="mt.exe -winmd:%(_ConsoleWinmdManifest.WinMDPath) -dll:%(_ConsoleWinmdManifest.Implementation) -out:%(_ConsoleWinmdManifest.Identity)" />
 
     <ItemGroup>
       <!-- Emit the generated manifest into the Link inputs. -->

build/rules/Microsoft.UI.Xaml.Additional.targets

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains targets that override behavior in Microsoft.UI.Xaml and
-    related packages.
-
-    For example: All XAML needs is a reference to WebView2; it does not need the
-    DLL and it does not need for us to copy the WinMD into the output folder. It
-    also doesn't require the WebView2 loader since we're not actually using
-    WebView2. Therefore, we can get away with *not including the WebView2
-    package* and only adding a reference to its winmd.
-  -->
-  <ItemGroup>
-    <Reference Include="$(WebView2PackageRoot)\lib\Microsoft.Web.WebView2.Core.winmd" />
-  </ItemGroup>
-</Project>

build/scripts/Invoke-FormattingCheck.ps1

@@ -10,7 +10,7 @@ function Invoke-CheckBadCodeFormatting() {
 
     # returns a non-zero exit code if there are any diffs in the tracked files in the repo
     git diff-index --quiet HEAD --
-    if ($LASTEXITCODE -eq 1) {
+    if ($lastExitCode -eq 1) {
 
         # Write the list of files that need updating to the log
         git diff-index --name-only HEAD

build/scripts/New-AppInstallerFromTemplateAndBundle.ps1

@@ -1,42 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory,
-      HelpMessage="Path to the .msixbundle")]
-    [string]
-    $BundlePath,
-
-    [Parameter(Mandatory,
-      HelpMessage="Path to the .appinstaller template")]
-    [string]
-    $AppInstallerTemplatePath,
-
-    [string]
-    $AppInstallerRoot,
-
-    [Parameter(Mandatory,
-      HelpMessage="Output Path")]
-    [string]
-    $OutputPath
-)
-
-$ErrorActionPreference = "Stop"
-
-$sentinelFile = New-TemporaryFile
-$directory = New-Item -Type Directory "$($sentinelFile.FullName)_Package"
-Remove-Item $sentinelFile -Force -EA:Ignore
-
-$bundle = (Get-Item $BundlePath)
-& tar.exe -x -f $bundle.FullName -C $directory AppxMetadata/AppxBundleManifest.xml
-
-$xml = [xml](Get-Content (Join-Path $directory "AppxMetadata\AppxBundleManifest.xml"))
-$name = $xml.Bundle.Identity.Name
-$version = $xml.Bundle.Identity.Version
-
-$doc = (Get-Content -ReadCount 0 $AppInstallerTemplatePath)
-$doc = $doc -Replace '\$\$ROOT\$\$',$AppInstallerRoot
-$doc = $doc -Replace '\$\$NAME\$\$',$name
-$doc = $doc -Replace '\$\$VERSION\$\$',$version
-$doc = $doc -Replace '\$\$PACKAGE\$\$',$bundle.Name
-$doc | Out-File -Encoding utf8NoBOM $OutputPath
-
-Get-Item $OutputPath

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -1,36 +1,24 @@
-[CmdletBinding(DefaultParameterSetName = 'AppX')]
 Param(
-    [Parameter(Mandatory, HelpMessage="Path to Terminal AppX", ParameterSetName = 'AppX')]
+    [Parameter(Mandatory,
+      HelpMessage="Path to Terminal AppX")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
     $TerminalAppX,
 
-    [Parameter(Mandatory, HelpMessage="Path to Terminal Layout Deployment", ParameterSetName='Layout')]
-    [ValidateScript({Test-Path $_ -Type Container})]
-    [string]
-    $TerminalLayout,
-
-    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='AppX')]
-    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='Layout')]
+    [Parameter(Mandatory,
+      HelpMessage="Path to Xaml AppX")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
     $XamlAppX,
 
-    [Parameter(HelpMessage="Output Directory", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Output Directory", ParameterSetName='Layout')]
+    [Parameter(HelpMessage="Output Directory")]
     [string]
     $Destination = ".",
 
-    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='Layout')]
+    [Parameter(HelpMessage="Path to makeappx.exe")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe",
-
-    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='Layout')]
-    [switch]
-    $PortableMode = $PSCmdlet.ParameterSetName -eq 'Layout'
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe"
 )
 
 $filesToRemove = @("*.xml", "*.winmd", "Appx*", "Images/*Tile*", "Images/*Logo*") # Remove from Terminal
@@ -48,17 +36,14 @@ $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString
 New-Item -ItemType Directory -Path $tempDir | Out-Null
 
 $XamlAppX = Get-Item $XamlAppX | Select-Object -Expand FullName
+$TerminalAppX = Get-Item $TerminalAppX | Select-Object -Expand FullName
 
 ########
 # Reading the AppX Manifest for preliminary info
 ########
 
-If ($TerminalAppX) {
-	$appxManifestPath = Join-Path $tempDir AppxManifest.xml
-	& tar.exe -x -f "$TerminalAppX" -C $tempDir AppxManifest.xml
-} ElseIf($TerminalLayout) {
-	$appxManifestPath = Join-Path $TerminalLayout AppxManifest.xml
-}
+$appxManifestPath = Join-Path $tempDir AppxManifest.xml
+& tar.exe -x -f "$TerminalAppX" -C $tempDir AppxManifest.xml
 $manifest = [xml](Get-Content $appxManifestPath)
 $pfn = $manifest.Package.Identity.Name
 $version = $manifest.Package.Identity.Version
@@ -72,20 +57,13 @@ $terminalDir = "terminal-{0}" -f ($version)
 ########
 
 $terminalAppPath = Join-Path $tempdir $terminalDir
-
-If ($TerminalAppX) {
-	$TerminalAppX = Get-Item $TerminalAppX | Select-Object -Expand FullName
-	New-Item -ItemType Directory -Path $terminalAppPath | Out-Null
-	& $MakeAppxPath unpack /p $TerminalAppX /d $terminalAppPath /o | Out-Null
-	If ($LASTEXITCODE -Ne 0) {
-	    Throw "Unpacking $TerminalAppX failed"
-	}
-} ElseIf ($TerminalLayout) {
-	Copy-Item -Recurse -Path $TerminalLayout -Destination $terminalAppPath
-}
-
 $xamlAppPath = Join-Path $tempdir "xaml"
+New-Item -ItemType Directory -Path $terminalAppPath | Out-Null
 New-Item -ItemType Directory -Path $xamlAppPath | Out-Null
+& $MakeAppxPath unpack /p $TerminalAppX /d $terminalAppPath /o | Out-Null
+If ($LASTEXITCODE -Ne 0) {
+    Throw "Unpacking $TerminalAppX failed"
+}
 & $MakeAppxPath unpack /p $XamlAppX /d $xamlAppPath /o | Out-Null
 If ($LASTEXITCODE -Ne 0) {
     Throw "Unpacking $XamlAppX failed"
@@ -127,24 +105,13 @@ $finalTerminalPriFile = Join-Path $terminalAppPath "resources.pri"
     -TerminalRoot $terminalAppPath `
     -XamlRoot $xamlAppPath `
     -OutputPath $finalTerminalPriFile `
-    -Verbose:$Verbose | Out-Host
+    -Verbose:$Verbose
 
 ########
 # Packaging
 ########
 
-$portableModeMarkerFile = Join-Path $terminalAppPath ".portable"
-If ($PortableMode) {
-	"" | Out-File $portableModeMarkerFile
-}
-
-If ($PSCmdlet.ParameterSetName -Eq "AppX") {
-	# We only produce a ZIP when we're combining two AppX directories.
-	New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null
-	$outputZip = (Join-Path $Destination ("{0}.zip" -f ($distributionName)))
-	& tar -c --format=zip -f $outputZip -C $tempDir $terminalDir
-	Remove-Item -Recurse -Force $tempDir -EA:SilentlyContinue
-	Get-Item $outputZip
-} ElseIf ($PSCmdlet.ParameterSetName -Eq "Layout") {
-	Get-Item $terminalAppPath
-}
+New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null
+$outputZip = (Join-Path $Destination ("{0}.zip" -f ($distributionName)))
+& tar -c --format=zip -f $outputZip -C $tempDir $terminalDir
+Get-Item $outputZip

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -70,24 +70,23 @@ Try {
 
     $dependencies = $Manifest.Package.Dependencies.PackageDependency.Name
     $depsHasVclibsDesktop = ("Microsoft.VCLibs.140.00.UWPDesktop" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug.UWPDesktop" -in $dependencies)
-    $depsHasVclibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
+    $depsHasVcLibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
     $filesHasVclibsDesktop = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d.dll" -EA:Ignore))
     $filesHasVclibsAppX = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140_app.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d_app.dll" -EA:Ignore))
 
-    If ($filesHasVclibsDesktop) {
-        Throw "Package contains the desktop VCLibs"
+    If ($depsHasVclibsDesktop -Eq $filesHasVclibsDesktop) {
+        $eitherBoth = if ($depsHasVclibsDesktop) { "both" } else { "neither" }
+        $neitherNor = if ($depsHasVclibsDesktop) { "and" } else { "nor" }
+        Throw "Package has $eitherBoth Dependency $neitherNor Integrated Desktop VCLibs"
     }
 
-    If ($depsHasVclibsDesktop) {
-        Throw "Package has a dependency on the desktop VCLibs"
-    }
-
-    If ($filesHasVclibsAppX) {
-        Throw "Package contains the AppX VCLibs"
-    }
-
-    If ($depsHasVclibsAppX) {
-        Throw "Package has a dependency on the AppX VCLibs"
+    If ($depsHasVclibsAppx -Eq $filesHasVclibsAppx) {
+        if ($depsHasVclibsAppx) {
+            # We've shipped like this forever, so downgrade to warning.
+            Write-Warning "Package has both Dependency and Integrated AppX VCLibs"
+        } else {
+            Throw "Package has neither Dependency nor Integrated AppX VCLibs"
+        }
     }
 
     ### Check that we have an App.xbf (which is a proxy for our resources having been merged)

custom.props

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

dep/nuget/packages.config

@@ -4,12 +4,12 @@
   <!-- Native packages -->
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
+  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
   <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.7.230706001" targetFramework="native" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
-  <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230824.2" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />

doc/AddASetting.md

@@ -5,10 +5,10 @@
       `.../console/published/wincon.w` in the OS repo when you submit the PR.
       The branch won't build without it.
     * For now, you can update winconp.h with your consumable changes.
-    * Define registry name (ex: `CONSOLE_REGISTRY_CURSORCOLOR`)
-    * Add the setting to `CONSOLE_STATE_INFO`.
+    * Define registry name (ex `CONSOLE_REGISTRY_CURSORCOLOR`)
+    * Add the setting to `CONSOLE_STATE_INFO`
     * Define the property key ID and the property key itself.
-        - Yes, the large majority of the `DEFINE_PROPERTYKEY` defs are the same, it's only the last byte of the guid that changes.
+        - Yes, the large majority of the `DEFINE_PROPERTYKEY` defs are the same, it's only the last byte of the guid that changes
 
 2. Add matching fields to Settings.hpp
     - Add getters, setters, the whole drill.
@@ -17,9 +17,9 @@
     - We need to add it to *reading and writing* the registry from the propsheet, and *reading* the link from the propsheet. Yes, that's weird, but the propsheet is smart enough to re-use ShortcutSerialization::s_SetLinkValues, but not smart enough to do the same with RegistrySerialization.
     - `src/propsheet/registry.cpp`
         -  `propsheet/registry.cpp@InitRegistryValues` should initialize the default value for the property.
-        -  `propsheet/registry.cpp@GetRegistryValues` should make sure to read the property from the registry.
+        -  `propsheet/registry.cpp@GetRegistryValues` should make sure to read the property from the registry
 
-4. Add the field to the propslib registry map.
+4. Add the field to the propslib registry map
 
 5. Add the value to `ShortcutSerialization.cpp`
     - Read the value in `ShortcutSerialization::s_PopulateV2Properties`
@@ -30,11 +30,11 @@ Now, your new setting should be stored just like all the other properties.
 
 7. Update the feature test properties to get add the setting as well
     - `ft_uia/Common/NativeMethods.cs@WinConP`:
-        - `Wtypes.PROPERTYKEY PKEY_Console_`.
-        - `NT_CONSOLE_PROPS`.
+        - `Wtypes.PROPERTYKEY PKEY_Console_`
+        - `NT_CONSOLE_PROPS`
 
 8. Add the default value for the setting to `win32k-settings.man`
     - If the setting shouldn't default to 0 or `nullptr`, then you'll need to set the default value of the setting in `win32k-settings.man`.
 
-9. Update `Settings::InitFromStateInfo` and `Settings::CreateConsoleStateInfo` to get/set the value in a CONSOLE_STATE_INFO appropriately.
+9. Update `Settings::InitFromStateInfo` and `Settings::CreateConsoleStateInfo` to get/set the value in a CONSOLE_STATE_INFO appropriately
 

doc/COOKED_READ_DATA.md

@@ -1,96 +0,0 @@
-# COOKED_READ_DATA, aka conhost's readline implementation
-
-## Test instructions
-
-All of the following ✅ marks must be fulfilled during manual testing:
-* ASCII input
-* Chinese input (中文維基百科) ❔
-  * Resizing the window properly wraps/unwraps wide glyphs ❌
-    Broken due to `TextBuffer::Reflow` bugs
-* Surrogate pair input (🙂) ❔
-  * Resizing the window properly wraps/unwraps surrogate pairs ❌
-    Broken due to `TextBuffer::Reflow` bugs
-* In cmd.exe
-  * Create 2 file: "a😊b.txt" and "a😟b.txt"
-  * Press tab: Autocomplete to "a😊b.txt" ✅
-  * Navigate the cursor right past the "a"
-  * Press tab twice: Autocomplete to "a😟b.txt" ✅
-* Execute `printf("    "); gets(buffer);` in C (or equivalent)
-  * Press Tab, A, Ctrl+V, Tab, A ✅
-  * The prompt is "        A^V     A" ✅
-  * Cursor navigation works ✅
-  * Backspacing/Deleting random parts of it works ✅
-  * It never deletes the initial 4 spaces ✅
-* Backspace deletes preceding glyphs ✅
-* Ctrl+Backspace deletes preceding words ✅
-* Escape clears input ✅
-* Home navigates to start ✅
-* Ctrl+Home deletes text between cursor and start ✅
-* End navigates to end ✅
-* Ctrl+End deletes text between cursor and end ✅
-* Left navigates over previous code points ✅
-* Ctrl+Left navigates to previous word-starts ✅
-* Right and F1 navigate over next code points ✅
-  * Pressing right at the end of input copies characters
-    from the previous command ✅
-* Ctrl+Right navigates to next word-ends ✅
-* Insert toggles overwrite mode ✅
-* Delete deletes next code point ✅
-* Up and F5 cycle through history ✅
-  * Doesn't crash with no history ✅
-  * Stops at first entry ✅
-* Down cycles through history ✅
-  * Doesn't crash with no history ✅
-  * Stops at last entry ✅
-* PageUp retrieves the oldest command ✅
-* PageDown retrieves the newest command ✅
-* F2 starts "copy to char" prompt ✅
-  * Escape dismisses prompt ✅
-  * Typing a character copies text from the previous command up
-    until that character into the current buffer (acts identical
-    to F3, but with automatic character search) ✅
-* F3 copies the previous command into the current buffer,
-  starting at the current cursor position,
-  for as many characters as possible ✅
-  * Doesn't erase trailing text if the current buffer
-    is longer than the previous command ✅
-  * Puts the cursor at the end of the copied text ✅
-* F4 starts "copy from char" prompt ✅
-  * Escape dismisses prompt ✅
-  * Erases text between the current cursor position and the
-    first instance of a given char (but not including it) ✅
-* F6 inserts Ctrl+Z ✅
-* F7 without modifiers starts "command list" prompt ✅
-  * Escape dismisses prompt ✅
-  * Minimum size of 40x10 characters ✅
-  * Width expands to fit the widest history command ✅
-  * Height expands up to 20 rows with longer histories ✅
-  * F9 starts "command number" prompt ✅
-  * Left/Right paste replace the buffer with the given command ✅
-    * And put cursor at the end of the buffer ✅
-  * Up/Down navigate selection through history ✅
-    * Stops at start/end with <10 entries ✅
-    * Stops at start/end with >20 entries ✅
-    * Wide text rendering during pagination with >20 entries ✅
-  * Shift+Up/Down moves history items around ✅
-  * Home navigates to first entry ✅
-  * End navigates to last entry ✅
-  * PageUp navigates by 20 items at a time or to first ✅
-  * PageDown navigates by 20 items at a time or to last ✅
-* Alt+F7 clears command history ✅
-* F8 cycles through commands that start with the same text as
-  the current buffer up until the current cursor position ✅
-  * Doesn't crash with no history ✅
-* F9 starts "command number" prompt ✅
-  * Escape dismisses prompt ✅
-  * Ignores non-ASCII-decimal characters ✅
-  * Allows entering between 1 and 5 digits ✅
-  * Pressing Enter fetches the given command from the history ✅
-* Alt+F10 clears doskey aliases ✅
-* In cmd.exe, with an empty prompt in an empty directory:
-  Pressing tab produces an audible bing and prints no text ✅
-* When Narrator is enabled, in cmd.exe:
-  * Typing individual characters announces only
-    exactly each character that is being typed ✅
-  * Backspacing at the end of a prompt announces
-    only exactly each deleted character ✅

doc/Niksa.md

@@ -27,8 +27,6 @@ I would highly recommend that Gulp convert to using PowerShell scripts and that
 
 Original Source: https://github.com/microsoft/terminal/issues/217#issuecomment-404240443
 
-_Addendum_: cmd.exe is the literal embodiment of [xkcd#1172]([url](https://xkcd.com/1172/)). Every change, no matter how small, will break _someone_. 
-
 ## <a name="screenPerf"></a>Why is typing-to-screen performance better than every other app?
 
 I really do not mind when someone comes by and decides to tell us that we're doing a good job at something. We hear so many complaints every day that a post like this is a breath of fresh air. Thanks for your thanks!
@@ -51,7 +49,7 @@ Will this UI enhancement come to other apps on Windows? Almost certainly not. Th
 
 Will we try to keep it from regressing? Yes! Right now it's sort of a manual process. We identify that something is getting slow and then we go haul out [WPR](https://docs.microsoft.com/en-us/windows-hardware/test/wpt/windows-performance-recorder) and start taking traces. We stare down the hot paths and try to reason out what is going on and then improve them. For instance, in the last cycle or two, we focused on heap allocations as a major area where we could improve our end-to-end performance, changing a ton of our code to use stack-constructed iterator-like facades over the underlying request buffer instead of translating and allocating it into a new heap space for each level of processing. 
 
-As an aside, @bitcrazed wants us to automate performance tests in some conhost specific way, but I haven't quite figured out a controlled environment to do this in yet. The Windows Engineering System runs performance tests each night that give us a coarse-grained way of knowing if we messed something up for the whole operating system, and they technically offer a fine-grained way for us to insert our own performance tests... but I just haven't got around to that yet. If you have an idea for a way for us to do this in an automated fashion, I'm all ears.
+As an aside, @bitcrazed wants us to automate performance tests in some conhost specific way, but I haven't quite figured out a controlled environment to do this in yet. The Windows Engineering System runs performance tests each night that give us a coarse grained way of knowing if we messed something up for the whole operating system, and they technically offer a fine grained way for us to insert our own performance tests... but I just haven't got around to that yet. If you have an idea for a way for us to do this in an automated fashion, I'm all ears.
 
 If there's anything else you'd like to know, let me know. I could go on all day. I deleted like 15 tangents from this reply before posting it.... 
 

doc/ORGANIZATION.md

@@ -32,6 +32,7 @@
 		* `/src/cascadia/TerminalApp` - This DLL represents the implementation of the Windows Terminal application. This includes parsing settings, hosting tabs & panes with Terminals in them, and displaying other UI elements. This DLL is almost entirely UWP-like code, and shouldn't be doing any Win32-like UI work.
 		* `/src/cascadia/WindowsTerminal` - This EXE provides Win32 hosting for the TerminalApp. It will set up XAML islands, and is responsible for drawing the window, either as a standard window or with content in the titlebar (non-client area).
 		* `/src/cascadia/CascadiaPackage` - This is a project for packaging the Windows Terminal and its dependencies into an .appx/.msix for deploying to the machine.
+		* `/src/cascadia/PublicTerminalCore` - This is a DLL wrapper for the TerminalCore and Renderer, similar to `TermControl`, which exposes some exported functions that so the Terminal can be used from C#.
 		* `/src/cascadia/WpfTerminalControl` - A DLL implementing a WPF version of the Terminal Control.
 	* `/src/host` – The meat of the windows console host. This includes buffer, input, output, windowing, server management, clipboard, and most interactions with the console host window that aren’t stated anywhere else. We’re trying to pull things out that are reusable into other libraries, but it’s a work in progress
 		* `/src/host/lib` – Builds the reusable LIB copy of the host
@@ -125,6 +126,8 @@
 * Private calls into the Windows Window Manager to perform privileged actions related to the console process (working to eliminate) or for High DPI stuff (also working to eliminate)
 	* `Userprivapi.cpp`
 	* `Windowdpiapi.cpp`
+* New UTF8 state machine in progress to improve Bash (and other apps) support for UTF-8 in console
+	* `Utf8ToWideCharParser.cpp`
 * Window resizing/layout/management/window messaging loops and all that other stuff that has us interact with Windows to create a visual display surface and control the user interaction entry point
 	* `Window.cpp`
 	* `Windowproc.cpp`

doc/cascadia/profiles.schema.json

@@ -24,13 +24,6 @@
       "pattern": "^(-?\\d+)?(,\\s?(-?\\d+)?)?$",
       "type": "string"
     },
-    "CSSLengthPercentage": {
-      "pattern": "^[+-]?\\d+(?:\\.\\d+)?(?:%|ch|pt|px)?$",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "DynamicProfileSource": {
       "enum": [
         "Windows.Terminal.Wsl",
@@ -85,41 +78,6 @@
         }
       ]
     },
-    "BuiltinSuggestionSource": {
-      "type": "string",
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "enum": [
-            "commandHistory",
-            "tasks",
-            "all"
-          ]
-        }
-      ]
-    },
-    "SuggestionSource": {
-      "default": "all",
-      "description": "Either a single suggestion source, or an array of sources to concatenate. Built-in sources include `commandHistory`, `directoryHistory`, and `tasks`. The special value `all` indicates all suggestion sources should be included",
-      "$comment": "`tasks` and `local` are sources that would be added by the Tasks feature, as a follow-up",
-      "oneOf": [
-        {
-          "type": "null"
-        },
-        {
-          "$ref": "#/$defs/BuiltinSuggestionSource"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/BuiltinSuggestionSource"
-          },
-          "uniqueItems": true
-        }
-      ]
-    },
     "AppearanceConfig": {
       "properties": {
         "colorScheme": {
@@ -210,6 +168,10 @@
                 "desktopWallpaper"
               ]
             }
+          ],
+          "type": [
+            "string",
+            "null"
           ]
         },
         "backgroundImageOpacity": {
@@ -274,17 +236,6 @@
         "experimental.pixelShaderPath": {
           "description": "Use to set a path to a pixel shader to use with the Terminal when unfocused. Overrides `experimental.retroTerminalEffect`. This is an experimental feature, and its continued existence is not guaranteed.",
           "type": "string"
-        },
-        "useAcrylic": {
-          "description": "When set to true, the window will have an acrylic material background when unfocused. When set to false, the window will have a plain, untextured background when unfocused.",
-          "type": "boolean"
-        },
-        "opacity": {
-          "default": 100,
-          "description": "Sets the opacity of the window for the profile when unfocused. Accepts values from 0-100.",
-          "maximum": 100,
-          "minimum": 0,
-          "type": "number"
         }
       },
       "type": "object"
@@ -364,14 +315,6 @@
             }
           },
           "additionalProperties": false
-        },
-        "cellWidth": {
-          "$ref": "#/$defs/CSSLengthPercentage",
-          "description": "Override the width of the terminal's cells. The override works similar to CSS' letter-spacing. It defaults to the natural glyph advance width of the primary font rounded to the nearest pixel."
-        },
-        "cellHeight": {
-          "$ref": "#/$defs/CSSLengthPercentage",
-          "description": "Override the height of the terminal's cells. The override works similar to CSS' line-height. Defaults to the sum of the natural glyph ascend, descend and line-gap of the primary font rounded to the nearest pixel. The default is usually quite close to setting this to 1.2."
         }
       },
       "type": "object"
@@ -390,12 +333,8 @@
     },
     "ShortcutActionName": {
       "enum": [
-        "addMark",
         "adjustFontSize",
-        "adjustOpacity",
-        "clearAllMarks",
         "clearBuffer",
-        "clearMark",
         "closeOtherPanes",
         "closeOtherTabs",
         "closePane",
@@ -406,7 +345,6 @@
         "copy",
         "duplicateTab",
         "expandSelectionToWord",
-        "experimental.colorSelection",
         "exportBuffer",
         "find",
         "findMatch",
@@ -414,60 +352,62 @@
         "globalSummon",
         "identifyWindow",
         "identifyWindows",
-        "markMode",
         "moveFocus",
         "movePane",
+        "swapPane",
+        "markMode",
         "moveTab",
         "multipleActions",
         "newTab",
         "newWindow",
         "nextTab",
-        "openAbout",
         "openNewTabDropdown",
         "openSettings",
-        "openSystemMenu",
         "openTabColorPicker",
-        "openTabRenamer",
         "openWindowRenamer",
         "paste",
         "prevTab",
-        "quakeMode",
-        "quit",
         "renameTab",
-        "renameWindow",
+        "openSystemMenu",
+        "openTabRenamer",
+        "quakeMode",
         "resetFontSize",
         "resizePane",
-        "restoreLastClosed",
+        "renameWindow",
         "scrollDown",
         "scrollDownPage",
-        "scrollToBottom",
-        "scrollToMark",
-        "scrollToTop",
         "scrollUp",
         "scrollUpPage",
-        "searchWeb",
-        "selectAll",
+        "scrollToBottom",
+        "scrollToTop",
         "sendInput",
         "setColorScheme",
-        "setFocusMode",
-        "setFullScreen",
-        "setMaximized",
         "setTabColor",
-        "showSuggestions",
         "splitPane",
-        "swapPane",
-        "switchSelectionEndpoint",
         "switchToTab",
         "tabSearch",
         "toggleAlwaysOnTop",
         "toggleBlockSelection",
         "toggleFocusMode",
+        "selectAll",
+        "setFocusMode",
+        "switchSelectionEndpoint",
         "toggleFullscreen",
+        "setFullScreen",
+        "setMaximized",
         "togglePaneZoom",
+        "toggleSplitOrientation",
         "toggleReadOnlyMode",
         "toggleShaderEffects",
-        "toggleSplitOrientation",
         "wt",
+        "quit",
+        "adjustOpacity",
+        "restoreLastClosed",
+        "addMark",
+        "scrollToMark",
+        "clearMark",
+        "clearAllMarks",
+        "experimental.colorSelection",
         "unbound"
       ],
       "type": "string"
@@ -657,7 +597,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -686,7 +625,7 @@
             },
             "allowEmpty": {
               "description": "Whether to render a folder without entries, or to hide it",
-              "default": false,
+              "default": "false",
               "type": "boolean"
             }
           }
@@ -700,7 +639,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -717,7 +655,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -739,7 +676,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -756,7 +692,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -797,7 +732,6 @@
       ]
     },
     "ShortcutAction": {
-      "type": "object",
       "properties": {
         "action": {
           "description": "The action to execute",
@@ -806,7 +740,8 @@
       },
       "required": [
         "action"
-      ]
+      ],
+      "type": "object"
     },
     "AdjustFontSizeAction": {
       "description": "Arguments corresponding to an Adjust Font Size Action",
@@ -815,7 +750,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -840,7 +774,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -851,11 +784,6 @@
               "default": false,
               "description": "If true, the copied content will be copied as a single line (even if there are hard line breaks present in the text). If false, newlines persist from the selected text."
             },
-            "dismissSelection": {
-              "type": "boolean",
-              "default": true,
-              "description": "If false, the copied content will be copied and the selection will not be dismissed. If true, the selection will be dismissed."
-            },
             "copyFormatting": {
               "default": null,
               "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied. Not setting this value inherits the behavior of the `copyFormatting` global setting.",
@@ -882,7 +810,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -899,7 +826,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -924,7 +850,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -949,7 +874,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -974,7 +898,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -999,7 +922,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1024,7 +946,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1049,7 +970,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1077,7 +997,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1110,7 +1029,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1148,7 +1066,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1176,7 +1093,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1198,7 +1114,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1220,7 +1135,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1245,7 +1159,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1266,7 +1179,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1287,7 +1199,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1308,7 +1219,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1333,7 +1243,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1362,7 +1271,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1391,7 +1299,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1420,7 +1327,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1445,7 +1351,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1470,7 +1375,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1494,7 +1398,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1520,7 +1423,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1542,7 +1444,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1570,7 +1471,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1587,7 +1487,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1609,7 +1508,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1631,7 +1529,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1653,7 +1550,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1675,7 +1571,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1698,7 +1593,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1720,7 +1614,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1742,7 +1635,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1794,7 +1686,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1804,30 +1695,6 @@
         }
       ]
     },
-    "SearchWebAction": {
-      "description": "Search the web for selected text",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "searchWeb"
-            },
-            "queryUrl": {
-              "type": "string",
-              "description": "URL of the web page to launch, %s is replaced with the selected text"
-            }
-          }
-        }
-      ],
-      "required": [
-        "queryUrl"
-      ]
-    },
     "AdjustOpacityAction": {
       "description": "Changes the opacity of the active Terminal window. If `relative` is specified, then this action will increase/decrease relative to the current opacity.",
       "allOf": [
@@ -1835,7 +1702,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1857,37 +1723,11 @@
         }
       ]
     },
-    "ShowSuggestionsAction": {
-      "description": "Arguments corresponding to a Open Suggestions Action",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "showSuggestions"
-            },
-            "source": {
-              "$ref": "#/$defs/SuggestionSource",
-              "description": "Which suggestion sources to filter."
-            },
-            "useCommandline": {
-              "default": false,
-              "description": "When set to `true`, the current commandline the user has typed will pre-populate the filter of the Suggestions UI. This requires that the user has enabled shell integration in their shell's config. When set to false, the filter will start empty."
-            }
-          }
-        }
-      ]
-    },
     "ShowCloseButton": {
       "enum": [
         "always",
         "hover",
-        "never",
-        "activeOnly"
+        "never"
       ],
       "type": "string"
     },
@@ -1951,30 +1791,13 @@
       "properties": {
         "applicationTheme": {
           "description": "Which UI theme the Terminal should use for controls",
-          "enum": [
-            "light",
-            "dark",
-            "system"
-          ],
+          "enum": [ "light", "dark", "system" ],
           "type": "string"
         },
         "useMica": {
           "description": "True if the Terminal should use a Mica backdrop for the window. This will apply underneath all controls (including the terminal panes and the titlebar)",
           "type": "boolean",
           "default": false
-        },
-        "experimental.rainbowFrame": {
-          "description": "When enabled, the frame of the window will cycle through all the colors. Enabling this will override the `frame` and `unfocusedFrame` settings.",
-          "type": "boolean",
-          "default": false
-        },
-        "frame": {
-          "description": "The color of the window frame when the window is inactive. This only works on Windows 11",
-          "$ref": "#/$defs/ThemeColor"
-        },
-        "unfocusedFrame": {
-          "description": "The color of the window frame when the window is inactive. This only works on Windows 11",
-          "$ref": "#/$defs/ThemeColor"
         }
       }
     },
@@ -1985,12 +1808,8 @@
         "name": {
           "type": "string",
           "description": "The name of the theme. This will be displayed in the settings UI.",
-          "not": {
-            "enum": [
-              "light",
-              "dark",
-              "system"
-            ]
+          "not": { 
+            "enum": [ "light", "dark", "system" ]
           }
         },
         "tab": {
@@ -2007,7 +1826,6 @@
     "ThemePair": {
       "additionalProperties": false,
       "description": "A pair of Theme names, to allow the Terminal to switch theme based on the OS theme",
-      "type": "object",
       "properties": {
         "light": {
           "type": "string",
@@ -2158,12 +1976,6 @@
             {
               "$ref": "#/$defs/ColorSelectionAction"
             },
-            {
-              "$ref": "#/$defs/SearchWebAction"
-            },
-            {
-              "$ref": "#/$defs/ShowSuggestionsAction"
-            },
             {
               "type": "null"
             }
@@ -2189,16 +2001,16 @@
         },
         "name": {
           "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.\nIf name is a string, it will be the name of the command.\nIf name is a object, the key property of the object will be used to lookup a localized string resource for the command",
-          "type": [
-            "string",
-            "object",
-            "null"
-          ],
           "properties": {
             "key": {
               "type": "string"
             }
-          }
+          },
+          "type": [
+            "string",
+            "object",
+            "null"
+          ]
         },
         "iterateOn": {
           "type": "string",
@@ -2235,7 +2047,6 @@
     "Globals": {
       "additionalProperties": true,
       "description": "Properties that affect the entire window, regardless of the profile settings.",
-      "type": "object",
       "properties": {
         "alwaysOnTop": {
           "default": false,
@@ -2247,11 +2058,6 @@
           "description": "When set to true, tabs are always displayed. When set to false and \"showTabsInTitlebar\" is set to false, tabs only appear after opening a new tab.",
           "type": "boolean"
         },
-        "compatibility.enableUnfocusedAcrylic": {
-          "default": true,
-          "description": "When set to true, unfocused windows can have acrylic instead of opaque.",
-          "type": "boolean"
-        },
         "centerOnLaunch": {
           "default": false,
           "description": "When set to `true`, the terminal window will auto-center itself on the display it opens on. The terminal will use the \"initialPosition\" to determine which display to open on.",
@@ -2272,11 +2078,6 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
-        "compatibility.isolatedMode": {
-          "default": false,
-          "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
-          "type": "boolean"
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2450,17 +2251,10 @@
         "theme": {
           "default": "dark",
           "description": "Sets the theme of the application. This value should be the name of one of the themes defined in `themes`. The Terminal also includes the themes `dark`, `light`, and `system`.",
-          "anyOf": [
+          "oneOf": [
             {
               "type": "string"
             },
-            {
-              "enum": [
-                "dark",
-                "light",
-                "system"
-              ]
-            },
             {
               "$ref": "#/$defs/ThemePair"
             }
@@ -2570,12 +2364,12 @@
       },
       "required": [
         "defaultProfile"
-      ]
+      ],
+      "type": "object"
     },
     "Profile": {
       "description": "Properties specific to a unique profile.",
       "additionalProperties": false,
-      "type": "object",
       "properties": {
         "acrylicOpacity": {
           "default": 0.5,
@@ -2604,11 +2398,6 @@
             "null"
           ]
         },
-        "compatibility.reloadEnvironmentVariables": {
-          "default": true,
-          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
-          "type": "boolean"
-        },
         "unfocusedAppearance": {
           "$ref": "#/$defs/AppearanceConfig",
           "description": "Sets the appearance of the terminal when it is unfocused.",
@@ -2627,7 +2416,7 @@
         },
         "backgroundImage": {
           "description": "Sets the file location of the image to draw over the window background.",
-          "anyOf": [
+          "oneOf": [
             {
               "type": [
                 "string",
@@ -2639,6 +2428,10 @@
                 "desktopWallpaper"
               ]
             }
+          ],
+          "type": [
+            "string",
+            "null"
           ]
         },
         "backgroundImageAlignment": {
@@ -2757,13 +2550,6 @@
           "default": false,
           "description": "When true, this profile should always open in an elevated context. If the window isn't running as an Administrator, then a new elevated window will be created."
         },
-        "environment": {
-          "description": "Key-value pairs representing environment variables to set. Environment variable names are not case sensitive. You can reference existing environment variable names by enclosing them in literal percent characters (e.g. %PATH%).",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
         "experimental.autoMarkPrompts": {
           "default": false,
           "description": "When set to true, prompts will automatically be marked.",
@@ -2975,7 +2761,8 @@
           "description": "When set to true, the window will have an acrylic material background. When set to false, the window will have a plain, untextured background.",
           "type": "boolean"
         }
-      }
+      },
+      "type": "object"
     },
     "ProfileList": {
       "description": "A list of profiles and the properties specific to each.",
@@ -2990,7 +2777,6 @@
     },
     "ProfilesObject": {
       "description": "A list of profiles and default settings that apply to all of them",
-      "type": "object",
       "properties": {
         "list": {
           "$ref": "#/$defs/ProfileList"
@@ -2999,12 +2785,12 @@
           "description": "The default settings that apply to every profile.",
           "$ref": "#/$defs/Profile"
         }
-      }
+      },
+      "type": "object"
     },
     "SchemeList": {
       "description": "Properties are specific to each color scheme. ColorTool is a great tool you can use to create and explore new color schemes. All colors use hex color format.",
       "items": {
-        "type": "object",
         "additionalProperties": false,
         "properties": {
           "name": {
@@ -3093,7 +2879,8 @@
             "$ref": "#/$defs/Color",
             "description": "Sets the color used as ANSI yellow."
           }
-        }
+        },
+        "type": "object"
       },
       "type": "array"
     }
@@ -3103,7 +2890,6 @@
       "$ref": "#/$defs/Globals"
     },
     {
-      "type": "object",
       "additionalItems": true,
       "properties": {
         "profiles": {

doc/roadmap-2022.md

@@ -1,9 +1,5 @@
 # Terminal 2022 Roadmap
 
-> **NOTE**
->
-> This document has been superseded by the [Terminal 2023 Roadmap]. Please refer to that document for the updated roadmap.
-
 ## Overview 
 
 This document outlines the roadmap of features we're planning for the Windows Terminal during 2022. This serves as a successor to the [Terminal v2 Roadmap], to reflect changes to our planning going forward.
@@ -115,7 +111,7 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [Up Next]: https://github.com/microsoft/terminal/milestone/37
 [Backlog]: https://github.com/microsoft/terminal/milestone/45
 
-[Terminal v2 Roadmap]: ./terminal-v2-roadmap.md
+[Terminal v2 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/terminal-v2-roadmap.md
 
 [Windows Terminal Preview 1.2 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/
 [Windows Terminal Preview 1.3 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/
@@ -130,5 +126,3 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [Windows Terminal Preview 1.12 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/
 [Windows Terminal Preview 1.13 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-13-release/
 [Windows Terminal Preview 1.14 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-14-release/
-
-[Terminal 2023 Roadmap]: ./roadmap-2023.md

doc/roadmap-2023.md

@@ -1,76 +0,0 @@
-# Terminal 2023 Roadmap
-
-## Overview 
-
-This document outlines the roadmap of features we're planning for the Windows Terminal during 2023. This serves as a successor to the [2022 Roadmap], to reflect changes to our planning going forward.
-
-## Release cadence
-
-We've settled on a roughly quarterly release cycle - about once every three months. In May we released [Terminal 1.18]. We're targeting 1.19 for sometime in late September, and 1.20 likely in early January 2024. (These timelines are rough estimates, not strict rules. For example, 1.18's release was pushed back slightly to better align with Build 2023.)
-
-New features will go into [Windows Terminal Preview](https://aka.ms/terminal-preview) first. Typically, one release after they've been in Preview, those features will move into [Windows Terminal](https://aka.ms/terminal) ("Terminal Stable"). In the case of some more risky or experimental features, we might hold them to only Preview builds for an extended period[^1].
-
-
-| Quarter | Date       | Release Version | Preview Release Blog Post |
-| --------|------------|---------------- | ------------------------- |
-| CY23 Q1 | 2023-01-24 | [Terminal 1.17] | [Windows Terminal Preview 1.17 Release] |
-| CY23 Q2 | 2023-05-23 | [Terminal 1.18] | [Windows Terminal Preview 1.18 Release] |
-| CY23 Q3 |            | [Terminal 1.19] | [Windows Terminal Preview 1.19 Release] |
-| CY23 Q4 |            | [Terminal 1.20] | [Windows Terminal Preview 1.20 Release] |
-
-Within a single milestone, we typically reserve the last month as "bake time", to polish off bugfixes and get the release ready to ship. In this last month, we'll likely slow down our ingestion of community PRs just to stabilize what's already in `main`. For example, a given release might look like:
-
-```mermaid
-gantt
-    title Proposed Terminal Releases 1.14-1.18
-    dateFormat  YYYY-MM-DD
-    axisFormat  %d %b
-    section Terminal 1.18
-        Lock down & bake        :l18, 2023-05-09  , 2w
-        Release 1.18            :milestone, 2023-05-23, 0
-        1.18 becomes Stable     :milestone, after l19, 0
-    section Terminal 1.19
-        Features                :f19, after l18, 10w
-        Bugfix                  :b19, after f19  , 4w
-        Lock down & bake        :l19, after b19  , 2w
-        Release 1.19            :milestone, after l19, 0
-```
-
-_informative, not normative_
-
-## Up next in the Terminal
-
-### Terminal 1.19
-
-* Canary builds. Nightly builds of the Terminal from `main`. More unstable, but quicker access to experimental features.
-* Terminal AI. While this will only be shipping in Canary builds to begin with, the v0 implementation will be available roughly at the same time as 1.19.
-* The Suggestions UI. This is the starting point for shell completions [#3121], tasks [#1595], and probably Terminal AI at some point too.
-* Unicode input for `cmd.exe` (and any other console app using "cooked reads"). See [#15567]
-* Miscellaneous performance improvements. Conhost should be a _lot_ faster now.
-* Broadcast input mode, for sending text to multiple panes at once.
-
-## Team member "north stars"
-
-For a more fluid take on what each of the team's personal goals are, head on over to [Core team North Stars]. This has a list of more long-term goals that each team member is working towards, but not things that are necessarily committed work.
-
-
-[^1]: A conclusive list of these features can be found at [../src/features.xml](../src/features.xml). Note that this is a raw XML doc used to light up specific parts of the codebase, and not something authored for human consumption.
-
-[2022 Roadmap]: ./roadmap-2022.md
-
-[Terminal 1.17]: https://github.com/microsoft/terminal/releases/tag/v1.17.1023
-[Terminal 1.18]: https://github.com/microsoft/terminal/releases/tag/v1.18.1462.0
-[Windows Terminal Preview 1.17 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-17-release/
-[Windows Terminal Preview 1.18 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-18-release/
-
-[@DHowett]: https://github.com/DHowett
-[@zadjii-msft]: https://github.com/zadjii-msft
-[@lhecker]: https://github.com/lhecker
-[@carlos-zamora]: https://github.com/carlos-zamora
-[@PankajBhojwani]: https://github.com/PankajBhojwani
-
-[Core team North Stars]: https://github.com/microsoft/terminal/wiki/Core-team-North-Stars
-
-[#1595]: https://github.com/microsoft/terminal/issues/1595
-[#3121]: https://github.com/microsoft/terminal/issues/3121
-[#15567]: https://github.com/microsoft/terminal/issues/15567

doc/specs/#11000 - Marks/Shell-Integration-Marks.md

@@ -1,499 +0,0 @@
----
-author: Mike Griese
-created on: 2022-03-28
-last updated: 2023-07-19
-issue id: 11000, 1527, 6232
----
-
-##### [Original issue: [#1527]] [experimental PR [#12948]] [remaining marks [#14341]]
-
-# Windows Terminal - Shell Integration (Marks)
-
-## Abstract
-
-_"Shell integration" refers to a broad category of ways by which a commandline
-shell can drive richer integration with the terminal. This spec in particular is
-most concerned with "marks" and other semantic markup of the buffer._
-
-Marks are a new buffer-side feature that allow the commandline application or
-user to add a bit of metadata to a range of text. This can be used for marking a
-region of text as a prompt, marking a command as succeeded or failed, quickly
-marking errors in the output. These marks can then be exposed to the user as
-pips on the scrollbar, or as icons in the margins. Additionally, the user can
-quickly scroll between different marks, to allow easy navigation between
-important information in the buffer.
-
-Marks in the Windows Terminal are a combination of functionality from a variety
-of different terminal emulators. "Marks" attempts to unify these different, but
-related pieces of functionality.
-
-## Background
-
-There's a large amount of prior art on this subject. I've attempted to collect
-as much as possible in the ["Relevant external docs"](#Relevant-external-docs)
-section below. "Marks" have been used in different scenarios by different
-emulators for different purposes. The common thread running between them of
-marking a region of text in the buffer with a special meaning.
-
-* iTerm2, ConEmu, FinalTerm et.al. support emitting a VT sequence to indicate
-  that a line is a "prompt" line. This is often used for quick navigation
-  between these prompts.
-* FinalTerm (and xterm.js) also support marking up more than just the prompt.
-  They go so far as to differentiate the start/end of the prompt, the start of
-  the commandline input, and the start/end of the command output.
-  `FTCS_COMMAND_FINISHED` is even designed to include metadata indicating
-  whether a command succeeded or failed.
-* Additionally, Terminal.app allows users to "bookmark" lines via the UI. That
-  allows users to quickly come back to something they feel is important.
-* Consider also editors like Visual Studio. VS also uses little marks on the
-  scrollbar to indicate where other matches are for whatever the given search
-  term is.
-
-### "Elevator" pitch
-
-The Terminal provides a way for command line shells to semantically mark parts
-of the command-line output. By marking up parts of the output, the Terminal can
-provide richer experiences. The Terminal will know where each command starts and
-stops, what the actual command was and what the output of that command is. This
-allows the terminal to expose quick actions for:
-
-* Quickly navigating the history by scrolling between commands
-* Re-running a previous command in the history
-* Copying all the output of a single command
-* A visual indicator to separate out one command-line from the next, for quicker
-  mental parsing of the output of the command-line.
-* Collapsing the output of a command, as to reduce noise
-* Visual indicators that highlight commands that succeeded or failed.
-* Jumping to previously used directories
-
-### User Stories
-
-This is a bit of a unusual section, as this feature was already partially
-implemented when this spec was written.
-
-Story |  Size | Description
---|-----------|--
-A | ✅ Done   | The user can use mark each prompt and have a mark displayed on the scrollbar
-B | ✅ Done   | The user can perform an action to scroll between marks
-C | ✅ Done   | The user can manually add marks to the buffer
-D | ✅ Done   | The shell can emit different marks to differentiate between prompt, command, and output
-E | ✅ Done   | Clearing the buffer clears marks
-F | 🐣 Crawl  | Marks stay in the same place you'd expect after resizing the buffer.
-G | ✅ Done   | Users can perform an action to select the previous command's output
-H | 🚶 Walk   | The find dialog can display marks on the scrollbar indicating the position of search matches
-I | 🏃‍♂️ Run    | The terminal can display icons in the gutter, with quick actions for that command (re-run, copy output, etc)
-J | 🏃‍♂️ Run    | The terminal can display a faint horizontal separator between commands in the buffer.
-K | 🚀 Sprint | The terminal can "collapse" content between two marks.
-L | 🚀 Sprint | The terminal can display a sticky header above the control which displays the most recent command
-M | 🚀 Sprint | The user can open a dialog to manually bookmark a line with a custom comment
-
-## Solution Design
-
-### Supported VT sequences
-
-* [x] iTerm2's OSC `SetMark` (in [#12948])
-* [x] FinalTerm prompt markup sequences
-  - [x] **FTCS_PROMPT** was added in [#13163]
-  - [x] The rest in [#14341]
-* [ ] additionally, VsCode's FinalTerm prompt markup variant, `OSC 663`
-* [ ] [ConEmu's
-  `OSC9;12`](https://conemu.github.io/en/AnsiEscapeCodes.html#ConEmu_specific_OSC)
-* [ ] Any custom OSC we may want to author ourselves.
-
-The FinalTerm prompt sequences are probably the most complicated version of all
-these, so it's important to give these a special callout. Almost all the other
-VT sequences are roughly equivalent to **FTCS_PROMPT**. The xterm.js / VsCode
-version has additional cases, that they ironically added to work around conpty
-not understanding these sequences originally.
-
-#### FinalTerm sequences
-
-The relevant FinalTerm sequences for marking up the prompt are as follows.
-
-
-![image](FTCS-diagram.png)
-
-* **FTCS_PROMPT**: `OSC 133 ; A ST`
-  - The start of a prompt. Internally, this sets a marker in the buffer
-    indicating we started a prompt at the current cursor position, and that
-    marker will be used when we get a **FTCS_COMMAND_START**
-* **FTCS_COMMAND_START**: `OSC 133 ; B ST`
-  - The start of a commandline (READ: the end of the prompt). When it follows a
-    **FTCS_PROMPT**, it creates a mark in the buffer from the location of the
-    **FTCS_PROMPT** to the current cursor position, with the category of
-    `prompt`
-* **FTCS_COMMAND_EXECUTED**: `OSC 133 ; C ST`
-  - The start of the command output / the end of the commandline.
-* **FTCS_COMMAND_FINISHED**: `OSC 133 ; D ; [Ps] ST`
-  - the end of a command.
-
-Same deal for the **FTCS_COMMAND_EXECUTED**/**FTCS_COMMAND_FINISHED** ones.
-**FTCS_COMMAND_EXECUTED** does nothing until we get a **FTCS_COMMAND_FINISHED**,
-and the `[Ps]` parameter determines the category.
-  - `[Ps] == 0`: success
-  - anything else: error
-
-This whole sequence will get turned into a single mark.
-
-When we get the **FTCS_COMMAND_FINISHED**, set the category of the prompt mark
-that preceded it, so that the `prompt` becomes an `error` or a `success`.
-
-
-### Buffer implementation
-
-In the initial PR ([#12948]), marks were stored simply as a `vector<Mark>`,
-where a mark had a start and end point. These wouldn't reflow on resize, and
-didn't support all of the FTCS sequences.
-
-There's ultimately three types of region here we need to mark:
-* The prompt (starting from A)
-* the command (starting from B)
-* the output (starting from C)
-
-That intuitively feels a bit like a text attribute almost. Additionally, the
-prompt should be connected to its subsequent command and output, s.t. we can
-* Select command output
-* re-run command
-
-easily. Supposedly, we could do this by iterating through the whole buffer to
-find the previous/next {whatever}[[1](#footnote-1)]. Additionally, the prompt
-needs to be able to contain the status / category, and a `133;D` needs to be
-able to change the category of the previous prompt/command.
-
-If we instead do a single mark for each command, from `133;A` to `133;A`, and
-have sub-points for elements within the command
-* `133;A` starts a mark on the current line, at the current position.
-* `133;B` sets the end of the mark to the current position.
-* `133;C` updates the mark's `commandStart` to the current end, then sets the
-  end of the mark to the current position.
-* `133;D` updates the mark's `outputStart` to the current end, then sets the end
-  of the mark to the current position. It also updates the category of the mark,
-  if needed.
-
-Each command then only shows up as a single mark on the scrollbar. Jumping
-between commands is easy, `scrollToMark` operates on `mark.start`, which is
-where the prompt started. "Bookmarks", i.e. things started by the user wouldn't
-have `commandStart` or `outputStart` in them. Getting the text of the command,
-of the output is easy - it's just the text between sub-points.
-
-Reflow still sucks though - we'd need to basically iterate over all the marks as
-we're reflowing, to make sure we put them into the right place in the new
-buffer. This is annoying and tedious, but shouldn't realistically be a
-performance problem.
-
-#### Cmd.exe considerations
-
-`cmd.exe` is generally a pretty bad shell, and doesn't have a lot of the same
-hooks that other shells do, that might allow for us to emit the
-**FTCS_COMMAND_EXECUTED** sequence. However, cmd.exe also doesn't allow
-multiline prompts, so we can be relatively certain that when the user presses
-<kbd>enter</kbd>, that's the end of the prompt. We will treat the
-`autoMarkPrompts` setting (which auto-marks <kbd>enter</kbd>) as the _end of the
-prompt_. That would at least allow cmd.exe to emit a {command finished}{prompt
-start}{prompt...}{command start} in the prompt, and have us add the command
-executed. It is not perfect (we wouldn't be able to get error information), but
-it does work well enough.
-
-```cmd
-PROMPT $e]133;D$e\$e]133;A$e\$e]9;9;$P$e\%PROMPT%$e]133;B$e\
-```
-
-## Settings proposals
-
-The below are the proposed additions to the settings for supporting marks and
-interacting with them. Some of these have already been added as experimental
-settings - these would be promoted to no longer be experimental.
-
-Many of the sub-points on these settings are definitely "Future Consideration"
-level settings. For example, the `scrollToMark` `"highlight"` property. That one
-is certainly not something we need to ship with.
-
-### Actions
-
-In addition to driving marks via the output, we will also want to support adding
-marks manually. These can be thought of like "bookmarks" - a user indicated
-region that means something to the user.
-
-* [ ] `addMark`: add a mark to the buffer. If there's a selection, place the
-  mark covering at the selection. Otherwise, place the mark on the cursor row.
-  - [x] `color`: a color for the scrollbar mark. (in [#12948])
-  - [ ] `category`: one of `{"prompt", "error", "warning", "success", "info"}`
-* [ ] `scrollToMark`
-  - [x] `direction`: `["first", "previous", "next", "last"]`  (in [#12948])
-  - [ ] `category`: `flags({categories}...)`, default `"all"`. Only scroll to
-    one of the categories specified (e.g. only scroll to the previous error,
-    only the previous prompt, or just any mark)
-  - [ ] [#13449] - `center` or some other setting that controls how the mark is scrolled in.
-    - Maybe `top` (current) /`center` (as proposed) /`nearestEdge` (when
-      scrolling down, put the mark at the bottom line of viewport , up -> top
-      line)?
-  - [ ] [#13455] - `highlight`: `bool`, default true. Display a temporary
-    highlight around the mark when scrolling to it. ("Highlight" != "select")
-    - If the mark has prompt/command/output sections, only select the prompt and command.
-    - If the mark has zero width (i.e. the user just wanted to bookmark a line),
-      then highlight the entire row.
-* [x] `clearMark`: Remove any marks in the selected region (or at the cursor
-  position)  (in [#12948])
-* [x] `clearAllMarks`: Remove all the marks from the buffer.  (in [#12948])
-
-
-#### Selecting commands & output
-
-_Inspired by a long weekend of manually copying .csv output from the Terminal to
-a spreadsheet, only to discover that we rejected [#4588] some years ago._
-
-* [x] `selectCommand(direction=[prev, next])`: Starting at the active selection
-  anchor, (or the cursor if there's no selection), select the command that
-  starts before/after this point (exclusive).  Probably shouldn't wrap around
-  the buffer.
-  * Since this will create a selection including the start of the command,
-    performing this again will select the _next_ command (in whatever
-    direction).
-* [x] `selectOutput(direction=[prev, next])`: same as above, but with command outputs.
-
-A convenient workflow might be a `multipleActions([selectOutput(prev),
-copy()])`, to quickly select the previous commands output.
-
-### Per-profile settings
-
-* [x] `autoMarkPrompts`: `bool`, default `false`.  (in [#12948])
-* [ ] `showFindMatchesOnScrollbar`: `bool`, default `true`.
-* [ ] `showMarksOnScrollbar`: `bool` or `flags({categories}...)`
-  * As an example: `"showMarksOnScrollbar": ["error", "success"]`).
-  * Controls if marks should be displayed on the scrollbar.
-  * If `true`/`"all"`, then all marks are displayed.
-  * If `false`/`"none"`, then no marks are displayed.
-  * If a set of categories are provided, only display marks from those categories.
-  * [x] the bool version is (in [#12948])
-  * [ ] The `flags({categories}...)` version is not done yet.
-* [ ] `showGutterIcons`, for displaying gutter icons.
-
-## UX Design
-
-An example of what colored marks look like:
-
-![Select the entire output of a command](https://user-images.githubusercontent.com/18356694/207696859-a227abe2-ccd4-4b81-8a2c-8a22219cd0dd.gif)
-
-This gif demos both prompt marks and marks for search results:
-
-![](https://user-images.githubusercontent.com/18356694/191330278-3f6bc207-1bd5-4ebd-bb0e-1f84b0170f49.gif)
-
-
-### Gutter icons
-
-![](vscode-shell-integration-gutter-mark.png)
-_An example of what the icons in the VsCode gutter look like_
-
-### Multiple marks on the same line
-
-When it comes to displaying marks on the scrollbar, or in the margins, the
-relative priority of these marks matters. Marks are given the following
-priority, with errors being the highest priority.
-* Error
-* Warning
-* Success
-* Prompt
-* Info (default)
-
-## Work needed to get marks to v1
-
-* [x] Clearing the screen leaves marks behind
-  * [x] Make sure `ED2` works to clear/move marks
-  * [x] Same with `ED3`
-  * [x] Same with `cls` / `Clear-Host`
-  * [x] Clear Buffer action too.
-* [X] Circling doesn't update scrollbar
-  * I think this was fixed in [#14341], or in [#14045]
-* [ ] Resizing / reflowing marks
-* [x] marks should be stored in the `TextBuffer`
-
-## Future Considerations
-* adding a timestamp for when a line was marked?
-* adding a comment to the mark. How do we display that comment? a TeachingTip on
-  the scrollbar maybe (actually that's a cool idea)
-* adding a shape to the mark? Terminal.app marks prompt lines with brackets in
-  the margins
-* Marks are currently just displayed as "last one in wins", they should have a
-  real sort order
-* Should the height of a mark on the scrollbar be dependent on font size &
-  buffer height? I think I've got it set to like, a static 2dip, but maybe it
-  should represent the actual height of the row (down to a min 1dip)
-* [#13455] - highlight a mark when scrolled to with the `scrollToMark` action.
-  This is left as a future consideration to figure out what kind of UI we want
-  here. Do we want to highlight
-  - the prompt?
-  - the whole row of the prompt?
-  - the prompt and the command?
-  - The whole prompt & command & output?
-* an `addBookmark` action: This one's basically just `addMark`, but opens a prompt
-  (like the window renamer) to add some text as a comment. Automatically
-  populated with the selected text (if there was some).
-  - A dedicated transient pane for displaying non-terminal content might be
-    useful for such a thing.
-  - This might just make more sense as a parameter to `addMark`.
-* Other ideas for `addMark` parameters:
-  - `icon`: This would require us to better figure out how we display gutter
-    icons. This would probably be like, a _shape_ rather than an arbitrary
-    image.
-  - `note`: a note to stick on the mark, as a comment. Might be more valuable
-    with something like `addBookmark`.
-
-### Gutter icons
-
-VsCode implements a set of gutter icons to the left of the buffer lines, to
-provide a UI element for exposing some quick actions to perform, powered by
-shell integration.
-
-Gutter icons don't need to implement app-level actions at all. They _should_ be
-part of the control. At least, part of the UWP `TermControl`. These are some
-basic "actions" we could add to that menu. Since these are all attached to a
-mark anyways, we already know what mark the user interacted with, and where the
-start/end already is.
-* Copy command
-* Copy output
-* Re-run command
-* Save as task
-* Explain this (for errors)
-
-To allow comments in marks (ala "bookmarks"), we can use
-the gutter flyout to display the comment, and have the tooltip display that
-comment.
-
-This is being left as a future consideration for now. We need to really sit and
-consider what the UX is like for this.
-* Do we just stick the gutter icons in the margin/padding?
-* Have it be a separate space in the "buffer"
-  - If it's in the buffer itself, we can render it with the renderer, which by
-    all accounts, we probably should.
-
-### Edge cases where these might not work as expected
-
-Much of the benefits of shell integration come from literal buffer text parsing.
-This can lead to some rough edge cases, such as:
-
-* the user presses <kbd>Ctrl+V</kbd><kbd>Escape</kbd> to input an ESC character
-  and the shell displays it as `^[`
-* the user presses <kbd>Ctrl+V</kbd><kbd>Ctrl+J</kbd> to input an LF character
-  and the shell displays it as a line break
-* the user presses <kbd>Enter</kbd> within a quoted string and the shell
-  displays a continuation prompt
-* the user types a command including an exclamation point, and the shell invokes
-  history expansion and echoes the result of expansion before it runs the
-  command
-* The user has a prompt with a right-aligned status, ala
-  ![](https://user-images.githubusercontent.com/189190/254475719-5007df07-6cc3-42e8-baf7-2572579eb2b9.png)
-
-In these cases, the effects of shell integration will likely not work as
-intended. There are various possible solutions that are being explored. We might
-want to in the future also use [VsCode's extension to the FTCS sequences] to
-enable the shell to tell the terminal the literal resulting commandline.
-
-There's been [other proposals] to extend shell integration features as well.
-
-### Rejected ideas
-
-There was originally some discussion as to whether this is a design that should
-be unified with generic pattern matchers. Something like the URL detection,
-which identifies part of the buffer and then "marks" it. Prototypes for both of
-these features are going in very different directions, however. Likely best to
-leave them separate.
-
-## Resources
-
-### Other related issues
-
-Not necessarily marks related, but could happily leverage this functionality.
-
-* [#5916] and [#12366], which are likely to be combined into a single thread
-  - Imagine a trigger that automatically detects `error:.*` and then marks the line
-* [#9583]
-  - Imagine selecting some text, colorizing & marking it all at once
-  - `addMark(selection:false)`, above, was inspired by this.
-* [#7561] (and broadly, [#3920])
-  - Search results should maybe show up here on the scrollbar too.
-* [#13455]
-* [#13449]
-* [#4588]
-* [#14754] - A "sticky header" for the `TermControl` that could display the
-  previous command at the top of the buffer.
-* [#2226] - a scrollable "minimap" in te scrollbar, as opposed to marks
-
-### Relevant external docs
-* **GREAT** summary of the state of the ecosystem: https://gitlab.freedesktop.org/terminal-wg/specifications/-/issues/28
-* https://iterm2.com/documentation-escape-codes.html
-  - `OSC 1337 ; SetMark ST` under "Set Mark"
-  - under "Shell Integration/FinalTerm
-* https://support.apple.com/en-ca/guide/terminal/trml135fbc26/mac
-  - discusses auto-marked lines on `enter`/`^C`/`^D`
-  - allows bookmarking lines with selection
-  - bookmarks can have a name (maybe not super important)
-* [How to Use Marks in OS X’s Terminal for Easier Navigation](https://www.howtogeek.com/256548/how-to-use-marks-in-os-xs-terminal-for-easier-navigation/)
-* [Terminal: The ‘\[‘ Marks the Spot](https://scriptingosx.com/2017/03/terminal-the-marks-the-spot/)
-* Thread with VsCode (xterm.js) implementation notes: https://github.com/microsoft/terminal/issues/1527#issuecomment-1076455642
-* [xterm.js prompt markup sequences](https://github.com/microsoft/vscode/blob/39cc1e1c42b2e53e83b1846c2857ca194848cc1d/src/vs/workbench/contrib/terminal/browser/xterm/shellIntegrationAddon.ts#L50-L52)
-* [VsCode command tracking release notes](https://code.visualstudio.com/updates/v1_22#_command-tracking), also [Terminal shell integration](https://code.visualstudio.com/updates/v1_65#_terminal-shell-integration)
-* ConEMU:
-  Sequence | Description
-  -- | --
-  ESC ] 9 ; 12 ST | Let ConEmu treat current cursor position as prompt start. Useful with PS1.
-
-* https://iterm2.com/documentation-one-page.html#documentation-triggers.html"
-
-### Footnotes
-
-<a name="footnote-1"><a>[1]: Intuitively, this feels prohibitively expensive,
-but you'd be mistaken.
-
-An average device right now (I mean something that was alright about 5 years
-ago, like an 8700k with regular DDR4) does about 4GB/s of random, un-cached
-memory access. While low-end devices are probably a bit slower, I think 4GB/s is
-a good estimate regardless. That's because non-random memory access is way way
-faster than that at around 20GB/s (DDR4 2400 - what most laptops had for the
-last decade).
-
-Assuming a 120 column * 32k line buffer (our current maximum), the buffer would
-be about 21MB large. Going through the entire buffer linearly at 20GB/s would
-take just 1ms (including all text and metadata). If we assume that each row has
-a mark, that marks are 36 byte large and assuming the worst case of random
-access, we can go through all 32k within about 0.3ms.
-
-
-
-_(Thanks lhecker for these notes)_
-
-
-[#1527]: https://github.com/microsoft/terminal/issues/1527
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#1527]: https://github.com/microsoft/terminal/issues/1527
-[#6232]: https://github.com/microsoft/terminal/issues/6232
-[#2226]: https://github.com/microsoft/terminal/issues/2226
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#13163]: https://github.com/microsoft/terminal/issues/13163
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#13455]: https://github.com/microsoft/terminal/issues/13455
-[#13449]: https://github.com/microsoft/terminal/issues/13449
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#4588]: https://github.com/microsoft/terminal/issues/4588
-[#5804]: https://github.com/microsoft/terminal/issues/5804
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#12948]: https://github.com/microsoft/terminal/issues/12948
-[#13455]: https://github.com/microsoft/terminal/issues/13455
-[#5916]: https://github.com/microsoft/terminal/issues/5916
-[#12366]: https://github.com/microsoft/terminal/issues/12366
-[#9583]: https://github.com/microsoft/terminal/issues/9583
-[#7561]: https://github.com/microsoft/terminal/issues/7561
-[#3920]: https://github.com/microsoft/terminal/issues/3920
-[#13455]: https://github.com/microsoft/terminal/issues/13455
-[#13449]: https://github.com/microsoft/terminal/issues/13449
-[#4588]: https://github.com/microsoft/terminal/issues/4588
-[#14341]: https://github.com/microsoft/terminal/issues/14341
-[#14045]: https://github.com/microsoft/terminal/issues/14045
-[#14754]: https://github.com/microsoft/terminal/issues/14754
-[#14341]: https://github.com/microsoft/terminal/issues/14341
-
-[VsCode's extension to the FTCS sequences]: https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
-
-[other proposals]: https://gitlab.freedesktop.org/terminal-wg/specifications/-/merge_requests/6#f6de1e5703f5806d0821d92b0274e895c4b6d850

doc/specs/#1571 - New Tab Menu Customization/#1571 - New Tab Menu Customization.md

@@ -435,7 +435,7 @@ ultimately deemed it to be out of scope for the initial spec review.
 
 <!-- Footnotes -->
 [#2046]: https://github.com/microsoft/terminal/issues/2046
-[Command Palette, Addendum 1]: ../%232046%20-%20Unified%20keybindings%20and%20commands%2C%20and%20synthesized%20action%20names.md
+[Command Palette, Addendum 1]: https://github.com/microsoft/terminal/blob/main/doc/specs/%232046%20-%20Unified%20keybindings%20and%20commands%2C%20and%20synthesized%20action%20names.md
 
 [#3337]: https://github.com/microsoft/terminal/issues/3337
 [#6899]: https://github.com/microsoft/terminal/issues/6899

doc/specs/#1595 - Suggestions UI/Suggestions-UI.md

@@ -1,744 +0,0 @@
----
-author: Mike Griese
-created on: 2022-08-22
-last updated: 2023-08-03
-issue id: 1595
----
-
-# Windows Terminal - Suggestions UI
-
-## Abstract
-
-Multiple related scenarios have come up where it would be beneficial to display
-actionable UI to the user within the context of the active terminal itself. This
-UI would be akin to the Intellisense UI in Visual Studio. It appears right where
-the user is typing, and can help provide immediate content for the user, based
-on some context. The "Suggestions UI" is this new ephemeral UI within the
-Windows Terminal that can display different types of actions, from different
-sources.
-
-## Background
-
-The Suggestions UI is the singular UI by which the Terminal can display a
-variety of suggestions to the user. These include:
-
-* Recent commands the user has executed in this terminal, powered by shell integration.
-* Recent directories, similarly powered by shell integration
-* Completions from the shell itself (like the shell completions in PowerShell)
-* Tasks, which are `sendInput` actions from the user's settings
-* Buffer Completions, which is a dumb type of autocomplete based on words in the buffer
-* and more (as provided via extensions)
-
-All of these scenarios are places where it makes sense to present the user a
-menu at the point of text insertion in the terminal control itself.
-
-### Inspiration
-
-Primarily, the inspiration is any Intellisense-like experience, in any app.
-Visual Studio, VsCode, PowerShell, vim, Sublime any JetBrains IDE - there's more
-than enough examples in the wild.
-
-Ultimately, the inspiration for the Suggestions UI came from a bunch of places
-all at once. In the course of a few months though, it became clear that we'd
-need a unified UI for displaying a variety of suggestion-like experiences in the
-Terminal. Our work with the PowerShell and VsCode teams helped refine these
-requests all into the unified design below.
-
-### User Stories
-
-  Size     |  Description
------------|--
- 🐣 Crawl  | The user can bring up the Suggestions UI with recent commands, powered by shell integration
- 🐣 Crawl  | [#12863] The user can bring up the Suggestions UI with recent directories, powered by shell integration
- 🚶 Walk   | The user can bring up the Suggestions UI with tasks from their settings
- 🚶 Walk   | CLI apps can invoke the Suggestions UI with a new VT sequence
- 🚶 Walk   | The Suggestions UI can be opened using the current typed commandline as a filter
- 🚶 Walk   | Recent commands and directories are stored in `state.json`, across sessions
- 🏃‍♂️ Run    | Suggestions can have descriptions presented in / alongside the UI
- 🏃‍♂️ Run    | The Suggestions UI can be opened without any nesting
- 🏃‍♂️ Run    | The Suggestions UI can be opened, nested by `source` of the suggestion
- 🚀 Sprint | Extensions can provide suggestion sources for the Suggestions UI
- 🚀 Sprint | The Suggestions UI can be opened in "inline" mode, only showing the text of the first suggestion
-
-### Elevator Pitch
-
-The Suggestions UI is a UI element displayed in the Terminal for providing
-different types of text suggestions to the user - anything from recently run
-commands, to saved commands, to tab-completion suggestions from the shell
-itself.
-
-## Business Justification
-
-It will delight developers.
-
-Furthermore, our partners on the Visual Studio team have been requesting similar
-functionality for some time now. The way autocompletion menus in PowerShell
-currently interact with UIA clients leaves much to be desired. They'd like a way
-to provide richer context to screen readers. Something to enable the terminal to
-more specifically describe the context of what's being presented to the user.
-
-## Scenario Details
-
-### UI/UX Design
-
-#### Prototypes
-
-The following gif was a VsCode prototype of [shell-driven autocompletion]. This
-is the point of reference we're starting from when talking about what the
-suggestions UI might look like.
-
-![](vscode-shell-suggestions.gif)
-
-These suggestions are populated by logic within PowerShell itself, and
-communicated to the Terminal. The Terminal can then display them in the
-Suggestions UI.
-
-The following demonstrate a prototype of what that might look like for the
-Terminal. These are meant to be informative, not normative, representations of
-what the UI would look like.
-
-![](shell-autocomplete-july-2022-000.gif)
-
-A prototype of the recent commands UI, powered by shell integration:
-
-![](command-history-suggestions.gif)
-
-A prototype of the tasks UI, powered by the user's settings:
-
-![](tasks-suggestions.gif)
-
-(admittedly, the `TeachingTip` in that gif is a prototype and was later replaced
-with a better version.)
-
-In general, the Suggestions UI will present a list of elements to select from,
-near the text cursor. This control might be contain a text box for filtering
-these items (a "**palette**"), or it might not (a "**menu**").
-
-![An example of the menu mode](3121-suggestion-menu-2023-000.gif)
-
-#### Palette vs Menu
-
-Depending on how the suggestions UI is invoked, we may or may not want to
-display a text box for filtering these suggestions. Consider the Intellisense
-menu in Visual Studio. That's a UI that only allows for up/down for navigation
-(and enter/tab for selecting the suggestion).
-
-For suggestions driven by the Terminal, we'll display a filtering text box in
-the Suggestions UI. This is similar to the command palette's search - a fuzzy
-search to filter the contents. This is the "**palette**" style of the
-suggestions dialog.
-
-For completions driven by the shell, we should probably not display the
-filtering text box. This is the "**menu**" style of the suggestion dialog. The
-user is primarily interacting with the shell here, not the Terminal.
-
-> **Warning**
-> TODO! For discussion, possibly with a real UX designer.
-
-How should we handle completions here? Tab? Enter? Right-Arrow? Should we have
-an element selected when we open the menu, or should tab/enter only work once
-the user has used the arrows at least once? Sublime allows for <kbd>tab</kbd> to
-complete the suggestion immediately.
-
-Consider also that these suggestions might be provided by the shell, as the user
-is typing at a commandline shell. For something like PowerShell, the user might
-want to start typing a command and have it tab-complete based off the shell's
-tab expansion rules. PowerShell's inline suggestions use right-arrow to
-differentiate "use this suggestion" vs tab for "tab expand what I'm typing at
-the prompt". We should probably preserve this behavior.
-
-We probably don't want to provide different experiences for the **menu** version
-of the Suggestions UI vs. the **palette** version. In the palette version, the
-user won't be pressing tab to tab-complete at the shell - the focus is out of
-the of terminal and in the Suggestions UI. With the menu version, the focus is
-still "in the terminal", and users would expect tab to tab-complete.
-
-We will want to make sure that there's some semblance of consistency across our
-implementation for the Suggestions UI, our own Command Palette, VsCode's
-intellisense and their own implementation of shell-completions in the Terminal.
-
-> **Note**
-> In my prototype, for the "Menu" mode, I accepted ALL of right-arrow, tab, and
-> enter as "accept completion", and any other key dismissed the UI. This _felt_
-> right for that mode. I'm not sure we could make the same call for "palette"
-> mode, where we'd need tab for navigating focus.
-
-### Implementation Details
-
-#### Fork the Command Palette
-
-We're largely going to start with the Command Palette to build the Suggestions
-UI[[1](#footnote-1)]. The Command Palette is already a control we've built for displaying a
-transient list of commands and dispatching them to the rest of the app.
-
-Currently, the Command Palette is a single static control, at the top-center of
-the Terminal window, and occupying a decent portion of the screen. For the
-Suggestions UI, we'll instead want to make sure that the control appears
-relative to the current cursor position.
-
-We'll start by taking the command palette, and copying it over to a new control.
-This will allow us to remove large chunks of code dealing with different modes
-(i.e. the tab switcher), and code dealing with prefix characters to switch
-modes.
-
-We'll need to make some small modifications to enable the Suggestions UI to
-* work as a text cursor-relative control
-* exist as a Flyout outside the bounds of the Terminal window
-* If the Suggestions UI is too close to the bottom of the screen, we'll need it to open
-  "upwards", with the search box at the _bottom_ and the list extending above it
-* prevent it from switching to command-line mode
-* display tooltips / `TeachingTip`s / some secondary flyout with a description
-  of the suggestion (if provided)
-
-#### Completion sources
-
-The Suggestions UI will support suggestions from a variety of different
-"sources". As an example, consider the following actions:
-
-```json
-        { "command": { "action":"suggestions", "source": "commandHistory" } },
-        { "command": { "action":"suggestions", "source": "directoryHistory" } },
-
-        { "command": { "action":"suggestions", "source": "tasks" } },
-        { "command": { "action":"suggestions", "source": "local" } },
-
-        { "command": { "action":"suggestions", "source": ["local", "tasks", "commandHistory"] } },
-
-        { "command": { "action":"suggestions", "source": "Microsoft.Terminal.Extensions.BufferComplete" } },
-```
-
-Each of these `suggestions` actions would open the Suggestions UI with a
-different set of actions.
-
-* `commandHistory`: Use commands from this session, as identified via shell
-  integration. This won't be able to return any suggestions if the user has not
-  configured their shell to support shell integration sequences yet.
-* `directoryHistory`: Populate the list with a series of `cd {path}` commands,
-  where the paths are populated via shell integration. Paths are in MRU order.
-* `tasks`: Populate the list with all `sendInput` actions in the user's settings
-  file. The command structure should remain unchanged. For example, if they have
-  `sendInput` actions nested under a "git" command, then the "git" entry will
-  remain in this tasks view with their `sendInput` actions nested inside it. For
-  more details, see the [Tasks] spec.
-* `local`: Populate the list with tasks that are located in the CWD, in a file
-  named `.wt.json`. For more details, see the [Tasks] spec.
-* `Microsoft.Terminal.Extensions.BufferComplete`: As an example, this
-  demonstrates how an action might be authored to reference a suggestion source
-  from an extension[[2](#footnote-2)].
-
-Each of these different sources will build a different set of `Command`s,
-primarily populated with `sendInput` actions. We'll load those `Command`s into
-the Suggestions UI control, and open it at the text cursor.
-
-To drill in on a single example - the `commandHistory` source. In that
-particular case, the TerminalPage will query the active TermControl for a list
-of its recent commands. If it knows these (via shell integration), then the
-TerminalPage will use that list of commands to build a list of `sendInput`
-actions. Those will then get fed to the suggestions UI.
-
-Not listed above is [shell-driven autocompletion]. These aren't something that
-the Terminal can invoke all on its own - these are something the shell would
-need to invoke themselves.
-
-#### Pre-populate the current commandline context
-
-Consider the following scenario. A user has typed `git c` in their shell, and
-has [shell integration] enabled for their shell. They want to open the
-Suggestions UI filtered to their recent history, but starting with what they've
-already typed. To support this scenario, we'll add an additional property:
-
-* `"useCommandline"`: `bool` (**default**: `true`)
-  * `true`: the current commandline the user has typed will pre-populate the
-    filter of the Suggestions UI. This requires that the user has enabled shell
-    integration in their shell's config.
-  * `false`: the filter will start empty, regardless of what the user has typed.
-
-With that setting, the user can achieve their desired UX with the following action:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true } },
-```
-
-Now, when they type `git c` and invoke the Suggestions UI, they can immediately
-start searching for recent commands that started with `git c`.
-
-The primary use case for `useCommandline: false` was for `"nesting": "source"`.
-When filtering a list of ["Tasks...", "Recent commands...", "Recent
-directories...", "Docker...", "Git..."], then there's minimal value to start by
-filtering to "git c".
-
-#### Default actions
-
-I propose adding the following actions to the Terminal by default:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true } },
-{ "command": { "action":"suggestions", "source": "directoryHistory" } },
-{ "command": { "action":"suggestions", "source": ["local", "tasks", "commandHistory"], "useCommandline": true, "nesting": "disabled" } },
-{ "command": { "action":"suggestions", "source": ["all"], "useCommandline": false, "nesting": "source" } },
-```
-
-These actions are colloquially:
-* Give me suggestions from my recent commands, using what I've typed
-* Give me suggestions of directories I've recently been in
-* _(After [Tasks] are implemented)_ Give me suggestions from recent commands,
-  commands I've saved, and commands for this project. Don't nest any, so they're
-  all in the top-level menu. Use what I've typed already to start filtering.
-* Just open the Suggestions UI with all suggestions sources, and group them by
-  the source of the suggestions.
-
-This should cover most of the basic use cases for suggestions.
-
-#### Who owns this menu?
-
-There was some discussion of who should own the suggestions menu. The control
-itself? Or the app hosting the control?
-
-A main argument for hosting this UI in the control itself is that any consumer
-of the `TermControl` should be able to display the [shell-driven autocompletion]
-menu. And they should get the UI from us "for free". Consumers shouldn't need to
-reimplement it themselves. This probably could be done without many changes:
-* Instead of operating on `Command`s and actions from the terminal settings,
-  the control could just know that all the entries in the menu are "send
-  input" "actions".
-* The control could offer a method to manually invoke the Suggestions UI for a
-  list of {suggestion, name, description} objects.
-* The app layer could easily translate between sendInput actions and these
-  pseudo-actions.
-
-A big argument in favor of having the app layer host the control: Consider an
-app like Visual Studio. When they embed the control, they'll want to style the
-shell-completions UI in their own way. They already have their own intellisense
-menu, and their own UI paradigm.
-
-For now, we'll leave this as something that's owned by the app layer. When we
-get around to finalizing the [shell-driven autocompletion] design, we can
-iterate on ideas for supporting both consumers that want to use a pre-built
-suggestions control, or consumers who want to bring their own.
-
-## Tenets
-
-<table>
-
-<tr><td><strong>Compatibility</strong></td><td>
-
-This shouldn't break any existing flows. This is a general purpose UI element,
-to be extended in a variety of ways. Those customizations will all be opt-in by
-the user, so I'm not expecting any breaking compatibility changes here.
-
-</td></tr>
-
-<tr><td><strong>Accessibility</strong></td><td>
-
-The Suggestions UI was designed with the goal of making commandline shell
-suggestions _more_ accessible. As Carlos previously wrote:
-
-> Screen readers struggle with this because the entire menu is redrawn every time, making it harder to understand what exactly is "selected" (as the concept of selection in this instance is a shell-side concept represented by visual manipulation).
->
-> ...
->
-> _\[Shell driven suggestions\]_ can then be leveraged by Windows Terminal to create UI elements. Doing so leverages WinUI's accessible design.
-
-This will allow the Terminal to provide more context-relevant information to
-screen readers.
-
-</td></tr>
-
-<tr><td><strong>Sustainability</strong></td><td>
-
-No sustainability changes expected.
-
-</td></tr>
-
-<tr><td><strong>Localization</strong></td><td>
-
-The localization needs of the Suggestions UI will be effectively the same as the
-needs of the Command Palette.
-
-The Terminal will have no way to localize suggestions that are provided via
-[shell-driven autocompletion]. These are just verbatim strings that the shell
-told us to use. We don't consider this to be something to worry about, however.
-This is no different than the fact that Terminal cannot localize the `Get-Help`
-(or any other) output of PowerShell.
-
-</td></tr>
-
-</table>
-
-## Implementation Plan
-
-This is more of an informative outline, rather than a normative one. Many of the
-things from Crawl, Walk, and Run are all already in PRs as of the time of this
-spec's review.
-
-### 🐣 Crawl
-
-* [ ] Fork the Command palette to a new UI element, the `SuggestionsControl`
-* [ ] Enable previewing `sendInput` actions in the Command Palette and `SuggestionsControl`
-* [ ] Enable the `SuggestionsControl` to open top-down (aligned to the bottom of the cursor row) or bottom-up (aligned to the top of the cursor row).
-* [ ] Disable sorting on the `SuggestionsControl` - elements should presumably be pre-sorted by the source.
-* [ ] Expose the recent commands as a accessor on `TermControl`
-* [ ] Add a `suggestions` action which accepts a single option `recentCommands`. These should be fed in MRU order to the `SuggestionsControl`.
-* [ ] Expose the recent directories as an accessor on `TermControl`, and add a `recentDirectories` source.
-
-### 🚶 Walk
-
-* [ ] Add a `tasks` source to `suggestions` which opens the Suggestions UI with
-  a tree of all `sendInput` commands
-* [ ] Enable the `SuggestionsControl` to open with or without a search box
-* [ ] Plumb support for shell-driven completions through the core up to the app
-* [ ] Expose the _current_ commandline from the `TermControl`
-* [ ] Add a `useCommandline` property to `suggestions`, to pre-populate the search with the current commandline.
-* [ ] Persist recent commands / directories accordingly
-
-### 🏃‍♂️ Run
-
-* [ ] Add a `description` field to `Command`
-* [ ] Add a `TeachingTip` (or similar) to the Suggestions UI to display
-  descriptions (when available)
-* [ ] Use the `ToolTip` property of shell-driven suggestions as the description
-* [ ] Add a boolean `nesting` property which can be used to disable nesting on the `tasks` source.
-* [ ] Add the ability for `nesting` to accept `enabled`/`disabled` as `true`/`false` equivalents
-* [ ] Add the ability for `nesting` to accept `source`, which instead groups all
-  commands to the Suggestions UI by the source of that suggestion.
-
-### 🚀 Sprint
-
-The two "sprint" tasks here are much more ambitious than the other listed
-scenarios, so breaking them down to atomic tasks sees less reasonable. We'd have
-to spend a considerable amount more time figuring out _how_ to do each of these
-first.
-
-For example - extensions. We have yet to fully realize what extensions _are_.
-Determining how extensions will provide suggestions is left as something we'll
-need to do as a part of the Extensions spec.
-
-## Conclusion
-
-Here's a sample json schema for the settings discussed here.
-
-```json
-"OpenSuggestionsAction": {
-  "description": "Arguments corresponding to a Open Suggestions Action",
-  "allOf": [
-    {
-      "$ref": "#/$defs/ShortcutAction"
-    },
-    {
-      "properties": {
-        "action": {
-          "type": "string",
-          "const": "suggestions"
-        },
-        "source": {
-          "$ref": "#/$defs/SuggestionSource",
-          "description": "Which suggestion sources to filter."
-        },
-        "useCommandline": {
-          "default": false,
-          "description": "When set to `true`, the current commandline the user has typed will pre-populate the filter of the Suggestions UI. This requires that the user has enabled shell integration in their shell's config. When set to false, the filter will start empty."
-        },
-        "nesting": {
-          "default": true,
-          "description": "When set to `true`, suggestions will follow the provided nesting structure. For Tasks, these will follow the structure of the Command Palette. When set to `false`, no nesting will be used (and all suggestions will be in the top-level menu.",
-          "$comment": "This setting is a possible follow-up setting, not required for v1. "
-        }
-      }
-    }
-  ]
-},
-"BuiltinSuggestionSource": {
-  "enum": [
-    "commandHistory",
-    "directoryHistory",
-    "tasks",
-    "local",
-    "all"
-  ],
-  "type": "string"
-},
-"SuggestionSource": {
-  "default": "all",
-  "description": "Either a single suggestion source, or an array of sources to concatenate. Built-in sources include `commandHistory`, `directoryHistory`, `tasks`, and `local`. Extensions may provide additional values. The special value `all` indicates all suggestion sources should be included",
-  "$comment": "`tasks` and `local` are sources that would be added by the Tasks feature, as a follow-up"
-  "oneOf": [
-    {
-      "type": [ "string", "null", "BuiltinSuggestionSource" ]
-    },
-    {
-      "type": "array",
-      "items": { "type": "BuiltinSuggestionSource" }
-    },
-    {
-      "type": "array",
-      "items": { "type": "string" }
-    }
-  ]
-},
-```
-
-### Future Considerations
-
-* Another extension idea: `WithFig.FigCompletions`. Imagine an extension that
-  could parse existing [Fig] completion specs, and provide those as suggestions
-  in this way.
-  * This might be a good example of an async suggestion source. The current
-    commandline is used as the starting filter, and the suggestions would be
-    populated by some `fig` process / thread / async operation that returns the
-    suggestions.
-* If the user hasn't enabled shell completion, we could add text to the
-  `commandHistory` or `directoryHistory` menus to inform the user how they could
-  go enable shell integration. We already have a docs page dedicated to this, so
-  we could start by linking to that page. More notes on this in [Automatic shell
-  integration](#Automatic-shell-integration).
-* Maybe there could be a per-profile setting for automatic suggestions after
-  some timeout. Like, as you type, a menu version of the Suggestions UI appears.
-  So you could just start typing `git c`, and it would automatically give you a
-  menu with suggestions, implicitly using the typed command as the "filter".
-  * Maybe we could do this as an `implicit` property on the `suggestions` action
-
-
-#### Description Tooltips
-
-> **Note**: _This is left as a future consideration for the initial draft of
-> this spec. I'd like to flesh out [shell-driven autocompletion] more before
-> committing any plans here._
-
-It would be beneficial for the Suggestions UI to display additional context to
-the user. Consider a extension that provides some commands for the user, like a
-hypothetical "Docker" extension. The extension author might be able to give the
-commands simplified names, but also want to expose a more detailed description
-of the commands to the user.
-
-Or consider the Suggestions UI when invoked by [shell-driven autocompletion].
-The shell might want to provide help text to the user with each of the
-suggestions. This would allow a user to browse through the suggestions that they
-might not know about, and learn how they work before committing to one.
-
-Only the help text for the currently hovered command should be presented to the
-user. To support this kind of UX, we'll add an optional flyout of some sort to
-display with the Suggestions UI. This flyout will only appear if there's more
-information provided to the Terminal.
-
-This might be in the form of a `TeachingTip`, as in this example:
-
-![TeachingTip with description](https://user-images.githubusercontent.com/18356694/222244568-243a6482-92d9-4c3c-bffc-54ad97f01f69.gif)
-
-Actions in the settings could also accept an optional `description` property, to
-specify the string that would be presented in that flyout.
-
-#### Automatic shell integration
-
-A large portion of these features all rely on shell integration being enabled by
-the user. However, this is not a trivial thing for the Terminal to do on behalf
-of the user. Shell integration relies on changes to the user's shell config. If
-the Terminal were to try and configure those itself, we may accidentally destroy
-configuration that the user has already set up. Hence why the Terminal can't
-just have a "Light up all the bells and whistles" toggle in the Settings UI.
-
-This is a non-trivial problem to solve, so it is being left as a future
-consideration, for a later spec. It deserves its own spec to sort out how we
-should expose this to users and safely implement it.
-
-#### Pre-filtering the UI & filter by source
-
-> **Note**: _This is a brainstorm I considered while writing this spec. I would
-> not include it in the v1 of this spec. Rather, I'd like to leave it for
-> where we might go with this UX in the future._
-
-Do want to support different _types_ of nesting? So instead of just the default,
-there could be something like `nesting: "source"`, to create a menu structured
-like:
-
-```
-Suggestions UI
-├─ Recent Commands...
-│  ├─ git checkout main
-│  ├─ git fetch
-│  └─ git pull
-├─ Recent Directories...
-│  ├─ d:\dev
-│  ├─ d:\dev\public
-│  └─ d:\dev\public\terminal
-├─ Saved tasks...
-│  ├─ Git...
-│  │  └─ git commit -m "
-│  │  └─ git log...
-│  └─ bx & runut
-└─ Docker
-   ├─ docker build --platform linux/amd64 <path>
-   └─ docker logs -f --tail <lines_count> <container_name>
-```
-
-> **Note**
-> I'm using `Docker` as an example fragment extension that provides
-> some `docker` commands. When grouping by `"source"`, we could pull those into
-> a separate top-level entry. When not grouping by `"source"`, those would still
-> show up with the rest of `tasks`. )
-
-#### Store recent commands across sessions
-
-> **Note**
-> _I'm not sure we really want to put this in this spec or not, hence
-> why it is in the "Future considerations" section. I think it is worth
-> mentioning. This might be better served in the [shell integration] doc._
-
-We'll probably want a way for recent commands to be saved across sessions. That way, your `cmd.exe` command history could persist across sessions. We'd need:
-
-* A setting to enable this behavior
-* A setting to control the context of these saved commandlines.
-  * Do we want them saved per-profile, or globally?
-  * If they're saved per-profile, maybe a profile can opt-in to loading all the commands?
-  * How does defterm play with this? Do we "layer" by concatenating per-profile commands with `profiles.defaults` ones?
-* A button in the Settings UI for clearing these commands
-* Should fragments be able to pre-populate "recent commands"?
-  * I'm just gonna say _no_. That would be a better idea for Tasks (aka just a `sendInput` Action that we load from the fragment normally as a Task), or a specific suggestion source for the fragment extension.
-
-#### Inline mode
-
-> **Note**
-> _This is a half-baked idea with some potential. However, I don't
-> think it needs to be a part of the v1 of the Suggestions UI, so I'm leaving it
-> under future considerations for a future revision._
-
-Do we want to have a suggestions UI "mode", that's just **one** inline
-suggestion, "no" UI? Some UX ala the `PsReadline` recent command suggestion
-feature. Imagine, we just display the IME ghost text thing for the first result,
-given the current prompt?
-
-Take the following action as an example:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true, "inline": true } },
-```
-
-Type the start of some command at the prompt, and press that key. Presto, we do
-the `pwsh` thing. Ghost text appears for the first match in the `commandHistory`
-for what the user has typed. If they press another key, ~they've typed into the
-"hidden" Suggestions UI, which filters the (hidden) list more, and updates the
-one inline suggestion.~
-
-Or, instead, typed keys go to the shell, and then we re-query the commandline,
-and update the filter accordingly. That would allow tab-completion to still
-work. We'd use <kbd>right arrow</kbd> to accept the suggestion (and dismiss the
-ghost text preview).
-
-This would seemingly SUPER conflict with PowerShell's own handler. Probably not
-something someone should enable for PowerShell 7 profiles if they're using that
-feature.
-
-### Rejected ideas
-
-These are musings from earlier versions of the spec.
-* **Asynchronous prompting**: This was rejected because it was so fundamentally
-  different from the rest of the UX of the Suggestions UI, it didn't make sense
-  to try and also do that behavior.
-* ...
-
-#### REJECTED: Asynchronous prompting
-
-Certain suggestion sources might want to provide results asynchronously.
-Consider a source that might want to make a web request to populate what strings
-to suggest. That source might want to prompt the user for input first, then
-dispatch the request, then populate the UI. Or something like a `fig`-like
-suggestion source, which would need to parse some files from the disk to
-generate the list of suggestions.
-
-The easiest way to do this would be to provide a secondary UI element for
-prompting the user for input, doing the request in the background, then opening
-the UI later. However, that feels a little disjointed. Could we instead provide
-a more continuous experience?
-
-The following is a proposal for using the Suggestions UI itself as the control
-to prompt the user for input.
-
-```c++
-TerminalPage::SetUpSuggestionsUI()
-{
-    const auto& asyncSource{ AsyncSuggestions() };
-
-    suggestionsUI.OnInputChanged({ asyncSource, AsyncSuggestions::InputChangedHandler});
-    // In this example, we don't want the UI to filter item based on the input
-    // string - the source has already determined the list of relevant matches.
-    suggestionsUI.FilterByInput(false);
-
-    asyncSource.SuggestionsChanged([](const auto& newCommands){
-        suggestionsUI.Loading(false);
-        suggestionsUI.Commands(newCommands);
-    })
-}
-
-void AsyncSuggestions::InputChangedHandler(FilterChangedArgs args)
-{
-    // kick off a trailing ThrottledFunc to do a new query
-    _loadNewResults->Run(args.NewInputText());
-    // If we get another request, we might want to cancel the pending throttled
-    // func entirely, and start the timeout fresh. Just so that we only make a
-    // query for the final string they type.
-
-    args.RequestLoading(true); // pass a boolean back up in the args, so that
-    // the Suggestions UI can clear out the current commands, and start displaying an
-    // indeterminate progress wheel.
-}
-```
-
-That would basically _have_ to be special cased for this source, at least for
-now. We could refactor that later to better deal with extensions.
-
-Let's make sure this would work for something `fig`-like, where the "prompt" is
-literally the prompt, what the user has already typed at the commandline.
-
-After some discussion:
-* How do we differentiate the prompting version of the Suggestions UI from the
-  filtering version?
-  * The prompting version _doesn't_ filter results
-* Async modes wouldn't work with sync ones at all. E.g. if you did `source:
-  ["tasks", "myAsyncSource"]`. It doesn't make sense to start with a list of
-  `tasks`, then type, find no tasks, but then oh! the UI fills in some other
-  suggestions too. That's weird.
-
-## Resources
-
-These are some other work streams that have a lot of tie-in to the Suggestions
-UI. These are all being spec'd at roughly the same time, so links may not be
-fully up to date.
-* [Shell integration]
-* [Shell-driven autocompletion]
-* [Tasks]
-
-### Footnotes
-
-<a name="footnote-1"><a>[1]: We've had discussion in the past ([#7285]) about
-possibly creating a more abstract "Live filtering list view" to replace the
-Command Palette. We could most certainly use that here too. We've decided to
-initially go with a fork for now.
-
-<a name="footnote-2"><a>[2]: Obviously, we're not having a real discussion about
-extensions in this doc. This example is solely to show that there's room for
-extensions to work with the "source" property in this design. What the final
-shape of extensions will be is very much still to be determined.
-
-
-[Fig]: https://github.com/withfig/autocomplete
-[Warp]: https://www.warp.dev/
-[workflows]: https://docs.warp.dev/features/workflows
-[also working on workflows]: https://fig.io/user-manual/workflows
-[winget script]: https://github.com/microsoft/PowerToys/blob/main/.github/workflows/package-submissions.yml
-[#1595]: https://github.com/microsoft/terminal/issues/1595
-[#7039]: https://github.com/microsoft/terminal/issues/7039
-[#3121]: https://github.com/microsoft/terminal/issues/3121
-[#10436]: https://github.com/microsoft/terminal/issues/10436
-[#12927]: https://github.com/microsoft/terminal/issues/12927
-[#12863]: https://github.com/microsoft/terminal/issues/12863
-[#7285]: https://github.com/microsoft/terminal/issues/7285
-[#14939]: https://github.com/microsoft/terminal/issues/7285
-
-[#keep]: https://github.com/zadjii/keep
-[VsCode Tasks]: ../../../.vscode/tasks.json
-
-<!-- Note: This is its own spec in progress, but for the time being #12862 will do -->
-[Tasks]: https://github.com/microsoft/terminal/issues/12862
-<!-- Note: This is just a link to the PR that introduced the shell integration spec -->
-[shell integration]: https://github.com/microsoft/terminal/pull/14792
-<!-- Note: If I ever write a spec for this, go ahead and replace this link -->
-[shell-driven autocompletion]: https://github.com/microsoft/terminal/issues/3121

doc/specs/#2046 - Unified keybindings and commands, and synthesized action names.md

@@ -605,4 +605,4 @@ as well as 3 schemes: "Scheme 1", "Scheme 2", and "Scheme 3".
 
 
 <!-- Footnotes -->
-[Command Palette Spec]: ./%232046%20-%20Command%20Palette.md
+[Command Palette Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%232046%20-%20Command%20Palette.md

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

@@ -612,8 +612,8 @@ You could have a profile that layers on an existing profile, with elevated-speci
 [#8514]: https://github.com/microsoft/terminal/issues/8514
 [#10276]: https://github.com/microsoft/terminal/issues/10276
 
-[Process Model 2.0 Spec]: ../%235000%20-%20Process%20Model%202.0.md
-[Configuration object for profiles]: ../%233062%20-%20Appearance configuration object for profiles.md
-[Session Management Spec]: ./%234472%20-%20Windows%20Terminal%20Session%20Management.md
+[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/#5000 - Process Model 2.0/#4472 - Windows Terminal Session Management.md

@@ -559,4 +559,4 @@ runtime.
 [Tab Tear-out in the community toolkit]: https://github.com/windows-toolkit/Sample-TabView-TearOff
 [Quake mode scenarios]: https://github.com/microsoft/terminal/issues/653#issuecomment-661370107
 [`ISwapChainPanelNative2::SetSwapChainHandle`]: https://docs.microsoft.com/en-us/windows/win32/api/windows.ui.xaml.media.dxinterop/nf-windows-ui-xaml-media-dxinterop-iswapchainpanelnative2-setswapchainhandle
-[Process Model 2.0 Spec]: ./doc/specs/%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md
+[Process Model 2.0 Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md

doc/specs/#653 - Quake Mode/#653 - Quake Mode.md

@@ -730,7 +730,7 @@ user to differentiate between the two behaviors.
 [#5727]: https://github.com/microsoft/terminal/issues/5727
 [#9992]: https://github.com/microsoft/terminal/issues/9992
 
-[Process Model 2.0 Spec]: ../%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md
+[Process Model 2.0 Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md
 [Quake 3 sample]: https://youtu.be/ZmR6HQbuHPA?t=27
 [`RegisterHotKey`]: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-registerhotkey
 [`dev/migrie/f/653-QUAKE-MODE`]: https://github.com/microsoft/terminal/tree/dev/migrie/f/653-QUAKE-MODE

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

@@ -215,8 +215,8 @@ actions manually.
       the tab context menu or the control context menu.
 
 <!-- Footnotes -->
-[Command Palette Spec]: ./doc/specs/%232046%20-%20Command%20Palette.md
-[New Tab Menu Customization Spec]: ./doc/specs/%231571%20-%20New%20Tab%20Menu%20Customization.md
+[Command Palette Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%232046%20-%20Command%20Palette.md
+[New Tab Menu Customization Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%231571%20-%20New%20Tab%20Menu%20Customization.md
 
 [#1571]: https://github.com/microsoft/terminal/issues/1571
 [#1912]: https://github.com/microsoft/terminal/issues/1912

doc/specs/drafts/#2634 - Broadcast Input/#2634 - Broadcast Input.md

@@ -290,7 +290,7 @@ though. **I recommend we ignore this for now, and leave this as a follow-up**.
 For reference, refer to the following from iTerm2:
 ![image](https://user-images.githubusercontent.com/2578976/64075757-fa971980-ccee-11e9-9e44-47aaf3bca76c.png)
 
-We don't have a menu bar like on macOS, but we do have a tab context menu. We
+We don't have a menu bar like on MacOS, but we do have a tab context menu. We
 could add these items as a nested entry under each tab. If we wanted to do this,
 we should also make sure to dynamically change the icon of the MenuItem to
 reflect the current broadcast state.

doc/specs/drafts/#3327 - Application Theming/#3327 - Application Theming.md

@@ -373,7 +373,7 @@ changes, or the active pane in a tab changes:
       `TabRowControl` to match.
 
 The `tab.cornerRadius` might be a bit trickier to implement. Currently, there's
-no XAML resource that controls this, nor is this something that's exposed by
+not a XAML resource that controls this, nor is this something that's exposed by
 the TabView control. Fortunately, this is something that's exposed to us
 programmatically. We'll need to manually set that value on each `TabViewItem` as
 we create new tabs. When we reload settings, we'll need to make sure to come

doc/specs/portable-mode-spec.md

@@ -1,90 +0,0 @@
----
-author: Dustin L. Howett @DHowett
-created on: 2023-03-22
-last updated: 2023-03-22
-issue id: none
----
-
-# Windows Terminal "Portable" Mode
-
-## Abstract
-
-Since we are planning on officially supporting unpackaged execution, I propose a special mode where Terminal stores its
-settings in a `settings` folder next to `WindowsTerminal.exe`.
-
-## Inspiration
-
-- [PortableApps](https://portableapps.com)
-- "Embeddable" Python, which relies on the deployment of a specific file to the Python root
-
-## Solution Design
-
-- _If running without package identity,_ `CascadiaSettings` will look for the presence of a file called `.portable` next
-  to `Microsoft.Terminal.Settings.Model.dll`.
-- If that file is present, it will change the settings and state paths to be rooted in a subfolder named `settings` next
-  to `Microsoft.Terminal.Settings.Model.dll`.
-
-Right now, _the only thing_ that makes Terminal not work in a "portable" manner is that it saves settings to
-`%LOCALAPPDATA%`.
-
-## UI/UX Design
-
-_No UI/UX impact is expected._
-
-## Capabilities
-
-- Distributors could ship a self-contained and preconfigured Terminal installation.
-- Users could archive fully-working preconfigured versions of Terminal.
-- Developers (such as those on the team) could easily test multiple versions of Terminal without worrying about global
-  settings pollution.
-
-### Accessibility
-
-_No change is expected._
-
-### Security
-
-_No change is expected._
-
-### Reliability
-
-More code always bears a risk.
-
-### Compatibility
-
-This is a net new feature, and it does not break any existing features. A distributor (or a user) can opt in (or out) by
-adding (or removing) the `.portable` file.
-
-The following features may be impacted.
-
-- **Dynamic Profiles** and **Fragment Extensions**
-  - _No impact expected._ Dynamic profiles will still be generated. If a portable installation is moved to a machine without the dynamic profile source, that profile will disappear.
-- `firstWindowPreference` and `state.json`
-  - _No impact expected._
-  - State is stored next to settings, even for portable installations.
-  - If a dynamic profile was saved in `state` and has been removed, Terminal will proceed as in non-portable mode.
-- Moving an install from Windows 10 to Windows 11 and back
-  - _No impact expected._
-- "Machine-specific" settings, like those about rendering and repainting
-  - _No impact expected._
-  - Terminal does not distinguish settings that are specific to a machine. These settings will move along with the portable install.
-- The shell extension
-  - _No impact expected._
-  - The shell extension will not be registered with Windows.
-  - If we choose to register the shell extension, it is already prepared for running a version of WT from the same directory. Registering the portable shell extension will make it launch portable Terminal.
-
-### Performance, Power, and Efficiency
-
-_No change is expected._
-
-## Potential Issues
-
-- User confusion around where settings are stored.
-
-## Future considerations
-
-- In the future, perhaps `.portable` could itself contain a directory path into which we would store settings.
-- We could consider adding an indicator in the Settings UI.
-- Because we are using the module path of the Settings Model DLL, a future unpackaged version of the shell extension
-  that supports profile loading would read the right settings file (assuming it used the settings model.)
-- If we choose to store the shell extension cache in the registry, we would need to avoid doing so in portable mode.

doc/terminal-v2-roadmap.md

@@ -142,4 +142,4 @@ Feature Notes:
 [#4472]: https://github.com/microsoft/terminal/issues/4472
 [#8048]: https://github.com/microsoft/terminal/pull/8048
 
-[Terminal 2022 Roadmap]: ./roadmap-2022.md
+[Terminal 2022 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/roadmap-2022.md

oss/libpopcnt/libpopcnt.h

@@ -95,7 +95,7 @@
   #define HAVE_AVX512
 #endif
 
-#if defined(X86_OR_X64) && !defined(_M_ARM64EC)
+#if defined(X86_OR_X64)
   /* MSVC compatible compilers (Windows) */
   #if defined(_MSC_VER)
     /* clang-cl (LLVM 10 from 2020) requires /arch:AVX2 or

oss/stb/LICENSE

@@ -1,37 +0,0 @@
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

oss/stb/MAINTAINER_README.md

@@ -1,4 +0,0 @@
-### Notes for Future Maintainers
-
-Search for files prefixed with `stb_` in this project.
-At the time of writing, the only file being used is `stb_rect_pack.h`.

oss/stb/cgmanifest.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
-    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/nothings/stb",
-          "commitHash": "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"
-        }
-      }
-    }
-  ],
-  "Version": 1
-}

oss/stb/stb_rect_pack.h

@@ -1,623 +0,0 @@
-// stb_rect_pack.h - v1.01 - public domain - rectangle packing
-// Sean Barrett 2014
-//
-// Useful for e.g. packing rectangular textures into an atlas.
-// Does not do rotation.
-//
-// Before #including,
-//
-//    #define STB_RECT_PACK_IMPLEMENTATION
-//
-// in the file that you want to have the implementation.
-//
-// Not necessarily the awesomest packing method, but better than
-// the totally naive one in stb_truetype (which is primarily what
-// this is meant to replace).
-//
-// Has only had a few tests run, may have issues.
-//
-// More docs to come.
-//
-// No memory allocations; uses qsort() and assert() from stdlib.
-// Can override those by defining STBRP_SORT and STBRP_ASSERT.
-//
-// This library currently uses the Skyline Bottom-Left algorithm.
-//
-// Please note: better rectangle packers are welcome! Please
-// implement them to the same API, but with a different init
-// function.
-//
-// Credits
-//
-//  Library
-//    Sean Barrett
-//  Minor features
-//    Martins Mozeiko
-//    github:IntellectualKitty
-//
-//  Bugfixes / warning fixes
-//    Jeremy Jaussaud
-//    Fabian Giesen
-//
-// Version history:
-//
-//     1.01  (2021-07-11)  always use large rect mode, expose STBRP__MAXVAL in public section
-//     1.00  (2019-02-25)  avoid small space waste; gracefully fail too-wide rectangles
-//     0.99  (2019-02-07)  warning fixes
-//     0.11  (2017-03-03)  return packing success/fail result
-//     0.10  (2016-10-25)  remove cast-away-const to avoid warnings
-//     0.09  (2016-08-27)  fix compiler warnings
-//     0.08  (2015-09-13)  really fix bug with empty rects (w=0 or h=0)
-//     0.07  (2015-09-13)  fix bug with empty rects (w=0 or h=0)
-//     0.06  (2015-04-15)  added STBRP_SORT to allow replacing qsort
-//     0.05:  added STBRP_ASSERT to allow replacing assert
-//     0.04:  fixed minor bug in STBRP_LARGE_RECTS support
-//     0.01:  initial release
-//
-// LICENSE
-//
-//   See end of file for license information.
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//       INCLUDE SECTION
-//
-
-#ifndef STB_INCLUDE_STB_RECT_PACK_H
-#define STB_INCLUDE_STB_RECT_PACK_H
-
-#define STB_RECT_PACK_VERSION  1
-
-#ifdef STBRP_STATIC
-#define STBRP_DEF static
-#else
-#define STBRP_DEF extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct stbrp_context stbrp_context;
-typedef struct stbrp_node    stbrp_node;
-typedef struct stbrp_rect    stbrp_rect;
-
-typedef int            stbrp_coord;
-
-#define STBRP__MAXVAL  0x7fffffff
-// Mostly for internal use, but this is the maximum supported coordinate value.
-
-STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
-// Assign packed locations to rectangles. The rectangles are of type
-// 'stbrp_rect' defined below, stored in the array 'rects', and there
-// are 'num_rects' many of them.
-//
-// Rectangles which are successfully packed have the 'was_packed' flag
-// set to a non-zero value and 'x' and 'y' store the minimum location
-// on each axis (i.e. bottom-left in cartesian coordinates, top-left
-// if you imagine y increasing downwards). Rectangles which do not fit
-// have the 'was_packed' flag set to 0.
-//
-// You should not try to access the 'rects' array from another thread
-// while this function is running, as the function temporarily reorders
-// the array while it executes.
-//
-// To pack into another rectangle, you need to call stbrp_init_target
-// again. To continue packing into the same rectangle, you can call
-// this function again. Calling this multiple times with multiple rect
-// arrays will probably produce worse packing results than calling it
-// a single time with the full rectangle array, but the option is
-// available.
-//
-// The function returns 1 if all of the rectangles were successfully
-// packed and 0 otherwise.
-
-struct stbrp_rect
-{
-   // reserved for your use:
-   int            id;
-
-   // input:
-   stbrp_coord    w, h;
-
-   // output:
-   stbrp_coord    x, y;
-   int            was_packed;  // non-zero if valid packing
-
-}; // 16 bytes, nominally
-
-
-STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
-// Initialize a rectangle packer to:
-//    pack a rectangle that is 'width' by 'height' in dimensions
-//    using temporary storage provided by the array 'nodes', which is 'num_nodes' long
-//
-// You must call this function every time you start packing into a new target.
-//
-// There is no "shutdown" function. The 'nodes' memory must stay valid for
-// the following stbrp_pack_rects() call (or calls), but can be freed after
-// the call (or calls) finish.
-//
-// Note: to guarantee best results, either:
-//       1. make sure 'num_nodes' >= 'width'
-//   or  2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1'
-//
-// If you don't do either of the above things, widths will be quantized to multiples
-// of small integers to guarantee the algorithm doesn't run out of temporary storage.
-//
-// If you do #2, then the non-quantized algorithm will be used, but the algorithm
-// may run out of temporary storage and be unable to pack some rectangles.
-
-STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
-// Optionally call this function after init but before doing any packing to
-// change the handling of the out-of-temp-memory scenario, described above.
-// If you call init again, this will be reset to the default (false).
-
-
-STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
-// Optionally select which packing heuristic the library should use. Different
-// heuristics will produce better/worse results for different data sets.
-// If you call init again, this will be reset to the default.
-
-enum
-{
-   STBRP_HEURISTIC_Skyline_default=0,
-   STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
-   STBRP_HEURISTIC_Skyline_BF_sortHeight
-};
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// the details of the following structures don't matter to you, but they must
-// be visible so you can handle the memory allocations for them
-
-struct stbrp_node
-{
-   stbrp_coord  x,y;
-   stbrp_node  *next;
-};
-
-struct stbrp_context
-{
-   int width;
-   int height;
-   int align;
-   int init_mode;
-   int heuristic;
-   int num_nodes;
-   stbrp_node *active_head;
-   stbrp_node *free_head;
-   stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2'
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//     IMPLEMENTATION SECTION
-//
-
-#ifdef STB_RECT_PACK_IMPLEMENTATION
-#ifndef STBRP_SORT
-#include <stdlib.h>
-#define STBRP_SORT qsort
-#endif
-
-#ifndef STBRP_ASSERT
-#include <assert.h>
-#define STBRP_ASSERT assert
-#endif
-
-#ifdef _MSC_VER
-#define STBRP__NOTUSED(v)  (void)(v)
-#define STBRP__CDECL       __cdecl
-#else
-#define STBRP__NOTUSED(v)  (void)sizeof(v)
-#define STBRP__CDECL
-#endif
-
-enum
-{
-   STBRP__INIT_skyline = 1
-};
-
-STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
-{
-   switch (context->init_mode) {
-      case STBRP__INIT_skyline:
-         STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
-         context->heuristic = heuristic;
-         break;
-      default:
-         STBRP_ASSERT(0);
-   }
-}
-
-STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
-{
-   if (allow_out_of_mem)
-      // if it's ok to run out of memory, then don't bother aligning them;
-      // this gives better packing, but may fail due to OOM (even though
-      // the rectangles easily fit). @TODO a smarter approach would be to only
-      // quantize once we've hit OOM, then we could get rid of this parameter.
-      context->align = 1;
-   else {
-      // if it's not ok to run out of memory, then quantize the widths
-      // so that num_nodes is always enough nodes.
-      //
-      // I.e. num_nodes * align >= width
-      //                  align >= width / num_nodes
-      //                  align = ceil(width/num_nodes)
-
-      context->align = (context->width + context->num_nodes-1) / context->num_nodes;
-   }
-}
-
-STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
-{
-   int i;
-
-   for (i=0; i < num_nodes-1; ++i)
-      nodes[i].next = &nodes[i+1];
-   nodes[i].next = NULL;
-   context->init_mode = STBRP__INIT_skyline;
-   context->heuristic = STBRP_HEURISTIC_Skyline_default;
-   context->free_head = &nodes[0];
-   context->active_head = &context->extra[0];
-   context->width = width;
-   context->height = height;
-   context->num_nodes = num_nodes;
-   stbrp_setup_allow_out_of_mem(context, 0);
-
-   // node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly)
-   context->extra[0].x = 0;
-   context->extra[0].y = 0;
-   context->extra[0].next = &context->extra[1];
-   context->extra[1].x = (stbrp_coord) width;
-   context->extra[1].y = (1<<30);
-   context->extra[1].next = NULL;
-}
-
-// find minimum y position if it starts at x1
-static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
-{
-   stbrp_node *node = first;
-   int x1 = x0 + width;
-   int min_y, visited_width, waste_area;
-
-   STBRP__NOTUSED(c);
-
-   STBRP_ASSERT(first->x <= x0);
-
-   #if 0
-   // skip in case we're past the node
-   while (node->next->x <= x0)
-      ++node;
-   #else
-   STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency
-   #endif
-
-   STBRP_ASSERT(node->x <= x0);
-
-   min_y = 0;
-   waste_area = 0;
-   visited_width = 0;
-   while (node->x < x1) {
-      if (node->y > min_y) {
-         // raise min_y higher.
-         // we've accounted for all waste up to min_y,
-         // but we'll now add more waste for everything we've visted
-         waste_area += visited_width * (node->y - min_y);
-         min_y = node->y;
-         // the first time through, visited_width might be reduced
-         if (node->x < x0)
-            visited_width += node->next->x - x0;
-         else
-            visited_width += node->next->x - node->x;
-      } else {
-         // add waste area
-         int under_width = node->next->x - node->x;
-         if (under_width + visited_width > width)
-            under_width = width - visited_width;
-         waste_area += under_width * (min_y - node->y);
-         visited_width += under_width;
-      }
-      node = node->next;
-   }
-
-   *pwaste = waste_area;
-   return min_y;
-}
-
-typedef struct
-{
-   int x,y;
-   stbrp_node **prev_link;
-} stbrp__findresult;
-
-static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
-{
-   int best_waste = (1<<30), best_x, best_y = (1 << 30);
-   stbrp__findresult fr;
-   stbrp_node **prev, *node, *tail, **best = NULL;
-
-   // align to multiple of c->align
-   width = (width + c->align - 1);
-   width -= width % c->align;
-   STBRP_ASSERT(width % c->align == 0);
-
-   // if it can't possibly fit, bail immediately
-   if (width > c->width || height > c->height) {
-      fr.prev_link = NULL;
-      fr.x = fr.y = 0;
-      return fr;
-   }
-
-   node = c->active_head;
-   prev = &c->active_head;
-   while (node->x + width <= c->width) {
-      int y,waste;
-      y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
-      if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL
-         // bottom left
-         if (y < best_y) {
-            best_y = y;
-            best = prev;
-         }
-      } else {
-         // best-fit
-         if (y + height <= c->height) {
-            // can only use it if it first vertically
-            if (y < best_y || (y == best_y && waste < best_waste)) {
-               best_y = y;
-               best_waste = waste;
-               best = prev;
-            }
-         }
-      }
-      prev = &node->next;
-      node = node->next;
-   }
-
-   best_x = (best == NULL) ? 0 : (*best)->x;
-
-   // if doing best-fit (BF), we also have to try aligning right edge to each node position
-   //
-   // e.g, if fitting
-   //
-   //     ____________________
-   //    |____________________|
-   //
-   //            into
-   //
-   //   |                         |
-   //   |             ____________|
-   //   |____________|
-   //
-   // then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned
-   //
-   // This makes BF take about 2x the time
-
-   if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
-      tail = c->active_head;
-      node = c->active_head;
-      prev = &c->active_head;
-      // find first node that's admissible
-      while (tail->x < width)
-         tail = tail->next;
-      while (tail) {
-         int xpos = tail->x - width;
-         int y,waste;
-         STBRP_ASSERT(xpos >= 0);
-         // find the left position that matches this
-         while (node->next->x <= xpos) {
-            prev = &node->next;
-            node = node->next;
-         }
-         STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
-         y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
-         if (y + height <= c->height) {
-            if (y <= best_y) {
-               if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
-                  best_x = xpos;
-                  STBRP_ASSERT(y <= best_y);
-                  best_y = y;
-                  best_waste = waste;
-                  best = prev;
-               }
-            }
-         }
-         tail = tail->next;
-      }
-   }
-
-   fr.prev_link = best;
-   fr.x = best_x;
-   fr.y = best_y;
-   return fr;
-}
-
-static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
-{
-   // find best position according to heuristic
-   stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
-   stbrp_node *node, *cur;
-
-   // bail if:
-   //    1. it failed
-   //    2. the best node doesn't fit (we don't always check this)
-   //    3. we're out of memory
-   if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
-      res.prev_link = NULL;
-      return res;
-   }
-
-   // on success, create new node
-   node = context->free_head;
-   node->x = (stbrp_coord) res.x;
-   node->y = (stbrp_coord) (res.y + height);
-
-   context->free_head = node->next;
-
-   // insert the new node into the right starting point, and
-   // let 'cur' point to the remaining nodes needing to be
-   // stiched back in
-
-   cur = *res.prev_link;
-   if (cur->x < res.x) {
-      // preserve the existing one, so start testing with the next one
-      stbrp_node *next = cur->next;
-      cur->next = node;
-      cur = next;
-   } else {
-      *res.prev_link = node;
-   }
-
-   // from here, traverse cur and free the nodes, until we get to one
-   // that shouldn't be freed
-   while (cur->next && cur->next->x <= res.x + width) {
-      stbrp_node *next = cur->next;
-      // move the current node to the free list
-      cur->next = context->free_head;
-      context->free_head = cur;
-      cur = next;
-   }
-
-   // stitch the list back in
-   node->next = cur;
-
-   if (cur->x < res.x + width)
-      cur->x = (stbrp_coord) (res.x + width);
-
-#ifdef _DEBUG
-   cur = context->active_head;
-   while (cur->x < context->width) {
-      STBRP_ASSERT(cur->x < cur->next->x);
-      cur = cur->next;
-   }
-   STBRP_ASSERT(cur->next == NULL);
-
-   {
-      int count=0;
-      cur = context->active_head;
-      while (cur) {
-         cur = cur->next;
-         ++count;
-      }
-      cur = context->free_head;
-      while (cur) {
-         cur = cur->next;
-         ++count;
-      }
-      STBRP_ASSERT(count == context->num_nodes+2);
-   }
-#endif
-
-   return res;
-}
-
-static int STBRP__CDECL rect_height_compare(const void *a, const void *b)
-{
-   const stbrp_rect *p = (const stbrp_rect *) a;
-   const stbrp_rect *q = (const stbrp_rect *) b;
-   if (p->h > q->h)
-      return -1;
-   if (p->h < q->h)
-      return  1;
-   return (p->w > q->w) ? -1 : (p->w < q->w);
-}
-
-static int STBRP__CDECL rect_original_order(const void *a, const void *b)
-{
-   const stbrp_rect *p = (const stbrp_rect *) a;
-   const stbrp_rect *q = (const stbrp_rect *) b;
-   return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
-}
-
-STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
-{
-   int i, all_rects_packed = 1;
-
-   // we use the 'was_packed' field internally to allow sorting/unsorting
-   for (i=0; i < num_rects; ++i) {
-      rects[i].was_packed = i;
-   }
-
-   // sort according to heuristic
-   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare);
-
-   for (i=0; i < num_rects; ++i) {
-      if (rects[i].w == 0 || rects[i].h == 0) {
-         rects[i].x = rects[i].y = 0;  // empty rect needs no space
-      } else {
-         stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
-         if (fr.prev_link) {
-            rects[i].x = (stbrp_coord) fr.x;
-            rects[i].y = (stbrp_coord) fr.y;
-         } else {
-            rects[i].x = rects[i].y = STBRP__MAXVAL;
-         }
-      }
-   }
-
-   // unsort
-   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order);
-
-   // set was_packed flags and all_rects_packed status
-   for (i=0; i < num_rects; ++i) {
-      rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
-      if (!rects[i].was_packed)
-         all_rects_packed = 0;
-   }
-
-   // return the all_rects_packed status
-   return all_rects_packed;
-}
-#endif
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/

res/terminal/Terminal_Can.svg

@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   fill="none"
-   version="1.1"
-   id="svg284"
-   sodipodi:docname="Terminal_Can_Pill.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata288">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="922"
-     inkscape:window-height="816"
-     id="namedview286"
-     showgrid="false"
-     inkscape:zoom="8.8541667"
-     inkscape:cx="-17.429862"
-     inkscape:cy="31.710582"
-     inkscape:window-x="3142"
-     inkscape:window-y="60"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg284" />
-  <g
-     id="g4007"
-     transform="matrix(0.9375,0,0,0.9375,0,1.5)">
-    <path
-       id="path150"
-       d="M 0,13 H 16 V 6 H 2 C 0.9,6 0,6.9 0,8 Z"
-       inkscape:connector-curvature="0"
-       style="fill:#cccccc" />
-    <path
-       id="path152"
-       d="M 32,6 H 16 v 7 h 16 z"
-       inkscape:connector-curvature="0"
-       style="fill:#999999" />
-    <path
-       id="path154"
-       d="M 48,13 H 32 V 6 h 14 c 1.1,0 2,0.9 2,2 z"
-       inkscape:connector-curvature="0"
-       style="fill:#666666" />
-    <path
-       id="path156"
-       d="M 46,42 H 2 C 0.9,42 0,41.1 0,40 V 12 h 48 v 28 c 0,1.1 -0.9,2 -2,2 z"
-       style="fill:url(#paint0_linear)"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g171"
-       style="filter:url(#filter0_dd)">
-      <path
-         id="path158"
-         d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
-         style="fill:url(#paint1_linear)"
-         inkscape:connector-curvature="0" />
-      <mask
-         height="13"
-         width="13"
-         y="24"
-         x="6"
-         maskUnits="userSpaceOnUse"
-         mask-type="alpha"
-         id="mask0">
-        <path
-           id="path160"
-           d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:url(#paint2_linear)" />
-      </mask>
-      <g
-         id="g167"
-         mask="url(#mask0)">
-        <g
-           id="g165"
-           style="filter:url(#filter1_dd)">
-          <path
-             id="path163"
-             d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
-             style="fill:url(#paint3_linear)"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <path
-         id="path169"
-         d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
-         style="fill:url(#paint4_linear)"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g175"
-       style="filter:url(#filter2_dd)">
-      <path
-         id="path173"
-         d="M 40,32 H 24 c -0.6,0 -1,0.4 -1,1 v 3 c 0,0.6 0.4,1 1,1 h 16 c 0.6,0 1,-0.4 1,-1 v -3 c 0,-0.6 -0.4,-1 -1,-1 z"
-         style="fill:url(#paint5_linear)"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <defs
-     id="defs282">
-    <filter
-       id="filter0_dd"
-       x="3.02499"
-       y="15"
-       width="18.95"
-       height="25.875"
-       filterUnits="userSpaceOnUse"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood177" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix179" />
-      <feOffset
-         dy="0.5"
-         id="feOffset181" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         id="feGaussianBlur183" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
-         id="feColorMatrix185" />
-      <feBlend
-         mode="normal"
-         in2="BackgroundImageFix"
-         result="effect1_dropShadow"
-         id="feBlend187" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix189" />
-      <feOffset
-         dy="1"
-         id="feOffset191" />
-      <feGaussianBlur
-         stdDeviation="1.5"
-         id="feGaussianBlur193" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
-         id="feColorMatrix195" />
-      <feBlend
-         mode="normal"
-         in2="effect1_dropShadow"
-         result="effect2_dropShadow"
-         id="feBlend197" />
-      <feBlend
-         mode="normal"
-         in="SourceGraphic"
-         in2="effect2_dropShadow"
-         result="shape"
-         id="feBlend199" />
-    </filter>
-    <filter
-       id="filter1_dd"
-       x="3.02499"
-       y="15"
-       width="18.95"
-       height="18.875"
-       filterUnits="userSpaceOnUse"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood202" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix204" />
-      <feOffset
-         dy="0.5"
-         id="feOffset206" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         id="feGaussianBlur208" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
-         id="feColorMatrix210" />
-      <feBlend
-         mode="normal"
-         in2="BackgroundImageFix"
-         result="effect1_dropShadow"
-         id="feBlend212" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix214" />
-      <feOffset
-         dy="1"
-         id="feOffset216" />
-      <feGaussianBlur
-         stdDeviation="1.5"
-         id="feGaussianBlur218" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
-         id="feColorMatrix220" />
-      <feBlend
-         mode="normal"
-         in2="effect1_dropShadow"
-         result="effect2_dropShadow"
-         id="feBlend222" />
-      <feBlend
-         mode="normal"
-         in="SourceGraphic"
-         in2="effect2_dropShadow"
-         result="shape"
-         id="feBlend224" />
-    </filter>
-    <filter
-       id="filter2_dd"
-       x="20"
-       y="30"
-       width="24"
-       height="11"
-       filterUnits="userSpaceOnUse"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood227" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix229" />
-      <feOffset
-         dy="0.5"
-         id="feOffset231" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         id="feGaussianBlur233" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
-         id="feColorMatrix235" />
-      <feBlend
-         mode="normal"
-         in2="BackgroundImageFix"
-         result="effect1_dropShadow"
-         id="feBlend237" />
-      <feColorMatrix
-         in="SourceAlpha"
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-         id="feColorMatrix239" />
-      <feOffset
-         dy="1"
-         id="feOffset241" />
-      <feGaussianBlur
-         stdDeviation="1.5"
-         id="feGaussianBlur243" />
-      <feColorMatrix
-         type="matrix"
-         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
-         id="feColorMatrix245" />
-      <feBlend
-         mode="normal"
-         in2="effect1_dropShadow"
-         result="effect2_dropShadow"
-         id="feBlend247" />
-      <feBlend
-         mode="normal"
-         in="SourceGraphic"
-         in2="effect2_dropShadow"
-         result="shape"
-         id="feBlend249" />
-    </filter>
-    <linearGradient
-       id="paint0_linear"
-       x1="36.4462"
-       y1="47.8257"
-       x2="11.8217"
-       y2="5.1748"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#333333"
-         id="stop252" />
-      <stop
-         offset="1"
-         stop-color="#4D4D4D"
-         id="stop254" />
-    </linearGradient>
-    <linearGradient
-       id="paint1_linear"
-       x1="14.5276"
-       y1="33.9959"
-       x2="10.4841"
-       y2="26.9924"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#999999"
-         id="stop257" />
-      <stop
-         offset="1"
-         stop-color="#B3B3B3"
-         id="stop259" />
-    </linearGradient>
-    <linearGradient
-       id="paint2_linear"
-       x1="14.5276"
-       y1="33.9959"
-       x2="10.4841"
-       y2="26.9924"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#999999"
-         id="stop262" />
-      <stop
-         offset="1"
-         stop-color="#B3B3B3"
-         id="stop264" />
-    </linearGradient>
-    <linearGradient
-       id="paint3_linear"
-       x1="16.2747"
-       y1="30.0336"
-       x2="8.73699"
-       y2="16.9781"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#CCCCCC"
-         id="stop267" />
-      <stop
-         offset="1"
-         stop-color="#E6E6E6"
-         id="stop269" />
-    </linearGradient>
-    <linearGradient
-       id="paint4_linear"
-       x1="16.2747"
-       y1="30.0336"
-       x2="8.73699"
-       y2="16.9781"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#CCCCCC"
-         id="stop272" />
-      <stop
-         offset="1"
-         stop-color="#E6E6E6"
-         id="stop274" />
-    </linearGradient>
-    <linearGradient
-       id="paint5_linear"
-       x1="35.1496"
-       y1="39.9553"
-       x2="28.8504"
-       y2="29.0447"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#CCCCCC"
-         id="stop277" />
-      <stop
-         offset="1"
-         stop-color="#E6E6E6"
-         id="stop279" />
-    </linearGradient>
-  </defs>
-  <rect
-     x="19"
-     y="31.053001"
-     width="29"
-     height="11.947"
-     rx="1.8238994"
-     id="rect29"
-     style="fill:#fcc024;stroke-width:1;fill-opacity:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
-  <path
-     d="M29.3999 39.7363C28.9253 39.9824 28.335 40.1055 27.6289 40.1055C26.7148 40.1055 25.9824 39.8169 25.4316 39.2397C24.8809 38.6626 24.6055 37.9053 24.6055 36.9678C24.6055 35.96 24.9146 35.1455 25.5327 34.5244C26.1538 33.9033 26.9375 33.5928 27.8838 33.5928C28.4932 33.5928 28.9985 33.6792 29.3999 33.8521V34.8892C28.9751 34.6372 28.5063 34.5112 27.9937 34.5112C27.311 34.5112 26.7573 34.7295 26.3325 35.166C25.9106 35.6025 25.6997 36.1855 25.6997 36.915C25.6997 37.6094 25.8975 38.1631 26.293 38.5762C26.6885 38.9863 27.2085 39.1914 27.853 39.1914C28.4478 39.1914 28.9634 39.0508 29.3999 38.7695V39.7363ZM35.772 40H34.625L34.0581 38.396H31.5796L31.0347 40H29.8921L32.252 33.6982H33.4297L35.772 40ZM33.7812 37.5435L32.9067 35.0298C32.8804 34.9478 32.8525 34.8159 32.8232 34.6343H32.8057C32.7793 34.8013 32.75 34.9331 32.7178 35.0298L31.8521 37.5435H33.7812ZM41.9858 40H40.8433L37.833 35.3682C37.7568 35.251 37.6938 35.1294 37.644 35.0034H37.6177C37.6411 35.1382 37.6528 35.4268 37.6528 35.8691V40H36.6421V33.6982H37.8594L40.7686 38.2202C40.8916 38.4077 40.9707 38.5366 41.0059 38.6069H41.0234C40.9941 38.4399 40.9795 38.1572 40.9795 37.7588V33.6982H41.9858V40Z"
-     id="pill_text"
-     inkscape:connector-curvature="0"
-     style="fill:#000000;stroke-width:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
-</svg>

res/terminal/Terminal_Can_HC.svg

@@ -1,17 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="foreground"><stop stop-color="#000000"/></linearGradient>
-<linearGradient id="background"><stop stop-color="#ffffff"/></linearGradient>
-</defs>
-<!-- background rounded rectangle -->
-<path d="M2 6C0.9 6 0 6.9 0 8L0 12L0 13L0 40C0 41.1 0.9 42 2 42L46 42C47.1 42 48 41.1 48 40L48 13L48 12L48 8C48 6.9 47.1 6 46 6L32 6L16 6L2 6Z" fill="url(#background)"/>
-<!-- tab outlines -->
-<rect y="12" x="0" height="1" width="48" fill="url(#foreground)"/>
-<rect y="6" x="15.33" height="7" width="1" fill="url(#foreground)"/>
-<rect y="6" x="31.66" height="7" width="1" fill="url(#foreground)"/>
-<!-- > -->
-<path d="M15.2 24.3L6.4 33.1C5.9 33.6 5.9 34.3 6.4 34.7L8.2 36.5C8.7 37 9.4 37 9.8 36.5L18.6 27.7C19.1 27.2 19.1 26.5 18.6 26.1L16.8 24.3C16.4 23.9 15.6 23.9 15.2 24.3Z" fill="url(#foreground)"/>
-<path d="M9.8 17.3L18.6 26.1C19.1 26.6 19.1 27.3 18.6 27.7L16.8 29.5C16.3 30 15.6 30 15.2 29.5L6.4 20.7C5.9 20.2 5.9 19.5 6.4 19.1L8.2 17.3C8.6 16.9 9.4 16.9 9.8 17.3Z" fill="url(#foreground)"/>
-<!-- "PRE" -->
-<path d="m 27.279297,33.324219 c 0,2.468099 0,4.936198 0,7.404297 0.513672,0 1.027343,0 1.541015,0 0,-0.848958 0,-1.697917 0,-2.546875 0.917549,0.01484 1.927453,0.03299 2.65875,-0.616892 1.172278,-0.927905 1.176118,-3.073122 -0.17547,-3.840777 -0.981472,-0.568217 -2.13908,-0.358412 -3.218649,-0.399753 -0.268549,0 -0.537097,0 -0.805646,0 z m 5.869141,0 c 0,2.468099 0,4.936198 0,7.404297 0.513021,0 1.026041,0 1.539062,0 0,-0.950521 0,-1.901042 0,-2.851563 0.431639,-0.03621 0.908827,0.05394 1.148438,0.458985 0.525553,0.771736 0.970414,1.596546 1.458984,2.392578 0.604167,0 1.208333,0 1.8125,0 -0.638695,-0.976785 -1.211177,-1.999445 -1.914561,-2.931671 -0.241051,-0.276681 -0.636923,-0.466649 -0.07177,-0.574189 1.274395,-0.677377 1.378019,-2.774051 0.102268,-3.504493 -0.922467,-0.560429 -2.029423,-0.352936 -3.053526,-0.393944 -0.340466,0 -0.680932,0 -1.021398,0 z m 6.25,0 c 0,2.468099 0,4.936198 0,7.404297 1.440755,0 2.88151,0 4.322265,0 0,-0.454427 0,-0.908855 0,-1.363282 -0.925781,0 -1.851563,0 -2.777344,0 0,-0.566406 0,-1.132812 0,-1.699218 0.804688,0 1.609375,0 2.414063,0 0,-0.454427 0,-0.908855 0,-1.363282 -0.804688,0 -1.609375,0 -2.414063,0 0,-0.536458 0,-1.072917 0,-1.609375 0.873047,0 1.746094,0 2.619141,0 0,-0.45638 0,-0.91276 0,-1.36914 -1.388021,0 -2.776041,0 -4.164062,0 z M 34.6875,34.648438 c 0.570781,0.0371 1.28319,-0.150767 1.691507,0.358943 0.370833,0.564952 0.02331,1.464787 -0.684396,1.526855 -0.334157,0.03512 -0.67147,0.0117 -1.007111,0.0185 0,-0.634765 0,-1.269531 0,-1.904296 z m -5.867188,0.01562 c 0.61736,0.02299 1.42501,-0.135196 1.79395,0.492096 0.333428,0.657753 -0.0252,1.619083 -0.829192,1.664678 -0.319151,0.05007 -0.643164,0.0243 -0.964758,0.03073 0,-0.729167 0,-1.458333 0,-2.1875 z" fill="url(#foreground)"/>
-</svg>