Update Cascadia Code to 2008.25 (#7403)

(cherry picked from commit 0488c5322c)

.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,54 @@
+ACCEPTFILES
+ACCESSDENIED
+alignof
+bitfield
+bitfields
+CLASSNOTAVAILABLE
+environstrings
+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,37 @@
+ACLs
+altform
+appendwttlogging
+backplating
+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/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 }}

NuGet.Config

@@ -8,7 +8,12 @@
         <!--<add key="Static Package Dependencies" value="dep\packages" />-->
         
         <!-- Use our own NuGet Feed -->
-        <add key="Windows Terminal NuGet Feed" value="https://terminalnuget.blob.core.windows.net/feed/index.json" />
+        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
+		
+		<!-- Temporarily? use the feeds from our friends in MUX for Helix test stuff -->
+		<add key="dotnetfeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+        <add key="dnceng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+        <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
         
         <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
         <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />

OpenConsole.sln

@@ -160,15 +160,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalConnection", "src\cascadia\TerminalConnection\TerminalConnection.vcxproj", "{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalCore", "src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj", "{CA5CAD1A-ABCD-429C-B551-8562EC954746}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\cascadia\TerminalControl\TerminalControl.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{1CF55140-EF6A-4736-A403-957E4F7430BB} = {1CF55140-EF6A-4736-A403-957E4F7430BB}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {48D21369-3D7B-4431-9967-24E81292CF63}
 	EndProjectSection
@@ -178,20 +174,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
+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-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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalSettings", "src\cascadia\TerminalSettings\TerminalSettings.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalCore", "src\cascadia\UnitTests_TerminalCore\UnitTests.vcxproj", "{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}"
@@ -235,10 +227,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "sr
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
@@ -1389,35 +1380,6 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.Build.0 = AuditMode|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = Release|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|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.Build.0 = Debug|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.Build.0 = 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|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.Build.0 = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.Build.0 = 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
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|Any CPU.ActiveCfg = Release|Win32
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
@@ -2073,7 +2035,6 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}

README.md

@@ -60,6 +60,22 @@ 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)
 
+#### Via Scoop (unofficial)
+
+[Scoop](https://scoop.sh) users can download and install the latest Terminal release by installing the `windows-terminal` package:
+
+```powershell
+scoop install windows-terminal
+```
+
+To update Windows Terminal using Scoop, run the following:
+
+```powershell
+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.  
+
 ---
 
 ## Windows Terminal 2.0 Roadmap
@@ -163,6 +179,7 @@ If you would like to ask a question that you feel doesn't warrant an issue (yet)
 * 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)
+* Pankaj Bhojwani, Developer
 
 ## Developer Guidance
 

build/Helix/AzurePipelinesHelperScripts.ps1

@@ -0,0 +1,32 @@
+function GetAzureDevOpsBaseUri
+{
+    Param(
+        [string]$CollectionUri,
+        [string]$TeamProject
+    )
+
+    return $CollectionUri + $TeamProject
+}
+
+function GetQueryTestRunsUri
+{
+    Param(
+        [string]$CollectionUri,
+        [string]$TeamProject,
+        [string]$BuildUri,
+        [switch]$IncludeRunDetails
+    )
+
+    if ($IncludeRunDetails)
+    {
+        $includeRunDetailsParameter = "&includeRunDetails=true"
+    }
+    else
+    {
+        $includeRunDetailsParameter = ""
+    }
+
+    $baseUri = GetAzureDevOpsBaseUri -CollectionUri $CollectionUri -TeamProject $TeamProject
+    $queryUri = "$baseUri/_apis/test/runs?buildUri=$BuildUri$includeRunDetailsParameter&api-version=5.0"
+    return $queryUri
+}

build/Helix/ConvertWttLogToXUnit.ps1

@@ -0,0 +1,28 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttSingleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttMultipleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$XUnitOutputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TestNamePrefix
+)
+
+# Ideally these would be passed as parameters to the script. However ps makes it difficult to deal with string literals containing '&', so we just 
+# read the values directly from the environment variables
+$helixResultsContainerUri = $Env:HELIX_RESULTS_CONTAINER_URI
+$helixResultsContainerRsas = $Env:HELIX_RESULTS_CONTAINER_RSAS
+
+$rerunPassesRequiredToAvoidFailure = $env:rerunPassesRequiredToAvoidFailure
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+$testResultParser = [HelixTestHelpers.TestResultParser]::new($TestNamePrefix, $helixResultsContainerUri, $helixResultsContainerRsas)
+$testResultParser.ConvertWttLogToXUnitLog($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath, $XUnitOutputPath, $rerunPassesRequiredToAvoidFailure)

build/Helix/EnsureMachineState.ps1

@@ -0,0 +1,112 @@
+$scriptDirectory = $script:MyInvocation.MyCommand.Path | Split-Path -Parent
+
+# List all processes to aid debugging:
+Write-Host "All processes running:"
+Get-Process
+
+tasklist /svc
+
+# Add this test directory as an exclusion for Windows Defender
+Write-Host "Add $scriptDirectory as Exclusion Path"
+Add-MpPreference -ExclusionPath $scriptDirectory
+Write-Host "Add $($env:HELIX_CORRELATION_PAYLOAD) as Exclusion Path"
+Add-MpPreference -ExclusionPath $env:HELIX_CORRELATION_PAYLOAD
+Get-MpPreference
+Get-MpComputerStatus
+
+
+# Minimize all windows:
+$shell = New-Object -ComObject "Shell.Application"
+$shell.minimizeall()
+
+# Kill any instances of Windows Security Alert:
+$windowTitleToMatch = "*Windows Security Alert*"
+$procs = Get-Process | Where {$_.MainWindowTitle -like "*Windows Security Alert*"}
+foreach ($proc in $procs)
+{
+    Write-Host "Found process with '$windowTitleToMatch' title: $proc"
+    $proc.Kill();
+}
+
+# Kill processes by name that are known to interfere with our tests:
+$processNamesToStop = @("Microsoft.Photos", "WinStore.App", "SkypeApp", "SkypeBackgroundHost", "OneDriveSetup", "OneDrive")
+foreach($procName in $processNamesToStop)
+{
+    Write-Host "Attempting to kill $procName if it is running"
+    Stop-Process -ProcessName $procName -Verbose -ErrorAction Ignore   
+}
+Write-Host "All processes running after attempting to kill unwanted processes:"
+Get-Process
+
+tasklist /svc
+
+$platform = $env:testbuildplatform
+if(!$platform)
+{
+    $platform = "x86"
+}
+
+function UninstallApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        } 
+    }
+}
+
+function UninstallTestApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        }
+
+        # Sometimes an app can get into a state where it is no longer returned by Get-AppxPackage, but it is still present
+        # which prevents other versions of the app from being installed.
+        # To handle this, we can directly call Remove-AppxPackage against the full name of the package. However, without
+        # Get-AppxPackage to find the PackageFullName, we just have to manually construct the name.
+        $packageFullName = "$($pkgName)_1.0.0.0_$($platform)__8wekyb3d8bbwe" 
+        Write-Host "Removing $packageFullName if installed"
+        Remove-AppPackage $packageFullName -ErrorVariable appxerror -ErrorAction SilentlyContinue 
+        if($appxerror)
+        {
+            foreach($error in $appxerror)
+            {
+                # In most cases, Remove-AppPackage will fail due to the package not being found. Don't treat this as an error.
+                if(!($error.Exception.Message -match "0x80073CF1"))
+                {
+                    Write-Error $error
+                }
+            }
+        }
+        else
+        {
+            Write-Host "Successfully removed $packageFullName"
+        }
+    }
+}
+
+Write-Host "Uninstall AppX packages that are known to cause issues with our tests"
+UninstallApps("*Skype*", "*Windows.Photos*")
+
+Write-Host "Uninstall any of our test apps that may have been left over from previous test runs"
+UninstallTestApps("NugetPackageTestApp", "NugetPackageTestAppCX", "IXMPTestApp", "MUXControlsTestApp")
+
+Write-Host "Uninstall MUX Framework package that may have been left over from previous test runs"
+# We don't want to uninstall all versions of the MUX Framework package, as there may be other apps preinstalled on the system 
+# that depend on it. We only uninstall the Framework package that corresponds to the version of MUX that we are testing.
+[xml]$versionData = (Get-Content "version.props")
+$versionMajor = $versionData.GetElementsByTagName("MUXVersionMajor").'#text'
+$versionMinor = $versionData.GetElementsByTagName("MUXVersionMinor").'#text'
+UninstallApps("Microsoft.UI.Xaml.$versionMajor.$versionMinor")
+
+Get-Process

build/Helix/GenerateTestProjFile.ps1

@@ -0,0 +1,336 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$TestFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$OutputProjFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$JobTestSuiteName,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TaefPath,
+
+    [string]$TaefQuery
+)
+
+Class TestCollection
+{
+    [string]$Name
+    [string]$SetupMethodName
+    [string]$TeardownMethodName
+    [System.Collections.Generic.Dictionary[string, string]]$Properties
+
+    TestCollection()
+    {
+        if ($this.GetType() -eq [TestCollection])
+        {
+            throw "This class should never be instantiated directly; it should only be derived from."
+        }
+    }
+
+    TestCollection([string]$name)
+    {
+        $this.Init($name)
+    }
+
+    hidden Init([string]$name)
+    {
+        $this.Name = $name
+        $this.Properties = @{}
+    }
+}
+
+Class Test : TestCollection 
+{
+    Test([string]$name)
+    {
+        $this.Init($name)
+    }
+}
+
+Class TestClass : TestCollection
+{
+    [System.Collections.Generic.List[Test]]$Tests
+
+    TestClass([string]$name)
+    {
+        $this.Init($name)
+        $this.Tests = @{}
+    }
+}
+
+Class TestModule : TestCollection
+{
+    [System.Collections.Generic.List[TestClass]]$TestClasses
+
+    TestModule([string]$name)
+    {
+        $this.Init($name)
+        $this.TestClasses = @{}
+    }
+}
+
+function Parse-TestInfo([string]$taefOutput)
+{
+    enum LineType
+    {
+        None
+        TestModule
+        TestClass
+        Test
+        Setup
+        Teardown
+        Property
+    }
+        
+    [string]$testModuleIndentation = "        "
+    [string]$testClassIndentation = "            "
+    [string]$testIndentation = "                "
+    [string]$setupBeginning = "Setup: "
+    [string]$teardownBeginning = "Teardown: "
+    [string]$propertyBeginning = "Property["
+
+    function Get-LineType([string]$line)
+    {
+        if ($line.Contains($setupBeginning))
+        {
+            return [LineType]::Setup;
+        }
+        elseif ($line.Contains($teardownBeginning))
+        {
+            return [LineType]::Teardown;
+        }
+        elseif ($line.Contains($propertyBeginning))
+        {
+            return [LineType]::Property;
+        }
+        elseif ($line.StartsWith($testModuleIndentation) -and -not $line.StartsWith("$testModuleIndentation "))
+        {
+            return [LineType]::TestModule;
+        }
+        elseif ($line.StartsWith($testClassIndentation) -and -not $line.StartsWith("$testClassIndentation "))
+        {
+            return [LineType]::TestClass;
+        }
+        elseif ($line.StartsWith($testIndentation) -and -not $line.StartsWith("$testIndentation "))
+        {
+            return [LineType]::Test;
+        }
+        else
+        {
+            return [LineType]::None;
+        }
+    }
+
+    [string[]]$lines = $taefOutput.Split(@([Environment]::NewLine, "`n"), [StringSplitOptions]::RemoveEmptyEntries)
+    [System.Collections.Generic.List[TestModule]]$testModules = @()
+
+    [TestModule]$currentTestModule = $null
+    [TestClass]$currentTestClass = $null
+    [Test]$currentTest = $null
+
+    [TestCollection]$lastTestCollection = $null
+
+    foreach ($rawLine in $lines)
+    {
+        [LineType]$lineType = (Get-LineType $rawLine)
+
+        # We don't need the whitespace around the line anymore, so we'll discard it to make things easier.
+        [string]$line = $rawLine.Trim()
+
+        if ($lineType -eq [LineType]::TestModule)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            if ($currentTestModule -ne $null)
+            {
+                $testModules.Add($currentTestModule)
+            }
+
+            $currentTestModule = [TestModule]::new($line)
+            $currentTestClass = $null
+            $currentTest = $null
+            $lastTestCollection = $currentTestModule
+        }
+        elseif ($lineType -eq [LineType]::TestClass)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            $currentTestClass = [TestClass]::new($line)
+            $currentTest = $null
+            $lastTestCollection = $currentTestClass
+        }
+        elseif ($lineType -eq [LineType]::Test)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            $currentTest = [Test]::new($line)
+            $lastTestCollection = $currentTest
+        }
+        elseif ($lineType -eq [LineType]::Setup)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.SetupMethodName = $line.Replace($setupBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Teardown)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.TeardownMethodName = $line.Replace($teardownBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Property)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                foreach ($match in [Regex]::Matches($line, "Property\[(.*)\]\s+=\s+(.*)"))
+                {
+                    [string]$propertyKey = $match.Groups[1].Value;
+                    [string]$propertyValue = $match.Groups[2].Value;
+                    $lastTestCollection.Properties.Add($propertyKey, $propertyValue);
+                }
+            }
+        }
+    }
+
+    if ($currentTest -ne $null -and $currentTestClass -ne $null)
+    {
+        $currentTestClass.Tests.Add($currentTest)
+    }
+
+    if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+    {
+        $currentTestModule.TestClasses.Add($currentTestClass)
+    }
+
+    if ($currentTestModule -ne $null)
+    {
+        $testModules.Add($currentTestModule)
+    }
+
+    return $testModules
+}
+
+Write-Verbose "TaefQuery = $TaefQuery"
+
+$TaefSelectQuery = ""
+$TaefQueryToAppend = ""
+if($TaefQuery)
+{
+    $TaefSelectQuery = "/select:`"$TaefQuery`""
+    $TaefQueryToAppend = " and $TaefQuery"
+}
+Write-Verbose "TaefSelectQuery = $TaefSelectQuery"
+
+
+$taefExe = "$TaefPath\te.exe"
+[string]$taefOutput = & "$taefExe" /listproperties $TaefSelectQuery $TestFile | Out-String
+
+[System.Collections.Generic.List[TestModule]]$testModules = (Parse-TestInfo $taefOutput)
+
+$projFileContent = @"
+<Project>
+  <ItemGroup>
+"@
+
+foreach ($testModule in $testModules)
+{
+    foreach ($testClass in $testModules.TestClasses)
+    {
+        Write-Host "Generating Helix work item for test class $($testClass.Name)..."
+        [System.Collections.Generic.List[string]]$testSuiteNames = @()
+        
+        $testSuiteExists = $false
+        $suitelessTestExists = $false
+
+        foreach ($test in $testClass.Tests)
+        {
+            # A test method inherits its 'TestSuite' property from its TestClass
+            if (!$test.Properties.ContainsKey("TestSuite") -and $testClass.Properties.ContainsKey("TestSuite"))
+            {
+                $test.Properties["TestSuite"] = $testClass.Properties["TestSuite"]
+            }
+
+            if ($test.Properties.ContainsKey("TestSuite"))
+            {
+                [string]$testSuite = $test.Properties["TestSuite"]
+
+                if (-not $testSuiteNames.Contains($testSuite))
+                {
+                    Write-Host "    Found test suite $testSuite. Generating Helix work item for it as well."
+                    $testSuiteNames.Add($testSuite)
+                }
+
+                $testSuiteExists = $true
+            }
+            else
+            {
+                $suitelessTestExists = $true
+            }
+        }
+        
+        $testClassSelectPattern = "$($testClass.Name).*"
+        if($testClass.Name.Contains("::"))
+        {
+            $testClassSelectPattern = "$($testClass.Name)::*"
+        }
+        $testNameQuery= "(@Name='$testClassSelectPattern')"
+
+        $workItemName = $testClass.Name
+        # Native tests use '::' as a separator, which is not valid for workItem names.
+        $workItemName = $workItemName -replace "::", "-"
+        
+        if ($suitelessTestExists)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*'$(if ($testSuiteExists) { "and not @TestSuite='*'" }))$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+        
+        foreach ($testSuiteName in $testSuiteNames)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)-$testSuiteName" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*' and @TestSuite='$testSuiteName')$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+    }
+}
+
+$projFileContent += @"
+
+  </ItemGroup>
+</Project>
+"@
+
+Set-Content $OutputProjFile $projFileContent -NoNewline -Encoding UTF8

build/Helix/HelixTestHelpers.cs

@@ -0,0 +1,669 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Xml.Linq;
+
+namespace HelixTestHelpers
+{
+    public class TestResult
+    {
+        public TestResult()
+        {
+            Screenshots = new List<string>();
+            RerunResults = new List<TestResult>();
+        }
+
+        public string Name { get; set; }
+        public string SourceWttFile { get; set; }
+        public bool Passed { get; set; }
+        public bool CleanupPassed { get; set; }
+        public TimeSpan ExecutionTime { get; set; }
+        public string Details { get; set; }
+
+        public List<string> Screenshots { get; private set; }
+        public List<TestResult> RerunResults { get; private set; }
+
+        // Returns true if the test pass rate is sufficient to avoid being counted as a failure.
+        public bool PassedOrUnreliable(int requiredNumberOfPasses)
+        {
+            if(Passed)
+            {
+                return true;
+            }
+            else
+            {
+                if(RerunResults.Count == 1)
+                {
+                    return RerunResults[0].Passed;
+                }
+                else
+                {
+                    return RerunResults.Where(r => r.Passed).Count() >= requiredNumberOfPasses;
+                }
+            }
+        }
+    }
+    
+    //
+    // Azure DevOps doesn't currently provide a way to directly report sub-results for tests that failed at least once
+    // that were run multiple times.  To get around that limitation, we'll mark the test as "Skip" since
+    // that's the only non-pass/fail result we can return, and will then report the information about the
+    // runs in the "reason" category for the skipped test.  In order to save space, we'll make the following
+    // optimizations for size:
+    //
+    //   1. Serialize as JSON, which is more compact than XML;
+    //   2. Don't serialize values that we don't need;
+    //   3. Store the URL prefix and suffix for the blob storage URL only once instead of
+    //      storing every log and screenshot URL in its entirety; and
+    //   4. Store a list of unique error messages and then index into that instead of
+    //      storing every error message in its entirety.
+    //
+    // #4 is motivated by the fact that if a test fails multiple times, it probably failed for the same reason
+    // each time, in which case we'd just be repeating ourselves if we stored every error message each time.
+    //
+    // TODO (https://github.com/dotnet/arcade/issues/2773): Once we're able to directly report things in a
+    // more granular fashion than just a binary pass/fail result, we should do that.
+    //
+    [DataContract]  
+    internal class JsonSerializableTestResults
+    {  
+        [DataMember]
+        internal string blobPrefix;
+        
+        [DataMember]
+        internal string blobSuffix;
+        
+        [DataMember]
+        internal string[] errors;
+        
+        [DataMember]
+        internal JsonSerializableTestResult[] results;
+    }
+    
+    [DataContract]  
+    internal class JsonSerializableTestResult  
+    {
+        [DataMember]
+        internal string outcome;
+
+        [DataMember]
+        internal int duration;
+        
+        [DataMember(EmitDefaultValue = false)]
+        internal string log;
+        
+        [DataMember(EmitDefaultValue = false)]
+        internal string[] screenshots;
+        
+        [DataMember(EmitDefaultValue = false)]
+        internal int errorIndex;
+    }
+    
+    public class TestPass
+    {
+        public TimeSpan TestPassExecutionTime { get; set; }
+        public List<TestResult> TestResults { get; set; }
+        
+        public static TestPass ParseTestWttFile(string fileName, bool cleanupFailuresAreRegressions, bool truncateTestNames)
+        {
+            using (var stream = File.OpenRead(fileName))
+            {
+                var doc = XDocument.Load(stream);
+                var testResults = new List<TestResult>();
+                var testExecutionTimeMap = new Dictionary<string, List<double>>();
+
+                TestResult currentResult = null;
+                long frequency = 0;
+                long startTime = 0;
+                long stopTime = 0;
+                bool inTestCleanup = false;
+
+                bool shouldLogToTestDetails = false;
+
+                long testPassStartTime = 0;
+                long testPassStopTime = 0;
+
+                Func<XElement, bool> isScopeData = (elt) =>
+                {
+                    return
+                        elt.Element("Data") != null &&
+                        elt.Element("Data").Element("WexContext") != null &&
+                        (
+                            elt.Element("Data").Element("WexContext").Value == "Cleanup" ||
+                            elt.Element("Data").Element("WexContext").Value == "TestScope" ||
+                            elt.Element("Data").Element("WexContext").Value == "TestScope" ||
+                            elt.Element("Data").Element("WexContext").Value == "ClassScope" ||
+                            elt.Element("Data").Element("WexContext").Value == "ModuleScope"
+                        );
+                };
+
+                Func<XElement, bool> isModuleOrClassScopeStart = (elt) =>
+                {
+                    return
+                        elt.Name == "Msg" &&
+                        elt.Element("Data") != null &&
+                        elt.Element("Data").Element("StartGroup") != null &&
+                        elt.Element("Data").Element("WexContext") != null &&
+                            (elt.Element("Data").Element("WexContext").Value == "ClassScope" ||
+                            elt.Element("Data").Element("WexContext").Value == "ModuleScope");
+                };
+
+                Func<XElement, bool> isModuleScopeEnd = (elt) =>
+                {
+                    return
+                        elt.Name == "Msg" &&
+                        elt.Element("Data") != null &&
+                        elt.Element("Data").Element("EndGroup") != null &&
+                        elt.Element("Data").Element("WexContext") != null &&
+                        elt.Element("Data").Element("WexContext").Value == "ModuleScope";
+                };
+
+                Func<XElement, bool> isClassScopeEnd = (elt) =>
+                {
+                    return
+                        elt.Name == "Msg" &&
+                        elt.Element("Data") != null &&
+                        elt.Element("Data").Element("EndGroup") != null &&
+                        elt.Element("Data").Element("WexContext") != null &&
+                        elt.Element("Data").Element("WexContext").Value == "ClassScope";
+                };
+
+                int testsExecuting = 0;
+                foreach (XElement element in doc.Root.Elements())
+                {
+                    // Capturing the frequency data to record accurate
+                    // timing data.
+                    if (element.Name == "RTI")
+                    {
+                        frequency = Int64.Parse(element.Attribute("Frequency").Value);
+                    }
+
+                    // It's possible for a test to launch another test. If that happens, we won't modify the
+                    // current result. Instead, we'll continue operating like normal and expect that we get two
+                    // EndTests nodes before our next StartTests. We'll check that we've actually got a stop time
+                    // before creating a new result. This will result in the two results being squashed
+                    // into one result of the outer test that ran the inner one.
+                    if (element.Name == "StartTest")
+                    {
+                        testsExecuting++;
+                        if (testsExecuting == 1)
+                        {
+                            string testName = element.Attribute("Title").Value;
+                            
+                            if (truncateTestNames)
+                            {
+                                const string xamlNativePrefix = "Windows::UI::Xaml::Tests::";
+                                const string xamlManagedPrefix = "Windows.UI.Xaml.Tests.";
+                                if (testName.StartsWith(xamlNativePrefix))
+                                {
+                                    testName = testName.Substring(xamlNativePrefix.Length);
+                                }
+                                else if (testName.StartsWith(xamlManagedPrefix))
+                                {
+                                    testName = testName.Substring(xamlManagedPrefix.Length);
+                                }
+                            }
+
+                            currentResult = new TestResult() { Name = testName, SourceWttFile = fileName, Passed = true, CleanupPassed = true };
+                            testResults.Add(currentResult);
+                            startTime = Int64.Parse(element.Descendants("WexTraceInfo").First().Attribute("TimeStamp").Value);
+                            inTestCleanup = false;
+                            shouldLogToTestDetails = true;
+                            stopTime = 0;
+                        }
+                    }
+                    else if (currentResult != null && element.Name == "EndTest")
+                    {
+                        testsExecuting--;
+
+                        // If any inner test fails, we'll still fail the outer
+                        currentResult.Passed &= element.Attribute("Result").Value == "Pass";
+
+                        // Only gather execution data if this is the outer test we ran initially
+                        if (testsExecuting == 0)
+                        {
+                            stopTime = Int64.Parse(element.Descendants("WexTraceInfo").First().Attribute("TimeStamp").Value);
+                            if (!testExecutionTimeMap.Keys.Contains(currentResult.Name))
+                                testExecutionTimeMap[currentResult.Name] = new List<double>();
+                            testExecutionTimeMap[currentResult.Name].Add((double)(stopTime - startTime) / frequency);
+                            currentResult.ExecutionTime = TimeSpan.FromSeconds(testExecutionTimeMap[currentResult.Name].Average());
+
+                            startTime = 0;
+                            inTestCleanup = true;
+                        }
+                    }
+                    else if (currentResult != null &&
+                            (isModuleOrClassScopeStart(element) || isModuleScopeEnd(element) || isClassScopeEnd(element)))
+                    {
+                        shouldLogToTestDetails = false;
+                        inTestCleanup = false;
+                    }
+
+                    // Log-appending methods.
+                    if (currentResult != null && element.Name == "Error")
+                    {
+                        if (shouldLogToTestDetails)
+                        {
+                            currentResult.Details += "\r\n[Error]: " + element.Attribute("UserText").Value;
+                            if (element.Attribute("File") != null && element.Attribute("File").Value != "")
+                            {
+                                currentResult.Details += (" [File " + element.Attribute("File").Value);
+                                if (element.Attribute("Line") != null)
+                                    currentResult.Details += " Line: " + element.Attribute("Line").Value;
+                                currentResult.Details += "]";
+                            }
+                        }
+
+
+                        // The test cleanup errors will often come after the test claimed to have
+                        // 'passed'. We treat them as errors as well. 
+                        if (inTestCleanup)
+                        {
+                            currentResult.CleanupPassed = false;
+                            currentResult.Passed = false;
+                            // In stress mode runs, this test will run n times before cleanup is run. If the cleanup
+                            // fails, we want to fail every test.
+                            if (cleanupFailuresAreRegressions)
+                            {
+                                foreach (var result in testResults.Where(res => res.Name == currentResult.Name))
+                                {
+                                    result.Passed = false;
+                                    result.CleanupPassed = false;
+                                }
+                            }
+                        }
+                    }
+
+                    if (currentResult != null && element.Name == "Warn")
+                    {
+                        if (shouldLogToTestDetails)
+                        {
+                            currentResult.Details += "\r\n[Warn]: " + element.Attribute("UserText").Value;
+                        }
+
+                        if (element.Attribute("File") != null && element.Attribute("File").Value != "")
+                        {
+                            currentResult.Details += (" [File " + element.Attribute("File").Value);
+                            if (element.Attribute("Line") != null)
+                                currentResult.Details += " Line: " + element.Attribute("Line").Value;
+                            currentResult.Details += "]";
+                        }
+                    }
+
+                    if (currentResult != null && element.Name == "Msg")
+                    {
+                        var dataElement = element.Element("Data");
+                        if (dataElement != null)
+                        {
+                            var supportingInfo = dataElement.Element("SupportingInfo");
+                            if (supportingInfo != null)
+                            {
+                                var screenshots = supportingInfo.Elements("Item")
+                                    .Where(item => GetAttributeValue(item, "Name") == "Screenshot")
+                                    .Select(item => GetAttributeValue(item, "Value"));
+
+                                foreach(var screenshot in screenshots)
+                                {
+                                    string fileNameSuffix = string.Empty;
+                                    
+                                    if (fileName.Contains("_rerun_multiple"))
+                                    {
+                                        fileNameSuffix = "_rerun_multiple";
+                                    }
+                                    else if (fileName.Contains("_rerun"))
+                                    {
+                                        fileNameSuffix = "_rerun";
+                                    }
+                                    
+                                    currentResult.Screenshots.Add(screenshot.Replace(".jpg", fileNameSuffix + ".jpg"));
+                                }
+                            }
+                        }
+                    }
+                }
+
+                testPassStartTime = Int64.Parse(doc.Root.Descendants("WexTraceInfo").First().Attribute("TimeStamp").Value);
+                testPassStopTime = Int64.Parse(doc.Root.Descendants("WexTraceInfo").Last().Attribute("TimeStamp").Value);
+
+                var testPassTime = TimeSpan.FromSeconds((double)(testPassStopTime - testPassStartTime) / frequency);
+                
+                foreach (TestResult testResult in testResults)
+                {
+                    if (testResult.Details != null)
+                    {
+                        testResult.Details = testResult.Details.Trim();
+                    }
+                }
+
+                var testpass = new TestPass
+                {
+                    TestPassExecutionTime = testPassTime,
+                    TestResults = testResults
+                };
+
+                return testpass;
+            }
+        }
+        
+        public static TestPass ParseTestWttFileWithReruns(string fileName, string singleRerunFileName, string multipleRerunFileName, bool cleanupFailuresAreRegressions, bool truncateTestNames)
+        {
+            TestPass testPass = ParseTestWttFile(fileName, cleanupFailuresAreRegressions, truncateTestNames);
+            TestPass singleRerunTestPass = File.Exists(singleRerunFileName) ? ParseTestWttFile(singleRerunFileName, cleanupFailuresAreRegressions, truncateTestNames) : null;
+            TestPass multipleRerunTestPass = File.Exists(multipleRerunFileName) ? ParseTestWttFile(multipleRerunFileName, cleanupFailuresAreRegressions, truncateTestNames) : null;
+            
+            List<TestResult> rerunTestResults = new List<TestResult>();
+
+            if (singleRerunTestPass != null)
+            {
+                rerunTestResults.AddRange(singleRerunTestPass.TestResults);
+            }
+
+            if (multipleRerunTestPass != null)
+            {
+                rerunTestResults.AddRange(multipleRerunTestPass.TestResults);
+            }
+
+            // For each failed test result, we'll check to see whether the test passed at least once upon rerun.
+            // If so, we'll set PassedOnRerun to true to flag the fact that this is an unreliable test
+            // rather than a genuine test failure.
+            foreach (TestResult failedTestResult in testPass.TestResults.Where(r => !r.Passed))
+            {
+                failedTestResult.RerunResults.AddRange(rerunTestResults.Where(r => r.Name == failedTestResult.Name));
+            }
+
+            return testPass;
+        }
+
+        private static string GetAttributeValue(XElement element, string attributeName)
+        {
+            if(element.Attribute(attributeName) != null)
+            {
+                return element.Attribute(attributeName).Value;
+            }
+
+            return null;
+        }
+    }
+
+    public static class FailedTestDetector
+    {
+        public static void OutputFailedTestQuery(string wttInputPath)
+        {
+            var testPass = TestPass.ParseTestWttFile(wttInputPath, cleanupFailuresAreRegressions: true, truncateTestNames: false);
+            
+            List<string> failedTestNames = new List<string>();
+            
+            foreach (var result in testPass.TestResults)
+            {
+                if (!result.Passed)
+                {
+                    failedTestNames.Add(result.Name);
+                }
+            }
+            
+            if (failedTestNames.Count > 0)
+            {
+                string failedTestSelectQuery = "(@Name='";
+                
+                for (int i = 0; i < failedTestNames.Count; i++)
+                {
+                    failedTestSelectQuery += failedTestNames[i];
+                    
+                    if (i < failedTestNames.Count - 1)
+                    {
+                        failedTestSelectQuery += "' or @Name='";
+                    }
+                }
+                
+                failedTestSelectQuery += "')";
+            
+                Console.WriteLine(failedTestSelectQuery);
+            }
+            else
+            {
+                Console.WriteLine("");
+            }
+        }
+    }
+
+    public class TestResultParser
+    {
+        private string testNamePrefix;
+        private string helixResultsContainerUri;
+        private string helixResultsContainerRsas;
+    
+        public TestResultParser(string testNamePrefix, string helixResultsContainerUri, string helixResultsContainerRsas)
+        {
+            this.testNamePrefix = testNamePrefix;
+            this.helixResultsContainerUri = helixResultsContainerUri;
+            this.helixResultsContainerRsas = helixResultsContainerRsas;
+        }
+
+        public Dictionary<string, string> GetSubResultsJsonByMethodName(string wttInputPath, string wttSingleRerunInputPath, string wttMultipleRerunInputPath)
+        {
+            Dictionary<string, string> subResultsJsonByMethod = new Dictionary<string, string>();
+            TestPass testPass = TestPass.ParseTestWttFileWithReruns(wttInputPath, wttSingleRerunInputPath, wttMultipleRerunInputPath, cleanupFailuresAreRegressions: true, truncateTestNames: false);
+            
+            foreach (var result in testPass.TestResults)
+            {
+                var methodName = result.Name.Substring(result.Name.LastIndexOf('.') + 1);
+
+                if (!result.Passed)
+                {
+                    // If a test failed, we'll have rerun it multiple times.  We'll record the results of each run
+                    // formatted as JSON.
+                    JsonSerializableTestResults serializableResults = new JsonSerializableTestResults();
+                    serializableResults.blobPrefix = helixResultsContainerUri;
+                    serializableResults.blobSuffix = helixResultsContainerRsas;
+
+                    List<string> errorList = new List<string>();
+                    errorList.Add(result.Details);
+
+                    foreach (TestResult rerunResult in result.RerunResults)
+                    {
+                        errorList.Add(rerunResult.Details);
+                    }
+
+                    serializableResults.errors = errorList.Distinct().Where(s => s != null).ToArray();
+
+                    var reason = new XElement("reason");
+                    List<JsonSerializableTestResult> serializableResultList = new List<JsonSerializableTestResult>();
+                    serializableResultList.Add(ConvertToSerializableResult(result, serializableResults.errors));
+
+                    foreach (TestResult rerunResult in result.RerunResults)
+                    {
+                        serializableResultList.Add(ConvertToSerializableResult(rerunResult, serializableResults.errors));
+                    }
+
+                    serializableResults.results = serializableResultList.ToArray();
+
+                    using (MemoryStream stream = new MemoryStream())
+                    {
+                        DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(JsonSerializableTestResults));
+                        serializer.WriteObject(stream, serializableResults);
+                        stream.Position = 0;
+
+                        using (StreamReader streamReader = new StreamReader(stream))
+                        {
+                            subResultsJsonByMethod.Add(methodName, streamReader.ReadToEnd());
+                        }
+                    }
+                }
+            }
+
+            return subResultsJsonByMethod;
+        }
+
+        public void ConvertWttLogToXUnitLog(string wttInputPath, string wttSingleRerunInputPath, string wttMultipleRerunInputPath, string xunitOutputPath, int requiredPassRateThreshold)
+        {
+            TestPass testPass = TestPass.ParseTestWttFileWithReruns(wttInputPath, wttSingleRerunInputPath, wttMultipleRerunInputPath, cleanupFailuresAreRegressions: true, truncateTestNames: false);
+            var results = testPass.TestResults;
+
+            int resultCount = results.Count;
+            int passedCount = results.Where(r => r.Passed).Count();
+            
+            // Since we re-run tests on failure, we'll mark every test that failed at least once as "skipped" rather than "failed".
+            // If the test failed sufficiently often enough for it to count as a failed test (determined by a property on the
+            // Azure DevOps job), we'll later mark it as failed during test results processing.
+
+            int failedCount = results.Where(r => !r.PassedOrUnreliable(requiredPassRateThreshold)).Count();
+            int skippedCount = results.Where(r => !r.Passed && r.PassedOrUnreliable(requiredPassRateThreshold)).Count();
+
+            var root = new XElement("assemblies");
+
+            var assembly = new XElement("assembly");
+            assembly.SetAttributeValue("name", "MUXControls.Test.dll");
+            assembly.SetAttributeValue("test-framework", "TAEF");
+            assembly.SetAttributeValue("run-date", DateTime.Now.ToString("yyyy-MM-dd"));
+
+            // This doesn't need to be completely accurate since it's not exposed anywhere.
+            // If we need accurate an start time we can probably calculate it from the te.wtl file, but for
+            // now this is fine.
+            assembly.SetAttributeValue("run-time", (DateTime.Now - testPass.TestPassExecutionTime).ToString("hh:mm:ss"));
+            
+            assembly.SetAttributeValue("total", resultCount);
+            assembly.SetAttributeValue("passed", passedCount);
+            assembly.SetAttributeValue("failed", failedCount);
+            assembly.SetAttributeValue("skipped", skippedCount);
+            
+            assembly.SetAttributeValue("time", (int)testPass.TestPassExecutionTime.TotalSeconds);
+            assembly.SetAttributeValue("errors", 0);
+            root.Add(assembly);
+
+            var collection = new XElement("collection");
+            collection.SetAttributeValue("total", resultCount);
+            collection.SetAttributeValue("passed", passedCount);
+            collection.SetAttributeValue("failed", failedCount);
+            collection.SetAttributeValue("skipped", skippedCount);
+            collection.SetAttributeValue("name", "Test collection");
+            collection.SetAttributeValue("time", (int)testPass.TestPassExecutionTime.TotalSeconds);
+            assembly.Add(collection);
+
+            foreach (var result in results)
+            {
+                var test = new XElement("test");
+                test.SetAttributeValue("name", testNamePrefix + "." + result.Name);
+
+                var className = GetTestClassName(result.Name);
+                var methodName = GetTestMethodName(result.Name);
+                test.SetAttributeValue("type", className);
+                test.SetAttributeValue("method", methodName);
+
+                test.SetAttributeValue("time", result.ExecutionTime.TotalSeconds);
+                
+                string resultString = string.Empty;
+                
+                if (result.Passed)
+                {
+                    resultString = "Pass";
+                }
+                else if(result.PassedOrUnreliable(requiredPassRateThreshold))
+                {
+                    resultString = "Skip";
+                }
+                else
+                {
+                    resultString = "Fail";
+                }
+
+                
+                test.SetAttributeValue("result", resultString);
+
+                if (!result.Passed)
+                {
+                    // If a test failed, we'll have rerun it multiple times.
+                    // We'll save the subresults to a JSON text file that we'll upload to the helix results container -
+                    // this allows it to be as long as we want, whereas the reason field in Azure DevOps has a 4000 character limit.
+                    string subResultsFileName = methodName + "_subresults.json";
+                    string subResultsFilePath = Path.Combine(Path.GetDirectoryName(wttInputPath), subResultsFileName);
+					
+                    if (result.PassedOrUnreliable(requiredPassRateThreshold))
+                    {
+                        var reason = new XElement("reason");
+                        reason.Add(new XCData(GetUploadedFileUrl(subResultsFileName, helixResultsContainerUri, helixResultsContainerRsas)));
+                        test.Add(reason);
+                    }
+                    else
+                    {
+                        var failure = new XElement("failure");
+                        var message = new XElement("message");
+						message.Add(new XCData(GetUploadedFileUrl(subResultsFileName, helixResultsContainerUri, helixResultsContainerRsas)));
+                        failure.Add(message);
+                        test.Add(failure);
+                    }
+                }
+                collection.Add(test);
+            }
+
+            File.WriteAllText(xunitOutputPath, root.ToString());
+        }
+        
+        private JsonSerializableTestResult ConvertToSerializableResult(TestResult rerunResult, string[] uniqueErrors)
+        {
+            var serializableResult = new JsonSerializableTestResult();
+            
+            serializableResult.outcome = rerunResult.Passed ? "Passed" : "Failed";
+            serializableResult.duration = (int)Math.Round(rerunResult.ExecutionTime.TotalMilliseconds);
+            
+            if (!rerunResult.Passed)
+            {
+                serializableResult.log = Path.GetFileName(rerunResult.SourceWttFile);
+                
+                if (rerunResult.Screenshots.Any())
+                {
+                    List<string> screenshots = new List<string>();
+                    
+                    foreach (var screenshot in rerunResult.Screenshots)
+                    {
+                        screenshots.Add(Path.GetFileName(screenshot));
+                    }
+                    
+                    serializableResult.screenshots = screenshots.ToArray();
+                }
+                
+                // To conserve space, we'll log the index of the error to index in a list of unique errors rather than
+                // jotting down every single error in its entirety. We'll add one to the result so we can avoid
+                // serializing this property when it has the default value of 0.
+                serializableResult.errorIndex = Array.IndexOf(uniqueErrors, rerunResult.Details) + 1;
+            }
+            
+            return serializableResult;
+        }
+
+        private string GetUploadedFileUrl(string filePath, string helixResultsContainerUri, string helixResultsContainerRsas)
+        {
+            var filename = Path.GetFileName(filePath);
+            return string.Format("{0}/{1}{2}", helixResultsContainerUri, filename, helixResultsContainerRsas);
+        }
+		
+		private string GetTestNameSeparator(string testname)
+        {
+            var separatorString = ".";
+            if (!testname.Contains(separatorString))
+            {
+                separatorString = "::";
+            }
+            return separatorString;
+        }
+
+        private string GetTestMethodName(string fullyQualifiedName)
+        {
+            var separatorString = GetTestNameSeparator(fullyQualifiedName);
+            var methodName = fullyQualifiedName.Substring(fullyQualifiedName.LastIndexOf(separatorString) + separatorString.Length);
+
+            return methodName;
+        }
+
+        private string GetTestClassName(string fullyQualifiedName)
+        {
+            var separatorString = GetTestNameSeparator(fullyQualifiedName);
+            var className = fullyQualifiedName.Substring(0, fullyQualifiedName.LastIndexOf(separatorString));
+
+            return className;
+        }
+    }
+}

build/Helix/InstallTestAppDependencies.ps1

@@ -0,0 +1,12 @@
+# Displaying progress is unnecessary and is just distracting.
+$ProgressPreference = "SilentlyContinue"
+
+$dependencyFiles = Get-ChildItem -Filter "*Microsoft.VCLibs.*.appx"
+
+foreach ($file in $dependencyFiles)
+{
+    Write-Host "Adding dependency $($file)..."
+
+    Add-AppxPackage $file
+    
+}

build/Helix/OutputFailedTestQuery.ps1

@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath
+)
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+[HelixTestHelpers.FailedTestDetector]::OutputFailedTestQuery($WttInputPath)

build/Helix/OutputSubResultsJsonFiles.ps1

@@ -0,0 +1,32 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttSingleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttMultipleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TestNamePrefix
+)
+
+# Ideally these would be passed as parameters to the script. However ps makes it difficult to deal with string literals containing '&', so we just 
+# read the values directly from the environment variables
+$helixResultsContainerUri = $Env:HELIX_RESULTS_CONTAINER_URI
+$helixResultsContainerRsas = $Env:HELIX_RESULTS_CONTAINER_RSAS
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+$testResultParser = [HelixTestHelpers.TestResultParser]::new($TestNamePrefix, $helixResultsContainerUri, $helixResultsContainerRsas)
+[System.Collections.Generic.Dictionary[string, string]]$subResultsJsonByMethodName = $testResultParser.GetSubResultsJsonByMethodName($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath)
+
+$subResultsJsonDirectory = [System.IO.Path]::GetDirectoryName($WttInputPath)
+
+foreach ($methodName in $subResultsJsonByMethodName.Keys)
+{
+    $subResultsJson = $subResultsJsonByMethodName[$methodName]
+    $subResultsJsonPath = [System.IO.Path]::Combine($subResultsJsonDirectory, $methodName + "_subresults.json")
+    Out-File $subResultsJsonPath -Encoding utf8 -InputObject $subResultsJson
+}

build/Helix/OutputTestResults.ps1

@@ -0,0 +1,131 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [int]$MinimumExpectedTestsExecutedCount,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI,
+    [bool]$CheckJobAttempt
+)
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+Write-Host "Checking test results..."
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
+Write-Host "queryUri = $queryUri"
+
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+[System.Collections.Generic.List[string]]$failingTests = @()
+[System.Collections.Generic.List[string]]$unreliableTests = @()
+[System.Collections.Generic.List[string]]$unexpectedResultTest = @()
+
+[System.Collections.Generic.List[string]]$namesOfProcessedTestRuns = @()
+$totalTestsExecutedCount = 0
+
+# We assume that we only have one testRun with a given name that we care about
+# We only process the last testRun with a given name (based on completedDate)
+# The name of a testRun is set to the Helix queue that it was run on (e.g. windows.10.amd64.client19h1.xaml)
+# If we have multiple test runs on the same queue that we care about, we will need to re-visit this logic
+foreach ($testRun in ($testRuns.value | Sort-Object -Property "completedDate" -Descending))
+{
+    if ($CheckJobAttempt)
+    {
+        if ($namesOfProcessedTestRuns -contains $testRun.name)
+        {
+            Write-Host "Skipping test run '$($testRun.name)', since we have already processed a test run of that name."
+            continue
+        }
+    }
+    
+    Write-Host "Processing results from test run '$($testRun.name)'"
+    $namesOfProcessedTestRuns.Add($testRun.name)
+
+    $totalTestsExecutedCount += $testRun.totalTests
+
+    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
+        
+    foreach ($testResult in $testResults.value)
+    {
+        $shortTestCaseTitle = $testResult.testCaseTitle -replace "[a-zA-Z0-9]+.[a-zA-Z0-9]+.Windows.UI.Xaml.Tests.MUXControls.",""
+
+        if ($testResult.outcome -eq "Failed")
+        {
+            if (-not $failingTests.Contains($shortTestCaseTitle))
+            {
+                $failingTests.Add($shortTestCaseTitle)
+            }
+        }
+        elseif ($testResult.outcome -eq "Warning")
+        {
+            if (-not $unreliableTests.Contains($shortTestCaseTitle))
+            {
+                $unreliableTests.Add($shortTestCaseTitle)
+            }
+        }
+        elseif ($testResult.outcome -ne "Passed")
+        {
+            # We should only see tests with result "Passed", "Failed" or "Warning"
+            if (-not $unexpectedResultTest.Contains($shortTestCaseTitle))
+            {
+                $unexpectedResultTest.Add($shortTestCaseTitle)
+            }
+        }
+    }
+}
+
+if ($unreliableTests.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=warning;]Unreliable tests:
+##vso[task.logissue type=warning;]$($unreliableTests -join "$([Environment]::NewLine)##vso[task.logissue type=warning;]")
+
+"@
+}
+
+if ($failingTests.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=error;]Failing tests:
+##vso[task.logissue type=error;]$($failingTests -join "$([Environment]::NewLine)##vso[task.logissue type=error;]")
+
+"@
+}
+
+if ($unexpectedResultTest.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=error;]Tests with unexpected results:
+##vso[task.logissue type=error;]$($unexpectedResultTest -join "$([Environment]::NewLine)##vso[task.logissue type=error;]")
+
+"@
+}
+
+if($totalTestsExecutedCount -lt $MinimumExpectedTestsExecutedCount)
+{
+    Write-Host "Expected at least $MinimumExpectedTestsExecutedCount tests to be executed."
+    Write-Host "Actual executed test count is: $totalTestsExecutedCount"
+    Write-Host "##vso[task.complete result=Failed;]"
+}
+elseif ($failingTests.Count -gt 0)
+{
+    Write-Host "At least one test failed."
+    Write-Host "##vso[task.complete result=Failed;]"
+}
+elseif ($unreliableTests.Count -gt 0)
+{
+    Write-Host "All tests eventually passed, but some initially failed."
+    Write-Host "##vso[task.complete result=Succeeded;]"
+}
+else
+{
+    Write-Host "All tests passed."
+    Write-Host "##vso[task.complete result=Succeeded;]"
+}

build/Helix/PrepareHelixPayload.ps1

@@ -0,0 +1,54 @@
+[CmdLetBinding()]
+Param(
+    [string]$Platform,
+    [string]$Configuration,
+    [string]$ArtifactName='drop'
+)
+
+$payloadDir = "HelixPayload\$Configuration\$Platform"
+
+$repoDirectory = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\"
+$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
+ 
+# Create the payload directory. Remove it if it already exists.
+If(test-path $payloadDir)
+{
+    Remove-Item $payloadDir -Recurse
+}
+New-Item -ItemType Directory -Force -Path $payloadDir
+
+# Copy files from nuget packages
+Copy-Item "$nugetPackagesDir\microsoft.windows.apps.test.1.0.181203002\lib\netcoreapp2.1\*.dll" $payloadDir
+Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\*" $payloadDir
+Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\CoreClr\*" $payloadDir
+New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
+
+function Copy-If-Exists
+{
+    Param($source, $destinationDir)
+
+    if (Test-Path $source)
+    {
+        Write-Host "Copy from '$source' to '$destinationDir'"
+        Copy-Item -Force $source $destinationDir
+    }
+    else
+    {
+        Write-Host "'$source' does not exist."
+    }
+}
+
+# Copy files from the 'drop' artifact dir
+Copy-Item "$repoDirectory\Artifacts\$ArtifactName\$Configuration\$Platform\Test\*" $payloadDir -Recurse
+
+# Copy files from the repo
+New-Item -ItemType Directory -Force -Path "$payloadDir"
+Copy-Item "build\helix\ConvertWttLogToXUnit.ps1" "$payloadDir"
+Copy-Item "build\helix\OutputFailedTestQuery.ps1" "$payloadDir"
+Copy-Item "build\helix\OutputSubResultsJsonFiles.ps1" "$payloadDir"
+Copy-Item "build\helix\HelixTestHelpers.cs" "$payloadDir"
+Copy-Item "build\helix\runtests.cmd" $payloadDir
+Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir"
+Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"

build/Helix/ProcessHelixFiles.ps1

@@ -0,0 +1,112 @@
+Param(
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$HelixAccessToken = $env:HelixAccessToken,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI,
+    [string]$OutputFolder = "HelixOutput"
+)
+
+$helixLinkFile = "$OutputFolder\LinksToHelixTestFiles.html"
+
+$accessTokenParam = ""
+if($HelixAccessToken)
+{
+    $accessTokenParam = "?access_token=$HelixAccessToken"
+}
+
+function Generate-File-Links
+{
+    Param ([Array[]]$files,[string]$sectionName)
+    if($files.Count -gt 0)
+    {
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<div class=$sectionName>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<h4>$sectionName</h4>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<ul>"
+        foreach($file in $files)
+        {
+            Out-File -FilePath $helixLinkFile -Append -InputObject "<li><a href=$($file.Link)>$($file.Name)</a></li>"
+        }
+        Out-File -FilePath $helixLinkFile -Append -InputObject "</ul>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "</div>"
+    }
+}
+
+#Create output directory
+New-Item $OutputFolder -ItemType Directory
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
+Write-Host "queryUri = $queryUri"
+
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+$webClient = New-Object System.Net.WebClient
+[System.Collections.Generic.List[string]]$workItems = @()
+
+foreach ($testRun in $testRuns.value)
+{
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
+    $isTestRunNameShown = $false
+
+    foreach ($testResult in $testResults.value)
+    {
+        if ("comment" -in $testResult)
+        {
+            $info = ConvertFrom-Json $testResult.comment
+            $helixJobId = $info.HelixJobId
+            $helixWorkItemName = $info.HelixWorkItemName
+
+            $workItem = "$helixJobId-$helixWorkItemName"
+
+            if (-not $workItems.Contains($workItem))
+            {
+                $workItems.Add($workItem)
+                $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files$accessTokenParam"
+                $files = Invoke-RestMethod -Uri $filesQueryUri -Method Get
+
+                $screenShots = $files | where { $_.Name.EndsWith(".jpg") }
+                $dumps = $files | where { $_.Name.EndsWith(".dmp") }
+                $pgcFiles = $files | where { $_.Name.EndsWith(".pgc") }
+                if ($screenShots.Count + $dumps.Count + $pgcFiles.Count -gt 0)
+                {
+                    if(-Not $isTestRunNameShown)
+                    {
+                        Out-File -FilePath $helixLinkFile -Append -InputObject "<h2>$($testRun.name)</h2>"
+                        $isTestRunNameShown = $true
+                    }
+                    Out-File -FilePath $helixLinkFile -Append -InputObject "<h3>$helixWorkItemName</h3>"
+                    Generate-File-Links $screenShots "Screenshots"
+                    Generate-File-Links $dumps "CrashDumps"
+                    Generate-File-Links $pgcFiles "PGC files"
+                    $misc = $files | where { ($screenShots -NotContains $_) -And ($dumps -NotContains $_) -And ($visualTreeVerificationFiles -NotContains $_) -And ($pgcFiles -NotContains $_) }
+                    Generate-File-Links $misc "Misc"
+
+                    foreach($pgcFile in $pgcFiles)
+                    {
+                        $flavorPath = $pgcFile.Name.Split('.')[0]
+                        $archPath = $pgcFile.Name.Split('.')[1]
+                        $fileName = $pgcFile.Name.Remove(0, $flavorPath.length + $archPath.length + 2)
+                        $fullPath = "$OutputFolder\PGO\$flavorPath\$archPath"
+                        $destination = "$fullPath\$fileName"
+
+                        Write-Host "Copying $($pgcFile.Name) to $destination"
+
+                        if (-Not (Test-Path $fullPath))
+                        {
+                            New-Item $fullPath -ItemType Directory
+                        }
+
+                        $link = "$($pgcFile.Link)$accessTokenParam"
+                        $webClient.DownloadFile($link, $destination)
+                    }
+                }
+            }
+        }
+    }
+}

build/Helix/RunTestsInHelix.proj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <PropertyGroup>
+    <HelixSource>pr/terminal/$(BUILD_SOURCEBRANCH)/</HelixSource>
+    <EnableXUnitReporter>true</EnableXUnitReporter>
+    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
+    <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
+    <HelixPreCommands>$(HelixPreCommands);set testnameprefix=$(Configuration).$(Platform);set testbuildplatform=$(Platform);set rerunPassesRequiredToAvoidFailure=$(rerunPassesRequiredToAvoidFailure)</HelixPreCommands>
+    <OutputPath>..\..\bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" />
+  </ItemGroup>
+  
+  <!-- These .proj files are generated by the build machine prior to running tests via GenerateTestProjFile.ps1. -->
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-TerminalAppLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-HostTestsUIA.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+</Project>

build/Helix/UpdateUnreliableTests.ps1

@@ -0,0 +1,135 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory = $true)] 
+    [int]$RerunPassesRequiredToAvoidFailure,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI
+)
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri
+Write-Host "queryUri = $queryUri"
+
+# To account for unreliable tests, we'll iterate through all of the tests associated with this build, check to see any tests that were unreliable
+# (denoted by being marked as "skipped"), and if so, we'll instead mark those tests with a warning and enumerate all of the attempted runs
+# with their pass/fail states as well as any relevant error messages for failed attempts.
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+
+$timesSeenByRunName = @{}
+      
+foreach ($testRun in $testRuns.value)
+{
+    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
+        
+    Write-Host "Marking test run `"$($testRun.name)`" as in progress so we can change its results to account for unreliable tests."
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+
+    Write-Host "Retrieving test results..."
+    $testResults = Invoke-RestMethod -Uri $testRunResultsUri -Method Get -Headers $azureDevOpsRestApiHeaders
+        
+    foreach ($testResult in $testResults.value)
+    {
+        $testNeedsSubResultProcessing = $false
+        if ($testResult.outcome -eq "NotExecuted")
+        {
+            $testNeedsSubResultProcessing = $true
+        }
+        elseif($testResult.outcome -eq "Failed")
+        {
+            $testNeedsSubResultProcessing = $testResult.errorMessage -like "*_subresults.json*"
+        }
+
+        if ($testNeedsSubResultProcessing)
+        {
+            Write-Host "  Test $($testResult.testCaseTitle) was detected as unreliable. Updating..."
+            
+            # The errorMessage field contains a link to the JSON-encoded rerun result data.
+            $rerunResults = ConvertFrom-Json (New-Object System.Net.WebClient).DownloadString($testResult.errorMessage)
+            [System.Collections.Generic.List[System.Collections.Hashtable]]$rerunDataList = @()
+            $attemptCount = 0
+            $passCount = 0
+            $totalDuration = 0
+            
+            foreach ($rerun in $rerunResults.results)
+            {
+                $rerunData = @{
+                    "displayName" = "Attempt #$($attemptCount + 1) - $($testResult.testCaseTitle)";
+                    "durationInMs" = $rerun.duration;
+                    "outcome" = $rerun.outcome;
+                }
+
+                if ($rerun.outcome -eq "Passed")
+                {
+                    $passCount++
+                }
+                
+                if ($attemptCount -gt 0)
+                {
+                    $rerunData["sequenceId"] = $attemptCount
+                }
+
+                Write-Host "    Attempt #$($attemptCount + 1): $($rerun.outcome)"
+                
+                if ($rerun.outcome -ne "Passed")
+                {
+                    $screenshots = "$($rerunResults.blobPrefix)/$($rerun.screenshots -join @"
+$($rerunResults.blobSuffix)
+$($rerunResults.blobPrefix)
+"@)$($rerunResults.blobSuffix)"
+
+                    # We subtract 1 from the error index because we added 1 so we could use 0
+                    # as a default value not injected into the JSON in order to keep its size down.
+                    # We did this because there's a maximum size enforced for the errorMessage parameter
+                    # in the Azure DevOps REST API.
+                    $fullErrorMessage = @"
+Log: $($rerunResults.blobPrefix)/$($rerun.log)$($rerunResults.blobSuffix)
+
+Screenshots:
+$screenshots
+
+Error log:
+$($rerunResults.errors[$rerun.errorIndex - 1])
+"@
+
+                    $rerunData["errorMessage"] = $fullErrorMessage
+                }
+                
+                $attemptCount++
+                $totalDuration += $rerun.duration
+                $rerunDataList.Add($rerunData)
+            }
+
+            $overallOutcome = "Warning"
+            
+            if ($attemptCount -eq 2)
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on the immediate rerun, so we'll mark it as unreliable."
+            }
+            elseif ($passCount -gt $RerunPassesRequiredToAvoidFailure)
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on $passCount of $attemptCount attempts, which is greater than or equal to the $RerunPassesRequiredToAvoidFailure passes required to avoid being marked as failed. Marking as unreliable."
+            }
+            else
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on only $passCount of $attemptCount attempts, which is less than the $RerunPassesRequiredToAvoidFailure passes required to avoid being marked as failed. Marking as failed."
+                $overallOutcome = "Failed"
+            }
+            
+            $updateBody = ConvertTo-Json @(@{ "id" = $testResult.id; "outcome" = $overallOutcome; "errorMessage" = " "; "durationInMs" = $totalDuration; "subResults" = $rerunDataList; "resultGroupType" = "rerun" }) -Depth 5
+            Invoke-RestMethod -Uri $testRunResultsUri -Method Patch -Headers $azureDevOpsRestApiHeaders -Body $updateBody -ContentType "application/json" | Out-Null
+        }
+    }
+        
+    Write-Host "Finished updates. Re-marking test run `"$($testRun.name)`" as completed."
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "Completed" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+}

build/Helix/global.json

@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20277.5"
+  }
+}

build/Helix/packages.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
+  <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
+  <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
+  <package id="runtime.win-x64.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
+</packages>

build/Helix/readme.md

@@ -0,0 +1,32 @@
+This directory contains code and configuration files to run WinUI tests in Helix.
+
+Helix is a cloud hosted test execution environment which is accessed via the Arcade SDK.
+More details:
+* [Arcade](https://github.com/dotnet/arcade)
+* [Helix](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk)
+
+WinUI tests are scheduled in Helix by the Azure DevOps Pipeline: [RunHelixTests.yml](../RunHelixTests.yml).
+
+The workflow is as follows:
+1. NuGet Restore is called on the packages.config in this directory. This downloads any runtime dependencies 
+that are needed to run tests.
+2. PrepareHelixPayload.ps1 is called. This copies the necessary files from various locations into a Helix 
+payload directory. This directory is what will get sent to the Helix machines.
+3. RunTestsInHelix.proj is executed. This proj has a dependency on 
+[Microsoft.DotNet.Helix.Sdk](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk) 
+which it uses to publish the Helix payload directory and to schedule the Helix Work Items. The WinUI tests 
+are parallelized into multiple Helix Work Items.
+4. Each Helix Work Item calls [runtests.cmd](runtests.cmd) with a specific query to pass to 
+[TAEF](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) which runs the tests.
+5. If a test is detected to have failed, we run it again, first once, then eight more times if it fails again.
+If it fails all ten times, we report the test as failed; otherwise, we report it as unreliable,
+which will show up as a warning, but which will not fail the build.  When a test is reported as unreliable,
+we include the results for each individual run via a JSON string in the original test's errorMessage field.
+6. TAEF produces logs in WTT format. Helix is able to process logs in XUnit format. We run 
+[ConvertWttLogToXUnit.ps1](ConvertWttLogToXUnit.ps1) to convert the logs into the necessary format.
+7. RunTestsInHelix.proj has EnableAzurePipelinesReporter set to true. This allows the XUnit formatted test 
+results to be reported back to the Azure DevOps Pipeline.
+8. We process unreliable tests once all tests have been reported by reading the JSON string from the
+errorMessage field and calling the Azure DevOps REST API to modify the unreliable tests to have sub-results
+added to the test and to mark the test as "warning", which will enable people to see exactly how the test
+failed in runs where it did.

build/Helix/runtests.cmd

@@ -0,0 +1,106 @@
+setlocal ENABLEDELAYEDEXPANSION
+
+echo %TIME%
+
+robocopy %HELIX_CORRELATION_PAYLOAD% . /s /NP > NUL
+
+echo %TIME%
+
+reg add HKLM\Software\Policies\Microsoft\Windows\Appx /v AllowAllTrustedApps /t REG_DWORD /d 1 /f
+
+rem enable dump collection for our test apps:
+rem note, this script is run from a 32-bit cmd, but we need to set the native reg-key
+FOR %%A IN (TestHostApp.exe,te.exe,te.processhost.exe,conhost.exe,OpenConsole.exe,WindowsTerminal.exe) DO (
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpFolder /t REG_EXPAND_SZ /d %HELIX_DUMP_FOLDER% /f
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpType /t REG_DWORD /d 2 /f
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpCount /t REG_DWORD /d 10 /f
+)
+
+echo %TIME%
+
+:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are 
+:: expected to show UI we don't want it running.
+taskkill -f -im dhandler.exe
+
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\EnsureMachineState.ps1
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
+echo %TIME%
+
+set testBinaryCandidates=TerminalApp.LocalTests.dll Conhost.UIA.Tests.dll
+set testBinaries=
+for %%B in (%testBinaryCandidates%) do (
+    if exist %%B (
+        set "testBinaries=!testBinaries! %%B"
+    )
+)
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError %*
+echo %TIME%
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+move te.wtl te_original.wtl
+
+copy /y te_original.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+for /f "tokens=* delims=" %%a in ('dir /b *.pgc') do ren "%%a" "%testnameprefix%.%%~na.pgc"
+copy /y *.pgc %HELIX_WORKITEM_UPLOAD_ROOT%
+
+set FailedTestQuery=
+for /F "tokens=* usebackq" %%I IN (`powershell -ExecutionPolicy Bypass .\OutputFailedTestQuery.ps1 te_original.wtl`) DO (
+  set FailedTestQuery=%%I
+)
+
+rem The first time, we'll just re-run failed tests once.  In many cases, tests fail very rarely, such that
+rem a single re-run will be sufficient to detect many unreliable tests.
+if "%FailedTestQuery%" == "" goto :SkipReruns
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError /select:"%FailedTestQuery%"
+echo %TIME%
+
+move te.wtl te_rerun.wtl
+
+copy /y te_rerun.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+
+rem If there are still failing tests remaining, we'll run them eight more times, so they'll have been run a total of ten times.
+rem If any tests fail all ten times, we can be pretty confident that these are actual test failures rather than unreliable tests.
+if not exist te_rerun.wtl goto :SkipReruns
+
+set FailedTestQuery=
+for /F "tokens=* usebackq" %%I IN (`powershell -ExecutionPolicy Bypass .\OutputFailedTestQuery.ps1 te_rerun.wtl`) DO (
+  set FailedTestQuery=%%I
+)
+
+if "%FailedTestQuery%" == "" goto :SkipReruns
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError /testmode:Loop /LoopTest:8 /select:"%FailedTestQuery%"
+echo %TIME%
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+move te.wtl te_rerun_multiple.wtl
+
+copy /y te_rerun_multiple.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+powershell -ExecutionPolicy Bypass .\CopyVisualTreeVerificationFiles.ps1
+
+:SkipReruns
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\OutputSubResultsJsonFiles.ps1 te_original.wtl te_rerun.wtl te_rerun_multiple.wtl %testnameprefix%
+powershell -ExecutionPolicy Bypass .\ConvertWttLogToXUnit.ps1 te_original.wtl te_rerun.wtl te_rerun_multiple.wtl testResults.xml %testnameprefix%
+echo %TIME%
+
+copy /y *_subresults.json %HELIX_WORKITEM_UPLOAD_ROOT%
+
+type testResults.xml
+
+echo %TIME%

build/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
+</packages>

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

@@ -2,6 +2,8 @@ parameters:
   configuration: 'Release'
   platform: ''
   additionalBuildArguments: ''
+  minimumExpectedTestsExecutedCount: 10  # Sanity check for minimum expected tests to be reported
+  rerunPassesRequiredToAvoidFailure: 5
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}
@@ -15,3 +17,19 @@ jobs:
   - template: build-console-steps.yml
     parameters:
       additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
+
+- template: helix-runtests-job.yml
+  parameters:
+    name: 'RunTestsInHelix'
+    dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
+    condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
+    testSuite: 'DevTestSuite'
+    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
+    
+- template: helix-processtestresults-job.yml
+  parameters:
+    dependsOn:
+    - RunTestsInHelix
+    condition: and(succeededOrFailed(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
+    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
+    minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }}

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

@@ -1,5 +1,6 @@
 parameters:
   additionalBuildArguments: ''
+  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
 
 steps:
 - checkout: self
@@ -7,23 +8,29 @@ steps:
   clean: true
 
 - task: NuGetToolInstaller@0
-  displayName: Ensure NuGet 4.8.1
+  displayName: 'Use NuGet 5.2.0'
   inputs:
-    versionSpec: 4.8.1
-
-- task: VisualStudioTestPlatformInstaller@1
-  displayName: Ensure VSTest Platform
+    versionSpec: 5.2.0
 
 # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
 # This should be `task: NuGetCommand@2`
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  displayName: Restore NuGet packages
+  displayName: Restore NuGet packages for solution
   inputs:
     command: restore
     feedsToUse: config
     configPath: NuGet.config
     restoreSolution: OpenConsole.sln
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
+    
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+  displayName: Restore NuGet packages for extraneous build actions
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: build/packages.config
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
 - task: VSBuild@1
   displayName: 'Build solution **\OpenConsole.sln'
@@ -34,7 +41,7 @@ steps:
     configuration: '$(BuildConfiguration)'
     msbuildArgs: "${{ parameters.additionalBuildArguments }}"
     clean: true
-    maximumCpuCount: true
+    maximumCpuCount: false
 
 - task: PowerShell@2
   displayName: 'Check MSIX for common regressions'
@@ -66,7 +73,7 @@ steps:
   inputs:
     targetType: filePath
     filePath: build\scripts\Run-Tests.ps1
-    arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
+    arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}'
   condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
 
 - task: PowerShell@2
@@ -74,9 +81,41 @@ steps:
   inputs:
     targetType: filePath
     filePath: build\scripts\Run-Tests.ps1
-    arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
+    arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}'
   condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
 
+- task: PowerShell@2
+  displayName: 'Convert Test Logs from WTL to xUnit format'
+  inputs:
+    targetType: filePath
+    filePath: build\Helix\ConvertWttLogToXUnit.ps1
+    arguments: -WttInputPath '${{ parameters.testLogPath }}' -WttSingleRerunInputPath 'unused.wtl' -WttMultipleRerunInputPath 'unused2.wtl' -XUnitOutputPath 'onBuildMachineResults.xml' -TestNamePrefix '$(BuildConfiguration).$(BuildPlatform)'
+  condition: or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86'))
+
+- task: PublishTestResults@2
+  displayName: 'Upload converted test logs'
+  inputs:
+    testResultsFormat: 'xUnit' # Options: JUnit, NUnit, VSTest, xUnit, cTest
+    testResultsFiles: '**/onBuildMachineResults.xml' 
+    #searchFolder: '$(System.DefaultWorkingDirectory)' # Optional
+    #mergeTestResults: false # Optional
+    #failTaskOnFailedTests: false # Optional
+    testRunTitle: 'On Build Machine Tests' # Optional
+    buildPlatform: $(BuildPlatform) # Optional
+    buildConfiguration: $(BuildConfiguration) # Optional
+    #publishRunAttachments: true # Optional
+
+- task: CopyFiles@2
+  displayName: 'Copy result logs to Artifacts'
+  inputs:
+    Contents: |
+     **/*.wtl
+     **/*onBuildMachineResults.xml
+     ${{ parameters.testLogPath }}
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
+    OverWrite: true
+    flattenFolders: true
+
 - task: CopyFiles@2
   displayName: 'Copy *.appx/*.msix to Artifacts (Non-PR builds only)'
   inputs:
@@ -90,9 +129,22 @@ steps:
     flattenFolders: true
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact (appx) (Non-PR builds only)'
+- task: CopyFiles@2
+  displayName: 'Copy outputs needed for test runs to Artifacts'
   inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)/appx'
-    ArtifactName: 'appx-$(BuildConfiguration)'
-  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+    Contents: |
+     $(Build.SourcesDirectory)/bin/$(BuildPlatform)/$(BuildConfiguration)/*.exe
+     $(Build.SourcesDirectory)/bin/$(BuildPlatform)/$(BuildConfiguration)/*.dll
+     $(Build.SourcesDirectory)/bin/$(BuildPlatform)/$(BuildConfiguration)/*.xml
+     **/Microsoft.VCLibs.*.appx
+     **/TestHostApp/*
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
+    OverWrite: true
+    flattenFolders: true
+  condition: and(and(succeeded(), eq(variables['BuildPlatform'], 'x64')), ne(variables['Build.Reason'], 'PullRequest'))
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish All Build Artifacts'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    ArtifactName: 'drop'

build/pipelines/templates/helix-createprojfile-steps.yml

@@ -0,0 +1,15 @@
+parameters:
+  condition: ''
+  testFilePath: ''
+  outputProjFileName: ''
+  testSuite: ''
+  taefQuery: ''
+
+steps:
+  - task: powershell@2
+    displayName: 'Create ${{ parameters.outputProjFileName }}'
+    condition: ${{ parameters.condition }}
+    inputs:
+      targetType: filePath
+      filePath: build\Helix\GenerateTestProjFile.ps1
+      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'

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

@@ -0,0 +1,68 @@
+parameters:
+  condition: 'succeededOrFailed()'
+  dependsOn: ''
+  rerunPassesRequiredToAvoidFailure: 5
+  minimumExpectedTestsExecutedCount: 10
+  checkJobAttempt: false
+  pgoArtifact: ''
+
+jobs:
+- job: ProcessTestResults
+  condition: ${{ parameters.condition }}
+  dependsOn: ${{ parameters.dependsOn }}
+  pool:
+    vmImage: 'windows-2019'
+  timeoutInMinutes: 120
+  variables:
+    helixOutputFolder: $(Build.SourcesDirectory)\HelixOutput
+
+  steps:
+  - task: powershell@2
+    displayName: 'UpdateUnreliableTests.ps1'
+    condition: succeededOrFailed()
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    inputs:
+      targetType: filePath
+      filePath: build\Helix\UpdateUnreliableTests.ps1
+      arguments: -RerunPassesRequiredToAvoidFailure '${{ parameters.rerunPassesRequiredToAvoidFailure }}'
+
+  - task: powershell@2
+    displayName: 'OutputTestResults.ps1'
+    condition: succeededOrFailed()
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    inputs:
+      targetType: filePath
+      filePath: build\Helix\OutputTestResults.ps1
+      arguments: -MinimumExpectedTestsExecutedCount '${{ parameters.minimumExpectedTestsExecutedCount }}' -CheckJobAttempt $${{ parameters.checkJobAttempt }}
+
+  - task: powershell@2
+    displayName: 'ProcessHelixFiles.ps1'
+    condition: succeededOrFailed()
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      HelixAccessToken: $(HelixApiAccessToken)
+    inputs:
+      targetType: filePath
+      filePath: build\Helix\ProcessHelixFiles.ps1
+      arguments: -OutputFolder '$(helixOutputFolder)'
+
+  - ${{if ne(parameters.pgoArtifact, '') }}:
+    - script: move /y $(helixOutputFolder)\PGO $(Build.ArtifactStagingDirectory)
+      displayName: 'Move pgc files to PGO artifact'
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Helix files'
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(helixOutputFolder)
+      artifactName: drop
+
+  - ${{if ne(parameters.pgoArtifact, '') }}:
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish pgc files'
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)\PGO\Release
+        artifactName: ${{ parameters.pgoArtifact }}

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

@@ -0,0 +1,131 @@
+parameters:
+  name: 'RunTestsInHelix'
+  dependsOn: ''
+  condition: ''
+  testSuite: ''
+  # If a Pipeline runs this template more than once, this parameter should be unique per build flavor to differentiate the
+  # the different test runs:
+  helixType: 'test/devtest' 
+  artifactName: 'drop'
+  maxParallel: 4
+  rerunPassesRequiredToAvoidFailure: 5
+  taefQuery: ''
+  # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
+  useBuildOutputFromPipeline: $(System.DefinitionId)
+  matrix: 
+    # Release_x86:
+    #   buildPlatform: 'x86'
+    #   buildConfiguration: 'release'
+    #   openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+    #   closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
+    Release_x64:
+      buildPlatform: 'x64'
+      buildConfiguration: 'release'
+      openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+      closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
+
+jobs:
+- job: ${{ parameters.name }}
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+  pool:
+    vmImage: 'windows-2019'
+  timeoutInMinutes: 120
+  strategy:
+    maxParallel: ${{ parameters.maxParallel }}
+    matrix: ${{ parameters.matrix }}
+  variables:
+    artifactsDir: $(Build.SourcesDirectory)\Artifacts
+    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$(buildPlatform)
+    helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'
+
+      
+  steps:
+  - task: CmdLine@1
+    displayName: 'Display build machine environment variables'
+    inputs:
+      filename: 'set'
+      
+  - task: NuGetToolInstaller@0
+    displayName: 'Use NuGet 5.2.0'
+    inputs:
+      versionSpec: 5.2.0
+
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet restore build/Helix/packages.config'
+    inputs:
+      restoreSolution: build/Helix/packages.config
+      feedsToUse: config
+      nugetConfigPath: nuget.config
+      restoreDirectory: packages
+
+  - task: DownloadBuildArtifacts@0 
+    condition:
+      and(succeeded(),eq(variables['useBuildOutputFromBuildId'],''))
+    inputs: 
+      artifactName: ${{ parameters.artifactName }} 
+      downloadPath: '$(artifactsDir)'
+
+  - task: DownloadBuildArtifacts@0 
+    condition:
+      and(succeeded(),ne(variables['useBuildOutputFromBuildId'],''))
+    inputs: 
+      buildType: specific
+      buildVersionToDownload: specific
+      project: $(System.TeamProjectId)
+      pipeline: ${{ parameters.useBuildOutputFromPipeline }}
+      buildId: $(useBuildOutputFromBuildId)
+      artifactName: ${{ parameters.artifactName }} 
+      downloadPath: '$(artifactsDir)'
+
+  - task: CmdLine@1
+    displayName: 'Display Artifact Directory payload contents'
+    inputs:
+      filename: 'dir'
+      arguments: '/s $(artifactsDir)'
+
+  - task: powershell@2
+    displayName: 'PrepareHelixPayload.ps1'
+    inputs:
+      targetType: filePath
+      filePath: build\Helix\PrepareHelixPayload.ps1
+      arguments: -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)' -ArtifactName '${{ parameters.artifactName }}'
+      
+  - task: CmdLine@1
+    displayName: 'Display Helix payload contents'
+    inputs:
+      filename: 'dir'
+      arguments: '/s $(Build.SourcesDirectory)\HelixPayload'
+
+  - template: helix-createprojfile-steps.yml
+    parameters:
+      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
+      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\TerminalApp.LocalTests.dll'
+      outputProjFileName: 'RunTestsInHelix-TerminalAppLocalTests.proj'
+      testSuite: '${{ parameters.testSuite }}'
+      taefQuery: ${{ parameters.taefQuery }}
+      
+  - template: helix-createprojfile-steps.yml
+    parameters:
+      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
+      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\Conhost.UIA.Tests.dll'
+      outputProjFileName: 'RunTestsInHelix-HostTestsUIA.proj'
+      testSuite: '${{ parameters.testSuite }}'
+      taefQuery: ${{ parameters.taefQuery }}
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish generated .proj files'
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: ${{ parameters.artifactName }}
+      
+  - task: DotNetCoreCLI@2
+    displayName: 'Run tests in Helix (open queues)'
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    inputs:
+      command: custom
+      projects: build\Helix\RunTestsInHelix.proj
+      custom: msbuild
+      arguments: '$(helixCommonArgs) /p:IsExternal=true /p:Creator=Terminal /p:HelixTargetQueues=$(openHelixTargetQueues)'
+

build/scripts/Get-WttLog.ps1

@@ -0,0 +1,15 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory=$true, Position=0)][string]$BuildPlatform,
+    [Parameter(Mandatory=$true, Position=1)][string]$RationalizedPlatform,
+    [Parameter(Mandatory=$true, Position=2)][string]$Configuration
+)
+
+
+$i = Get-Item .\packages\MuxCustomBuild*
+$wtt = Join-Path -Path $i[0].FullName -ChildPath (Join-Path -Path 'tools' -ChildPath (Join-Path -Path $BuildPlatform -ChildPath 'wttlog.dll'))
+$dest = Join-Path -Path .\bin -ChildPath (Join-Path -Path $RationalizedPlatform -ChildPath ($Configuration))
+copy $wtt $dest
+
+
+Exit 0

build/scripts/Run-Tests.ps1

@@ -2,12 +2,24 @@
 Param(
     [Parameter(Mandatory=$true, Position=0)][string]$MatchPattern,
     [Parameter(Mandatory=$true, Position=1)][string]$Platform,
-    [Parameter(Mandatory=$true, Position=2)][string]$Configuration
+    [Parameter(Mandatory=$true, Position=2)][string]$Configuration,
+    [Parameter(Mandatory=$false, Position=3)][string]$LogPath
 )
 
 $testdlls = Get-ChildItem -Path ".\bin\$Platform\$Configuration" -Recurse -Filter $MatchPattern
 
-&".\bin\$Platform\$Configuration\te.exe" $testdlls.FullName
+
+$args = @();
+
+if ($LogPath)
+{
+    $args += '/enablewttlogging';
+    $args += '/appendwttlogging';
+    $args += "/logFile:$LogPath";
+    Write-Host "Wtt Logging Enabled";
+}
+
+&".\bin\$Platform\$Configuration\te.exe" $args $testdlls.FullName
 
 if ($lastexitcode -Ne 0) { Exit $lastexitcode }
 

custom.props

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

doc/Niksa.md

@@ -9,6 +9,8 @@ This document serves as a storage point for those posts.
 - [Output Processing between "Far East" and "Western"](#fesb)
 - [Why do we not backport things?](#backport)
 - [Why can't we have mixed elevated and non-elevated tabs in the Terminal?](#elevation)
+- [What's the difference between a shell and a terminal?](#shell-vs-terminal)
+
 
 ## <a name="cmd"></a>Why do we avoid changing CMD.exe?
 `setlocal` doesn't behave the same way as an environment variable. It's a thing that would have to be put in at the top of the batch script that is `somefile.cmd` as one of its first commands to adjust the way that one specific batch file is processed by the `cmd.exe` engine. That's probably not suitable for your needs, but that's the way we have to go.
@@ -179,3 +181,20 @@ Other platforms have accepted that risk in preference for user convenience. They
 
 Original Source: https://github.com/microsoft/terminal/issues/632#issuecomment-519375707
 
+## <a name="shell-vs-terminal"></a>What's the difference between a shell and a terminal?
+
+_guest speaker @zadjii-msft_
+
+I think there might be a bit of a misunderstanding here - there are two different kinds of applications we're talking about here:
+* shell applications, like `cmd.exe`, `powershell`, `zsh`, etc. These are text-only applications that emit streams of characters. They don't care at all about how they're eventually rendered to the user. These are also sometimes referred to as "commandline client" applications.
+* terminal applications, like the Windows Terminal, gnome-terminal, xterm, iterm2, hyper. These are graphical applications that can be used to render the output of commandline clients. 
+
+On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will creates a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
+
+Any terminal can run any commandline client application. So you can use the Windows Terminal to run whatever shell you want. I use mine for both `cmd` and `powershell`, and also WSL:
+
+![image](https://user-images.githubusercontent.com/18356694/89556758-79d27e80-d7d7-11ea-84e2-10710e09ef4a.png)
+
+It's not the Terminal's responsibility to remember the commands executed by a commandline client. That's the responsibility of the _shell_. How would the terminal remember commands executed by something like `emacs` or `vim`? Those are both applications where the user is typing input and hitting enter, like they would at a cmd prompt, but without something that resembles a command history.
+
+Original Source: https://github.com/microsoft/terminal/issues/6500#issuecomment-670035468

doc/cascadia/SettingsSchema.md

@@ -8,7 +8,7 @@ Properties listed below affect the entire window, regardless of the profile sett
 | -------- | --------- | ---- | ------- | ----------- |
 | `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 | `false` | 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. |
+| `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. |
@@ -126,7 +126,7 @@ For commands with arguments:
 | `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. | `singleLine` | boolean | When `true`, the copied content will be copied as a single line. When `false`, newlines persist from the selected text. |
+| `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. |
@@ -142,6 +142,7 @@ For commands with arguments:
 | `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. | | | |
@@ -158,7 +159,7 @@ For commands with arguments:
 | ---- | ---- |
 | Function and Alphanumeric Keys | `f1-f24`, `a-z`, `0-9` |
 | Symbols | ``` ` ```, `-`, `=`, `[`, `]`, `\`, `;`, `'`, `,`, `.`, `/` |
-| Arrow Keys | `down`, `left`, `right`, `up`, `pagedown`, `pageup`, `pgdn`, `pgup`, `end`, `home`, `plus` |
+| 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` |
 

doc/cascadia/profiles.schema.json

@@ -4,9 +4,9 @@
   "title": "Microsoft's Windows Terminal Settings Profile Schema",
   "definitions": {
     "KeyChordSegment": {
-      "pattern": "^(?<modifier>(ctrl|alt|shift)(?:\\+(ctrl|alt|shift)(?<!\\2))?(?:\\+(ctrl|alt|shift)(?<!\\2|\\3))?\\+)?(?<key>[^\\s+]|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
+      "pattern": "^(?<modifier>(ctrl|alt|shift)(?:\\+(ctrl|alt|shift)(?<!\\2))?(?:\\+(ctrl|alt|shift)(?<!\\2|\\3))?\\+)?(?<key>[^\\s+]|app|menu|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
       "type": "string",
-      "description": "The string should fit the format \"[ctrl+][alt+][shift+]<keyName>\", where each modifier is optional, separated by + symbols, and keyName is either one of the names listed in the table below, or any single key character. The string should be written in full lowercase.\nbackspace\tBACKSPACE key\ntab\tTAB key\nenter\tENTER key\nesc, escape\tESC key\nspace\tSPACEBAR\npgup, pageup\tPAGE UP key\npgdn, pagedown\tPAGE DOWN key\nend\tEND key\nhome\tHOME key\nleft\tLEFT ARROW key\nup\tUP ARROW key\nright\tRIGHT ARROW key\ndown\tDOWN ARROW key\ninsert\tINS key\ndelete\tDEL key\nnumpad_0-numpad_9, numpad0-numpad9\tNumeric keypad keys 0 to 9. Can't be combined with the shift modifier.\nnumpad_multiply\tNumeric keypad MULTIPLY key (*)\nnumpad_plus, numpad_add\tNumeric keypad ADD key (+)\nnumpad_minus, numpad_subtract\tNumeric keypad SUBTRACT key (-)\nnumpad_period, numpad_decimal\tNumeric keypad DECIMAL key (.). Can't be combined with the shift modifier.\nnumpad_divide\tNumeric keypad DIVIDE key (/)\nf1-f24\tF1 to F24 function keys\nplus\tADD key (+)"
+      "description": "The string should fit the format \"[ctrl+][alt+][shift+]<keyName>\", where each modifier is optional, separated by + symbols, and keyName is either one of the names listed in the table below, or any single key character. The string should be written in full lowercase.\napp, menu\tMENU key\nbackspace\tBACKSPACE key\ntab\tTAB key\nenter\tENTER key\nesc, escape\tESC key\nspace\tSPACEBAR\npgup, pageup\tPAGE UP key\npgdn, pagedown\tPAGE DOWN key\nend\tEND key\nhome\tHOME key\nleft\tLEFT ARROW key\nup\tUP ARROW key\nright\tRIGHT ARROW key\ndown\tDOWN ARROW key\ninsert\tINS key\ndelete\tDEL key\nnumpad_0-numpad_9, numpad0-numpad9\tNumeric keypad keys 0 to 9. Can't be combined with the shift modifier.\nnumpad_multiply\tNumeric keypad MULTIPLY key (*)\nnumpad_plus, numpad_add\tNumeric keypad ADD key (+)\nnumpad_minus, numpad_subtract\tNumeric keypad SUBTRACT key (-)\nnumpad_period, numpad_decimal\tNumeric keypad DECIMAL key (.). Can't be combined with the shift modifier.\nnumpad_divide\tNumeric keypad DIVIDE key (/)\nf1-f24\tF1 to F24 function keys\nplus\tADD key (+)"
     },
     "Color": {
       "default": "#",
@@ -34,35 +34,42 @@
     "ShortcutActionName": {
       "enum": [
         "adjustFontSize",
+        "closeOtherTabs",
         "closePane",
         "closeTab",
+        "closeTabsAfter",
         "closeWindow",
+        "commandPalette",
         "copy",
         "duplicateTab",
+        "find",
         "moveFocus",
         "newTab",
         "nextTab",
         "openNewTabDropdown",
         "openSettings",
+        "openTabColorPicker",
         "paste",
         "prevTab",
+        "renameTab",
         "resetFontSize",
         "resizePane",
         "scrollDown",
         "scrollDownPage",
         "scrollUp",
         "scrollUpPage",
+        "sendInput",
+        "setColorScheme",
+        "setTabColor",
         "splitPane",
         "switchToTab",
+        "tabSearch",
+        "toggleAlwaysOnTop",
         "toggleFocusMode",
         "toggleFullscreen",
-        "toggleAlwaysOnTop",
+        "togglePaneZoom",
         "toggleRetroEffect",
-        "find",
-        "setTabColor",
-        "openTabColorPicker",
-        "renameTab",
-        "commandPalette",
+        "wt",
         "unbound"
       ],
       "type": "string"
@@ -84,6 +91,40 @@
       ],
       "type": "string"
     },
+    "CopyFormat": {
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "html",
+              "rtf"
+            ]
+          }
+        },
+        {
+          "type": "string",
+          "enum": [
+            "html",
+            "rtf",
+            "all",
+            "none"
+          ]
+        }
+      ]
+    },
+    "AnchorKey": {
+      "enum": [
+        "ctrl",
+        "alt",
+        "shift"
+      ],
+      "type": "string"
+    },
     "NewTerminalArgs": {
       "properties": {
         "commandline": {
@@ -149,6 +190,18 @@
               "type": "boolean",
               "default": false,
               "description": "If true, the copied content will be copied as a single line (even if there are hard line breaks present in the text). If false, newlines persist from the selected text."
+            },
+            "copyFormatting": {
+              "default": null,
+              "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied. Not setting this value inherits the behavior of the `copyFormatting` global setting.",
+              "oneOf": [
+                {
+                  "$ref": "#/definitions/CopyFormat"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           }
         }
@@ -217,6 +270,28 @@
       ],
       "required": [ "direction" ]
     },
+    "SendInputAction": {
+      "description": "Arguments corresponding to a Send Input Action",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ShortcutAction"
+        },
+        {
+          "properties": {
+            "action": {
+              "type": "string",
+              "pattern": "sendInput"
+            },
+            "input": {
+              "type": "string",
+              "default": "",
+              "description": "The text input to feed into the shell. ANSI escape sequences may be used. Escape codes like \\x1b must be written as \\u001b."
+            }
+          }
+        }
+      ],
+      "required": [ "input" ]
+    },
     "SplitPaneAction": {
       "description": "Arguments corresponding to a Split Pane Action",
       "allOf": [
@@ -280,6 +355,78 @@
         }
       ]
     },
+    "SetColorSchemeAction": {
+      "description": "Arguments corresponding to a Set Color Scheme Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "setColorScheme" },
+            "colorScheme": {
+              "type": "string",
+              "default": "",
+              "description": "the name of the scheme to apply to the active pane"
+            }
+          }
+        }
+      ],
+      "required": [ "name" ]
+    },
+    "WtAction": {
+      "description": "Arguments corresponding to a wt Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "wt" },
+            "commandline": {
+              "type": "string",
+              "default": "",
+              "description": "a `wt` commandline to run in the current window"
+            }
+          }
+        }
+      ],
+      "required": [ "commandline" ]
+    },
+    "CloseOtherTabsAction": {
+      "description": "Arguments for a closeOtherTabs action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "closeOtherTabs" },
+            "index": {
+              "oneOf": [
+                { "type": "integer" },
+                { "type": null }
+              ],
+              "default": "",
+              "description": "Close the tabs other than the one at this index. If no index is provided, use the focused tab's index."
+            }
+          }
+        }
+      ]
+    },
+    "CloseTabsAfterAction": {
+      "description": "Arguments for a closeTabsAfter action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "closeTabsAfter" },
+            "index": {
+              "oneOf": [
+                { "type": "integer" },
+                { "type": null }
+              ],
+              "default": "",
+              "description": "Close the tabs following the tab at this index. If no index is provided, use the focused tab's index."
+            }
+          }
+        }
+      ]
+    },
     "Keybinding": {
       "additionalProperties": false,
       "properties": {
@@ -293,9 +440,14 @@
               { "$ref": "#/definitions/SwitchToTabAction" },
               { "$ref": "#/definitions/MoveFocusAction" },
               { "$ref": "#/definitions/ResizePaneAction" },
+              { "$ref": "#/definitions/SendInputAction" },
               { "$ref": "#/definitions/SplitPaneAction" },
               { "$ref": "#/definitions/OpenSettingsAction" },
               { "$ref": "#/definitions/SetTabColorAction" },
+              { "$ref": "#/definitions/SetColorSchemeAction" },
+              { "$ref": "#/definitions/WtAction" },
+              { "$ref": "#/definitions/CloseOtherTabsAction" },
+              { "$ref": "#/definitions/CloseTabsAfterAction" },
               { "type": "null" }
             ]
         },
@@ -342,8 +494,8 @@
         },
         "copyFormatting": {
           "default": true,
-          "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard.",
-          "type": "boolean"
+          "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"
         },
         "largePasteWarning": {
           "default": true,
@@ -392,10 +544,16 @@
           "minimum": 1,
           "type": "integer"
         },
+        "startOnUserLogin": {
+          "default": false,
+          "description": "When set to true, this enables the launch of Windows Terminal at startup. Setting this to false will disable the startup task entry. If the Windows Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect.",
+          "type": "boolean"
+        },
         "launchMode": {
           "default": "default",
-          "description": "Defines whether the Terminal will launch as maximized or not.",
+          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window.",
           "enum": [
+            "fullscreen",
             "maximized",
             "default"
           ],
@@ -460,6 +618,11 @@
           "default": true,
           "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
+        },
+        "useTabSwitcher": {
+          "default": true,
+          "description": "When set to \"true\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI.",
+          "type": "boolean"
         }
       },
       "required": [
@@ -659,8 +822,15 @@
         "padding": {
           "default": "8, 8, 8, 8",
           "description": "Sets the padding around the text within the window. Can have three different formats:\n -\"#\" sets the same padding for all sides \n -\"#, #\" sets the same padding for left-right and top-bottom\n -\"#, #, #, #\" sets the padding individually for left, top, right, and bottom.",
-          "pattern": "^-?[0-9]+(\\.[0-9]+)?( *, *-?[0-9]+(\\.[0-9]+)?|( *, *-?[0-9]+(\\.[0-9]+)?){3})?$",
-          "type": "string"
+          "oneOf": [
+            {
+              "pattern": "^-?[0-9]+(\\.[0-9]+)?( *, *-?[0-9]+(\\.[0-9]+)?|( *, *-?[0-9]+(\\.[0-9]+)?){3})?$",
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
+          ]
         },
         "scrollbarState": {
           "default": "visible",

doc/specs/#1337 - Per-Profile Tab Colors/#1337 - Per-Profile Tab Colors.md

@@ -0,0 +1,146 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-07-31
+last updated: 2020-08-03
+issue id: #1337
+---
+# Per-Profile Tab Colors
+
+## Abstract
+
+This spec describes a way to specify tab colors in a profile in a way that will
+be forward compatible with theming the Terminal. This spec will be largely
+dedicated to the design of a single setting, but within the context of theming.
+
+## Inspiration
+
+Following the addition of the Tab Color Picker in [#3789], we've had numerous
+requests for the ability to set the color of a tab directly within a profile.
+While largely we're tracking theming in [#3327], including the specification of
+a tab color, the theming spec ([#5772] )is very large and will take a while to
+revise and approve. This spec is intended to pull a single point out from that
+spec to make it more easily reviewable, and implement it in a way that will
+continue working when we add support for themes in the future.
+
+## Solution Design
+
+To enable per-profile tab colors, we'll add a single setting: `tabColor`. For
+now<sup>[[1](#user-content-footnote-1)]</sup>, this setting will accept any
+`#rrggbb` color string.
+
+Since each profile creates a `Pane` with a `TermControl`, we'll need to store
+this color not in the `Tab`, but somewhere below `Pane`, so that when you switch
+between Panes in a tab with different `tabColor`s, the color will update
+automatically. When a new `TermControl` is created, we'll store this color in the
+`TermControl`'s `Terminal` core. This is to support the future possibility of
+setting the tab color via VT sequences.
+
+A Tab's color will be the result of layering a variety of sources, from the bottom up:
+
+Color | | Set by
+-- | -- | --
+Runtime Color | _optional_ |Color Picker / `setTabColor` action
+Control Tab Color | _optional_ | Profile's `tabColor`, or a color set by VT
+Theme Tab Background | _optional_ | `tab.backgroundColor` in the theme
+Tab Default Color | **default** | TabView in XAML
+
+Some examples:
+* **Scenario 1**: The user has set `"tabColor": "#ff0000"` in their profile.
+  When they create tabs with that profile, instead of appearing in the default
+  color for the TabView, they'll be `#ff0000`.
+* **Scenario 2**: The user has set `"tabColor": "#ff0000"` in their profile.
+  When they try to set the color for that tab (with the color picker) to
+  `#0000ff`, the tab's color is updated to reflect this new blue color. When
+  they clear the runtime color (with the color picker), the tab will return to
+  `#ff0000`.
+* **Scenario 3**: The user has two profiles with colors set, one to `"tabColor":
+  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
+  profiles in two panes side-by side, the tab's color will update to reflect the
+  color from the currently-focused control.
+* **Scenario 4**: The user has two profiles with colors set, one to `"tabColor":
+  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
+  profiles in two panes side-by side, and try to set the color for that tab
+  (with the color picker) to `#0000ff`, the tab's color is updated to reflect
+  this new blue color. Regardless of which pane is focused, the tab will be
+  blue.
+* **Scenario 5**: The user has set `"tabColor": "#ff0000"` in their profile
+  ("Profile A"), and `"tab.backgroundColor": "#00ff00"`in their theme. When they
+  create tabs with "Profile A", the tabs will appear red. Other tabs (for
+  profiles without `tabColor` set) will appear green, using the color from the
+  theme.
+
+
+## UI/UX Design
+
+In general, this is going to look exactly like the colored tabs look now.
+
+![preview](profile-tabColor-000.gif)
+
+## Capabilities
+
+<table>
+<tr>
+<td><strong>Accessibility</strong></td>
+<td>
+N/A
+</td>
+</tr>
+<tr>
+<td><strong>Security</strong></td>
+<td>
+N/A
+</td>
+</tr>
+<tr>
+<td><strong>Reliability</strong></td>
+<td>
+No expected change
+</td>
+</tr>
+<tr>
+<td><strong>Compatibility</strong></td>
+<td>
+This entire spec outlines how this feature is designed with a emphasis on future
+compatibility. As such, there are no expected regressions in the future when we
+do add support for themes.
+</td>
+</tr>
+<tr>
+<td><strong>Performance, Power, and Efficiency</strong></td>
+<td>
+No expected change
+</td>
+</tr>
+</table>
+
+## Potential Issues
+
+None expected.
+
+## Footnotes
+
+<a id="footnote-1"><a>[1]: When full theming support is added, themes will
+provide support for setting colors as one of a variety of values:
+
+  * An `#rrggbb` string
+  * The system accent color
+  * The current background color of the Terminal
+  * A value from a given resource key from XAML
+
+When support for these other types of "smart" colors is added, then the profile
+`tabColor` setting will also gracefully accept these values.
+
+## Future considerations
+
+* It's not out of the realm of possibility that someone might want to color each
+  _pane_'s color at runtime. In that case, the runtime color would be stored in
+  the `Pane`, not the `Tab`.
+
+
+
+<!-- Footnotes -->
+
+[#1337]: https://github.com/microsoft/terminal/issues/1337
+[#3789]: https://github.com/microsoft/terminal/issues/3789
+[#3327]: https://github.com/microsoft/terminal/issues/3327
+[#5772]: https://github.com/microsoft/terminal/pull/5772

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

@@ -0,0 +1,300 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-5-13
+last updated: 2020-08-04
+issue id: 1571
+---
+
+# New Tab Menu Customization
+
+## Abstract
+
+Many users have lots and _lots_ of profiles that they use. Some of these
+profiles the user might not use that frequently. When that happens, the new tab
+dropdown can become quite cluttered.
+
+A common ask is for the ability to reorder and reorganize this dropdown. This
+spec provides a design for how the user might be able to specify the
+customization in their settings.
+
+## Inspiration
+
+Largely, this spec was inspired by discussion in
+[#1571](https://github.com/microsoft/terminal/issues/1571#issuecomment-519504048)
+and the _many_ linked threads.
+
+## Solution Design
+
+This design proposes adding a new setting `"newTabMenu"`. When unset, (the
+default), the new tab menu is populated with all the profiles, in the order they
+appear in the users settings file. When set, this enables the user to control
+the appearance of the new tab dropdown. Let's take a look at an example:
+
+```json
+{
+    "profiles":{ ... },
+    "newTabMenu": [
+        { "type":"profile", "profile": "cmd" },
+        { "type":"profile", "profile": "Windows PowerShell" },
+        { "type":"separator" },
+        {
+            "type":"folder",
+            "name": "ssh",
+            "icon": "C:\\path\\to\\icon.png",
+            "entries":[
+                { "type":"profile", "profile": "Host 1" },
+                { "type":"profile", "profile": "8.8.8.8" },
+                { "type":"profile", "profile": "Host 2" }
+            ]
+        },
+        { "type":"separator" },
+        { "type":"profile", "profile": "Ubuntu-18.04" },
+        { "type":"profile", "profile": "Fedora" }
+    ]
+}
+```
+
+If a user were to use this as their new tab menu, that they would get is a menu
+that looks like this:
+
+![fig 1](Menu-Customization-000.png)
+
+_fig 1_: A _very rough_ mockup of what this feature might look like
+
+There are five `type`s of objects in this menu:
+* `"type":"profile"`: This is a profile. Clicking on this entry will open a new
+  tab, with that profile. The profile is identified with the `"profile"`
+  parameter, which accepts either a profile `name` or GUID. The icon for this
+  entry will be the profile's icon, and the text on the entry will be the
+  profile's name.
+* `"type":"separator"`: This represents a XAML `MenuFlyoutSeparator`, enabling
+  the user to visually space out entries.
+* `"type":"folder"`: This represents a nested menu of entries.
+  - The `"name"` property provides a string of text to display for the group.
+  - The `"icon"` property provides a path to a image to use as the icon. This
+    property is optional.
+  - The `"entries"` property specifies a list of menu entries that will appear
+    nested under this entry. This can contain other `"type":"folder"` groups as
+    well!
+* `"type":"action"`: This represents a menu entry that should execute a specific
+  `ShortcutAction`.
+  - the `id` property will specify the global action ID (see [#6899], [#7175])
+    to identify the action to perform when the user selects the entry. Actions
+    with invalid IDs will be ignored and omitted from the list.
+  - The text for this entry will be the action's label (which is
+    either provided as the `"name"` in the global list of actions, or the
+    generated name if no `name` was provided)
+  - The icon for this entry will similarly re-use the action's `icon`.
+* `"type":"remainingProfiles"`: This is a special type of entry that will be
+  expanded to contain one `"type":"profile"` entry for every profile that was
+  not already listed in the menu. This will allow users to add one entry for
+  just "all the profiles they haven't manually added to the menu".
+  - This type of entry can only be specified once - trying to add it to the menu
+    twice will raise a warning, and ignore all but the first `remainingProfiles`
+    entry.
+  - This type of entry can also be set inside a `folder` entry, allowing users
+    to highlight only a couple profiles in the top-level of the menu, but
+    enabling all other profiles to also be accessible.
+  - The "name" of these entries will simply be the name of the profile
+  - The "icon" of these entries will simply be the profile's icon
+
+The "default" new tab menu could be imagined as the following blob of json:
+
+```json
+{
+    "newTabMenu": [
+        { "type":"remainingProfiles" }
+    ]
+}
+```
+
+### Other considerations
+
+Also considered during the investigation for this feature was re-using the list
+of profiles to expose the structure of the new tab menu. For example, doing
+something like:
+
+```json
+"profiles": {
+  "defaults": {},
+  "list":
+  [
+    { "name": "cmd" },
+    { "name": "powershell" },
+    { "type": "separator" },
+    {
+      "type": "folder" ,
+      "profiles": [
+        { "name": "ubuntu" }
+      ]
+    }
+  ]
+}
+```
+
+This option was not pursued because we felt that it needlessly complicated the
+contents of the list of profiles objects. We'd rather have the `profiles` list
+exclusively contain `Profile` objects, and have other elements of the json
+_refer_ to those profiles. What if someone would like to have an action that
+opened a new tab with profile index 4, and then they set that action as entry 4
+in the profile's list? That would certainly be some sort of unexpected behavior.
+
+Additionally, what if someone wants to have an entry that opens a tab with one
+pane with one profile in it, and another pane with different profile in it? Or
+what if they want the same profile to appear twice in the menu?
+
+By overloading the structure of the `profiles` list, we're forcing all other
+consumers of the list of profiles to care about the structure of the elements of
+the list. These other consumers should only really care about the list of
+profiles, and not necessarily how they're structured in the new tab dropdown.
+Furthermore, it complicates the list of profiles, by adding actions intermixed
+with the profiles.
+
+The design chosen in this spec more cleanly separates the responsibilities of
+the list of profiles and the contents of the new tab menu. This way, each object
+can be defined independent of the structure of the other.
+
+## UI/UX Design
+
+See the above _figure 1_.
+
+The profile's `icon` will also appear as the icon on `profile` entries. If
+there's a keybinding bound to open a new tab with that profile, then that will
+also be added to the `MenuFlyoutItem` as the accelerator text, similar to the
+text we have nowadays.
+
+Beneath the list of profiles will _always_ be the same "Settings", "Feedback"
+and "About" entries, separated by a `MenuFlyoutSeparator`. This is consistent
+with the UI as it exists with no customization. These entries cannot be removed
+with this feature, only the list of profiles customized.
+
+## Capabilities
+
+### Accessibility
+
+This menu will be added to the XAML tree in the same fashion as the current new
+tab flyout, so there should be no dramatic change here.
+
+### Security
+
+_(no change expected)_
+
+### Reliability
+
+_(no change expected)_
+
+### Compatibility
+
+_(no change expected)_
+
+### Performance, Power, and Efficiency
+
+_(no change expected)_
+
+## Potential Issues
+
+Currently, the `openTab` and `splitPane` keybindings will accept a `index`
+parameter to say either:
+* "Create a new tab/pane with the N'th profile"
+* "Create a new tab/pane with the profile at index N in the new
+tab dropdown".
+
+These two were previously synonymous, as the N'th profile was always the N'th in
+the dropdown. However, with this change, we'll be changing the meaning of that
+argument to mean explicitly the first option - "Open a tab/pane with the N'th
+profile".
+
+A previous version of this spec considered changing the meaning of that
+parameter to mean "open the entry at index N", the second option. However, in
+[Command Palette, Addendum 1], we found that naming that command would become
+unnecessarily complex.
+
+To cover that above scenario, we could consider adding an `index` parameter to
+the `openNewTabDropdown` action. If specified, that would open either the N'th
+action in the dropdown (ignoring separators), or open the dropdown with the n'th
+item selected.
+
+The N'th entry in the menu won't always be a profile: it might be a folder with
+more options, or it might be an action (that might not be opening a new tab/pane
+at all).
+
+Given all the above scenarios, `openNewTabDropdown` with an `"index":N`
+parameter will behave in the following ways. If the Nth top-level entry in the
+new tab menu is a:
+* `"type":"profile"`: perform the `newTab` or `splitPane` action with that profile.
+* `"type":"folder"`: Focus the first element in the sub menu, so the user could
+  navigate it with the keyboard.
+* `"type":"separator"`: Ignore these when counting top-level entries.
+* `"type":"action"`: Perform the action.
+
+So for example:
+
+```
+New Tab Button ▽
+├─ Folder 1
+│  └─ Profile A
+│  └─ Action B
+├─ Separator
+├─ Folder 2
+│  └─ Profile C
+│  └─ Profile D
+├─ Action E
+└─ Profile F
+```
+
+And assuming the user has bound:
+```json
+{
+  "bindings":
+  [
+    { "command": { "action": "openNewTabDropdown", "index": 0 }, "keys": "ctrl+shift+1" },
+    { "command": { "action": "openNewTabDropdown", "index": 1 }, "keys": "ctrl+shift+2" },
+    { "command": { "action": "openNewTabDropdown", "index": 2 }, "keys": "ctrl+shift+3" },
+    { "command": { "action": "openNewTabDropdown", "index": 3 }, "keys": "ctrl+shift+4" },
+  ]
+}
+```
+
+* <kbd>ctrl+shift+1</kbd> focuses "Profile A", but the user needs to press
+  enter/space to creates a new tab/split
+* <kbd>ctrl+shift+2</kbd> focuses "Profile C", but the user needs to press
+  enter/space to creates a new tab/split
+* <kbd>ctrl+shift+3</kbd> performs Action E
+* <kbd>ctrl+shift+4</kbd> Creates a new tab/split with Profile F
+
+## Future considerations
+
+* The user could set a `"name"`/`"text"`, or `"icon"` property to these menu
+  items manually, to override the value from the profile or action. These
+  settings would be totally optional, but it's not unreasonable that someone
+  might want this.
+* We may want to consider adding a default icon for all folders or actions in
+  the menu. For example, a folder (like 📁) for `folder` entries, or something
+  like ⚡ for actions. We'll leave these unset by default, and evaluate setting
+  these icons by default in the future.
+* Something considered during review was a way to specify "All my WSL profiles".
+  Maybe the user wants to have all their profiles generated by the WSL Distro
+  Generator appear in a "WSL" folder. This would likely require a more elaborate
+  filtering syntax, to be able to select only profiles where a certain property
+  has a specific value. Consider the user who has multiple "SSH
+  me@\<some host\>.com" profiles, and they want all their "SSH\*" profiles to
+  appear in an "SSH" folder. This feels out-of-scope for this spec.
+* A similar structure could potentially also be used for customizing the context
+  menu within a control, or the context menu for the tab. (see [#3337])
+  - In both of those cases, it might be important to somehow refer to the
+    context of the current tab or control in the json. Think for example about
+    "Close tab" or "Close other tabs" - currently, those work by _knowing_ which
+    tab the "action" is specified for, not by actually using a `closeTab` action.
+    In the future, they might need to be implemented as something like
+    - Close Tab: `{ "action": "closeTab", "index": "${selectedTab.index}" }`
+    - Close Other Tabs: `{ "action": "closeTabs", "otherThan": "${selectedTab.index}" }`
+    - Close Tabs to the Right: `{ "action": "closeTabs", "after": "${selectedTab.index}" }`
+
+
+<!-- Footnotes -->
+[#2046]: https://github.com/microsoft/terminal/issues/2046
+[Command Palette, Addendum 1]: https://github.com/microsoft/terminal/blob/master/doc/specs/%232046%20-%20Unified%20keybindings%20and%20commands%2C%20and%20synthesized%20action%20names.md
+
+[#3337]: https://github.com/microsoft/terminal/issues/3337
+[#6899]: https://github.com/microsoft/terminal/issues/6899
+[#7175]: https://github.com/microsoft/terminal/issues/7175

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

@@ -0,0 +1,228 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-07-13
+last updated: 2020-07-22
+issue id: 6899
+---
+
+# Action IDs
+
+## Abstract
+
+This document is intended to serve as an addition to the [Command Palette Spec],
+as well as the [New Tab Menu Customization Spec].
+
+As we come to rely more on actions being a mechanism by which the user defines
+"do something in the Terminal", we'll want to make it even easier for users to
+re-use the actions that they've already defined, as to reduce duplicated json as
+much as possible. This spec proposes a mechanism by which actions could be
+uniquely identifiable, so that the user could refer to bindings in other
+contexts without needing to replicate an entire json blob.
+
+## Solution Design
+
+This spec was largely inspired by the following diagram from @DHowett:
+
+![figure 1](data-mockup.png)
+
+The goal is to introduce an `id` parameter by which actions could be uniquely
+refered to. If we'd ever like to use an action outside the list of `actions`, we
+can simply refer to the action's ID, allowing the user to only define the action
+_once_.
+
+We'll start by renaming `bindings` to `actions`. `bindings` was suggested as a
+rename for `keybindings` in [#6532], as a way to make the name more generic.
+Discussion with the team lead to the understanding that the name `actions` would
+be even better, as a way of making the meaning of the "list of actions" more
+obvious.
+
+When we're parsing `actions`, we'll make three passes:
+* The first pass will scan the list for objects with an `id` property. We'll
+  attempt to parse those entries into `ActionAndArgs` which we'll store in the
+  global `id->ActionAndArgs` map. If any entry doesn't have an `id` set, we'll
+  skip it in this phase. If an entry doesn't have a `command` set, we'll ignore
+  it in this pass.
+* The second pass will scan for _keybindings_. Any entries with `keys` set will
+  create a `KeyChord->ActionAndArgs` entry in the keybindings map. If the entry
+  has an `id` set, then we'll simply re-use the action we've already parsed for
+  the `id`, from the action map. If there isn't an `id`, then we'll parse the
+  action manually at this time. Entries without a `keys` set will be ignored in
+  this pass.
+* The final pass will be to generate _commands_. Similar to the keybindings
+  pass, we'll attempt to lookup actions for entries with an `id` set. If there
+  isn't an `id`, then we'll parse the action manually at this time. We'll then
+  get the name for the entry, either from the `name` property if it's set, or
+  the action's `GenerateName` method.
+
+For a visual representation, let's assume the user has the following in their
+`actions`:
+
+![figure 2](data-mockup-actions.png)
+
+We'll first parse the `actions` to generate the mapping of `id`->`Actions`:
+
+![figure 3](data-mockup-actions-and-ids.png)
+
+Then, we'll parse the `actions` to generate the mapping of keys to actions, with
+some actions already being defined in the map of `id`->`Actions`:
+
+![figure 4](data-mockup-actions-and-ids-and-keys.png)
+
+
+When layering `actions`, if a later settings file contains an action with the
+same `id`, it will replace the current value. In this way, users can redefine
+actions, or remove default ones (with something like `{ "id":
+"Terminal.OpenTab", "command":null }`
+
+We'd maintain a large list of default actions, each with unique `id`s set. These
+are all given `id`'s with a `Terminal.` prefix, to easily identify them as
+built-in, default actions. Not all of these actions will be given keys, but they
+will all be given `id`s.
+
+> 👉 NOTE: The IDs for the default actions will need to be manually created, not
+> autogenerated. These `id`s are not strings displayed in the user interface, so
+> localization is not a concern.
+
+As we add additional menus to the Terminal, like the customization for the new
+tab dropdown, or the tab context menu, or the `TermControl` context menu, they
+could all refer to these actions by `id`, rather than duplicating the same json.
+
+
+### Existing Scenarios
+
+Keybindings will still be stored as a `keys->Action` mapping, so the user will
+still be able to override default keybindings exactly the same as before.
+
+Similarly, commands in the Command Palette will continue using their existing
+`name->Action` mapping they're currently using. For a binding like
+
+```json
+{ "keys": "ctrl+alt+x", "id": "Terminal.OpenDefaultSettings" },
+```
+* We'll bind whatever action is defined as `Terminal.OpenDefaultSettings` to
+  <kbd>ctrl+alt+x</kbd>.
+* We'll use whatever action is defined as `Terminal.OpenDefaultSettings` to
+  generate a name for the command palette.
+
+### Future Context Menus
+
+In [New Tab Menu Customization Spec], we discuss allowing the user to bind
+actions to the new tab menu. In that spec, they can do so with something like
+the following:
+
+```json
+{
+    "newTabMenu": [
+        { "type":"action", "command": { "action": "adjustFontSize", "delta": 1 }, }
+        { "type":"action", "command": { "action": "adjustFontSize", "delta": -1 }, }
+        { "type":"action", "command": "resetFontSize", }
+        { "type":"profile", "profile": "cmd" },
+        { "type":"profile", "profile": "Windows PowerShell" },
+        { "type":"separator" },
+        {
+            "type":"folder",
+            "name": "Settings...",
+            "icon": "C:\\path\\to\\icon.png",
+            "entries":[
+                { "type":"action", "command": "openSettings" },
+                { "type":"action", "command": { "action": "openSettings", "target": "defaultsFile" } },
+            ]
+        }
+    ]
+}
+```
+
+In this example, the user has also exposed the "Increase font size", "Decrease
+font size", and "Reset font size" actions, as well as the settings files in a
+submenu. With this proposal, the above could instead be re-written as:
+
+```json
+{
+    "newTabMenu": [
+        { "type":"action", "id": "Terminal.IncreaseFontSize" },
+        { "type":"action", "id": "Terminal.DecreaseFontSize" },
+        { "type":"action", "id": "Terminal.ResetFontSize" },
+        { "type":"profile", "profile": "cmd" },
+        { "type":"profile", "profile": "Windows PowerShell" },
+        { "type":"separator" },
+        {
+            "type":"folder",
+            "name": "Settings...",
+            "icon": "C:\\path\\to\\icon.png",
+            "entries":[
+                { "type":"action", "id": "Terminal.OpenDefaultSettings" },
+                { "type":"action", "id": "Terminal.OpenSettings" },
+            ]
+        }
+    ]
+}
+```
+
+In this example, the actions are looked up from the global map using the `id`
+provided, enabling the user to re-use their existing definitions. If the user
+re-defined the `Terminal.IncreaseFontSize` action to mean something else, then
+the action in the new tab menu will also be automatically updated.
+
+Furthermore, when additional menus are added (such as the tab context menu, or
+the `TermControl` context menu), these could also leverage a similar syntax to
+the above to allow re-use of the `id` parameter.
+
+Discussion with the team also suggested that users shouldn't be able to define
+actions in these menus _at all_. The actions should exclusively be defined in
+`actions`, and other menus should only be able to refer to these actions by
+`id`.
+
+## UI/UX Design
+
+There's not a whole lot of UI for this feature specifically. This is largely
+behind-the-scenes refactoring of how actions can be defined.
+
+## Capabilities
+
+### Accessibility
+
+_(not applicable)_
+
+### Security
+
+_(no change expected)_
+
+### Reliability
+
+_(no change expected)_
+
+### Compatibility
+
+_(no change expected)_
+
+### Performance, Power, and Efficiency
+
+_(no change expected)_
+
+## Potential Issues
+
+This won't necessarily play well with iterable commands in the Command Palette,
+but that's okay. For iterable commands, users will still need to define the
+actions manually.
+
+## Future considerations
+
+* See the following issues for other places where this might be useful:
+  - [#1912] - Context Menu for Tabs
+    * See also [#5524], [#5025], [#5633]
+  - [#3337] - Right-click menu inside TerminalControl (w/ Copy & Paste?)
+    * See also [#5633] and [#5025], both those actions seem reasonable in either
+      the tab context menu or the control context menu.
+
+<!-- Footnotes -->
+[Command Palette Spec]: https://github.com/microsoft/terminal/blob/master/doc/specs/%232046%20-%20Command%20Palette.md
+[New Tab Menu Customization Spec]: https://github.com/microsoft/terminal/blob/master/doc/specs/%231571%20-%20New%20Tab%20Menu%20Customization.md
+
+[#1571]: https://github.com/microsoft/terminal/issues/1571
+[#1912]: https://github.com/microsoft/terminal/issues/1912
+[#3337]: https://github.com/microsoft/terminal/issues/3337
+[#5025]: https://github.com/microsoft/terminal/issues/5025
+[#5524]: https://github.com/microsoft/terminal/issues/5524
+[#5633]: https://github.com/microsoft/terminal/issues/5633
+[#6532]: https://github.com/microsoft/terminal/issues/6532
+[#6899]: https://github.com/microsoft/terminal/issues/6899

res/README.md

@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2007.01)
-   * from microsoft/cascadia-code@311cc603f30635da704b6a7d13050e245e61667b
+* Cascadia Code, Cascadia Mono (2008.25)
+   * from microsoft/cascadia-code@678eea921b0c8b921b9fb009bb16d3d2ca5b8112

src/buffer/out/AttrRow.cpp

@@ -108,12 +108,7 @@ TextAttribute ATTR_ROW::GetAttrByColumn(const size_t column,
 {
     THROW_HR_IF(E_INVALIDARG, column >= _cchRowWidth);
     const auto runPos = FindAttrIndex(column, pApplies);
-    return GetAttrByIndex(runPos);
-}
-
-TextAttribute ATTR_ROW::GetAttrByIndex(const size_t index) const
-{
-    return _list.at(index).GetAttributes();
+    return _list.at(runPos).GetAttributes();
 }
 
 // Routine Description:
@@ -228,7 +223,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
 // Return Value:
 // - STATUS_NO_MEMORY if there wasn't enough memory to insert the runs
 //   otherwise STATUS_SUCCESS if we were successful.
-[[nodiscard]] HRESULT ATTR_ROW::InsertAttrRuns(const std::basic_string_view<TextAttributeRun> newAttrs,
+[[nodiscard]] HRESULT ATTR_ROW::InsertAttrRuns(const gsl::span<const TextAttributeRun> newAttrs,
                                                const size_t iStart,
                                                const size_t iEnd,
                                                const size_t cBufferWidth)
@@ -255,7 +250,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
     if (newAttrs.size() == 1)
     {
         // Get the new color attribute we're trying to apply
-        const TextAttribute NewAttr = newAttrs.at(0).GetAttributes();
+        const TextAttribute NewAttr = til::at(newAttrs, 0).GetAttributes();
 
         // If the existing run was only 1 element...
         // ...and the new color is the same as the old, we don't have to do anything and can exit quick.
@@ -377,7 +372,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
     if (iStart == 0 && iEnd == iLastBufferCol)
     {
         // Just dump what we're given over what we have and call it a day.
-        _list.assign(newAttrs.cbegin(), newAttrs.cend());
+        _list.assign(newAttrs.begin(), newAttrs.end());
 
         return S_OK;
     }

src/buffer/out/AttrRow.hpp

@@ -36,8 +36,6 @@ public:
     TextAttribute GetAttrByColumn(const size_t column,
                                   size_t* const pApplies) const;
 
-    TextAttribute GetAttrByIndex(const size_t index) const;
-
     size_t GetNumberOfRuns() const noexcept;
 
     size_t FindAttrIndex(const size_t index,
@@ -48,7 +46,7 @@ public:
 
     void Resize(const size_t newWidth);
 
-    [[nodiscard]] HRESULT InsertAttrRuns(const std::basic_string_view<TextAttributeRun> newAttrs,
+    [[nodiscard]] HRESULT InsertAttrRuns(const gsl::span<const TextAttributeRun> newAttrs,
                                          const size_t iStart,
                                          const size_t iEnd,
                                          const size_t cBufferWidth);

src/buffer/out/OutputCellIterator.cpp

@@ -112,9 +112,9 @@ OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const
 // - This is an iterator over legacy colors only. The text is not modified.
 // Arguments:
 // - legacyAttrs - One legacy color item per cell
-OutputCellIterator::OutputCellIterator(const std::basic_string_view<WORD> legacyAttrs) noexcept :
+OutputCellIterator::OutputCellIterator(const gsl::span<const WORD> legacyAttrs) noexcept :
     _mode(Mode::LegacyAttr),
-    _currentView(s_GenerateViewLegacyAttr(legacyAttrs.at(0))),
+    _currentView(s_GenerateViewLegacyAttr(til::at(legacyAttrs, 0))),
     _run(legacyAttrs),
     _attr(InvalidTextAttribute),
     _distance(0),
@@ -127,9 +127,9 @@ OutputCellIterator::OutputCellIterator(const std::basic_string_view<WORD> legacy
 // - This is an iterator over legacy cell data. We will use the unicode text and the legacy color attribute.
 // Arguments:
 // - charInfos - Multiple cell with unicode text and legacy color data.
-OutputCellIterator::OutputCellIterator(const std::basic_string_view<CHAR_INFO> charInfos) noexcept :
+OutputCellIterator::OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept :
     _mode(Mode::CharInfo),
-    _currentView(s_GenerateView(charInfos.at(0))),
+    _currentView(s_GenerateView(til::at(charInfos, 0))),
     _run(charInfos),
     _attr(InvalidTextAttribute),
     _distance(0),
@@ -142,9 +142,9 @@ OutputCellIterator::OutputCellIterator(const std::basic_string_view<CHAR_INFO> c
 // - This is an iterator over existing OutputCells with full text and color data.
 // Arguments:
 // - cells - Multiple cells in a run
-OutputCellIterator::OutputCellIterator(const std::basic_string_view<OutputCell> cells) :
+OutputCellIterator::OutputCellIterator(const gsl::span<const OutputCell> cells) :
     _mode(Mode::Cell),
-    _currentView(s_GenerateView(cells.at(0))),
+    _currentView(s_GenerateView(til::at(cells, 0))),
     _run(cells),
     _attr(InvalidTextAttribute),
     _distance(0),
@@ -180,15 +180,15 @@ OutputCellIterator::operator bool() const noexcept
         }
         case Mode::Cell:
         {
-            return _pos < std::get<std::basic_string_view<OutputCell>>(_run).length();
+            return _pos < std::get<gsl::span<const OutputCell>>(_run).size();
         }
         case Mode::CharInfo:
         {
-            return _pos < std::get<std::basic_string_view<CHAR_INFO>>(_run).length();
+            return _pos < std::get<gsl::span<const CHAR_INFO>>(_run).size();
         }
         case Mode::LegacyAttr:
         {
-            return _pos < std::get<std::basic_string_view<WORD>>(_run).length();
+            return _pos < std::get<gsl::span<const WORD>>(_run).size();
         }
         default:
             FAIL_FAST_HR(E_NOTIMPL);
@@ -265,7 +265,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateView(std::get<std::basic_string_view<OutputCell>>(_run).at(_pos));
+            _currentView = s_GenerateView(til::at(std::get<gsl::span<const OutputCell>>(_run), _pos));
         }
         break;
     }
@@ -275,7 +275,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateView(std::get<std::basic_string_view<CHAR_INFO>>(_run).at(_pos));
+            _currentView = s_GenerateView(til::at(std::get<gsl::span<const CHAR_INFO>>(_run), _pos));
         }
         break;
     }
@@ -285,7 +285,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateViewLegacyAttr(std::get<std::basic_string_view<WORD>>(_run).at(_pos));
+            _currentView = s_GenerateViewLegacyAttr(til::at(std::get<gsl::span<const WORD>>(_run), _pos));
         }
         break;
     }

src/buffer/out/OutputCellIterator.hpp

@@ -39,9 +39,9 @@ public:
     OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit = 0) noexcept;
     OutputCellIterator(const std::wstring_view utf16Text);
     OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute attribute);
-    OutputCellIterator(const std::basic_string_view<WORD> legacyAttributes) noexcept;
-    OutputCellIterator(const std::basic_string_view<CHAR_INFO> charInfos) noexcept;
-    OutputCellIterator(const std::basic_string_view<OutputCell> cells);
+    OutputCellIterator(const gsl::span<const WORD> legacyAttributes) noexcept;
+    OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept;
+    OutputCellIterator(const gsl::span<const OutputCell> cells);
     ~OutputCellIterator() = default;
 
     OutputCellIterator& operator=(const OutputCellIterator& it) = default;
@@ -86,13 +86,13 @@ private:
     };
     Mode _mode;
 
-    std::basic_string_view<WORD> _legacyAttrs;
+    gsl::span<const WORD> _legacyAttrs;
 
     std::variant<
         std::wstring_view,
-        std::basic_string_view<WORD>,
-        std::basic_string_view<CHAR_INFO>,
-        std::basic_string_view<OutputCell>,
+        gsl::span<const WORD>,
+        gsl::span<const CHAR_INFO>,
+        gsl::span<const OutputCell>,
         std::monostate>
         _run;
 

src/buffer/out/OutputCellRect.cpp

@@ -50,7 +50,7 @@ gsl::span<OutputCell> OutputCellRect::GetRow(const size_t row)
 // - Read-only iterator of OutputCells
 OutputCellIterator OutputCellRect::GetRowIter(const size_t row) const
 {
-    const std::basic_string_view<OutputCell> view(_FindRowOffset(row), _cols);
+    const gsl::span<const OutputCell> view(_FindRowOffset(row), _cols);
 
     return OutputCellIterator(view);
 }

src/buffer/out/Row.cpp

@@ -160,66 +160,98 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
     // If we're given a right-side column limit, use it. Otherwise, the write limit is the final column index available in the char row.
     const auto finalColumnInRow = limitRight.value_or(_charRow.size() - 1);
 
-    while (it && currentIndex <= finalColumnInRow)
+    if (it)
     {
-        // Fill the color if the behavior isn't set to keeping the current color.
-        if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
+        // Accumulate usages of the same color so we can spend less time in InsertAttrRuns rewriting it.
+        auto currentColor = it->TextAttr();
+        size_t colorUses = 0;
+        size_t colorStarts = index;
+
+        while (it && currentIndex <= finalColumnInRow)
         {
-            const TextAttributeRun attrRun{ 1, it->TextAttr() };
-            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &attrRun, 1 },
-                                                  currentIndex,
-                                                  currentIndex,
-                                                  _charRow.size()));
-        }
-
-        // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
-        if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
-        {
-            const bool fillingLastColumn = currentIndex == finalColumnInRow;
-
-            // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
-            // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
-            // for the trailing byte coming up before writing it.
-
-            // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
-            // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
-            if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
+            // Fill the color if the behavior isn't set to keeping the current color.
+            if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
             {
-                _charRow.ClearCell(currentIndex);
+                // If the color of this cell is the same as the run we're currently on,
+                // just increment the counter.
+                if (currentColor == it->TextAttr())
+                {
+                    ++colorUses;
+                }
+                else
+                {
+                    // Otherwise, commit this color into the run and save off the new one.
+                    const TextAttributeRun run{ colorUses, currentColor };
+                    // Now commit the new color runs into the attr row.
+                    LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
+                                                          colorStarts,
+                                                          currentIndex - 1,
+                                                          _charRow.size()));
+                    currentColor = it->TextAttr();
+                    colorUses = 1;
+                    colorStarts = currentIndex;
+                }
             }
-            // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
-            // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
-            else if (fillingLastColumn && it->DbcsAttr().IsLeading())
+
+            // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
+            if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
             {
-                _charRow.ClearCell(currentIndex);
-                _charRow.SetDoubleBytePadded(true);
+                const bool fillingLastColumn = currentIndex == finalColumnInRow;
+
+                // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
+                // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
+                // for the trailing byte coming up before writing it.
+
+                // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
+                // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
+                if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
+                {
+                    _charRow.ClearCell(currentIndex);
+                }
+                // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
+                // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
+                else if (fillingLastColumn && it->DbcsAttr().IsLeading())
+                {
+                    _charRow.ClearCell(currentIndex);
+                    _charRow.SetDoubleBytePadded(true);
+                }
+                // Otherwise, copy the data given and increment the iterator.
+                else
+                {
+                    _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
+                    _charRow.GlyphAt(currentIndex) = it->Chars();
+                    ++it;
+                }
+
+                // If we're asked to (un)set the wrap status and we just filled the last column with some text...
+                // NOTE:
+                //  - wrap = std::nullopt    --> don't change the wrap value
+                //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
+                //  - wrap = false           --> we're filling cells as a block, unwrap
+                if (wrap.has_value() && fillingLastColumn)
+                {
+                    // set wrap status on the row to parameter's value.
+                    _charRow.SetWrapForced(wrap.value());
+                }
             }
-            // Otherwise, copy the data given and increment the iterator.
             else
             {
-                _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
-                _charRow.GlyphAt(currentIndex) = it->Chars();
                 ++it;
             }
 
-            // If we're asked to (un)set the wrap status and we just filled the last column with some text...
-            // NOTE:
-            //  - wrap = std::nullopt    --> don't change the wrap value
-            //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
-            //  - wrap = false           --> we're filling cells as a block, unwrap
-            if (wrap.has_value() && fillingLastColumn)
-            {
-                // set wrap status on the row to parameter's value.
-                _charRow.SetWrapForced(wrap.value());
-            }
-        }
-        else
-        {
-            ++it;
+            // Move to the next cell for the next time through the loop.
+            ++currentIndex;
         }
 
-        // Move to the next cell for the next time through the loop.
-        ++currentIndex;
+        // Now commit the final color into the attr row
+        if (colorUses)
+        {
+            const TextAttributeRun run{ colorUses, currentColor };
+            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
+                                                  colorStarts,
+                                                  currentIndex - 1,
+                                                  _charRow.size()));
+        }
     }
 
     return it;

src/buffer/out/TextAttribute.cpp

@@ -90,7 +90,7 @@ bool TextAttribute::IsLegacy() const noexcept
 // - reverseScreenMode: true if the screen mode is reversed.
 // Return Value:
 // - the foreground and background colors that should be displayed.
-std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::basic_string_view<COLORREF> colorTable,
+std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                                 const COLORREF defaultFgColor,
                                                                 const COLORREF defaultBgColor,
                                                                 const bool reverseScreenMode) const noexcept
@@ -246,8 +246,12 @@ bool TextAttribute::IsCrossedOut() const noexcept
 
 bool TextAttribute::IsUnderlined() const noexcept
 {
-    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
-    return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_UNDERSCORE);
+    return WI_IsFlagSet(_extendedAttrs, ExtendedAttributes::Underlined);
+}
+
+bool TextAttribute::IsDoublyUnderlined() const noexcept
+{
+    return WI_IsFlagSet(_extendedAttrs, ExtendedAttributes::DoublyUnderlined);
 }
 
 bool TextAttribute::IsOverlined() const noexcept
@@ -270,7 +274,7 @@ void TextAttribute::SetFaint(bool isFaint) noexcept
     WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Faint, isFaint);
 }
 
-void TextAttribute::SetItalics(bool isItalic) noexcept
+void TextAttribute::SetItalic(bool isItalic) noexcept
 {
     WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Italics, isItalic);
 }
@@ -290,13 +294,17 @@ void TextAttribute::SetCrossedOut(bool isCrossedOut) noexcept
     WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::CrossedOut, isCrossedOut);
 }
 
-void TextAttribute::SetUnderline(bool isUnderlined) noexcept
+void TextAttribute::SetUnderlined(bool isUnderlined) noexcept
 {
-    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
-    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_UNDERSCORE, isUnderlined);
+    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Underlined, isUnderlined);
 }
 
-void TextAttribute::SetOverline(bool isOverlined) noexcept
+void TextAttribute::SetDoublyUnderlined(bool isDoublyUnderlined) noexcept
+{
+    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::DoublyUnderlined, isDoublyUnderlined);
+}
+
+void TextAttribute::SetOverlined(bool isOverlined) noexcept
 {
     WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_GRID_HORIZONTAL, isOverlined);
 }

src/buffer/out/TextAttribute.hpp

@@ -63,7 +63,7 @@ public:
     static TextAttribute StripErroneousVT16VersionsOfLegacyDefaults(const TextAttribute& attribute) noexcept;
     WORD GetLegacyAttributes() const noexcept;
 
-    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::basic_string_view<COLORREF> colorTable,
+    std::pair<COLORREF, COLORREF> CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
                                                      const COLORREF defaultFgColor,
                                                      const COLORREF defaultBgColor,
                                                      const bool reverseScreenMode = false) const noexcept;
@@ -95,17 +95,19 @@ public:
     bool IsInvisible() const noexcept;
     bool IsCrossedOut() const noexcept;
     bool IsUnderlined() const noexcept;
+    bool IsDoublyUnderlined() const noexcept;
     bool IsOverlined() const noexcept;
     bool IsReverseVideo() const noexcept;
 
     void SetBold(bool isBold) noexcept;
     void SetFaint(bool isFaint) noexcept;
-    void SetItalics(bool isItalic) noexcept;
+    void SetItalic(bool isItalic) noexcept;
     void SetBlinking(bool isBlinking) noexcept;
     void SetInvisible(bool isInvisible) noexcept;
     void SetCrossedOut(bool isCrossedOut) noexcept;
-    void SetUnderline(bool isUnderlined) noexcept;
-    void SetOverline(bool isOverlined) noexcept;
+    void SetUnderlined(bool isUnderlined) noexcept;
+    void SetDoublyUnderlined(bool isDoublyUnderlined) noexcept;
+    void SetOverlined(bool isOverlined) noexcept;
     void SetReverseVideo(bool isReversed) noexcept;
 
     ExtendedAttributes GetExtendedAttributes() const noexcept;
@@ -218,11 +220,12 @@ namespace WEX
             static WEX::Common::NoThrowString ToString(const TextAttribute& attr)
             {
                 return WEX::Common::NoThrowString().Format(
-                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x)}",
+                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x),ext:(0x%02x)}",
                     VerifyOutputTraits<TextColor>::ToString(attr._foreground).GetBuffer(),
                     VerifyOutputTraits<TextColor>::ToString(attr._background).GetBuffer(),
                     attr.IsBold(),
-                    attr._wAttrLegacy);
+                    attr._wAttrLegacy,
+                    static_cast<DWORD>(attr._extendedAttrs));
             }
         };
     }

src/buffer/out/TextColor.cpp

@@ -138,7 +138,7 @@ void TextColor::SetDefault() noexcept
 // - brighten: if true, we'll brighten a dark color table index.
 // Return Value:
 // - a COLORREF containing the real value of this TextColor.
-COLORREF TextColor::GetColor(std::basic_string_view<COLORREF> colorTable,
+COLORREF TextColor::GetColor(gsl::span<const COLORREF> colorTable,
                              const COLORREF defaultColor,
                              bool brighten) const noexcept
 {
@@ -158,9 +158,9 @@ COLORREF TextColor::GetColor(std::basic_string_view<COLORREF> colorTable,
             // If we find a match, return instead the bright version of this color
             for (size_t i = 0; i < 8; i++)
             {
-                if (colorTable.at(i) == defaultColor)
+                if (til::at(colorTable, i) == defaultColor)
                 {
-                    return colorTable.at(i + 8);
+                    return til::at(colorTable, i + 8);
                 }
             }
         }
@@ -173,11 +173,11 @@ COLORREF TextColor::GetColor(std::basic_string_view<COLORREF> colorTable,
     }
     else if (IsIndex16() && brighten)
     {
-        return colorTable.at(_index | 8);
+        return til::at(colorTable, _index | 8);
     }
     else
     {
-        return colorTable.at(_index);
+        return til::at(colorTable, _index);
     }
 }
 

src/buffer/out/TextColor.h

@@ -88,7 +88,7 @@ public:
     void SetIndex(const BYTE index, const bool isIndex256) noexcept;
     void SetDefault() noexcept;
 
-    COLORREF GetColor(std::basic_string_view<COLORREF> colorTable,
+    COLORREF GetColor(gsl::span<const COLORREF> colorTable,
                       const COLORREF defaultColor,
                       const bool brighten = false) const noexcept;
 

src/buffer/out/UnicodeStorage.cpp

@@ -35,7 +35,7 @@ void UnicodeStorage::StoreGlyph(const key_type key, const mapped_type& glyph)
 // - erases key and its associated data from the storage
 // Arguments:
 // - key - the key to remove
-void UnicodeStorage::Erase(const key_type key)
+void UnicodeStorage::Erase(const key_type key) noexcept
 {
     _map.erase(key);
 }

src/buffer/out/UnicodeStorage.hpp

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

src/buffer/out/textBuffer.cpp

@@ -787,7 +787,7 @@ const Cursor& TextBuffer::GetCursor() const noexcept
     return _currentAttributes;
 }
 
-void TextBuffer::SetCurrentAttributes(const TextAttribute currentAttributes) noexcept
+void TextBuffer::SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept
 {
     _currentAttributes = currentAttributes;
 }

src/buffer/out/textBuffer.hpp

@@ -118,7 +118,7 @@ public:
 
     [[nodiscard]] TextAttribute GetCurrentAttributes() const noexcept;
 
-    void SetCurrentAttributes(const TextAttribute currentAttributes) noexcept;
+    void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;
 
     void Reset();
 

src/buffer/out/ut_textbuffer/TextAttributeTests.cpp

@@ -27,7 +27,7 @@ class TextAttributeTests
     COLORREF _colorTable[COLOR_TABLE_SIZE];
     COLORREF _defaultFg = RGB(1, 2, 3);
     COLORREF _defaultBg = RGB(4, 5, 6);
-    std::basic_string_view<COLORREF> _GetTableView();
+    gsl::span<const COLORREF> _GetTableView();
 };
 
 bool TextAttributeTests::ClassSetup()
@@ -51,9 +51,9 @@ bool TextAttributeTests::ClassSetup()
     return true;
 }
 
-std::basic_string_view<COLORREF> TextAttributeTests::_GetTableView()
+gsl::span<const COLORREF> TextAttributeTests::_GetTableView()
 {
-    return std::basic_string_view<COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
 }
 
 void TextAttributeTests::TestRoundtripLegacy()

src/buffer/out/ut_textbuffer/TextColorTests.cpp

@@ -27,7 +27,7 @@ class TextColorTests
     COLORREF _colorTable[COLOR_TABLE_SIZE];
     COLORREF _defaultFg = RGB(1, 2, 3);
     COLORREF _defaultBg = RGB(4, 5, 6);
-    std::basic_string_view<COLORREF> _GetTableView();
+    gsl::span<const COLORREF> _GetTableView();
 };
 
 bool TextColorTests::ClassSetup()
@@ -51,9 +51,9 @@ bool TextColorTests::ClassSetup()
     return true;
 }
 
-std::basic_string_view<COLORREF> TextColorTests::_GetTableView()
+gsl::span<const COLORREF> TextColorTests::_GetTableView()
 {
-    return std::basic_string_view<COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
 }
 
 void TextColorTests::TestDefaultColor()

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -9,6 +9,7 @@
 
 using namespace Microsoft::Console;
 using namespace TerminalApp;
+using namespace winrt::TerminalApp::implementation;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -73,24 +74,24 @@ namespace TerminalAppLocalTests
 
         const auto scheme0 = ColorScheme::FromJson(scheme0Json);
 
-        VERIFY_IS_TRUE(scheme0.ShouldBeLayered(scheme0Json));
-        VERIFY_IS_FALSE(scheme0.ShouldBeLayered(scheme1Json));
-        VERIFY_IS_TRUE(scheme0.ShouldBeLayered(scheme2Json));
-        VERIFY_IS_FALSE(scheme0.ShouldBeLayered(scheme3Json));
+        VERIFY_IS_TRUE(scheme0->ShouldBeLayered(scheme0Json));
+        VERIFY_IS_FALSE(scheme0->ShouldBeLayered(scheme1Json));
+        VERIFY_IS_TRUE(scheme0->ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme0->ShouldBeLayered(scheme3Json));
 
         const auto scheme1 = ColorScheme::FromJson(scheme1Json);
 
-        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme0Json));
-        VERIFY_IS_TRUE(scheme1.ShouldBeLayered(scheme1Json));
-        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme2Json));
-        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme3Json));
+        VERIFY_IS_FALSE(scheme1->ShouldBeLayered(scheme0Json));
+        VERIFY_IS_TRUE(scheme1->ShouldBeLayered(scheme1Json));
+        VERIFY_IS_FALSE(scheme1->ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme1->ShouldBeLayered(scheme3Json));
 
         const auto scheme3 = ColorScheme::FromJson(scheme3Json);
 
-        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme0Json));
-        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme1Json));
-        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme2Json));
-        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme3Json));
+        VERIFY_IS_FALSE(scheme3->ShouldBeLayered(scheme0Json));
+        VERIFY_IS_FALSE(scheme3->ShouldBeLayered(scheme1Json));
+        VERIFY_IS_FALSE(scheme3->ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme3->ShouldBeLayered(scheme3Json));
     }
 
     void ColorSchemeTests::LayerColorSchemeProperties()
@@ -130,38 +131,38 @@ namespace TerminalAppLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
 
         auto scheme0 = ColorScheme::FromJson(scheme0Json);
-        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]);
+        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]);
 
         Log::Comment(NoThrowString().Format(
             L"Layering scheme1 on top of scheme0"));
-        scheme0.LayerJson(scheme1Json);
+        scheme0->LayerJson(scheme1Json);
 
-        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]);
+        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]);
 
         Log::Comment(NoThrowString().Format(
             L"Layering scheme2Json on top of (scheme0+scheme1)"));
-        scheme0.LayerJson(scheme2Json);
+        scheme0->LayerJson(scheme2Json);
 
-        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]);
+        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]);
     }
 
     void ColorSchemeTests::LayerColorSchemesOnArray()
@@ -205,19 +206,20 @@ namespace TerminalAppLocalTests
             for (auto& kv : settings._globals._colorSchemes)
             {
                 Log::Comment(NoThrowString().Format(
-                    L"kv:%s->%s", kv.first.data(), kv.second.GetName().data()));
+                    L"kv:%s->%s", kv.first.data(), kv.second.Name().data()));
             }
             VERIFY_ARE_EQUAL(1u, settings._globals.GetColorSchemes().size());
 
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0 = settings._globals._colorSchemes.find(L"scheme0")->second;
+            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._defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
         }
 
         settings._LayerOrCreateColorScheme(scheme1Json);
@@ -226,18 +228,20 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
 
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0 = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1 = settings._globals._colorSchemes.find(L"scheme1")->second;
+            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._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);
+            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);
 
@@ -245,18 +249,20 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
 
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0 = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1 = settings._globals._colorSchemes.find(L"scheme1")->second;
+            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._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, 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);
 
@@ -264,22 +270,25 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(3u, settings._globals.GetColorSchemes().size());
 
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0 = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1 = settings._globals._colorSchemes.find(L"scheme1")->second;
+            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
             VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"") != settings._globals._colorSchemes.end());
-            auto scheme2 = settings._globals._colorSchemes.find(L"")->second;
+            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._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);
+            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

@@ -10,7 +10,8 @@
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::Settings;
+using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Windows::Foundation::Collections;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -61,25 +62,25 @@ namespace TerminalAppLocalTests
         const auto commands1Json = VerifyParseSucceeded(commands1String);
         const auto commands2Json = VerifyParseSucceeded(commands2String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
         }
-        VERIFY_ARE_EQUAL(1u, commands.size());
+        VERIFY_ARE_EQUAL(1u, commands.Size());
 
         {
             auto warnings = implementation::Command::LayerJson(commands, commands1Json);
             VERIFY_ARE_EQUAL(0u, warnings.size());
         }
-        VERIFY_ARE_EQUAL(2u, commands.size());
+        VERIFY_ARE_EQUAL(2u, commands.Size());
 
         {
             auto warnings = implementation::Command::LayerJson(commands, commands2Json);
             VERIFY_ARE_EQUAL(0u, warnings.size());
         }
-        VERIFY_ARE_EQUAL(4u, commands.size());
+        VERIFY_ARE_EQUAL(4u, commands.Size());
     }
 
     void CommandTests::LayerCommand()
@@ -95,13 +96,13 @@ namespace TerminalAppLocalTests
         const auto commands2Json = VerifyParseSucceeded(commands2String);
         const auto commands3Json = VerifyParseSucceeded(commands3String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
-            VERIFY_ARE_EQUAL(1u, commands.size());
-            auto command = commands.at(L"action0");
+            VERIFY_ARE_EQUAL(1u, commands.Size());
+            auto command = commands.Lookup(L"action0");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, command.Action().Action());
@@ -111,8 +112,8 @@ namespace TerminalAppLocalTests
         {
             auto warnings = implementation::Command::LayerJson(commands, commands1Json);
             VERIFY_ARE_EQUAL(0u, warnings.size());
-            VERIFY_ARE_EQUAL(1u, commands.size());
-            auto command = commands.at(L"action0");
+            VERIFY_ARE_EQUAL(1u, commands.Size());
+            auto command = commands.Lookup(L"action0");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::PasteText, command.Action().Action());
@@ -121,8 +122,8 @@ namespace TerminalAppLocalTests
         {
             auto warnings = implementation::Command::LayerJson(commands, commands2Json);
             VERIFY_ARE_EQUAL(0u, warnings.size());
-            VERIFY_ARE_EQUAL(1u, commands.size());
-            auto command = commands.at(L"action0");
+            VERIFY_ARE_EQUAL(1u, commands.Size());
+            auto command = commands.Lookup(L"action0");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, command.Action().Action());
@@ -133,7 +134,7 @@ namespace TerminalAppLocalTests
             // This last command should "unbind" the action.
             auto warnings = implementation::Command::LayerJson(commands, commands3Json);
             VERIFY_ARE_EQUAL(0u, warnings.size());
-            VERIFY_ARE_EQUAL(0u, commands.size());
+            VERIFY_ARE_EQUAL(0u, commands.Size());
         }
     }
 
@@ -147,22 +148,20 @@ namespace TerminalAppLocalTests
             { "name": "command0", "command": { "action": "splitPane", "split": null } },
             { "name": "command1", "command": { "action": "splitPane", "split": "vertical" } },
             { "name": "command2", "command": { "action": "splitPane", "split": "horizontal" } },
-            { "name": "command3", "command": { "action": "splitPane", "split": "none" } },
             { "name": "command4", "command": { "action": "splitPane" } },
-            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } },
-            { "name": "command6", "command": { "action": "splitPane", "split": "foo" } }
+            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } }
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
-        VERIFY_ARE_EQUAL(7u, commands.size());
+        VERIFY_ARE_EQUAL(5u, commands.Size());
 
         {
-            auto command = commands.at(L"command0");
+            auto command = commands.Lookup(L"command0");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -172,7 +171,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"command1");
+            auto command = commands.Lookup(L"command1");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -182,7 +181,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"command2");
+            auto command = commands.Lookup(L"command2");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -192,7 +191,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"command3");
+            auto command = commands.Lookup(L"command4");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -202,27 +201,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"command4");
-            VERIFY_IS_NOT_NULL(command);
-            VERIFY_IS_NOT_NULL(command.Action());
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
-            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
-        }
-        {
-            auto command = commands.at(L"command5");
-            VERIFY_IS_NOT_NULL(command);
-            VERIFY_IS_NOT_NULL(command.Action());
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
-            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
-        }
-        {
-            auto command = commands.at(L"command6");
+            auto command = commands.Lookup(L"command5");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -239,17 +218,17 @@ namespace TerminalAppLocalTests
         const std::string commands0String{ R"([ { "name": { "key": "DuplicateTabCommandKey"}, "command": "copy" } ])" };
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
-            VERIFY_ARE_EQUAL(1u, commands.size());
+            VERIFY_ARE_EQUAL(1u, commands.Size());
 
             // NOTE: We're relying on DuplicateTabCommandKey being defined as
             // "Duplicate Tab" here. If that string changes in our resources,
             // this test will break.
-            auto command = commands.at(L"Duplicate tab");
+            auto command = commands.Lookup(L"Duplicate tab");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, command.Action().Action());
@@ -260,6 +239,14 @@ namespace TerminalAppLocalTests
 
     void CommandTests::TestAutogeneratedName()
     {
+        // Tests run in Helix can't report Skipped until GH#7286 is resolved.
+        // Set ignore flag to make Helix run completely overlook it.
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True")
+        END_TEST_METHOD_PROPERTIES()
+
+        // This test to be corrected as a part of GH#7281
+
         // This test ensures that we'll correctly create commands for actions
         // that don't have given names, pursuant to the spec in GH#6532.
 
@@ -279,18 +266,18 @@ namespace TerminalAppLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
 
         // There are only 3 commands here: all of the `"none"`, `"auto"`,
         // `"foo"`, `null`, and <no args> bindings all generate the same action,
         // which will generate just a single name for all of them.
-        VERIFY_ARE_EQUAL(3u, commands.size());
+        VERIFY_ARE_EQUAL(3u, commands.Size());
 
         {
-            auto command = commands.at(L"Split pane");
+            auto command = commands.Lookup(L"Split pane");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -300,7 +287,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"Split pane, direction: vertical");
+            auto command = commands.Lookup(L"Split pane, split: vertical");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -310,7 +297,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
-            auto command = commands.at(L"Split pane, direction: horizontal");
+            auto command = commands.Lookup(L"Split pane, split: horizontal");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
@@ -329,14 +316,14 @@ namespace TerminalAppLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        std::unordered_map<winrt::hstring, Command> commands;
-        VERIFY_ARE_EQUAL(0u, commands.size());
+        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());
-        VERIFY_ARE_EQUAL(1u, commands.size());
+        VERIFY_ARE_EQUAL(1u, commands.Size());
 
         {
-            auto command = commands.at(L"Split pane");
+            auto command = commands.Lookup(L"Split pane");
             VERIFY_IS_NOT_NULL(command);
             VERIFY_IS_NOT_NULL(command.Action());
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -4,7 +4,9 @@
 #include "pch.h"
 #include <WexTestClass.h>
 
+#include "../TerminalApp/TerminalPage.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
+#include "../TerminalApp/ActionArgs.h"
 
 using namespace WEX::Logging;
 using namespace WEX::Common;
@@ -52,6 +54,10 @@ namespace TerminalAppLocalTests
 
         TEST_METHOD(CheckTypos);
 
+        TEST_METHOD(TestSimpleExecuteCommandlineAction);
+        TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
+        TEST_METHOD(TestInvalidExecuteCommandlineAction);
+
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                       const size_t expectedSubcommands,
@@ -1067,4 +1073,66 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"C:\\", myArgs.TerminalArgs().StartingDirectory());
         }
     }
+
+    void CommandlineTest::TestSimpleExecuteCommandlineAction()
+    {
+        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());
+        VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+        auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+        VERIFY_IS_NOT_NULL(myArgs);
+        VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+        VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
+        VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
+        VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
+        VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
+        VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+    }
+
+    void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
+    {
+        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);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+        }
+        {
+            auto actionAndArgs = actions.at(1);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+        }
+    }
+
+    void CommandlineTest::TestInvalidExecuteCommandlineAction()
+    {
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        // -H and -V cannot be combined.
+        args->Commandline(L"split-pane -H -V");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
+        VERIFY_ARE_EQUAL(0u, actions.size());
+    }
 }