Migrate spelling-0.0.21 changes from main

Just read the code, it's immediately obvious what I messed up

Closes #11645

@DHowett turns out I was wrong, I could get this one done before 5 😜

(cherry picked from commit 3667678df1)

.clang-format

@@ -1,25 +1,57 @@
----
-Language: Cpp
-BasedOnStyle: Microsoft
+
 AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AllowAllArgumentsOnNextLine: true
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AllowAllConstructorInitializersOnNextLine: true
 AlignEscapedNewlines: Left
+AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: All
+AllowShortBlocksOnASingleLine: Never
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+#AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
   AfterUnion: true
   AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 ColumnLimit: 0
 CommentPragmas: "suppress"
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
+DeriveLineEnding: true
+DerivePointerAlignment: false
 FixNamespaceComments: false
 IncludeBlocks: Regroup
 IncludeCategories:
@@ -31,13 +63,35 @@ IncludeCategories:
       Priority: 2
     - Regex: '.*'
       Priority: 3
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: "BEGIN_TEST_METHOD_PROPERTIES|BEGIN_MODULE|BEGIN_TEST_CLASS|BEGIN_TEST_METHOD"
 MacroBlockEnd: "END_TEST_METHOD_PROPERTIES|END_MODULE|END_TEST_CLASS|END_TEST_METHOD"
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
 PointerAlignment: Left
 ReflowComments: false
 SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Latest
+TabWidth: 4
+UseTab: Never

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "XamlStyler.Console": {
-      "version": "3.2206.4",
+      "version": "3.2008.4",
       "commands": [
         "xstyler"
       ]

.editorconfig

@@ -1,7 +1,6 @@
 root = true
 
 [*]
-charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 

.git-blame-ignore-revs

@@ -1,15 +0,0 @@
-# Commits mentioned in this file will automatically
-# be skipped by GitHub's blame view.
-# To use it with "git", run
-# > git blame --ignore-revs-file ./.git-blame-ignore-revs
-
-# Reformatted the entire codebase
-9b92986b49bed8cc41fde4d6ef080921c41e6d9e
-
-# Line Endings changes
-cb7a76d96c92aa9fc7b03f69148fb0c75dff191d
-5bbf61af8c8f12e6c05d07a696bf7d411b330a67
-d07546a6fef73fa4e1fb1c2f01535843d1fcc212
-
-# UTF-8 BOM changes
-ddae2a1d49d604487d3c963e5eacbeb73861d986

.gitattributes

@@ -3,8 +3,6 @@
 ###############################################################################
 * -text
 
-*.inc linguist-language=cpp
-
 ###############################################################################
 # Set default behavior for command prompt diff.
 #

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -1,6 +1,5 @@
 name: "Bug report 🐛"
 description: Report errors or unexpected behavior
-labels: [Issue-Bug, Needs-Triage]
 body:
 - type: markdown
   attributes:
@@ -11,21 +10,14 @@ body:
 
 - type: input
   attributes:
-    label: Windows Terminal version
-    placeholder: "1.7.3651.0"
+    label: Windows Terminal version (or Windows build number)
+    placeholder: "10.0.19042.0, 1.7.3651.0"
     description: |
-      You can copy the version number from the About dialog. Open the About dialog by opening the menu with the "V" button (to the right of the "+" button that opens a new tab) and choosing About from the end of the list.
+      If you are reporting an issue in Windows Terminal, you can find the version in the about dialog.
+
+      If you are reporting an issue with the Windows Console, please run `ver` or `[Environment]::OSVersion`.
   validations:
-    required: false
-    
-- type: input
-  attributes:
-    label: Windows build number
-    placeholder: "10.0.19042.0"
-    description: |
-      Please run `ver` or `[Environment]::OSVersion`.
-  validations:
-    required: false
+    required: true
 
 - type: textarea
   attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,20 @@
+<!-- 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
 
-## References and Relevant Issues
+<!-- 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
+* [ ] Closes #xxx
+* [ ] 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
 
+<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
 ## Validation Steps Performed
-
-## PR Checklist
-- [ ] Closes #xxx
-- [ ] 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 (if necessary)

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

@@ -2,7 +2,6 @@ admins
 allcolors
 Apc
 apc
-backpressure
 breadcrumb
 breadcrumbs
 bsd
@@ -13,23 +12,18 @@ clickable
 clig
 CMMI
 copyable
-CtrlDToClose
 cybersecurity
 dalet
 Dcs
 dcs
-deselection
 dialytika
-diffing
 dje
 downside
 downsides
 dze
 dzhe
-DTo
 EDDB
 EDDC
-Emacspeak
 Enum'd
 Fitt
 formattings
@@ -66,7 +60,6 @@ lol
 lorem
 Lorigin
 maxed
-megathread
 minimalistic
 mkmk
 mnt
@@ -92,7 +85,6 @@ shcha
 slnt
 Sos
 ssh
-stakeholders
 timeline
 timelines
 timestamped
@@ -100,7 +92,6 @@ TLDR
 tokenizes
 tonos
 toolset
-truthiness
 tshe
 ubuntu
 uiatextrange

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

@@ -34,6 +34,7 @@ DNE
 DONTADDTORECENT
 DWMSBT
 DWMWA
+DWMWA
 DWORDLONG
 endfor
 ENDSESSION
@@ -54,8 +55,6 @@ GETMOUSEHOVERTIME
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
-hinternet
-HINTERNET
 hotkeys
 href
 hrgn
@@ -159,7 +158,6 @@ rcx
 REGCLS
 RETURNCMD
 rfind
-RLO
 ROOTOWNER
 roundf
 RSHIFT
@@ -214,11 +212,8 @@ userenv
 USEROBJECTFLAGS
 Viewbox
 virtualalloc
-vsnwprintf
 wcsstr
 wcstoui
-WDJ
-winhttp
 winmain
 winsta
 winstamin
@@ -226,7 +221,6 @@ wmemcmp
 wpc
 WSF
 wsregex
-WWH
 wwinmain
 xchg
 XDocument
@@ -252,4 +246,3 @@ xtree
 xutility
 YIcon
 YMax
-zwstring

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

@@ -9,11 +9,9 @@ appxbundle
 appxerror
 appxmanifest
 ATL
-autoexec
 backplating
 bitmaps
 BOMs
-COMPUTERNAME
 CPLs
 cpptools
 cppvsdbg
@@ -28,7 +26,6 @@ dotnetfeed
 DTDs
 DWINRT
 enablewttlogging
-HOMESHARE
 Intelli
 IVisual
 libucrt
@@ -36,7 +33,6 @@ libucrtd
 LKG
 LOCKFILE
 Lxss
-makepri
 mfcribbon
 microsoft
 microsoftonline
@@ -54,19 +50,14 @@ pgo
 pgosweep
 powerrename
 powershell
-priconfig
-PRIINFO
 propkey
 pscustomobject
 QWORD
 regedit
-resfiles
 robocopy
 SACLs
-segoe
 sdkddkver
 Shobjidl
-sid
 Skype
 SRW
 sxs
@@ -79,7 +70,6 @@ tdbuildteamid
 ucrt
 ucrtd
 unvirtualized
-USERDNSDOMAIN
 VCRT
 vcruntime
 Virtualization

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

@@ -1,6 +1,6 @@
 Anup
-arkthur
 austdi
+arkthur
 Ballmer
 bhoj
 Bhojwani
@@ -23,7 +23,6 @@ Griese
 Hernan
 Howett
 Illhardt
-Imms
 iquilezles
 italo
 jantari
@@ -31,11 +30,10 @@ jerrysh
 Kaiyu
 kimwalisch
 KMehrain
-Kodelife
 KODELIFE
+Kodelife
 Kourosh
 kowalczyk
-leonardder
 leonmsft
 Lepilleur
 lhecker
@@ -61,7 +59,6 @@ oising
 oldnewthing
 opengl
 osgwiki
-Ottosson
 pabhojwa
 panos
 paulcam
@@ -80,18 +77,15 @@ sonpham
 stakx
 talo
 thereses
-Thysell
 Walisch
 WDX
 Wellons
-Westerman
 Wirt
 Wojciech
 zadjii
 Zamor
-zamora
 Zamora
-zljubisic
+zamora
 Zoey
 zorio
 Zverovich

.github/actions/spelling/excludes.txt

@@ -109,10 +109,8 @@
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
 ^src/tools/lnkd/lnkd\.bat$
 ^src/tools/pixels/pixels\.bat$
-^src/tools/RenderingTests/main.cpp$
 ^src/tools/texttests/fira\.txt$
 ^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^src/types/ColorFix.cpp
 ^src/types/ut_types/UtilsTests.cpp$
 ^tools/ReleaseEngineering/ServicingPipeline.ps1$
 ignore$

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

@@ -9,7 +9,6 @@ ABCDEFGHIJ
 abcdefghijk
 ABCDEFGHIJKLMNO
 abcdefghijklmnop
-ABCDEFGHIJKLMNOPQRS
 ABCDEFGHIJKLMNOPQRST
 ABCG
 ABE
@@ -19,15 +18,11 @@ BBBBBBBB
 BBBBBCCC
 BBBBCCCCC
 BBGGRR
-efg
 EFG
 EFGh
-KLMNOQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJ
-QQQQQQQQQQABCDEFGHIJKLMNOPQRS
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
-QQQQQQQQQQABCDEFGHIJPQRST
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty

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

@@ -2,7 +2,6 @@ aabbcc
 ABANDONFONT
 abbcc
 ABCDEFGHIJKLMNOPQRSTUVWXY
-ABCF
 abgr
 abi
 ABORTIFHUNG
@@ -38,12 +37,10 @@ ansicpg
 ANSISYS
 ANSISYSRC
 ANSISYSSC
-answerback
 antialiasing
 ANull
 anycpu
 APARTMENTTHREADED
-APCA
 APCs
 APIENTRY
 apiset
@@ -64,6 +61,7 @@ argb
 ARRAYSIZE
 ARROWKEYS
 asan
+ASBRST
 ASBSET
 ASDF
 asdfghjkl
@@ -178,6 +176,7 @@ CConsole
 CConversion
 CCRT
 cdd
+CDeclaration
 CEdit
 CELLSIZE
 cfae
@@ -195,8 +194,7 @@ chh
 chk
 CHT
 Cic
-cielab
-Cielab
+CLA
 Clcompile
 CLE
 cleartype
@@ -254,13 +252,11 @@ conattrs
 conbufferout
 concfg
 conclnt
-concretizations
 conddkrefs
 condrv
 conechokey
 conemu
 configurability
-confusables
 conhost
 conime
 conimeinfo
@@ -315,6 +311,7 @@ CPLINFO
 cplusplus
 CPPCORECHECK
 cppcorecheckrules
+cpprest
 cpprestsdk
 cppwinrt
 CProc
@@ -335,7 +332,7 @@ Cspace
 csrmsg
 CSRSS
 csrutil
-CSTYLE
+cstyle
 CSwitch
 CTerminal
 CText
@@ -412,26 +409,21 @@ DECAUPSS
 DECAWM
 DECBKM
 DECCARA
-DECCIR
 DECCKM
-DECCKSR
 DECCOLM
 DECCRA
 DECCTR
 DECDHL
 decdld
-DECDMAC
 DECDWL
 DECEKBD
 DECERA
 DECFRA
 DECID
-DECINVM
 DECKPAM
 DECKPM
 DECKPNM
 DECLRMM
-DECMSR
 DECNKM
 DECNRCM
 DECOM
@@ -441,13 +433,9 @@ DECRARA
 DECRC
 DECREQTPARM
 DECRLM
-DECRPM
-DECRQCRA
 DECRQM
-DECRQPSR
 DECRQSS
 DECRQTSR
-DECRSPS
 decrst
 DECSACE
 DECSASD
@@ -465,10 +453,8 @@ DECSLRM
 DECSMKR
 DECSR
 DECSTBM
-DECSTGLT
 DECSTR
 DECSWL
-DECTABSR
 DECTCEM
 DECXCPR
 DEFAPP
@@ -488,6 +474,7 @@ defterm
 DELAYLOAD
 DELETEONRELEASE
 Delt
+demoable
 depersist
 deprioritized
 deserializers
@@ -544,6 +531,7 @@ DSSCL
 DSwap
 DTest
 DTTERM
+DUMMYUNIONNAME
 dup'ed
 dvi
 dwl
@@ -587,7 +575,6 @@ ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
 enumranges
-EOK
 eplace
 EPres
 EQU
@@ -597,6 +584,7 @@ ETW
 EUDC
 EVENTID
 eventing
+everytime
 evflags
 evt
 execd
@@ -618,12 +606,8 @@ FACESIZE
 FAILIFTHERE
 fastlink
 fcharset
-FDEA
 fdw
-FECF
-FEEF
 fesb
-FFAF
 FFDE
 FFrom
 fgbg
@@ -820,8 +804,6 @@ hkl
 HKLM
 hlocal
 hlsl
-HMB
-HMK
 hmod
 hmodule
 hmon
@@ -829,7 +811,6 @@ HORZ
 hostable
 hostlib
 HPA
-hpcon
 HPCON
 hpj
 HPR
@@ -911,6 +892,7 @@ INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
 INTERNALNAME
+inthread
 intsafe
 INVALIDARG
 INVALIDATERECT
@@ -1129,7 +1111,6 @@ Mip
 MMBB
 mmcc
 MMCPL
-MMIX
 mmsystem
 MNC
 MNOPQ
@@ -1268,12 +1249,14 @@ ntm
 nto
 ntrtl
 ntstatus
+ntsubauth
 NTSYSCALLAPI
 nttree
 nturtl
 ntuser
 NTVDM
 ntverp
+NTWIN
 nugetversions
 nullability
 nullness
@@ -1294,8 +1277,6 @@ OEMFONT
 OEMFORMAT
 OEMs
 offboarded
-oklab
-Oklab
 OLEAUT
 OLECHAR
 onecore
@@ -1314,6 +1295,8 @@ opencode
 opencon
 openconsole
 openconsoleproxy
+OPENIF
+OPENLINK
 openps
 openvt
 ORIGINALFILENAME
@@ -1366,7 +1349,9 @@ pcg
 pch
 PCIDLIST
 PCIS
+PCLIENT
 PCLONG
+PCOBJECT
 pcon
 PCONSOLE
 PCONSOLEENDTASK
@@ -1378,6 +1363,7 @@ pcshell
 PCSHORT
 PCSR
 PCSTR
+PCUNICODE
 PCWCH
 PCWCHAR
 PCWSTR
@@ -1426,6 +1412,7 @@ PLOGICAL
 pnm
 PNMLINK
 pntm
+PNTSTATUS
 POBJECT
 Podcast
 POINTSLIST
@@ -1443,7 +1430,9 @@ PPEB
 ppf
 ppguid
 ppidl
+pplx
 PPROC
+PPROCESS
 ppropvar
 ppsi
 ppsl
@@ -1507,6 +1496,7 @@ ptrs
 ptsz
 PTYIn
 PUCHAR
+PUNICODE
 pwch
 PWDDMCONSOLECONTEXT
 pws
@@ -1568,6 +1558,7 @@ REGISTEROS
 REGISTERVDM
 regkey
 REGSTR
+reingest
 RELBINPATH
 remoting
 renamer
@@ -1579,7 +1570,6 @@ replatformed
 Replymessage
 repositorypath
 Requiresx
-rerasterize
 rescap
 Resequence
 RESETCONTENT
@@ -1776,13 +1766,10 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-srgb
-Srgb
 srv
 srvinit
 srvpipe
 ssa
-startdir
 STARTF
 STARTUPINFO
 STARTUPINFOEX
@@ -1792,7 +1779,6 @@ STARTWPARMS
 STARTWPARMSA
 STARTWPARMSW
 Statusline
-stb
 stdafx
 STDAPI
 stdc
@@ -1832,7 +1818,6 @@ SYSCOMMAND
 SYSDEADCHAR
 SYSKEYDOWN
 SYSKEYUP
-SYSLIB
 SYSLINK
 SYSMENU
 sysparams
@@ -1866,7 +1851,6 @@ TDP
 TEAMPROJECT
 tearoff
 Teb
-Techo
 tellp
 teraflop
 terminalcore
@@ -1958,7 +1942,6 @@ trx
 tsattrs
 tsf
 tsgr
-tsm
 TStr
 TSTRFORMAT
 TSub
@@ -2010,6 +1993,7 @@ unittesting
 unittests
 unk
 unknwn
+unmark
 UNORM
 unparseable
 unregistering
@@ -2122,6 +2106,7 @@ WDDMCONSOLECONTEXT
 wdm
 webpage
 websites
+websockets
 wekyb
 wex
 wextest
@@ -2198,7 +2183,6 @@ wnd
 WNDALLOC
 WNDCLASS
 WNDCLASSEX
-WNDCLASSEXW
 WNDCLASSW
 Wndproc
 WNegative
@@ -2304,7 +2288,6 @@ YOffset
 YSubstantial
 YVIRTUALSCREEN
 YWalk
-zabcd
 Zabcdefghijklmnopqrstuvwxyz
 ZCmd
 ZCtrl

.github/actions/spelling/patterns/0_t.txt

@@ -10,4 +10,4 @@
 \\tests(?![a-z])
 \\thread(?![a-z])
 \\tools(?![a-z])
-\\types?(?![a-z])
+\\types(?![a-z])

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

@@ -35,7 +35,7 @@ ROY\sG\.\sBIV
 # hit-count: 71 file-count: 35
 # Compiler flags
 (?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
-(?:^|[\t ,"'`=(])-[X](?!aml)(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+(?:^|[\t ,"'`=(])-[X](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
 
 # hit-count: 41 file-count: 28
 # version suffix <word>v#

.github/workflows/addToProject.yml

@@ -1,21 +0,0 @@
-name: Add triaged bugs & tasks to project board
-# https://github.com/actions/add-to-project
-
-on:
-  issues:
-    types:
-      - labeled
-      - unlabeled
-
-permissions: {}
-jobs:
-  add-to-project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.3.0
-        with:
-          project-url: https://github.com/orgs/microsoft/projects/159
-          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
-          labeled: Issue-Feature, Needs-Triage, Needs-Author-Feedback, Issue-Scenario
-          label-operator: NOT

.github/workflows/winget.yml

@@ -1,24 +0,0 @@
-name: Publish to Winget
-
-on:
-  release:
-    types: [published]
-
-env:
-  REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
-
-jobs:
-  publish:
-    runs-on: windows-latest # Action can only run on Windows
-    steps:
-      - name: Publish Windows Terminal ${{ github.event.release.prerelease && 'Preview' || 'Stable' }}
-        run: |
-          $assets = '${{ toJSON(github.event.release.assets) }}' | ConvertFrom-Json
-          $wingetRelevantAsset = $assets | Where-Object { $_.name -like '*.msixbundle' } | Select-Object -First 1
-          $regex = [Regex]::New($env:REGEX)
-          $version = $regex.Match($wingetRelevantAsset.name).Groups[1].Value
-
-          $wingetPackage = "Microsoft.WindowsTerminal${{ github.event.release.prerelease && '.Preview' || '' }}"
-
-          & curl.exe -JLO https://aka.ms/wingetcreate/latest
-          & .\wingetcreate.exe update $wingetPackage -s -v $version -u $wingetRelevantAsset.browser_download_url -t "${{ secrets.WINGET_TOKEN }}"

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "dep/gsl"]
 	path = dep/gsl
 	url = https://github.com/microsoft/gsl
+[submodule "dep/wil"]
+	path = dep/wil
+	url = https://github.com/microsoft/wil

.vscode/settings.json

@@ -6,7 +6,7 @@
     "C_Cpp.loggingLevel": "None",
     "files.associations": {
         "xstring": "cpp",
-        "*.idl": "midl3",
+        "*.idl": "cpp",
         "array": "cpp",
         "future": "cpp",
         "istream": "cpp",
@@ -94,11 +94,7 @@
         "xlocinfo": "cpp",
         "xmemory": "cpp",
         "xstddef": "cpp",
-        "xtr1common": "cpp",
-        "coroutine": "cpp",
-        "format": "cpp",
-        "forward_list": "cpp",
-        "latch": "cpp"
+        "xtr1common": "cpp"
     },
     "files.exclude": {
         "**/bin/**": true,
@@ -106,4 +102,4 @@
         "**/packages/**": true,
         "**/Generated Files/**": true
     }
-}
+}

.vsconfig

@@ -17,7 +17,7 @@
     "Microsoft.Net.Component.4.5.TargetingPack",
     "Microsoft.VisualStudio.Component.DiagnosticTools",
     "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
+    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
     "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
     "Microsoft.VisualStudio.Component.VC.CoreIde",
     "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
@@ -25,11 +25,10 @@
     "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
     "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
-    "Microsoft.VisualStudio.Component.VC.ASAN",
-    "Microsoft.VisualStudio.Component.VC.v143.x86.x64",
-    "Microsoft.VisualStudio.Component.VC.v143.ARM64",
+    "Microsoft.VisualStudio.Component.VC.v142.x86.x64",
+    "Microsoft.VisualStudio.Component.VC.v142.ARM64",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v143",
+    "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142",
     "Microsoft.VisualStudio.Component.UWP.VC.ARM64"
   ]
 }

CONTRIBUTING.md

@@ -81,7 +81,7 @@ When you hit "New Issue", select the type of issue closest to what you want to r
   Microsoft Windows [Version 10.0.18900.1001]
   ```
 
-* What tools and apps you're using (e.g. VS 2022, VSCode, etc.)
+* What tools and apps you're using (e.g. VS 2019, VSCode, etc.)
 * Don't assume we're experts in setting up YOUR environment and don't assume we are experts in `<your distro/tool of choice>`. Teach us to help you!
 * **We LOVE detailed repro steps!** What steps do we need to take to reproduce the issue? Assume we love to read repro steps. As much detail as you can stand is probably _barely_ enough detail for us!
 * If you're reporting a particular character/glyph not rendering correctly, the specific Unicode codepoint would be MOST welcome (e.g. U+1F4AF, U+4382)
@@ -99,29 +99,15 @@ If you don't have any additional info/context to add but would like to indicate
 
 ## Contributing fixes / features
 
-If you're able & willing to help fix issues and/or implement features, we'd love your contribution!
-
-The best place to start is the list of ["good first issue"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22++label%3A%22good+first+issue%22+)s. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find an issue you're interested in and hop in!
-
-Generally, we categorize issues in the following way, which is largely derived from our old internal work tracking system:
-* ["Bugs"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Bug%22+) are parts of the Terminal & Console that are not quite working the right way. There's code to already support some scenario, but it's not quite working right. Fixing these is generally a matter of debugging the broken functionality and fixing the wrong code.
-* ["Tasks"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Task%22+) are usually new pieces of functionality that aren't yet implemented for the Terminal/Console. These are usually smaller features, which we believe
-  - could be a single, atomic PR
-  - Don't require much design consideration, or we've already written the spec for the larger feature they belong to.
-* ["Features"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Feature%22+) are larger pieces of new functionality. These are usually things we believe would require larger discussion of how they should be implemented, or they'll require some complicated new settings. They might just be features that are composed of many individual tasks. Often times, with features, we like to have a spec written before development work is started, to make sure we're all on the same page (see below).
-
-Bugs and tasks are obviously the easiest to get started with, but don't feel afraid of features either! We've had some community members contribute some amazing "feature"-level work to the Terminal (albeit, with lots of discussion 😄).
-
-
-Often, we like to assign issues that generally belong to somebody's area of expertise to the team member that owns that area. This doesn't mean the community can't jump in -- they should reach out and have a chat with the assignee to see if it'd okay to take. If an issue's been assigned more than a month ago, there's a good chance it's fair game to try yourself.
+For those able & willing to help fix issues and/or implement features ...
 
 ### To Spec or not to Spec
 
 Some issues/features may be quick and simple to describe and understand. For such scenarios, once a team member has agreed with your approach, skip ahead to the section headed "Fork, Branch, and Create your PR", below.
 
-Small issues that do not require a spec will be labelled `Issue-Bug` or `Issue-Task`.
+Small issues that do not require a spec will be labelled Issue-Bug or Issue-Task.
 
-However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled `Issue-Feature`. More often than not, we'll add such features to the ["Specification Tracker" project](https://github.com/microsoft/terminal/projects/1).
+However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled Issue-Feature.
 
 Specs help collaborators discuss different approaches to solve a problem, describe how the feature will behave, how the feature will impact the user, what happens if something goes wrong, etc. Driving towards agreement in a spec, before any code is written, often results in simpler code, and less wasted effort in the long run.
 
@@ -139,7 +125,7 @@ Team members will be happy to help review specs and guide them to completion.
 
 ### Help Wanted
 
-Once the team has approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
+Once the team have approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
 
 ---
 

NOTICE.md

@@ -117,6 +117,7 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ```
 
 ## dynamic_bitset
@@ -147,6 +148,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
 ```
 
 ## \{fmt\}
@@ -213,116 +215,41 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
 ```
 
-## PCG Random Number Generation
 
-**Source**: [https://github.com/imneme/pcg-cpp](https://github.com/imneme/pcg-cpp)
+## boost
+
+**Source**: [https://github.com/boostorg/boost](https://github.com/boostorg/boost)
 
 ### License
 
 ```
-Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
+Boost Software License - Version 1.0 - August 17th, 2003
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 
-## wyhash
-
-**Source**: [https://github.com/wangyi-fudan/wyhash](https://github.com/wangyi-fudan/wyhash)
-
-### License
-
-```
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-```
-
-## stb
-
-**Source**: [https://github.com/nothings/stb](https://github.com/nothings/stb)
-
-### License
-
-```
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
-## Oklab
-**Source**: [https://bottosson.github.io/posts/oklab/](https://bottosson.github.io/posts/oklab/)
-
-### License
-
-```
-Copyright (c) 2020 Björn Ottosson
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
 ```
 
 # Microsoft Open Source

NuGet.Config

@@ -10,8 +10,6 @@
         <clear />
     </disabledPackageSources>
     <config>
-        <!-- TODO: TEMPORARY UNTIL PGO-Helpers is updated to search both. We shouldn't need to keep the globals path here. -->
-        <add key="globalPackagesFolder" value=".\packages" />
         <add key="repositorypath" value=".\packages" />
     </config>
 </configuration>

README.md

@@ -21,7 +21,7 @@ Related repositories include:
 
 ## Installing and running Windows Terminal
 
-> **Note**: Windows Terminal requires Windows 10 2004 (build 19041) or later
+> 🔴 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
 
 ### Microsoft Store [Recommended]
 
@@ -52,10 +52,8 @@ fails for any reason, you can try the following command at a PowerShell prompt:
 Add-AppxPackage Microsoft.WindowsTerminal_<versionNumber>.msixbundle
 ```
 
-> **Note**: If you install Terminal manually:
+> 🔴 Note: If you install Terminal manually:
 >
-> * You may need to install the [VC++ v14 Desktop Framework Package](https://docs.microsoft.com/troubleshoot/cpp/c-runtime-packages-desktop-bridge#how-to-install-and-update-desktop-framework-packages).  
->   This should only be necessary on older builds of Windows 10 and only if you get an error about missing framework packages.
 > * Terminal will not auto-update when new builds are released so you will need
 >   to regularly install the latest Terminal release to receive all the latest
 >   fixes and improvements!
@@ -67,7 +65,7 @@ the latest Terminal release by installing the `Microsoft.WindowsTerminal`
 package:
 
 ```powershell
-winget install --id Microsoft.WindowsTerminal -e
+winget install --id=Microsoft.WindowsTerminal -e
 ```
 
 #### Via Chocolatey (unofficial)
@@ -113,10 +111,10 @@ repository.
 
 ---
 
-## Windows Terminal Roadmap
+## Windows Terminal 2.0 Roadmap
 
-The plan for the Windows Terminal [is described here](/doc/roadmap-2022.md) and
-will be updated as the project proceeds.
+The plan for delivering Windows Terminal 2.0 [is described
+here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
 
 ## Project Build Status
 
@@ -177,7 +175,7 @@ While overhauling Windows Console, we modernized its codebase considerably,
 cleanly separating logical entities into modules and classes, introduced some
 key extensibility points, replaced several old, home-grown collections and
 containers with safer, more efficient [STL
-containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2022),
+containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019),
 and made the code simpler and safer by using Microsoft's [Windows Implementation
 Libraries - WIL](https://github.com/Microsoft/wil).
 
@@ -216,7 +214,7 @@ resources useful and interesting:
 * Windows Terminal Launch: [Build 2019
   Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
 * Run As Radio: [Show 645 - Windows Terminal with Richard
-  Turner](https://www.runasradio.com/Shows/Show/645)
+  Turner](http://www.runasradio.com/Shows/Show/645)
 * Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps
   on the Windows
   Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
@@ -235,7 +233,7 @@ Cause: You're launching the incorrect solution in Visual Studio.
 Solution: Make sure you're building & deploying the `CascadiaPackage` project in
 Visual Studio.
 
-> **Note**: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
+> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
 > Windows Console that hosts Windows' command-line infrastructure. OpenConsole
 > is used by Windows Terminal to connect to and communicate with command-line
 > applications (via
@@ -266,7 +264,7 @@ help avoid any wasted or duplicate effort.
 The easiest way to communicate with the team is via GitHub issues.
 
 Please file new issues, feature requests and suggestions, but **DO search for
-similar open/closed preexisting issues before creating a new issue.**
+similar open/closed pre-existing issues before creating a new issue.**
 
 If you would like to ask a question that you feel doesn't warrant an issue
 (yet), please reach out to us via Twitter:
@@ -274,8 +272,11 @@ If you would like to ask a question that you feel doesn't warrant an issue
 * Kayla Cinnamon, Program Manager:
   [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Mike Griese, Senior Developer: [@zadjii](https://twitter.com/zadjii)
+* Michael Niksa, Senior Developer:
+  [@michaelniksa](https://twitter.com/MichaelNiksa)
+* Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
+* Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)
 * Pankaj Bhojwani, Developer
 * Leonard Hecker, Developer: [@LeonardHecker](https://twitter.com/LeonardHecker)
 
@@ -283,25 +284,23 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Prerequisites
 
-* You must be running Windows 10 2004 (build >= 10.0.19041.0) or later to run
+* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run
   Windows Terminal
 * You must [enable Developer Mode in the Windows Settings
   app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
   to locally install and run Windows Terminal
-* You must have [PowerShell 7 or later](https://github.com/PowerShell/PowerShell/releases/latest) installed
-* You must have the [Windows 11 (10.0.22621.0)
-  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
+* You must have the [Windows 10 1903
+  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
   installed
 * You must have at least [VS
-  2022](https://visualstudio.microsoft.com/downloads/) installed
+  2019](https://visualstudio.microsoft.com/downloads/) installed
 * You must install the following Workloads via the VS Installer. Note: Opening
-  the solution in VS 2022 will [prompt you to install missing components
+  the solution in VS 2019 will [prompt you to install missing components
   automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
   * Desktop Development with C++
   * Universal Windows Platform Development
   * **The following Individual Components**
-    * C++ (v143) Universal Windows Platform Tools
-* You must install the [.NET Framework Targeting Pack](https://docs.microsoft.com/dotnet/framework/install/guide-for-developers#to-install-the-net-framework-developer-pack-or-targeting-pack) to build test projects
+    * C++ (v142) Universal Windows Platform Tools
 
 ## Building the Code
 
@@ -339,9 +338,7 @@ Solution Explorer) and go to properties. In the Debug menu, change "Application
 process" and "Background task process" to "Native Only".
 
 You should then be able to build & debug the Terminal project by hitting
-<kbd>F5</kbd>. Make sure to select either the "x64" or the "x86" platform - the
-Terminal doesn't build for "Any Cpu" (because the Terminal is a C++ application,
-not a C# one).
+<kbd>F5</kbd>.
 
 > 👉 You will _not_ be able to launch the Terminal directly by running the
 > WindowsTerminal.exe. For more details on why, see

Scratch.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134

build/Fuzz/notifications-ado.json

@@ -1,34 +0,0 @@
-{
-  "config": {
-    "base_url": "https://dev.azure.com/microsoft/os",
-    "auth_token": "INSERT_PAT_HERE",
-    "project": "OpenConsole",
-    "type": "Bug",
-    "unique_fields": [
-      "Microsoft.VSTS.Common.CustomString03"
-    ],
-    "comment": "<a href='{{ input_url }}'>This input</a> caused the <a href='{{ target_url }}'>fuzz target</a> {{ report.executable }} to crash. The faulting input SHA256 hash is {{ report.input_sha256 }} <br>",
-    "ado_fields": {
-      "System.AssignedTo": "INSERT_ASSIGNED_HERE",
-      "System.Tags": "OneFuzz",
-      "System.AreaPath": "OS\\WDX\\DXP\\WinDev\\Terminal",
-      "OSG.Watson.Telemetry14DaysInMarketHits": "1",
-      "System.IterationPath": "OS\\Future",
-      "Microsoft.VSTS.Common.CustomString01": "{{ job.project }}",
-      "Microsoft.VSTS.Common.CustomString02": "{{ job.name }}",
-      "Microsoft.VSTS.Common.CustomString03": "{{ report.minimized_stack_function_lines_sha256}}",
-      "System.Title": "[Fuzzing] - {{ report.crash_site }}",
-      "Microsoft.VSTS.CMMI.HowFound": "Security: Fuzzing",
-      "OSG.SecurityImpact": "Security Triage Requested",
-      "OSG.SDLSeverity": "Moderate",
-      "Microsoft.VSTS.TCM.ReproSteps": "The fuzzing target ({{ job.project }} {{ job.name }} {{ job.build }}) reported a crash. <br> {%if report.asan_log %} AddressSanitizer reported the following details: <br> <pre> {{ report.asan_log }} </pre> {% else %} Faulting call stack: <ul> {% for item in report.call_stack %} <li> {{ item }} </li> {% endfor %} </ul> <br> {% endif %} You can reproduce the issue remotely in OneFuzz by running the following command: <pre> {{ repro_cmd }} </pre>"
-    },
-    "on_duplicate": {
-      "set_state": {"Resolved": "Active", "Closed": "Active"},
-      "ado_fields": {
-        "System.IterationPath": "OS\\Future"
-      },
-      "increment": ["OSG.Watson.Telemetry14DaysInMarketHits"]
-    }
-  }
-}

build/Helix/EnsureMachineState.ps1

@@ -1,4 +1,4 @@
-$scriptDirectory = $script:MyInvocation.MyCommand.Path | Split-Path -Parent
+$scriptDirectory = $script:MyInvocation.MyCommand.Path | Split-Path -Parent
 
 # List all processes to aid debugging:
 Write-Host "All processes running:"

build/Helix/HelixTestHelpers.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

build/Helix/OutputTestResults.ps1

@@ -31,7 +31,7 @@ $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.client21h1.xaml)
+# 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))
 {

build/Helix/PrepareHelixPayload.ps1

@@ -55,8 +55,12 @@ Copy-Item "build\helix\runtests.cmd" $payloadDir
 Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir"
 Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"
 
-# Extract the unpackaged distribution of Windows Terminal to the payload directory,
-# where it will create a subdirectory named terminal-0.0.1.0
-# This is referenced in TerminalApp.cs later as part of the test harness.
-& tar -x -v -f "$repoDirectory\Artifacts\$ArtifactName\unpackaged\WindowsTerminalDev_0.0.1.0_x64.zip" -C "$payloadDir"
-Copy-Item "res\fonts\*.ttf" "$payloadDir\terminal-0.0.1.0"
+# Copy the APPX package from the 'drop' artifact dir
+Copy-Item "$repoDirectory\Artifacts\$ArtifactName\appx\CascadiaPackage_0.0.1.0_$Platform.msix" $payloadDir\CascadiaPackage.zip
+
+# Rename it to extension of ZIP because Expand-Archive is real sassy on the build machines
+# and refuses to unzip it because of its file extension while on a desktop, it just
+# does the job without complaining.
+
+# Extract the APPX package
+Expand-Archive -LiteralPath $payloadDir\CascadiaPackage.zip -DestinationPath $payloadDir\appx

build/Helix/ProcessHelixFiles.ps1

@@ -70,7 +70,7 @@ foreach ($testRun in $testRuns.value)
 
     foreach ($testResult in $testResults.value)
     {
-        $info = ConvertFrom-Json ([System.Web.HttpUtility]::HtmlDecode($testResult.comment))
+        $info = ConvertFrom-Json $testResult.comment
         $helixJobId = $info.HelixJobId
         $helixWorkItemName = $info.HelixWorkItemName
 

build/Helix/global.json

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

build/config/ESRPSigning_ConPTY.json

@@ -1,51 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "conpty.dll",
-                "OpenConsole.exe"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}

build/config/ESRPSigning_Terminal.json

@@ -1,72 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                // Namespaced DLLs
-                "Microsoft.Terminal.*.dll",
-                "Microsoft.Terminal.*.winmd",
-
-                // ConPTY and DefTerm
-                "OpenConsole.exe",
-                "OpenConsoleProxy.dll",
-
-                // VCRT Forwarders
-                "*_app.dll",
-
-                // Legacy DLLs with old names
-                "TerminalApp.dll",
-                "TerminalApp.winmd",
-                "TerminalConnection.dll",
-                "TerminalThemeHelpers.dll",
-                "WindowsTerminalShellExt.dll",
-
-                // The rest
-                "TerminalAzBridge.exe",
-                "wt.exe",
-                "WindowsTerminal.exe",
-                "elevate-shim.exe"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}

build/config/GitCheckin.json

@@ -1,24 +0,0 @@
-{
-    "Branch": [
-      {
-        "collection": "microsoft",
-        "project": "OS",
-        "repo": "os.2020",
-        "name": "official/rs_we_adept_e4d2",
-        "workitem": "38106206",
-        "CheckinFiles": [
-          {
-            "source": "WindowsTerminal.app.man",
-            "path": "/redist/mspartners/ipa/WindowsTerminal",
-            "type": "File"
-          }
-        ]
-      }
-    ],
-    "Email": [
-      {
-        "sendTo": "condev",
-        "sendOnErrorOnly": "False"
-      }
-    ]
-  }

build/config/PolicheckExclusions.xml

@@ -1,11 +0,0 @@
-<PoliCheckExclusions>
-  <!-- All strings must be UPPER CASE -->
-  <!--Each of these exclusions is a folder name -if \[name]\exists in the file path, it will be skipped -->
-  <Exclusion Type="FolderPathFull">winrt|.git|oss|packages</Exclusion>
-  <!--Each of these exclusions is a folder name -if any folder or file starts with "\[name]", it will be skipped -->
-  <!--<Exclusion Type="FolderPathStart">ABC|XYZ</Exclusion>-->
-  <!--Each of these file types will be completely skipped for the entire scan -->
-  <Exclusion Type="FileType">.PNG|.SVG|.BMP|.ICO</Exclusion>
-  <!--The specified file names will be skipped during the scan regardless which folder they are in -->
-  <!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
-</PoliCheckExclusions>

build/packages.config

@@ -2,7 +2,4 @@
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
-  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
-  <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />
-  <package id="Microsoft.Debugging.Tools.SrcTool" version="20220617.1556.0" targetFramework="native" />
 </packages>

build/pgo/PGO.DB.proj

@@ -1,4 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Terminal.PGO.props" />
-  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.targets" />
-</Project>

build/pgo/Terminal.PGO.DB.nuspec

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.Internal.Windows.Terminal.PGODatabase</id>
-    <version>0</version>
-    <title>Windows Terminal PGO Database</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Windows Terminal PGO Database</description>
-  </metadata>
-  <files>
-    <!-- The target directories for pgd files need to remain as is.  PGO optimization pass will rely on this exact directory layout. -->
-    <file src="x64\*.pgd" target="tools\x64"/>
-  </files>
-</package>

build/pgo/Terminal.PGO.props

@@ -1,51 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <NuGetPackageDirectory>$(MSBuildThisFileDirectory)..\..\packages</NuGetPackageDirectory>
-    <PkgMicrosoft_PGO_Helpers_Cpp>$(NuGetPackageDirectory)\Microsoft.Internal.PGO-Helpers.Cpp.0.2.34</PkgMicrosoft_PGO_Helpers_Cpp>
-  </PropertyGroup>
-
-  <!-- Get version information -->
-  <Import Project="$(MSBuildThisFileDirectory)..\..\custom.props" />
-
-  <PropertyGroup>
-    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>main</PGOBranch>
-
-    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
-    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
-
-    <!-- Mandatory.  Major version number of the PGO database which should match the version of the product.  This can be hard-coded or obtained from other sources in build system. -->
-    <PGOPackageVersionMajor>$(VersionMajor)</PGOPackageVersionMajor>
-
-    <!-- Mandatory.  Minor version number of the PGO database which should match the version of the product.  This can be hard-coded or obtained from other sources in build system. -->
-    <PGOPackageVersionMinor>$(VersionMinor)</PGOPackageVersionMinor>
-
-    <!-- Mandatory, defaults to 0.  Patch version number of the PGO database which should match the version of the product.  This can be hard-coded or obtained from other sources in build system. -->
-    <PGOPackageVersionPatch>0</PGOPackageVersionPatch>
-    
-    <!-- Optional, defaults to empty.  Prerelease version number of the PGO database which should match the version of the product.  This can be hard-coded or obtained from other sources in build system. -->
-    <PGOPackageVersionPrerelease></PGOPackageVersionPrerelease>
-
-    <!-- Mandatory.  Path to nuget.config file for the project.  Path is relative to where the props file will be. -->
-    <PGONuGetConfigPath>$(MSBuildThisFileDirectory)..\..\nuget.config</PGONuGetConfigPath>
-
-    <!-- Mandatory.  Path to PGO database NuSpec, see section below. -->
-    <PGONuspecPath>$(MSBuildThisFileDirectory)Terminal.PGO.DB.nuspec</PGONuspecPath>
-
-    <!-- Optional, defaults to true.  Should verification result in build failure or error? -->
-    <PGOVerifyFailureTreatedAsError>true</PGOVerifyFailureTreatedAsError>
-
-    <!-- Optional, defaults to $(IntDir)\Nuspec.  Temporary path where PGD files are copied to. -->
-    <PGONuspecBasePath>$(PGDPathForAllArch)</PGONuspecBasePath>
-
-    <!-- Optional, defaults to true.  Specifies whether to use default information for PGD files. -->
-    <PGOUseDefaultPGDFileInfo>true</PGOUseDefaultPGDFileInfo>
-
-    <!-- Copying the PGO runtime brings along a CRT. If we do that under normal circumstances, WAPPROJ will get its grubby hands on it and mess up all the CRT shenanigans we have to pull to make MSIX packages happy. So only pull it in for Instrument builds.-->
-    <PGOCopyRuntime>false</PGOCopyRuntime>
-    <PGOCopyRuntime Condition="'$(PGOBuildMode)' == 'Instrument'">true</PGOCopyRuntime>
-  </PropertyGroup>
-
-  <!-- Import PGO-Helpers -->
-  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.props" />
-</Project>

build/pipelines/ci.yml

@@ -38,7 +38,6 @@ stages:
       - template: ./templates/build-console-audit-job.yml
         parameters:
           platform: x64
-
   - stage: Build_x64
     displayName: Build x64
     dependsOn: []
@@ -62,32 +61,6 @@ stages:
       - template: ./templates/build-console-ci.yml
         parameters:
           platform: ARM64
-
-  - stage: Test_x64
-    displayName: Test x64
-    dependsOn: [Build_x64]
-    condition: succeeded()
-    jobs:
-      - template: ./templates/test-console-ci.yml
-        parameters:
-          platform: x64
-  - stage: Test_x86
-    displayName: Test x86
-    dependsOn: [Build_x86]
-    jobs:
-      - template: ./templates/test-console-ci.yml
-        parameters:
-          platform: x86
-
-  - stage: Helix_x64
-    displayName: Helix x64
-    dependsOn: [Build_x64]
-    condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')))
-    jobs:
-      - template: ./templates/console-ci-helix-job.yml
-        parameters:
-          platform: x64
-
   - stage: Scripts
     displayName: Code Health Scripts
     dependsOn: []
@@ -95,10 +68,3 @@ stages:
     jobs:
       - template: ./templates/check-formatting.yml
 
-
-  - stage: CodeIndexer
-    displayName: Github CodeNav Indexer
-    dependsOn: [Build_x64]
-    condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')))
-    jobs:
-      - template: ./templates/codenav-indexer.yml

build/pipelines/daily-loc-submission.yml

@@ -1,93 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "0 3 * * 2-6" # Run at 03:00 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Localization Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-pool:
-  vmImage: windows-2019
-
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
-  - repository: internal
-    type: git
-    name: Terminal.Internal
-    ref: main
-
-steps:
-
-- checkout: self
-  clean: true
-  submodules: false
-  fetchDepth: 1 # Don't need a deep checkout for loc files!
-  persistCredentials: true
-  path: s # Adding a second repo made Azure DevOps change where we're checked out.
-
-- checkout: internal
-  clean: true
-  submodules: false
-  fetchDepth: 1
-  persistCredentials: true
-  path: s/Terminal.Internal
-
-- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
-  displayName: 'Touchdown Build - 7105, PRODEXT'
-  inputs:
-    teamId: 7105
-    authId: '$(TouchdownApplicationID)'
-    authKey: '$(TouchdownApplicationKey)'
-    resourceFilePath: |
-     **\en-US\*.resw
-     Terminal.Internal\PDPs\Stable\PDPs\en-us\PDP.xml
-     Terminal.Internal\PDPs\Preview\PDPs\en-us\PDP.xml
-    outputDirectoryRoot: LocOutput
-    appendRelativeDir: true
-    pseudoSetting: Included
-    localizationTarget: false
-
-- pwsh: >-
-    Remove-Item -EA:Ignore -R -Force LocOutput\Terminal.Internal
-
-    $Files = Get-ChildItem LocOutput -R -Filter '*.resw' | ? FullName -Like '*en-US\*\*.resw'
-
-    $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-
-    Get-ChildItem LocOutput -R -Filter '*.resw' | % {
-
-      ((Get-Content $_.FullName) -join "`r`n") + "`r`n" | Set-Content -NoNewline $_.FullName
-
-    }
-
-    & tar.exe -c -f LocOutputMunged.tar -C LocOutput .
-
-    & tar.exe -x -v -f LocOutputMunged.tar
-
-    rm LocOutputMunged.tar
-
-    rm -r -fo LocOutput
-
-    & ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
-
-    git config --local user.email "consvc@microsoft.com"
-
-    git config --local user.name "Console Service Bot"
-
-    git add **/*.resw
-
-    git status
-
-    git switch -c loc-update
-
-    $Now = Get-Date
-
-    git commit -m "Localization Updates - $Now"
-
-    git push origin HEAD:refs/heads/loc-update -f
-  displayName: Move Loc files to the right places and commit them I guess?

build/pipelines/feature-flag-ci.yml

@@ -1,29 +0,0 @@
-trigger: none
-
-pr:
-  branches:
-    include:
-      - main
-  paths:
-    include:
-      - src/features.xml
-
-variables:
-  - name: runCodesignValidationInjectionBG
-    value: false
-
-parameters:
-  - name: buildBrandings
-    type: object
-    default:
-      - Release
-      - Preview
-      # Dev is built automatically
-      # WindowsInbox does not typically build with VS.
-
-jobs:
-  - ${{ each branding in parameters.buildBrandings }}:
-    - template: ./templates/build-console-ci.yml
-      parameters:
-        platform: x64
-        branding: ${{ branding }}

build/pipelines/fuzz.yml

@@ -1,59 +0,0 @@
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-  paths:
-    exclude:
-      - docs/*
-      - samples/*
-      - tools/*
-
-pr: none
-
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-stages:
-  - stage: Build_Fuzz_Config
-    displayName: Build Fuzzers
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-    - template: ./templates/build-console-fuzzing.yml
-      parameters:
-        platform: x64
-  - stage: OneFuzz
-    displayName: Submit OneFuzz Job
-    dependsOn: ['Build_Fuzz_Config']
-    condition: succeeded()
-    pool:
-      vmImage: 'ubuntu-latest'
-    variables:
-      artifactName: fuzzingBuildOutput
-    jobs:
-    - job:
-      steps:
-      - task: DownloadBuildArtifacts@0
-        inputs:
-          artifactName: $(artifactName)
-          downloadPath: $(Build.ArtifactStagingDirectory)
-      - task: UsePythonVersion@0
-        inputs:
-          versionSpec: '3.x'
-          addToPath: true
-          architecture: 'x64'
-      - bash: |
-          set -ex
-          pip -q install onefuzz
-          onefuzz config --endpoint $(endpoint) --client_id $(client_id) --authority $(authority) --tenant_domain $(tenant_domain) --client_secret $(client_secret)
-          sed -i s/INSERT_PAT_HERE/$(ado_pat)/ build/Fuzz/notifications-ado.json
-          sed -i s/INSERT_ASSIGNED_HERE/$(ado_assigned_to)/ build/Fuzz/notifications-ado.json
-        displayName: Configure OneFuzz
-      - bash: |
-          onefuzz template libfuzzer basic --colocate_all_tasks --vm_count 1 --target_exe $target_exe_path --notification_config @./build/Fuzz/notifications-ado.json OpenConsole $test_name $(Build.SourceVersion) default
-        displayName: Submit OneFuzz Job
-        env:
-          target_exe_path: $(Build.ArtifactStagingDirectory)/$(artifactName)/Fuzzing/x64/test/OpenConsoleFuzzer.exe
-          test_name: WriteCharsLegacy

build/pipelines/release.yml

@@ -2,9 +2,9 @@
 trigger: none
 pr: none
 
-pool:
+pool: 
   name: WinDevPool-L
-  demands: ImageOverride -equals WinDevVS17-latest
+  demands: ImageOverride -equals WinDevVS16-latest
 
 parameters:
   - name: branding
@@ -18,22 +18,10 @@ parameters:
     displayName: "Build Windows Terminal MSIX"
     type: boolean
     default: true
-  - name: runCompliance
-    displayName: "Run Compliance and Security Build"
-    type: boolean
-    default: true
-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
   - name: buildTerminalVPack
     displayName: "Build Windows Terminal VPack"
     type: boolean
     default: false
-  - name: buildConPTY
-    displayName: "Build ConPTY NuGet"
-    type: boolean
-    default: false
   - name: buildWPF
     displayName: "Build Terminal WPF Control"
     type: boolean
@@ -46,6 +34,7 @@ parameters:
       - Optimize
       - Instrument
       - None
+
   - name: buildConfigurations
     type: object
     default:
@@ -58,30 +47,7 @@ parameters:
       - arm64
 
 variables:
-  MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
-  TerminalInternalPackageVersion: "0.0.8"
-  # If we are building a branch called "release-*", change the NuGet suffix
-  # to "preview". If we don't do that, XES will set the suffix to "release1"
-  # because it truncates the value after the first period.
-  # We also want to disable the suffix entirely if we're Release branded while
-  # on a release branch.
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label as
-  # well.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Release                    | Preview
-  # ------------------|----------------------------|-----------------------------
-  # release-*         | 1.12.20220427              | 1.13.20220427-preview
-  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
-  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      NoNuGetPackBetaVersion: true
-    ${{ else }}:
-      NuGetPackBetaVersion: preview
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental
+  TerminalInternalPackageVersion: "0.0.7"
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 resources:
@@ -99,7 +65,6 @@ jobs:
             BuildConfiguration: ${{ config }}
             BuildPlatform: ${{ platform }}
   displayName: Build
-  timeoutInMinutes: 240
   cancelTimeoutInMinutes: 1
   steps:
   - checkout: self
@@ -120,7 +85,19 @@ jobs:
         If ($Arch -Eq "x86") { $Arch = "Win32" }
 
         Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-  - template: .\templates\restore-nuget-steps.yml
+  - task: NuGetToolInstaller@1
+    displayName: Use NuGet 5.10
+    inputs:
+      versionSpec: 5.10
+  - task: NuGetCommand@2
+    displayName: NuGet custom
+    inputs:
+      command: custom
+      selectOrConfig: config
+      nugetConfigPath: NuGet.Config
+      arguments: restore OpenConsole.sln -SolutionDirectory $(Build.SourcesDirectory)
+  # Pull the Windows SDK for the developer tools like the debuggers so we can index sources later
+  - template: .\templates\install-winsdk-steps.yml
   - task: UniversalPackages@0
     displayName: Download terminal-internal Universal Package
     inputs:
@@ -136,8 +113,6 @@ jobs:
       resourceFilePath: >-
         src\cascadia\TerminalApp\Resources\en-US\Resources.resw
 
-        src\cascadia\TerminalApp\Resources\en-US\ContextMenu.resw
-
         src\cascadia\TerminalControl\Resources\en-US\Resources.resw
 
         src\cascadia\TerminalConnection\Resources\en-US\Resources.resw
@@ -146,6 +121,8 @@ jobs:
 
         src\cascadia\TerminalSettingsEditor\Resources\en-US\Resources.resw
 
+        src\cascadia\WindowsTerminalUniversal\Resources\en-US\Resources.resw
+
         src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw
       appendRelativeDir: true
       localizationTarget: false
@@ -159,24 +136,25 @@ jobs:
 
         $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
       pwsh: true
-  - task: PowerShell@2
-    displayName: Copy the Context Menu Loc Resources to CascadiaPackage
-    inputs:
-      filePath: ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
-      pwsh: true
   - task: PowerShell@2
     displayName: Generate NOTICE.html from NOTICE.md
     inputs:
       filePath: .\build\scripts\Generate-ThirdPartyNotices.ps1
       arguments: -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
       pwsh: true
+  - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
+    - task: PowerShell@2
+      displayName: Restore PGO Database
+      inputs:
+        filePath: tools/PGODatabase/restore-pgodb.ps1
+        workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
   - ${{ if eq(parameters.buildTerminal, true) }}:
     - task: VSBuild@1
       displayName: Build solution **\OpenConsole.sln
-      condition: true
       inputs:
         solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /t:Terminal\CascadiaPackage /p:WindowsTerminalReleaseBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
+        vsVersion: 16.0
+        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /t:Terminal\CascadiaPackage;Terminal\WindowsTerminalUniversal /p:WindowsTerminalReleaseBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
         platform: $(BuildPlatform)
         configuration: $(BuildConfiguration)
         clean: true
@@ -188,6 +166,20 @@ jobs:
       inputs:
         PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
         ArtifactName: binlog-$(BuildPlatform)
+    - ${{ if eq(parameters.pgoBuildMode, 'Optimize') }}:
+      - task: PowerShell@2
+        displayName: Validate binaries are optimized
+        condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
+        inputs:
+          targetType: inline
+          script: >-
+            $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
+
+            foreach ($BinFile in $Binaries) {
+
+              & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/src/cascadia/CascadiaPackage/bin/$(BuildPlatform)/$(BuildConfiguration)/$BinFile"
+
+            }
     - task: PowerShell@2
       displayName: Check MSIX for common regressions
       inputs:
@@ -200,26 +192,21 @@ jobs:
   - ${{ if eq(parameters.buildWPF, true) }}:
     - task: VSBuild@1
       displayName: Build solution **\OpenConsole.sln for PublicTerminalCore
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
       inputs:
         solution: '**\OpenConsole.sln'
+        vsVersion: 16.0
         msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
         platform: $(BuildPlatform)
         configuration: $(BuildConfiguration)
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for ConPTY
-      inputs:
-        solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Conhost\Host_EXE;Conhost\winconpty_DLL
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
   - task: PowerShell@2
     displayName: Source Index PDBs
     inputs:
       filePath: build\scripts\Index-Pdbs.ps1
       arguments: -SearchDir '$(Build.SourcesDirectory)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
       errorActionPreference: silentlyContinue
-      pwsh: true
+  - task: ComponentGovernanceComponentDetection@0
+    displayName: Component Detection
   - task: PowerShell@2
     displayName: Run Unit Tests
     condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
@@ -236,89 +223,42 @@ jobs:
       arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
   - ${{ if eq(parameters.buildTerminal, true) }}:
     - task: CopyFiles@2
-      displayName: Copy *.msix and symbols to Artifacts
+      displayName: Copy *.appx/*.msix to Artifacts
       inputs:
         Contents: >-
+          **/*.appx
+
           **/*.msix
 
           **/*.appxsym
+
+          !**/Microsoft.VCLibs*.appx
         TargetFolder: $(Build.ArtifactStagingDirectory)/appx
         OverWrite: true
         flattenFolders: true
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/appx'
-
-    - pwsh: |-
-        $Package = (Get-ChildItem "$(Build.ArtifactStagingDirectory)/appx" -Recurse -Filter "Cascadia*.msix" | Select -First 1)
-        $PackageFilename = $Package.FullName
-        Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        & "$(MakeAppxPath)" unpack /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
-      displayName: Unpack the new Terminal package for signing
-
-    - task: EsrpCodeSigning@1
-      displayName: Submit Terminal's binaries for signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Build.SourcesDirectory)\UnpackedTerminalPackage'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_Terminal.json'
-
-    - pwsh: |-
-        $PackageFilename = "$(WindowsTerminalPackagePath)"
-        Remove-Item "$(Build.SourcesDirectory)\UnpackedTerminalPackage\CodeSignSummary*"
-        & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
-      displayName: Re-pack the new Terminal package after signing
-
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifact (appx)
       inputs:
         PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
         ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)
-
-    - pwsh: |-
-        $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination "$(Build.ArtifactStagingDirectory)/unpackaged"
-      displayName: Build Unpackaged Distribution
-
-    - publish: $(Build.ArtifactStagingDirectory)/unpackaged
-      artifact: unpackaged-$(BuildPlatform)-$(BuildConfiguration)
-      displayName: Publish Artifact (unpackaged)
-
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy ConPTY to Artifacts
-      inputs:
-        Contents: |-
-          $(Build.SourcesDirectory)/bin/**/conpty.dll
-          $(Build.SourcesDirectory)/bin/**/conpty.lib
-          $(Build.SourcesDirectory)/bin/**/conpty.pdb
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.exe
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.pdb
-        TargetFolder: $(Build.ArtifactStagingDirectory)/conpty
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (ConPTY)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/conpty
-        ArtifactName: conpty-dll-$(BuildPlatform)-$(BuildConfiguration)
   - ${{ if eq(parameters.buildWPF, true) }}:
     - task: CopyFiles@2
       displayName: Copy PublicTerminalCore.dll to Artifacts
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
       inputs:
         Contents: >-
           **/PublicTerminalCore.dll
+
+          **/api-ms-win-core-synch-l1-2-0.dll
         TargetFolder: $(Build.ArtifactStagingDirectory)/wpf
         OverWrite: true
         flattenFolders: true
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifact (PublicTerminalCore)
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
       inputs:
         PathtoPublish: $(Build.ArtifactStagingDirectory)/wpf
         ArtifactName: wpf-dll-$(BuildPlatform)-$(BuildConfiguration)
-
   - task: PublishSymbols@2
     displayName: Publish symbols path
     continueOnError: True
@@ -330,52 +270,44 @@ jobs:
       IndexSources: false
       SymbolServerType: TeamServices
 
-- ${{ if eq(parameters.runCompliance, true) }}:
-  - template: ./templates/build-console-compliance-job.yml
-
 - ${{ if eq(parameters.buildTerminal, true) }}:
   - job: BundleAndSign
     displayName: Create and sign AppX/MSIX bundles
-    variables:
-      ${{ if eq(parameters.branding, 'Release') }}:
-        BundleStemName: Microsoft.WindowsTerminal
-      ${{ elseif eq(parameters.branding, 'Preview') }}:
-        BundleStemName: Microsoft.WindowsTerminalPreview
-      ${{ else }}:
-        BundleStemName: WindowsTerminalDev
     dependsOn: Build
     steps:
     - checkout: self
       clean: true
-      fetchDepth: 1
       submodules: true
       persistCredentials: True
     - task: PkgESSetupBuild@12
       displayName: Package ES - Setup Build
       inputs:
         disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts ${{ platform }}
-        inputs:
-          artifactName: appx-${{ platform }}-Release
-    # Add 3000 to the major version component, but only for the bundle.
-    # This is to ensure that it is newer than "2022.xx.yy.zz" or whatever the original bundle versions were before
-    # we switched to uniform naming.
-    - pwsh: |-
-        $VersionEpoch = 3000
-        $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
-        $Components[0] = ([int]$Components[0] + $VersionEpoch)
-        $BundleVersion = $Components -Join "."
-        New-Item -Type Directory "$(System.ArtifactsDirectory)\bundle"
-        .\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Artifacts (*.appx, *.msix)
+      inputs:
+        downloadType: specific
+        itemPattern: >-
+          **/*.msix
+
+          **/*.appx
+        extractTars: false
+    - task: PowerShell@2
       displayName: Create WindowsTerminal*.msixbundle
+      inputs:
+        filePath: build\scripts\Create-AppxBundle.ps1
+        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion 0.0.0.0 -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
+    - task: PowerShell@2
+      displayName: Create WindowsTerminalUniversal*.msixbundle
+      inputs:
+        filePath: build\scripts\Create-AppxBundle.ps1
+        arguments: -InputPath "$(System.ArtifactsDirectory)" -ProjectName WindowsTerminalUniversal -BundleVersion $(XES_APPXMANIFESTVERSION) -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminalUniversal_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
     - task: EsrpCodeSigning@1
       displayName: Submit *.msixbundle to ESRP for code signing
       inputs:
         ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)\bundle
-        Pattern: $(BundleStemName)*.msixbundle
+        FolderPath: $(System.ArtifactsDirectory)
+        Pattern: Microsoft.WindowsTerminal*.msixbundle
         UseMinimatch: true
         signConfigType: inlineSignParams
         inlineOperation: >-
@@ -404,104 +336,12 @@ jobs:
                   "ToolVersion": "1.0"
               }
           ]
-
     - task: PublishBuildArtifacts@1
       displayName: 'Publish Artifact: appxbundle-signed'
       inputs:
-        PathtoPublish: $(System.ArtifactsDirectory)\bundle
+        PathtoPublish: $(System.ArtifactsDirectory)
         ArtifactName: appxbundle-signed
 
-- ${{ if eq(parameters.buildConPTY, true) }}:
-  - job: PackageAndSignConPTY
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (ConPTY)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download ${{ platform }} ConPTY binaries
-        inputs:
-          artifactName: conpty-dll-${{ platform }}-$(BuildConfiguration)
-          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
-          extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts around
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: |-
-          Get-ChildItem bin -Recurse -Directory -Filter conpty-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-          Move-Item bin\x86 bin\Win32
-
-    - task: EsrpCodeSigning@1
-      displayName: Submit ConPTY libraries and OpenConsole for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Build.SourcesDirectory)/bin'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_ConPTY.json'
-
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet pack
-      inputs:
-        command: pack
-        packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
-        packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
-        versioningScheme: byEnvVar
-        versionEnvVar: XES_PACKAGEVERSIONNUMBER
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (nupkg)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
-        ArtifactName: conpty-nupkg-$(BuildConfiguration)
-
-
 - ${{ if eq(parameters.buildWPF, true) }}:
   - job: PackageAndSignWPF
     strategy:
@@ -514,33 +354,37 @@ jobs:
     steps:
     - checkout: self
       clean: true
-      fetchDepth: 1
       submodules: true
       persistCredentials: True
     - task: PkgESSetupBuild@12
       displayName: Package ES - Setup Build
       inputs:
         disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download ${{ platform }} PublicTerminalCore
-        inputs:
-          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)
-          itemPattern: '**/*.dll'
-          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
-          extractTars: false
+    - task: DownloadBuildArtifacts@0
+      displayName: Download x86 PublicTerminalCore
+      inputs:
+        artifactName: wpf-dll-x86-$(BuildConfiguration)
+        itemPattern: '**/*.dll'
+        downloadPath: bin\Win32\$(BuildConfiguration)\
+        extractTars: false
+    - task: DownloadBuildArtifacts@0
+      displayName: Download x64 PublicTerminalCore
+      inputs:
+        artifactName: wpf-dll-x64-$(BuildConfiguration)
+        itemPattern: '**/*.dll'
+        downloadPath: bin\x64\$(BuildConfiguration)\
+        extractTars: false
     - task: PowerShell@2
-      displayName: Move downloaded artifacts around
+      displayName: Move downloaded artifacts up a level
       inputs:
         targetType: inline
         # Find all artifact files and move them up a directory. Ugh.
-        script: |-
+        script: >-
           Get-ChildItem bin -Recurse -Directory -Filter wpf-dll-* | % {
             $_ | Get-ChildItem -Recurse -File | % {
               Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
             }
           }
-          Move-Item bin\x86 bin\Win32
     - task: NuGetToolInstaller@1
       displayName: Use NuGet 5.10.0
       inputs:
@@ -554,6 +398,7 @@ jobs:
       displayName: Build solution **\OpenConsole.sln for WPF Control
       inputs:
         solution: '**\OpenConsole.sln'
+        vsVersion: 16.0
         msbuildArgs: /p:WindowsTerminalReleaseBuild=$(UseReleaseBranding);Version=$(XES_PACKAGEVERSIONNUMBER) /t:Pack
         platform: Any CPU
         configuration: $(BuildConfiguration)
@@ -607,71 +452,6 @@ jobs:
         PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
         ArtifactName: wpf-nupkg-$(BuildConfiguration)
 
-- ${{ if eq(parameters.publishSymbolsToPublic, true) }}:
-  - job: PublishSymbols
-    displayName: Publish Symbols
-    dependsOn: BundleAndSign
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-
-    - template: .\templates\restore-nuget-steps.yml
-
-    # Download the appx-PLATFORM-CONFIG-VERSION artifact for every platform/version combo
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Symbols ${{ platform }}
-        inputs:
-          artifactName: appx-${{ platform }}-Release
-
-    # It seems easier to do this -- download every appxsym -- then enumerate all the PDBs in the build directory for the
-    # public symbol push. Otherwise, we would have to list all of the PDB files one by one.
-    - pwsh: |-
-        mkdir $(Build.SourcesDirectory)/appxsym-temp
-        Get-ChildItem "$(System.ArtifactsDirectory)" -Filter *.appxsym -Recurse | % {
-          $src = $_.FullName
-          $dest = Join-Path "$(Build.SourcesDirectory)/appxsym-temp/" $_.Name
-
-          mkdir $dest
-          Write-Host "Extracting $src to $dest..."
-          tar -x -v -f $src -C $dest
-        }
-      displayName: Extract symbols for public consumption
-
-    - task: PowerShell@2
-      displayName: Source Index PDBs (the public ones)
-      inputs:
-        filePath: build\scripts\Index-Pdbs.ps1
-        arguments: -SearchDir '$(Build.SourcesDirectory)/appxsym-temp' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-        pwsh: true
-
-    # Publish the app symbols to the public MSDL symbol server
-    # accessible via https://msdl.microsoft.com/download/symbols
-    - task: PublishSymbols@2
-      displayName: 'Publish app symbols to MSDL'
-      inputs:
-        symbolsFolder: '$(Build.SourcesDirectory)/appxsym-temp'
-        searchPattern: '**/*.pdb'
-        SymbolsMaximumWaitTime: 30
-        SymbolServerType: 'TeamServices'
-        SymbolsProduct: 'Windows Terminal Application Binaries'
-        SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-        # The ADO task does not support indexing of GitHub sources.
-        indexSources: false
-        detailedLog: true
-      # There is a bug which causes this task to fail if LIB includes an inaccessible path (even though it does not depend on it).
-      # To work around this issue, we just force LIB to be any dir that we know exists.
-      # Copied from https://github.com/microsoft/icu/blob/f869c214adc87415dfe751d81f42f1bca55dcf5f/build/azure-nuget.yml#L564-L583
-      env:
-        LIB: $(Build.SourcesDirectory)
-        ArtifactServices_Symbol_AccountName: microsoftpublicsymbols
-        ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)
-
-
 - ${{ if eq(parameters.buildTerminalVPack, true) }}:
   - job: VPack
     displayName: Create Windows vPack
@@ -679,7 +459,6 @@ jobs:
     steps:
     - checkout: self
       clean: true
-      fetchDepth: 1
       submodules: true
     - task: PkgESSetupBuild@12
       displayName: Package ES - Setup Build
@@ -710,19 +489,7 @@ jobs:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       inputs:
         sourceDirectory: $(System.ArtifactsDirectory)\appxbundle-signed\WindowsTerminal.app
-        description: VPack for the Windows Terminal Application
+        description: Windows Terminal pre-install application
         pushPkgName: WindowsTerminal.app
-        owner: conhost
-        githubToken: $(GitHubTokenForVpackProvenance)
-    - task: PublishPipelineArtifact@1
-      displayName: 'Copy VPack Manifest to Drop'
-      inputs:
-        targetPath: $(XES_VPACKMANIFESTDIRECTORY)
-        artifactName: VPackManifest
-    - task: PkgESFCIBGit@12
-      displayName: 'Submit VPack Manifest to Windows'
-      inputs:
-        configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-        artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-        prTimeOut: 5
+        owner: condev
 ...

build/pipelines/templates/build-console-audit-job.yml

@@ -8,25 +8,39 @@ jobs:
   variables:
     BuildConfiguration: AuditMode
     BuildPlatform: ${{ parameters.platform }}
-  pool:
+  pool: 
     ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-latest
 
   steps:
   - checkout: self
     submodules: true
     clean: true
-    fetchDepth: 1
 
-  - template: restore-nuget-steps.yml
+  - task: NuGetToolInstaller@0
+    displayName: Ensure NuGet 4.8.1
+    inputs:
+      versionSpec: 4.8.1
+
+  # 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
+    inputs:
+      command: restore
+      feedsToUse: config
+      configPath: NuGet.config
+      restoreSolution: OpenConsole.sln
+      restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
   - task: VSBuild@1
     displayName: 'Build solution **\OpenConsole.sln'
     inputs:
       solution: '**\OpenConsole.sln'
+      vsVersion: 16.0
       platform: '$(BuildPlatform)'
       configuration: '$(BuildConfiguration)'
       msbuildArgs: ${{ parameters.additionalBuildArguments }}

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

@@ -1,23 +1,22 @@
 parameters:
   configuration: 'Release'
-  branding: 'Dev'
   platform: ''
   additionalBuildArguments: ''
+  minimumExpectedTestsExecutedCount: 10  # Sanity check for minimum expected tests to be reported
+  rerunPassesRequiredToAvoidFailure: 5
 
 jobs:
-- job: Build${{ parameters.platform }}${{ parameters.configuration }}${{ parameters.branding }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }} ${{ parameters.branding }}
+- job: Build${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
   variables:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
-    WindowsTerminalBranding: ${{ parameters.branding }}
-    EnableRichCodeNavigation: true
-  pool:
+  pool: 
     ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-latest
 
   steps:
   - template: build-console-steps.yml
@@ -29,3 +28,21 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     condition: and(succeededOrFailed(), not(eq(variables['Build.Reason'], 'PullRequest')))
+
+- 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'
+    platform: ${{ parameters.platform }}
+    configuration: ${{ parameters.configuration }}
+    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-compliance-job.yml

@@ -1,203 +0,0 @@
-jobs:
-- job: Compliance
-  # We don't *need* a matrix but there's no other way to set parameters on a "job"
-  # in the AzDO YAML syntax. It would have to be a "stage" or a "template".
-  # Doesn't matter. We're going to do compliance on Release x64 because
-  # that's the one all the tooling works against for sure.
-  strategy:
-    matrix:
-      Release_x64:
-        BuildConfiguration: Release
-        BuildPlatform: x64
-  displayName: Validate Security and Compliance
-  timeoutInMinutes: 240
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - task: PowerShell@2
-    displayName: Rationalize Build Platform
-    inputs:
-      targetType: inline
-      script: >-
-        $Arch = "$(BuildPlatform)"
-
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
-
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-  - template: restore-nuget-steps.yml
-  - task: UniversalPackages@0
-    displayName: Download terminal-internal Universal Package
-    inputs:
-      feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-      packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-      versionListDownload: $(TerminalInternalPackageVersion)
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: >-
-        src\cascadia\TerminalApp\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalControl\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalConnection\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsModel\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsEditor\Resources\en-US\Resources.resw
-
-        src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      pseudoSetting: Included
-  - task: PowerShell@2
-    displayName: Move Loc files one level up
-    inputs:
-      targetType: inline
-      script: >-
-        $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-
-        $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-      pwsh: true
-
-  # 1ES Component Governance onboarding (Detects open source components). See https://docs.opensource.microsoft.com/tools/cg.html
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: Component Detection
-
-  # # PREfast and PoliCheck need Node. Install that first.
-  - task: NodeTool@0
-
-  # !!! NOTE !!! Run PREfast first. Some of the other tasks are going to run on a completed build.
-  # PREfast is going to build the code as a part of its analysis and the generated sources
-  # and output binaries will be sufficient for the rest of the analysis.
-  # If you disable this, the other tasks won't likely work. You would have to add a build
-  # step instead that builds the code normally before calling them.
-  # Also... PREfast will rebuild anyway so that's why we're not running a normal build first.
-  # Waste of time to build twice.
-  # PREfast. See https://www.1eswiki.com/wiki/SDL_Native_Rules_Build_Task
-
-  # The following 1ES tasks all operate completely differently and have a different syntax for usage.
-  # Most notable is every one of them has a different way of excluding things.
-  # Go see their 1eswiki.com pages to figure out how to exclude things.
-  # When writing exclusions, try to make them narrow so when new projects/binaries are added, they
-  # cause an error here and have to be explicitly pulled out. Don't write an exclusion so broad
-  # that it will catch other new stuff.
-
-  # https://www.1eswiki.com/wiki/PREfast_Build_Task
-  # Builds the project with C/C++ static analysis tools to find coding flaws and vulnerabilities
-  # !!! WARNING !!! It doesn't work with WAPPROJ packaging projects. Build the sub-projects instead.
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@3
-    displayName: 'Run the PREfast SDL Native Rules for MSBuild'
-    condition: succeededOrFailed()
-    inputs:
-      setupCommandlines: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsMSBuildCmd.bat"'
-      msBuildCommandline: msbuild.exe /nologo /m /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }} /p:WindowsTerminalReleaseBuild=true /p:platform=$(BuildPlatform) /p:configuration=$(BuildConfiguration) /t:Terminal\Window\WindowsTerminal /p:VisualStudioVersion=17.0 $(Build.SourcesDirectory)\OpenConsole.sln
-      msBuildVersion: "17.0"
-
-  # Copies output from PREfast SDL Native Rules task to expected location for consumption by PkgESSecComp
-  - task: CopyFiles@1
-    displayName: 'Copy PREfast xml files to SDLNativeRulesDir'
-    inputs:
-      SourceFolder: '$(Agent.BuildDirectory)'
-      Contents: |
-        **\*.nativecodeanalysis.xml
-      TargetFolder: '$(Agent.BuildDirectory)\_sdt\logs\SDLNativeRules'
-
-  # https://www.1eswiki.com/index.php?title=PoliCheck_Build_Task
-  # Scans the text of source code, comments, and content for terminology that could be sensitive for legal, cultural, or geopolitical reasons.
-  # (Also finds vulgarities... takes all the fun out of everything.)
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
-    displayName: 'Run PoliCheck'
-    inputs:
-      targetType: F
-      targetArgument: $(Build.SourcesDirectory)
-      result: PoliCheck.xml
-      optionsFC: 1
-      optionsXS: 1
-      optionsUEPath: $(Build.SourcesDirectory)\build\config\PolicheckExclusions.xml
-      optionsHMENABLE: 0
-    continueOnError: true
-
-  # https://www.1eswiki.com/wiki/CredScan_Azure_DevOps_Build_Task
-  # Searches through source code and build outputs for a credential left behind in the open
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
-    displayName: 'Run CredScan'
-    inputs:
-      outputFormat: pre
-      # suppressionsFile: LocalSuppressions.json
-      batchSize: 20
-      debugMode: false
-    continueOnError: true
-
-  # https://www.1eswiki.com/wiki/BinSkim_Build_Task
-  # Searches managed and unmanaged binaries for known security vulnerabilities.
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
-    displayName: 'Run BinSkim'
-    inputs:
-      TargetPattern: guardianGlob
-      # See https://aka.ms/gdn-globs for how to do match patterns
-      AnalyzeTargetGlob: $(Build.SourcesDirectory)\bin\**\*.dll;$(Build.SourcesDirectory)\bin\**\*.exe;-:file|**\Microsoft.UI.Xaml.dll;-:file|**\Microsoft.Toolkit.Win32.UI.XamlHost.dll;-:file|**\vcruntime*.dll;-:file|**\vcomp*.dll;-:file|**\vccorlib*.dll;-:file|**\vcamp*.dll;-:file|**\msvcp*.dll;-:file|**\concrt*.dll;-:file|**\TerminalThemeHelpers*.dll
-    continueOnError: true
-
-  # Set XES_SERIALPOSTBUILDREADY to run Security and Compliance task once per build
-  - powershell: Write-Host "##vso[task.setvariable variable=XES_SERIALPOSTBUILDREADY;]true"
-    displayName: 'Set XES_SERIALPOSTBUILDREADY Vars'
-
-  # https://www.osgwiki.com/wiki/Package_ES_Security_and_Compliance
-  # Does a few things:
-  # - Ensures that Windows-required compliance tasks are run either inside this task
-  #   or were run as a previous step prior to this one
-  #   (PREfast, PoliCheck, Credscan)
-  # - Runs Windows-specific compliance tasks inside the task
-  #   + CheckCFlags - ensures that compiler and linker flags meet Windows standards
-  #   + CFGCheck/XFGCheck - ensures that Control Flow Guard (CFG) or
-  #                         eXtended Flow Guard (XFG) are enabled on binaries
-  #                         NOTE: CFG is deprecated and XFG isn't fully ready yet.
-  #                         NOTE2: CFG fails on an XFG'd binary
-  # - Brokers all security/compliance task logs to "Trust Services Automation (TSA)" (https://aka.ms/tsa)
-  #   which is a system that maps all errors into the appropriate bug database
-  #   template for each organization since they all vary. It should also suppress
-  #   new bugs when one already exists for the product.
-  #   This one is set up to go to the OS repository and use the given parameters
-  #   to file bugs to our AzDO product path.
-  #   If we don't use PkgESSecComp to do this for us, we need to install the TSA task
-  #   ourselves in this pipeline to finalize data upload and bug creation.
-  # !!! NOTE !!! This task goes *LAST* after any other compliance tasks so it catches their logs
-  - task: PkgESSecComp@10
-    displayName: 'Security and Compliance tasks'
-    inputs:
-      fileNewBugs: false
-      areaPath: 'OS\WDX\DXP\WinDev\Terminal'
-      teamProject: 'OS'
-      iterationPath: 'OS\Future'
-      bugTags: 'TerminalReleaseCompliance'
-      scanAll: true
-      errOnBugs: false
-      failOnStdErr: true
-      taskLogVerbosity: Diagnostic
-      secCompConfigFromTask: |
-        # Overrides default build sources directory
-        sourceTargetOverrideAll: $(Build.SourcesDirectory)
-        # Overrides default build binaries directory when "Scan all" option is specified
-        binariesTargetOverrideAll: $(Build.SourcesDirectory)\bin
-
-        # Set the tools to false if they should not run in the build
-        tools:
-            - toolName: CheckCFlags
-              enable: true
-            - toolName: CFGCheck
-              enable: true
-            - toolName: Policheck
-              enable: false
-            - toolName: CredScan
-              enable: false
-            - toolName: XFGCheck
-              enable: false

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

@@ -1,90 +0,0 @@
-parameters:
-  configuration: 'Fuzzing'
-  platform: ''
-  additionalBuildArguments: ''
-
-jobs:
-- job: Build${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - checkout: self
-    submodules: true
-    clean: true
-
-  - template: restore-nuget-steps.yml
-
-  # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
-  - script: |
-      "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
-      set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
-      del %TEMP%\vsinstalldir.txt
-      call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
-      echo VCToolsInstallDir = %VCToolsInstallDir%
-      echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
-    displayName: 'Retrieve VC tools directory'
-
-  - task: VSBuild@1
-    displayName: 'Build solution **\OpenConsole.sln'
-    inputs:
-      solution: '**\OpenConsole.sln'
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      msbuildArgs: "${{ parameters.additionalBuildArguments }}"
-      clean: true
-      maximumCpuCount: true
-
-  - task: PowerShell@2
-    displayName: 'Rationalize build platform'
-    inputs:
-      targetType: inline
-      script: |
-        $Arch = "$(BuildPlatform)"
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-
-  - 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 outputs needed for test runs to Artifacts'
-    inputs:
-      Contents: |
-       $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.exe
-       $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.dll
-       $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.xml
-       **/Microsoft.VCLibs.*.appx
-       **/TestHostApp/*.exe
-       **/TestHostApp/*.dll
-       **/TestHostApp/*.xml
-       !**/*.pdb
-       !**/*.ipdb
-       !**/*.obj
-       !**/*.pch
-      TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
-      OverWrite: true
-      flattenFolders: true
-    condition: succeeded()
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish All Build Artifacts'
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-      ArtifactName: 'fuzzingBuildOutput'

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

@@ -12,17 +12,17 @@ jobs:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
     PGOBuildMode: 'Instrument'
-  pool:
+  pool: 
     ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-latest
 
   steps:
   - template: build-console-steps.yml
     parameters:
-      additionalBuildArguments: '${{ parameters.additionalBuildArguments }}'
+      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
 
 - template: helix-runtests-job.yml
   parameters:
@@ -34,7 +34,7 @@ jobs:
     configuration: ${{ parameters.configuration }}
     platform: ${{ parameters.platform }}
     rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
-
+    
 - template: helix-processtestresults-job.yml
   parameters:
     name: 'ProcessTestResults'
@@ -52,4 +52,3 @@ jobs:
     - ProcessTestResults
     pgoArtifact: 'PGO'
     platform: ${{ parameters.platform }}
-    configuration: ${{ parameters.configuration }}

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

@@ -1,13 +1,36 @@
 parameters:
   additionalBuildArguments: ''
+  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
 
 steps:
 - checkout: self
   submodules: true
   clean: true
-  fetchDepth: 1
 
-- template: restore-nuget-steps.yml
+- task: NuGetToolInstaller@0
+  displayName: 'Use NuGet 5.2.0'
+  inputs:
+    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 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'
 
 # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
 - script: |
@@ -24,13 +47,22 @@ steps:
   inputs:
     filename: 'set'
 
+- task: powershell@2
+  displayName: 'Restore PGO database'
+  condition: eq(variables['PGOBuildMode'], 'Optimize')
+  inputs:
+    targetType: filePath
+    workingDirectory: $(Build.SourcesDirectory)\tools\PGODatabase
+    filePath: $(Build.SourcesDirectory)\tools\PGODatabase\restore-pgodb.ps1
+
 - task: VSBuild@1
   displayName: 'Build solution **\OpenConsole.sln'
   inputs:
     solution: '**\OpenConsole.sln'
+    vsVersion: 16.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: "${{ parameters.additionalBuildArguments }} /p:PGOBuildMode=$(PGOBuildMode) /bl:$(Build.SourcesDirectory)\\msbuild.binlog"
+    msbuildArgs: "${{ parameters.additionalBuildArguments }}"
     clean: true
     maximumCpuCount: true
 
@@ -63,25 +95,79 @@ steps:
       If ($Arch -Eq "x86") { $Arch = "Win32" }
       Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
 
+- task: PowerShell@2
+  displayName: 'Validate binaries are optimized'
+  condition: eq(variables['pgoBuildMode'], 'Optimize')
+  inputs:
+    targetType: inline
+    script: |
+      $Binaries = 'OpenConsole.exe', 'WindowsTerminal.exe', 'TerminalApp.dll', 'TerminalConnection.dll', 'Microsoft.Terminal.Control.dll', 'Microsoft.Terminal.Remoting.dll', 'Microsoft.Terminal.Settings.Editor.dll', 'Microsoft.Terminal.Settings.Model.dll'
+      foreach ($BinFile in $Binaries)
+      {
+        & "$(Build.SourcesDirectory)\tools\PGODatabase\verify-pgo.ps1" "$(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/$BinFile"
+      }
+
+- task: PowerShell@2
+  displayName: 'Run Unit Tests'
+  inputs:
+    targetType: filePath
+    filePath: build\scripts\Run-Tests.ps1
+    arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}'
+  condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
+
+- task: PowerShell@2
+  displayName: 'Run Feature Tests (x64 only)'
+  inputs:
+    targetType: filePath
+    filePath: build\scripts\Run-Tests.ps1
+    arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}'
+  condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), 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: and(ne(variables['PGOBuildMode'], 'Instrument'),or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
+
+- task: PublishTestResults@2
+  displayName: 'Upload converted test logs'
+  condition: ne(variables['PGOBuildMode'], 'Instrument')
+  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 *.msix to Artifacts'
+  displayName: 'Copy result logs to Artifacts'
   inputs:
     Contents: |
-     **/*.msix
-     **/*.appxsym
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/appx'
+     **/*.wtl
+     **/*onBuildMachineResults.xml
+     ${{ parameters.testLogPath }}
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
     OverWrite: true
     flattenFolders: true
 
-- pwsh: |-
-    $TerminalMsixPath = (Get-Item "$(Build.ArtifactStagingDirectory)\appx\Cascadia*.msix").FullName
-    $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-    & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $TerminalMsixPath -XamlAppX $XamlAppxPath -Destination "$(Build.ArtifactStagingDirectory)/unpackaged"
-  displayName: Build Unpackaged Distribution
-
-- publish: $(Build.ArtifactStagingDirectory)/unpackaged
-  artifact: unpackaged-$(BuildPlatform)-$(BuildConfiguration)
-  displayName: Publish Artifact (unpackaged)
+- task: CopyFiles@2
+  displayName: 'Copy *.appx/*.msix to Artifacts (Non-PR builds only)'
+  inputs:
+    Contents: |
+     **/*.appx
+     **/*.msix
+     **/*.appxsym
+     !**/Microsoft.VCLibs*.appx
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/appx'
+    OverWrite: true
+    flattenFolders: true
+  condition: succeeded()
 
 - task: CopyFiles@2
   displayName: 'Copy outputs needed for test runs to Artifacts'
@@ -91,8 +177,6 @@ steps:
      $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.dll
      $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.xml
      **/Microsoft.VCLibs.*.appx
-     **/*unit.test*.dll
-     **/*unit.test*.manifest
      **/TestHostApp/*.exe
      **/TestHostApp/*.dll
      **/TestHostApp/*.xml
@@ -109,7 +193,7 @@ steps:
   displayName: 'Publish All Build Artifacts'
   inputs:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-    ArtifactName: 'drop'
+    ArtifactName: 'drop'  
 
 - task: CopyFiles@2
   displayName: 'Copy PGO databases needed for PGO instrumentation run'
@@ -127,11 +211,3 @@ steps:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/PGO'
     ArtifactName: 'PGO'
   condition: and(succeeded(), eq(variables['PGOBuildMode'], 'Instrument'))
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: binlog'
-  condition: always()
-  continueOnError: True
-  inputs:
-    PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
-    ArtifactName: binlog-$(BuildPlatform)

build/pipelines/templates/check-formatting.yml

@@ -2,7 +2,7 @@
 jobs:
 - job: CodeFormatCheck
   displayName: Proper Code Formatting Check
-  pool: { vmImage: windows-2022 }
+  pool: { vmImage: windows-2019 }
 
   steps:
   - checkout: self
@@ -11,7 +11,7 @@ jobs:
     clean: true
 
   - task: PowerShell@2
-    displayName: 'Code Formatting Check'
+    displayName: 'Code Formattting Check'
     inputs:
       targetType: filePath
       filePath: '.\build\scripts\Invoke-FormattingCheck.ps1'

build/pipelines/templates/codenav-indexer.yml

@@ -1,22 +0,0 @@
-parameters:
-  artifactName: 'drop'
-
-jobs:
-- job: CodeNavIndexer
-  displayName: Run Github CodeNav Indexer
-  pool: { vmImage: windows-2019 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    submodules: false
-    clean: true
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-
-  - task: RichCodeNavIndexer@0
-    inputs:
-      languages: 'cpp,csharp'
-    continueOnError: true

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

@@ -1,25 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  minimumExpectedTestsExecutedCount: 10  # Sanity check for minimum expected tests to be reported
-  rerunPassesRequiredToAvoidFailure: 5
-
-jobs:
-- template: helix-runtests-job.yml
-  parameters:
-    name: 'RunTestsInHelix'
-    # We're not setting dependsOn as we want to rely on the "stage" dependency above us
-    testSuite: 'DevTestSuite'
-    platform: ${{ parameters.platform }}
-    configuration: ${{ parameters.configuration }}
-    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
-    
-- template: helix-processtestresults-job.yml
-  parameters:
-    dependsOn:
-    - RunTestsInHelix
-    # the default condition is succeededOrFailed(), and the "stage" condition ensures we only run as needed
-    platform: ${{ parameters.platform }}
-    configuration: ${{ parameters.configuration }}
-    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
-    minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }}

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

@@ -8,7 +8,6 @@ parameters:
 
 jobs:
 - job: ProcessTestResults
-  displayName: Process Helix Results ${{ parameters.platform }} ${{ parameters.configuration }}
   condition: ${{ parameters.condition }}
   dependsOn: ${{ parameters.dependsOn }}
   pool:

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

@@ -14,12 +14,11 @@ parameters:
   platform: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  openHelixTargetQueues: 'windows.11.amd64.client.open.reunion'
-  closedHelixTargetQueues: 'windows.11.amd64.client.reunion'
+  openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}
-  displayName: Submit Helix ${{ parameters.platform }} ${{ parameters.configuration }}
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.condition }}
   pool:
@@ -43,9 +42,9 @@ jobs:
       filename: 'set'
 
   - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 6.3.0'
+    displayName: 'Use NuGet 5.2.0'
     inputs:
-      versionSpec: 6.3.0
+      versionSpec: 5.2.0
 
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet restore build/Helix/packages.config'

build/pipelines/templates/install-winsdk-steps.yml

@@ -0,0 +1,9 @@
+parameters:
+  sdkVersion: 18362
+steps:
+  - task: powershell@2
+    inputs:
+      targetType: filePath
+      filePath: build\scripts\Install-WindowsSdkISO.ps1
+      arguments: ${{ parameters.sdkVersion }}
+    displayName: 'Install Windows SDK (${{ parameters.sdkVersion }})'

build/pipelines/templates/pgo-build-and-publish-nuget-job.yml

@@ -11,7 +11,7 @@ jobs:
     vmImage: 'windows-2019'
   variables:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
-    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
+    pgoToolsPath: $(Build.SourcesDirectory)\tools\PGODatabase
     nuspecPath: $(pgoToolsPath)\NuSpecs
     nuspecFilename: PGO.nuspec
 
@@ -30,22 +30,28 @@ jobs:
     inputs:
       versionSpec: 5.8.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 for extraneous build actions
+  - task: CopyFiles@2
+    displayName: 'Copy pgd files to NuGet build directory'
     inputs:
-      command: restore
-      feedsToUse: config
-      configPath: NuGet.config
-      restoreSolution: build/packages.config
-      restoreDirectory: '$(Build.SourcesDirectory)\packages'
+      sourceFolder: $(artifactsPath)\${{ parameters.pgoArtifact }}
+      contents: '**\*.pgd'
+      targetFolder: $(nuspecPath)\tools
 
-  - task: MSBuild@1
-    displayName: 'Create PGO Nuget'
+  - task: powershell@2
+    displayName: 'Generate NuSpec file'
     inputs:
-      solution: $(pgoToolsPath)\PGO.DB.proj
-      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath)\${{ parameters.pgoArtifact }} /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
+      targetType: filePath
+      filePath: $(pgoToolsPath)\generate-nuspec.ps1
+      workingDirectory: $(pgoToolsPath)
+      arguments: $(nuspecPath)\$(nuspecFilename).template $(nuspecPath)\$(nuspecFilename)
+
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet pack'
+    inputs:
+      command: pack
+      packagesToPack: '$(nuspecPath)\$(nuspecFilename)'
+      basePath: '$(nuspecPath)'
+      packDestination: '$(Build.ArtifactStagingDirectory)'
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -63,4 +69,4 @@ jobs:
       # This is the name of that connection
       publishFeedCredentials: 'Terminal Public Artifact Feed'
       feedsToUse: config
-      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'

build/pipelines/templates/pgo-merge-pgd-job.yml

@@ -2,7 +2,6 @@ parameters:
   dependsOn: ''
   pgoArtifact: PGO
   platform: ''
-  configuration: ''
 
 jobs:
 - job: MergePGD
@@ -13,7 +12,6 @@ jobs:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
     pgoArtifactsPath: $(artifactsPath)\${{ parameters.pgoArtifact }}
     buildPlatform: ${{ parameters.platform }}
-    buildConfiguration: ${{ parameters.configuration }}
 
   steps:
   # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
@@ -26,36 +24,58 @@ jobs:
       echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
     displayName: 'Retrieve VC tools directory'
 
-  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 6.3.0'
-    inputs:
-      versionSpec: 6.3.0
-
-  - task: NuGetAuthenticate@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 for extraneous build actions
-    inputs:
-      command: restore
-      feedsToUse: config
-      configPath: NuGet.config
-      restoreSolution: build/packages.config
-      restoreDirectory: '$(Build.SourcesDirectory)\packages'
-
   - task: DownloadBuildArtifacts@0
     inputs:
       artifactName: ${{ parameters.pgoArtifact }}
       downloadPath: $(artifactsPath)
 
-  - task: MSBuild@1
-    displayName: Merge counts into PGD
-    inputs:
-      solution: $(Build.SourcesDirectory)\OpenConsole.sln
-      platform: $(buildPlatform)
-      configuration: $(buildConfiguration)
-      msbuildArguments: '/t:MergePGOCounts /p:PGOBuildMode=Instrument /p:PGDPath=$(pgoArtifactsPath)\$(buildPlatform) /p:PGCRootPath=$(pgoArtifactsPath)\$(buildPlatform)'
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge WindowsTerminal*.pgc WindowsTerminal.pgd
+    displayName: 'Merge Terminal pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge OpenConsole*.pgc OpenConsole.pgd
+    displayName: 'Merge OpenConsole pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Control*.pgc Microsoft.Terminal.Control.pgd
+    displayName: 'Merge Microsoft.Terminal.Control pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Remoting*.pgc Microsoft.Terminal.Remoting.pgd
+    displayName: 'Merge Microsoft.Terminal.Remoting pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Editor*.pgc Microsoft.Terminal.Settings.Editor.pgd
+    displayName: 'Merge Microsoft.Terminal.Settings.Editor pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Model*.pgc Microsoft.Terminal.Settings.Model.pgd
+    displayName: 'Merge Microsoft.Terminal.Settings.Model pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalApp*.pgc TerminalApp.pgd
+    displayName: 'Merge TerminalApp pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalConnection*.pgc TerminalConnection.pgd
+    displayName: 'Merge TerminalConnection pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
 
   - task: CopyFiles@2
     displayName: 'Copy merged pgd to artifact staging'
@@ -67,4 +87,4 @@ jobs:
   - task: PublishBuildArtifacts@1
     inputs:
       pathToPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: ${{ parameters.pgoArtifact }}
+      artifactName: ${{ parameters.pgoArtifact }}

build/pipelines/templates/restore-nuget-steps.yml

@@ -1,40 +0,0 @@
-steps:
-- task: NuGetToolInstaller@0
-  displayName: 'Use NuGet 6.3.0'
-  inputs:
-    versionSpec: 6.3.0
-
-- task: NuGetAuthenticate@0
-
-- script: |-
-    echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)
-  displayName: Ensure NuGet restores for $(BuildPlatform)
-
-# 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 for extraneous build actions
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: build/packages.config
-    restoreDirectory: '$(Build.SourcesDirectory)\packages'
-
-- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  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 global nuget
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: dep/nuget/packages.config
-    restoreDirectory: '$(Build.SourcesDirectory)\packages'

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

@@ -1,90 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: ''
-  artifactName: 'drop'
-  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-
-jobs:
-- job: Test${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - checkout: self
-    submodules: true
-    clean: true
-    fetchDepth: 1
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-
-  - task: PowerShell@2
-    displayName: 'Rationalize build platform'
-    inputs:
-      targetType: inline
-      script: |
-        $Arch = "$(BuildPlatform)"
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-
-  - task: PowerShell@2
-    displayName: 'Run Unit Tests'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(System.ArtifactsDirectory)\\${{ parameters.artifactName }}\\$(BuildConfiguration)\\$(BuildPlatform)\\test"
-    condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-
-  - task: PowerShell@2
-    displayName: 'Run Feature Tests (x64 only)'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(System.ArtifactsDirectory)\\${{ parameters.artifactName }}\\$(BuildConfiguration)\\$(BuildPlatform)\\test"
-    condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), 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: and(ne(variables['PGOBuildMode'], 'Instrument'),or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-
-  - task: PublishTestResults@2
-    displayName: 'Upload converted test logs'
-    condition: ne(variables['PGOBuildMode'], 'Instrument')
-    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-logs'
-      OverWrite: true
-      flattenFolders: true
-
-  - publish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test-logs'
-    artifact: TestLogs$(BuildPlatform)$(BuildConfiguration)

build/rules/Branding.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Preview'">WT_BRANDING_PREVIEW</_WTBrandingPreprocessorToken>
     <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Release'">WT_BRANDING_RELEASE</_WTBrandingPreprocessorToken>

build/rules/CollectWildcardResources.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
   </PropertyGroup>
 

build/rules/GenerateFeatureFlags.proj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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')" />
 
@@ -63,14 +63,8 @@
     Outputs="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
     DependsOnTargets="_GenerateBranchAndBrandingCache">
     <MakeDir Directories="$(OpenConsoleCommonOutDir)\inc" />
-    <!-- This commandline is escaped like:
-
-    powershell -Command "&'$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1' -Path '%(FeatureFlagFile.FullPath)'' -Branding $(_WTBrandingName)"
-
-    which was the only way I could find to get it to obey spaces in the SolutionDir
-    -->
     <Exec
-      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;&amp;&apos;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&apos; -Path &apos;%(FeatureFlagFile.FullPath)&apos; -Branding $(_WTBrandingName)&quot;"
+      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" />

build/rules/GenerateSxsManifestsFromWinmds.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BeforeLinkTargets Condition="'$(WindowsTargetPlatformVersion)' &gt;= '10.0.18362.0'">
       $(BeforeLinkTargets);

build/rules/Microsoft.UI.Xaml.Additional.targets

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains targets that override behavior in Microsoft.UI.Xaml and
-    related packages.
-
-    For example: All XAML needs is a reference to WebView2; it does not need the
-    DLL and it does not need for us to copy the WinMD into the output folder. It
-    also doesn't require the WebView2 loader since we're not actually using
-    WebView2. Therefore, we can get away with *not including the WebView2
-    package* and only adding a reference to its winmd.
-  -->
-  <ItemGroup>
-    <Reference Include="$(WebView2PackageRoot)\lib\Microsoft.Web.WebView2.Core.winmd" />
-  </ItemGroup>
-</Project>

build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1

@@ -1,34 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
-
-$LocalizationsFromContextMenu = Get-ChildItem ./src/cascadia/TerminalApp/Resources -Recurse -Filter ContextMenu.resw
-$Languages = [System.Collections.HashTable]::New()
-$LocalizationsFromContextMenu | ForEach-Object {
-	$Languages[$_.Directory.Name] = $_
-}
-
-ForEach ($pair in $Languages.GetEnumerator()) {
-	$LanguageDir = "./src/cascadia/CascadiaPackage/Resources/$($pair.Key)"
-	$ResPath = "$LanguageDir/Resources.resw"
-	$PreexistingResw = Get-Item $ResPath -EA:Ignore
-	If ($null -eq $PreexistingResw) {
-		Write-Host "Copying $($pair.Value.FullName) to $ResPath"
-		New-Item -type Directory $LanguageDir -EA:Ignore
-		Copy-Item $pair.Value.FullName $ResPath
-	} Else {
-		# Merge Them!
-		Write-Host "Merging $($pair.Value.FullName) into $ResPath"
-		$existingXml = [xml](Get-Content $PreexistingResw.FullName)
-		$newXml = [xml](Get-Content $pair.Value.FullName)
-		$newDataKeys = $newXml.root.data.name
-		$existingXml.root.data | % {
-			If ($_.name -in $newDataKeys) {
-				$null = $existingXml.root.RemoveChild($_)
-			}
-		}
-		$newXml.root.data | % {
-			$null = $existingXml.root.AppendChild($existingXml.ImportNode($_, $true))
-		}
-		$existingXml.Save($PreexistingResw.FullName)
-	}
-}

build/scripts/Create-AppxBundle.ps1

@@ -22,7 +22,7 @@ Param(
     [Parameter(HelpMessage="Path to makeappx.exe")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe"
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\MakeAppx.exe"
 )
 
 If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {

build/scripts/Index-Pdbs.ps1

@@ -8,11 +8,10 @@ Param(
     [switch]$recursive
 )
 
-$pdbStrPackage = ([xml](Get-Content "$SourceRoot\build\packages.config")).packages.package | Where-Object id -like "*PdbStr*"
-# This assumes that we rev PdbStr and SrcTool at the same time.
-$debugPackageVersions = $pdbStrPackage.version
-$srctoolExe = Join-Path $SourceRoot "packages" "Microsoft.Debugging.Tools.SrcTool.$debugPackageVersions" "content" "amd64" "srctool.exe"
-$pdbstrExe = Join-Path $SourceRoot "packages" "Microsoft.Debugging.Tools.PdbStr.$debugPackageVersions" "content" "amd64" "pdbstr.exe"
+$debuggerPath = (Get-ItemProperty -path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots" -name WindowsDebuggersRoot10).WindowsDebuggersRoot10
+$srcsrvPath = Join-Path $debuggerPath "x64\srcsrv"
+$srctoolExe = Join-Path $srcsrvPath "srctool.exe"
+$pdbstrExe = Join-Path $srcsrvPath "pdbstr.exe"
 
 $fileTable = @{}
 foreach ($gitFile in & git ls-files)

build/scripts/Install-WindowsSdkISO.ps1

@@ -0,0 +1,346 @@
+[CmdletBinding()]
+param([Parameter(Mandatory=$true, Position=0)]
+      [string]$buildNumber)
+
+# Ensure the error action preference is set to the default for PowerShell3, 'Stop'
+$ErrorActionPreference = 'Stop'
+
+# Constants
+$WindowsSDKOptions = @("OptionId.UWPCpp", "OptionId.DesktopCPPx64", "OptionId.DesktopCPPx86", "OptionId.DesktopCPPARM64", "OptionId.DesktopCPPARM", "OptionId.WindowsDesktopDebuggers")
+$WindowsSDKRegPath = "HKLM:\Software\WOW6432Node\Microsoft\Windows Kits\Installed Roots"
+$WindowsSDKRegRootKey = "KitsRoot10"
+$WindowsSDKVersion = "10.0.$buildNumber.0"
+$WindowsSDKInstalledRegPath = "$WindowsSDKRegPath\$WindowsSDKVersion\Installed Options"
+$StrongNameRegPath = "HKLM:\SOFTWARE\Microsoft\StrongName\Verification"
+$PublicKeyTokens = @("31bf3856ad364e35")
+
+if ($buildNumber -notmatch "^\d{5,}$")
+{
+    Write-Host "ERROR: '$buildNumber' doesn't look like a windows build number"
+    Write-Host
+    Exit 1
+}
+
+function Download-File
+{
+    param ([string] $outDir,
+           [string] $downloadUrl,
+           [string] $downloadName)
+
+    $downloadPath = Join-Path $outDir "$downloadName.download"
+    $downloadDest = Join-Path $outDir $downloadName
+    $downloadDestTemp = Join-Path $outDir "$downloadName.tmp"
+
+    Write-Host -NoNewline "Downloading $downloadName..."
+
+    $retries = 10
+    $downloaded = $false
+    while (-not $downloaded)
+    {
+        try
+        {
+            $webclient = new-object System.Net.WebClient
+            $webclient.DownloadFile($downloadUrl, $downloadPath)
+            $downloaded = $true
+        }
+        catch [System.Net.WebException]
+        {
+            Write-Host
+            Write-Warning "Failed to fetch updated file from $downloadUrl : $($error[0])"
+            if (!(Test-Path $downloadDest))
+            {
+                if ($retries -gt 0)
+                {
+                    Write-Host "$retries retries left, trying download again"
+                    $retries--
+                    start-sleep -Seconds 10
+                }
+                else
+                {
+                    throw "$downloadName was not found at $downloadDest"
+                }
+            }
+            else
+            {
+                Write-Warning "$downloadName may be out of date"
+            }
+        }
+    }
+
+    Unblock-File $downloadPath
+
+    $downloadDestTemp = $downloadPath;
+
+    # Delete and rename to final dest
+    Write-Host "testing $downloadDest"
+    if (Test-Path $downloadDest)
+    {
+        Write-Host "Deleting: $downloadDest"
+        Remove-Item $downloadDest -Force
+    }
+
+    Move-Item -Force $downloadDestTemp $downloadDest
+    Write-Host "Done"
+
+    return $downloadDest
+}
+
+function Get-ISODriveLetter
+{
+    param ([string] $isoPath)
+
+    $diskImage = Get-DiskImage -ImagePath $isoPath
+    if ($diskImage)
+    {
+        $volume = Get-Volume -DiskImage $diskImage
+
+        if ($volume)
+        {
+            $driveLetter = $volume.DriveLetter
+            if ($driveLetter)
+            {
+                $driveLetter += ":"
+                return $driveLetter
+            }
+        }
+    }
+
+    return $null
+}
+
+function Mount-ISO
+{
+    param ([string] $isoPath)
+
+    # Check if image is already mounted
+    $isoDrive = Get-ISODriveLetter $isoPath
+
+    if (!$isoDrive)
+    {
+        Mount-DiskImage -ImagePath $isoPath -StorageType ISO | Out-Null
+    }
+
+    $isoDrive = Get-ISODriveLetter $isoPath
+    Write-Verbose "$isoPath mounted to ${isoDrive}:"
+}
+
+function Dismount-ISO
+{
+    param ([string] $isoPath)
+
+    $isoDrive = (Get-DiskImage -ImagePath $isoPath | Get-Volume).DriveLetter
+
+    if ($isoDrive)
+    {
+        Write-Verbose "$isoPath dismounted"
+        Dismount-DiskImage -ImagePath $isoPath | Out-Null
+    }
+}
+
+function Disable-StrongName
+{
+    param ([string] $publicKeyToken = "*")
+
+    reg ADD "HKLM\SOFTWARE\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
+    if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64")
+    {
+        reg ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
+    }
+}
+
+function Test-Admin
+{
+    $identity = [Security.Principal.WindowsIdentity]::GetCurrent()
+    $principal = New-Object Security.Principal.WindowsPrincipal $identity
+    $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+}
+
+function Test-RegistryPathAndValue
+{
+    param (
+        [parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $path,
+        [parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $value)
+
+    try
+    {
+        if (Test-Path $path)
+        {
+            Get-ItemProperty -Path $path | Select-Object -ExpandProperty $value -ErrorAction Stop | Out-Null
+            return $true
+        }
+    }
+    catch
+    {
+    }
+
+    return $false
+}
+
+function Test-InstallWindowsSDK
+{
+    $retval = $true
+
+    if (Test-RegistryPathAndValue -Path $WindowsSDKRegPath -Value $WindowsSDKRegRootKey)
+    {
+        # A Windows SDK is installed
+        # Is an SDK of our version installed with the options we need?
+        $allRequiredSdkOptionsInstalled = $true
+        foreach($sdkOption in $WindowsSDKOptions)
+        {
+            if (!(Test-RegistryPathAndValue -Path $WindowsSDKInstalledRegPath -Value $sdkOption))
+            {
+                $allRequiredSdkOptionsInstalled = $false
+            }
+        }
+
+        if($allRequiredSdkOptionsInstalled)
+        {
+            # It appears we have what we need. Double check the disk
+            $sdkRoot = Get-ItemProperty -Path $WindowsSDKRegPath | Select-Object -ExpandProperty $WindowsSDKRegRootKey
+            if ($sdkRoot)
+            {
+                if (Test-Path $sdkRoot)
+                {
+                    $refPath = Join-Path $sdkRoot "References\$WindowsSDKVersion"
+                    if (Test-Path $refPath)
+                    {
+                        $umdPath = Join-Path $sdkRoot "UnionMetadata\$WindowsSDKVersion"
+                        if (Test-Path $umdPath)
+                        {
+                            # Pretty sure we have what we need
+                            $retval = $false
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return $retval
+}
+
+function Test-InstallStrongNameHijack
+{
+    foreach($publicKeyToken in $PublicKeyTokens)
+    {
+        $key = "$StrongNameRegPath\*,$publicKeyToken"
+        if (!(Test-Path $key))
+        {
+            return $true
+        }
+    }
+
+    return $false
+}
+
+Write-Host -NoNewline "Checking for installed Windows SDK $WindowsSDKVersion..."
+$InstallWindowsSDK = Test-InstallWindowsSDK
+if ($InstallWindowsSDK)
+{
+    Write-Host "Installation required"
+}
+else
+{
+    Write-Host "INSTALLED"
+}
+
+$StrongNameHijack = Test-InstallStrongNameHijack
+Write-Host -NoNewline "Checking if StrongName bypass required..."
+
+if ($StrongNameHijack)
+{
+    Write-Host "REQUIRED"
+}
+else
+{
+    Write-Host "Done"
+}
+
+if ($StrongNameHijack -or $InstallWindowsSDK)
+{
+    if (!(Test-Admin))
+    {
+        Write-Host
+        throw "ERROR: Elevation required"
+    }
+}
+
+if ($InstallWindowsSDK)
+{
+    # Static(ish) link for Windows SDK
+    # Note: there is a delay from Windows SDK announcements to availability via the static link
+    $uri = "https://software-download.microsoft.com/download/sg/Windows_InsiderPreview_SDK_en-us_$($buildNumber)_1.iso";
+
+    if ($env:TEMP -eq $null)
+    {
+        $env:TEMP = Join-Path $env:SystemDrive 'temp'
+    }
+
+    $winsdkTempDir = Join-Path (Join-Path $env:TEMP ([System.IO.Path]::GetRandomFileName())) "WindowsSDK"
+
+    if (![System.IO.Directory]::Exists($winsdkTempDir))
+    {
+        [void][System.IO.Directory]::CreateDirectory($winsdkTempDir)
+    }
+
+    $file = "winsdk_$buildNumber.iso"
+
+    Write-Verbose "Getting WinSDK from $uri"
+    $downloadFile = Download-File $winsdkTempDir $uri $file
+    Write-Verbose "File is at $downloadFile"
+    $downloadFileItem = Get-Item $downloadFile
+    
+    # Check to make sure the file is at least 10 MB.
+    if ($downloadFileItem.Length -lt 10*1024*1024)
+    {
+        Write-Host
+        Write-Host "ERROR: Downloaded file doesn't look large enough to be an ISO. The requested version may not be on microsoft.com yet."
+        Write-Host
+        Exit 1
+    }
+
+    # TODO Check if zip, exe, iso, etc.
+    try
+    {
+        Write-Host -NoNewline "Mounting ISO $file..."
+        Mount-ISO $downloadFile
+        Write-Host "Done"
+
+        $isoDrive = Get-ISODriveLetter $downloadFile
+
+        if (Test-Path $isoDrive)
+        {
+            Write-Host -NoNewLine "Installing WinSDK..."
+
+            $setupPath = Join-Path "$isoDrive" "WinSDKSetup.exe"
+            Start-Process -Wait $setupPath "/features $WindowsSDKOptions /q"
+            Write-Host "Done"
+        }
+        else
+        {
+            throw "Could not find mounted ISO at ${isoDrive}"
+        }
+    }
+    finally
+    {
+        Write-Host -NoNewline "Dismounting ISO $file..."
+        Dismount-ISO $downloadFile
+        Write-Host "Done"
+    }
+}
+
+if ($StrongNameHijack)
+{
+    Write-Host -NoNewline "Disabling StrongName for Windows SDK..."
+
+    foreach($key in $PublicKeyTokens)
+    {
+        Disable-StrongName $key
+    }
+
+    Write-Host "Done"
+}

build/scripts/Merge-PriFiles.ps1

@@ -1,78 +0,0 @@
-Param(
-    [Parameter(Mandatory,
-      HelpMessage="List of PRI files or XML dumps (detailed only) to merge")]
-    [string[]]
-    $Path,
-
-    [Parameter(Mandatory,
-      HelpMessage="Output Path")]
-    [string]
-    $OutputPath,
-
-    [Parameter(HelpMessage="Name of index in output file; defaults to 'Application'")]
-    [string]
-    $IndexName = "Application",
-
-    [Parameter(HelpMessage="Path to makepri.exe")]
-    [ValidateScript({Test-Path $_ -Type Leaf})]
-    [string]
-    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakePri.exe"
-)
-
-$ErrorActionPreference = 'Stop'
-
-$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString((Get-Random 65535),16).PadLeft(4,'0')).tmp"
-New-Item -ItemType Directory -Path $tempDir | Out-Null
-$priConfig = Join-Path $tempDir "priconfig.xml"
-$priListFile = Join-Path $tempDir "pri.resfiles"
-$dumpListFile = Join-Path $tempDir "dump.resfiles"
-
-@"
-<?xml version="1.0" encoding="utf-8"?>
-<resources targetOsVersion="10.0.0" majorVersion="1">
-  <index root="\" startIndexAt="dump.resfiles">
-    <default>
-      <qualifier name="Language" value="en-US" />
-      <qualifier name="Contrast" value="standard" />
-      <qualifier name="Scale" value="200" />
-      <qualifier name="HomeRegion" value="001" />
-      <qualifier name="TargetSize" value="256" />
-      <qualifier name="LayoutDirection" value="LTR" />
-      <qualifier name="DXFeatureLevel" value="DX9" />
-      <qualifier name="Configuration" value="" />
-      <qualifier name="AlternateForm" value="" />
-      <qualifier name="Platform" value="UAP" />
-    </default>
-    <indexer-config type="PRIINFO" />
-    <indexer-config type="RESFILES" qualifierDelimiter="." />
-  </index>
-  <index root="\" startIndexAt="pri.resfiles">
-    <default>
-      <qualifier name="Language" value="en-US" />
-      <qualifier name="Contrast" value="standard" />
-      <qualifier name="Scale" value="200" />
-      <qualifier name="HomeRegion" value="001" />
-      <qualifier name="TargetSize" value="256" />
-      <qualifier name="LayoutDirection" value="LTR" />
-      <qualifier name="DXFeatureLevel" value="DX9" />
-      <qualifier name="Configuration" value="" />
-      <qualifier name="AlternateForm" value="" />
-      <qualifier name="Platform" value="UAP" />
-    </default>
-    <indexer-config type="PRI" />
-    <indexer-config type="RESFILES" qualifierDelimiter="." />
-  </index>
-</resources>
-"@ | Out-File -Encoding:utf8NoBOM $priConfig
-
-$Path | Where { $_ -Like "*.pri" } | ForEach-Object {
-    Get-Item $_ | Select -Expand FullName
-} | Out-File -Encoding:utf8NoBOM $priListFile
-
-$Path | Where { $_ -Like "*.xml" } | ForEach-Object {
-    Get-Item $_ | Select -Expand FullName
-} | Out-File -Encoding:utf8NoBOM $dumpListFile
-
-& $MakePriPath new /pr $tempDir /cf $priConfig /o /in $IndexName /of $OutputPath
-
-Remove-Item -Recurse -Force $tempDir

build/scripts/Merge-TerminalAndXamlResources.ps1

@@ -1,47 +0,0 @@
-Param(
-    [Parameter(Mandatory,
-      HelpMessage="Root directory of extracted Terminal AppX")]
-    [string[]]
-    $TerminalRoot,
-
-    [Parameter(Mandatory,
-      HelpMessage="Root directory of extracted Xaml AppX")]
-    [string[]]
-    $XamlRoot,
-
-    [Parameter(Mandatory,
-      HelpMessage="Output Path")]
-    [string]
-    $OutputPath,
-
-    [Parameter(HelpMessage="Path to makepri.exe")]
-    [ValidateScript({Test-Path $_ -Type Leaf})]
-    [string]
-    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakePri.exe"
-)
-
-$ErrorActionPreference = 'Stop'
-
-$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString((Get-Random 65535),16).PadLeft(4,'0')).tmp"
-New-Item -ItemType Directory -Path $tempDir | Out-Null
-
-$terminalDump = Join-Path $tempDir "terminal.pri.xml"
-
-& $MakePriPath dump /if (Join-Path $TerminalRoot "resources.pri") /of $terminalDump /dt detailed
-
-Write-Verbose "Removing Microsoft.UI.Xaml node from Terminal to prevent a collision with XAML"
-$terminalXMLDocument = [xml](Get-Content $terminalDump)
-$resourceMap = $terminalXMLDocument.PriInfo.ResourceMap
-$fileSubtree = $resourceMap.ResourceMapSubtree | Where-Object { $_.Name -eq "Files" }
-$subtrees = $fileSubtree.ResourceMapSubtree
-$xamlSubtreeChild = ($subtrees | Where-Object { $_.Name -eq "Microsoft.UI.Xaml" })
-if ($Null -Ne $xamlSubtreeChild) {
-    $null = $fileSubtree.RemoveChild($xamlSubtreeChild)
-    $terminalXMLDocument.Save($terminalDump)
-}
-
-$indexName = $terminalXMLDocument.PriInfo.ResourceMap.name
-
-& (Join-Path $PSScriptRoot "Merge-PriFiles.ps1") -Path $terminalDump, (Join-Path $XamlRoot "resources.pri") -IndexName $indexName -OutputPath $OutputPath -MakePriPath $MakePriPath
-
-Remove-Item -Recurse -Force $tempDir

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -1,140 +0,0 @@
-[CmdletBinding(DefaultParameterSetName = 'AppX')]
-Param(
-    [Parameter(Mandatory, HelpMessage="Path to Terminal AppX", ParameterSetName = 'AppX')]
-    [ValidateScript({Test-Path $_ -Type Leaf})]
-    [string]
-    $TerminalAppX,
-
-    [Parameter(Mandatory, HelpMessage="Path to Terminal Layout Deployment", ParameterSetName='Layout')]
-    [ValidateScript({Test-Path $_ -Type Container})]
-    [string]
-    $TerminalLayout,
-
-    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='AppX')]
-    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='Layout')]
-    [ValidateScript({Test-Path $_ -Type Leaf})]
-    [string]
-    $XamlAppX,
-
-    [Parameter(HelpMessage="Output Directory", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Output Directory", ParameterSetName='Layout')]
-    [string]
-    $Destination = ".",
-
-    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='Layout')]
-    [ValidateScript({Test-Path $_ -Type Leaf})]
-    [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe"
-)
-
-$filesToRemove = @("*.xml", "*.winmd", "Appx*", "Images/*Tile*", "Images/*Logo*") # Remove from Terminal
-$filesToKeep = @("Microsoft.Terminal.Remoting.winmd") # ... except for these
-$filesToCopyFromXaml = @("Microsoft.UI.Xaml.dll", "Microsoft.UI.Xaml") # We don't need the .winmd
-
-$ErrorActionPreference = 'Stop'
-
-If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {
-    Write-Error "Could not find MakeAppx.exe at `"$MakeAppxPath`".`nMake sure that -MakeAppxPath points to a valid SDK."
-    Exit 1
-}
-
-$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString((Get-Random 65535),16).PadLeft(4,'0')).tmp"
-New-Item -ItemType Directory -Path $tempDir | Out-Null
-
-$XamlAppX = Get-Item $XamlAppX | Select-Object -Expand FullName
-
-########
-# Reading the AppX Manifest for preliminary info
-########
-
-If ($TerminalAppX) {
-	$appxManifestPath = Join-Path $tempDir AppxManifest.xml
-	& tar.exe -x -f "$TerminalAppX" -C $tempDir AppxManifest.xml
-} ElseIf($TerminalLayout) {
-	$appxManifestPath = Join-Path $TerminalLayout AppxManifest.xml
-}
-$manifest = [xml](Get-Content $appxManifestPath)
-$pfn = $manifest.Package.Identity.Name
-$version = $manifest.Package.Identity.Version
-$architecture = $manifest.Package.Identity.ProcessorArchitecture
-
-$distributionName = "{0}_{1}_{2}" -f ($pfn, $version, $architecture)
-$terminalDir = "terminal-{0}" -f ($version)
-
-########
-# Unpacking Terminal and XAML
-########
-
-$terminalAppPath = Join-Path $tempdir $terminalDir
-
-If ($TerminalAppX) {
-	$TerminalAppX = Get-Item $TerminalAppX | Select-Object -Expand FullName
-	New-Item -ItemType Directory -Path $terminalAppPath | Out-Null
-	& $MakeAppxPath unpack /p $TerminalAppX /d $terminalAppPath /o | Out-Null
-	If ($LASTEXITCODE -Ne 0) {
-	    Throw "Unpacking $TerminalAppX failed"
-	}
-} ElseIf ($TerminalLayout) {
-	Copy-Item -Recurse -Path $TerminalLayout -Destination $terminalAppPath
-}
-
-$xamlAppPath = Join-Path $tempdir "xaml"
-New-Item -ItemType Directory -Path $xamlAppPath | Out-Null
-& $MakeAppxPath unpack /p $XamlAppX /d $xamlAppPath /o | Out-Null
-If ($LASTEXITCODE -Ne 0) {
-    Throw "Unpacking $XamlAppX failed"
-}
-
-########
-# Some sanity checking
-########
-
-$xamlManifest = [xml](Get-Content (Join-Path $xamlAppPath "AppxManifest.xml"))
-If ($xamlManifest.Package.Identity.Name -NotLike "Microsoft.UI.Xaml*") {
-    Throw "$XamlAppX is not a XAML package (instead, it looks like $($xamlManifest.Package.Identity.Name))"
-}
-If ($xamlManifest.Package.Identity.ProcessorArchitecture -Ne $architecture) {
-    Throw "$XamlAppX is not built for $architecture (instead, it is built for $($xamlManifest.Package.Identity.ProcessorArchitecture))"
-}
-
-########
-# Preparation of source files
-########
-
-$itemsToRemove = $filesToRemove | ForEach-Object {
-    Get-Item (Join-Path $terminalAppPath $_) -EA:SilentlyContinue | Where-Object {
-        $filesToKeep -NotContains $_.Name
-    }
-} | Sort-Object FullName -Unique
-$itemsToRemove | Remove-Item -Recurse
-
-$filesToCopyFromXaml | ForEach-Object {
-    Get-Item (Join-Path $xamlAppPath $_)
-} | Copy-Item -Recurse -Destination $terminalAppPath
-
-########
-# Resource Management
-########
-
-$finalTerminalPriFile = Join-Path $terminalAppPath "resources.pri"
-& (Join-Path $PSScriptRoot "Merge-TerminalAndXamlResources.ps1") `
-    -TerminalRoot $terminalAppPath `
-    -XamlRoot $xamlAppPath `
-    -OutputPath $finalTerminalPriFile `
-    -Verbose:$Verbose | Out-Host
-
-########
-# Packaging
-########
-
-If ($PSCmdlet.ParameterSetName -Eq "AppX") {
-	# We only produce a ZIP when we're combining two AppX directories.
-	New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null
-	$outputZip = (Join-Path $Destination ("{0}.zip" -f ($distributionName)))
-	& tar -c --format=zip -f $outputZip -C $tempDir $terminalDir
-	Remove-Item -Recurse -Force $tempDir -EA:SilentlyContinue
-	Get-Item $outputZip
-} ElseIf ($PSCmdlet.ParameterSetName -Eq "Layout") {
-	Get-Item $terminalAppPath
-}

build/scripts/Run-Tests.ps1

@@ -3,11 +3,10 @@ Param(
     [Parameter(Mandatory=$true, Position=0)][string]$MatchPattern,
     [Parameter(Mandatory=$true, Position=1)][string]$Platform,
     [Parameter(Mandatory=$true, Position=2)][string]$Configuration,
-    [Parameter(Mandatory=$false, Position=3)][string]$LogPath,
-    [Parameter(Mandatory=$false)][string]$Root = ".\bin\$Platform\$Configuration"
+    [Parameter(Mandatory=$false, Position=3)][string]$LogPath
 )
 
-$testdlls = Get-ChildItem -Path "$Root" -Recurse -Filter $MatchPattern
+$testdlls = Get-ChildItem -Path ".\bin\$Platform\$Configuration" -Recurse -Filter $MatchPattern
 
 
 $args = @();
@@ -20,7 +19,7 @@ if ($LogPath)
     Write-Host "Wtt Logging Enabled";
 }
 
-&"$Root\te.exe" $args $testdlls.FullName
+&".\bin\$Platform\$Configuration\te.exe" $args $testdlls.FullName
 
 if ($lastexitcode -Ne 0) { Exit $lastexitcode }
 

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -8,7 +8,7 @@ Param(
     [Parameter(HelpMessage="Path to Windows Kit")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0"
+    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0"
 )
 
 $ErrorActionPreference = "Stop"
@@ -70,24 +70,23 @@ Try {
 
     $dependencies = $Manifest.Package.Dependencies.PackageDependency.Name
     $depsHasVclibsDesktop = ("Microsoft.VCLibs.140.00.UWPDesktop" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug.UWPDesktop" -in $dependencies)
-    $depsHasVclibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
+    $depsHasVcLibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
     $filesHasVclibsDesktop = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d.dll" -EA:Ignore))
     $filesHasVclibsAppX = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140_app.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d_app.dll" -EA:Ignore))
 
-    If ($filesHasVclibsDesktop) {
-        Throw "Package contains the desktop VCLibs"
+    If ($depsHasVclibsDesktop -Eq $filesHasVclibsDesktop) {
+        $eitherBoth = if ($depsHasVclibsDesktop) { "both" } else { "neither" }
+        $neitherNor = if ($depsHasVclibsDesktop) { "and" } else { "nor" }
+        Throw "Package has $eitherBoth Dependency $neitherNor Integrated Desktop VCLibs"
     }
 
-    If ($depsHasVclibsDesktop) {
-        Throw "Package has a dependency on the desktop VCLibs"
-    }
-
-    If ($filesHasVclibsAppX) {
-        Throw "Package contains the AppX VCLibs"
-    }
-
-    If ($depsHasVclibsAppX) {
-        Throw "Package has a dependency on the AppX VCLibs"
+    If ($depsHasVclibsAppx -Eq $filesHasVclibsAppx) {
+        if ($depsHasVclibsAppx) {
+            # We've shipped like this forever, so downgrade to warning.
+            Write-Warning "Package has both Dependency and Integrated AppX VCLibs"
+        } else {
+            Throw "Package has neither Dependency nor Integrated AppX VCLibs"
+        }
     }
 
     ### Check that we have an App.xbf (which is a proxy for our resources having been merged)
@@ -97,6 +96,11 @@ Try {
         Throw "Failed to find App.xbf (TerminalApp project) in resources.pri"
     }
 
+    If (($null -eq (Get-Item "$AppxPackageRootPath\cpprest142_2_10.dll" -EA:Ignore)) -And
+        ($null -eq (Get-Item "$AppxPackageRootPath\cpprest142_2_10d.dll" -EA:Ignore))) {
+        Throw "Failed to find cpprest142_2_10.dll -- check the WAP packaging project"
+    }
+
     If (($null -eq (Get-Item "$AppxPackageRootPath\wtd.exe" -EA:Ignore)) -And
         ($null -eq (Get-Item "$AppxPackageRootPath\wt.exe" -EA:Ignore))) {
         Throw "Failed to find wt.exe/wtd.exe -- check the WAP packaging project"

common.openconsole.props

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!--
   This props file is a workaround for the fact that for wapproj projects,

consolegit2gitfilters.json

@@ -11,7 +11,6 @@
     "/packages/",
     "/ipch/",
     "/dep/",
-    "/doc/",
     "/.vs/",
     "/build/",
     "/src/cascadia/",
@@ -25,9 +24,6 @@
     "/doc/cascadia/",
     "/doc/user-docs/",
     "/src/tools/MonarchPeasantSample/",
-    "/src/tools/MonarchPeasantPackage/",
-    "/src/tools/ansi-color/",
-    "/src/tools/ColorTool/",
     "/scratch/",
     "Scratch.sln",
   ],

custom.props

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2023</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>19</VersionMinor>
+    <VersionMinor>11</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

dep/CLI11/CLI11.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-// CLI11: Version 1.9.1
+// CLI11: Version 1.9.0
 // Originally designed by Henry Schreiner
 // https://github.com/CLIUtils/CLI11
 //
 // This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts
-// from: v1.9.1
+// from: v1.9.0
 //
 // From LICENSE:
 //
@@ -60,14 +60,14 @@
 #include <utility>
 #include <vector>
 
-// Verbatim copy from Version.hpp:
+// Verbatim copy from CLI/Version.hpp:
 
 #define CLI11_VERSION_MAJOR 1
 #define CLI11_VERSION_MINOR 9
-#define CLI11_VERSION_PATCH 1
-#define CLI11_VERSION "1.9.1"
+#define CLI11_VERSION_PATCH 0
+#define CLI11_VERSION "1.9.0"
 
-// Verbatim copy from Macros.hpp:
+// Verbatim copy from CLI/Macros.hpp:
 
 // The following version macro is very similar to the one in PyBind11
 #if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
@@ -102,7 +102,7 @@
 #define CLI11_DEPRECATED(reason) __attribute__((deprecated(reason)))
 #endif
 
-// Verbatim copy from Validators.hpp:
+// Verbatim copy from CLI/Validators.hpp:
 
 // C standard library
 // Only needed for existence checking
@@ -114,14 +114,7 @@
 #else
 #include <filesystem>
 #if defined __cpp_lib_filesystem && __cpp_lib_filesystem >= 201703
-#if defined _GLIBCXX_RELEASE && _GLIBCXX_RELEASE >= 9
 #define CLI11_HAS_FILESYSTEM 1
-#elif defined(__GLIBCXX__)
-// if we are using gcc and Version <9 default to no filesystem
-#define CLI11_HAS_FILESYSTEM 0
-#else
-#define CLI11_HAS_FILESYSTEM 1
-#endif
 #else
 #define CLI11_HAS_FILESYSTEM 0
 #endif
@@ -136,11 +129,11 @@
 #include <sys/types.h>
 #endif
 
-// From Version.hpp:
+// From CLI/Version.hpp:
 
-// From Macros.hpp:
+// From CLI/Macros.hpp:
 
-// From StringTools.hpp:
+// From CLI/StringTools.hpp:
 
 namespace CLI
 {
@@ -577,7 +570,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From Error.hpp:
+// From CLI/Error.hpp:
 
 namespace CLI
 {
@@ -851,11 +844,11 @@ public:
     {
         CLI11_ERROR_DEF(ParseError, ArgumentMismatch)
         CLI11_ERROR_SIMPLE(ArgumentMismatch)
-        ArgumentMismatch(std::string name, int expected, std::size_t received) :
+        ArgumentMismatch(std::string name, int expected, std::size_t recieved) :
             ArgumentMismatch(expected > 0 ? ("Expected exactly " + std::to_string(expected) + " arguments to " + name +
-                                             ", got " + std::to_string(received)) :
+                                             ", got " + std::to_string(recieved)) :
                                             ("Expected at least " + std::to_string(-expected) + " arguments to " + name +
-                                             ", got " + std::to_string(received)),
+                                             ", got " + std::to_string(recieved)),
                              ExitCodes::ArgumentMismatch) {}
 
         static ArgumentMismatch AtLeast(std::string name, int num, std::size_t received)
@@ -956,7 +949,7 @@ public:
 
 } // namespace CLI
 
-// From TypeTools.hpp:
+// From CLI/TypeTools.hpp:
 
 namespace CLI
 {
@@ -1244,26 +1237,16 @@ namespace CLI
         };
 
         /// Convert an object to a string (directly forward if this can become a string)
-        template<typename T, enable_if_t<std::is_convertible<T, std::string>::value, detail::enabler> = detail::dummy>
+        template<typename T, enable_if_t<std::is_constructible<std::string, T>::value, detail::enabler> = detail::dummy>
         auto to_string(T&& value) -> decltype(std::forward<T>(value))
         {
             return std::forward<T>(value);
         }
 
-        /// Construct a string from the object
-        template<typename T,
-                 enable_if_t<std::is_constructible<std::string, T>::value && !std::is_convertible<T, std::string>::value,
-                             detail::enabler> = detail::dummy>
-        std::string to_string(const T& value)
-        {
-            return std::string(value);
-        }
-
         /// Convert an object to a string (streaming must be supported for that type)
         template<typename T,
-                 enable_if_t<!std::is_convertible<std::string, T>::value && !std::is_constructible<std::string, T>::value &&
-                                 is_ostreamable<T>::value,
-                             detail::enabler> = detail::dummy>
+                 enable_if_t<!std::is_constructible<std::string, T>::value && is_ostreamable<T>::value, detail::enabler> =
+                     detail::dummy>
         std::string to_string(T&& value)
         {
             std::stringstream stream;
@@ -1641,7 +1624,7 @@ namespace CLI
         // Lexical cast
 
         /// Convert a flag into an integer value  typically binary flags
-        inline std::int64_t to_flag_value(std::string val)
+        inline int64_t to_flag_value(std::string val)
         {
             static const std::string trueString("true");
             static const std::string falseString("false");
@@ -1654,12 +1637,12 @@ namespace CLI
                 return -1;
             }
             val = detail::to_lower(val);
-            std::int64_t ret;
+            int64_t ret;
             if (val.size() == 1)
             {
                 if (val[0] >= '1' && val[0] <= '9')
                 {
-                    return (static_cast<std::int64_t>(val[0]) - '0');
+                    return (static_cast<int64_t>(val[0]) - '0');
                 }
                 switch (val[0])
                 {
@@ -2144,7 +2127,7 @@ namespace CLI
                  enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
         void sum_flag_vector(const std::vector<std::string>& flags, T& output)
         {
-            std::int64_t count{ 0 };
+            int64_t count{ 0 };
             for (auto& flag : flags)
             {
                 count += detail::to_flag_value(flag);
@@ -2161,7 +2144,7 @@ namespace CLI
                  enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value, detail::enabler> = detail::dummy>
         void sum_flag_vector(const std::vector<std::string>& flags, T& output)
         {
-            std::int64_t count{ 0 };
+            int64_t count{ 0 };
             for (auto& flag : flags)
             {
                 count += detail::to_flag_value(flag);
@@ -2172,7 +2155,7 @@ namespace CLI
     } // namespace detail
 } // namespace CLI
 
-// From Split.hpp:
+// From CLI/Split.hpp:
 
 namespace CLI
 {
@@ -2324,7 +2307,7 @@ namespace CLI
     } // namespace detail
 } // namespace CLI
 
-// From ConfigFwd.hpp:
+// From CLI/ConfigFwd.hpp:
 
 namespace CLI
 {
@@ -2453,7 +2436,7 @@ namespace CLI
     };
 } // namespace CLI
 
-// From Validators.hpp:
+// From CLI/Validators.hpp:
 
 namespace CLI
 {
@@ -2521,7 +2504,7 @@ namespace CLI
                 }
             }
             return retstring;
-        }
+        };
 
         /// This is the required operator for a Validator - provided to help
         /// users (CLI11 uses the member `func` directly)
@@ -2529,7 +2512,7 @@ namespace CLI
         {
             std::string value = str;
             return (active_) ? func_(value) : std::string{};
-        }
+        };
 
         /// Specify the type string
         Validator& description(std::string validator_desc)
@@ -2593,14 +2576,14 @@ namespace CLI
         {
             application_index_ = app_index;
             return *this;
-        }
+        };
         /// Specify the application index of a validator
         Validator application_index(int app_index) const
         {
             Validator newval(*this);
             newval.application_index_ = app_index;
             return newval;
-        }
+        };
         /// Get the current value of the application index
         int get_application_index() const { return application_index_; }
         /// Get a boolean if the validator is active
@@ -2716,7 +2699,7 @@ namespace CLI
         /// CLI enumeration of different file types
         enum class path_type
         {
-            nonexistent,
+            nonexistant,
             file,
             directory
         };
@@ -2729,13 +2712,13 @@ namespace CLI
             auto stat = std::filesystem::status(file, ec);
             if (ec)
             {
-                return path_type::nonexistent;
+                return path_type::nonexistant;
             }
             switch (stat.type())
             {
             case std::filesystem::file_type::none:
             case std::filesystem::file_type::not_found:
-                return path_type::nonexistent;
+                return path_type::nonexistant;
             case std::filesystem::file_type::directory:
                 return path_type::directory;
             case std::filesystem::file_type::symlink:
@@ -2766,7 +2749,7 @@ namespace CLI
                 return ((buffer.st_mode & S_IFDIR) != 0) ? path_type::directory : path_type::file;
             }
 #endif
-            return path_type::nonexistent;
+            return path_type::nonexistant;
         }
 #endif
         /// Check for an existing file (returns error message if check fails)
@@ -2778,7 +2761,7 @@ namespace CLI
             {
                 func_ = [](std::string& filename) {
                     auto path_result = check_path(filename.c_str());
-                    if (path_result == path_type::nonexistent)
+                    if (path_result == path_type::nonexistant)
                     {
                         return "File does not exist: " + filename;
                     }
@@ -2800,7 +2783,7 @@ namespace CLI
             {
                 func_ = [](std::string& filename) {
                     auto path_result = check_path(filename.c_str());
-                    if (path_result == path_type::nonexistent)
+                    if (path_result == path_type::nonexistant)
                     {
                         return "Directory does not exist: " + filename;
                     }
@@ -2822,7 +2805,7 @@ namespace CLI
             {
                 func_ = [](std::string& filename) {
                     auto path_result = check_path(filename.c_str());
-                    if (path_result == path_type::nonexistent)
+                    if (path_result == path_type::nonexistant)
                     {
                         return "Path does not exist: " + filename;
                     }
@@ -2840,7 +2823,7 @@ namespace CLI
             {
                 func_ = [](std::string& filename) {
                     auto path_result = check_path(filename.c_str());
-                    if (path_result != path_type::nonexistent)
+                    if (path_result != path_type::nonexistant)
                     {
                         return "Path already exists: " + filename;
                     }
@@ -3327,7 +3310,7 @@ namespace CLI
             // if the type does not have first_type and second_type, these are both value_type
             using element_t = typename detail::element_type<T>::type; // Removes (smart) pointers if needed
             using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
-            using local_item_t = typename IsMemberType<item_t>::type; // Will convert bad types to good ones
+            using local_item_t = typename IsMemberType<item_t>::type; // This will convert bad types to good ones
                 // (const char * to std::string)
 
             // Make a local copy of the filter function, using a std::function if not one already
@@ -3398,9 +3381,10 @@ namespace CLI
             // if the type does not have first_type and second_type, these are both value_type
             using element_t = typename detail::element_type<T>::type; // Removes (smart) pointers if needed
             using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
-            using local_item_t = typename IsMemberType<item_t>::type; // Will convert bad types to good ones
+            using local_item_t = typename IsMemberType<item_t>::type; // This will convert bad types to good ones
                 // (const char * to std::string)
-            using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair
+            using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair //
+                // the type of the object pair
 
             // Make a local copy of the filter function, using a std::function if not one already
             std::function<local_item_t(local_item_t)> filter_fn = filter_function;
@@ -3641,7 +3625,7 @@ namespace CLI
     class AsSizeValue : public AsNumberWithUnit
     {
     public:
-        using result_t = std::uint64_t;
+        using result_t = uint64_t;
 
         /// If kb_is_1000 is true,
         /// interpret 'kb', 'k' as 1000 and 'kib', 'ki' as 1024
@@ -3737,7 +3721,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From FormatterFwd.hpp:
+// From CLI/FormatterFwd.hpp:
 
 namespace CLI
 {
@@ -3751,9 +3735,9 @@ namespace CLI
 
     enum class AppFormatMode
     {
-        Normal, ///< The normal, detailed help
-        All, ///< A fully expanded help
-        Sub, ///< Used when printed as part of expanded subcommand
+        Normal, //< The normal, detailed help
+        All, //< A fully expanded help
+        Sub, //< Used when printed as part of expanded subcommand
     };
 
     /// This is the minimum requirements to run a formatter.
@@ -3913,7 +3897,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From Option.hpp:
+// From CLI/Option.hpp:
 
 namespace CLI
 {
@@ -4457,7 +4441,7 @@ namespace CLI
         template<typename T = App>
         Option* needs(std::string opt_name)
         {
-            auto opt = static_cast<T*>(parent_)->get_option_no_throw(opt_name);
+            auto opt = dynamic_cast<T*>(parent_)->get_option_no_throw(opt_name);
             if (opt == nullptr)
             {
                 throw IncorrectConstruction::MissingOption(opt_name);
@@ -4508,7 +4492,7 @@ namespace CLI
         template<typename T = App>
         Option* excludes(std::string opt_name)
         {
-            auto opt = static_cast<T*>(parent_)->get_option_no_throw(opt_name);
+            auto opt = dynamic_cast<T*>(parent_)->get_option_no_throw(opt_name);
             if (opt == nullptr)
             {
                 throw IncorrectConstruction::MissingOption(opt_name);
@@ -4554,7 +4538,7 @@ namespace CLI
             if (!ignore_case_ && value)
             {
                 ignore_case_ = value;
-                auto* parent = static_cast<T*>(parent_);
+                auto* parent = dynamic_cast<T*>(parent_);
                 for (const Option_p& opt : parent->options_)
                 {
                     if (opt.get() == this)
@@ -4586,7 +4570,7 @@ namespace CLI
             if (!ignore_underscore_ && value)
             {
                 ignore_underscore_ = value;
-                auto* parent = static_cast<T*>(parent_);
+                auto* parent = dynamic_cast<T*>(parent_);
                 for (const Option_p& opt : parent->options_)
                 {
                     if (opt.get() == this)
@@ -4714,9 +4698,9 @@ namespace CLI
         /// Will include / prefer the positional name if positional is true.
         /// If all_options is false, pick just the most descriptive name to show.
         /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
-        std::string get_name(bool positional = false, ///< Show the positional name
-                             bool all_options = false ///< Show every option
-        ) const
+        std::string get_name(bool positional = false, //<[input] Show the positional name
+                             bool all_options = false //<[input] Show every option
+                             ) const
         {
             if (get_group().empty())
                 return {}; // Hidden
@@ -5016,7 +5000,7 @@ namespace CLI
                 {
                     if (!default_str_.empty())
                     {
-                        // _add_results takes an rvalue only
+                        //_add_results takes an rvalue only
                         _add_result(std::string(default_str_), res);
                         _validate_results(res);
                         results_t extra;
@@ -5395,7 +5379,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From App.hpp:
+// From CLI/App.hpp:
 
 namespace CLI
 {
@@ -6237,9 +6221,8 @@ namespace CLI
         }
 
         /// Vector version to capture multiple flags.
-        template<
-            typename T,
-            enable_if_t<!std::is_assignable<std::function<void(std::int64_t)>, T>::value, detail::enabler> = detail::dummy>
+        template<typename T,
+                 enable_if_t<!std::is_assignable<std::function<void(int64_t)>, T>::value, detail::enabler> = detail::dummy>
         Option* add_flag(std::string flag_name,
                          std::vector<T>& flag_results, ///< A vector of values with the flag results
                          std::string flag_description = "")
@@ -6277,11 +6260,11 @@ namespace CLI
 
         /// Add option for callback with an integer value
         Option* add_flag_function(std::string flag_name,
-                                  std::function<void(std::int64_t)> function, ///< A function to call, void(int)
+                                  std::function<void(int64_t)> function, ///< A function to call, void(int)
                                   std::string flag_description = "")
         {
             CLI::callback_t fun = [function](const CLI::results_t& res) {
-                std::int64_t flag_count = 0;
+                int64_t flag_count = 0;
                 detail::sum_flag_vector(res, flag_count);
                 function(flag_count);
                 return true;
@@ -6293,7 +6276,7 @@ namespace CLI
 #ifdef CLI11_CPP14
         /// Add option for callback (C++14 or better only)
         Option* add_flag(std::string flag_name,
-                         std::function<void(std::int64_t)> function, ///< A function to call, void(std::int64_t)
+                         std::function<void(int64_t)> function, ///< A function to call, void(int64_t)
                          std::string flag_description = "")
         {
             return add_flag_function(std::move(flag_name), std::move(function), std::move(flag_description));
@@ -6469,7 +6452,7 @@ namespace CLI
         template<typename T = Option_group>
         T* add_option_group(std::string group_name, std::string group_description = "")
         {
-            auto option_group = std::make_shared<T>(std::move(group_description), group_name, this);
+            auto option_group = std::make_shared<T>(std::move(group_description), group_name, nullptr);
             auto ptr = option_group.get();
             // move to App_p for overload resolution on older gcc versions
             App_p app_ptr = std::dynamic_pointer_cast<App>(option_group);
@@ -6478,7 +6461,7 @@ namespace CLI
         }
 
         ///@}
-        /// @name Subcommands
+        /// @name Subcommmands
         ///@{
 
         /// Add a subcommand. Inherits INHERITABLE and OptionDefaults, and help flag
@@ -6854,16 +6837,16 @@ namespace CLI
         int exit(const Error& e, std::ostream& out = std::cout, std::ostream& err = std::cerr) const
         {
             /// Avoid printing anything if this is a CLI::RuntimeError
-            if (e.get_name() == "RuntimeError")
+            if (dynamic_cast<const CLI::RuntimeError*>(&e) != nullptr)
                 return e.get_exit_code();
 
-            if (e.get_name() == "CallForHelp")
+            if (dynamic_cast<const CLI::CallForHelp*>(&e) != nullptr)
             {
                 out << help();
                 return e.get_exit_code();
             }
 
-            if (e.get_name() == "CallForAllHelp")
+            if (dynamic_cast<const CLI::CallForAllHelp*>(&e) != nullptr)
             {
                 out << help("", AppFormatMode::All);
                 return e.get_exit_code();
@@ -7097,12 +7080,7 @@ namespace CLI
         /// Access the config formatter as a configBase pointer
         std::shared_ptr<ConfigBase> get_config_formatter_base() const
         {
-            // This is safer as a dynamic_cast if we have RTTI, as Config -> ConfigBase
-#if defined(__cpp_rtti) || (defined(__GXX_RTTI) && __GXX_RTTI) || (defined(_HAS_STATIC_RTTI) && (_HAS_STATIC_RTTI == 0))
             return std::dynamic_pointer_cast<ConfigBase>(config_formatter_);
-#else
-            return std::static_pointer_cast<ConfigBase>(config_formatter_);
-#endif
         }
 
         /// Get the app or subcommand description
@@ -8930,21 +8908,6 @@ namespace CLI
         /// This class is simply to allow tests access to App's protected functions
         struct AppFriend
         {
-#ifdef CLI11_CPP14
-            /// Wrap _parse_short, perfectly forward arguments and return
-            template<typename... Args>
-            static decltype(auto) parse_arg(App* app, Args&&... args)
-            {
-                return app->_parse_arg(std::forward<Args>(args)...);
-            }
-
-            /// Wrap _parse_subcommand, perfectly forward arguments and return
-            template<typename... Args>
-            static decltype(auto) parse_subcommand(App* app, Args&&... args)
-            {
-                return app->_parse_subcommand(std::forward<Args>(args)...);
-            }
-#else
             /// Wrap _parse_short, perfectly forward arguments and return
             template<typename... Args>
             static auto parse_arg(App* app, Args&&... args) ->
@@ -8960,7 +8923,6 @@ namespace CLI
             {
                 return app->_parse_subcommand(std::forward<Args>(args)...);
             }
-#endif
             /// Wrap the fallthrough parent function to make sure that is working correctly
             static App* get_fallthrough_parent(App* app) { return app->_get_fallthrough_parent(); }
         };
@@ -8968,7 +8930,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From Config.hpp:
+// From CLI/Config.hpp:
 
 namespace CLI
 {
@@ -9398,7 +9360,7 @@ namespace CLI
 
 } // namespace CLI
 
-// From Formatter.hpp:
+// From CLI/Formatter.hpp:
 
 namespace CLI
 {

dep/CLI11/README.md

@@ -1,4 +1,5 @@
 # CLI11
 
-Taken from [release v1.9.1](https://github.com/CLIUtils/CLI11/releases/tag/v1.9.1), source commit
-[5cb3efa](https://github.com/CLIUtils/CLI11/commit/5cb3efabce007c3a0230e4cc2e27da491c646b6c)
+Taken from [release v1.9.0](https://github.com/CLIUtils/CLI11/releases/tag/v1.9.0), source commit
+[dd0d8e4](https://github.com/CLIUtils/CLI11/commit/dd0d8e4fe729e5b1110232c7a5c9566dad884686)
+

dep/CLI11/cgmanifest.json

@@ -1,15 +1,13 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
+{"Registrations":[
     {
       "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/CLIUtils/CLI11",
-          "commitHash": "5cb3efabce007c3a0230e4cc2e27da491c646b6c"
-        }
-      }
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/CLIUtils/CLI11",
+         "commitHash": "dd0d8e4fe729e5b1110232c7a5c9566dad884686"
+         }
+       }
     }
-  ],
-  "Version": 1
+ ],
+ "Version": 1
 }

dep/Console/ConIoSrv.h

@@ -1,96 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
-#pragma once
-
-#include <ntlpcapi.h>
-
-#define CIS_ALPC_PORT_NAME           L""
-
-#define CIS_EVENT_TYPE_INPUT         (0)
-#define CIS_EVENT_TYPE_FOCUS         (1)
-#define CIS_EVENT_TYPE_FOCUS_ACK     (2)
-
-#define CIS_MSG_TYPE_MAPVIRTUALKEY   (0)
-#define CIS_MSG_TYPE_VKKEYSCAN       (1)
-#define CIS_MSG_TYPE_GETKEYSTATE     (2)
-
-#define CIS_MSG_TYPE_GETDISPLAYSIZE  (3)
-#define CIS_MSG_TYPE_GETFONTSIZE     (4)
-#define CIS_MSG_TYPE_SETCURSOR       (5)
-#define CIS_MSG_TYPE_UPDATEDISPLAY   (6)
-
-#define CIS_MSG_ATTR_FLAGS           (0)
-
-#define CIS_MSG_ATTR_BUFFER_SIZE     (1024)
-
-#define CIS_DISPLAY_MODE_NONE        (0)
-#define CIS_DISPLAY_MODE_BGFX        (1)
-#define CIS_DISPLAY_MODE_DIRECTX     (2)
-
-typedef struct {
-    PORT_MESSAGE AlpcHeader;
-    UCHAR Type;
-
-    union {
-        struct {
-            UINT Code;
-            UINT MapType;
-            UINT ReturnValue;
-        } MapVirtualKeyParams;
-
-        struct {
-            WCHAR Character;
-            SHORT ReturnValue;
-        } VkKeyScanParams;
-
-        struct {
-            int VirtualKey;
-            SHORT ReturnValue;
-        } GetKeyStateParams;
-
-        struct {
-            CD_IO_DISPLAY_SIZE DisplaySize;
-
-            NTSTATUS ReturnValue;
-        } GetDisplaySizeParams;
-
-        struct {
-            CD_IO_FONT_SIZE FontSize;
-
-            NTSTATUS ReturnValue;
-        } GetFontSizeParams;
-
-        struct {
-            CD_IO_CURSOR_INFORMATION CursorInformation;
-
-            NTSTATUS ReturnValue;
-        } SetCursorParams;
-
-        struct {
-            SHORT RowIndex;
-
-            NTSTATUS ReturnValue;
-        } UpdateDisplayParams;
-
-        struct {
-            USHORT DisplayMode;
-        } GetDisplayModeParams;
-    };
-} CIS_MSG, *PCIS_MSG;
-
-typedef struct {
-    UCHAR Type;
-
-    union {
-        struct {
-            INPUT_RECORD Record;
-        } InputEvent;
-
-        struct {
-            BOOLEAN IsActive;
-        } FocusEvent;
-    };
-} CIS_EVENT, *PCIS_EVENT;

dep/Console/conapi.h

@@ -1,6 +1,5 @@
 /*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
+Copyright (c) Microsoft Corporation
 
 Module Name:
 - conapi.h

dep/Console/condrv.h

@@ -1,7 +1,6 @@
 /*++
 
 Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the MIT license.
 
 Module Name:
 
@@ -158,8 +157,8 @@ typedef struct _CD_IO_DISPLAY_SIZE {
 } CD_IO_DISPLAY_SIZE, *PCD_IO_DISPLAY_SIZE;
 
 typedef struct _CD_IO_CHARACTER {
-    WCHAR Character;
-    USHORT Attribute;
+    WCHAR Character; 
+    USHORT Atribute;
 } CD_IO_CHARACTER, *PCD_IO_CHARACTER;
 
 typedef struct _CD_IO_ROW_INFORMATION {
@@ -175,11 +174,6 @@ typedef struct _CD_IO_CURSOR_INFORMATION {
     BOOLEAN IsVisible;
 } CD_IO_CURSOR_INFORMATION, *PCD_IO_CURSOR_INFORMATION;
 
-typedef struct _CD_IO_FONT_SIZE {
-    ULONG Width;
-    ULONG Height;
-} CD_IO_FONT_SIZE, *PCD_IO_FONT_SIZE;
-
 #define IOCTL_CONDRV_READ_IO \
     CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
 
@@ -218,6 +212,3 @@ typedef struct _CD_IO_FONT_SIZE {
 
 #define IOCTL_CONDRV_LAUNCH_SERVER \
     CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_CONDRV_GET_FONT_SIZE \
-    CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_NEITHER, FILE_ANY_ACCESS)

dep/Console/conmsgl1.h

@@ -1,7 +1,6 @@
 /*++
 
 Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the MIT license.
 
 Module Name:
 

dep/Console/conmsgl2.h

@@ -1,7 +1,6 @@
 /*++
 
 Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the MIT license.
 
 Module Name:
 

dep/Console/conmsgl3.h

@@ -1,7 +1,6 @@
 /*++
 
-Copyright (c) 1985 - 1999, Microsoft Corporation.
-Licensed under the MIT license.
+Copyright (c) 1985 - 1999, Microsoft Corporation
 
 Module Name:
 

dep/Console/csrmsg.h

@@ -1,24 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
-#pragma once
-
-#include <ntcsrmsg.h>
-
-typedef enum _USER_API_NUMBER {
-    UserpEndTask,
-} USER_API_NUMBER, *PUSER_API_NUMBER;
-
-typedef struct _ENDTASKMSG {
-    HANDLE ProcessId;
-    ULONG ConsoleEventCode;
-    ULONG ConsoleFlags;
-} ENDTASKMSG, *PENDTASKMSG;
-
-typedef struct _USER_API_MSG {
-    union {
-        ENDTASKMSG EndTask;
-    } u;
-} USER_API_MSG, *PUSER_API_MSG;

dep/Console/ntcon.h

@@ -1,6 +1,5 @@
 //
 //    Copyright (C) Microsoft.  All rights reserved.
-//    Licensed under the MIT license.
 //
 #ifndef _NTCON_
 #define _NTCON_

dep/Console/ntcsrdll.h

@@ -1,15 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
-#pragma once
-
-#include <ntcsrmsg.h>
-
-NTSTATUS CsrClientCallServer(
-    PCSR_API_MSG m,
-    PCSR_CAPTURE_HEADER CaptureBuffer OPTIONAL,
-    ULONG ApiNumber,
-    ULONG ArgLength
-);

dep/Console/ntcsrmsg.h

@@ -1,16 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
-#pragma once
-
-#include <ntlpcapi.h>
-
-typedef struct _CSR_CAPTURE_HEADER {
-} CSR_CAPTURE_HEADER, *PCSR_CAPTURE_HEADER;
-
-typedef struct _CSR_API_MSG {
-} CSR_API_MSG, *PCSR_API_MSG;
-
-#define CSR_MAKE_API_NUMBER(DllIndex, ApiIndex) 0

dep/Console/ntlpcapi.h

@@ -1,126 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
-#pragma once
-
-#define OB_FILE_OBJECT_TYPE 1
-
-typedef struct _PORT_MESSAGE {
-    union {
-        struct {
-            SHORT DataLength;
-            SHORT TotalLength;
-        } s1;
-    } u1;
-    union {
-        ULONG ZeroInit;
-    } u2;
-    union {
-        CLIENT_ID ClientId;
-    };
-    ULONG MessageId;
-} PORT_MESSAGE, *PPORT_MESSAGE;
-
-#define ALPC_MSGFLG_SYNC_REQUEST            0
-#define ALPC_PORFLG_ACCEPT_DUP_HANDLES      1
-#define ALPC_PORFLG_ACCEPT_INDIRECT_HANDLES 2
-
-typedef struct _ALPC_DATA_VIEW_ATTR {
-    PVOID  ViewBase;
-    SIZE_T ViewSize;
-} ALPC_DATA_VIEW_ATTR, *PALPC_DATA_VIEW_ATTR;
-
-typedef struct _ALPC_CONTEXT_ATTR {
-} ALPC_CONTEXT_ATTR, *PALPC_CONTEXT_ATTR;
-
-#define ALPC_INDIRECT_HANDLE_MAX 512
-
-typedef struct _ALPC_HANDLE_ATTR {
-    union {
-        ULONG HandleCount;
-    };
-} ALPC_HANDLE_ATTR, *PALPC_HANDLE_ATTR;
-
-#define ALPC_FLG_MSG_DATAVIEW_ATTR 1
-#define ALPC_FLG_MSG_HANDLE_ATTR   2
-
-typedef struct _ALPC_MESSAGE_ATTRIBUTES {
-} ALPC_MESSAGE_ATTRIBUTES, *PALPC_MESSAGE_ATTRIBUTES;
-
-typedef struct _ALPC_PORT_ATTRIBUTES {
-    ULONG Flags;
-    SECURITY_QUALITY_OF_SERVICE SecurityQos;
-    SIZE_T MaxMessageLength;
-    SIZE_T MemoryBandwidth;
-    SIZE_T MaxPoolUsage;
-    SIZE_T MaxSectionSize;
-    SIZE_T MaxViewSize;
-    SIZE_T MaxTotalSectionSize;
-    ULONG DupObjectTypes;
-#ifdef _WIN64
-    ULONG Reserved;
-#endif
-} ALPC_PORT_ATTRIBUTES, *PALPC_PORT_ATTRIBUTES;
-
-typedef enum _ALPC_MESSAGE_INFORMATION_CLASS {
-    AlpcMessageHandleInformation
-} ALPC_MESSAGE_INFORMATION_CLASS;
-
-typedef struct _ALPC_MESSAGE_HANDLE_INFORMATION {
-    ULONG Index;
-    ULONG Handle;
-} ALPC_MESSAGE_HANDLE_INFORMATION, *PALPC_MESSAGE_HANDLE_INFORMATION;
-
-NTSTATUS AlpcInitializeMessageAttribute(
-    ULONG AttributeFlags,
-    PALPC_MESSAGE_ATTRIBUTES Buffer,
-    SIZE_T BufferSize,
-    PSIZE_T RequiredBufferSize
-);
-
-PVOID AlpcGetMessageAttribute(
-    PALPC_MESSAGE_ATTRIBUTES Buffer,
-    ULONG AttributeFlag
-);
-
-#define ALPC_GET_DATAVIEW_ATTRIBUTES(MsgAttr) \
-    ((PALPC_DATA_VIEW_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_DATAVIEW_ATTR))
-
-#define ALPC_GET_HANDLE_ATTRIBUTES(MsgAttr) \
-    ((PALPC_HANDLE_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_HANDLE_ATTR))
-
-NTSTATUS NtAlpcConnectPort(
-    PHANDLE PortHandle,
-    PUNICODE_STRING PortName,
-    POBJECT_ATTRIBUTES ObjectAttributes,
-    PALPC_PORT_ATTRIBUTES PortAttributes,
-    ULONG Flags,
-    PSID RequiredServerSid,
-    PPORT_MESSAGE ConnectionMessage,
-    PSIZE_T BufferLength,
-    PALPC_MESSAGE_ATTRIBUTES OutMessageAttributes,
-    PALPC_MESSAGE_ATTRIBUTES InMessageAttributes,
-    PLARGE_INTEGER Timeout
-);
-
-NTSTATUS NtAlpcSendWaitReceivePort(
-    HANDLE PortHandle,
-    ULONG Flags,
-    PPORT_MESSAGE SendMessage,
-    PALPC_MESSAGE_ATTRIBUTES SendMessageAttributes,
-    PPORT_MESSAGE ReceiveMessage,
-    PSIZE_T BufferLength,
-    PALPC_MESSAGE_ATTRIBUTES ReceiveMessageAttributes,
-    PLARGE_INTEGER Timeout
-);
-
-NTSTATUS NtAlpcQueryInformationMessage(
-    HANDLE PortHandle,
-    PPORT_MESSAGE PortMessage,
-    ALPC_MESSAGE_INFORMATION_CLASS MessageInformationClass,
-    PVOID MessageInformation,
-    ULONG Length,
-    PULONG ReturnLength
-);

dep/Console/winconp.h

@@ -1,7 +1,3 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
 
 #ifndef _WINCONP_
 #define _WINCONP_

dep/NT/ntioapi_x.h

@@ -1,8 +1,3 @@
-/*++
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
---*/
-
 #pragma once
 
 #define FILE_SYNCHRONOUS_IO_NONALERT            0x00000020

dep/Win32K/winuserp.h

@@ -1,7 +1,4 @@
 /*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT license.
- *
  * Reserved console space.
  *
  * This was moved from the console code so that we can localize it

dep/jsoncpp/README.md

@@ -2,8 +2,8 @@
 
 [Amalgamated](https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated)
 from source commit
-[5defb4e](https://github.com/open-source-parsers/jsoncpp/commit/5defb4ed1a4293b8e2bf641e16b156fb9de498cc),
-release 1.9.5.
+[6aba23f](https://github.com/open-source-parsers/jsoncpp/commit/6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2),
+release 1.9.3.
 
 > Generating amalgamated source and header JsonCpp is provided with a script to
 > generate a single header and a single source file to ease inclusion into an

dep/jsoncpp/cgmanifest.json

@@ -1,15 +1,13 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
+{"Registrations":[
     {
       "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/open-source-parsers/jsoncpp",
-          "commitHash": "5defb4ed1a4293b8e2bf641e16b156fb9de498cc"
-        }
-      }
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/open-source-parsers/jsoncpp",
+         "commitHash": "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
+         }
+       }
     }
-  ],
-  "Version": 1
+ ],
+ "Version": 1
 }