Update Cascadia Code to 2009.21 (#7693)

(cherry picked from commit 206131d83a)

.github/actions/spell-check/advice.txt

@@ -0,0 +1,25 @@
+<details>
+<summary>
+:pencil2: Contributor please read this
+</summary>
+
+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. You can copy the contents of each `perl` command excluding the outer `'` marks and dropping any `'"`/`"'` quotation mark pairs into a file and then run `perl file.pl` from the root of the repository to run the code. Alternatively, you can manually insert the items...
+
+If the listed items are:
+* ... **misspelled**, then please *correct* them instead of using the command.
+* ... *names*, please add them to `.github/actions/spell-check/dictionary/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
+* ... just things you're using, please add them to an appropriate file in `.github/actions/spell-check/expect/`.
+* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spell-check/patterns/`.
+
+See the `README.md` in each directory for more information.
+
+:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [:check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
+
+</details>
+
+#### :warning: Reviewers
+At present, the action that triggered this message will not show its :x: in this PR unless the branch is within this repository.
+Thus, you **should** make sure that this comment has been addressed before encouraging the merge bot to merge this PR.

.github/actions/spell-check/dictionary/README.md

@@ -1,6 +1,6 @@
-# Allow files are lists of words to accept unconditionally
+# Dictionaries are lists of words to accept unconditionally
 
-While check spelling will complain about an expected word
+While check spelling will complain about a whitelisted word
 which is no longer present, you can include things here even if
 they are not otherwise present in the repository.
 
@@ -8,14 +8,13 @@ E.g., you could include a list of system APIs here, or potential
 contributors (so that if a future commit includes their name,
 it'll be accepted).
 
-## Files
+### Files
 
 | File | Description |
 | ---- | ----------- |
-| [Allow](allow.txt) | Supplements to the dictionary |
+| [Dictionary](dictionary.txt) | Primary US English dictionary |
 | [Chinese](chinese.txt) | Chinese words |
 | [Japanese](japanese.txt) | Japanese words |
 | [Microsoft](microsoft.txt) | Microsoft brand items |
 | [Fonts](fonts.txt) | Font names |
 | [Names](names.txt) | Names of people |
-| [Colors](colors.txt) | Names of color |

.github/actions/spell-check/dictionary/apis.txt

@@ -0,0 +1,53 @@
+ACCEPTFILES
+ACCESSDENIED
+alignof
+bitfield
+bitfields
+CLASSNOTAVAILABLE
+EXPCMDFLAGS
+EXPCMDSTATE
+fullkbd
+futex
+Hashtable
+href
+IAsync
+IBind
+IBox
+IClass
+IComparable
+ICustom
+IDialog
+IDirect
+IExplorer
+IMap
+IObject
+IStorage
+llabs
+LCID
+lround
+LSHIFT
+NCHITTEST
+NCLBUTTONDBLCLK
+NCRBUTTONDBLCLK
+NOAGGREGATION
+NOREDIRECTIONBITMAP
+oaidl
+ocidl
+otms
+OUTLINETEXTMETRICW
+PAGESCROLL
+RETURNCMD
+rfind
+roundf
+RSHIFT
+rx
+serializer
+SIZENS
+spsc
+STDCPP
+syscall
+tmp
+tx
+userenv
+XDocument
+XElement

.github/actions/spell-check/dictionary/fonts.txt

@@ -1,10 +1,8 @@
 Consolas
 emoji
-emojis
 Extralight
 Gabriola
 Iosevka
 MDL
 Monofur
 Segoe
-wght

.github/actions/spell-check/dictionary/math.txt

@@ -0,0 +1,3 @@
+powf
+sqrtf
+isnan

.github/actions/spell-check/dictionary/microsoft.txt

@@ -0,0 +1,38 @@
+ACLs
+altform
+appendwttlogging
+backplating
+CPRs
+DACL
+DACLs
+dotnetfeed
+DWINRT
+enablewttlogging
+LKG
+mfcribbon
+microsoft
+microsoftonline
+netcore
+osgvsowi
+pgc
+pgo
+pgosweep
+powerrename
+powershell
+pscustomobject
+robocopy
+SACLs
+Shobjidl
+Skype
+sysnative
+systemroot
+taskkill
+tasklist
+tdbuildteamid
+vcruntime
+visualstudio
+wlk
+wslpath
+wtl
+wtt
+wttlog

.github/actions/spell-check/dictionary/names.txt

@@ -1,66 +1,44 @@
 Anup
 austdi
-arkthur
 Ballmer
 bhoj
 Bhojwani
-Bluloco
 carlos
 dhowett
 Diviness
 dsafa
 duhowett
-DXP
-ekg
-eryksun
 ethanschoonover
 Firefox
 Gatta
-glsl
-Gravell
 Grie
 Griese
 Hernan
 Howett
 Illhardt
-iquilezles
-italo
 jantari
 jerrysh
 Kaiyu
 kimwalisch
 KMehrain
-KODELIFE
-Kodelife
 Kourosh
 kowalczyk
 leonmsft
 Lepilleur
-lhecker
 lukesampson
-Macbook
 Manandhar
-masserano
 mbadolato
 Mehrain
-menger
 mgravell
 michaelniksa
-michkap
 migrie
 mikegr
 mikemaccana
-miloush
 miniksa
 niksa
-nvaccess
-nvda
 oising
 oldnewthing
-opengl
 osgwiki
-pabhojwa
-panos
 paulcam
 pauldotknopf
 PGP
@@ -68,18 +46,11 @@ Pham
 Rincewind
 rprichard
 Schoonover
-shadertoy
-Shomnipotence
-simioni
 Somuah
 sonph
 sonpham
 stakx
-talo
-thereses
 Walisch
-WDX
-Wellons
 Wirt
 Wojciech
 zadjii

.github/actions/spell-check/excludes.txt

@@ -0,0 +1,63 @@
+(?:^|/)dirs$
+(?:^|/)go\.mod$
+(?:^|/)go\.sum$
+(?:^|/)package-lock\.json$
+(?:^|/)sources(?:|\.dep)$
+SUMS$
+\.ai$
+\.bmp$
+\.cer$
+\.class$
+\.crl$
+\.crt$
+\.csr$
+\.dll$
+\.DS_Store$
+\.eot$
+\.eps$
+\.exe$
+\.gif$
+\.graffle$
+\.gz$
+\.icns$
+\.ico$
+\.jar$
+\.jpeg$
+\.jpg$
+\.key$
+\.lib$
+\.lock$
+\.map$
+\.min\..
+\.mp3$
+\.mp4$
+\.otf$
+\.pbxproj$
+\.pdf$
+\.pem$
+\.png$
+\.psd$
+\.runsettings$
+\.sig$
+\.so$
+\.svg$
+\.svgz$
+\.tar$
+\.tgz$
+\.ttf$
+\.woff
+\.xcf$
+\.xls
+\.xpm$
+\.yml$
+\.zip$
+^consolegit2gitfilters\.json$
+^dep/
+^oss/
+^doc/reference/UTF8-torture-test\.txt$
+^src/interactivity/onecore/BgfxEngine\.
+^src/renderer/wddmcon/WddmConRenderer\.
+^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
+^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
+^\.github/actions/spell-check/
+^\.gitignore$

.github/actions/spell-check/expect/alphabet.txt

@@ -1,23 +1,16 @@
-AAAa
-AAAAA
-AAAAAAAAAAAAA
-AAAAAABBBBBBCCC
-AAAAABBBBBBCCC
-abcd
 abcd
+abcde
+abcdef
+ABCDEFG
+ABCDEFGH
 ABCDEFGHIJ
 abcdefghijk
-ABCDEFGHIJKLMNO
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
-ABCG
+abcdefghijklmnopqrstuvwxyz
 ABE
-abf
-BBBBB
-BBBBBBBB
-BBBBBCCC
-BBBBCCCCC
 BBGGRR
+BBBBBBBBBBBBBBDDDD
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ
@@ -26,6 +19,7 @@ QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty
+QWERTYUIOP
 qwertyuiopasdfg
 YYYYYYYDDDDDDDDDDD
 ZAAZZ
@@ -37,4 +31,3 @@ ZYXWVUT
 ZZBBZ
 ZZZBB
 ZZZBZ
-ZZZZZ

.github/actions/spell-check/expect/web.txt

@@ -0,0 +1,15 @@
+http
+td
+www
+ecma
+rapidtables
+WCAG
+freedesktop
+ycombinator
+robertelder
+kovidgoyal
+leonerd
+fixterms
+uk
+winui
+appshellintegration

.github/actions/spell-check/patterns/patterns.txt

@@ -0,0 +1,22 @@
+https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
+https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
+https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
+https://www\.vt100\.net/docs/[-a-zA-Z0-9#_\/.]*
+https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
+https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
+https://[a-z-]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+[Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
+(?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
+(?: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
+# selectionInput.cpp
+ :\\windows\\syste\b
+TestUtils::VerifyExpectedString\(tb, L"[^"]+"
+(?:hostSm|mach)\.ProcessString\(L"[^"]+"
+\b([A-Za-z])\1{3,}\b
+Base64::s_(?:En|De)code\(L"[^"]+"
+VERIFY_ARE_EQUAL\(L"[^"]+"
+L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
+std::memory_order_[\w]+

.github/actions/spelling/README.md

@@ -1,15 +0,0 @@
-# check-spelling/check-spelling configuration
-
-File | Purpose | Format | Info
--|-|-|-
-[allow/*.txt](allow/) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
-[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
-[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
-[patterns/*.txt](patterns/) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
-[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[expect/*.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
-[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

@@ -1,48 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details>
-<summary>
-:pencil2: Contributor please read this
-</summary>
-
-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.
-* ... *names*, please add them to `.github/actions/spelling/allow/names.txt`.
-* ... APIs, you can add them to a file in `.github/actions/spelling/allow/`.
-* ... just things you're using, please add them to an appropriate file in `.github/actions/spelling/expect/`.
-* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spelling/patterns/`.
-
-See the `README.md` in each directory for more information.
-
-:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
-
-
-<details><summary>If the flagged items are :exploding_head: false positives</summary>
-
-If items relate to a ...
-* binary file (or some other file you wouldn't want to check at all).
-
-  Please add a file path to the `excludes.txt` file matching the containing file.
-
-  File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-
-* well-formed pattern.
-
-  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](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-  Note that patterns can't match multiline strings.
-</details>
-
-</details>

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

@@ -1,108 +0,0 @@
-admins
-allcolors
-Apc
-apc
-breadcrumb
-breadcrumbs
-bsd
-calt
-ccmp
-changelog
-clickable
-clig
-CMMI
-copyable
-cybersecurity
-dalet
-Dcs
-dcs
-dialytika
-dje
-downside
-downsides
-dze
-dzhe
-EDDB
-EDDC
-Enum'd
-Fitt
-formattings
-FTCS
-ftp
-fvar
-gantt
-gcc
-geeksforgeeks
-ghe
-github
-gje
-godbolt
-hostname
-hostnames
-https
-hyperlink
-hyperlinking
-hyperlinks
-iconify
-img
-inlined
-It'd
-kje
-libfuzzer
-libuv
-liga
-lje
-Llast
-llvm
-Lmid
-locl
-lol
-lorem
-Lorigin
-maxed
-minimalistic
-mkmk
-mnt
-mru
-nje
-noreply
-ogonek
-ok'd
-overlined
-pipeline
-postmodern
-ptys
-qof
-qps
-rclt
-reimplementation
-reserialization
-reserialize
-reserializes
-rlig
-runtimes
-shcha
-slnt
-Sos
-ssh
-timeline
-timelines
-timestamped
-TLDR
-tokenizes
-tonos
-toolset
-tshe
-ubuntu
-uiatextrange
-UIs
-und
-unregister
-versioned
-vsdevcmd
-We'd
-wildcards
-XBox
-YBox
-yeru
-zhe

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

@@ -1,248 +0,0 @@
-ACCEPTFILES
-ACCESSDENIED
-acl
-aclapi
-alignas
-alignof
-APPLYTOSUBMENUS
-appxrecipe
-bitfield
-bitfields
-BUILDBRANCH
-BUILDMSG
-BUILDNUMBER
-BYCOMMAND
-BYPOSITION
-charconv
-CLASSNOTAVAILABLE
-CLOSEAPP
-cmdletbinding
-COLORPROPERTY
-colspan
-COMDLG
-commandlinetoargv
-comparand
-cstdint
-CXICON
-CYICON
-Dacl
-dataobject
-dcomp
-DERR
-dlldata
-DNE
-DONTADDTORECENT
-DWMSBT
-DWMWA
-DWMWA
-DWORDLONG
-endfor
-ENDSESSION
-enumset
-environstrings
-EXPCMDFLAGS
-EXPCMDSTATE
-filetime
-FILTERSPEC
-FORCEFILESYSTEM
-FORCEMINIMIZE
-frac
-fullkbd
-futex
-GETDESKWALLPAPER
-GETHIGHCONTRAST
-GETMOUSEHOVERTIME
-Hashtable
-HIGHCONTRASTON
-HIGHCONTRASTW
-hotkeys
-href
-hrgn
-HTCLOSE
-hwinsta
-HWINSTA
-IActivation
-IApp
-IAppearance
-IAsync
-IBind
-IBox
-IClass
-IComparable
-IComparer
-IConnection
-ICustom
-IDialog
-IDirect
-IExplorer
-IFACEMETHOD
-IFile
-IGraphics
-IInheritable
-IMap
-IMonarch
-IObject
-iosfwd
-IPackage
-IPeasant
-ISetup
-isspace
-IStorage
-istream
-IStringable
-ITab
-ITaskbar
-itow
-IUri
-IVirtual
-KEYSELECT
-LCID
-llabs
-llu
-localtime
-lround
-Lsa
-lsass
-LSHIFT
-LTGRAY
-MAINWINDOW
-memchr
-memicmp
-MENUCOMMAND
-MENUDATA
-MENUINFO
-MENUITEMINFOW
-mmeapi
-MOUSELEAVE
-mov
-mptt
-msappx
-MULTIPLEUSE
-NCHITTEST
-NCLBUTTONDBLCLK
-NCMOUSELEAVE
-NCMOUSEMOVE
-NCRBUTTONDBLCLK
-NIF
-NIN
-NOAGGREGATION
-NOASYNC
-NOCHANGEDIR
-NOPROGRESS
-NOREDIRECTIONBITMAP
-NOREPEAT
-NOTIFYBYPOS
-NOTIFYICON
-NOTIFYICONDATA
-ntprivapi
-oaidl
-ocidl
-ODR
-offsetof
-ofstream
-onefuzz
-osver
-OSVERSIONINFOEXW
-otms
-OUTLINETEXTMETRICW
-overridable
-PACL
-PAGESCROLL
-PATINVERT
-PEXPLICIT
-PICKFOLDERS
-pmr
-ptstr
-QUERYENDSESSION
-rcx
-REGCLS
-RETURNCMD
-rfind
-ROOTOWNER
-roundf
-RSHIFT
-SACL
-schandle
-semver
-serializer
-SETVERSION
-SHELLEXECUTEINFOW
-shobjidl
-SHOWHIDE
-SHOWMINIMIZED
-SHOWTIP
-SINGLEUSE
-SIZENS
-smoothstep
-snprintf
-spsc
-sregex
-SRWLOC
-SRWLOCK
-STDCPP
-STDMETHOD
-strchr
-strcpy
-streambuf
-strtoul
-Stubless
-Subheader
-Subpage
-syscall
-SYSTEMBACKDROP
-TABROW
-TASKBARCREATED
-TBPF
-THEMECHANGED
-tlg
-TME
-tmp
-tmpdir
-tolower
-toupper
-TRACKMOUSEEVENT
-TTask
-TVal
-UChar
-UFIELD
-ULARGE
-UOI
-UPDATEINIFILE
-userenv
-USEROBJECTFLAGS
-Viewbox
-virtualalloc
-wcsstr
-wcstoui
-winmain
-winsta
-winstamin
-wmemcmp
-wpc
-WSF
-wsregex
-wwinmain
-xchg
-XDocument
-XElement
-xfacet
-xhash
-XIcon
-xiosbase
-xlocale
-xlocbuf
-xlocinfo
-xlocmes
-xlocmon
-xlocnum
-xloctime
-XMax
-xmemory
-XParse
-xpath
-xstddef
-xstring
-xtree
-xutility
-YIcon
-YMax

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

@@ -1,117 +0,0 @@
-alice
-aliceblue
-antiquewhite
-blanchedalmond
-blueviolet
-burlywood
-cadetblue
-cornflowerblue
-cornsilk
-cyan
-darkblue
-darkcyan
-darkgoldenrod
-darkgray
-darkgreen
-darkgrey
-darkkhaki
-darkmagenta
-darkolivegreen
-darkorange
-darkorchid
-darkred
-darksalmon
-darkseagreen
-darkslateblue
-darkslategray
-darkslategrey
-darkturquoise
-darkviolet
-deeppink
-deepskyblue
-dimgray
-dimgrey
-dodgerblue
-firebrick
-floralwhite
-forestgreen
-gainsboro
-ghostwhite
-greenyellow
-hotpink
-indian
-indianred
-lavenderblush
-lawngreen
-lemonchiffon
-lightblue
-lightcoral
-lightcyan
-lightgoldenrod
-lightgoldenrodyellow
-lightgray
-lightgreen
-lightgrey
-lightpink
-lightsalmon
-lightseagreen
-lightskyblue
-lightslateblue
-lightslategray
-lightslategrey
-lightsteelblue
-lightyellow
-limegreen
-mediumaquamarine
-mediumblue
-mediumorchid
-mediumpurple
-mediumseagreen
-mediumslateblue
-mediumspringgreen
-mediumturquoise
-mediumvioletred
-midnightblue
-mintcream
-mistyrose
-navajo
-navajowhite
-navyblue
-oldlace
-olivedrab
-orangered
-palegoldenrod
-palegreen
-paleturquoise
-palevioletred
-papayawhip
-peachpuff
-peru
-powderblue
-rebecca
-rebeccapurple
-rosybrown
-royalblue
-saddlebrown
-sandybrown
-seagreen
-sienna
-skyblue
-slateblue
-slategray
-slategrey
-springgreen
-steelblue
-violetred
-webgray
-webgreen
-webgrey
-webmaroon
-webpurple
-whitesmoke
-xaroon
-xray
-xreen
-xrey
-xurple
-yellowgreen

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

@@ -1,11 +0,0 @@
-atan
-CPrime
-HBar
-HPrime
-isnan
-LPrime
-LStep
-powf
-RSub
-sqrtf
-ULP

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

@@ -1,85 +0,0 @@
-ACLs
-ADMINS
-advapi
-altform
-altforms
-appendwttlogging
-appx
-appxbundle
-appxerror
-appxmanifest
-ATL
-backplating
-bitmaps
-BOMs
-CPLs
-cpptools
-cppvsdbg
-CPRs
-cryptbase
-DACL
-DACLs
-defaultlib
-diffs
-disposables
-dotnetfeed
-DTDs
-DWINRT
-enablewttlogging
-Intelli
-IVisual
-libucrt
-libucrtd
-LKG
-LOCKFILE
-Lxss
-mfcribbon
-microsoft
-microsoftonline
-MSAA
-msixbundle
-MSVC
-MSVCP
-muxc
-netcore
-Onefuzz
-osgvsowi
-PFILETIME
-pgc
-pgo
-pgosweep
-powerrename
-powershell
-propkey
-pscustomobject
-QWORD
-regedit
-robocopy
-SACLs
-sdkddkver
-Shobjidl
-Skype
-SRW
-sxs
-Sysinternals
-sysnative
-systemroot
-taskkill
-tasklist
-tdbuildteamid
-ucrt
-ucrtd
-unvirtualized
-VCRT
-vcruntime
-Virtualization
-visualstudio
-vscode
-VSTHRD
-winsdkver
-wlk
-wslpath
-wtl
-wtt
-wttlog
-Xamarin

.github/actions/spelling/candidate.patterns

@@ -1,523 +0,0 @@
-# marker to ignore all code on line
-^.*/\* #no-spell-check-line \*/.*$
-# 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}
-
-# cid urls
-(['"])cid:.*?\g{-1}
-
-# data url in parens
-\(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 url
-data:[-a-zA-Z=;:/0-9+]*,\S*
-
-# mailto urls
-mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
-
-# magnet urls
-magnet:[?=:\w]+
-
-# magnet urls
-"magnet:[^"]+"
-
-# obs:
-"obs:[^"]*"
-
-# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
-# In this examples content, I'm using a number of different ways to match things to show various approaches
-# asciinema
-\basciinema\.org/a/[0-9a-zA-Z]+
-
-# apple
-\bdeveloper\.apple\.com/[-\w?=/]+
-# Apple music
-\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
-
-# appveyor api
-\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
-# appveyor project
-\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
-
-# Amazon
-
-# Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
-# AWS S3
-\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS execute-api
-\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
-# AWS ELB
-\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
-# AWS SNS
-\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS VPC
-vpc-\w+
-
-# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
-# YouTube url
-\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
-# YouTube music
-\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
-# YouTube tag
-<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
-# YouTube image
-\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
-# Google Accounts
-\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
-# Google Analytics
-\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
-# Google APIs
-\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
-# Google Storage
-\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
-# Google Calendar
-\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
-\w+\@group\.calendar\.google\.com\b
-# Google DataStudio
-\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
-# The leading `/` here is as opposed to the `\b` above
-# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
-# Google Docs
-/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
-# Google Drive
-\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
-# Google Groups
-\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
-themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
-# Google CDN
-\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
-# Goo.gl
-/goo\.gl/[a-zA-Z0-9]+
-# Google Chrome Store
-\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
-# Google Books
-\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
-# Google Fonts
-\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
-# Google Forms
-\bforms\.gle/\w+
-# Google Scholar
-\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
-# Google Colab Research Drive
-\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
-
-# GitHub SHAs (api)
-\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
-# GitHub SHAs (markdown)
-(?:\[`?[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 wiki
-\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
-# githubusercontent
-/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
-# githubassets
-\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
-# gist github
-\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
-# git.io
-\bgit\.io/[0-9a-zA-Z]+
-# GitHub JSON
-"node_id": "[-a-zA-Z=;:/0-9+]*"
-# Contributor
-\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
-# GHSA
-GHSA(?:-[0-9a-z]{4}){3}
-
-# GitLab commit
-\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
-# GitLab merge requests
-\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
-# GitLab uploads
-\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
-# GitLab commits
-\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
-
-# 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]+
-# bitbucket repositories commits
-\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-# bitbucket commits
-\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-
-# bit.ly
-\bbit\.ly/\w+
-
-# bitrise
-\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
-
-# bootstrapcdn.com
-\bbootstrapcdn\.com/[-./\w]+
-
-# cdn.cloudflare.com
-\bcdnjs\.cloudflare\.com/[./\w]+
-
-# circleci
-\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
-
-# gitter
-\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
-
-# gravatar
-\bgravatar\.com/avatar/[0-9a-f]+
-
-# ibm
-[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
-
-# imgur
-\bimgur\.com/[^.]+
-
-# Internet Archive
-\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
-
-# discord
-/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
-
-# Disqus
-\bdisqus\.com/[-\w/%.()!?&=_]*
-
-# medium link
-\blink\.medium\.com/[a-zA-Z0-9]+
-# medium
-\bmedium\.com/\@?[^/\s"]+/[-\w]+
-
-# microsoft
-\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
-# powerbi
-\bapp\.powerbi\.com/reportEmbed/[^"' ]*
-# vs devops
-\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
-# microsoft store
-\bmicrosoft\.com/store/apps/\w+
-
-# mvnrepository.com
-\bmvnrepository\.com/[-0-9a-z./]+
-
-# now.sh
-/[0-9a-z-.]+\.now\.sh\b
-
-# oracle
-\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
-
-# chromatic.com
-/\S+.chromatic.com\S*[")]
-
-# codacy
-\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
-
-# compai
-\bcompai\.pub/v1/png/[0-9a-f]+
-
-# mailgun api
-\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
-# mailgun
-\b[0-9a-z]+.mailgun.org
-
-# /message-id/
-/message-id/[-\w@./%]+
-
-# Reddit
-\breddit\.com/r/[/\w_]*
-
-# requestb.in
-\brequestb\.in/[0-9a-z]+
-
-# sched
-\b[a-z0-9]+\.sched\.com\b
-
-# Slack url
-slack://[a-zA-Z0-9?&=]+
-# Slack
-\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
-# Slack edge
-\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
-# Slack images
-\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
-
-# shields.io
-\bshields\.io/[-\w/%?=&.:+;,]*
-
-# stackexchange -- https://stackexchange.com/feeds/sites
-\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
-
-# Sentry
-[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
-
-# Twitter markdown
-\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
-# Twitter hashtag
-\btwitter\.com/hashtag/[\w?_=&]*
-# Twitter status
-\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
-# Twitter profile images
-\btwimg\.com/profile_images/[_\w./]*
-# Twitter media
-\btwimg\.com/media/[-_\w./?=]*
-# Twitter link shortened
-\bt\.co/\w+
-
-# facebook
-\bfburl\.com/[0-9a-z_]+
-# facebook CDN
-\bfbcdn\.net/[\w/.,]*
-# facebook watch
-\bfb\.watch/[0-9A-Za-z]+
-
-# dropbox
-\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
-
-# ipfs protocol
-ipfs://[0-9a-z]*
-# ipfs url
-/ipfs/[0-9a-z]*
-
-# w3
-\bw3\.org/[-0-9a-zA-Z/#.]+
-
-# loom
-\bloom\.com/embed/[0-9a-f]+
-
-# regex101
-\bregex101\.com/r/[^/\s"]+/\d+
-
-# figma
-\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
-
-# freecodecamp.org
-\bfreecodecamp\.org/[-\w/.]+
-
-# image.tmdb.org
-\bimage\.tmdb\.org/[/\w.]+
-
-# mermaid
-\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
-
-# Wikipedia
-\ben\.wikipedia\.org/wiki/[-\w%.#]+
-
-# gitweb
-[^"\s]+/gitweb/\S+;h=[0-9a-f]+
-
-# HyperKitty lists
-/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
-
-# lists
-/thread\.html/[^"\s]+
-
-# list-management
-\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
-
-# kubectl.kubernetes.io/last-applied-configuration
-"kubectl.kubernetes.io/last-applied-configuration": ".*"
-
-# pgp
-\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
-
-# Spotify
-\bopen\.spotify\.com/embed/playlist/\w+
-
-# Mastodon
-\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
-
-# scastie
-\bscastie\.scala-lang\.org/[^/]+/\w+
-
-# images.unsplash.com
-\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
-
-# pastebin
-\bpastebin\.com/[\w/]+
-
-# heroku
-\b\w+\.heroku\.com/source/archive/\w+
-
-# quip
-\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
-
-# badgen.net
-\bbadgen\.net/badge/[^")\]'\s]+
-
-# statuspage.io
-\w+\.statuspage\.io\b
-
-# media.giphy.com
-\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
-
-# tinyurl
-\btinyurl\.com/\w+
-
-# getopts
-\bgetopts\s+(?:"[^"]+"|'[^']+')
-
-# ANSI color codes
-(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
-
-# URL escaped characters
-\%[0-9A-F][A-F]
-# IPv6
-\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
-\bxn--[-0-9a-z]+
-# sha
-sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
-# sha-... -- uses a fancy capture
-(['"]|&quot;)[0-9a-f]{40,}\g{-1}
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-# hex in url queries
-=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
-# ssh
-(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
-
-# PGP
-\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
-# GPG keys
-\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
-# Well known gpg keys
-.well-known/openpgpkey/[\w./]+
-
-# 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}|u\d+)\b
-# integrity
-integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
-
-# https://www.gnu.org/software/groff/manual/groff.html
-# man troff content
-\\f[BCIPR]
-# '
-\\\(aq
-
-# .desktop mime types
-^MimeTypes?=.*$
-# .desktop localized entries
-^[A-Z][a-z]+\[[a-z]+\]=.*$
-# Localized .desktop content
-Name\[[^\]]+\]=.*
-
-# IServiceProvider
-\bI(?=(?:[A-Z][a-z]{2,})+\b)
-
-# crypt
-"\$2[ayb]\$.{56}"
-
-# scrypt / argon
-\$(?:scrypt|argon\d+[di]*)\$\S+
-
-# Input to GitHub JSON
-content: "[-a-zA-Z=;:/0-9+]*="
-
-# 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,})
-
-# Regular expressions for (P|p)assword
-\([A-Z]\|[a-z]\)[a-z]+
-
-# JavaScript regular expressions
-# javascript test regex
-/.*/[gim]*\.test\(
-# javascript match regex
-\.match\(/[^/\s"]*/[gim]*\s*
-# javascript match regex
-\.match\(/\\[b].*?/[gim]*\s*\)(?:;|$)
-# javascript regex
-^\s*/\\[b].*/[gim]*\s*(?:\)(?:;|$)|,$)
-# javascript replace regex
-\.replace\(/[^/\s"]*/[gim]*\s*,
-
-# Go regular expressions
-regexp?\.MustCompile\(`[^`]*`\)
-
-# sed regular expressions
-sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
-
-# go install
-go install(?:\s+[a-z]+\.[-@\w/.]+)+
-
-# 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+
-
-# kubectl - pods in CrashLoopBackOff
-\w+-[0-9a-f]+-\w+\s+\d+/\d+\s+CrashLoopBackOff\s+
-
-# kubernetes object suffix
--[0-9a-f]{10}-\w{5}\s
-
-# posthog secrets
-posthog\.init\((['"])phc_[^"',]+\g{-1},
-
-# xcode
-
-# xcodeproject scenes
-(?:Controller|ID|id)="\w{3}-\w{2}-\w{3}"
-
-# xcode api botches
-customObjectInstantitationMethod
-
-# font awesome classes
-\.fa-[-a-z0-9]+
-
-# 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|[,.])*
-
-# Non-English
-[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
-\\(?: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])
-# 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 (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
-\bset(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
-# tar arguments
-\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
-# 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
-# macOS temp folders
-/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/

.github/actions/spelling/excludes.txt

@@ -1,117 +0,0 @@
-# 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$
-(?:^|/)sources(?:|\.dep)$
-(?:^|/)vendor/
-\.a$
-\.ai$
-\.avi$
-\.bmp$
-\.bz2$
-\.cer$
-\.class$
-\.crl$
-\.crt$
-\.csr$
-\.dll$
-\.docx?$
-\.drawio$
-\.DS_Store$
-\.eot$
-\.eps$
-\.exe$
-\.gif$
-\.gitattributes$
-\.graffle$
-\.gz$
-\.icns$
-\.ico$
-\.jar$
-\.jks$
-\.jpeg$
-\.jpg$
-\.key$
-\.lib$
-\.lock$
-\.map$
-\.min\..
-\.mod$
-\.mp3$
-\.mp4$
-\.o$
-\.ocf$
-\.otf$
-\.pbxproj$
-\.pdf$
-\.pem$
-\.png$
-\.psd$
-\.pyc$
-\.runsettings$
-\.s$
-\.sig$
-\.so$
-\.svg$
-\.svgz$
-\.svgz?$
-\.tar$
-\.tgz$
-\.tiff?$
-\.ttf$
-\.vsdx$
-\.wav$
-\.webm$
-\.webp$
-\.woff
-\.woff2?$
-\.xcf$
-\.xls
-\.xlsx?$
-\.xpm$
-\.yml$
-\.zip$
-^\.github/actions/spelling/
-^\.github/fabricbot.json$
-^\.gitignore$
-^\Q.git-blame-ignore-revs\E$
-^\Q.github/workflows/spelling.yml\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/tools/closetest/CloseTest.vcxproj.filters\E$
-^\XamlStyler.json$
-^build/config/
-^consolegit2gitfilters\.json$
-^dep/
-^doc/reference/master-sequence-list.csv$
-^doc/reference/UTF8-torture-test\.txt$
-^oss/
-^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\.
-^src/terminal/adapter/ut_adapter/run\.bat$
-^src/terminal/parser/delfuzzpayload\.bat$
-^src/terminal/parser/ft_fuzzer/run\.bat$
-^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
-^src/terminal/parser/ft_fuzzwrapper/run\.bat$
-^src/terminal/parser/ut_parser/Base64Test.cpp$
-^src/terminal/parser/ut_parser/run\.bat$
-^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
-^src/tools/lnkd/lnkd\.bat$
-^src/tools/pixels/pixels\.bat$
-^src/tools/texttests/fira\.txt$
-^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^src/types/ut_types/UtilsTests.cpp$
-^tools/ReleaseEngineering/ServicingPipeline.ps1$
-ignore$
-SUMS$

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

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

.github/actions/spelling/line_forbidden.patterns

@@ -1,62 +0,0 @@
-# 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,
-# you might not want to check in code where you were debugging w/ `fit()`, in which case, you might want
-# to use this:
-#\bfit\(
-
-# s.b. GitHub
-\bGithub\b
-
-# s.b. GitLab
-\bGitlab\b
-
-# s.b. JavaScript
-\bJavascript\b
-
-# s.b. Microsoft
-\bMicroSoft\b
-
-# s.b. another
-\ban[- ]other\b
-
-# s.b. greater than
-\bgreater then\b
-
-# s.b. into
-#\sin to\s
-
-# s.b. opt-in
-\sopt in\s
-
-# s.b. less than
-\bless then\b
-
-# s.b. otherwise
-\bother[- ]wise\b
-
-# s.b. nonexistent
-\bnon existing\b
-\b[Nn]o[nt][- ]existent\b
-
-# s.b. preexisting
-[Pp]re[- ]existing
-
-# s.b. preempt
-[Pp]re[- ]empt\b
-
-# s.b. preemptively
-[Pp]re[- ]emptively
-
-# s.b. reentrancy
-[Rr]e[- ]entrancy
-
-# s.b. reentrant
-[Rr]e[- ]entrant
-
-# s.b. workaround(s)
-#\bwork[- ]arounds?\b
-
-# Reject duplicate words
-\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s

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

@@ -1,96 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-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
-microsoft/cascadia-code\@[0-9a-fA-F]{40}
-\d+x\d+Logo
-Scro\&ll
-# selectionInput.cpp
- :\\windows\\syste\b
-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\+/"
-std::memory_order_[\w]+
-D2DERR_SHADER_COMPILE_FAILED
-TIL_FEATURE_[0-9A-Z_]+
-vcvars\w*
-ROY\sG\.\sBIV
-!(?:(?i)ESC)!\[
-!(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
-
-# 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: 3831 file-count: 582
-# IServiceProvider
-\bI(?=(?:[A-Z][a-z]{2,})+\b)
-
-# hit-count: 71 file-count: 35
-# Compiler flags
-(?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
-(?:^|[\t ,"'`=(])-[X](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# 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: 20 file-count: 9
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-
-# 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: 4 file-count: 4
-# 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
-# latex
-\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
-
-# hit-count: 1 file-count: 1
-# 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
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
-
-# hit-count: 1 file-count: 1
-# 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][-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*$
-
-# Autogenerated revert commit message
-^This reverts commit [0-9a-f]{40}\.$
-
-# vtmode
---vtmode\s+(\w+)\s+\g{-1}\s
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b

.github/actions/spelling/reject.txt

@@ -1,12 +0,0 @@
-^attache$
-^attacher$
-^attachers$
-benefitting
-occurences?
-^dependan.*
-^oer$
-Sorce
-^[Ss]pae.*
-^untill$
-^untilling$
-^wether.*

.github/linters/.markdown-lint.yml

@@ -1,40 +0,0 @@
----
-###########################
-###########################
-## Markdown Linter rules ##
-###########################
-###########################
-
-# Linter rules doc:
-# - https://github.com/DavidAnson/markdownlint
-#
-# Note:
-# To comment out a single error:
-#   <!-- markdownlint-disable -->
-#   any violations you want
-#   <!-- markdownlint-restore -->
-#
-# To run the linter locally:
-# 1. install the npm package:
-#    `npm install -g markdownlint-cli`
-# 2. Then run it in the root of the repo with
-#    `markdownlint -c .github\linters\.markdown-lint.yml ./*.md`
-
-###############
-# Rules by id #
-###############
-MD004: false                  # Unordered list style
-MD007:
-  indent: 2                   # Unordered list indentation
-MD013:
-  line_length: 400            # Line length 80 is far to short
-MD026:
-  punctuation: ".,;:!。，；:"  # List of not allowed
-MD029: false                  # Ordered list item prefix
-MD033: false                  # Allow inline HTML
-MD036: false                  # Emphasis used instead of a heading
-
-#################
-# Rules by tags #
-#################
-blank_lines: false  # Error on blank lines

.github/workflows/linter.yml

@@ -1,51 +0,0 @@
----
-###########################
-###########################
-## Linter GitHub Actions ##
-###########################
-###########################
-name: Lint Code Base
-
-#
-# Documentation:
-# https://help.github.com/en/articles/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
-on:
-  pull_request:
-    branches: [master]
-
-###############
-# Set the Job #
-###############
-jobs:
-  build:
-    # Name the Job
-    name: Lint Code Base
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
-    steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: github/super-linter@v3.10.0
-        env:
-          VALIDATE_ALL_CODEBASE: false
-          DEFAULT_BRANCH: master
-          MARKDOWN_CONFIG_FILE: .markdown-lint.yml
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_EDITORCONFIG: false

.github/workflows/spelling.yml

@@ -0,0 +1,20 @@
+name: Spell checking
+on:
+  push:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron: '15 * * * *'
+
+jobs:
+  build:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2.0.0
+      with:
+        fetch-depth: 5
+    - uses: check-spelling/check-spelling@0.0.16-alpha
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        bucket: .github/actions
+        project: spell-check

.github/workflows/spelling2.yml

@@ -1,134 +0,0 @@
-# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
-name: Spell checking
-
-# Comment management is handled through a secondary job, for details see:
-# 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 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
-#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
-#   it needs `pull-requests: write` in order to manipulate those comments.
-
-# Updating pull request branches is managed via comment handling.
-# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
-#
-# These elements work together to make it happen:
-#
-# `on.issue_comment`
-#   This event listens to comments by users asking to update the metadata.
-#
-# `jobs.update`
-#   This job runs in response to an issue_comment and will push a new commit
-#   to update the spelling metadata.
-#
-# `with.experimental_apply_changes_via_bot`
-#   Tells the action to support and generate messages that enable it
-#   to make a commit to update the spelling metadata.
-#
-# `with.ssh_key`
-#   In order to trigger workflows when the commit is made, you can provide a
-#   secret (typically, a write-enabled github deploy key).
-#
-#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
-
-on:
-  push:
-    branches:
-    - "**"
-    tags-ignore:
-    - "**"
-  pull_request_target:
-    branches:
-    - "**"
-    tags-ignore:
-    - "**"
-    types:
-    - 'opened'
-    - 'reopened'
-    - 'synchronize'
-  issue_comment:
-    types:
-    - 'created'
-
-jobs:
-  spelling:
-    name: Spell checking
-    permissions:
-      contents: read
-      pull-requests: read
-      actions: read
-    outputs:
-      followup: ${{ steps.spelling.outputs.followup }}
-    runs-on: ubuntu-latest
-    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
-      cancel-in-progress: true
-    steps:
-    - name: check-spelling
-      id: spelling
-      uses: check-spelling/check-spelling@v0.0.21
-      with:
-        suppress_push_for_open_pull_request: 1
-        checkout: true
-        check_file_names: 1
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        post_comment: 0
-        use_magic_file: 1
-        extra_dictionary_limit: 10
-        extra_dictionaries:
-          cspell:software-terms/src/software-terms.txt
-          cspell:python/src/python/python-lib.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:npm/npm.txt
-          cspell:dotnet/dotnet.txt
-          cspell:python/src/python/python.txt
-          cspell:css/css.txt
-          cspell:cpp/src/stdlib-cmath.txt
-        check_extra_dictionaries: ''
-
-  comment-push:
-    name: Report (Push)
-    # If your workflow isn't running on push, you can remove this job
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      contents: write
-    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
-    steps:
-    - name: comment
-      uses: check-spelling/check-spelling@v0.0.21
-      with:
-        checkout: true
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        task: ${{ needs.spelling.outputs.followup }}
-
-  comment-pr:
-    name: Report (PR)
-    # If you workflow isn't running on pull_request*, you can remove this job
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      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.21
-      with:
-        checkout: true
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        task: ${{ needs.spelling.outputs.followup }}

CONTRIBUTING.md

@@ -140,13 +140,6 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 1. Create & push a feature branch
 1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 1. Work on your changes
-1. Build and see if it works. Consult [How to build OpenConsole](./doc/building.md) if you have problems.
-
-### Testing
-
-Testing is a key component in the development workflow. Both Windows Terminal and Windows Console use TAEF(the Test Authoring and Execution Framework) as the main framework for testing.
-
-If your changes affect existing test cases, or you're working on brand new features and also the accompanying test cases, see [TAEF](./doc/TAEF.md) for more information about how to validate your work locally.
 
 ### Code Review
 

NOTICE.md

@@ -48,6 +48,36 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
+## telnetpp
+
+**Source**: https://github.com/KazDragon/telnetpp
+
+### License 
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Matthew Chaplain a.k.a KazDragon
+
+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.
+```
+
 ## chromium/base/numerics
 
 **Source**: https://github.com/chromium/chromium/tree/master/base/numerics

OpenConsole.sln

@@ -87,8 +87,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Feature", "src\h
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
 		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalParser.UnitTests", "src\terminal\parser\ut_parser\Parser.UnitTests.vcxproj", "{12144E07-FE63-4D33-9231-748B8D8C3792}"
@@ -180,7 +180,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
@@ -226,21 +225,16 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererUia", "src\renderer\uia\lib\uia.vcxproj", "{48D21369-3D7B-4431-9967-24E81292CF63}"
@@ -256,8 +250,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia\LocalTests_TerminalApp\TestHostApp\TestHostApp.vcxproj", "{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {CA5CAD1A-9B68-456A-B13E-C8218070DC42}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
@@ -315,24 +307,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model.Lib", "src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model", "src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj", "{CA5CAD1A-082C-4476-9F33-94B339494076}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_SettingsModel", "src\cascadia\LocalTests_SettingsModel\SettingsModel.LocalTests.vcxproj", "{CA5CAD1A-9B68-456A-B13E-C8218070DC42}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
-		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -2012,84 +1986,6 @@ Global
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x64.Build.0 = Release|x64
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.ActiveCfg = Release|Win32
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2170,9 +2066,6 @@ Global
 		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87}
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {59840756-302F-44DF-AA47-441A9D673202}
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

README.md

@@ -7,25 +7,21 @@ This repository contains the source code for:
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
 * [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
-* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples)
-  that show how to consume the Windows Console APIs
+* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples) that show how to consume the Windows Console APIs
 
 Related repositories include:
 
-* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal)
-  ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
+* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal) ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
 * [Console API Documentation](https://github.com/MicrosoftDocs/Console-Docs)
 * [Cascadia Code Font](https://github.com/Microsoft/Cascadia-Code)
 
 ## Installing and running Windows Terminal
 
-> 🔴 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
+> 👉 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
 
 ### Microsoft Store [Recommended]
 
-Install the [Windows Terminal from the Microsoft Store][store-install-link].
-This allows you to always be on the latest version when we release new builds
-with automatic upgrades.
+Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
 
 This is our preferred method.
 
@@ -33,21 +29,16 @@ This is our preferred method.
 
 #### Via GitHub
 
-For users who are unable to install Terminal from the Microsoft Store, Terminal
-builds can be manually downloaded from this repository's [Releases
-page](https://github.com/microsoft/terminal/releases).
+For users who are unable to install Terminal from the Microsoft Store, Terminal builds can be manually downloaded from this repository's [Releases page](https://github.com/microsoft/terminal/releases).
 
-> 🔴 Note: If you install Terminal manually:
+> ⚠ Note: If you install Terminal manually:
 >
-> * 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
->   fixes and improvements!
+> * Be sure to install the [Desktop Bridge VC++ v14 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=53175) otherwise Terminal may not install and/or run and may crash at startup
+> * 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 fixes and improvements!
 
 #### Via Windows Package Manager CLI (aka winget)
 
-[winget](https://github.com/microsoft/winget-cli) users can download and install
-the latest Terminal release by installing the `Microsoft.WindowsTerminal`
-package:
+[winget](https://github.com/microsoft/winget-cli) users can download and install the latest Terminal release by installing the `Microsoft.WindowsTerminal` package:
 
 ```powershell
 winget install --id=Microsoft.WindowsTerminal -e
@@ -55,8 +46,7 @@ winget install --id=Microsoft.WindowsTerminal -e
 
 #### Via Chocolatey (unofficial)
 
-[Chocolatey](https://chocolatey.org) users can download and install the latest
-Terminal release by installing the `microsoft-windows-terminal` package:
+[Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
 
 ```powershell
 choco install microsoft-windows-terminal
@@ -68,15 +58,11 @@ To upgrade Windows Terminal using Chocolatey, run the following:
 choco upgrade microsoft-windows-terminal
 ```
 
-If you have any issues when installing/upgrading the package please go to the
-[Windows Terminal package
-page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the
-[Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
+If you have any issues when installing/upgrading the package please go to the [Windows Terminal package page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
 
 #### Via Scoop (unofficial)
 
-[Scoop](https://scoop.sh) users can download and install the latest Terminal
-release by installing the `windows-terminal` package:
+[Scoop](https://scoop.sh) users can download and install the latest Terminal release by installing the `windows-terminal` package:
 
 ```powershell
 scoop install windows-terminal
@@ -88,123 +74,70 @@ To update Windows Terminal using Scoop, run the following:
 scoop update windows-terminal
 ```
 
-If you have any issues when installing/updating the package, please search for
-or report the same on the [issues
-page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket
-repository.
+If you have any issues when installing/updating the package, please search for or report the same on the [issues page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket repository.  
 
 ---
 
 ## Windows Terminal 2.0 Roadmap
 
-The plan for delivering Windows Terminal 2.0 [is described
-here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
+The plan for delivering Windows Terminal 2.0 [is described here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
 
 ## Project Build Status
 
 Project|Build Status
 ---|---
-Terminal|[![Terminal Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
-ColorTool|![Colortool Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
+Terminal|[![Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
+ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
 
 ---
 
 ## Terminal & Console Overview
 
-Please take a few minutes to review the overview below before diving into the
-code:
+Please take a few minutes to review the overview below before diving into the code:
 
 ### Windows Terminal
 
-Windows Terminal is a new, modern, feature-rich, productive terminal application
-for command-line users. It includes many of the features most frequently
-requested by the Windows command-line community including support for tabs, rich
-text, globalization, configurability, theming & styling, and more.
+Windows Terminal is a new, modern, feature-rich, productive terminal application for command-line users. It includes many of the features most frequently requested by the Windows command-line community including support for tabs, rich text, globalization, configurability, theming & styling, and more.
 
-The Terminal will also need to meet our goals and measures to ensure it remains
-fast and efficient, and doesn't consume vast amounts of memory or power.
+The Terminal will also need to meet our goals and measures to ensure it remains fast and efficient, and doesn't consume vast amounts of memory or power.
 
 ### The Windows Console Host
 
-The Windows Console host, `conhost.exe`, is Windows' original command-line user
-experience. It also hosts Windows' command-line infrastructure and the Windows
-Console API server, input engine, rendering engine, user preferences, etc. The
-console host code in this repository is the actual source from which the
-`conhost.exe` in Windows itself is built.
+The Windows Console host, `conhost.exe`, is Windows' original command-line user experience. It also hosts Windows' command-line infrastructure and the Windows Console API server, input engine, rendering engine, user preferences, etc. The console host code in this repository is the actual source from which the `conhost.exe` in Windows itself is built.
 
-Since taking ownership of the Windows command-line in 2014, the team added
-several new features to the Console, including background transparency,
-line-based selection, support for [ANSI / Virtual Terminal
-sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit
-color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/),
-a [Pseudoconsole
-("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/),
-and more.
+Since taking ownership of the Windows command-line in 2014, the team added several new features to the Console, including background transparency, line-based selection, support for [ANSI / Virtual Terminal sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/), a [Pseudoconsole ("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/), and more.
 
-However, because Windows Console's primary goal is to maintain backward
-compatibility, we have been unable to add many of the features the community
-(and the team) have been wanting for the last several years including tabs,
-unicode text, and emoji.
+However, because Windows Console's primary goal is to maintain backward compatibility, we have been unable to add many of the features the community (and the team) have been wanting for the last several years including tabs, unicode text, and emoji.
 
 These limitations led us to create the new Windows Terminal.
 
-> You can read more about the evolution of the command-line in general, and the
-> Windows command-line specifically in [this accompanying series of blog
-> posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-> on the Command-Line team's blog.
+> You can read more about the evolution of the command-line in general, and the Windows command-line specifically in [this accompanying series of blog posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/) on the Command-Line team's blog.
 
 ### Shared Components
 
-While overhauling Windows Console, we modernized its codebase considerably,
-cleanly separating logical entities into modules and classes, introduced some
-key extensibility points, replaced several old, home-grown collections and
-containers with safer, more efficient [STL
-containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019),
-and made the code simpler and safer by using Microsoft's [Windows Implementation
-Libraries - WIL](https://github.com/Microsoft/wil).
+While overhauling Windows Console, we modernized its codebase considerably, cleanly separating logical entities into modules and classes, introduced some key extensibility points, replaced several old, home-grown collections and containers with safer, more efficient [STL containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019), and made the code simpler and safer by using Microsoft's [Windows Implementation Libraries - WIL](https://github.com/Microsoft/wil).
 
-This overhaul resulted in several of Console's key components being available
-for re-use in any terminal implementation on Windows. These components include a
-new DirectWrite-based text layout and rendering engine, a text buffer capable of
-storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
+This overhaul resulted in several of Console's key components being available for re-use in any terminal implementation on Windows. These components include a new DirectWrite-based text layout and rendering engine, a text buffer capable of storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
 
 ### Creating the new Windows Terminal
 
-When we started planning the new Windows Terminal application, we explored and
-evaluated several approaches and technology stacks. We ultimately decided that
-our goals would be best met by continuing our investment in our C++ codebase,
-which would allow us to reuse several of the aforementioned modernized
-components in both the existing Console and the new Terminal. Further, we
-realized that this would allow us to build much of the Terminal's core itself as
-a reusable UI control that others can incorporate into their own applications.
+When we started planning the new Windows Terminal application, we explored and evaluated several approaches and technology stacks. We ultimately decided that our goals would be best met by continuing our investment in our C++ codebase, which would allow us to reuse several of the aforementioned modernized components in both the existing Console and the new Terminal. Further, we realized that this would allow us to build much of the Terminal's core itself as a reusable UI control that others can incorporate into their own applications.
 
-The result of this work is contained within this repo and delivered as the
-Windows Terminal application you can download from the Microsoft Store, or
-[directly from this repo's
-releases](https://github.com/microsoft/terminal/releases).
+The result of this work is contained within this repo and delivered as the Windows Terminal application you can download from the Microsoft Store, or [directly from this repo's releases](https://github.com/microsoft/terminal/releases).
 
 ---
 
 ## Resources
 
-For more information about Windows Terminal, you may find some of these
-resources useful and interesting:
+For more information about Windows Terminal, you may find some of these resources useful and interesting:
 
 * [Command-Line Blog](https://devblogs.microsoft.com/commandline)
-* [Command-Line Backgrounder Blog
-  Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-* Windows Terminal Launch: [Terminal "Sizzle
-  Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
-* Windows Terminal Launch: [Build 2019
-  Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
-* Run As Radio: [Show 645 - Windows Terminal with Richard
-  Turner](http://www.runasradio.com/Shows/Show/645)
-* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps
-  on the Windows
-  Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
-* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows
-  Terminal -
-  BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
+* [Command-Line Backgrounder Blog Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
+* Windows Terminal Launch: [Terminal "Sizzle Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
+* Windows Terminal Launch: [Build 2019 Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
+* Run As Radio: [Show 645 - Windows Terminal with Richard Turner](http://www.runasradio.com/Shows/Show/645)
+* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps on the Windows Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
+* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows Terminal - BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
 
 ---
 
@@ -214,50 +147,35 @@ resources useful and interesting:
 
 Cause: You're launching the incorrect solution in Visual Studio.
 
-Solution: Make sure you're building & deploying the `CascadiaPackage` project 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
-> Windows Console that hosts Windows' command-line infrastructure. OpenConsole
-> is used by Windows Terminal to connect to and communicate with command-line
-> applications (via
-> [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
+> ⚠ 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 [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
 
 ---
 
 ## Documentation
 
-All project documentation is located at aka.ms/terminal-docs. If you would like
-to contribute to the documentation, please submit a pull request on the [Windows
-Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
+All project documentation is located at aka.ms/terminal-docs. If you would like to contribute to the documentation, please submit a pull request on the [Windows Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
 
 ---
 
 ## Contributing
 
-We are excited to work alongside you, our amazing community, to build and
-enhance Windows Terminal\!
+We are excited to work alongside you, our amazing community, to build and enhance Windows Terminal\!
 
-***BEFORE you start work on a feature/fix***, please read & follow our
-[Contributor's
-Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to
-help avoid any wasted or duplicate effort.
+***BEFORE you start work on a feature/fix***, please read & follow our [Contributor's Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to help avoid any wasted or duplicate effort.
 
 ## Communicating with the Team
 
 The easiest way to communicate with the team is via GitHub issues.
 
-Please file new issues, feature requests and suggestions, but **DO search for
-similar open/closed pre-existing issues before creating a new issue.**
+Please file new issues, feature requests and suggestions, but **DO search for similar open/closed pre-existing 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:
+If you would like to ask a question that you feel doesn't warrant an issue (yet), please reach out to us via Twitter:
 
-* Kayla Cinnamon, Program Manager:
-  [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
+* Kayla Cinnamon, Program Manager: [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Michael Niksa, Senior Developer:
-  [@michaelniksa](https://twitter.com/MichaelNiksa)
+* Michael Niksa, Senior Developer: [@michaelniksa](https://twitter.com/MichaelNiksa)
 * Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
 * Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)
@@ -267,19 +185,11 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Prerequisites
 
-* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run
-  Windows Terminal
-* You must [enable Developer Mode in the Windows Settings
-  app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
-  to locally install and run Windows Terminal
-* You must have the [Windows 10 1903
-  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
-  installed
-* You must have at least [VS
-  2019](https://visualstudio.microsoft.com/downloads/) installed
-* You must install the following Workloads via the VS Installer. Note: Opening
-  the solution in VS 2019 will [prompt you to install missing components
-  automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
+* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run Windows Terminal
+* You must [enable Developer Mode in the Windows Settings app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) to locally install and run Windows Terminal
+* You must have the [Windows 10 1903 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) installed
+* You must have at least [VS 2019](https://visualstudio.microsoft.com/downloads/) installed
+* You must install the following Workloads via the VS Installer. Note: Opening the solution in VS 2019 will [prompt you to install missing components automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
   * Desktop Development with C++
   * Universal Windows Platform Development
   * **The following Individual Components**
@@ -287,17 +197,13 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Building the Code
 
-This repository uses [git
-submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its
-dependencies. To make sure submodules are restored or updated, be sure to run
-the following prior to building:
+This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its dependencies. To make sure submodules are restored or updated, be sure to run the following prior to building:
 
 ```shell
 git submodule update --init --recursive
 ```
 
-OpenConsole.sln may be built from within Visual Studio or from the command-line
-using a set of convenience scripts & tools in the **/tools** directory:
+OpenConsole.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
 
 ### Building in PowerShell
 
@@ -316,28 +222,19 @@ bcz
 
 ## Running & Debugging
 
-To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the
-Solution Explorer) and go to properties. In the Debug menu, change "Application
-process" and "Background task process" to "Native Only".
+To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the Solution Explorer) and go to properties. In the Debug menu, change "Application process" and "Background task process" to "Native Only".
 
-You should then be able to build & debug the Terminal project by hitting
-<kbd>F5</kbd>.
+You should then be able to build & debug the Terminal project by hitting <kbd>F5</kbd>.
 
-> 👉 You will _not_ be able to launch the Terminal directly by running the
-> WindowsTerminal.exe. For more details on why, see
-> [#926](https://github.com/microsoft/terminal/issues/926),
-> [#4043](https://github.com/microsoft/terminal/issues/4043)
+> 👉 You will _not_ be able to launch the Terminal directly by running the WindowsTerminal.exe. For more details on why, see [#926](https://github.com/microsoft/terminal/issues/926), [#4043](https://github.com/microsoft/terminal/issues/4043)
 
 ### Coding Guidance
 
 Please review these brief docs below about our coding practices.
 
-> 👉 If you find something missing from these docs, feel free to contribute to
-> any of our documentation files anywhere in the repository (or write some new
-> ones!)
+> 👉 If you find something missing from these docs, feel free to contribute to any of our documentation files anywhere in the repository (or write some new ones!)
 
-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.
+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](https://github.com/Microsoft/Terminal/blob/master/doc/STYLE.md)
 * [Code Organization](https://github.com/Microsoft/Terminal/blob/master/doc/ORGANIZATION.md)
@@ -346,12 +243,10 @@ order to be effective contributors to our project.
 
 ---
 
-## Code of Conduct
+# Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of
-Conduct][conduct-code]. For more information see the [Code of Conduct
-FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any
-additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
+For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
 
 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/

SUPPORT.md

@@ -1,17 +0,0 @@
-# Support
-
-## How to file issues and get help  
-
-This project uses [GitHub issues][gh-issue] to [track bugs][gh-bug] and [feature requests][gh-feature]. Please search the existing issues before filing new issues to avoid duplicates. For new topics, file your bug or feature request as a new issue.
-
-For help and questions about using this project, please look at the [docs site for Windows Terminal][docs] and our [Contributor's Guide][contributor] if you want to work on Windows Terminal.
-
-## Microsoft Support Policy  
-
-Support for Windows Terminal is limited to the resources listed above.
-
-[gh-issue]: https://github.com/microsoft/terminal/issues/new/choose
-[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]: https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md

build/pipelines/ci.yml

@@ -3,7 +3,6 @@ trigger:
   branches:
     include:
       - master
-      - feature/*
   paths:
     exclude:
       - doc/*
@@ -14,7 +13,6 @@ pr:
   branches:
     include:
       - master
-      - feature/*
   paths:
     exclude:
       - doc/*

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

@@ -41,8 +41,6 @@ steps:
     configuration: '$(BuildConfiguration)'
     msbuildArgs: "${{ parameters.additionalBuildArguments }}"
     clean: true
-    # The build agents cannot currently support parallel build due to the
-    # memory requirements of our PCH files.
     maximumCpuCount: false
 
 - task: PowerShell@2

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -106,10 +106,6 @@ Try {
         Throw "Failed to find wt.exe/wtd.exe -- check the WAP packaging project"
     }
 
-    If ($null -eq (Get-Item "$AppxPackageRootPath\OpenConsole.exe" -EA:Ignore)) {
-        Throw "Failed to find OpenConsole.exe -- check the WAP packaging project"
-    }
-
 } Finally {
     Remove-Item -Recurse -Force $AppxPackageRootPath
 }

custom.props

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

doc/TAEF.md

@@ -1,30 +1,9 @@
-### TAEF Overview ###
-
+### TAEF ###
 TAEF, the Test Authoring and Execution Framework, is used extensively within the Windows organization to test the operating system code in a unified manner for system, driver, and application code. As the console is a Windows OS Component, we strive to continue using the same system such that tests can be ran in a unified manner both externally to Microsoft as well as inside the official OS Build/Test system.
 
-The [official documentation](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
+The [official documentation](https://msdn.microsoft.com/en-us/library/windows/hardware/hh439725\(v=vs.85\).aspx) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
 
-### Writing Tests
-
-You may want to read the section [Authoring Tests in C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/authoring-tests-in-c--) before getting your hands dirty. Note that the quoted header name in `#include "WexTestClass.h"` might be a bit confusing. You are not required to copy TAEF headers into the project folder.
-
-Use the [TAEF Verify Macros for C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/verify) in your test code to perform verifications.
-
-### Running Tests
-
-If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Taef.Redist.Wlk` package.
-
-> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Taef.Redist.Wlk` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
-
-In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:
-
-```shell
-.\tools\razzle.cmd
-```
-
-Then you should be able to use `%TAEF%` as an alias of the actual `te.exe`.
-
-For the purposes of the OpenConsole project, you can run the tests using the `te.exe` that matches the architecture for which the test was built (x86/x64):
+For the purposes of the console project, you can run the tests using the *TE.exe* that matches the architecture for which the test was build (x86/x64) in the pattern
 
 	te.exe Console.Unit.Tests.dll
 
@@ -36,15 +15,6 @@ Limiting the tests to be run is also useful with:
 
 Any pattern of class/method names can be specified after the */name:* flag with wildcard patterns.
 
-For any further details on the functionality of the TAEF test runner, please see the [Executing Tests](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/executing-tests) section in the official documentation. Or run the embedded help with
+For any further details on the functionality of the TAEF test runner, *TE.exe*, please see the documentation above or run the embedded help with
 
 	te.exe /!
-
-If you use PowerShell, try the following command:
-
-```powershell
-Import-Module .\tools\OpenConsole.psm1
-Invoke-OpenConsoleTests
-```
-
-`Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.

doc/building.md

@@ -67,12 +67,12 @@ To update the version of a given package, use the following snippet
 
 where:
 - `$PackageName` is the name of the package, e.g. Microsoft.UI.Xaml
-- `$OldVersionNumber` is the version number currently used, e.g. 2.4.0-prerelease.200506002
-- `$NewVersionNumber` is the version number you want to migrate to, e.g. 2.5.0-prerelease.200812002
+- `$OldVersionNumber` is the version number currently used, e.g. 2.5.0-prerelease.200609001
+- `$NewVersionNumber` is the version number you want to migrate to, e.g. 2.4.200117003-prerelease
 
 Example usage:
 
-`git grep -z -l Microsoft.UI.Xaml | xargs -0 sed -i -e 's/2.4.0-prerelease.200506002/2.5.0-prerelease.200812002/g'`
+`git grep -z -l Microsoft.UI.Xaml | xargs -0 sed -i -e 's/2.5.0-prerelease.200609001/2.4.200117003-prerelease/g'`
 
 ## Using .nupkg files instead of downloaded Nuget packages
 If you want to use .nupkg files instead of the downloaded Nuget package, you can do this with the following steps:

doc/cascadia/SettingsSchema.md

@@ -1 +1,211 @@
-⚠ This document has moved to [the Customize Settings section of the Windows Terminal documentation](https://docs.microsoft.com/windows/terminal/customize-settings/global-settings).
+# Settings.json Documentation
+
+## Globals
+
+Properties listed below affect the entire window, regardless of the profile settings.
+
+| Property | Necessity | Type | Default | Description |
+| -------- | --------- | ---- | ------- | ----------- |
+| `alwaysShowTabs` | _Required_ | Boolean | `true` | When set to `true`, tabs are always displayed. When set to `false` and `showTabsInTitlebar` is set to `false`, tabs only appear after typing <kbd>Ctrl</kbd> + <kbd>T</kbd>. |
+| `copyOnSelect` | Optional | Boolean | `false` | When set to `true`, a selection is immediately copied to your clipboard upon creation. When set to `false`, the selection persists and awaits further action. |
+| `copyFormatting` | Optional | Boolean, Array | `true` | 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. |
+| `largePasteWarning` | Optional | Boolean | `true` | When set to `true`, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste. |
+| `multiLinePasteWarning` | Optional | Boolean | `true` | When set to `true`, trying to paste text with a _new line_ character will display a warning asking you whether to continue or not with the paste. |
+| `defaultProfile` | _Required_ | String | PowerShell guid | Sets the default profile. Opens by typing <kbd>Ctrl</kbd> + <kbd>T</kbd> or by clicking the '+' icon. The guid of the desired default profile is used as the value. |
+| `initialCols` | _Required_ | Integer | `120` | The number of columns displayed in the window upon first load. |
+| `initialPosition` | Optional | String | `","` | The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If `launchMode` is set to `"maximized"`, the window will be maximized on the monitor specified by those coordinates. |
+| `initialRows` | _Required_ | Integer | `30` | The number of rows displayed in the window upon first load. |
+| `launchMode` | Optional | String | `default` | Defines whether the Terminal will launch as maximized or not. Possible values: `"default"`, `"maximized"` |
+| `theme` | _Required_ | String | `system` | Sets the theme of the application. Possible values: `"light"`, `"dark"`, `"system"` |
+| `showTerminalTitleInTitlebar` | _Required_ | Boolean | `true` | When set to `true`, titlebar displays the title of the selected tab. When set to `false`, titlebar displays "Windows Terminal". |
+| `showTabsInTitlebar` | Optional | Boolean | `true` | When set to `true`, the tabs are moved into the titlebar and the titlebar disappears. When set to `false`, the titlebar sits above the tabs. |
+| `snapToGridOnResize` | Optional | Boolean | `false` | When set to `true`, the window will snap to the nearest character boundary on resize. When `false`, the window will resize "smoothly" |
+| `tabWidthMode` | Optional | String | `equal` | Sets the width of the tabs. Possible values: <br><ul><li>`"equal"`: sizes each tab to the same width</li><li>`"titleLength"`:  sizes each tab to the length of its title</li><li>`"compact"`: sizes each tab to the length of its title when focused, and shrinks to the size of only the icon when the tab is unfocused.</li></ul> |
+| `wordDelimiters` | Optional | String | <code>&nbsp;&#x2f;&#x5c;&#x28;&#x29;&#x22;&#x27;&#x2d;&#x3a;&#x2c;&#x2e;&#x3b;&#x3c;&#x3e;&#x7e;&#x21;&#x40;&#x23;&#x24;&#x25;&#x5e;&#x26;&#x2a;&#x7c;&#x2b;&#x3d;&#x5b;&#x5d;&#x7b;&#x7d;&#x7e;&#x3f;│</code><br>_(`│` is `U+2502 BOX DRAWINGS LIGHT VERTICAL`)_ | Determines the delimiters used in a double click selection. |
+| `confirmCloseAllTabs` | Optional | Boolean | `true` | When set to `true` closing a window with multiple tabs open WILL require confirmation.  When set to `false` closing a window with multiple tabs open WILL NOT require confirmation. |
+| `startOnUserLogin` | Optional | Boolean | `false` | When set to `true` enables the launch of Windows Terminal at startup. Setting to `false` will disable the startup task entry. Note: if the Windows Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect. |
+| `disabledProfileSources` | Optional | Array[String] | `[]` | Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup. This array can contain any combination of `Windows.Terminal.Wsl`, `Windows.Terminal.Azure`, or `Windows.Terminal.PowershellCore`. For more information, see [UsingJsonSettings.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingJsonSettings.md#dynamic-profiles) |
+| `experimental.rendering.forceFullRepaint` | Optional | Boolean | `false` | When set to true, we will redraw the entire screen each frame. When set to false, we will render only the updates to the screen between frames. |
+| `experimental.rendering.software` | Optional | Boolean | `false` | When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one. |
+
+## Profiles
+
+Properties listed below are specific to each unique profile.
+
+| Property | Necessity | Type | Default | Description |
+| -------- | --------- | ---- | ------- | ----------- |
+| `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. |
+| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu. <br>Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overridden by using `tabTitle`. |
+| `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. |
+| `antialiasingMode` | Optional | String | `"grayscale"` | Controls how text is antialiased in the renderer. Possible values are "grayscale", "cleartype" and "aliased". Note that changing this setting will require starting a new terminal instance. |
+| `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. |
+| `backgroundImageAlignment` | Optional | String | `center` | Sets how the background image aligns to the boundaries of the window. Possible values: `"center"`, `"left"`, `"top"`, `"right"`, `"bottom"`, `"topLeft"`, `"topRight"`, `"bottomLeft"`, `"bottomRight"` |
+| `backgroundImageOpacity` | Optional | Number | `1.0` | Sets the transparency of the background image. Accepts floating point values from 0-1. |
+| `backgroundImageStretchMode` | Optional | String | `uniformToFill` | Sets how the background image is resized to fill the window. Possible values: `"none"`, `"fill"`, `"uniform"`, `"uniformToFill"` |
+| `closeOnExit` | Optional | String | `graceful` | Sets how the profile reacts to termination or failure to launch. Possible values: `"graceful"` (close when `exit` is typed or the process exits normally), `"always"` (always close) and `"never"` (never close). `true` and `false` are accepted as synonyms for `"graceful"` and `"never"` respectively. |
+| `colorScheme` | Optional | String | `Campbell` | Name of the terminal color scheme to use. Color schemes are defined under `schemes`. |
+| `commandline` | Optional | String | | Executable used in the profile. |
+| `cursorColor` | Optional | String | | Sets the cursor color of the profile. Overrides `cursorColor` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
+| `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
+| `fontFace` | Optional | String | `Cascadia Mono` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
+| `fontSize` | Optional | Integer | `12` | Sets the font size. |
+| `fontWeight` | Optional | String | `normal` | Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values: `"thin"`, `"extra-light"`, `"light"`, `"semi-light"`, `"normal"`, `"medium"`, `"semi-bold"`, `"bold"`, `"extra-bold"`, `"black"`, `"extra-black"`, or the corresponding numeric representation of OpenType font weight. |
+| `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. |
+| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file. |
+| `historySize` | Optional | Integer | `9001` | The number of lines above the ones displayed in the window you can scroll back to. |
+| `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. |
+| `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. |
+| `scrollbarState` | Optional | String | `"visible"` | Defines the visibility of the scrollbar. Possible values: `"visible"`, `"hidden"` |
+| `selectionBackground` | Optional | String | | Sets the selection background color of the profile. Overrides `selectionBackground` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `snapOnInput` | Optional | Boolean | `true` | When set to `true`, the window will scroll to the command input line when typing. When set to `false`, the window will not scroll when you start typing. |
+| `altGrAliasing` | Optional | Boolean | `true` | By default Windows treats Ctrl+Alt as an alias for AltGr. When altGrAliasing is set to false, this behavior will be disabled. |
+| `source` | Optional | String | | Stores the name of the profile generator that originated this profile. _There are no discoverable values for this field._ |
+| `startingDirectory` | Optional | String | `%USERPROFILE%` | The directory the shell starts in when it is loaded. |
+| `suppressApplicationTitle` | Optional | Boolean | `false` | When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal. |
+| `tabTitle` | Optional | String | | If set, will replace the `name` as the title to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application.  |
+| `useAcrylic` | Optional | Boolean | `false` | When set to `true`, the window will have an acrylic background. When set to `false`, the window will have a plain, untextured background. The transparency only applies to focused windows due to OS limitation. |
+| `experimental.retroTerminalEffect` | Optional | Boolean | `false` | When set to `true`, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed. |
+
+## Schemes
+
+Properties listed below are specific to each color scheme. [ColorTool](https://github.com/microsoft/terminal/tree/master/src/tools/ColorTool) is a great tool you can use to create and explore new color schemes. All colors use hex color format.
+
+| Property | Necessity | Type | Description |
+| -------- | ---- | ----------- | ----------- |
+| `name` | _Required_ | String | Name of the color scheme. |
+| `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
+| `background` | _Required_ | String | Sets the background color of the color scheme. |
+| `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
+| `cursorColor` | Optional | String | Sets the cursor color of the color scheme. |
+| `black` | _Required_ | String | Sets the color used as ANSI black. |
+| `blue` | _Required_ | String | Sets the color used as ANSI blue. |
+| `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
+| `brightBlue` | _Required_ | String | Sets the color used as ANSI bright blue. |
+| `brightCyan` | _Required_ | String | Sets the color used as ANSI bright cyan. |
+| `brightGreen` | _Required_ | String | Sets the color used as ANSI bright green. |
+| `brightPurple` | _Required_ | String | Sets the color used as ANSI bright purple. |
+| `brightRed` | _Required_ | String | Sets the color used as ANSI bright red. |
+| `brightWhite` | _Required_ | String | Sets the color used as ANSI bright white. |
+| `brightYellow` | _Required_ | String | Sets the color used as ANSI bright yellow. |
+| `cyan` | _Required_ | String | Sets the color used as ANSI cyan. |
+| `green` | _Required_ | String | Sets the color used as ANSI green. |
+| `purple` | _Required_ | String | Sets the color used as ANSI purple. |
+| `red` | _Required_ | String | Sets the color used as ANSI red. |
+| `white` | _Required_ | String | Sets the color used as ANSI white. |
+| `yellow` | _Required_ | String | Sets the color used as ANSI yellow. |
+
+## Keybindings
+
+Properties listed below are specific to each custom key binding.
+
+| Property | Necessity | Type | Description |
+| -------- | ---- | ----------- | ----------- |
+| `command` | _Required_ | String | The command executed when the associated key bindings are pressed. |
+| `keys` | _Required_ | Array[String] or String | Defines the key combinations used to call the command. |
+| `action` | Optional | String | Adds additional functionality to certain commands. |
+
+### Implemented Commands and Actions
+
+Commands listed below are per the implementation in [`src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp`](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp).
+
+Keybindings can be structured in the following manners:
+
+For commands without arguments:
+<br>
+`{ "command": "commandName", "keys": [ "modifiers+key" ] }`
+
+For commands with arguments:
+<br>
+`{ "command": { "action": "commandName", "argument": "value" }, "keys": ["modifiers+key"] }`
+
+| Command | Command Description | Action (*=required) | Action Arguments | Argument Descriptions |
+| ------- | ------------------- | ------ | ---------------- | ----------------- |
+| `adjustFontSize` | Change the text size by a specified point amount. | `delta` | integer | Amount of size change per command invocation. |
+| `closePane` | Close the active pane. | | | |
+| `closeTab` | Close the current tab. | | | |
+| `closeWindow` | Close the current window and all tabs within it. | | | |
+| `copy` | Copy the selected terminal content to your Windows Clipboard. | 1. `singleLine`<br>2. `copyFormatting` | 1. boolean<br>2. boolean, array | 1. When `true`, the copied content will be copied as a single line. When `false`, newlines persist from the selected text.<br>2. 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. |
+| `duplicateTab` | Make a copy and open the current tab. | | | |
+| `find` | Open the search dialog box. | | | |
+| `moveFocus` | Focus on a different pane depending on direction. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
+| `newTab` | Create a new tab. Without any arguments, this will open the default profile in a new tab. | 1. `commandLine`<br>2. `startingDirectory`<br>3. `tabTitle`<br>4. `index`<br>5. `profile` | 1. string<br>2. string<br>3. string<br>4. integer<br>5. string | 1. Executable run within the tab.<br>2. Directory in which the tab will open.<br>3. Title of the new tab.<br>4. Profile that will open based on its position in the dropdown (starting at 0).<br>5. Profile that will open based on its GUID or name. |
+| `nextTab` | Open the tab to the right of the current one. | | | |
+| `openNewTabDropdown` | Open the dropdown menu. | | | |
+| `openSettings` | Open the settings file. | | | |
+| `paste` | Insert the content that was copied onto the clipboard. | | | |
+| `prevTab` | Open the tab to the left of the current one. | | | |
+| `resetFontSize` | Reset the text size to the default value. | | | |
+| `resizePane` | Change the size of the active pane. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the pane will be resized. |
+| `scrollDown` | Move the screen down. | | | |
+| `scrollUp` | Move the screen up. | | | |
+| `scrollUpPage` | Move the screen up a whole page. | | | |
+| `scrollDownPage` | Move the screen down a whole page. | | | |
+| `sendInput` | Sends some text input to the shell. | `input` | string | The text input to feed into the shell.<br>ANSI escape sequences may be used. Escape codes like `\x1b` must be written as `\u001b`.<br>For instance the input `"text\n"` will write "text" followed by a newline. `"\u001b[D"` will behave as if the left arrow button had been pressed. |
+| `splitPane` | Halve the size of the active pane and open another. Without any arguments, this will open the default profile in the new pane. | 1. `split`*<br>2. `commandLine`<br>3. `startingDirectory`<br>4. `tabTitle`<br>5. `index`<br>6. `profile`<br>7. `splitMode` | 1. `vertical`, `horizontal`, `auto`<br>2. string<br>3. string<br>4. string<br>5. integer<br>6. string<br>7. string | 1. How the pane will split. `auto` will split in the direction that provides the most surface area.<br>2. Executable run within the pane.<br>3. Directory in which the pane will open.<br>4. Title of the tab when the new pane is focused.<br>5. Profile that will open based on its position in the dropdown (starting at 0).<br>6. Profile that will open based on its GUID or name.<br>7. Controls how the pane splits. Only accepts `duplicate` which will duplicate the focused pane's profile into a new pane. |
+| `switchToTab` | Open a specific tab depending on index. | `index`* | integer | Tab that will open based on its position in the tab bar (starting at 0). |
+| `toggleFullscreen` | Switch between fullscreen and default window sizes. | | | |
+| `unbound` | Unbind the associated keys from any command. | | | |
+
+### Accepted Modifiers and Keys
+
+#### Modifiers
+`ctrl+`, `shift+`, `alt+`
+
+#### Keys
+
+| Type | Keys |
+| ---- | ---- |
+| Function and Alphanumeric Keys | `f1-f24`, `a-z`, `0-9` |
+| Symbols | ``` ` ```, `-`, `=`, `[`, `]`, `\`, `;`, `'`, `,`, `.`, `/` |
+| Arrow Keys | `down`, `left`, `right`, `up`, `pagedown`, `pageup`, `pgdn`, `pgup`, `end`, `home`, `plus`, `app`, `menu` |
+| Action Keys | `tab`, `enter`, `esc`, `escape`, `space`, `backspace`, `delete`, `insert` |
+| Numpad Keys | `numpad_0-numpad_9`, `numpad0-numpad9`, `numpad_add`, `numpad_plus`, `numpad_decimal`, `numpad_period`, `numpad_divide`, `numpad_minus`, `numpad_subtract`, `numpad_multiply` |
+
+## Background Images and Icons
+
+Some Terminal settings allow you to specify custom background images and icons. It is recommended that custom images and icons are stored in system-provided folders and are referred to using the correct [URI Schemes](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes). URI Schemes provide a way to reference files independent of their physical paths (which may change in the future).
+
+The most useful URI schemes to remember when customizing background images and icons are:
+
+| URI Scheme | Corresponding Physical Path | Use / description |
+| --- | --- | ---|
+| `ms-appdata:///Local/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\` | Per-machine files |
+| `ms-appdata:///Roaming/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\RoamingState\` | Common files |
+
+> ⚠ Note: Do not rely on file references using the `ms-appx` URI Scheme (i.e. icons). These files are considered an internal implementation detail and may change name/location or may be omitted in the future.
+
+### Icons
+
+Terminal displays icons for each of your profiles which Terminal generates for any built-in shells - PowerShell Core, PowerShell, and any installed Linux/WSL distros. Each profile refers to a stock icon via the `ms-appx` URI Scheme.
+
+> ⚠ Note: Do not rely on the files referenced by the `ms-appx` URI Scheme - they are considered an internal implementation detail and may change name/location or may be omitted in the future.
+
+You can refer to you own icons if you wish, e.g.:
+
+```json
+    "icon" : "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\icon-ubuntu-32.png",
+```
+
+> 👉 Tip: Icons should be sized to 32x32px in an appropriate raster image format (e.g. .PNG, .GIF, or .ICO) to avoid having to scale your icons during runtime (causing a noticeable delay and loss of quality.)
+
+### Custom Background Images
+
+You can apply a background image to each of your profiles, allowing you to configure/brand/style each of your profiles independently from one another if you wish.
+
+To do so, specify your preferred `backgroundImage`, position it using `backgroundImageAlignment`, set its opacity with `backgroundImageOpacity`, and/or specify how your image fill the available space using `backgroundImageStretchMode`.
+
+For example:
+```json
+    "backgroundImage": "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\bg-ubuntu-256.png",
+    "backgroundImageAlignment": "bottomRight",
+    "backgroundImageOpacity": 0.1,
+    "backgroundImageStretchMode": "none"
+```
+
+> 👉 Tip: You can easily roam your collection of images and icons across all your machines by storing your icons and images in OneDrive (as shown above).
+
+With these settings, your Terminal's Ubuntu profile would look similar to this:
+
+![Custom icon and background image](../images/custom-icon-and-background-image.jpg)

doc/cascadia/profiles.schema.json

@@ -26,25 +26,11 @@
       ],
       "type": "string"
     },
-    "BellStyle": {
-      "enum": [
-        "none",
-        "audible"
-      ],
-      "type": "string"
-    },
     "ProfileGuid": {
       "default": "{}",
       "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
       "type": "string"
     },
-    "Icon": {
-      "description": "Image file location or an emoji to be used as an icon. Displays within the tab, the dropdown menu, and jumplist.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "ShortcutActionName": {
       "enum": [
         "adjustFontSize",
@@ -81,7 +67,6 @@
         "toggleAlwaysOnTop",
         "toggleFocusMode",
         "toggleFullscreen",
-        "togglePaneZoom",
         "toggleRetroEffect",
         "wt",
         "unbound"
@@ -479,14 +464,6 @@
               "type": "array"
             }
           ]
-        },
-        "icon": { "$ref": "#/definitions/Icon" },
-        "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.",
-          "type": [
-            "string",
-            "null"
-          ]
         }
       },
       "required": [
@@ -519,11 +496,6 @@
           "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.",
           "$ref": "#/definitions/CopyFormat"
         },
-        "disableAnimations": {
-          "default": false,
-          "description": "When set to `true`, visual animations will be disabled across the application.",
-          "type": "boolean"
-        },
         "largePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
@@ -555,18 +527,18 @@
         },
         "initialCols": {
           "default": 120,
-          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of columns displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
         },
         "initialPosition": {
           "$ref": "#/definitions/Coordinates",
-          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), the window will be maximized on the monitor specified by those coordinates."
+          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to maximized, the window will be maximized on the monitor specified by those coordinates."
         },
         "initialRows": {
           "default": 30,
-          "description": "The number of rows displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of rows displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
@@ -578,13 +550,11 @@
         },
         "launchMode": {
           "default": "default",
-          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window. Setting this to \"focus\" is equivalent to launching the terminal in the \"default\" mode, but with the focus mode enabled. Similar, setting this to \"maximizedFocus\" will result in launching the terminal in a maximized window with the focus mode enabled.",
+          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window.",
           "enum": [
             "fullscreen",
             "maximized",
-            "default",
-            "focus",
-            "maximizedFocus"
+            "default"
           ],
           "type": "string"
         },
@@ -724,11 +694,6 @@
           ],
           "type": "string"
         },
-        "bellStyle": {
-          "default": "audible",
-          "description": "Controls what happens when the application emits a BEL character. When set to \"audible\", the Terminal will play a sound. When set to \"none\", nothing will happen.",
-          "$ref": "#/definitions/BellStyle"
-        },
         "closeOnExit": {
           "default": "graceful",
           "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
@@ -844,7 +809,10 @@
           "minimum": -1,
           "type": "integer"
         },
-        "icon":{ "$ref": "#/definitions/Icon" },
+        "icon": {
+          "description": "Image file location of the icon used in the profile. Displays within the tab and the dropdown menu.",
+          "type": ["string", "null"]
+        },
         "name": {
           "description": "Name of the profile. Displays in the dropdown menu.",
           "minLength": 1,

doc/creating_a_new_project.md

@@ -1,54 +0,0 @@
-# Creating a New Project
-
-## Creating a new WinRT Component DLL and referencing it in another project
-
-When creating a new DLL, it was really helpful to reference an existing DLL's `.vcxproj` like `TerminalControl.vcxproj`. While you should mostly try to copy what the existing `.vcxproj` has, here's a handful of things to double check for as you go along.
-
-- [ ] Make sure to `<Import>` our pre props at the _top_ of the vcxproj, and our post props at the _bottom_ of the vcxproj.
-```
-<!-- pre props --> 
-<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
-<!-- everything else -->
-
-<!-- post props -->
-<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-```
-- [ ] Add a `<ProjectReference>` to your new `.vcxproj` in both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`
-- [ ] Add a `<Reference>` to `TerminalAppLib.vcxproj` similar to this:
-```
-    <Reference Include="Microsoft.Terminal.NewDLL">
-      <HintPath>$(_BinRoot)TerminalNewDLL\Microsoft.Terminal.NewDLL.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-```
-- [ ] Make sure the project has a `.def` file with the following lines. The `WINRT_GetActivationFactory` part is important to expose the new DLL's activation factory so that other projects can successfully call the DLL's `GetActivationFactory` to get the DLL's classes.
-```
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
-```
-- For a bit more context on this whole process, the `AppXManifest.xml` file defines which classes belong to which DLLs. If your project wants class `X.Y.Z`, it can look it up in the manifest's definitions and see that it came from `X.Y.dll`. Then it'll load up the DLL, and call a particular function called `GetActivationFactory(L"X.Y.Z")` to get the class it wants. So, the definitions in `AppXManifest` are _required_ for this activation to work properly, and I found myself double checking the file to see that the definitions I expect are there.
-- _Note_: If your new library eventually rolls up as a reference to our Centennial Packaging project `CascadiaPackage`, you don't have to worry about manually adding your definitions to the `AppXManifest.xml` because the Centennial Packaging project automatically enumerates the reference tree of WinMDs and stitches that information into the `AppXManifest.xml`. However, if your new project does _not_ ultimately roll up to a packaging project that will automatically put the references into `AppXManifest`, you will have to add them in manually.
-
-### Troubleshooting
-- If you hit an error that looks like this: 
-    ```
-    X found processing metadata file ..\blah1\Microsoft.UI.Xaml.winmd, type already exists in file ..\blah\NewDLLProject\Microsoft.UI.Xaml.winmd.
-    ```
-    The `Microsoft.UI.Xaml.winmd` is showing up in the output folder when it shouldn't. Try adding this block at the top of your `.vcxproj`
-    ```
-    <ItemDefinitionGroup>
-    <Reference>
-        <Private>false</Private>
-    </Reference>
-    </ItemDefinitionGroup>
-    ```
-    This will make all references non-private, meaning "don't copy it into my folder" by default.
-
-- If you hit a `Class not Registered` error, this might be because a class isn't getting registered in the app manifest. You can go check `src/cascadia/CascadiaPackage/bin/x64/Debug/AppX/AppXManifest.xml` to see if there exist entries to the classes of your newly created DLL. If the references aren't there, double check that you've added `<ProjectReference>` blocks to both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`.
-
-- If you hit an extremely vague error along the lines of `Error in the DLL`, and right before that line you notice that your new DLL is loaded and unloaded right after each other, double check that your new DLL's definitions show up in the `AppXManifest.xml` file. If your new DLL is included as a reference to a project that rolls up to `CascadiaPackage`, double check that you've created a `.def` file for the project. Otherwise if your new project _does not_ roll up to a package that populates the `AppXManifest` references for you, you'll have to add those references yourself.

doc/specs/#1564 - Settings UI/design.md

@@ -1,112 +0,0 @@
----
-author: Kayla Cinnamon @cinnamon-msft
-created on: 2020-07-13
-last updated: 2020-08-11
-issue id: #1564
----
-
-# Settings UI Design
-
-## Abstract
-
-This design document describes how each page of the settings UI will be laid out along with design mockups to display how the UI will appear. The mock ups are for appearance purposes and some layouts and naming may be different in this doc. This doc should be considered the final say.
-
-## UI Design
-
-### Overall navigation with Startup page
-
-This is the list of the top-level navigation items that will appear on the left nav bar:
-
-- General
-    - Startup
-    - Interaction
-    - Rendering
-- Appearance
-    - Global
-    - Color schemes
-    - Themes*
-- Profiles
-    - Defaults
-    - Enumerate profiles
-    - Add new
-- Keyboard
-- Mouse*
-- Command Palette*
-- Marketplace*
-
-\* Themes, mouse, command palette, and marketplace will be added once they're implemented.
-
-![Overall navigation](./navigation-2.png)
-
-### Profile appearance page
-
-This page requires special design because it includes the TerminalControl window to preview appearance changes. This preview window will appear on the following pages:
-
-- Appearance - Color Schemes
-- Profiles - Appearance
-
-![Appearance page](./appearance.png)
-
-### Keyboard page
-
-The keyboard page will list the enabled key bindings and provide a way for users to add and remove them.
-
-![Keyboard page](./keyboard.png)
-
-When someone hovers over one of the items in the table, the Edit and Delete buttons will appear. Below is what the modal looks like if they were to click Edit on a command that does not have any arguments/actions. In the future, we would want this text box to be able to listen for key combinations. This would add a "listen" button to the UI.
-
-![Keyboard page modal](./keyboard-modal.png)
-
-If the command they select has additional arguments/actions, the modal will dynamically size as arguments/actions are added.
-
-![Keyboard page modal add new arguments](./keyboard-modal-add.png)
-
-![Keyboard page modal arguments](./keyboard-modal-args.png)
-
-## Settings layout
-
-Below is the list of all settings on their respective pages in the settings UI. The title row aligns with the navigation view on the left of the UI. Bolded headers in those columns align with top nav on the page.
-
-| General - Startup | General - Interaction | General - Rendering | Appearance - Global | Appearance - Color Schemes | Profiles - Global | Profiles - Enumerate profiles | Profiles - Add new |
-| ---------------- | --------------------- | ------------------- | ------------------- | -------------------------- | ----------------- | ----------------------------- | ------------------ |
-| Default profile (dropdown) | Copy after selection is made (checkbox) | Software rendering (checkbox) | Theme (radio) | Name (text box) | **General** | **General** | **General** | **General** |
-| Launch on startup (checkbox) | Copy formatting (checkbox) | Screen redrawing (checkbox) | Show/Hide the title bar (checkbox) | Cursor color (color picker) | Command line (text box) | Scrollbar visibility (radio) | Scrollbar visibility (radio) |
-| Launch size (radio) | Word delimiters (text box) | | Show terminal title in title bar (checkbox) | Selection background (color picker) | Starting directory (browse button) | Command line (browse button) | Command line (browse button) |
-| Launch position (text box) | Window resize behavior (checkbox) | | Always show tabs (checkbox) | Background (color picker) | Icon (browse button) | Starting directory (browse button) | Starting directory (browse button) |
-| Columns on first launch (number picker) | | | Tab width mode (radio) | Foreground (color picker) | Tab title (text box) | Name (text box) | Name (text box) |
-| Rows on first launch (number picker) | | | Hide close all tabs popup (checkbox) | Black (color picker) | Scrollbar visibility (radio) | Icon (browse button) | Icon (browse button) |
-| Automatically create new profiles when new shells are installed (checkbox) | | | | Blue (color picker) | **Appearance** | Tab title (text box) | Tab title (text box) |
-| | | | | Cyan (color picker) | Font face (text box) | **Appearance** | **Appearance** |
-| | | | | Green (color picker) | Font size (number picker) | Retro terminal effects (checkbox) | Retro terminal effects (checkbox) |
-| | | | | Purple (color picker) | Font weight (dropdown) | Font face (text box) | Font face (text box) |
-| | | | | Red (color picker) | Padding (text box) | Font size (number picker) | Font size (number picker) |
-| | | | | White (color picker) | Cursor shape (radio) | Font weight (dropdown) | Font weight (dropdown) |
-| | | | | Yellow (color picker) | Cursor color (color picker) | Padding (text box) | Padding (text box) |
-| | | | | Bright black (color picker) | Cursor height (number picker) | Cursor shape (radio) | Cursor shape (radio) |
-| | | | | Bright blue (color picker) | Color scheme (dropdown) | Cursor color (color picker) | Cursor color (color picker) |
-| | | | | Bright cyan (color picker) | Foreground color (color picker) | Cursor height (number picker) | Cursor height (number picker) |
-| | | | | Bright green (color picker) | Background color (color picker) | Color scheme (dropdown) | Color scheme (dropdown) |
-| | | | | Bright purple (color picker) | Selection background color (color picker) | Foreground color (color picker) | Foreground color (color picker) |
-| | | | | Bright red (color picker) | Enable acrylic (checkbox) | Background color (color picker) | Background color (color picker) |
-| | | | | Bright white (color picker) | Acrylic opacity (number picker) | Selection background color (color picker) | Selection background color (color picker) |
-| | | | | Bright yellow (color picker) | Background image (browse button) | Enable acrylic (checkbox) | Enable acrylic (checkbox) |
-| | | | | | Background image stretch mode (radio) | Acrylic opacity (number picker) | Acrylic opacity (number picker) |
-| | | | | | Background image alignment (dropdown) | Background image (browse button) | Background image (browse button) |
-| | | | | | Background image opacity (number picker) | Background image stretch mode (radio) | Background image stretch mode (radio) |
-| | | | | | Retro terminal effects (checkbox) | Background image alignment (dropdown) | Background image alignment (dropdown) |
-| | | | | | **Advanced** | Background image opacity (number picker) | Background image opacity (number picker) |
-| | | | | | Hide profile from dropdown (checkbox) | **Advanced** | **Advanced** |
-| | | | | | Suppress title changes (checkbox) | GUID (text box) | GUID (text box) |
-| | | | | | Antialiasing text (radio) | Hide profile from dropdown (checkbox) | Hide profile from dropdown (checkbox) |
-| | | | | | AltGr aliasing (checkbox) | Suppress title changes (checkbox) | Suppress title changes (checkbox) |
-| | | | | | Scroll to input when typing (checkbox) | Antialiasing text (radio) | Antialiasing text (radio) |
-| | | | | | History size (number picker) | AltGr aliasing (checkbox) | AltGr aliasing (checkbox) |
-| | | | | | How the profile closes (radio) | Scroll to input when typing (checkbox) | Scroll to input when typing (checkbox) |
-| | | | | | | History size (number picker) | History size (number picker) |
-| | | | | | | How the profile closes (radio) | How the profile closes (radio) |
-
-## Potential Issues
-
-## Future considerations
-
-## Resources

doc/specs/#1564 - Settings UI/spec.md

@@ -1,122 +0,0 @@
----
-author: Kayla Cinnamon @cinnamon-msft
-created on: 2020-06-29
-last updated: 2020-08-10
-issue id: #1564
----
-
-# Settings UI Implementation
-
-## Abstract
-
-This spec describes the basic functionality of the settings UI, including disabling it, the navigation items, launch methods, and editing of settings. The specific layout of each page will defined in later design reviews.
-
-## Inspiration
-
-We have been wanting a settings UI since the dawn of Terminal time, so we need to define how it will interact with the application and how users should expect to interact with it.
-
-## Solution Design
-
-The settings UI will be the default experience. We will provide users an option to skip the settings UI and edit the raw JSON file.
-
-### Ability to disable displaying the settings UI
-
-Some users don't want a UI for the settings. We can update the `openSettings` key binding with a `settingsUI` option.
-
-If people still like the UI but want to access the JSON file, we can provide an "Open the JSON file" button at the bottom of the navigation menu.
-
-### Launch method: launch in a new tab
-
-Clicking the settings button in the dropdown menu will open the settings UI in a new tab. This helps us take steps toward supporting non-terminal content in a tab. Users will be able to see their visual changes by using the preview window inside the settings UI on relevant pages.
-
-#### We also considered: launch in a new window
-
-Clicking the settings button in the dropdown menu will open the settings UI in a new window. This allows the user to edit their settings and see the Terminal live update with their changes.
-
-In the Windows taskbar, the icon will appear as if Terminal has multiple windows open.
-
-### Editing and saving settings: implement a save button
-
-Users will only see their settings changes take place once they click "Save". Clicking "Save" will write to the settings.json file. This aligns with the functionality that exists today by editing the settings.json file in a text editor and saving it.
-
-We will also be adding a TerminalControl inside the settings UI to preview what the changes will look like before actually saving them to the settings.json file.
-
-#### We also considered: automatically save settings
-
-As users edit fields in the settings UI, they are automatically saved and written to the JSON file. This allows the user to see their settings changes taking place in real time.
-
-## UI/UX Design
-
-Layout of all of the settings per page can be found in the [design doc](./design.md).
-
-### Top-level navigation: more descriptive navigation
-
-The navigation menu is broken up into more digestible sections. This aligns more closely to other terminals. The following are the proposed navigation items:
-
-- General
-    - Startup
-    - Interaction
-    - Rendering
-- Appearance
-    - Global
-    - Color schemes
-    - Themes*
-- Profiles
-    - Defaults
-    - Enumerate profiles
-    - Add new
-- Keyboard
-- Mouse*
-- Command Palette*
-- Marketplace*
-
-\* Themes, mouse, command palette, and marketplace will be added once they're implemented.
-
-![Settings UI navigation 2](./navigation-2.png)
-
-#### We also considered: align with JSON
-
-The settings UI could have top-level navigation that aligns with the overall structure of the settings.json file. The following are the proposed navigation items:
-
-- Globals
-- Profiles
-- Color schemes
-- Bindings
-
-For Bindings, it would have key bindings, mouse bindings, and command palette inside it.
-
-![Settings UI navigation 1](./navigation.png)
-
-## Capabilities
-
-### Accessibility
-
-This will have to undergo full accessibility testing because it is a new UI element. All items inside the settings UI should be accessible by a screen reader and the keyboard. Additionally, all of the settings UI will have to be localized.
-
-### Security
-
-This does not impact security.
-
-### Reliability
-
-This will not improve reliability.
-
-### Compatibility
-
-This will change the default experience to open the UI, rather than the JSON file in a text editor. This behavior can be reverted with the setting listed [above](#ability-to-disable-displaying-the-settings-ui).
-
-### Performance, Power, and Efficiency
-
-This does not affect performance, power, nor efficiency.
-
-## Potential Issues
-
-## Future considerations
-
-- We will have to have design reviews for all of the content pages.
-- The `hidden` property will need special consideration. Ideally, all profiles will appear in the settings regardless if `hidden` is set to `true`.
-- We should have undo functionality. In a text editor, you can type `Ctrl+Z` however the settings UI is a bit more complex.
-- Once we have a marketplace for themes and extensions, this should be added to the top-level navigation.
-- As we add more features, the top-level navigation is subject to change in favor of improved usability.
-
-## Resources

doc/specs/#885 - winrt Terminal Settings.md

@@ -1,251 +0,0 @@
----
-author: Carlos Zamora @carlos-zamora
-created on: 2020-07-10
-last updated: 2020-07-10
-issue id: [#885](https://github.com/microsoft/terminal/issues/885)
----
-
-# Terminal Settings Model
-
-## Abstract
-
-This spec proposes a major refactor and repurposing of the TerminalSettings project as the TerminalSettingsModel.
- TerminalSettingsModel would be responsible for exposing, serializing, and deserializing settings as WinRT objects
- for Windows Terminal. In doing so, Terminal's settings model is accessible as WinRT objects to existing components
- like TerminalApp, TerminalControl, and TerminalCore. Additionally, Terminal Settings can be used by the Settings UI or
- Shell Extensions to modify or reference Terminal's settings respectively.
-
-## Inspiration
-
-The main driver for this change is the Settings UI. The Settings UI will need to read and modify Terminal's settings
- objects. At the time of writing this spec, the Terminal's settings are serialized as objects in the TerminalApp project.
- To access these objects via XAML, the Settings UI needs them to be WinRT objects. Additional features that need the
- settings objects to be WinRT objects include future shell extensions, like jumplist.
-
-## Solution Design
-
-### Terminal Settings Model: Objects and Projections
-
-The following TerminalApp objects will become WinRT objects and will be moved to the TerminalSettingsModel project
-(formerly TerminalSettings):
-- ColorScheme
-- Profile
-- GlobalAppSettings
-- CascadiaSettings
-
-The TerminalSettingsModel project will have a root namespace of `Microsoft.Terminal.Settings.Model`.
-
-Adjacent to the introduction of these settings objects, `IControlSettings` and `ICoreSettings` will be moved
- to the `Microsoft.Terminal.TerminalControl` namespace. This allows for a better consumption of the
- settings model that is covered later in the (Consumption section)[#terminal-settings-model:-consumption].
-
-#### Moving/Splitting the Action Model
-
-Windows Terminal represents actions via several objects:
-- `AppKeyBindings`: a map of all the defined keybindings and their corresponding actions
-- `ActionAndArgs`: a (de)serializable action (this holds more objects inside of it, but we won't focus on that for now)
-- `ShortcutActionDispatch`: responsible for dispatching events pertinent to a given ActionAndArgs object
-`TerminalApp`'s `TerminalPage` handles any events dispatched by the `ShortcutActionDispatch`.
-
-With the introduction of the TerminalSettingsModel, we will split `AppKeyBindings` using a `KeyMapping` class.
- This separation will look something like the following:
-```c++
-namespace TerminalApp
-{
-    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings
-    {
-        AppKeyBindings();
-
-        // NOTE: It may be possible to move both of these to the constructor instead
-        void SetDispatch(ShortcutActionDispatch dispatch);
-        void SetKeyMap(KeyMapping keymap);
-    }
-}
-
-namespace TerminalSettingsModel
-{
-    [default_interface] runtimeclass KeyMapping
-    {
-        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord);
-        void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord);
-
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action);
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
-    }
-}
-```
-This separation leaves `AppKeyBindings` with the responsibility of detecting and dispatching actions, whereas
- `KeyMapping` handles the (de)serialization and navigation of the key bindings.
-
-
-### Terminal Settings Model: Serialization and Deserialization
-
-Introducing these `Microsoft.Terminal.Settings.Model` WinRT objects also allow the serialization and deserialization
- logic from TerminalApp to be moved to TerminalSettings. `JsonUtils` introduces several quick and easy methods
- for setting serialization. This will be moved into the `Microsoft.Terminal.Settings.Model` namespace too.
-
-Deserialization will be an extension of the existing `JsonUtils` `ConversionTrait` struct template. `ConversionTrait`
- already includes `FromJson` and `CanConvert`. Serialization would be handled by a `ToJson` function.
-
-
-### Terminal Settings Model: Warnings and Serialization Errors
-
-Today, if the deserialization of `CascadiaSettings` encounters any errors, an exception is thrown and caught/handled
- by falling back to a simple `CascadiaSettings` object. However, WinRT does not support exceptions.
-
-To get around this issue, when `CascadiaSettings` encounters a serialization error, it must internally record
- any pertinent information for that error, and return the simple `CascadiaSettings` as if nothing happened.
- The consumer must then call `CascadiaSettings::GetErrors()` and `CascadiaSettings::GetWarnings()` to properly
- understand whether an error ocurred and how to present that to the user.
-
-
-#### TerminalApp: Loading and Reloading Changes
-
-TerminalApp will construct and reference a `CascadiaSettings settings` as follows:
-- TerminalApp will have a global reference to the "settings.json" filepath
-- construct an `CascadiaSettings` using `CascadiaSettings("settings.json")`. This builds an `CascadiaSettings`
-   from the "defaults.json" file data (which is already compiled as a string literal)
-   and layers the settings.json data on top of it.
-- check for errors/warnings, and handle them appropriately
-
-This will be different from the current model which has the settings.json path hardcoded, and is simplified
- to a `LoadAll()` call wrapped in error handlers.
-
-**NOTE:** This model allows us to layer even more settings files on top of the existing Terminal Settings
- Model, if so desired. This could be helpful when importing additional settings files from an external location
- such as a marketplace.
-
-When TerminalApp detects a change to settings.json, it'll repeat the steps above. We could cache the result from
- constructing an `CascadiaSettings` from "defaults.json" data to improve performance.
-
-
-#### TerminalControl: Acquiring and Applying the Settings
-
-At the time of writing this spec, TerminalApp constructs `TerminalControl.TerminalSettings` WinRT objects
- to expose `IControlSettings` and `ICoreSettings` to any hosted terminals. In moving `IControlSettings`
- and `ICoreSettings` down to the TerminalControl layer, TerminalApp can now have better control over
- how to expose relevant settings to a TerminalControl instance.
-
-`TerminalSettings` (which implements `IControlSettings` and `ICoreSettings`) will be moved to
- TerminalApp and act as a bridge connecting `CascadiaSettings` to the TermControl. It will operate
- very similarly as it does today. On construction of the TermControl or hot-reload,
- `TerminalSettings` will be constructed by copying the relevant values of `CascadiaSettings`.
- Then, it will be passed to TermControl (and TermCore by extension).
-
-
-## UI/UX Design
-
-N/A
-
-## Capabilities
-
-### Accessibility
-
-N/A
-
-### Security
-
-N/A
-
-### Reliability
-
-N/A
-
-### Compatibility
-
-N/A
-
-### Performance, Power, and Efficiency
-
-## Potential Issues
-
-N/A
-
-## Future considerations
-
-### TerminalSettings: passing by reference
-
-`TermApp` synthesizes a `TerminalSettings` by copying the relevant values of `CascadiaSettings`,
- then giving it to a Terminal Control. Some visual keybindings and interactions like ctrl+scroll
- and ctrl+shift+scroll to change the font size and acrylic opacity operate by directly modifying
- the value of the instantiated `TerminalSettings`. However, when a settings reload occurs,
- these instanced changes are lost.
-
-`TerminalSettings` can be used as a WinRT object that references (instead of copies) the relevant
- values of `CascadiaSettings`. This would prevent those instanced changes from being lost on a settings
- reload.
-
-Since previewing commands like `setColorScheme` would require a clone of the existing `TerminalSettings`,
- a `Clone` API can be added on `TerminalSettings` to accomplish that. When passing by value,
- `TerminalSettings` can just overwrite the existing property (i.e.: color scheme). When passing
- by reference, a slightly more complex mechanism is required to override the value.
-
-Now, instead of overwriting the value, we need to override the reference to a constant value
-(i.e.: `snapOnInput=true`) or a referenced value (i.e.: `colorScheme`).
-
-### Layering Additional Settings
-As we begin to introduce more sources that affect the settings (via extensions or themes),
- we can introduce a `LayerSettings(String path)`. This layers the new settings file
- onto the existing `CascadiaSettings`. This is already done internally, we would just expose
- it via C++/WinRT.
-
-```c++
-runtimeclass CascadiaSettings
-{
-    // Load a settings file, and layer those changes on top of the existing CascadiaSettings
-    void LayerSettings(String path);
-}
-```
-
-### Settings UI: Modifying and Applying the Settings (DRAFT)
-
-```c++
-runtimeclass CascadiaSettings
-{
-    // Create a copy of the existing CascadiaSettings
-    CascadiaSettings Clone();
-
-    // Compares object to "source" and applies changes to
-    // the settings file at "outPath"
-    void Save(String outPath);
-}
-```
-
-The Settings UI will also have a reference to the `CascadiaSettings settings` from TerminalApp
- as `settingsSource`. When the Settings UI is opened up, the Settings UI will also have its own `CascadiaSettings settingsClone`
- that is a clone of TerminalApp's `CascadiaSettings`.
-```c++
-settingsClone = settingsSource.Clone()
-```
-
-As the user navigates the Settings UI, the relevant contents of `settingsClone` will be retrieved and presented.
- As the user makes changes to the Settings UI, XAML will update `settingsClone` using XAML data binding.
- When the user saves/applies the changes in the XAML, `settingsClone.Save("settings.json")` is called;
- this compares the changes between `settingsClone` and `settingsSource`, then injects the changes (if any) to `settings.json`.
-
-As mentioned earlier, TerminalApp detects a change to "settings.json" to update its `CascadiaSettings`.
- Since the above triggers a change to `settings.json`, TerminalApp will also update itself. When
- something like this occurs, `settingsSource` will automatically be updated too.
-
-In the case that a user is simultaneously updating the settings file directly and the Settings UI,
- `settingsSource` and `settingsClone` can be compared to ensure that the Settings UI, the TerminalApp,
- and the settings files are all in sync.
-
- **NOTE:** In the event that the user would want to export their current configuration, `Save`
- can be used to export the changes to a new file.
-
- ### Reserialization (DRAFT)
-
-After deserializing the settings, injecting the new json into settings.json
- should not remove the existing comments or formatting.
-
-The reserialization process takes place right after comparing the `settingsSource` and `settingsClone` objects.
- For each setting found in the diff, we go to the relevant part of the JSON and see if the key is already there.
- If it is, we update the value to be the one from `settingsClone`. Otherwise, we append the key/value pair
- at the end of the section (much like we do with dynamic profiles in `profiles`).
-
-## Resources
-
-- [Preview Commands](https://github.com/microsoft/terminal/issues/6689)
-- [New JSON Utils](https://github.com/microsoft/terminal/pull/6590)
-- [Spec: Settings UI](https://github.com/microsoft/terminal/pull/6720)

doc/terminal-v2-roadmap.md

@@ -22,14 +22,15 @@ Below is the schedule for when milestones will be included in release builds of
 | Milestone End Date | Milestone Name | Preview Release Blog Post |
 | ------------------ | -------------- | ------------------------- |
 | 2020-06-18 | [1.1] in Windows Terminal Preview | [Windows Terminal Preview 1.1 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-1-release/) |
-| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/) |
-| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/) |
-| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/) |
-| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | |
-| 2020-12-31 | 1.6 in Windows Terminal Preview<br>[1.5] in Windows Terminal | |
-| 2021-01-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
-| 2021-02-28 | 1.8 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
-| 2021-03-31 | 1.9 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
+| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | |
+| 2020-08-31 | 1.3 in Windows Terminal Preview<br>[1.2] in Windows Terminal | |
+| 2020-09-30 | 1.4 in Windows Terminal Preview<br>1.3 in Windows Terminal | |
+| 2020-10-31 | 1.5 in Windows Terminal Preview<br>1.4 in Windows Terminal | |
+| 2020-11-30 | 1.6 in Windows Terminal Preview<br>1.5 in Windows Terminal | |
+| 2020-12-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
+| 2021-01-31 | 1.8 in Windows Terminal Preview<br>1.7 in Windows Terminal | |
+| 2021-02-28 | 1.9 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
+| 2021-03-31 | 1.10 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
 | 2021-04-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-05-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
@@ -49,11 +50,11 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 
 | Priority\* | Scenario | Description/Notes |
 | ---------- | -------- | ----------------- |
-| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370] |
-| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] |
+| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564] |
+| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193] |
 | 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256]<br>Spec: [#2080] |
-| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] |
-| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] |
+| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574] |
+| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080] |
 | 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] |
 | 1 | Open tab as admin/other user | Open tab in existing Windows Terminal instance as admin (if Terminal was run unelevated) or as another user.<br><br>Issue: [#5000] |
 | 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] |
@@ -61,7 +62,7 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 | 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] |
 | 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] |
 | 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming |
-| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] |
+| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576] |
 | 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] |
 | 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] |
 | 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] |
@@ -79,26 +80,16 @@ Feature Notes:
 
 [1.1]: https://github.com/microsoft/terminal/milestone/24
 [1.2]: https://github.com/microsoft/terminal/milestone/25
-[1.3]: https://github.com/microsoft/terminal/milestone/26
-[1.4]: https://github.com/microsoft/terminal/milestone/28
-[1.5]: https://github.com/microsoft/terminal/milestone/30
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
-[#6720]: https://github.com/microsoft/terminal/pull/6720
-[#6904]: https://github.com/microsoft/terminal/pull/6904
-[#7283]: https://github.com/microsoft/terminal/pull/7283
-[#7370]: https://github.com/microsoft/terminal/pull/7370
 [#5400]: https://github.com/microsoft/terminal/issues/5400
 [#2046]: https://github.com/microsoft/terminal/issues/2046
 [#2193]: https://github.com/microsoft/terminal/pull/2193
-[#6635]: https://github.com/microsoft/terminal/pull/6635
 [#1256]: https://github.com/microsoft/terminal/issues/1256
 [#2080]: https://github.com/microsoft/terminal/pull/2080
 [#574]: https://github.com/microsoft/terminal/issues/574
-[#7251]: https://github.com/microsoft/terminal/pull/7251
 [#492]: https://github.com/microsoft/terminal/issues/492
 [#2080]: https://github.com/microsoft/terminal/pull/2080
-[#7414]: https://github.com/microsoft/terminal/pull/7414
 [#3327]: https://github.com/microsoft/terminal/issues/3327
 [#5772]: https://github.com/microsoft/terminal/pull/5772
 [#5000]: https://github.com/microsoft/terminal/issues/5000
@@ -109,7 +100,6 @@ Feature Notes:
 [#1410]: https://github.com/microsoft/terminal/issues/1410
 [#1000]: https://github.com/microsoft/terminal/issues/1000
 [#576]: https://github.com/microsoft/terminal/issues/576
-[#7515]: https://github.com/microsoft/terminal/pull/7515
 [#756]: https://github.com/microsoft/terminal/issues/756
 [#1060]: https://github.com/microsoft/terminal/issues/1060
 [#6100]: https://github.com/microsoft/terminal/pull/6100

doc/user-docs/ThirdPartyToolProfiles.md

@@ -1,7 +1,13 @@
 # Adding profiles for third-party tools
 
-This doc will hopefully provide a useful guide for adding profiles for common third-party tools to your
-[settings.json](https://docs.microsoft.com/en-us/windows/terminal/customize-settings/profile-settings) file.
+This doc will hopefully provide a useful guide for adding profiles for common
+third-party tools to your
+[settings.json](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingJsonSettings.md)
+file.
+
+All of these profiles are provided _without_ their `guid` set. If you'd like to
+set any of these profiles as your _default_ profile, you'll need to make sure to
+[generate a unique guid](https://www.guidgenerator.com/) for them manually.
 
 ## Anaconda
 
@@ -9,10 +15,10 @@ Assuming that you've installed Anaconda into `%USERPROFILE%\Anaconda3`:
 
 ```json
 {
-    "commandline": "cmd.exe /k \"%USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3\"",
-    "icon": "%USERPROFILE%\\Anaconda3\\Menu\\anaconda-navigator.ico",
-    "name": "Anaconda3",
-    "startingDirectory": "%USERPROFILE%"
+    "commandline" : "cmd.exe /k \"%USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3\"",
+    "icon" : "%USERPROFILE%/Anaconda3/Menu/anaconda-navigator.ico",
+    "name" : "Anaconda3",
+    "startingDirectory" : "%USERPROFILE%"
 }
 ```
 
@@ -22,23 +28,23 @@ Assuming that you've installed cmder into `%CMDER_ROOT%`:
 
 ```json
 {
-    "commandline": "cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
-    "name": "cmder",
-    "icon": "%CMDER_ROOT%\\icons\\cmder.ico",
-    "startingDirectory": "%USERPROFILE%"
+    "commandline" : "cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
+    "name" : "cmder",
+    "icon" : "%CMDER_ROOT%/icons/cmder.ico",
+    "startingDirectory" : "%USERPROFILE%"
 }
 ```
 
 ## Cygwin
 
-Assuming that you've installed Cygwin into `C:\Cygwin`:
+Assuming that you've installed Cygwin into `C:/Cygwin`:
 
 ```json
 {
-    "name": "Cygwin",
-    "commandline": "C:\\Cygwin\\bin\\bash --login -i",
-    "icon": "C:\\Cygwin\\Cygwin.ico",
-    "startingDirectory": "C:\\Cygwin\\bin"
+    "name" : "Cygwin",
+    "commandline" : "C:/Cygwin/bin/bash --login -i",
+    "icon" : "C:/Cygwin/Cygwin.ico",
+    "startingDirectory" : "C:/Cygwin/bin"
 }
 ```
 
@@ -52,49 +58,49 @@ Assuming that you've installed Far into `c:\Program Files\Far Manager`:
 
 ```json
 {
-    "name": "Far",
-    "commandline": "\"c:\\program files\\far manager\\far.exe\"",
-    "startingDirectory": "%USERPROFILE%",
-    "useAcrylic": false
+    "name" : "Far",
+    "commandline" : "\"c:\\program files\\far manager\\far.exe\"",
+    "startingDirectory" : "%USERPROFILE%",
+    "useAcrylic" : false
 },
 ```
 
 ## Git Bash
 
-Assuming that you've installed Git Bash into `C:\\Program Files\\Git`:
+Assuming that you've installed Git Bash into `C:/Program Files/Git`:
 
 ```json
 {
-    "name": "Git Bash",
-    "commandline": "C:\\Program Files\\Git\\bin\\bash.exe -li",
-    "icon": "C:\\Program Files\\Git\\mingw64\\share\\git\\git-for-windows.ico",
-    "startingDirectory": "%USERPROFILE%"
+    "name" : "Git Bash",
+    "commandline" : "C:/Program Files/Git/bin/bash.exe -li",
+    "icon" : "C:/Program Files/Git/mingw64/share/git/git-for-windows.ico",
+    "startingDirectory" : "%USERPROFILE%"
 }
 ````
 
 ## Git Bash (WOW64)
 
-Assuming that you've installed Git Bash into `C:\\Program Files (x86)\\Git`:
+Assuming that you've installed Git Bash into `C:/Program Files (x86)/Git`:
 
 ```json
 {
-    "name": "Git Bash",
-    "commandline": "%ProgramFiles(x86)%\\Git\\bin\\bash.exe -li",
-    "icon": "%ProgramFiles(x86)%\\Git\\mingw32\\share\\git\\git-for-windows.ico",
-    "startingDirectory": "%USERPROFILE%"
+    "name" : "Git Bash",
+    "commandline" : "%ProgramFiles(x86)%/Git/bin/bash.exe -li",
+    "icon" : "%ProgramFiles(x86)%/Git/mingw32/share/git/git-for-windows.ico",
+    "startingDirectory" : "%USERPROFILE%"
 }
 ```
 
 ## MSYS2
 
-Assuming that you've installed MSYS2 into `C:\\msys64`:
+Assuming that you've installed MSYS2 into `C:/msys64`:
 
 ```json
 {
-    "name": "MSYS2",
-    "commandline": "C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64",
-    "icon": "C:\\msys64\\msys2.ico",
-    "startingDirectory": "C:\\msys64\\home\\user"
+    "name" : "MSYS2",
+    "commandline" : "C:/msys64/msys2_shell.cmd -defterm -no-start -mingw64",
+    "icon": "C:/msys64/msys2.ico",
+    "startingDirectory" : "C:/msys64/home/user"
 }
 ````
 
@@ -104,9 +110,9 @@ Assuming that you've installed VS 2019 Professional:
 
 ```json
 {
-    "name": "Developer Command Prompt for VS 2019",
-    "commandline": "cmd.exe /k \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/Tools/VsDevCmd.bat\"",
-    "startingDirectory": "%USERPROFILE%"
+    "name" : "Developer Command Prompt for VS 2019",
+    "commandline" : "cmd.exe /k \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/Tools/VsDevCmd.bat\"",
+    "startingDirectory" : "%USERPROFILE%"
 }
 ```
 

doc/user-docs/UsingCommandlineArguments.md

@@ -1 +1,201 @@
-⚠ This document has moved to [Using command-line arguments for Windows Terminal](https://docs.microsoft.com/windows/terminal/command-line-arguments).
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-01-16
+last updated: 2020-01-17
+---
+
+# Using the `wt.exe` Commandline
+
+As of [#4023], the Windows Terminal now supports accepting arguments on the
+commandline, to enable launching the Terminal in a non-default configuration.
+This document serves as a reference for all the parameters you can currently
+pass, and gives some examples of how to use the `wt` commandline.
+
+> NOTE: If you're running the Terminal built straight from the repo, you'll need
+> to use `wtd.exe` and `wtd` instead of `wt.exe` and `wt`.
+
+1. [Commandline Reference](#Reference)
+1. [Commandline Examples](#Examples)
+
+## Reference
+
+### Options
+
+#### `--help,-h,-?,/?,`
+
+Display the help message.
+
+## Subcommands
+
+#### `new-tab`
+
+`new-tab [terminal_parameters]`
+
+Opens a new tab with the given customizations. On its _first_ invocation, also
+opens a new window. Subsequent `new-tab` commands will all open new tabs in the
+same window. <sup>[[1](#footnote-1)]</sup>
+
+**Parameters**:
+
+* `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).
+
+#### `split-pane`
+
+`split-pane [-H,--horizontal|-V,--vertical] [terminal_parameters]`
+
+Creates a new pane in the currently focused tab by splitting the given pane
+vertically or horizontally. <sup>[[1](#footnote-1)]</sup>
+
+**Parameters**:
+
+* `-H,--horizontal`, `-V,--vertical`: Used to indicate which direction to split
+  the pane. `-V` is "vertically" (think `[|]`), and `-H` is "horizontally"
+  (think `[-]`). If omitted, defaults to "auto", which splits the current pane
+  in whatever the larger dimension is. If both `-H` and `-V` are provided,
+  defaults to vertical.
+* `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).
+
+#### `focus-tab`
+
+`focus-tab [--target,-t tab-index]|[--next,-n]|[--previous,-p]`
+
+Moves focus to a given tab.
+
+**Parameters**:
+
+* `--target,-t tab-index`: moves focus to the tab at index `tab-index`. If
+  omitted, defaults to `0` (the first tab). Will display an error if combined
+  with either of `--next` or `--previous`.
+* `-n,--next`: Move focus to the next tab. Will display an error if combined
+  with either of `--previous` or `--target`.
+* `-p,--previous`: Move focus to the previous tab. Will display an error if
+  combined with either of `--next` or `--target`.
+
+#### `[terminal_parameters]`
+
+Some of the preceding commands are used to create a new terminal instance.
+These commands are listed above as accepting `[terminal_parameters]` as a
+parameter. For these commands, `[terminal_parameters]` can be any of the
+following:
+
+`[--profile,-p profile-name] [--startingDirectory,-d starting-directory] [commandline]`
+
+* `--profile,-p profile-name`: Use the given profile to open the new tab/pane,
+  where `profile-name` is the `name` or `guid` of a profile. If `profile-name`
+  does not match _any_ profiles, uses the default.
+* `--startingDirectory,-d starting-directory`: Overrides the value of
+  `startingDirectory` of the specified profile, to start in `starting-directory`
+  instead.
+* `commandline`: A commandline to replace the default commandline of the
+  selected profile. If the user wants to use a `;` in this commandline, it
+  should be escaped as `\;`.
+
+### Notes
+
+* <span id="footnote-1"></span> [1]: If you try to run a `wt` commandline while running in a Windows Terminal window, the commandline will _always_ create a new window by default. Being able to run `wt` commandlines in the _current_ window is planned in the future - for more information, refer to [#4472].
+
+## Examples
+
+### Open Windows Terminal in the current directory
+
+```powershell
+wt -d .
+```
+
+This will launch a new Windows Terminal window in the current working directory.
+It will use your default profile, but instead of using the `startingDirectory`
+property from that it will use the current path. This is especially useful for
+launching the Windows Terminal in a directory you currently have open in an
+`explorer.exe` window.
+
+### Opening with multiple panes
+
+If you want to open with multiple panes in the same tab all at once, you can use
+the `split-pane` command to create new panes.
+
+Consider the following commandline:
+
+```powershell
+wt ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
+```
+
+This creates a new Windows Terminal window with one tab, and 3 panes:
+
+* `wt`: Creates the new tab with the default profile
+* `split-pane -p "Windows PowerShell"`: This will create a new pane, split from
+  the parent with the default profile. This pane will open with the "Windows
+  PowerShell" profile
+* `split-pane -H wsl.exe`: This will create a third pane, split _horizontally_
+  from the "Windows PowerShell" pane. It will be running the default profile,
+  and will use `wsl.exe` as the commandline (instead of the default profile's
+  `commandline`).
+
+
+### Using multiple commands from PowerShell
+
+The Windows Terminal uses the semicolon character `;` as a delimiter for
+separating subcommands in the `wt` commandline. Unfortunately, `powershell` also
+uses `;` as a command separator. To work around this you can use the following
+tricks to help run multiple wt sub commands from powershell. In all the
+following examples, we'll be creating a new Terminal window with three panes -
+one running `cmd`, one with `powershell`, and a last one running `wsl`.
+
+In each of the following examples, we're using the `Start-Process` command to
+run `wt`. For more information on why we're using `Start-Process`, see ["Using
+`start`"](#using-start) below.
+
+#### Single quoted parameters (if you aren't calculating anything):
+
+In this example, we'll wrap all the parameters to `wt` in single quotes (`'`)
+
+```PowerShell
+start wt 'new-tab "cmd"; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe'
+```
+
+#### Escaped quotes (if you need variables):
+
+If you'd like to pass a value contained in a variable to the `wt` commandline,
+instead use the following syntax:
+
+```PowerShell
+$ThirdPane = "wsl.exe"
+start wt "new-tab cmd; split-pane -p `"Windows PowerShell`" ; split-pane -H $ThirdPane"
+```
+
+Note the usage of  `` ` `` to escape the double-quotes (`"`) around "Windows
+Powershell" in the `-p` parameter to the `split-pane` sub-command.
+
+#### Using `start`
+
+All the above examples explicitly used `start` to launch the Terminal.
+
+In the following examples, we're going to not use `start` to run the
+commandline. Instead, we'll try two other methods of escaping the commandline:
+* Only escaping the semicolons so that `powershell` will ignore them and pass
+  them straight to `wt`.
+* Using `--%`, so powershell will treat the rest of the commandline as arguments
+  to the application.
+
+```PowerShell
+wt new-tab "cmd" `; split-pane -p "Windows PowerShell" `; split-pane -H wsl.exe
+```
+
+```Powershell
+wt --% new-tab cmd ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
+```
+
+In both these examples, the newly created Windows Terminal window will create
+the window by correctly parsing all the provided commandline arguments.
+
+However, these methods are _not_ recommended currently, as Powershell will wait
+for the newly-created Terminal window to be closed before returning control to
+Powershell. By default, Powershell will always wait for Windows Store
+applications (like the Windows Terminal) to close before returning to the
+prompt. Note that this is different than the behavior of `cmd`, which will return
+to the prompt immediately. See
+[Powershell/PowerShell#9970](https://github.com/PowerShell/PowerShell/issues/9970)
+for more details on this bug.
+
+
+[#4023]: https://github.com/microsoft/terminal/pull/4023
+[#4472]: https://github.com/microsoft/terminal/issues/4472

doc/user-docs/UsingJsonSettings.md

@@ -1 +1,483 @@
-⚠ This document has moved to [the Customize Settings section of the Windows Terminal documentation](https://docs.microsoft.com/windows/terminal/customize-settings/global-settings).
+# Editing Windows Terminal JSON Settings
+
+One way (currently the only way) to configure Windows Terminal is by editing the
+`settings.json` settings file. At the time of writing you can open the settings
+file in your default editor by selecting `Settings` from the WT pull down menu.
+
+The settings are stored in the file `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json`.
+
+As of [#2515](https://github.com/microsoft/terminal/pull/2515), the settings are
+split into _two_ files: a hardcoded `defaults.json`, and `settings.json`, which
+contains the user settings. Users should only be concerned with the contents of
+the `settings.json`, which contains their customizations. The `defaults.json`
+file is only provided as a reference of what the default settings are. For more
+details on how these two files work, see [Settings
+Layering](#settings-layering). To view the default settings file, click on the
+"Settings" button while holding the <kbd>Alt</kbd> key.
+
+Details of specific settings can be found [here](../cascadia/SettingsSchema.md).
+A general introduction is provided below.
+
+The settings are grouped under four headings:
+
+1. Global: Settings that apply to the whole application e.g. Default profile, initial size etc.
+2. Key Bindings: Actually a sub field of the global settings, but worth discussing separately
+3. Profiles: A group of settings to be applied to a tab when it is opened using that profile. E.g. shell to use, cursor shape etc.
+4. Schemes: Sets of colors for background, text etc. that can be used by profiles
+
+## Global Settings
+
+These settings define startup defaults, and application-wide settings that might
+not affect a particular terminal instance.
+
+* Theme
+* Title Bar options
+* Initial size
+* Default profile used when the Windows Terminal is started
+
+Example settings include
+
+```json
+{
+    "defaultProfile" : "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}",
+    "initialCols" : 120,
+    "initialRows" : 50,
+    "theme" : "system",
+    "keybindings" : []
+    ...
+}
+```
+
+These global properties should exist in the root json object.
+
+## Key Bindings
+
+This is an array of key chords and shortcuts to invoke various commands.
+Each command can have more than one key binding.
+
+> 👉 **Note**: Key bindings is a subfield of the global settings and
+> key bindings apply to all profiles in the same manner.
+
+For example, here's a sample of the default keybindings:
+
+```json
+{
+    "keybindings":
+    [
+        { "command": "closePane", "keys": ["ctrl+shift+w"] },
+        { "command": "copy", "keys": ["ctrl+shift+c"] },
+        { "command": "newTab", "keys": ["ctrl+shift+t"] },
+        // etc.
+    ]
+}
+```
+
+You can also use a single key chord string as the value of `"keys"`.
+It will be treated as a chord of length one.
+This will allow you to simplify the above snippet as follows:
+
+```json
+{
+    "keybindings":
+    [
+        { "command": "closePane", "keys": "ctrl+shift+w" },
+        { "command": "copy", "keys": "ctrl+shift+c" },
+        { "command": "newTab", "keys": "ctrl+shift+t" },
+        // etc.
+    ]
+}
+```
+
+A list of default key bindings is available [here](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/defaults.json#L204).
+
+### Unbinding keys
+
+If you ever come across a key binding that you're unhappy with, it's possible to
+easily change the keybindings. For example, vim uses <kbd>Ctrl+^</kbd> as a
+binding for "switch to previous buffer", which conflicts with the Terminal's
+default keybinding for "open a new tab with the sixth profile". If you'd like to
+unbind that keybinding, and allow the keystroke to fall through to vim, you can
+add the following to your keybindings:
+
+```json
+{
+    "command" : null, "keys" : ["ctrl+shift+6"]
+},
+```
+
+This will _unbind_ <kbd>Ctrl+Shift+6</kbd>, allowing vim to use the keystroke
+instead of the terminal.
+
+### Binding multiple keys
+
+You can have multiple key chords bound to the same action. To do this, simply
+add multiple bindings for the same action. For example:
+
+```json
+    "keybindings" :
+    [
+        { "command": "copy", "keys": "ctrl+shift+c" },
+        { "command": "copy", "keys": "ctrl+c" },
+        { "command": "copy", "keys": "enter" }
+    ]
+```
+
+In this snippet, all three of <kbd>ctrl+shift+c</kbd>, <kbd>ctrl+c</kbd> and <kbd>enter</kbd> are bound to `copy`.
+
+## Profiles
+
+A profile contains the settings applied when a new WT tab is opened. Each
+profile is identified by a GUID and contains a number of other fields.
+
+> 👉 **Note**: The `guid` property is the unique identifier for a profile. If
+> multiple profiles all have the same `guid` value, you may see unexpected
+> behavior.
+
+* Which command to execute on startup - this can include arguments.
+* Starting directory
+* Which color scheme to use (see Schemes below)
+* Font face and size
+* Various settings to control appearance. E.g. Opacity, icon, cursor appearance, display name etc.
+* Other behavioral settings. E.g. Close on exit, snap on input, .....
+
+Example settings include
+
+```json
+    "closeOnExit" : true,
+    "colorScheme" : "Campbell",
+    "commandline" : "wsl.exe -d Debian",
+    "cursorColor" : "#FFFFFF",
+    "cursorShape" : "bar",
+    "fontFace" : "Hack",
+    "fontSize" : 9,
+    "guid" : "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}",
+    "name" : "Debian",
+    "startingDirectory" : "%USERPROFILE%\\wslhome"
+    ....
+```
+
+> 👉 **Note**: To use backslashes in any path field, you'll need to escape them following JSON escaping rules (like shown above). As an alternative, you can use forward slashes ("%USERPROFILE%/wslhome").
+
+The profile GUID is used to reference the default profile in the global settings.
+
+The values for background image stretch mode are documented [here](https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.stretch).
+
+### Hiding a profile
+
+If you want to remove a profile from the list of profiles in the new tab
+dropdown, but keep the profile around in your `settings.json` file, you can add
+the property `"hidden": true` to the profile's json. This can also be used to
+remove the default `cmd` and PowerShell profiles, if the user does not wish to
+see them.
+
+## Color Schemes
+
+Each scheme defines the color values to be used for various terminal escape sequences.
+Each schema is identified by the name field. Examples include
+
+```json
+    "name" : "Campbell",
+    "background" : "#0C0C0C",
+    "black" : "#0C0C0C",
+    "blue" : "#0037DA",
+    "foreground" : "#F2F2F2",
+    "green" : "#13A10E",
+    "red" : "#C50F1F",
+    "white" : "#CCCCCC",
+    "yellow" : "#C19C00"
+    ...
+```
+
+The schema name can then be referenced in one or more profiles.
+
+## Settings layering
+
+The runtime settings are actually constructed from _three_ sources:
+
+* The default settings, which are hardcoded into the application, and available
+  in `defaults.json`. This includes the default keybindings, color schemes, and
+  profiles for both Windows PowerShell and Command Prompt (`cmd.exe`).
+* Dynamic Profiles, which are generated at runtime. These include Powershell
+  Core, the Azure Cloud Shell connector, and profiles for and WSL distros.
+* The user settings from `settings.json`.
+
+Settings from each of these sources are "layered" upon the settings from
+previous sources. In this manner, the user settings in `settings.json` can
+contain _only the changes from the default settings_. For example, if a user
+would like to only change the color scheme of the default `cmd` profile to
+"Solarized Dark", you could change your cmd profile to the following:
+
+```js
+        {
+            // Make changes here to the cmd.exe profile
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "colorScheme": "Solarized Dark"
+        }
+```
+
+Here, we know we're changing the `cmd` profile, because the `guid`
+`"{0caa0dad-35be-5f56-a8ff-afceeeaa6101}"` is `cmd`'s unique GUID. Any profiles
+with that GUID will all be treated as the same object. Any changes in that
+profile will overwrite those from the defaults.
+
+Similarly, you can overwrite settings from a color scheme by defining a color
+scheme in `settings.json` with the same name as a default color scheme.
+
+If you'd like to unbind a keystroke that's bound to an action in the default
+keybindings, you can set the `"command"` to `"unbound"` or `null`. This will
+allow the keystroke to fallthrough to the commandline application instead of
+performing the default action.
+
+### Dynamic Profiles
+
+When dynamic profiles are created at runtime, they'll be added to the
+`settings.json` file. You can identify these profiles by the presence of a
+`"source"` property. These profiles are tied to their source - if you uninstall
+a linux distro, then the profile will remain in your `settings.json` file, but
+the profile will be hidden.
+
+The Windows Terminal uses the `guid` property of these dynamically-generated
+profiles to uniquely identify them. If you try to change the `guid` of a
+dynamically-generated profile, the Terminal will automatically recreate a new
+entry for that profile.
+
+If you'd like to disable a particular dynamic profile source, you can add that
+`source` to the global `"disabledProfileSources"` array. For example, if you'd
+like to hide all the WSL profiles, you could add the following setting:
+
+```json
+
+    "disabledProfileSources": ["Windows.Terminal.WSL"],
+    ...
+
+```
+
+> 👉 **NOTE**: On launch, if a dynamic profile generator is enabled, it will
+> always add new profiles it detects to your list of profiles. If you delete a
+> dynamically generated profile from your list of profiles, it will just get
+> re-added the next time the Terminal is launched! To remove a dynamic profile
+> from your list of profiles, make sure to set `"hidden": true` in the profile.
+
+### Default settings
+
+In [#2325](https://github.com/microsoft/terminal/issues/2325), we introduced the
+concept of "Default Profile Settings". These are settings that will apply to all
+of your profiles by default. Profiles can still override these settings
+individually. With default profile settings, you can easily make changes to all
+your profiles at once. For example, given the following settings:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles":
+    [
+        {
+            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+            "name": "Windows PowerShell",
+            "commandline": "powershell.exe",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "cmd",
+            "commandline": "cmd.exe",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        {
+            "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+            "name" : "cmder",
+            "startingDirectory" : "%USERPROFILE%",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        }
+    ],
+```
+
+All three of these profiles are using "Cascadia Code" as their `"fontFace"`, and
+14 as their `fontSize`. With default profile settings, you can easily set these
+properties for all your profiles, like so:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles": {
+        "defaults":
+        {
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        "list": [
+            {
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe"
+            },
+            {
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "cmd",
+                "commandline": "cmd.exe"
+            },
+            {
+                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+                "name" : "cmder",
+                "startingDirectory" : "%USERPROFILE%"
+            }
+        ]
+    },
+```
+
+Note that the `profiles` property has changed in this example from a _list_ of
+profiles, to an _object_ with two properties:
+
+* a `list` that contains the list of all the profiles
+* the new `defaults` object, which contains all the settings that should apply to
+  every profile.
+
+What if I wanted a profile to have a different value for a property other than
+the default? Simply set the property in the profile's entry to override the
+value from `defaults`. Let's say you want the `cmd` profile to have _"Consolas"_
+as the font, but the rest of your profiles to still have _"Cascadia Code"_. You
+could achieve that with the following:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles": {
+        "defaults":
+        {
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        "list": [
+            {
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe"
+            },
+            {
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "cmd",
+                "commandline": "cmd.exe",
+                "fontFace": "Consolas"
+            },
+            {
+                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+                "name" : "cmder",
+                "startingDirectory" : "%USERPROFILE%"
+            }
+        ]
+    },
+```
+
+In the above settings, the `"fontFace"` in the `cmd.exe` profile overrides the
+`"fontFace"` from the `defaults`.
+
+## Configuration Examples
+
+### Add a custom background to the WSL Debian terminal profile
+
+1. Download the [Debian JPG logo](https://www.debian.org/logos/openlogo-100.jpg)
+2. Put the image in the
+ `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_<randomString>\LocalState\`
+ directory (same directory as your `settings.json` file).
+
+    __NOTE__:  You can put the image anywhere you like, the above suggestion happens to be convenient.
+3. Open your WT json properties file.
+4. Under the Debian Linux profile, add the following fields:
+
+```json
+    "backgroundImage": "ms-appdata:///Local/openlogo-100.jpg",
+    "backgroundImageOpacity": 1,
+    "backgroundImageStretchMode" : "none",
+    "backgroundImageAlignment" : "topRight",
+```
+
+5. Make sure that `useAcrylic` is `false`.
+6. Save the file.
+7. Jump over to WT and verify your changes.
+
+Notes:
+
+1. You will need to experiment with different color settings
+and schemes to make your terminal text visible on top of your image
+2. If you store the image in the UWP directory (the same directory as your settings.json file),
+then you should use the URI style path name given in the above example.
+More information about UWP URI schemes [here](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes).
+3. Instead of using a UWP URI you can use a:
+    1. URL such as
+`http://open.esa.int/files/2017/03/Mayer_and_Bond_craters_seen_by_SMART-1-350x346.jpg`
+    2. Local file location such as `C:\Users\Public\Pictures\openlogo.jpg`
+
+### Adding Copy and Paste Keybindings
+
+As of [#1093](https://github.com/microsoft/terminal/pull/1093) (first available
+in Windows Terminal v0.3), the Windows Terminal now supports copy and paste
+keyboard shortcuts. However, if you installed and ran the terminal before that,
+you won't automatically get the new keybindings added to your settings. If you'd
+like to add shortcuts for copy and paste, you can do so by inserting the
+following objects into your `globals.keybindings` array:
+
+```json
+{ "command": "copy", "keys": ["ctrl+shift+c"] },
+{ "command": "paste", "keys": ["ctrl+shift+v"] }
+```
+
+> 👉 **Note**: you can also add a keybinding for the `copy` command with the argument `"trimWhitespace": true`. This removes newlines as the text is copied to your clipboard.
+
+This will add copy and paste on <kbd>ctrl+shift+c</kbd>
+and <kbd>ctrl+shift+v</kbd> respectively.
+
+You can set the keybindings to whatever you'd like. If you prefer
+<kbd>ctrl+c</kbd> to copy, then set the `keys` to `"ctrl+c"`.
+
+You can even set multiple keybindings for a single action if you'd like. For example:
+
+```json
+
+            {
+                "command" : "paste",
+                "keys" :
+                [
+                    "ctrl+shift+v"
+                ]
+            },
+            {
+                "command" : "paste",
+                "keys" :
+                [
+                    "shift+insert"
+                ]
+            }
+```
+
+will bind both <kbd>ctrl+shift+v</kbd> and
+<kbd>shift+Insert</kbd> to `paste`.
+
+> 👉 **Note**: If you set your copy keybinding to `"ctrl+c"`, you'll only be able to send
+an interrupt to the commandline application using <kbd>Ctrl+C</kbd> when there's
+no text selection. Additionally, if you set `paste` to `"ctrl+v"`, commandline
+applications won't be able to read a ctrl+v from the input. For these reasons,
+we suggest `"ctrl+shift+c"` and `"ctrl+shift+v"`
+
+### Setting the `startingDirectory` of WSL Profiles to `~`
+
+By default, the `startingDirectory` of a profile is `%USERPROFILE%`
+(`C:\Users\<YourUsername>`). This is a Windows path. However, for WSL, you might
+want to use the WSL home path instead. At the time of writing (26decf1 / Nov.
+1st, 2019), `startingDirectory` only accepts a Windows-style path, so setting it
+to start within the WSL distro can be a little tricky.
+
+Fortunately, with Windows 1903, the filesystems of WSL distros can easily be
+addressed using the `\\wsl$\` prefix. For any WSL distro whose name is
+`DistroName`, you can use `\\wsl$\DistroName` as a Windows path that points to
+the root of that distro's filesystem.
+
+For example, the following works as a profile to launch the "Ubuntu-18.04"
+distro in it's home path:
+
+```json
+{
+    "name": "Ubuntu-18.04",
+    "commandline" : "wsl -d Ubuntu-18.04",
+    "startingDirectory" : "//wsl$/Ubuntu-18.04/home/<Your Ubuntu Username>",
+}
+```

doc/user-docs/index.md

@@ -1 +1,91 @@
-⚠ Our user-facing documentation has moved to the [Windows Terminal documentation page](https://docs.microsoft.com/windows/terminal/).
+# Windows Terminal User Documentation
+
+NOTE: At the time of writing Windows Terminal is still under active development and many things will
+change. If you notice an error in the docs, please raise an issue. Or better yet, please file a PR with an appropriate update!
+
+## Installing Windows Terminal
+
+### From Source Code
+
+To compile Windows Terminal yourself using the source code, follow the instructions in the [README](/README.md#developer-guidance).
+
+### From the Microsoft Store
+
+1. Make sure you have upgraded to the current Windows 10 release (at least build `1903`). To determine your build number, see [winver](https://docs.microsoft.com/en-us/windows/client-management/windows-version-search).
+2. Open the Windows Terminal listing in the [Microsoft Store](https://aka.ms/install-terminal).
+3. Review the minimum system requirements to confirm you can successfully install Windows Terminal.
+4. Click `Get` to begin the installation process.
+
+## Starting Windows Terminal
+
+1. Locate the _Windows Terminal_ app in your Start menu.
+2. Click _Windows Terminal_ to launch the app. If you need administrative privileges, right-click the entry and click `Run as administrator`. Alternatively, you can highlight the app and press `Ctrl`+`Shift`+`Enter`.
+
+NOTE: The default shell is PowerShell; you can change this using the _Running a Different Shell_ procedure.
+
+### Command line options
+
+Windows Terminal has implemented a rich set of command-line options in part as response to issue [#607](https://github.com/microsoft/terminal/issues/607).  See [UsingCommandlineArguments.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingCommandlineArguments.md) for details.
+
+## Multiple Tabs
+
+Additional shells can be started by hitting the `+` button from the tab bar -- a new instance of the
+default shell is displayed (default shortcut: <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>1</kbd>).
+
+## Running a Different Shell
+
+Note: This section assumes you already have _Windows Subsystem for Linux_ (WSL) installed. For more information, see [the installation guide](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
+
+Windows Terminal uses PowerShell as its default shell. You can also use Windows Terminal to launch other shells, such as `cmd.exe` or WSL's `bash`:
+
+1. In the tab bar, click the `⌵` button to view the available shells.
+2. Choose your shell from the dropdown list. The new shell session will open in a new tab.
+
+To customize the shell list, see the _Configuring Windows Terminal_ section below.
+
+## Starting a new PowerShell tab with admin privilege
+
+There is no current plan to support this feature for security reasons. See issue [#632](https://github.com/microsoft/terminal/issues/632)
+
+## Selecting and Copying Text in Windows Terminal
+
+As in ConHost, a selection can be made by left-clicking and dragging the mouse across the terminal. This is a line selection by default, meaning that the selection will wrap to the end of the line and the beginning of the next one. You can select in block mode by holding down the <kbd>Alt</kbd> key when starting a selection.
+
+To copy the text to your clipboard, you can right-click the terminal when a selection is active. As of [#1224](https://github.com/microsoft/terminal/pull/1224) (first available in Windows Terminal v0.4), the Windows Terminal now supports HTML copy. The HTML is automatically copied to your clipboard along with the regular text in any copy operation.
+
+If there is not an active selection, a right-click will paste the text content from your clipboard to the terminal.
+
+Copy and paste operations can also be keybound. For more information on how to bind keys, see [Using Json Settings](UsingJsonSettings.md#adding-copy-and-paste-keybindings).
+
+> 👉 **Note**: If you have the `copyOnSelect` global setting enabled, a selection will persist and immediately copy the selected text to your clipboard. Right-clicking will always paste your clipboard data.
+
+## Add a "Open Windows Terminal Here" to File Explorer
+
+Not currently supported "out of the box" (See issue [#1060](https://github.com/microsoft/terminal/issues/1060)). However, you can open Windows Terminal in current directory by typing `wt -d .` in the Explorer address bar.
+
+## Configuring Windows Terminal
+
+All Windows Terminal settings are currently managed using the `settings.json` file, located within `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState`.
+
+To open the settings file from Windows Terminal:
+
+1. Click the `⌵` button in the top bar.
+2. From the dropdown list, click `Settings`. You can also use a shortcut: <kbd>Ctrl</kbd>+<kbd>,</kbd>.
+3. Your default `json` editor will open the settings file.
+
+For an introduction to the various settings, see [Using Json Settings](UsingJsonSettings.md). The list of valid settings can be found in the [settings.json documentation](../cascadia/SettingsSchema.md) section.
+
+## Tips and Tricks
+
+1. In PowerShell you can discover if the Windows Terminal is being used by checking for the existence of the environment variable `WT_SESSION`.
+
+    Under pwsh you can also use
+`(Get-Process -Id $pid).Parent.ProcessName -eq 'WindowsTerminal'`
+
+    (ref [https://twitter.com/r_keith_hill/status/1142871145852440576](https://twitter.com/r_keith_hill/status/1142871145852440576))
+
+2. Terminal zoom can be changed by holding <kbd>Ctrl</kbd> and scrolling with mouse.
+3. Background opacity can be changed by holding <kbd>Ctrl</kbd>+<kbd>Shift</kbd> and scrolling with mouse. Note that acrylic transparency is limited by the OS only to focused windows.
+4. Open Windows Terminal in current directory by typing `wt -d .` in the address bar.
+5. Pin the Windows Terminal to the taskbar. Now it can be launched using the Windows shortcut <kbd>Win</kbd>+<kbd>Number</kbd> (e.g. <kbd>Win</kbd>+<kbd>1</kbd> or any other number based on the position in the taskbar!). Press <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>Number</kbd> to always launch a new window.
+6. Please add more Tips and Tricks.

oss/xorg_apps_rgb/MAINTAINER_README.md

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

oss/xorg_apps_rgb/cgmanifest.json

@@ -1,13 +0,0 @@
-{"Registrations":[ 
-    {
-      "component": { 
-       "type": "git", 
-       "git": { 
-         "repositoryUrl": "https://gitlab.freedesktop.org/xorg/app/rgb.git", 
-         "commitHash": "97820e748eb496a1f6d3fc3bf89688f0ce1f64f9" 
-         }
-       }
-    }
- ],
- "Version": 1
-}

src/buffer/out/AttrRow.cpp

@@ -175,23 +175,6 @@ size_t ATTR_ROW::FindAttrIndex(const size_t index, size_t* const pApplies) const
     return runPos - _list.cbegin();
 }
 
-// Routine Description:
-// - Finds the hyperlink IDs present in this row and returns them
-// Return value:
-// - An unordered set containing the hyperlink IDs present in this row
-std::unordered_set<uint16_t> ATTR_ROW::GetHyperlinks()
-{
-    std::unordered_set<uint16_t> ids;
-    for (const auto& run : _list)
-    {
-        if (run.GetAttributes().IsHyperlink())
-        {
-            ids.emplace(run.GetAttributes().GetHyperlinkId());
-        }
-    }
-    return ids;
-}
-
 // Routine Description:
 // - Sets the attributes (colors) of all character positions from the given position through the end of the row.
 // Arguments:

src/buffer/out/AttrRow.hpp

@@ -41,8 +41,6 @@ public:
     size_t FindAttrIndex(const size_t index,
                          size_t* const pApplies) const;
 
-    std::unordered_set<uint16_t> GetHyperlinks();
-
     bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
     void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith) noexcept;
 

src/buffer/out/TextAttribute.cpp

@@ -88,18 +88,16 @@ bool TextAttribute::IsLegacy() const noexcept
 // - defaultFgColor: the default foreground color rgb value.
 // - defaultBgColor: the default background color rgb value.
 // - reverseScreenMode: true if the screen mode is reversed.
-// - blinkingIsFaint: true if blinking should be interpreted as faint.
 // Return Value:
 // - the foreground and background colors that should be displayed.
 std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                                 const COLORREF defaultFgColor,
                                                                 const COLORREF defaultBgColor,
-                                                                const bool reverseScreenMode,
-                                                                const bool blinkingIsFaint) const noexcept
+                                                                const bool reverseScreenMode) const noexcept
 {
     auto fg = _foreground.GetColor(colorTable, defaultFgColor, IsBold());
     auto bg = _background.GetColor(colorTable, defaultBgColor);
-    if (IsFaint() || (IsBlinking() && blinkingIsFaint))
+    if (IsFaint())
     {
         fg = (fg >> 1) & 0x7F7F7F; // Divide foreground color components by two.
     }
@@ -114,17 +112,6 @@ std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<
     return { fg, bg };
 }
 
-// Method description:
-// - Tells us whether the text is a hyperlink or not
-// Return value:
-// - True if it is a hyperlink, false otherwise
-bool TextAttribute::IsHyperlink() const noexcept
-{
-    // All non-hyperlink text have a default hyperlinkId of 0 while
-    // all hyperlink text have a non-zero hyperlinkId
-    return _hyperlinkId != 0;
-}
-
 TextColor TextAttribute::GetForeground() const noexcept
 {
     return _foreground;
@@ -135,15 +122,6 @@ TextColor TextAttribute::GetBackground() const noexcept
     return _background;
 }
 
-// Method description:
-// - Retrieves the hyperlink ID of the text
-// Return value:
-// - The hyperlink ID
-uint16_t TextAttribute::GetHyperlinkId() const noexcept
-{
-    return _hyperlinkId;
-}
-
 void TextAttribute::SetForeground(const TextColor foreground) noexcept
 {
     _foreground = foreground;
@@ -196,15 +174,6 @@ void TextAttribute::SetColor(const COLORREF rgbColor, const bool fIsForeground)
     }
 }
 
-// Method description:
-// - Sets the hyperlink ID of the text
-// Arguments:
-// - id - the id we wish to set
-void TextAttribute::SetHyperlinkId(uint16_t id) noexcept
-{
-    _hyperlinkId = id;
-}
-
 bool TextAttribute::IsLeadingByte() const noexcept
 {
     return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_LEADING_BYTE);
@@ -367,14 +336,6 @@ void TextAttribute::SetDefaultBackground() noexcept
     _background = TextColor();
 }
 
-// Method description:
-// - Resets only the meta and extended attributes
-void TextAttribute::SetDefaultMetaAttrs() noexcept
-{
-    _extendedAttrs = ExtendedAttributes::Normal;
-    _wAttrLegacy = 0;
-}
-
 // Method Description:
 // - Returns true if this attribute indicates its background is the "default"
 //      background. Its _rgbBackground will contain the actual value of the
@@ -395,6 +356,6 @@ bool TextAttribute::BackgroundIsDefault() const noexcept
 //      requires for most erasing and filling operations.
 void TextAttribute::SetStandardErase() noexcept
 {
-    SetDefaultMetaAttrs();
-    _hyperlinkId = 0;
+    _extendedAttrs = ExtendedAttributes::Normal;
+    _wAttrLegacy = 0;
 }

src/buffer/out/TextAttribute.hpp

@@ -36,8 +36,7 @@ public:
         _wAttrLegacy{ 0 },
         _foreground{},
         _background{},
-        _extendedAttrs{ ExtendedAttributes::Normal },
-        _hyperlinkId{ 0 }
+        _extendedAttrs{ ExtendedAttributes::Normal }
     {
     }
 
@@ -45,8 +44,7 @@ public:
         _wAttrLegacy{ gsl::narrow_cast<WORD>(wLegacyAttr & META_ATTRS) },
         _foreground{ s_LegacyIndexOrDefault(wLegacyAttr & FG_ATTRS, s_legacyDefaultForeground) },
         _background{ s_LegacyIndexOrDefault((wLegacyAttr & BG_ATTRS) >> 4, s_legacyDefaultBackground) },
-        _extendedAttrs{ ExtendedAttributes::Normal },
-        _hyperlinkId{ 0 }
+        _extendedAttrs{ ExtendedAttributes::Normal }
     {
         // If we're given lead/trailing byte information with the legacy color, strip it.
         WI_ClearAllFlags(_wAttrLegacy, COMMON_LVB_SBCSDBCS);
@@ -57,8 +55,7 @@ public:
         _wAttrLegacy{ 0 },
         _foreground{ rgbForeground },
         _background{ rgbBackground },
-        _extendedAttrs{ ExtendedAttributes::Normal },
-        _hyperlinkId{ 0 }
+        _extendedAttrs{ ExtendedAttributes::Normal }
     {
     }
 
@@ -69,8 +66,7 @@ public:
     std::pair<COLORREF, COLORREF> CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                      const COLORREF defaultFgColor,
                                                      const COLORREF defaultBgColor,
-                                                     const bool reverseScreenMode = false,
-                                                     const bool blinkingIsFaint = false) const noexcept;
+                                                     const bool reverseScreenMode = false) const noexcept;
 
     bool IsLeadingByte() const noexcept;
     bool IsTrailingByte() const noexcept;
@@ -116,11 +112,8 @@ public:
 
     ExtendedAttributes GetExtendedAttributes() const noexcept;
 
-    bool IsHyperlink() const noexcept;
-
     TextColor GetForeground() const noexcept;
     TextColor GetBackground() const noexcept;
-    uint16_t GetHyperlinkId() const noexcept;
     void SetForeground(const TextColor foreground) noexcept;
     void SetBackground(const TextColor background) noexcept;
     void SetForeground(const COLORREF rgbForeground) noexcept;
@@ -130,11 +123,9 @@ public:
     void SetIndexedForeground256(const BYTE fgIndex) noexcept;
     void SetIndexedBackground256(const BYTE bgIndex) noexcept;
     void SetColor(const COLORREF rgbColor, const bool fIsForeground) noexcept;
-    void SetHyperlinkId(uint16_t id) noexcept;
 
     void SetDefaultForeground() noexcept;
     void SetDefaultBackground() noexcept;
-    void SetDefaultMetaAttrs() noexcept;
 
     bool BackgroundIsDefault() const noexcept;
 
@@ -152,14 +143,11 @@ public:
         return !IsAnyGridLineEnabled() && // grid lines have a visual representation
                // crossed out, doubly and singly underlined have a visual representation
                WI_AreAllFlagsClear(_extendedAttrs, ExtendedAttributes::CrossedOut | ExtendedAttributes::DoublyUnderlined | ExtendedAttributes::Underlined) &&
-               // hyperlinks have a visual representation
-               !IsHyperlink() &&
                // all other attributes do not have a visual representation
                (_wAttrLegacy & META_ATTRS) == (other._wAttrLegacy & META_ATTRS) &&
                ((checkForeground && _foreground == other._foreground) ||
                 (!checkForeground && _background == other._background)) &&
-               _extendedAttrs == other._extendedAttrs &&
-               IsHyperlink() == other.IsHyperlink();
+               _extendedAttrs == other._extendedAttrs;
     }
 
     constexpr bool IsAnyGridLineEnabled() const noexcept
@@ -181,8 +169,6 @@ private:
     TextColor _background;
     ExtendedAttributes _extendedAttrs;
 
-    uint16_t _hyperlinkId;
-
 #ifdef UNIT_TESTING
     friend class TextBufferTests;
     friend class TextAttributeTests;
@@ -196,7 +182,7 @@ private:
 // 4 for _foreground
 // 4 for _background
 // 1 for _extendedAttrs
-static_assert(sizeof(TextAttribute) <= 13 * sizeof(BYTE), "We should only need 13B for an entire TextAttribute. We may need to increment this in the future as we add additional attributes");
+static_assert(sizeof(TextAttribute) <= 11 * sizeof(BYTE), "We should only need 11B for an entire TextColor. Any more than that is just waste");
 
 enum class TextAttributeBehavior
 {
@@ -210,8 +196,7 @@ constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexce
     return a._wAttrLegacy == b._wAttrLegacy &&
            a._foreground == b._foreground &&
            a._background == b._background &&
-           a._extendedAttrs == b._extendedAttrs &&
-           a._hyperlinkId == b._hyperlinkId;
+           a._extendedAttrs == b._extendedAttrs;
 }
 
 constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept

src/buffer/out/textBuffer.cpp

@@ -34,8 +34,7 @@ TextBuffer::TextBuffer(const COORD screenBufferSize,
     _storage{},
     _unicodeStorage{},
     _renderTarget{ renderTarget },
-    _size{},
-    _currentHyperlinkId{ 1 }
+    _size{}
 {
     // initialize ROWs
     for (size_t i = 0; i < static_cast<size_t>(screenBufferSize.Y); ++i)
@@ -552,10 +551,7 @@ bool TextBuffer::IncrementCircularBuffer(const bool inVtMode)
     // to the logical position 0 in the window (cursor coordinates and all other coordinates).
     _renderTarget.TriggerCircling();
 
-    // Prune hyperlinks to delete obsolete references
-    _PruneHyperlinks();
-
-    // Second, clean out the old "first row" as it will become the "last row" of the buffer after the circle is performed.
+    // First, clean out the old "first row" as it will become the "last row" of the buffer after the circle is performed.
     auto fillAttributes = _currentAttributes;
     if (inVtMode)
     {
@@ -996,29 +992,19 @@ const COORD TextBuffer::GetWordStart(const COORD target, const std::wstring_view
     //  so the words in the example include ["word   ", "other  "]
     // NOTE: the start anchor (this one) is inclusive, whereas the end anchor (GetWordEnd) is exclusive
 
-#pragma warning(suppress : 26496)
-    // GH#7664: Treat EndExclusive as EndInclusive so
-    // that it actually points to a space in the buffer
-    auto copy{ target };
-    const auto bufferSize{ GetSize() };
-    if (target == bufferSize.Origin())
+    // can't expand left
+    if (target.X == GetSize().Left())
     {
-        // can't expand left
         return target;
     }
-    else if (target == bufferSize.EndExclusive())
-    {
-        // treat EndExclusive as EndInclusive
-        copy = { bufferSize.RightInclusive(), bufferSize.BottomInclusive() };
-    }
 
     if (accessibilityMode)
     {
-        return _GetWordStartForAccessibility(copy, wordDelimiters);
+        return _GetWordStartForAccessibility(target, wordDelimiters);
     }
     else
     {
-        return _GetWordStartForSelection(copy, wordDelimiters);
+        return _GetWordStartForSelection(target, wordDelimiters);
     }
 }
 
@@ -1118,16 +1104,9 @@ const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view w
     //  so the words in the example include ["word   ", "other  "]
     // NOTE: the end anchor (this one) is exclusive, whereas the start anchor (GetWordStart) is inclusive
 
-    // Already at the end. Can't move forward.
-    if (target == GetSize().EndExclusive())
-    {
-        return target;
-    }
-
     if (accessibilityMode)
     {
-        const auto lastCharPos{ GetLastNonSpaceCharacter() };
-        return _GetWordEndForAccessibility(target, wordDelimiters, lastCharPos);
+        return _GetWordEndForAccessibility(target, wordDelimiters);
     }
     else
     {
@@ -1140,20 +1119,13 @@ const COORD TextBuffer::GetWordEnd(const COORD target, const std::wstring_view w
 // Arguments:
 // - target - a COORD on the word you are currently on
 // - wordDelimiters - what characters are we considering for the separation of words
-// - lastCharPos - the position of the last nonspace character in the text buffer (to improve performance)
 // Return Value:
 // - The COORD for the first character of the next readable "word". If no next word, return one past the end of the buffer
-const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const
+const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const
 {
     const auto bufferSize = GetSize();
     COORD result = target;
 
-    // Check if we're already on/past the last RegularChar
-    if (bufferSize.CompareInBounds(result, lastCharPos, true) >= 0)
-    {
-        return bufferSize.EndExclusive();
-    }
-
     // ignore right boundary. Continue through readable text found
     while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
     {
@@ -1163,12 +1135,6 @@ const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const st
         }
     }
 
-    // we are already on/past the last RegularChar
-    if (bufferSize.CompareInBounds(result, lastCharPos, true) >= 0)
-    {
-        return bufferSize.EndExclusive();
-    }
-
     // make sure we expand to the beginning of the NEXT word
     while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
     {
@@ -1219,46 +1185,6 @@ const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::w
     return result;
 }
 
-void TextBuffer::_PruneHyperlinks()
-{
-    // Check the old first row for hyperlink references
-    // If there are any, search the entire buffer for the same reference
-    // If the buffer does not contain the same reference, we can remove that hyperlink from our map
-    // This way, obsolete hyperlink references are cleared from our hyperlink map instead of hanging around
-    // Get all the hyperlink references in the row we're erasing
-    auto firstRowRefs = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
-    if (!firstRowRefs.empty())
-    {
-        const auto total = TotalRowCount();
-        // Loop through all the rows in the buffer except the first row -
-        // we have found all hyperlink references in the first row and put them in refs,
-        // now we need to search the rest of the buffer (i.e. all the rows except the first)
-        // to see if those references are anywhere else
-        for (size_t i = 1; i != total; ++i)
-        {
-            const auto nextRowRefs = GetRowByOffset(i).GetAttrRow().GetHyperlinks();
-            for (auto id : nextRowRefs)
-            {
-                if (firstRowRefs.find(id) != firstRowRefs.end())
-                {
-                    firstRowRefs.erase(id);
-                }
-            }
-            if (firstRowRefs.empty())
-            {
-                // No more hyperlink references left to search for, terminate early
-                break;
-            }
-        }
-    }
-
-    // Now delete obsolete references from our map
-    for (auto hyperlinkReference : firstRowRefs)
-    {
-        RemoveHyperlinkFromMap(hyperlinkReference);
-    }
-}
-
 // Method Description:
 // - Update pos to be the position of the first character of the next word. This is used for accessibility
 // Arguments:
@@ -1270,16 +1196,38 @@ void TextBuffer::_PruneHyperlinks()
 // - pos - The COORD for the first character on the "word" (inclusive)
 bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, COORD lastCharPos) const
 {
-    // move to the beginning of the next word
-    // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
-    //       This is also the inclusive start of the next word.
-    auto copy{ _GetWordEndForAccessibility(pos, wordDelimiters, lastCharPos) };
+    auto copy = pos;
+    const auto bufferSize = GetSize();
 
-    if (copy == GetSize().EndExclusive())
+    // started on a word, continue until the end of the word
+    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
+    {
+        if (!bufferSize.IncrementInBounds(copy))
+        {
+            // last char in buffer is a RegularChar
+            // thus there is no next word
+            return false;
+        }
+    }
+
+    // we are already on/past the last RegularChar
+    if (bufferSize.CompareInBounds(copy, lastCharPos) >= 0)
     {
         return false;
     }
 
+    // on whitespace, continue until the beginning of the next word
+    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
+    {
+        if (!bufferSize.IncrementInBounds(copy))
+        {
+            // last char in buffer is a DelimiterChar or ControlChar
+            // there is no next word
+            return false;
+        }
+    }
+
+    // successful move, copy result out
     pos = copy;
     return true;
 }
@@ -1294,17 +1242,33 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
 // - pos - The COORD for the first character on the "word" (inclusive)
 bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters) const
 {
-    // move to the beginning of the current word
-    auto copy{ GetWordStart(pos, wordDelimiters, true) };
+    auto copy = pos;
+    auto bufferSize = GetSize();
 
-    if (!GetSize().DecrementInBounds(copy, true))
+    // started on whitespace/delimiter, continue until the end of the previous word
+    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
     {
-        // can't move behind current word
-        return false;
+        if (!bufferSize.DecrementInBounds(copy))
+        {
+            // first char in buffer is a DelimiterChar or ControlChar
+            // there is no previous word
+            return false;
+        }
     }
 
-    // move to the beginning of the previous word
-    pos = GetWordStart(copy, wordDelimiters, true);
+    // on a word, continue until the beginning of the word
+    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
+    {
+        if (!bufferSize.DecrementInBounds(copy))
+        {
+            // first char in buffer is a RegularChar
+            // there is no previous word
+            return false;
+        }
+    }
+
+    // successful move, copy result out
+    pos = copy;
     return true;
 }
 
@@ -1317,13 +1281,8 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
 const til::point TextBuffer::GetGlyphStart(const til::point pos) const
 {
     COORD resultPos = pos;
+
     const auto bufferSize = GetSize();
-
-    if (resultPos == bufferSize.EndExclusive())
-    {
-        bufferSize.DecrementInBounds(resultPos, true);
-    }
-
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
     {
         bufferSize.DecrementInBounds(resultPos, true);
@@ -1364,15 +1323,9 @@ const til::point TextBuffer::GetGlyphEnd(const til::point pos) const
 bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowBottomExclusive) const
 {
     COORD resultPos = pos;
-    const auto bufferSize = GetSize();
-
-    if (resultPos == GetSize().EndExclusive())
-    {
-        // we're already at the end
-        return false;
-    }
 
     // try to move. If we can't, we're done.
+    const auto bufferSize = GetSize();
     const bool success = bufferSize.IncrementInBounds(resultPos, allowBottomExclusive);
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
     {
@@ -1387,19 +1340,20 @@ bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowBottomExclusive) con
 // - Update pos to be the beginning of the previous glyph/character. This is used for accessibility
 // Arguments:
 // - pos - a COORD on the word you are currently on
+// - allowBottomExclusive - allow the nonexistent end-of-buffer cell to be encountered
 // Return Value:
 // - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
 // - pos - The COORD for the first cell of the previous glyph (inclusive)
-bool TextBuffer::MoveToPreviousGlyph(til::point& pos) const
+bool TextBuffer::MoveToPreviousGlyph(til::point& pos, bool allowBottomExclusive) const
 {
     COORD resultPos = pos;
 
     // try to move. If we can't, we're done.
     const auto bufferSize = GetSize();
-    const bool success = bufferSize.DecrementInBounds(resultPos, true);
+    const bool success = bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
     if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsLeading())
     {
-        bufferSize.DecrementInBounds(resultPos, true);
+        bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
     }
 
     pos = resultPos;
@@ -2188,7 +2142,6 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
     {
         // Finish copying remaining parameters from the old text buffer to the new one
         newBuffer.CopyProperties(oldBuffer);
-        newBuffer.CopyHyperlinkMaps(oldBuffer);
 
         // If we found where to put the cursor while placing characters into the buffer,
         //   just put the cursor there. Otherwise we have to advance manually.
@@ -2254,104 +2207,3 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
 
     return hr;
 }
-
-// Method Description:
-// - Adds or updates a hyperlink in our hyperlink table
-// Arguments:
-// - The hyperlink URI, the hyperlink id (could be new or old)
-void TextBuffer::AddHyperlinkToMap(std::wstring_view uri, uint16_t id)
-{
-    _hyperlinkMap[id] = uri;
-}
-
-// Method Description:
-// - Retrieves the URI associated with a particular hyperlink ID
-// Arguments:
-// - The hyperlink ID
-// Return Value:
-// - The URI
-std::wstring TextBuffer::GetHyperlinkUriFromId(uint16_t id) const
-{
-    return _hyperlinkMap.at(id);
-}
-
-// Method description:
-// - Provides the hyperlink ID to be assigned as a text attribute, based on the optional custom id provided
-// Arguments:
-// - The user-defined id
-// Return value:
-// - The internal hyperlink ID
-uint16_t TextBuffer::GetHyperlinkId(std::wstring_view params)
-{
-    uint16_t id = 0;
-    if (params.empty())
-    {
-        // no custom id specified, return our internal count
-        id = _currentHyperlinkId;
-        ++_currentHyperlinkId;
-    }
-    else
-    {
-        // assign _currentHyperlinkId if the custom id does not already exist
-        const auto result = _hyperlinkCustomIdMap.emplace(params, _currentHyperlinkId);
-        if (result.second)
-        {
-            // the custom id did not already exist
-            ++_currentHyperlinkId;
-        }
-        id = (*(result.first)).second;
-    }
-    // _currentHyperlinkId could overflow, make sure its not 0
-    if (_currentHyperlinkId == 0)
-    {
-        ++_currentHyperlinkId;
-    }
-    return id;
-}
-
-// Method Description:
-// - Removes a hyperlink from the hyperlink map and the associated
-//   user defined id from the custom id map (if there is one)
-// Arguments:
-// - The ID of the hyperlink to be removed
-void TextBuffer::RemoveHyperlinkFromMap(uint16_t id)
-{
-    _hyperlinkMap.erase(id);
-    for (const auto& customIdPair : _hyperlinkCustomIdMap)
-    {
-        if (customIdPair.second == id)
-        {
-            _hyperlinkCustomIdMap.erase(customIdPair.first);
-            break;
-        }
-    }
-}
-
-// Method Description:
-// - Obtains the custom ID, if there was one, associated with the
-//   uint16_t id of a hyperlink
-// Arguments:
-// - The uint16_t id of the hyperlink
-// Return Value:
-// - The custom ID if there was one, empty string otherwise
-std::wstring TextBuffer::GetCustomIdFromId(uint16_t id) const
-{
-    for (auto customIdPair : _hyperlinkCustomIdMap)
-    {
-        if (customIdPair.second == id)
-        {
-            return customIdPair.first;
-        }
-    }
-    return {};
-}
-
-// Method Description:
-// - Copies the hyperlink/customID maps of the old buffer into this one
-// Arguments:
-// - The other buffer
-void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
-{
-    _hyperlinkMap = other._hyperlinkMap;
-    _hyperlinkCustomIdMap = other._hyperlinkCustomIdMap;
-}

src/buffer/out/textBuffer.hpp

@@ -137,17 +137,10 @@ public:
     const til::point GetGlyphStart(const til::point pos) const;
     const til::point GetGlyphEnd(const til::point pos) const;
     bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false) const;
-    bool MoveToPreviousGlyph(til::point& pos) const;
+    bool MoveToPreviousGlyph(til::point& pos, bool allowBottomExclusive = false) const;
 
     const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection = false) const;
 
-    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
-    std::wstring GetHyperlinkUriFromId(uint16_t id) const;
-    uint16_t GetHyperlinkId(std::wstring_view params);
-    void RemoveHyperlinkFromMap(uint16_t id);
-    std::wstring GetCustomIdFromId(uint16_t id) const;
-    void CopyHyperlinkMaps(const TextBuffer& OtherBuffer);
-
     class TextAndColor
     {
     public:
@@ -195,10 +188,6 @@ private:
     // storage location for glyphs that can't fit into the buffer normally
     UnicodeStorage _unicodeStorage;
 
-    std::unordered_map<uint16_t, std::wstring> _hyperlinkMap;
-    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
-    uint16_t _currentHyperlinkId;
-
     void _RefreshRowIDs(std::optional<SHORT> newRowWidth);
 
     Microsoft::Console::Render::IRenderTarget& _renderTarget;
@@ -224,11 +213,9 @@ private:
     const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD lastCharPos) const;
+    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
 
-    void _PruneHyperlinks();
-
 #ifdef UNIT_TESTING
     friend class TextBufferTests;
     friend class UiaTextRangeTests;

src/cascadia/CascadiaResources.build.items

@@ -26,7 +26,7 @@
       <Link>ProfileIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
     <!-- Default Settings -->
-    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\defaults.json">
+    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalApp\defaults.json">
       <DeploymentContent>true</DeploymentContent>
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>

src/cascadia/LocalTests_SettingsModel/LocalTests_SettingsModel.def

@@ -1,3 +0,0 @@
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE

src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp

@@ -1,308 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
-#include "JsonTestClass.h"
-
-using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace WEX::Logging;
-using namespace WEX::TestExecution;
-using namespace WEX::Common;
-
-namespace SettingsModelLocalTests
-{
-    // TODO:microsoft/terminal#3838:
-    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
-    // an updated TAEF that will let us install framework packages when the test
-    // package is deployed. Until then, these tests won't deploy in CI.
-
-    class ProfileTests : public JsonTestClass
-    {
-        // Use a custom AppxManifest to ensure that we can activate winrt types
-        // from our test. This property will tell taef to manually use this as
-        // the AppxManifest for this test class.
-        // This does not yet work for anything XAML-y. See TabTests.cpp for more
-        // details on that.
-        BEGIN_TEST_CLASS(ProfileTests)
-            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
-        END_TEST_CLASS()
-
-        TEST_METHOD(CanLayerProfile);
-        TEST_METHOD(LayerProfileProperties);
-        TEST_METHOD(LayerProfileIcon);
-        TEST_METHOD(LayerProfilesOnArray);
-
-        TEST_CLASS_SETUP(ClassSetup)
-        {
-            InitializeJsonReader();
-            return true;
-        }
-    };
-
-    void ProfileTests::CanLayerProfile()
-    {
-        const std::string profile0String{ R"({
-            "name" : "profile0",
-            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile1String{ R"({
-            "name" : "profile1",
-            "guid" : "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile2String{ R"({
-            "name" : "profile2",
-            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile3String{ R"({
-            "name" : "profile3"
-        })" };
-
-        const auto profile0Json = VerifyParseSucceeded(profile0String);
-        const auto profile1Json = VerifyParseSucceeded(profile1String);
-        const auto profile2Json = VerifyParseSucceeded(profile2String);
-        const auto profile3Json = VerifyParseSucceeded(profile3String);
-
-        const auto profile0 = implementation::Profile::FromJson(profile0Json);
-
-        VERIFY_IS_FALSE(profile0->ShouldBeLayered(profile1Json));
-        VERIFY_IS_TRUE(profile0->ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile0->ShouldBeLayered(profile3Json));
-
-        const auto profile1 = implementation::Profile::FromJson(profile1Json);
-
-        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile0Json));
-        // A profile _can_ be layered with itself, though what's the point?
-        VERIFY_IS_TRUE(profile1->ShouldBeLayered(profile1Json));
-        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile1->ShouldBeLayered(profile3Json));
-
-        const auto profile3 = implementation::Profile::FromJson(profile3Json);
-
-        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile0Json));
-        // A profile _can_ be layered with itself, though what's the point?
-        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile1Json));
-        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile2Json));
-        VERIFY_IS_FALSE(profile3->ShouldBeLayered(profile3Json));
-    }
-
-    void ProfileTests::LayerProfileProperties()
-    {
-        const std::string profile0String{ R"({
-            "name": "profile0",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "foreground": "#000000",
-            "background": "#010101",
-            "selectionBackground": "#010101"
-        })" };
-        const std::string profile1String{ R"({
-            "name": "profile1",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "foreground": "#020202",
-            "startingDirectory": "C:/"
-        })" };
-        const std::string profile2String{ R"({
-            "name": "profile2",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "foreground": "#030303",
-            "selectionBackground": "#020202"
-        })" };
-
-        const auto profile0Json = VerifyParseSucceeded(profile0String);
-        const auto profile1Json = VerifyParseSucceeded(profile1String);
-        const auto profile2Json = VerifyParseSucceeded(profile2String);
-
-        auto profile0 = implementation::Profile::FromJson(profile0Json);
-        VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(til::color(0, 0, 0), til::color{ profile0->Foreground().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->SelectionBackground().Value() });
-
-        VERIFY_ARE_EQUAL(L"profile0", profile0->Name());
-
-        VERIFY_IS_TRUE(profile0->StartingDirectory().empty());
-
-        Log::Comment(NoThrowString().Format(
-            L"Layering profile1 on top of profile0"));
-        profile0->LayerJson(profile1Json);
-
-        VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile0->Foreground().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
-
-        VERIFY_ARE_EQUAL(L"profile1", profile0->Name());
-
-        VERIFY_IS_FALSE(profile0->StartingDirectory().empty());
-        VERIFY_ARE_EQUAL(L"C:/", profile0->StartingDirectory());
-
-        Log::Comment(NoThrowString().Format(
-            L"Layering profile2 on top of (profile0+profile1)"));
-        profile0->LayerJson(profile2Json);
-
-        VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(til::color(3, 3, 3), til::color{ profile0->Foreground().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
-
-        VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
-        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile0->SelectionBackground().Value() });
-
-        VERIFY_ARE_EQUAL(L"profile2", profile0->Name());
-
-        VERIFY_IS_FALSE(profile0->StartingDirectory().empty());
-        VERIFY_ARE_EQUAL(L"C:/", profile0->StartingDirectory());
-    }
-
-    void ProfileTests::LayerProfileIcon()
-    {
-        const std::string profile0String{ R"({
-            "name": "profile0",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "icon": "not-null.png"
-        })" };
-        const std::string profile1String{ R"({
-            "name": "profile1",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "icon": null
-        })" };
-        const std::string profile2String{ R"({
-            "name": "profile2",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile3String{ R"({
-            "name": "profile3",
-            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "icon": "another-real.png"
-        })" };
-
-        const auto profile0Json = VerifyParseSucceeded(profile0String);
-        const auto profile1Json = VerifyParseSucceeded(profile1String);
-        const auto profile2Json = VerifyParseSucceeded(profile2String);
-        const auto profile3Json = VerifyParseSucceeded(profile3String);
-
-        auto profile0 = implementation::Profile::FromJson(profile0Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"not-null.png", profile0->Icon());
-
-        Log::Comment(NoThrowString().Format(
-            L"Verify that layering an object the key set to null will clear the key"));
-        profile0->LayerJson(profile1Json);
-        VERIFY_IS_TRUE(profile0->Icon().empty());
-
-        profile0->LayerJson(profile2Json);
-        VERIFY_IS_TRUE(profile0->Icon().empty());
-
-        profile0->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());
-
-        Log::Comment(NoThrowString().Format(
-            L"Verify that layering an object _without_ the key will not clear the key"));
-        profile0->LayerJson(profile2Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());
-
-        auto profile1 = implementation::Profile::FromJson(profile1Json);
-        VERIFY_IS_TRUE(profile1->Icon().empty());
-        profile1->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile1->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile1->Icon());
-    }
-
-    void ProfileTests::LayerProfilesOnArray()
-    {
-        const std::string profile0String{ R"({
-            "name" : "profile0",
-            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile1String{ R"({
-            "name" : "profile1",
-            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile2String{ R"({
-            "name" : "profile2",
-            "guid" : "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile3String{ R"({
-            "name" : "profile3",
-            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-        })" };
-        const std::string profile4String{ R"({
-            "name" : "profile4",
-            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
-        })" };
-
-        const auto profile0Json = VerifyParseSucceeded(profile0String);
-        const auto profile1Json = VerifyParseSucceeded(profile1String);
-        const auto profile2Json = VerifyParseSucceeded(profile2String);
-        const auto profile3Json = VerifyParseSucceeded(profile3String);
-        const auto profile4Json = VerifyParseSucceeded(profile4String);
-
-        auto settings = winrt::make_self<implementation::CascadiaSettings>();
-
-        VERIFY_ARE_EQUAL(0u, settings->_profiles.Size());
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile4Json));
-
-        settings->_LayerOrCreateProfile(profile0Json);
-        VERIFY_ARE_EQUAL(1u, settings->_profiles.Size());
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
-
-        settings->_LayerOrCreateProfile(profile1Json);
-        VERIFY_ARE_EQUAL(2u, settings->_profiles.Size());
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
-
-        settings->_LayerOrCreateProfile(profile2Json);
-        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile0", settings->_profiles.GetAt(0).Name());
-
-        settings->_LayerOrCreateProfile(profile3Json);
-        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile3", settings->_profiles.GetAt(0).Name());
-
-        settings->_LayerOrCreateProfile(profile4Json);
-        VERIFY_ARE_EQUAL(3u, settings->_profiles.Size());
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile0Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile1Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile2Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile3Json));
-        VERIFY_IS_NOT_NULL(settings->_FindMatchingProfile(profile4Json));
-        VERIFY_ARE_EQUAL(L"profile4", settings->_profiles.GetAt(0).Name());
-    }
-
-}

src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- A note about this project: We're building the test code dll from this
-    project, but it _MUST_ be run in conjunction with the TestHostApp project.
-    TestHostApp actually will build a TestHost executable and packaging bits
-    that we can use to run our tests. We need TestHostApp so that our
-    dependencies, like MUX, can be aggregated correctly, and resources properly
-    combined into a resources.pri file.
-
-    TestHostApp will manually copy the output of this project into it's own
-    OutDir, so we can run the tests from there. -->
-
-  <PropertyGroup>
-    <ProjectGuid>{CA5CAD1A-9B68-456A-B13E-C8218070DC42}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SettingsModelLocalTests</RootNamespace>
-    <ProjectName>LocalTests_SettingsModel</ProjectName>
-    <TargetName>SettingsModel.LocalTests</TargetName>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
-    <!-- We'll manage our own OutDir/IntDir -->
-    <NoOutputRedirection>true</NoOutputRedirection>
-  </PropertyGroup>
-
-  <PropertyGroup>
-  <!-- Manually change our outdir to be in a subdirectory. We don't really want
-    to put our output in the bin root, because if we do, we'll copy
-    TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
-    (in _any_ cppwinrt project) will automatically try to pick up
-    TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
-    before importing common.build.pre.props -->
-    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-
-  <Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)\src\cppwinrt.build.pre.props" />
-
-  <!-- ========================= Headers ======================== -->
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="JsonTestClass.h" />
-  </ItemGroup>
-
-  <!-- ========================= Cpp Files ======================== -->
-  <ItemGroup>
-    <ClCompile Include="ProfileTests.cpp" />
-    <ClCompile Include="ColorSchemeTests.cpp" />
-    <ClCompile Include="KeyBindingsTests.cpp" />
-    <ClCompile Include="CommandTests.cpp" />
-    <ClCompile Include="DeserializationTests.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
-    you want to use jsoncpp -->
-    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-
-  <!-- ========================= Project References ======================== -->
-  <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" />
-
-    <!-- If you don't reference these projects here, the
-    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
-  </ItemGroup>
-
-  <!-- ========================= Globals ======================== -->
-
-  <!-- ====================== Compiler & Linker Flags ===================== -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-
-      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
-      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <GenerateManifest>true</GenerateManifest>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-
-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
-  <Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
-
-  <PropertyGroup>
-    <_CppWinrtBinRoot>&quot;$(OpenConsoleDir)$(Platform)\$(Configuration)\&quot;</_CppWinrtBinRoot>
-    <!-- From Microsoft.UI.Xaml.targets -->
-    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
-    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
-    <_MUXBinRoot>&quot;$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\runtimes\win10-$(Native-Platform)\native\&quot;</_MUXBinRoot>
-  </PropertyGroup>
-
-<!-- We actually can just straight up reference MUX here, it's fine -->
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
-
-</Project>

src/cascadia/LocalTests_SettingsModel/pch.cpp

@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -1,65 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- precomp.h
-
-Abstract:
-- Contains external headers to include in the precompile phase of console build process.
-- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
-
-Author(s):
-- Carlos Zamora (cazamor) April 2019
---*/
-
-#pragma once
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
-// This includes support libraries from the CRT, STL, WIL, and GSL
-#include "LibraryIncludes.h"
-// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
-//      SDK definition of this function, so the only fix is to undef it.
-// from WinBase.h
-// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
-#include <wil/cppwinrt.h>
-#include <unknwn.h>
-#include <hstring.h>
-
-#include <WexTestClass.h>
-#include <json.h>
-#include "consoletaeftemplates.hpp"
-
-#include <winrt/Windows.ApplicationModel.Resources.Core.h>
-#include "winrt/Windows.UI.Xaml.Markup.h"
-#include <winrt/Windows.system.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/windows.ui.core.h>
-#include <winrt/Windows.ui.input.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Windows.ui.xaml.media.h>
-#include <winrt/Windows.ui.xaml.input.h>
-#include <winrt/Windows.UI.Xaml.Markup.h>
-#include <winrt/Windows.UI.Xaml.Documents.h>
-
-#include <windows.ui.xaml.media.dxinterop.h>
-
-#include <winrt/windows.applicationmodel.core.h>
-
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#include "til.h"
-
-// Common includes for most tests:
-#include "../../inc/argb.h"
-#include "../../inc/conattrs.hpp"
-#include "../../types/inc/utils.hpp"
-#include "../../inc/DefaultSettings.h"

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -3,17 +3,18 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp::implementation;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -130,11 +131,11 @@ namespace SettingsModelLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
 
         auto scheme0 = ColorScheme::FromJson(scheme0Json);
-        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_Name);
-        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_schemeName);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -143,10 +144,10 @@ namespace SettingsModelLocalTests
             L"Layering scheme1 on top of scheme0"));
         scheme0->LayerJson(scheme1Json);
 
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -155,10 +156,10 @@ namespace SettingsModelLocalTests
             L"Layering scheme2Json on top of (scheme0+scheme1)"));
         scheme0->LayerJson(scheme2Json);
 
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -192,102 +193,102 @@ namespace SettingsModelLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
         const auto scheme3Json = VerifyParseSucceeded(scheme3String);
 
-        auto settings = winrt::make_self<CascadiaSettings>();
+        CascadiaSettings settings;
 
-        VERIFY_ARE_EQUAL(0u, settings->_globals->ColorSchemes().Size());
-        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme0Json));
-        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
-        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme2Json));
-        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(0u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
 
-        settings->_LayerOrCreateColorScheme(scheme0Json);
+        settings._LayerOrCreateColorScheme(scheme0Json);
         {
-            for (auto kv : settings->_globals->ColorSchemes())
+            for (auto& kv : settings._globals._colorSchemes)
             {
                 Log::Comment(NoThrowString().Format(
-                    L"kv:%s->%s", kv.Key().data(), kv.Value().Name().data()));
+                    L"kv:%s->%s", kv.first.data(), kv.second.Name().data()));
             }
-            VERIFY_ARE_EQUAL(1u, settings->_globals->ColorSchemes().Size());
+            VERIFY_ARE_EQUAL(1u, settings._globals.GetColorSchemes().size());
 
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
-            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
 
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
         }
 
-        settings->_LayerOrCreateColorScheme(scheme1Json);
+        settings._LayerOrCreateColorScheme(scheme1Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
+            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
 
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
-            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
-            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
+            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
-        settings->_LayerOrCreateColorScheme(scheme2Json);
+        settings._LayerOrCreateColorScheme(scheme2Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
+            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
 
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
-            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
-            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
+            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
-        settings->_LayerOrCreateColorScheme(scheme3Json);
+        settings._LayerOrCreateColorScheme(scheme3Json);
 
         {
-            VERIFY_ARE_EQUAL(3u, settings->_globals->ColorSchemes().Size());
+            VERIFY_ARE_EQUAL(3u, settings._globals.GetColorSchemes().size());
 
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme0"));
-            auto scheme0Proj = settings->_globals->ColorSchemes().Lookup(L"scheme0");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L"scheme1"));
-            auto scheme1Proj = settings->_globals->ColorSchemes().Lookup(L"scheme1");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
+            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
-            VERIFY_IS_TRUE(settings->_globals->ColorSchemes().HasKey(L""));
-            auto scheme2Proj = settings->_globals->ColorSchemes().Lookup(L"");
+            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"") != settings._globals._colorSchemes.end());
+            auto scheme2Proj = settings._globals._colorSchemes.find(L"")->second;
             auto scheme2 = winrt::get_self<ColorScheme>(scheme2Proj);
 
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme0Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
-            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
-            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_Background);
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+            VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+            VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_defaultBackground);
         }
     }
 }

src/cascadia/LocalTests_TerminalApp/CommandTests.cpp

@@ -3,19 +3,20 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -61,7 +62,7 @@ namespace SettingsModelLocalTests
         const auto commands1Json = VerifyParseSucceeded(commands1String);
         const auto commands2Json = VerifyParseSucceeded(commands2String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -95,7 +96,7 @@ namespace SettingsModelLocalTests
         const auto commands2Json = VerifyParseSucceeded(commands2String);
         const auto commands3Json = VerifyParseSucceeded(commands3String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -153,7 +154,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -167,7 +168,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command1");
@@ -177,7 +178,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command2");
@@ -187,7 +188,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command4");
@@ -197,7 +198,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command5");
@@ -207,7 +208,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
     }
     void CommandTests::TestResourceKeyName()
@@ -217,7 +218,7 @@ namespace SettingsModelLocalTests
         const std::string commands0String{ R"([ { "name": { "key": "DuplicateTabCommandKey"}, "command": "copy" } ])" };
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -265,7 +266,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -283,7 +284,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"Split pane, split: vertical");
@@ -293,7 +294,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"Split pane, split: horizontal");
@@ -303,7 +304,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
     }
     void CommandTests::TestLayerOnAutogeneratedName()
@@ -315,7 +316,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -329,7 +330,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
     }
 }

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -6,12 +6,12 @@
 
 #include "../TerminalApp/TerminalPage.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
+#include "../TerminalApp/ActionArgs.h"
 
 using namespace WEX::Logging;
 using namespace WEX::Common;
 using namespace WEX::TestExecution;
 
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;
 using namespace ::TerminalApp;
 
@@ -57,7 +57,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestSimpleExecuteCommandlineAction);
         TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
         TEST_METHOD(TestInvalidExecuteCommandlineAction);
-        TEST_METHOD(TestLaunchMode);
 
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
@@ -1077,8 +1076,9 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
-        ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        args->Commandline(L"new-tab");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1095,8 +1095,9 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
-        ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        args->Commandline(L"new-tab ; split-pane");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1128,100 +1129,10 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestInvalidExecuteCommandlineAction()
     {
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
         // -H and -V cannot be combined.
-        ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        args->Commandline(L"split-pane -H -V");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
-
-    void CommandlineTest::TestLaunchMode()
-    {
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_FALSE(appArgs.GetLaunchMode().has_value());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-F" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--fullscreen" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-M" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-f" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-fM" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-    }
 }

src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp

@@ -3,20 +3,20 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
-#include "../TerminalSettingsModel/KeyMapping.h"
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -66,18 +66,18 @@ namespace SettingsModelLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(2u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(2u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(4u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(4u, appKeyBindings->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::LayerKeybindings()
@@ -90,18 +90,18 @@ namespace SettingsModelLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(2u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(2u, appKeyBindings->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::UnbindKeybindings()
@@ -120,52 +120,52 @@ namespace SettingsModelLocalTests
         const auto bindings4Json = VerifyParseSucceeded(bindings4String);
         const auto bindings5Json = VerifyParseSucceeded(bindings5String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
-        keymap->LayerJson(bindings1Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings1Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using `\"unbound\"` to unbind the key"));
-        keymap->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using `null` to unbind the key"));
         // First add back a good binding
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
         // Then try layering in the bad setting
-        keymap->LayerJson(bindings3Json);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings3Json);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using an unrecognized command to unbind the key"));
         // First add back a good binding
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
         // Then try layering in the bad setting
-        keymap->LayerJson(bindings4Json);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings4Json);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key using a straight up invalid value to unbind the key"));
         // First add back a good binding
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
         // Then try layering in the bad setting
-        keymap->LayerJson(bindings5Json);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings5Json);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
 
         Log::Comment(NoThrowString().Format(
             L"Try unbinding a key that wasn't bound at all"));
-        keymap->LayerJson(bindings2Json);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings2Json);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
     }
 
     void KeyBindingsTests::TestArbitraryArgs()
@@ -189,17 +189,17 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(10u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(10u, appKeyBindings->_keyShortcuts.size());
 
         {
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` without args parses as Copy(SingleLine=false)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -210,7 +210,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -221,7 +221,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ false, true, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -232,7 +232,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` without args parses as NewTab(Index=null)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('T') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -244,7 +244,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` parses args correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('T') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -258,7 +258,7 @@ namespace SettingsModelLocalTests
                 L"Verify that `newTab` with an index greater than the legacy "
                 L"args afforded parses correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('Y') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -272,7 +272,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` ignores args it doesn't understand"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -284,7 +284,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` null as it's `args` parses as the default option"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -296,7 +296,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a positive delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -308,7 +308,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a negative delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -329,56 +329,56 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(5u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(5u, appKeyBindings->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
     }
 
@@ -392,15 +392,15 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(3u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(3u, appKeyBindings->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -409,7 +409,7 @@ namespace SettingsModelLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -420,7 +420,7 @@ namespace SettingsModelLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -437,15 +437,15 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
-        VERIFY_IS_NOT_NULL(keymap);
-        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
-        keymap->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, keymap->_keyShortcuts.size());
+        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
+        VERIFY_IS_NOT_NULL(appKeyBindings);
+        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
+        appKeyBindings->LayerJson(bindings0Json);
+        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value

src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp

@@ -0,0 +1,308 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
+#include "JsonTestClass.h"
+
+using namespace Microsoft::Console;
+using namespace TerminalApp;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+using namespace WEX::Common;
+
+namespace TerminalAppLocalTests
+{
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
+    class ProfileTests : public JsonTestClass
+    {
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(ProfileTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
+
+        TEST_METHOD(CanLayerProfile);
+        TEST_METHOD(LayerProfileProperties);
+        TEST_METHOD(LayerProfileIcon);
+        TEST_METHOD(LayerProfilesOnArray);
+
+        TEST_CLASS_SETUP(ClassSetup)
+        {
+            InitializeJsonReader();
+            return true;
+        }
+    };
+
+    void ProfileTests::CanLayerProfile()
+    {
+        const std::string profile0String{ R"({
+            "name" : "profile0",
+            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile1String{ R"({
+            "name" : "profile1",
+            "guid" : "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile2String{ R"({
+            "name" : "profile2",
+            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile3String{ R"({
+            "name" : "profile3"
+        })" };
+
+        const auto profile0Json = VerifyParseSucceeded(profile0String);
+        const auto profile1Json = VerifyParseSucceeded(profile1String);
+        const auto profile2Json = VerifyParseSucceeded(profile2String);
+        const auto profile3Json = VerifyParseSucceeded(profile3String);
+
+        const auto profile0 = Profile::FromJson(profile0Json);
+
+        VERIFY_IS_FALSE(profile0.ShouldBeLayered(profile1Json));
+        VERIFY_IS_TRUE(profile0.ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile0.ShouldBeLayered(profile3Json));
+
+        const auto profile1 = Profile::FromJson(profile1Json);
+
+        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile0Json));
+        // A profile _can_ be layered with itself, though what's the point?
+        VERIFY_IS_TRUE(profile1.ShouldBeLayered(profile1Json));
+        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile1.ShouldBeLayered(profile3Json));
+
+        const auto profile3 = Profile::FromJson(profile3Json);
+
+        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile0Json));
+        // A profile _can_ be layered with itself, though what's the point?
+        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile1Json));
+        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile2Json));
+        VERIFY_IS_FALSE(profile3.ShouldBeLayered(profile3Json));
+    }
+
+    void ProfileTests::LayerProfileProperties()
+    {
+        const std::string profile0String{ R"({
+            "name": "profile0",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "foreground": "#000000",
+            "background": "#010101",
+            "selectionBackground": "#010101"
+        })" };
+        const std::string profile1String{ R"({
+            "name": "profile1",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "foreground": "#020202",
+            "startingDirectory": "C:/"
+        })" };
+        const std::string profile2String{ R"({
+            "name": "profile2",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "foreground": "#030303",
+            "selectionBackground": "#020202"
+        })" };
+
+        const auto profile0Json = VerifyParseSucceeded(profile0String);
+        const auto profile1Json = VerifyParseSucceeded(profile1String);
+        const auto profile2Json = VerifyParseSucceeded(profile2String);
+
+        auto profile0 = Profile::FromJson(profile0Json);
+        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), profile0._defaultForeground.value());
+
+        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+
+        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());
+
+        VERIFY_ARE_EQUAL(L"profile0", profile0._name);
+
+        VERIFY_IS_FALSE(profile0._startingDirectory.has_value());
+
+        Log::Comment(NoThrowString().Format(
+            L"Layering profile1 on top of profile0"));
+        profile0.LayerJson(profile1Json);
+
+        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0._defaultForeground.value());
+
+        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+
+        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());
+
+        VERIFY_ARE_EQUAL(L"profile1", profile0._name);
+
+        VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
+        VERIFY_ARE_EQUAL(L"C:/", profile0._startingDirectory.value());
+
+        Log::Comment(NoThrowString().Format(
+            L"Layering profile2 on top of (profile0+profile1)"));
+        profile0.LayerJson(profile2Json);
+
+        VERIFY_IS_TRUE(profile0._defaultForeground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), profile0._defaultForeground.value());
+
+        VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());
+
+        VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0._selectionBackground.value());
+
+        VERIFY_ARE_EQUAL(L"profile2", profile0._name);
+
+        VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
+        VERIFY_ARE_EQUAL(L"C:/", profile0._startingDirectory.value());
+    }
+
+    void ProfileTests::LayerProfileIcon()
+    {
+        const std::string profile0String{ R"({
+            "name": "profile0",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "icon": "not-null.png"
+        })" };
+        const std::string profile1String{ R"({
+            "name": "profile1",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "icon": null
+        })" };
+        const std::string profile2String{ R"({
+            "name": "profile2",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile3String{ R"({
+            "name": "profile3",
+            "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "icon": "another-real.png"
+        })" };
+
+        const auto profile0Json = VerifyParseSucceeded(profile0String);
+        const auto profile1Json = VerifyParseSucceeded(profile1String);
+        const auto profile2Json = VerifyParseSucceeded(profile2String);
+        const auto profile3Json = VerifyParseSucceeded(profile3String);
+
+        auto profile0 = Profile::FromJson(profile0Json);
+        VERIFY_IS_TRUE(profile0._icon.has_value());
+        VERIFY_ARE_EQUAL(L"not-null.png", profile0._icon.value());
+
+        Log::Comment(NoThrowString().Format(
+            L"Verify that layering an object the key set to null will clear the key"));
+        profile0.LayerJson(profile1Json);
+        VERIFY_IS_FALSE(profile0._icon.has_value());
+
+        profile0.LayerJson(profile2Json);
+        VERIFY_IS_FALSE(profile0._icon.has_value());
+
+        profile0.LayerJson(profile3Json);
+        VERIFY_IS_TRUE(profile0._icon.has_value());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0._icon.value());
+
+        Log::Comment(NoThrowString().Format(
+            L"Verify that layering an object _without_ the key will not clear the key"));
+        profile0.LayerJson(profile2Json);
+        VERIFY_IS_TRUE(profile0._icon.has_value());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0._icon.value());
+
+        auto profile1 = Profile::FromJson(profile1Json);
+        VERIFY_IS_FALSE(profile1._icon.has_value());
+        profile1.LayerJson(profile3Json);
+        VERIFY_IS_TRUE(profile1._icon.has_value());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile1._icon.value());
+    }
+
+    void ProfileTests::LayerProfilesOnArray()
+    {
+        const std::string profile0String{ R"({
+            "name" : "profile0",
+            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile1String{ R"({
+            "name" : "profile1",
+            "guid" : "{6239a42c-1111-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile2String{ R"({
+            "name" : "profile2",
+            "guid" : "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile3String{ R"({
+            "name" : "profile3",
+            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
+        })" };
+        const std::string profile4String{ R"({
+            "name" : "profile4",
+            "guid" : "{6239a42c-0000-49a3-80bd-e8fdd045185c}"
+        })" };
+
+        const auto profile0Json = VerifyParseSucceeded(profile0String);
+        const auto profile1Json = VerifyParseSucceeded(profile1String);
+        const auto profile2Json = VerifyParseSucceeded(profile2String);
+        const auto profile3Json = VerifyParseSucceeded(profile3String);
+        const auto profile4Json = VerifyParseSucceeded(profile4String);
+
+        CascadiaSettings settings;
+
+        VERIFY_ARE_EQUAL(0u, settings._profiles.size());
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile4Json));
+
+        settings._LayerOrCreateProfile(profile0Json);
+        VERIFY_ARE_EQUAL(1u, settings._profiles.size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+
+        settings._LayerOrCreateProfile(profile1Json);
+        VERIFY_ARE_EQUAL(2u, settings._profiles.size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+
+        settings._LayerOrCreateProfile(profile2Json);
+        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile0", settings._profiles.at(0)._name);
+
+        settings._LayerOrCreateProfile(profile3Json);
+        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(0)._name);
+
+        settings._LayerOrCreateProfile(profile4Json);
+        VERIFY_ARE_EQUAL(3u, settings._profiles.size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile2Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile3Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingProfile(profile4Json));
+        VERIFY_ARE_EQUAL(L"profile4", settings._profiles.at(0)._name);
+    }
+
+}

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -9,11 +9,11 @@
 #include "../TerminalApp/ShortcutActionDispatch.h"
 #include "../TerminalApp/Tab.h"
 #include "../CppWinrtTailored.h"
+#include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -26,7 +26,7 @@ namespace TerminalAppLocalTests
     // an updated TAEF that will let us install framework packages when the test
     // package is deployed. Until then, these tests won't deploy in CI.
 
-    class TabTests
+    class TabTests : public JsonTestClass
     {
         // For this set of tests, we need to activate some XAML content. For
         // release builds, the application runs as a centennial application,
@@ -64,6 +64,7 @@ namespace TerminalAppLocalTests
 
         TEST_CLASS_SETUP(ClassSetup)
         {
+            InitializeJsonReader();
             return true;
         }
 
@@ -74,7 +75,7 @@ namespace TerminalAppLocalTests
 
     private:
         void _initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                     CascadiaSettings initialSettings);
+                                     std::shared_ptr<CascadiaSettings> initialSettings);
     };
 
     void TabTests::EnsureTestsActivate()
@@ -189,7 +190,7 @@ namespace TerminalAppLocalTests
     // Return Value:
     // - <none>
     void TabTests::_initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                           CascadiaSettings initialSettings)
+                                           std::shared_ptr<CascadiaSettings> initialSettings)
     {
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -275,8 +276,12 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = std::make_shared<CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -333,11 +338,19 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = std::make_shared<CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
+        VerifyParseSucceeded(settingsJson1);
+        auto settings1 = std::make_shared<CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
+        settings1->_ParseJsonString(settingsJson1, false);
+        settings1->LayerJson(settings1->_userSettings);
+        settings1->_ValidateSettings();
 
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
@@ -420,11 +433,19 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = std::make_shared<CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
+        VerifyParseSucceeded(settingsJson1);
+        auto settings1 = std::make_shared<CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
+        settings1->_ParseJsonString(settingsJson1, false);
+        settings1->LayerJson(settings1->_userSettings);
+        settings1->_ValidateSettings();
 
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj

@@ -49,6 +49,7 @@
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="JsonTestClass.h" />
     <ClInclude Include="CppWinrtTailored.h" />
   </ItemGroup>
 
@@ -56,10 +57,19 @@
   <ItemGroup>
     <ClCompile Include="CommandlineTest.cpp" />
     <ClCompile Include="SettingsTests.cpp" />
+    <ClCompile Include="ProfileTests.cpp" />
+    <ClCompile Include="ColorSchemeTests.cpp" />
+    <ClCompile Include="KeyBindingsTests.cpp" />
+    <ClCompile Include="CommandTests.cpp" />
     <ClCompile Include="TabTests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
+    you want to use jsoncpp -->
+    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
 
   <!-- ========================= Project References ======================== -->
@@ -71,8 +81,7 @@
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->

src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj

@@ -100,10 +100,6 @@
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
     </ProjectReference>
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj">
-      <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
-    </ProjectReference>
-
   </ItemGroup>
 
   <PropertyGroup>
@@ -157,10 +153,6 @@
     <Copy SourceFiles="$(_TestBinRoot)\LocalTests_TerminalApp\TerminalApp.LocalTests.dll"
           DestinationFiles="$(TargetDir)\TerminalApp.LocalTests.dll" />
 
-    <!-- Copy our test code from LocalTests_TerminalApp into this directory -->
-    <Copy SourceFiles="$(_TestBinRoot)\LocalTests_SettingsModel\SettingsModel.LocalTests.dll"
-          DestinationFiles="$(TargetDir)\SettingsModel.LocalTests.dll" />
-
     <!-- Copy some dlls which TerminalConnection is dependent upon that didn't
       get rolled up into this  directory -->
     <Copy SourceFiles="@(TerminalConnectionDlls)"

src/cascadia/LocalTests_TerminalApp/TestUtils.h

@@ -12,19 +12,19 @@ Author(s):
     Mike Griese (migrie) December-2019
 --*/
 
-class TestUtils
+class TerminalAppLocalTests::TestUtils
 {
 public:
     // Function Description:
     // - This is a helper to retrieve the ActionAndArgs from the keybindings
     //   for a given chord.
     // Arguments:
-    // - keymap: The AppKeyBindings to lookup the ActionAndArgs from.
+    // - bindings: The AppKeyBindings to lookup the ActionAndArgs from.
     // - kc: The key chord to look up the bound ActionAndArgs for.
     // Return Value:
     // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
-    static const winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs GetActionAndArgs(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap,
-                                                                                             const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::AppKeyBindings& bindings,
+                                                                    const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
     {
         std::wstring buffer{ L"" };
         if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))
@@ -42,8 +42,12 @@ public:
         buffer += static_cast<wchar_t>(MapVirtualKeyW(kc.Vkey(), MAPVK_VK_TO_CHAR));
         WEX::Logging::Log::Comment(WEX::Common::NoThrowString().Format(L"Looking for key:%s", buffer.c_str()));
 
-        const auto action = keymap.TryLookup(kc);
-        VERIFY_IS_NOT_NULL(action, L"Expected to find an action bound to the given KeyChord");
-        return action;
+        const auto keyIter = bindings._keyShortcuts.find(kc);
+        VERIFY_IS_TRUE(keyIter != bindings._keyShortcuts.end(), L"Expected to find an action bound to the given KeyChord");
+        if (keyIter != bindings._keyShortcuts.end())
+        {
+            return keyIter->second;
+        }
+        return nullptr;
     };
 };

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -15,8 +15,6 @@ Author(s):
 
 #pragma once
 
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
 // This includes support libraries from the CRT, STL, WIL, and GSL
 #include "LibraryIncludes.h"
 // This is inexplicable, but for whatever reason, cppwinrt conflicts with the
@@ -35,6 +33,12 @@ Author(s):
 #include <json.h>
 #include "consoletaeftemplates.hpp"
 
+// Common includes for most tests:
+#include "../../inc/argb.h"
+#include "../../inc/conattrs.hpp"
+#include "../../types/inc/utils.hpp"
+#include "../../inc/DefaultSettings.h"
+
 #include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include <winrt/Windows.system.h>
@@ -54,18 +58,8 @@ Author(s):
 #include <winrt/windows.applicationmodel.core.h>
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
-#include <winrt/Microsoft.Terminal.Settings.Model.h>
 
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 
 #include <regex>
 #include <CLI11/CLI11.hpp>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#include "til.h"
-
-// Common includes for most tests:
-#include "../../inc/argb.h"
-#include "../../inc/conattrs.hpp"
-#include "../../types/inc/utils.hpp"
-#include "../../inc/DefaultSettings.h"

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -433,15 +433,7 @@ void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data)
     publicTerminal->SendOutput(data);
 }
 
-/// <summary>
-/// Triggers a terminal resize using the new width and height in pixel.
-/// </summary>
-/// <param name="terminal">Terminal pointer.</param>
-/// <param name="width">New width of the terminal in pixels.</param>
-/// <param name="height">New height of the terminal in pixels</param>
-/// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
-/// <returns>HRESULT of the attempted resize.</returns>
-HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
+HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double height, _Out_ COORD* dimensions)
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
 
@@ -454,55 +446,10 @@ HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _I
         static_cast<int>(height),
         0));
 
-    const SIZE windowSize{ width, height };
+    const SIZE windowSize{ static_cast<short>(width), static_cast<short>(height) };
     return publicTerminal->Refresh(windowSize, dimensions);
 }
 
-/// <summary>
-/// Helper method for resizing the terminal using character column and row counts
-/// </summary>
-/// <param name="terminal">Pointer to the terminal object.</param>
-/// <param name="dimensionsInCharacters">New terminal size in row and column count.</param>
-/// <param name="dimensionsInPixels">Out parameter with the new size of the renderer.</param>
-/// <returns>HRESULT of the attempted resize.</returns>
-HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensionsInCharacters, _Out_ SIZE* dimensionsInPixels)
-{
-    RETURN_HR_IF_NULL(E_INVALIDARG, dimensionsInPixels);
-
-    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-
-    const auto viewInCharacters = Viewport::FromDimensions({ 0, 0 }, { (dimensionsInCharacters.X), (dimensionsInCharacters.Y) });
-    const auto viewInPixels = publicTerminal->_renderEngine->GetViewportInPixels(viewInCharacters);
-
-    dimensionsInPixels->cx = viewInPixels.Width();
-    dimensionsInPixels->cy = viewInPixels.Height();
-
-    COORD unused{ 0, 0 };
-
-    return TerminalTriggerResize(terminal, viewInPixels.Width(), viewInPixels.Height(), &unused);
-}
-
-/// <summary>
-/// Calculates the amount of rows and columns that fit in the provided width and height.
-/// </summary>
-/// <param name="terminal">Terminal pointer</param>
-/// <param name="width">Width of the terminal area to calculate.</param>
-/// <param name="height">Height of the terminal area to calculate.</param>
-/// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
-/// <returns>HRESULT of the calculation.</returns>
-HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
-{
-    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-
-    const auto viewInPixels = Viewport::FromDimensions({ 0, 0 }, { width, height });
-    const auto viewInCharacters = publicTerminal->_renderEngine->GetViewportInCharacters(viewInPixels);
-
-    dimensions->X = viewInCharacters.Width();
-    dimensions->Y = viewInCharacters.Height();
-
-    return S_OK;
-}
-
 void _stdcall TerminalDpiChanged(void* terminal, int newDpi)
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
@@ -813,6 +760,18 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
     publicTerminal->Refresh(windowSize, &dimensions);
 }
 
+// Resizes the terminal to the specified rows and columns.
+HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions)
+{
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+
+    auto lock = publicTerminal->_terminal->LockForWriting();
+    publicTerminal->_terminal->ClearSelection();
+    publicTerminal->_renderer->TriggerRedrawAll();
+
+    return publicTerminal->_terminal->UserResize(dimensions);
+}
+
 void _stdcall TerminalBlinkCursor(void* terminal)
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -27,9 +27,8 @@ extern "C" {
 __declspec(dllexport) HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
 __declspec(dllexport) void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data);
 __declspec(dllexport) void _stdcall TerminalRegisterScrollCallback(void* terminal, void __stdcall callback(int, int, int));
-__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
-__declspec(dllexport) HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
-__declspec(dllexport) HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double height, _Out_ COORD* dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
 __declspec(dllexport) void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
 __declspec(dllexport) void _stdcall TerminalUserScroll(void* terminal, int viewTop);
 __declspec(dllexport) void _stdcall TerminalClearSelection(void* terminal);
@@ -91,9 +90,7 @@ private:
     std::optional<til::point> _singleClickTouchdownPos;
 
     friend HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
-    friend HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
-    friend HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
-    friend HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+    friend HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
     friend void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
     friend void _stdcall TerminalUserScroll(void* terminal, int viewTop);
     friend void _stdcall TerminalClearSelection(void* terminal);

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -51,9 +51,9 @@ static constexpr std::string_view ActionKey{ "action" };
 // This key is reserved to remove a keybinding, instead of mapping it to an action.
 static constexpr std::string_view UnboundKey{ "unbound" };
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
-    using namespace ::Microsoft::Terminal::Settings::Model;
+    using namespace ::TerminalApp;
 
     // Specifically use a map here over an unordered_map. We want to be able to
     // iterate over these entries in-order when we're serializing the keybindings.
@@ -100,12 +100,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         { ToggleCommandPaletteKey, ShortcutAction::ToggleCommandPalette },
         { ToggleFocusModeKey, ShortcutAction::ToggleFocusMode },
         { ToggleFullscreenKey, ShortcutAction::ToggleFullscreen },
-        { TogglePaneZoomKey, ShortcutAction::TogglePaneZoom },
+        // { TogglePaneZoomKey, ShortcutAction::TogglePaneZoom }, // TODO GH#7252: Re-enable pane zooming
         { ToggleRetroEffectKey, ShortcutAction::ToggleRetroEffect },
         { UnboundKey, ShortcutAction::Invalid },
     };
 
-    using ParseResult = std::tuple<IActionArgs, std::vector<SettingsLoadWarnings>>;
+    using ParseResult = std::tuple<IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
     using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;
 
     // This is a map of ShortcutAction->function<IActionArgs(Json::Value)>. It holds
@@ -169,7 +169,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - a deserialized ActionAndArgs corresponding to the values in json, or
     //   null if we failed to deserialize an action.
     winrt::com_ptr<ActionAndArgs> ActionAndArgs::FromJson(const Json::Value& json,
-                                                          std::vector<SettingsLoadWarnings>& warnings)
+                                                          std::vector<::TerminalApp::SettingsLoadWarnings>& warnings)
     {
         // Invalid is our placeholder that the action was not parsed.
         ShortcutAction action = ShortcutAction::Invalid;
@@ -208,7 +208,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // does, we'll try to deserialize any "args" that were provided with
         // the binding.
         IActionArgs args{ nullptr };
-        std::vector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> parseWarnings;
+        std::vector<::TerminalApp::SettingsLoadWarnings> parseWarnings;
         const auto deserializersIter = argParsers.find(action);
         if (deserializersIter != argParsers.end())
         {

src/cascadia/TerminalApp/ActionAndArgs.h

@@ -1,33 +1,25 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #pragma once
-
 #include "ActionAndArgs.g.h"
 #include "TerminalWarnings.h"
 #include "..\inc\cppwinrt_utils.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     struct ActionAndArgs : public ActionAndArgsT<ActionAndArgs>
     {
         static const std::map<std::string_view, ShortcutAction, std::less<>> ActionKeyNamesMap;
         static winrt::com_ptr<ActionAndArgs> FromJson(const Json::Value& json,
-                                                      std::vector<SettingsLoadWarnings>& warnings);
+                                                      std::vector<::TerminalApp::SettingsLoadWarnings>& warnings);
 
         ActionAndArgs() = default;
-        ActionAndArgs(ShortcutAction action, IActionArgs args) :
-            _Action{ action },
-            _Args{ args } {};
-
         hstring GenerateName() const;
 
-        GETSET_PROPERTY(ShortcutAction, Action, ShortcutAction::Invalid);
+        GETSET_PROPERTY(TerminalApp::ShortcutAction, Action, TerminalApp::ShortcutAction::Invalid);
         GETSET_PROPERTY(IActionArgs, Args, nullptr);
     };
 }
 
-namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
+namespace winrt::TerminalApp::factory_implementation
 {
     BASIC_FACTORY(ActionAndArgs);
 }

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -20,14 +20,14 @@
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
-#include "CloseOtherTabsArgs.g.cpp"
-#include "CloseTabsAfterArgs.g.cpp"
+
+#include "Utils.h"
 
 #include <LibraryResources.h>
 
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     winrt::hstring NewTerminalArgs::GenerateName() const
     {
@@ -212,7 +212,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // The string will be similar to the following:
         // * "Send Input: ...input..."
 
-        auto escapedInput = til::visualize_control_codes(_Input);
+        auto escapedInput = VisualizeControlCodes(_Input);
         auto name = fmt::format(std::wstring_view(RS_(L"SendInputCommandKey")), escapedInput);
         return winrt::hstring{ name };
     }