Skip to content

Commit

Permalink
Merge branch 'main' into dev/migrie/preview-setcolorscheme
Browse files Browse the repository at this point in the history
  • Loading branch information
zadjii-msft committed Apr 13, 2021
2 parents a038cff + b8e36ba commit 544b2fd
Show file tree
Hide file tree
Showing 230 changed files with 9,213 additions and 4,699 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"XamlStyler.Console": {
"version": "3.2008.4",
"commands": [
"xstyler"
]
}
}
}
17 changes: 15 additions & 2 deletions .github/actions/spelling/dictionary/apis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,19 @@ bitfields
CLASSNOTAVAILABLE
cmdletbinding
COLORPROPERTY
COMDLG
CXICON
CYICON
D2DERR_SHADER_COMPILE_FAILED
dataobject
DERR
dlldata
DONTADDTORECENT
environstrings
EXPCMDFLAGS
EXPCMDSTATE
FILTERSPEC
FORCEFILESYSTEM
FORCEMINIMIZE
frac
fullkbd
Expand All @@ -31,12 +36,13 @@ IAsync
IBind
IBox
IClass
IConnection
IComparable
IConnection
ICustom
IDialog
IDirect
IExplorer
IFile
IInheritable
IMap
IObject
Expand All @@ -62,6 +68,7 @@ NCLBUTTONDBLCLK
NCRBUTTONDBLCLK
NOAGGREGATION
NOASYNC
NOCHANGEDIR
NOPROGRESS
NOREDIRECTIONBITMAP
ntprivapi
Expand All @@ -71,10 +78,11 @@ otms
OUTLINETEXTMETRICW
overridable
PAGESCROLL
PICKFOLDERS
pmr
REGCLS
RETURNCMD
REGCLS
RETURNCMD
rfind
roundf
RSHIFT
Expand All @@ -83,6 +91,7 @@ schandle
semver
serializer
shobjidl
SINGLEUSE
SHOWMINIMIZED
SIZENS
smoothstep
Expand All @@ -93,6 +102,8 @@ spsc
sregex
STDCPP
strchr
STDMETHOD
Stubless
Subheader
Subpage
UPDATEINIFILE
Expand All @@ -108,8 +119,10 @@ UPDATEINIFILE
userenv
wcsstr
wcstoui
winmain
wpc
wsregex
wwinmain
XDocument
XElement
xlocmes
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ SUMS$
^\.github/actions/spelling/
^\.gitignore$
^doc/reference/master-sequence-list.csv$
^\XamlStyler.json$
1 change: 1 addition & 0 deletions .github/actions/spelling/expect/alphabet.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
AAAa
abcd
abcde
abcdef
Expand Down
10 changes: 10 additions & 0 deletions .github/actions/spelling/expect/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ args
argv
ARRAYSIZE
ARROWKEYS
asan
ASBRST
ASBSET
ASDF
Expand Down Expand Up @@ -433,6 +434,7 @@ cstring
cstyle
csv
CSwitch
CTerminal
CText
ctime
ctl
Expand Down Expand Up @@ -571,6 +573,7 @@ defaultsettings
DEFAULTTONEAREST
DEFAULTTONULL
DEFAULTTOPRIMARY
DEFCON
defectdefs
DEFERERASE
deff
Expand Down Expand Up @@ -830,6 +833,7 @@ FRAMECHANGED
fre
freopen
frontend
fsanitize
Fscreen
FSCTL
FSINFOCLASS
Expand All @@ -842,6 +846,7 @@ fullwidth
func
FUNCTIONCALL
fuzzer
fuzzmain
fuzzmap
fuzzwrapper
fwdecl
Expand Down Expand Up @@ -1254,6 +1259,7 @@ LEFTSHIFT
len
lhs
libpopcnt
libsancov
libtickit
LIMITTEXT
LINEDOWN
Expand Down Expand Up @@ -1464,6 +1470,7 @@ MSIL
msix
msrc
msvcrt
msvcrtd
MSVS
msys
msysgit
Expand Down Expand Up @@ -2055,6 +2062,7 @@ runtests
runtimeclass
runuia
runut
runxamlformat
rvalue
RVERTICAL
rxvt
Expand Down Expand Up @@ -2389,6 +2397,7 @@ titlebar
TITLEISLINKNAME
TJson
tl
TLambda
TLEN
Tlg
Tlgdata
Expand Down Expand Up @@ -2846,6 +2855,7 @@ XResource
xsd
xsi
xsize
xstyler
XSubstantial
xtended
xterm
Expand Down
2 changes: 1 addition & 1 deletion .nuget/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="vswhere" version="2.6.7" />
</packages>
</packages>
17 changes: 15 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"${workspaceFolder}\\OpenConsole.sln",
"/p:Configuration=${input:configChoice}",
"/p:Platform=${input:platformChoice}",
"/p:AppxSymbolPackageEnabled=false", // This takes a long time, so false if we don't really need it.
"/t:$target",
"/m", // Parallel builds
"/verbosity:minimal"
],
"problemMatcher": ["$msCompile"],
Expand Down Expand Up @@ -46,8 +48,7 @@
],
"problemMatcher": ["$msCompile"],
"group": {
"kind": "build",
"isDefault": true
"kind": "build"
}
},
{
Expand All @@ -57,6 +58,18 @@
"args": [
],
"problemMatcher": ["$msCompile"],
},
{
"type": "process",
"label": "Run Code Format",
"command": "powershell.exe",
"args": [
"-Command",
"Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
"Set-MsBuildDevEnvironment;",
"Invoke-CodeFormat",
],
"problemMatcher": ["$msCompile"],
}
],
"inputs":[
Expand Down
Loading

1 comment on commit 544b2fd

@github-actions

This comment was marked as resolved.

Please sign in to comment.