Skip to content

Commit

Permalink
Merge branch 'dev/migrie/f/sui-panes' into dev/migrie/fhl/md-pane
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/cascadia/TerminalApp/TerminalAppLib.vcxproj
#	src/cascadia/TerminalApp/TerminalPaneContent.idl
#	src/cascadia/TerminalApp/TerminalTab.cpp
  • Loading branch information
zadjii-msft committed Mar 20, 2024
2 parents 3182560 + c8d0c0a commit e199fbe
Show file tree
Hide file tree
Showing 603 changed files with 96,735 additions and 11,900 deletions.
4 changes: 4 additions & 0 deletions .github/actions/spelling/allow/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ changelog
clickable
clig
CMMI
consvc
copyable
Counterintuitively
CtrlDToClose
CVS
CUI
cybersecurity
dalet
Expand Down Expand Up @@ -90,6 +92,8 @@ ptys
pwshw
qof
qps
Remappings
Retargets
rclt
reimplementation
reserialization
Expand Down
14 changes: 14 additions & 0 deletions .github/actions/spelling/allow/apis.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
aalt
abvm
ACCEPTFILES
ACCESSDENIED
acl
Expand All @@ -22,7 +24,9 @@ COLORPROPERTY
colspan
COMDLG
commandlinetoargv
commoncontrols
comparand
COPYFROMRESOURCE
cstdint
CXICON
CYICON
Expand All @@ -34,6 +38,7 @@ delayimp
DERR
dlldata
DNE
dnom
DONTADDTORECENT
DWMSBT
DWMWA
Expand All @@ -42,10 +47,12 @@ endfor
ENDSESSION
enumset
environstrings
EXACTSIZEONLY
EXPCMDFLAGS
EXPCMDSTATE
filetime
FILTERSPEC
fina
FORCEFILESYSTEM
FORCEMINIMIZE
frac
Expand All @@ -59,6 +66,7 @@ Hashtable
HIGHCONTRASTON
HIGHCONTRASTW
hinternet
HIGHQUALITYSCALE
HINTERNET
hotkeys
href
Expand All @@ -75,6 +83,7 @@ IBox
IClass
IComparable
IComparer
ICONINFO
IConnection
ICustom
IDialog
Expand All @@ -84,6 +93,7 @@ IExplorer
IFACEMETHOD
IFile
IGraphics
IImage
IInheritable
IMap
IMonarch
Expand Down Expand Up @@ -114,6 +124,7 @@ LSHIFT
LTGRAY
MAINWINDOW
MAXIMIZEBOX
medi
memchr
memicmp
MENUCOMMAND
Expand Down Expand Up @@ -144,6 +155,7 @@ NOTIFYBYPOS
NOTIFYICON
NOTIFYICONDATA
ntprivapi
numr
oaidl
ocidl
ODR
Expand All @@ -169,9 +181,11 @@ REGCLS
RETURNCMD
rfind
RLO
rnrn
ROOTOWNER
roundf
RSHIFT
rvrn
SACL
schandle
SEH
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/allow/microsoft.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ MSAA
msixbundle
MSVC
MSVCP
mtu
muxc
netcore
Onefuzz
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
^src/terminal/parser/ut_parser/Base64Test.cpp$
^src/terminal/parser/ut_parser/run\.bat$
^src/tools/benchcat
^src/tools/ConsoleBench
^src/tools/integrity/dirs$
^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
^src/tools/RenderingTests/main\.cpp$
Expand All @@ -125,3 +126,4 @@
^tools/ReleaseEngineering/ServicingPipeline\.ps1$
^XamlStyler\.json$
ignore$
Resources/(?!en)
13 changes: 13 additions & 0 deletions .github/actions/spelling/expect/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ AFew
AFill
AFX
AHelper
ahicon
ahz
AImpl
AInplace
Expand Down Expand Up @@ -73,6 +74,7 @@ aumid
Authenticode
AUTOBUDDY
AUTOCHECKBOX
autocrlf
autohide
AUTOHSCROLL
automagically
Expand Down Expand Up @@ -429,6 +431,7 @@ DECRQM
DECRQPSR
DECRQSS
DECRQTSR
DECRQUPSS
DECRSPS
decrst
DECSACE
Expand All @@ -451,6 +454,7 @@ DECSTBM
DECSTGLT
DECSTR
DECSWL
DECSWT
DECTABSR
DECTCEM
DECXCPR
Expand Down Expand Up @@ -843,6 +847,9 @@ IGNORELANGUAGE
IHosted
iid
IIo
ILC
ILCo
ILD
ime
IMPEXP
inbox
Expand Down Expand Up @@ -1340,11 +1347,14 @@ pgomgr
PGONu
pguid
phhook
phico
phicon
phwnd
pidl
PIDLIST
pids
pii
piml
pinvoke
pipename
pipestr
Expand Down Expand Up @@ -1676,6 +1686,8 @@ slpit
SManifest
SMARTQUOTE
SMTO
snapcx
snapcy
SOLIDBOX
Solutiondir
somefile
Expand Down Expand Up @@ -1901,6 +1913,7 @@ UPDATEDISPLAY
UPDOWN
UPKEY
UPSS
upss
uregex
URegular
usebackq
Expand Down
Loading

0 comments on commit e199fbe

Please sign in to comment.