Migrate spelling-0.0.19 changes from main

<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
Immediately cancelling the preview when the user is navigating back from a nested command.

<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #10165
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
Basically 2 changes are done here:
- Allow the click handler to run for the back button when the button has focus and user hits the enter key (similarly as hitting space now).
- Now immediately cancelling the preview when the user is navigating back. Felt nicer to do it immediately at that point then keeping the preview active until the user hits cancel to close the palette. So the preview is already cancelled at step **5** instead of 6 as mentioned in the reproduction steps here https://github.com/microsoft/terminal/issues/10165#issue-899838383. But of course let me know if you're not agreeing here 😀 .

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
- Open 'Color Scheme' and verified preview is still working fine when selecting different schemes.
- After tabbing back to the Back button verified that when hitting enter or space the preview is cancelled and the original color scheme is being used again.
- Then after going back to 'Color Scheme' previews are still working ok.
- After hitting Enter on one of the Color Schemes the scheme still becomes active as before.

(cherry picked from commit 1cc383f865)

.github/actions/spelling/advice.md

@@ -1,3 +1,4 @@
+<!-- markdownlint-disable MD033 MD041 -->
 <details>
 <summary>
 :pencil2: Contributor please read this
@@ -8,9 +9,10 @@ By default the command suggestion will generate a file named based on your commi
 :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/spelling/dictionary/names.txt`.
-* ... APIs, you can add them to a file in `.github/actions/spelling/dictionary/`.
+* ... *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/`.
 
@@ -18,10 +20,31 @@ 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:
 
-:clamp: If you see a bunch of garbage and it relates to a binary-ish string, please add a file path to the `.github/actions/spelling/excludes.txt` file instead of just accepting the garbage.
+<details><summary>:clamp: If you see a bunch of garbage</summary>
+
+If it relates to a ...
+<details><summary>well-formed pattern</summary>
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to a `patterns/{file}.txt`.
+
+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><summary>binary-ish string</summary>
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
 
 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](https://github.com/microsoft/terminal/blob/main/README.md) (on whichever branch you're using).
+`^` 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).
+</details>
+
+</details>
+
 </details>

.github/actions/spelling/allow/README.md

@@ -1,4 +1,4 @@
-# Dictionaries are lists of words to accept unconditionally
+# Allow files are lists of words to accept unconditionally
 
 While check spelling will complain about an expected word
 which is no longer present, you can include things here even if
@@ -8,11 +8,11 @@ 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 |
 | ---- | ----------- |
-| [Dictionary](dictionary.txt) | Primary US English dictionary |
+| [Allow](allow.txt) | Supplements to the dictionary |
 | [Chinese](chinese.txt) | Chinese words |
 | [Japanese](japanese.txt) | Japanese words |
 | [Microsoft](microsoft.txt) | Microsoft brand items |

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

@@ -0,0 +1,77 @@
+apc
+calt
+ccmp
+changelog
+cybersecurity
+Apc
+clickable
+clig
+copyable
+dalet
+dcs
+Dcs
+dialytika
+dje
+downside
+downsides
+dze
+dzhe
+Enum'd
+Fitt
+formattings
+ftp
+fvar
+geeksforgeeks
+ghe
+gje
+hostname
+hostnames
+hyperlink
+hyperlinking
+hyperlinks
+img
+It'd
+kje
+liga
+lje
+locl
+lorem
+Llast
+Lmid
+Lorigin
+maxed
+mkmk
+mru
+noreply
+nje
+ogonek
+ok'd
+overlined
+postmodern
+ptys
+qof
+qps
+rclt
+reimplementation
+reserialization
+reserialize
+reserializes
+rlig
+runtimes
+shcha
+slnt
+Sos
+timestamped
+TLDR
+tokenizes
+tonos
+tshe
+uiatextrange
+UIs
+und
+unregister
+versioned
+We'd
+wildcards
+yeru
+zhe

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

@@ -1,22 +1,35 @@
 ACCEPTFILES
 ACCESSDENIED
+alignas
 alignof
+APPLYTOSUBMENUS
 bitfield
 bitfields
+BUILDBRANCH
+BUILDMSG
+BUILDNUMBER
+BYPOSITION
+charconv
 CLASSNOTAVAILABLE
 cmdletbinding
 COLORPROPERTY
+colspan
 COMDLG
+comparand
+cstdint
 CXICON
 CYICON
-D2DERR_SHADER_COMPILE_FAILED
 dataobject
+dcomp
 DERR
 dlldata
 DONTADDTORECENT
+DWORDLONG
+enumset
 environstrings
 EXPCMDFLAGS
 EXPCMDSTATE
+filetime
 FILTERSPEC
 FORCEFILESYSTEM
 FORCEMINIMIZE
@@ -28,7 +41,9 @@ GETHIGHCONTRAST
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
+hotkeys
 href
+hrgn
 IActivation
 IApp
 IAppearance
@@ -37,97 +52,143 @@ IBind
 IBox
 IClass
 IComparable
+IComparer
 IConnection
 ICustom
 IDialog
 IDirect
 IExplorer
+IFACEMETHOD
 IFile
 IInheritable
 IMap
 IObject
+iosfwd
 IPackage
 IPeasant
+isspace
+ISetup
 IStorage
 istream
 IStringable
 ITab
 ITaskbar
+IUri
 IVirtual
+KEYSELECT
 LCID
 llabs
 llu
 localtime
 lround
 LSHIFT
-MULTIPLEUSE
+MENUCOMMAND
+MENUDATA
+MENUINFO
+memicmp
+mptt
+mov
 msappx
 MULTIPLEUSE
 NCHITTEST
 NCLBUTTONDBLCLK
 NCRBUTTONDBLCLK
+NIF
+NIN
 NOAGGREGATION
 NOASYNC
 NOCHANGEDIR
 NOPROGRESS
 NOREDIRECTIONBITMAP
+NOREPEAT
+NOTIFYBYPOS
+NOTIFYICON
+NOTIFYICONDATA
 ntprivapi
 oaidl
 ocidl
+ODR
+offsetof
+osver
+OSVERSIONINFOEXW
 otms
 OUTLINETEXTMETRICW
 overridable
 PAGESCROLL
 PICKFOLDERS
 pmr
-REGCLS
+rcx
 REGCLS
 RETURNCMD
 rfind
 roundf
 RSHIFT
-rx
 schandle
 semver
 serializer
+SETVERSION
+SHELLEXECUTEINFOW
 shobjidl
-SINGLEUSE
 SHOWMINIMIZED
+SHOWTIP
+SINGLEUSE
 SIZENS
 smoothstep
-GETDESKWALLPAPER
-SHELLEXECUTEINFOW
 snprintf
 spsc
 sregex
+SRWLOC
+SRWLOCK
 STDCPP
-strchr
 STDMETHOD
+strchr
+strcpy
+streambuf
+strtoul
 Stubless
 Subheader
 Subpage
-UPDATEINIFILE
 syscall
+TASKBARCREATED
 TBPF
 THEMECHANGED
+tlg
 tmp
 tolower
+toupper
 TTask
 TVal
-tx
+UChar
 UPDATEINIFILE
 userenv
 wcsstr
 wcstoui
 winmain
+wmemcmp
 wpc
 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

@@ -0,0 +1,117 @@
+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/fonts.txt

@@ -7,3 +7,4 @@ Iosevka
 MDL
 Monofur
 Segoe
+wght

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

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

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

@@ -1,15 +1,22 @@
 ACLs
 ADMINS
+advapi
 altform
 altforms
 appendwttlogging
+appx
+appxbundle
+appxerror
+appxmanifest
+ATL
 backplating
 bitmaps
 BOMs
 CPLs
-CPRs
 cpptools
 cppvsdbg
+CPRs
+cryptbase
 DACL
 DACLs
 diffs
@@ -19,14 +26,20 @@ DTDs
 DWINRT
 enablewttlogging
 Intelli
+IVisual
 LKG
+LOCKFILE
+Lxss
 mfcribbon
 microsoft
 microsoftonline
+MSAA
 msixbundle
+MSVC
 muxc
 netcore
 osgvsowi
+PFILETIME
 pgc
 pgo
 pgosweep
@@ -34,20 +47,29 @@ powerrename
 powershell
 propkey
 pscustomobject
+QWORD
+regedit
 robocopy
 SACLs
+sdkddkver
 Shobjidl
 Skype
+SRW
+sxs
+Sysinternals
 sysnative
 systemroot
 taskkill
 tasklist
 tdbuildteamid
+unvirtualized
 VCRT
 vcruntime
+Virtualization
 visualstudio
 vscode
 VSTHRD
+winsdkver
 wlk
 wslpath
 wtl

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

@@ -13,6 +13,7 @@ ethanschoonover
 Firefox
 Gatta
 glsl
+Gravell
 Grie
 Griese
 Hernan
@@ -30,6 +31,7 @@ Kourosh
 kowalczyk
 leonmsft
 Lepilleur
+lhecker
 lukesampson
 Manandhar
 mbadolato
@@ -51,6 +53,7 @@ oldnewthing
 opengl
 osgwiki
 pabhojwa
+panos
 paulcam
 pauldotknopf
 PGP
@@ -65,12 +68,13 @@ sonpham
 stakx
 thereses
 Walisch
+Wellons
 Wirt
 Wojciech
 zadjii
 Zamor
-zamora
 Zamora
+zamora
 Zoey
 zorio
 Zverovich

.github/actions/spelling/dictionary/colors.txt

@@ -1,782 +0,0 @@
-snow
-ghost-white
-ghostwhite
-white-smoke
-whitesmoke
-gainsboro
-floral-white
-floralwhite
-old-lace
-oldlace
-linen
-antique-white
-antiquewhite
-papaya-whip
-papayawhip
-blanched-almond
-blanchedalmond
-bisque
-peach-puff
-peachpuff
-navajo-white
-navajowhite
-moccasin
-cornsilk
-ivory
-lemon-chiffon
-lemonchiffon
-seashell
-honeydew
-mint-cream
-mintcream
-azure
-alice-blue
-aliceblue
-lavender
-lavender-blush
-lavenderblush
-misty-rose
-mistyrose
-white
-black
-dark-slate-gray
-darkslategray
-dark-slate-grey
-darkslategrey
-dim-gray
-dimgray
-dim-grey
-dimgrey
-slate-gray
-slategray
-slate-grey
-slategrey
-light-slate-gray
-lightslategray
-light-slate-grey
-lightslategrey
-gray
-grey
-xray
-x11gray
-xrey
-x11grey
-web-gray
-webgray
-web-grey
-webgrey
-light-grey
-lightgrey
-light-gray
-lightgray
-midnight-blue
-midnightblue
-navy
-navy-blue
-navyblue
-cornflower-blue
-cornflowerblue
-dark-slate-blue
-darkslateblue
-slate-blue
-slateblue
-medium-slate-blue
-mediumslateblue
-light-slate-blue
-lightslateblue
-medium-blue
-mediumblue
-royal-blue
-royalblue
-blue
-dodger-blue
-dodgerblue
-deep-sky-blue
-deepskyblue
-sky-blue
-skyblue
-light-sky-blue
-lightskyblue
-steel-blue
-steelblue
-light-steel-blue
-lightsteelblue
-light-blue
-lightblue
-powder-blue
-powderblue
-pale-turquoise
-paleturquoise
-dark-turquoise
-darkturquoise
-medium-turquoise
-mediumturquoise
-turquoise
-cyan
-aqua
-light-cyan
-lightcyan
-cadet-blue
-cadetblue
-medium-aquamarine
-mediumaquamarine
-aquamarine
-dark-green
-darkgreen
-dark-olive-green
-darkolivegreen
-dark-sea-green
-darkseagreen
-sea-green
-seagreen
-medium-sea-green
-mediumseagreen
-light-sea-green
-lightseagreen
-pale-green
-palegreen
-spring-green
-springgreen
-lawn-green
-lawngreen
-green
-lime
-xreen
-x11green
-web-green
-webgreen
-chartreuse
-medium-spring-green
-mediumspringgreen
-green-yellow
-greenyellow
-lime-green
-limegreen
-yellow-green
-yellowgreen
-forest-green
-forestgreen
-olive-drab
-olivedrab
-dark-khaki
-darkkhaki
-khaki
-pale-goldenrod
-palegoldenrod
-light-goldenrod-yellow
-lightgoldenrodyellow
-light-yellow
-lightyellow
-yellow
-gold
-light-goldenrod
-lightgoldenrod
-goldenrod
-dark-goldenrod
-darkgoldenrod
-rosy-brown
-rosybrown
-indian-red
-indianred
-saddle-brown
-saddlebrown
-sienna
-peru
-burlywood
-beige
-wheat
-sandy-brown
-sandybrown
-tan
-chocolate
-firebrick
-brown
-dark-salmon
-darksalmon
-salmon
-light-salmon
-lightsalmon
-orange
-dark-orange
-darkorange
-coral
-light-coral
-lightcoral
-tomato
-orange-red
-orangered
-red
-hot-pink
-hotpink
-deep-pink
-deeppink
-pink
-light-pink
-lightpink
-pale-violet-red
-palevioletred
-maroon
-xaroon
-x11maroon
-web-maroon
-webmaroon
-medium-violet-red
-mediumvioletred
-violet-red
-violetred
-magenta
-fuchsia
-violet
-plum
-orchid
-medium-orchid
-mediumorchid
-dark-orchid
-darkorchid
-dark-violet
-darkviolet
-blue-violet
-blueviolet
-purple
-xurple
-x11purple
-web-purple
-webpurple
-medium-purple
-mediumpurple
-thistle
-snow1
-snow2
-snow3
-snow4
-seashell1
-seashell2
-seashell3
-seashell4
-antiquewhite1
-antiquewhite2
-antiquewhite3
-antiquewhite4
-bisque1
-bisque2
-bisque3
-bisque4
-peachpuff1
-peachpuff2
-peachpuff3
-peachpuff4
-navajowhite1
-navajowhite2
-navajowhite3
-navajowhite4
-lemonchiffon1
-lemonchiffon2
-lemonchiffon3
-lemonchiffon4
-cornsilk1
-cornsilk2
-cornsilk3
-cornsilk4
-ivory1
-ivory2
-ivory3
-ivory4
-honeydew1
-honeydew2
-honeydew3
-honeydew4
-lavenderblush1
-lavenderblush2
-lavenderblush3
-lavenderblush4
-mistyrose1
-mistyrose2
-mistyrose3
-mistyrose4
-azure1
-azure2
-azure3
-azure4
-slateblue1
-slateblue2
-slateblue3
-slateblue4
-royalblue1
-royalblue2
-royalblue3
-royalblue4
-blue1
-blue2
-blue3
-blue4
-dodgerblue1
-dodgerblue2
-dodgerblue3
-dodgerblue4
-steelblue1
-steelblue2
-steelblue3
-steelblue4
-deepskyblue1
-deepskyblue2
-deepskyblue3
-deepskyblue4
-skyblue1
-skyblue2
-skyblue3
-skyblue4
-lightskyblue1
-lightskyblue2
-lightskyblue3
-lightskyblue4
-slategray1
-slategray2
-slategray3
-slategray4
-lightsteelblue1
-lightsteelblue2
-lightsteelblue3
-lightsteelblue4
-lightblue1
-lightblue2
-lightblue3
-lightblue4
-lightcyan1
-lightcyan2
-lightcyan3
-lightcyan4
-paleturquoise1
-paleturquoise2
-paleturquoise3
-paleturquoise4
-cadetblue1
-cadetblue2
-cadetblue3
-cadetblue4
-turquoise1
-turquoise2
-turquoise3
-turquoise4
-cyan1
-cyan2
-cyan3
-cyan4
-darkslategray1
-darkslategray2
-darkslategray3
-darkslategray4
-aquamarine1
-aquamarine2
-aquamarine3
-aquamarine4
-darkseagreen1
-darkseagreen2
-darkseagreen3
-darkseagreen4
-seagreen1
-seagreen2
-seagreen3
-seagreen4
-palegreen1
-palegreen2
-palegreen3
-palegreen4
-springgreen1
-springgreen2
-springgreen3
-springgreen4
-green1
-green2
-green3
-green4
-chartreuse1
-chartreuse2
-chartreuse3
-chartreuse4
-olivedrab1
-olivedrab2
-olivedrab3
-olivedrab4
-darkolivegreen1
-darkolivegreen2
-darkolivegreen3
-darkolivegreen4
-khaki1
-khaki2
-khaki3
-khaki4
-lightgoldenrod1
-lightgoldenrod2
-lightgoldenrod3
-lightgoldenrod4
-lightyellow1
-lightyellow2
-lightyellow3
-lightyellow4
-yellow1
-yellow2
-yellow3
-yellow4
-gold1
-gold2
-gold3
-gold4
-goldenrod1
-goldenrod2
-goldenrod3
-goldenrod4
-darkgoldenrod1
-darkgoldenrod2
-darkgoldenrod3
-darkgoldenrod4
-rosybrown1
-rosybrown2
-rosybrown3
-rosybrown4
-indianred1
-indianred2
-indianred3
-indianred4
-sienna1
-sienna2
-sienna3
-sienna4
-burlywood1
-burlywood2
-burlywood3
-burlywood4
-wheat1
-wheat2
-wheat3
-wheat4
-tan1
-tan2
-tan3
-tan4
-chocolate1
-chocolate2
-chocolate3
-chocolate4
-firebrick1
-firebrick2
-firebrick3
-firebrick4
-brown1
-brown2
-brown3
-brown4
-salmon1
-salmon2
-salmon3
-salmon4
-lightsalmon1
-lightsalmon2
-lightsalmon3
-lightsalmon4
-orange1
-orange2
-orange3
-orange4
-darkorange1
-darkorange2
-darkorange3
-darkorange4
-coral1
-coral2
-coral3
-coral4
-tomato1
-tomato2
-tomato3
-tomato4
-orangered1
-orangered2
-orangered3
-orangered4
-red1
-red2
-red3
-red4
-deeppink1
-deeppink2
-deeppink3
-deeppink4
-hotpink1
-hotpink2
-hotpink3
-hotpink4
-pink1
-pink2
-pink3
-pink4
-lightpink1
-lightpink2
-lightpink3
-lightpink4
-palevioletred1
-palevioletred2
-palevioletred3
-palevioletred4
-maroon1
-maroon2
-maroon3
-maroon4
-violetred1
-violetred2
-violetred3
-violetred4
-magenta1
-magenta2
-magenta3
-magenta4
-orchid1
-orchid2
-orchid3
-orchid4
-plum1
-plum2
-plum3
-plum4
-mediumorchid1
-mediumorchid2
-mediumorchid3
-mediumorchid4
-darkorchid1
-darkorchid2
-darkorchid3
-darkorchid4
-purple1
-purple2
-purple3
-purple4
-mediumpurple1
-mediumpurple2
-mediumpurple3
-mediumpurple4
-thistle1
-thistle2
-thistle3
-thistle4
-gray0
-grey0
-gray1
-grey1
-gray2
-grey2
-gray3
-grey3
-gray4
-grey4
-gray5
-grey5
-gray6
-grey6
-gray7
-grey7
-gray8
-grey8
-gray9
-grey9
-gray10
-grey10
-gray11
-grey11
-gray12
-grey12
-gray13
-grey13
-gray14
-grey14
-gray15
-grey15
-gray16
-grey16
-gray17
-grey17
-gray18
-grey18
-gray19
-grey19
-gray20
-grey20
-gray21
-grey21
-gray22
-grey22
-gray23
-grey23
-gray24
-grey24
-gray25
-grey25
-gray26
-grey26
-gray27
-grey27
-gray28
-grey28
-gray29
-grey29
-gray30
-grey30
-gray31
-grey31
-gray32
-grey32
-gray33
-grey33
-gray34
-grey34
-gray35
-grey35
-gray36
-grey36
-gray37
-grey37
-gray38
-grey38
-gray39
-grey39
-gray40
-grey40
-gray41
-grey41
-gray42
-grey42
-gray43
-grey43
-gray44
-grey44
-gray45
-grey45
-gray46
-grey46
-gray47
-grey47
-gray48
-grey48
-gray49
-grey49
-gray50
-grey50
-gray51
-grey51
-gray52
-grey52
-gray53
-grey53
-gray54
-grey54
-gray55
-grey55
-gray56
-grey56
-gray57
-grey57
-gray58
-grey58
-gray59
-grey59
-gray60
-grey60
-gray61
-grey61
-gray62
-grey62
-gray63
-grey63
-gray64
-grey64
-gray65
-grey65
-gray66
-grey66
-gray67
-grey67
-gray68
-grey68
-gray69
-grey69
-gray70
-grey70
-gray71
-grey71
-gray72
-grey72
-gray73
-grey73
-gray74
-grey74
-gray75
-grey75
-gray76
-grey76
-gray77
-grey77
-gray78
-grey78
-gray79
-grey79
-gray80
-grey80
-gray81
-grey81
-gray82
-grey82
-gray83
-grey83
-gray84
-grey84
-gray85
-grey85
-gray86
-grey86
-gray87
-grey87
-gray88
-grey88
-gray89
-grey89
-gray90
-grey90
-gray91
-grey91
-gray92
-grey92
-gray93
-grey93
-gray94
-grey94
-gray95
-grey95
-gray96
-grey96
-gray97
-grey97
-gray98
-grey98
-gray99
-grey99
-gray100
-grey100
-dark-grey
-darkgrey
-dark-gray
-darkgray
-dark-blue
-darkblue
-dark-cyan
-darkcyan
-dark-magenta
-darkmagenta
-dark-red
-darkred
-light-green
-lightgreen
-crimson
-indigo
-olive
-rebecca-purple
-rebeccapurple
-silver
-teal

.github/actions/spelling/dictionary/math.txt

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

.github/actions/spelling/excludes.txt

@@ -1,3 +1,4 @@
+(?:(?i)\.png$)
 (?:^|/)dirs$
 (?:^|/)go\.mod$
 (?:^|/)go\.sum$
@@ -35,7 +36,6 @@ SUMS$
 \.pbxproj$
 \.pdf$
 \.pem$
-(?:(?i)\.png$)
 \.psd$
 \.runsettings$
 \.sig$
@@ -54,14 +54,26 @@ SUMS$
 \.zip$
 ^consolegit2gitfilters\.json$
 ^dep/
-^oss/
+^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/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/types/ut_types/UtilsTests.cpp$
+^src/terminal/parser/ft_fuzzwrapper/run\.bat$
+^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$
 ^\.github/actions/spelling/
 ^\.gitignore$
-^doc/reference/master-sequence-list.csv$
 ^\XamlStyler.json$

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

@@ -1,4 +1,9 @@
 AAAa
+AAAAA
+AAAAAAAAAAAAA
+AAAAAABBBBBBCCC
+AAAAABBBBBBCCC
+abcd
 abcd
 abcde
 abcdef
@@ -6,12 +11,20 @@ ABCDEFG
 ABCDEFGH
 ABCDEFGHIJ
 abcdefghijk
+ABCDEFGHIJKLMNO
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
 abcdefghijklmnopqrstuvwxyz
+ABCG
 ABE
-BBGGRR
+abf
+BBBBB
+BBBBBBBB
 BBBBBBBBBBBBBBDDDD
+BBBBBCCC
+BBBBCCCCC
+BBGGRR
+CCE
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ
@@ -32,3 +45,4 @@ ZYXWVUT
 ZZBBZ
 ZZZBB
 ZZZBZ
+ZZZZZ

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

@@ -1,6 +1,7 @@
 http
-td
 www
+easyrgb
+php
 ecma
 rapidtables
 WCAG
@@ -10,9 +11,9 @@ robertelder
 kovidgoyal
 leonerd
 fixterms
-uk
 winui
 appshellintegration
+mdtauk
 cppreference
 gfycat
-what3words
+Guake

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

@@ -22,3 +22,6 @@ 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*

.github/actions/spelling/reject.txt

@@ -0,0 +1,22 @@
+^attache$
+^attacher$
+^attachers$
+^spae$
+^spaebook$
+^spaecraft$
+^spaed$
+^spaedom$
+^spaeing$
+^spaeings$
+^spae-man$
+^spaeman$
+^spaer$
+^Spaerobee$
+^spaes$
+^spaewife$
+^spaewoman$
+^spaework$
+^spaewright$
+^wether$
+^wethers$
+^wetherteg$

.github/workflows/spelling.yml

@@ -1,15 +0,0 @@
-name: Spell checking
-on:
-  pull_request_target:
-  push:
-
-jobs:
-  build:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.0.0
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.17-alpha

.github/workflows/spelling2.yml

@@ -0,0 +1,20 @@
+# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
+name: Spell checking
+on:
+  pull_request_target:
+  push:
+
+jobs:
+  spelling:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: "!contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@v0.0.19

build/rules/GenerateFeatureFlags.proj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- THIS PROJECT CANNOT BE LOADED INTO THE SOLUTION. -->
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Any CPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Fuzzing|Any CPU">
+      <Configuration>Fuzzing</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="AuditMode|Any CPU">
+      <Configuration>AuditMode</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Any CPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>d97c3c61-53cd-4e72-919b-9a0940e038f9</ProjectGuid>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntermediateOutputPath>$(SolutionDir)obj\$(Configuration)\GenerateFeatureFlags\</IntermediateOutputPath>
+    <OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Configuration)\</OpenConsoleCommonOutDir>
+
+    <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Preview'">Preview</_WTBrandingName>
+    <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Release'">Release</_WTBrandingName>
+    <_WTBrandingName Condition="'$(_WTBrandingName)'==''">Dev</_WTBrandingName>
+  </PropertyGroup>
+
+  <Target Name="_GenerateBranchAndBrandingCache">
+    <Exec Command="git.exe rev-parse --abbrev-ref HEAD"
+      CustomWarningRegularExpression="^fatal:.*"
+      ConsoleToMsBuild="true"
+      IgnoreExitCode="true">
+      <Output TaskParameter="ConsoleOutput" ItemName="_GitBranchLines" />
+    </Exec>
+
+    <ItemGroup>
+      <_BrandingLines Include="$(_WTBrandingName)" />
+    </ItemGroup>
+
+    <WriteLinesToFile File="$(IntermediateOutputPath)branch_branding_cache.txt"
+      Lines="@(_GitBranchLines);@(_BrandingLines)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)branch_branding_cache.txt" />
+      <_BranchBrandingCacheFiles Include="$(IntermediateOutputPath)branch_branding_cache.txt" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_RunFeatureFlagScript"
+    Inputs="@(FeatureFlagFile);@(_BranchBrandingCacheFiles)"
+    Outputs="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
+    DependsOnTargets="_GenerateBranchAndBrandingCache">
+    <MakeDir Directories="$(OpenConsoleCommonOutDir)\inc" />
+    <Exec
+      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&quot; -Path &quot;%(FeatureFlagFile.FullPath)&quot; -Branding $(_WTBrandingName)"
+      ConsoleToMsBuild="true"
+      StandardOutputImportance="low">
+      <Output TaskParameter="ConsoleOutput" ItemName="_FeatureFlagFileLines" />
+    </Exec>
+
+    <!--
+      We gather the feature flag output in MSBuild and emit the file so that we can take advantage of
+      WriteOnlyWhenDifferent. Doing this ensures that we don't rebuild the world when the branch changes
+      (if it results in a new TilFeatureStaging.h that would have had the same content/features as the previous one)
+    -->
+
+    <WriteLinesToFile File="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
+      Lines="@(_FeatureFlagFileLines)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="_RunFeatureFlagScript" />
+  <Target Name="Clean">
+    <Delete Files="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h" />
+  </Target>
+
+  <ItemGroup>
+    <FeatureFlagFile Include="$(SolutionDir)\src\features.xml" />
+  </ItemGroup>
+</Project>

consolegit2gitfilters.json

@@ -19,6 +19,7 @@
     "/.github/",
     "/samples/",
     "/res/terminal/",
+    "/res/fonts/",
     "/doc/specs/",
     "/doc/cascadia/",
     "/doc/user-docs/",

doc/cascadia/profiles.schema.json

@@ -541,12 +541,14 @@
             "action": { "type": "string", "pattern": "openSettings" },
             "target": {
               "type": "string",
-              "default": "settingsFile",
-              "description": "The settings file to open.",
+              "default": "settingsUI",
+              "description": "Opens Settings UI or settings file.",
               "enum": [
                 "settingsFile",
                 "defaultsFile",
-                "allFiles"
+                "allFiles",
+                "settingsUI"
+                
               ]
             }
           }
@@ -1347,6 +1349,11 @@
           "type": "boolean",
           "default": false
         },
+        "tabColor": {
+          "$ref": "#/definitions/Color",
+          "description": "Sets the color of the profile's tab. Using the tab color picker will override this color.",
+          "type": ["string", "null"]
+        },
         "tabTitle": {
           "description": "If set, will replace the name as the title to pass to the shell on startup. Some shells (like bash) may choose to ignore this initial value, while others (cmd, powershell) may use this value over the lifetime of the application.",
           "type": ["string", "null"]

doc/feature_flags.md

@@ -0,0 +1,65 @@
+# til::feature
+
+Feature flags are controlled by an XML document stored at `src/features.xml`.
+
+## Example Document
+
+```xml
+<?xml version="1.0"?>
+<featureStaging xmlns="http://microsoft.com/TilFeatureStaging-Schema.xsd">
+    <feature>
+        <!-- This will produce Feature_XYZ::IsEnabled() and TIL_FEATURE_XYZ_ENABLED (preprocessor) -->
+        <name>Feature_XYZ</name>
+
+        <description>Does a cool thing</description>
+
+        <!-- GitHub deliverable number; optional -->
+        <id>1234</id>
+
+        <!-- Whether the feature defaults to enabled or disabled -->
+        <stage>AlwaysEnabled|AlwaysDisabled</stage>
+
+        <!-- Branch wildcards where the feature should be *DISABLED* -->
+        <alwaysDisabledBranchTokens>
+            <branchToken>branch/with/wildcard/*</branchToken>
+            <!-- ... more branchTokens ... -->
+        </alwaysDisabledBranchTokens>
+
+        <!-- Just like alwaysDisabledBranchTokens, but for *ENABLING* the feature. -->
+        <alwaysEnabledBranchTokens>
+            <branchToken>...</branchToken>
+        </alwaysEnabledBranchTokens>
+
+        <!-- Brandings where the feature should be *DISABLED* -->
+        <alwaysDisabledBrandingTokens>
+            <!-- Valid brandings include Dev, Preview, Release, WindowsInbox -->
+            <brandingToken>Release</brandingToken>
+            <!-- ... more brandingTokens ... -->
+        </alwaysDisabledBrandingTokens>
+
+        <!-- Just like alwaysDisabledBrandingTokens, but for *ENABLING* the feature -->
+        <alwaysEnabledBrandingTokens>
+            <branchToken>...</branchToken>
+        </alwaysEnabledBrandingTokens>
+
+        <!-- Unequivocally disable this feature in Release -->
+        <alwaysDisabledReleaseTokens />
+    </feature>
+</featureStaging>
+```
+
+## Notes
+
+Features that are disabled for Release using `alwaysDisabledReleaseTokens` are
+*always* disabled in Release, even if they come from a branch that would have
+been enabled by the wildcard.
+
+### Precedence
+
+1. `alwaysDisabledReleaseTokens`
+2. Enabled branches
+3. Disabled branches
+   * The longest branch token that matches your branch will win.
+3. Enabled brandings
+4. Disabled brandings
+5. The feature's default state

res/README.md

@@ -6,16 +6,3 @@ The images in this directory do not fall under the same [license](https://raw.gi
 of the Windows Terminal code.
 
 Please consult the [license](./LICENSE) in this directory for terms applicable to the image assets in this directory.
-
-## Fonts
-
-The fonts in this directory do not fall under the same [license](https://raw.githubusercontent.com/microsoft/terminal/main/LICENSE) as the rest
-of the Windows Terminal code.
-
-Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadia-code/main/LICENSE) in the
-[microsoft/cascadia-code](https://github.com/microsoft/cascadia-code) repository for terms applicable to the fonts in this directory.
-
-### Fonts Included
-
-* Cascadia Code, Cascadia Mono (2102.25)
-   * from microsoft/cascadia-code@911dc421f333e3b72b97381d16fee5b71eb48f04

res/fonts/README.md

@@ -0,0 +1,12 @@
+# Windows Terminal and Console Assets (Fonts)
+
+The fonts in this directory do not fall under the same [license](https://raw.githubusercontent.com/microsoft/terminal/main/LICENSE) as the rest
+of the Windows Terminal code.
+
+Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadia-code/main/LICENSE) in the
+[microsoft/cascadia-code](https://github.com/microsoft/cascadia-code) repository for terms applicable to the fonts in this directory.
+
+### Fonts Included
+
+* Cascadia Code, Cascadia Mono (2106.17)
+   * from microsoft/cascadia-code@fb0bce69c1c12f6c298b8bc1c1d181868f5daa9a

src/ConsolePerf.wprp

@@ -43,6 +43,7 @@
         <EventProvider Id="EventProvider-Microsoft.Windows.Console.Server" Name="1A541C01-589A-496E-85A7-A9E02170166D"/>
         <EventProvider Id="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser" Name="c9ba2a84-d3ca-5e19-2bd6-776a0910cb9d"/>
         <EventProvider Id="EventProvider-Microsoft.Windows.Console.Render.VtEngine" Name="c9ba2a95-d3ca-5e19-2bd6-776a0910cb9d"/>
+        <EventProvider Id="EventProvider-Microsoft.Windows.Console.UIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
         <!-- Now define some profiles. We'll call them by ID when collecting. Also, the Base is where it is inheriting from and is a .wprpi file built... -->
         <!-- ... into WPR automatically. Go look in the WPR install directory or in the documentation to find it. -->
         <Profile Id="ConsolePerfProfile.Verbose.File" Base="GeneralProfile.Light.File" LoggingMode="File" Name="ConsolePerfProfile" DetailLevel="Verbose" Description="Console Performance default profile">
@@ -66,6 +67,7 @@
                         <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server"/>
                         <EventProviderId Value="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser"/>
                         <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Render.VtEngine"/>
+                        <EventProviderId Value="EventProvider-Microsoft.Windows.Console.UIA"/>
                     </EventProviders>
                 </EventCollectorId>
             </Collectors>

src/Terminal.wprp

@@ -11,6 +11,7 @@
     <EventProvider Id="EventProvider_TerminalApp" Name="24a1622f-7da7-5c77-3303-d850bd1ab2ed" />
     <EventProvider Id="EventProvider_TerminalWin32Host" Name="56c06166-2e2e-5f4d-7ff3-74f4b78c87d6" />
     <EventProvider Id="EventProvider_TerminalRemoting" Name="d6f04aad-629f-539a-77c1-73f5c3e4aa7b" />
+    <EventProvider Id="EventProvider_TerminalDirectX" Name="c93e739e-ae50-5a14-78e7-f171e947535d" />
     <Profile Id="Terminal.Verbose.File" Name="Terminal" Description="Terminal" LoggingMode="File" DetailLevel="Verbose">
       <Collectors>
         <EventCollectorId Value="EventCollector_Terminal">
@@ -21,6 +22,7 @@
             <EventProviderId Value="EventProvider_TerminalApp" />
             <EventProviderId Value="EventProvider_TerminalWin32Host" />
             <EventProviderId Value="EventProvider_TerminalRemoting" />
+            <EventProviderId Value="EventProvider_TerminalDirectX" />
           </EventProviders>
         </EventCollectorId>
       </Collectors>

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -54,7 +54,6 @@
             <uap:ShowOn Tile="square310x310Logo"/>
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:SplashScreen Image="Images\SplashScreen.png"/>
       </uap:VisualElements>
 
       <Extensions>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -55,7 +55,6 @@
             <uap:ShowOn Tile="square310x310Logo"/>
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:SplashScreen Image="Images\SplashScreen.png"/>
       </uap:VisualElements>
 
       <Extensions>
@@ -75,6 +74,7 @@
             Enabled="false"
             DisplayName="ms-resource:AppNamePre" />
         </uap5:Extension>
+        <!-- DISABLED FOR 1.8
         <uap3:Extension Category="windows.appExtension">
             <uap3:AppExtension Name="com.microsoft.windows.console.host"
                 Id="OpenConsole-Pre"
@@ -97,6 +97,7 @@
                 </uap3:Properties>
             </uap3:AppExtension>
         </uap3:Extension>
+        -->
         <com:Extension Category="windows.comInterface">
             <com:ComInterface>
                 <com:ProxyStub Id="1833E661-CC81-4DD0-87C6-C2F74BD39EFA" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
@@ -141,8 +142,10 @@
   <Extensions>
     <uap7:Extension Category="windows.sharedFonts">
       <uap7:SharedFonts>
-        <uap4:Font File="Cascadia.ttf" />
+        <uap4:Font File="CascadiaCode.ttf" />
+        <uap4:Font File="CascadiaCodeItalic.ttf" />
         <uap4:Font File="CascadiaMono.ttf" />
+        <uap4:Font File="CascadiaMonoItalic.ttf" />
       </uap7:SharedFonts>
     </uap7:Extension>
   </Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -55,7 +55,6 @@
             <uap:ShowOn Tile="square310x310Logo"/>
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:SplashScreen Image="Images\SplashScreen.png"/>
       </uap:VisualElements>
 
       <Extensions>
@@ -141,8 +140,10 @@
   <Extensions>
     <uap7:Extension Category="windows.sharedFonts">
       <uap7:SharedFonts>
-        <uap4:Font File="Cascadia.ttf" />
+        <uap4:Font File="CascadiaCode.ttf" />
+        <uap4:Font File="CascadiaCodeItalic.ttf" />
         <uap4:Font File="CascadiaMono.ttf" />
+        <uap4:Font File="CascadiaMonoItalic.ttf" />
       </uap7:SharedFonts>
     </uap7:Extension>
   </Extensions>

src/cascadia/CascadiaResources.build.items

@@ -12,13 +12,9 @@
       <Link>Images\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
     <!-- Fonts -->
-    <Content Include="$(OpenConsoleDir)res\Cascadia.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
+    <Content Include="$(OpenConsoleDir)res\fonts\*.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
       <DeploymentContent>true</DeploymentContent>
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Content>
-    <Content Include="$(OpenConsoleDir)res\CascadiaMono.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
-      <DeploymentContent>true</DeploymentContent>
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>%(FileName)%(Extension)</Link>
     </Content>
     <!-- Profile Icons -->
     <Content Include="$(OpenConsoleDir)src\cascadia\CascadiaPackage\ProfileIcons\**\*">

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -798,7 +798,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
         }
     }
 
-    publicTerminal->_terminal->SetCursorStyle(theme.CursorStyle);
+    publicTerminal->_terminal->SetCursorStyle(static_cast<DispatchTypes::CursorStyle>(theme.CursorStyle));
 
     publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, { 0, fontSize }, CP_UTF8 };
     publicTerminal->_UpdateFont(newDpi);

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -19,7 +19,7 @@ typedef struct _TerminalTheme
     COLORREF DefaultForeground;
     COLORREF DefaultSelectionBackground;
     float SelectionBackgroundAlpha;
-    DispatchTypes::CursorStyle CursorStyle;
+    uint32_t CursorStyle; // This will be converted to DispatchTypes::CursorStyle (size_t), but C# cannot marshal an enum type and have it fit in a size_t.
     COLORREF ColorTable[16];
 } TerminalTheme, *LPTerminalTheme;
 

src/cascadia/Remoting/WindowManager.cpp

@@ -40,7 +40,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                 // stay in this jail until we do.
                 TraceLoggingWrite(g_hRemotingProvider,
                                   "WindowManager_ExceptionInCtor",
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
     }
@@ -99,7 +100,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingUInt64(givenID.value(), "Id", "The ID we should assign our peasant"),
                                   TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
             else
             {
@@ -108,7 +110,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingPointer(nullptr, "Id", "No ID provided"),
                                   TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
         else
@@ -140,7 +143,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingUInt64(givenID.value(), "Id", "The ID we should assign our peasant"),
                                   TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
             else if (responseId == WindowingBehaviorUseName)
             {
@@ -151,7 +155,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingUInt64(0, "Id", "The ID we should assign our peasant"),
                                   TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
             else
             {
@@ -160,7 +165,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingUInt64(0, "Id", "The ID we should assign our peasant"),
                                   TraceLoggingWideString(L"", "Name", "The name we should assign this window"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
 
@@ -228,7 +234,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           "WindowManager_ConnectedToMonarch",
                           TraceLoggingUInt64(_monarch.GetPID(), "monarchPID", "The PID of the new Monarch"),
                           TraceLoggingBoolean(_isKing, "isKing", "true if we are the new monarch"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         if (_peasant)
         {
@@ -294,7 +301,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         TraceLoggingWrite(g_hRemotingProvider,
                           "WindowManager_CreateOurPeasant",
                           TraceLoggingUInt64(_peasant.GetID(), "peasantID", "The ID of our new peasant"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         return _peasant;
     }
@@ -369,7 +377,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                       "WindowManager_FailedToOpenMonarch",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
                                       TraceLoggingUInt64(gle, "lastError", "The result of GetLastError"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
                     exitThreadRequested = _performElection();
                     continue;
@@ -385,7 +394,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchDied",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     // Connect to the new monarch, which might be us!
                     // If we become the monarch, then we'll return true and exit this thread.
                     exitThreadRequested = _performElection();
@@ -396,7 +406,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchWaitInterrupted",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     exitThreadRequested = true;
                     break;
 
@@ -405,7 +416,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchWaitTimeout",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     exitThreadRequested = true;
                     break;
 
@@ -417,7 +429,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                       "WindowManager_WaitFailed",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
                                       TraceLoggingUInt64(gle, "lastError", "The result of GetLastError"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     ExitProcess(0);
                 }
                 }
@@ -441,7 +454,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                 TraceLoggingWrite(g_hRemotingProvider,
                                   "WindowManager_ExceptionInWaitThread",
                                   TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                 bool foundNewMonarch = false;
                 while (!foundNewMonarch)
                 {
@@ -461,7 +475,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                         TraceLoggingWrite(g_hRemotingProvider,
                                           "WindowManager_ExceptionInNestedWaitThread",
                                           TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     }
                 }
             }

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -4,11 +4,11 @@
 #include "pch.h"
 #include "OpenTerminalHere.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
+#include "../WinRTUtils/inc/LibraryResources.h"
+
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <ShlObj.h>
 
-// TODO GH#6112: Localize these strings
-static constexpr std::wstring_view VerbDisplayName{ L"Open in Windows Terminal" };
-static constexpr std::wstring_view VerbDevBuildDisplayName{ L"Open in Windows Terminal (Dev Build)" };
 static constexpr std::wstring_view VerbName{ L"WindowsTerminalOpenHere" };
 
 // This code is aggressively copied from
@@ -87,8 +87,15 @@ HRESULT OpenTerminalHere::GetTitle(IShellItemArray* /*psiItemArray*/,
 {
     // Change the string we return depending on if we're running from the dev
     // build package or not.
-    const bool isDevBuild = IsDevBuild();
-    return SHStrDup(isDevBuild ? VerbDevBuildDisplayName.data() : VerbDisplayName.data(), ppszName);
+    const auto resource =
+#if defined(WT_BRANDING_RELEASE)
+        RS_(L"ShellExtension_OpenInTerminalMenuItem");
+#elif defined(WT_BRANDING_PREVIEW)
+        RS_(L"ShellExtension_OpenInTerminalMenuItem_Preview");
+#else
+        RS_(L"ShellExtension_OpenInTerminalMenuItem_Dev");
+#endif
+    return SHStrDup(resource.data(), ppszName);
 }
 
 HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,

src/cascadia/ShellExtension/dllmain.cpp

@@ -4,6 +4,8 @@
 #include "pch.h"
 #include "OpenTerminalHere.h"
 
+#include "../WinRTUtils/inc/LibraryResources.h"
+
 using namespace Microsoft::WRL;
 
 STDAPI DllCanUnloadNow()
@@ -30,3 +32,6 @@ DllMain(_In_opt_ HINSTANCE hinst, DWORD reason, _In_opt_ void*)
     }
     return TRUE;
 }
+
+// Usurp the TerminalApp's resource group.
+UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"TerminalApp/Resources")

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -117,9 +117,11 @@ namespace winrt::TerminalApp::implementation
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<SendInputArgs>())
         {
-            const auto termControl = _GetActiveControl();
-            termControl.SendInput(realArgs.Input());
-            args.Handled(true);
+            if (const auto termControl{ _GetActiveControl() })
+            {
+                termControl.SendInput(realArgs.Input());
+                args.Handled(true);
+            }
         }
     }
 
@@ -308,9 +310,11 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = args.ActionArgs().try_as<AdjustFontSizeArgs>())
         {
-            const auto termControl = _GetActiveControl();
-            termControl.AdjustFontSize(realArgs.Delta());
-            args.Handled(true);
+            if (const auto& termControl{ _GetActiveControl() })
+            {
+                termControl.AdjustFontSize(realArgs.Delta());
+                args.Handled(true);
+            }
         }
     }
 
@@ -324,17 +328,21 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleResetFontSize(const IInspectable& /*sender*/,
                                             const ActionEventArgs& args)
     {
-        const auto termControl = _GetActiveControl();
-        termControl.ResetFontSize();
-        args.Handled(true);
+        if (const auto& termControl{ _GetActiveControl() })
+        {
+            termControl.ResetFontSize();
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandleToggleShaderEffects(const IInspectable& /*sender*/,
                                                   const ActionEventArgs& args)
     {
-        const auto termControl = _GetActiveControl();
-        termControl.ToggleShaderEffects();
-        args.Handled(true);
+        if (const auto& termControl{ _GetActiveControl() })
+        {
+            termControl.ToggleShaderEffects();
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandleToggleFocusMode(const IInspectable& /*sender*/,
@@ -719,9 +727,9 @@ namespace winrt::TerminalApp::implementation
                 const auto newName = realArgs.Name();
                 const auto request = winrt::make_self<implementation::RenameWindowRequestedArgs>(newName);
                 _RenameWindowRequestedHandlers(*this, *request);
+                args.Handled(true);
             }
         }
-        args.Handled(false);
     }
 
     void TerminalPage::_HandleOpenWindowRenamer(const IInspectable& /*sender*/,

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -493,8 +493,18 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
 
     if (*subcommand.tabColorOption)
     {
-        const auto tabColor = Microsoft::Console::Utils::ColorFromHexString(_startingTabColor);
-        args.TabColor(static_cast<winrt::Windows::UI::Color>(tabColor));
+        try
+        {
+            // This is gonna throw whenever the string that's currently being parsed
+            // isn't a valid hex string. Let's just eat anything this throws because
+            // we should only lock in the TabColor arg when the user gives a valid hex
+            // str, and we shouldn't crash when the user gives us anything else.
+            const auto tabColor = Microsoft::Console::Utils::ColorFromHexString(_startingTabColor);
+            args.TabColor(static_cast<winrt::Windows::UI::Color>(tabColor));
+        }
+        catch (...)
+        {
+        }
     }
 
     if (*subcommand.suppressApplicationTitleOption)

src/cascadia/TerminalApp/AppLogic.cpp

@@ -919,12 +919,32 @@ namespace winrt::TerminalApp::implementation
         _ApplyTheme(_settings.GlobalSettings().Theme());
     }
 
+    // Function Description:
+    // Returns the current app package or nullptr.
+    // TRANSITIONAL
+    // Exists to work around a compiler bug. This function encapsulates the
+    // exception handling that we used to keep around calls to Package::Current,
+    // so that when it's called inside a coroutine and fails it doesn't explode
+    // terribly.
+    static winrt::Windows::ApplicationModel::Package GetCurrentPackageNoThrow() noexcept
+    {
+        try
+        {
+            return winrt::Windows::ApplicationModel::Package::Current();
+        }
+        catch (...)
+        {
+            // discard any exception -- literally pretend we're not in a package
+        }
+        return nullptr;
+    }
+
     fire_and_forget AppLogic::_ApplyStartupTaskStateChange()
     try
     {
         // First, make sure we're running in a packaged context. This method
         // won't work, and will crash mysteriously if we're running unpackaged.
-        const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
+        const auto package{ GetCurrentPackageNoThrow() };
         if (package == nullptr)
         {
             return;

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -14,6 +14,7 @@ using namespace winrt;
 using namespace winrt::TerminalApp;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Foundation::Collections;
@@ -311,6 +312,13 @@ namespace winrt::TerminalApp::implementation
         }
         else if (key == VirtualKey::Enter)
         {
+            if (const auto& button = e.OriginalSource().try_as<Button>())
+            {
+                // Let the button handle the Enter key so an eventually attached click handler will be called
+                e.Handled(false);
+                return;
+            }
+
             const auto selectedCommand = _filteredActionsView().SelectedItem();
             const auto filteredCommand = selectedCommand.try_as<winrt::TerminalApp::FilteredCommand>();
             _dispatchCommand(filteredCommand);
@@ -503,6 +511,7 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_moveBackButtonClicked(Windows::Foundation::IInspectable const& /*sender*/,
                                                 Windows::UI::Xaml::RoutedEventArgs const&)
     {
+        _PreviewActionHandlers(*this, nullptr);
         _nestedActionStack.Clear();
         ParentCommandName(L"");
         _currentNestedCommands.Clear();
@@ -629,7 +638,13 @@ namespace winrt::TerminalApp::implementation
                     // palette like the Tab Switcher will be able to have the last laugh.
                     _close();
 
-                    _DispatchCommandRequestedHandlers(*this, actionPaletteItem.Command());
+                    // But make an exception for the Toggle Command Palette action: we don't want the dispatch
+                    // make the command palette - that was just closed - visible again.
+                    // All other actions can just be dispatched.
+                    if (actionPaletteItem.Command().ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
+                    {
+                        _DispatchCommandRequestedHandlers(*this, actionPaletteItem.Command());
+                    }
 
                     TraceLoggingWrite(
                         g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
@@ -927,6 +942,10 @@ namespace winrt::TerminalApp::implementation
         ParsedCommandLineText(L"");
         _searchBox().Text(L"");
         _searchBox().Select(_searchBox().Text().size(), 0);
+
+        _nestedActionStack.Clear();
+        ParentCommandName(L"");
+        _currentNestedCommands.Clear();
         // Leaving this block of code outside the above if-statement
         // guarantees that the correct text is shown for the mode
         // whenever _switchToMode is called.

src/cascadia/TerminalApp/FilteredCommand.cpp

@@ -80,7 +80,7 @@ namespace winrt::TerminalApp::implementation
 
         for (const auto searchChar : _Filter)
         {
-            const auto lowerCaseSearchChar = std::towlower(searchChar);
+            const WCHAR searchCharAsString[] = { searchChar, L'\0' };
             while (true)
             {
                 if (currentOffset == commandName.size())
@@ -93,7 +93,10 @@ namespace winrt::TerminalApp::implementation
                     return winrt::make<HighlightedText>(segments);
                 }
 
-                auto isCurrentCharMatched = std::towlower(commandName[currentOffset]) == lowerCaseSearchChar;
+                // GH#9941: search should be locale-aware as well
+                // We use the same comparison method as upon sorting to guarantee consistent behavior
+                const WCHAR currentCharAsString[] = { commandName[currentOffset], L'\0' };
+                auto isCurrentCharMatched = lstrcmpi(searchCharAsString, currentCharAsString) == 0;
                 if (isProcessingMatchedSegment != isCurrentCharMatched)
                 {
                     // We reached the end of the region (matched character came after a series of unmatched or vice versa).

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

@@ -624,4 +624,16 @@
   <data name="WindowRestoreDownButtonToolTip" xml:space="preserve">
     <value>Restore Down</value>
   </data>
-</root>
+  <data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
+    <value>Open in Windows Terminal (Dev)</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
+  <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
+    <value>Open in Windows Terminal Preview</value>
+    <comment>{Locked="Windows"} This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal</comment>
+  </data>
+  <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
+    <value>Open in Windows Terminal</value>
+    <comment>{Locked="Windows"} This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal</comment>
+  </data>
+</root>

src/cascadia/TerminalApp/SettingsTab.cpp

@@ -62,7 +62,8 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void SettingsTab::_MakeTabViewItem()
     {
-        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
+        TabBase::_MakeTabViewItem();
+
         Title(RS_(L"SettingsTab"));
         TabViewItem().Header(winrt::box_value(Title()));
     }

src/cascadia/TerminalApp/SettingsTab.h

@@ -33,7 +33,7 @@ namespace winrt::TerminalApp::implementation
         void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override;
 
     private:
-        void _MakeTabViewItem();
+        void _MakeTabViewItem() override;
         winrt::fire_and_forget _CreateIcon();
     };
 }

src/cascadia/TerminalApp/TabBase.cpp

@@ -45,35 +45,27 @@ namespace winrt::TerminalApp::implementation
     {
         auto weakThis{ get_weak() };
 
-        // Close
-        Controls::MenuFlyoutItem closeTabMenuItem;
-        Controls::FontIcon closeSymbol;
-        closeSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
-        closeSymbol.Glyph(L"\xE711");
-
-        closeTabMenuItem.Click([weakThis](auto&&, auto&&) {
+        // Build the menu
+        Controls::MenuFlyout contextMenuFlyout;
+        // GH#5750 - When the context menu is dismissed with ESC, toss the focus
+        // back to our control.
+        contextMenuFlyout.Closed([weakThis](auto&&, auto&&) {
             if (auto tab{ weakThis.get() })
             {
-                tab->_CloseRequestedHandlers(nullptr, nullptr);
+                tab->_RequestFocusActiveControlHandlers();
             }
         });
-        closeTabMenuItem.Text(RS_(L"TabClose"));
-        closeTabMenuItem.Icon(closeSymbol);
-
-        // Build the menu
-        Controls::MenuFlyout newTabFlyout;
-        newTabFlyout.Items().Append(_CreateCloseSubMenu());
-        newTabFlyout.Items().Append(closeTabMenuItem);
-        TabViewItem().ContextFlyout(newTabFlyout);
+        _AppendCloseMenuItems(contextMenuFlyout);
+        TabViewItem().ContextFlyout(contextMenuFlyout);
     }
 
     // Method Description:
-    // - Creates a sub-menu containing menu items to close multiple tabs
+    // - Append the close menu items to the context menu flyout
     // Arguments:
-    // - <none>
+    // - flyout - the menu flyout to which the close items must be appended
     // Return Value:
-    // - the created MenuFlyoutSubItem
-    Controls::MenuFlyoutSubItem TabBase::_CreateCloseSubMenu()
+    // - <none>
+    void TabBase::_AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout)
     {
         auto weakThis{ get_weak() };
 
@@ -95,12 +87,30 @@ namespace winrt::TerminalApp::implementation
         });
         _closeOtherTabsMenuItem.Text(RS_(L"TabCloseOther"));
 
-        Controls::MenuFlyoutSubItem closeSubMenu;
-        closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
-        closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
-        closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
+        // Close
+        Controls::MenuFlyoutItem closeTabMenuItem;
+        Controls::FontIcon closeSymbol;
+        closeSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
+        closeSymbol.Glyph(L"\xE711");
 
-        return closeSubMenu;
+        closeTabMenuItem.Click([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_CloseRequestedHandlers(nullptr, nullptr);
+            }
+        });
+        closeTabMenuItem.Text(RS_(L"TabClose"));
+        closeTabMenuItem.Icon(closeSymbol);
+
+        // GH#8238 append the close menu items to the flyout itself until crash in XAML is fixed
+        //Controls::MenuFlyoutSubItem closeSubMenu;
+        //closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
+        //closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
+        //closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
+        //flyout.Items().Append(closeSubMenu);
+        flyout.Items().Append(_closeTabsAfterMenuItem);
+        flyout.Items().Append(_closeOtherTabsMenuItem);
+        flyout.Items().Append(closeTabMenuItem);
     }
 
     // Method Description:
@@ -206,6 +216,7 @@ namespace winrt::TerminalApp::implementation
         titleRun.Text(_CreateToolTipTitle());
 
         auto textBlock = WUX::Controls::TextBlock{};
+        textBlock.TextWrapping(WUX::TextWrapping::Wrap);
         textBlock.TextAlignment(WUX::TextAlignment::Center);
         textBlock.Inlines().Append(titleRun);
 
@@ -222,4 +233,24 @@ namespace winrt::TerminalApp::implementation
         toolTip.Content(textBlock);
         WUX::Controls::ToolTipService::SetToolTip(TabViewItem(), toolTip);
     }
+
+    // Method Description:
+    // - Initializes a TabViewItem for this Tab instance.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void TabBase::_MakeTabViewItem()
+    {
+        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
+
+        // GH#3609 If the tab was tapped, and no one else was around to handle
+        // it, then ask our parent to toss focus into the active control.
+        TabViewItem().Tapped([weakThis{ get_weak() }](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_RequestFocusActiveControlHandlers();
+            }
+        });
+    }
 }

src/cascadia/TerminalApp/TabBase.h

@@ -25,6 +25,8 @@ namespace winrt::TerminalApp::implementation
         void UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs);
         void SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);
 
+        WINRT_CALLBACK(RequestFocusActiveControl, winrt::delegate<void()>);
+
         WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
         WINRT_CALLBACK(CloseRequested, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
@@ -52,7 +54,9 @@ namespace winrt::TerminalApp::implementation
         virtual void _CreateContextMenu();
         virtual winrt::hstring _CreateToolTipTitle();
 
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _CreateCloseSubMenu();
+        virtual void _MakeTabViewItem();
+
+        void _AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
         void _EnableCloseMenuItems();
         void _CloseTabsAfter();
         void _CloseOtherTabs();