Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
safety check on alpha test.
2026-04-06 14:19:45 +00:00 · 2020-11-13 13:16:30 -08:00 · 2020-11-13 13:16:30 -08:00 · 2020-11-13 13:16:30 -08:00 · 2020-11-13 13:15:13 -08:00 · 2020-11-13 13:12:28 -08:00
2593 changed files with 67942 additions and 194444 deletions
--- a/.clang-format
+++ b/.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
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "XamlStyler.Console": {
-      "version": "3.2206.4",
-      "commands": [
-        "xstyler"
-      ]
-    }
-  }
-}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,6 @@
 root = true

 [*]
-charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

--- a/.git-blame-ignore-revs
+++ b/.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
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,8 +3,6 @@
 ###############################################################################
 * -text

-*.inc linguist-language=cpp
-
 ###############################################################################
 # Set default behavior for command prompt diff.
 #
--- a/.github/ISSUE_TEMPLATE/Bug_Report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -0,0 +1,54 @@
+---
+name: "Bug report 🐛"
+about: Report errors or unexpected behavior
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
+
+I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
+1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
+2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
+3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
+4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
+5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
+
+All good? Then proceed!
+-->
+
+<!--
+This bug tracker is monitored by Windows Terminal development team and other technical folks.
+
+**Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
+Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
+
+If this is an application crash, please also provide a Feedback Hub submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal (Preview)" and choose "Share My Feedback" after submission to get the link.
+
+Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
+
+-->
+
+# Environment
+
+```none
+Windows build number: [run `[Environment]::OSVersion` for powershell, or `ver` for cmd]
+Windows Terminal version (if applicable):
+
+Any other software?
+```
+
+# Steps to reproduce
+
+<!-- A description of how to trigger this bug. -->
+
+# Expected behavior
+
+<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->
+
+# Actual behavior
+
+<!-- What's actually happening? -->
--- a/.github/ISSUE_TEMPLATE/Bug_Report.yml
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.yml
@@ -1,61 +0,0 @@
-name: "Bug report 🐛"
-description: Report errors or unexpected behavior
-labels: [Issue-Bug, Needs-Triage]
-body:
- type: markdown
-  attributes:
-    value: |
-      Please make sure to [search for existing issues](https://github.com/microsoft/terminal/issues) and [check the FAQ](https://github.com/microsoft/terminal/wiki/Frequently-Asked-Questions-(FAQ)) before filing a new one!
-
-      If this is an application crash, please also provide a [Feedback Hub](https://aka.ms/terminal-feedback-hub) submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal" and choose "Share My Feedback" after submission to get the link.
-
- type: input
-  attributes:
-    label: Windows Terminal version
-    placeholder: "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.
-  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
-
- type: textarea
-  attributes:
-    label: Other Software
-    description: If you're reporting a bug about our interaction with other software, what software? What versions?
-    placeholder: |
-      vim 8.2 (inside WSL)
-      OpenSSH_for_Windows_8.1p1
-      My Cool Application v0.3 (include a code snippet if it would help!)
-  validations:
-    required: false
-
- type: textarea
-  attributes:
-    label: Steps to reproduce
-    placeholder: Tell us the steps required to trigger your bug.
-  validations:
-    required: true
-
- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: If you want to include screenshots, paste them into the markdown editor below.
-    placeholder: What were you expecting?
-  validations:
-    required: false
-
- type: textarea
-  attributes:
-    label: Actual Behavior
-    placeholder: What happened instead?
-  validations:
-    required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,12 +0,0 @@
-blank_issues_enabled: true
-
-contact_links:
-  - name: Microsoft Security Response Center 🔐
-    url: https://msrc.microsoft.com/create-report
-    about: Please report security vulnerabilities here.
-  - name: Windows Terminal Documentation issue 📄
-    url: https://github.com/MicrosoftDocs/terminal/issues/new
-    about: Report issues with the documentation for the Windows Terminal (in docs.microsoft.com/windows/terminal)
-  - name: Console Documentation issue 📄
-    url: https://github.com/MicrosoftDocs/console-docs/issues/new
-    about: Report issues with the documentation for the Console (in docs.microsoft.com/windows/console)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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)
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -1,37 +1,29 @@
-aci
 admins
 allcolors
 Apc
 apc
-backpressure
 breadcrumb
 breadcrumbs
 bsd
 calt
 ccmp
-ccon
 changelog
 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
@@ -68,7 +60,6 @@ lol
 lorem
 Lorigin
 maxed
-megathread
 minimalistic
 mkmk
 mnt
@@ -80,8 +71,6 @@ ok'd
 overlined
 pipeline
 postmodern
-Powerline
-powerline
 ptys
 qof
 qps
@@ -92,12 +81,10 @@ reserialize
 reserializes
 rlig
 runtimes
-servicebus
 shcha
 slnt
 Sos
 ssh
-stakeholders
 timeline
 timelines
 timestamped
@@ -105,7 +92,6 @@ TLDR
 tokenizes
 tonos
 toolset
-truthiness
 tshe
 ubuntu
 uiatextrange
@@ -115,7 +101,6 @@ unregister
 versioned
 vsdevcmd
 We'd
-westus
 wildcards
 XBox
 YBox
--- a/.github/actions/spelling/allow/apis.txt
+++ b/.github/actions/spelling/allow/apis.txt
@@ -29,12 +29,12 @@ Dacl
 dataobject
 dcomp
 DERR
-delayimp
 dlldata
 DNE
 DONTADDTORECENT
 DWMSBT
 DWMWA
+DWMWA
 DWORDLONG
 endfor
 ENDSESSION
@@ -55,8 +55,6 @@ GETMOUSEHOVERTIME
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
-hinternet
-HINTERNET
 hotkeys
 href
 hrgn
@@ -76,7 +74,6 @@ IConnection
 ICustom
 IDialog
 IDirect
-Idn
 IExplorer
 IFACEMETHOD
 IFile
@@ -161,13 +158,11 @@ rcx
 REGCLS
 RETURNCMD
 rfind
-RLO
 ROOTOWNER
 roundf
 RSHIFT
 SACL
 schandle
-SEH
 semver
 serializer
 SETVERSION
@@ -213,18 +208,12 @@ UFIELD
 ULARGE
 UOI
 UPDATEINIFILE
-urlmon
 userenv
 USEROBJECTFLAGS
-Vcpp
 Viewbox
 virtualalloc
-vsnwprintf
 wcsstr
 wcstoui
-WDJ
-winhttp
-wininet
 winmain
 winsta
 winstamin
@@ -232,7 +221,6 @@ wmemcmp
 wpc
 WSF
 wsregex
-WWH
 wwinmain
 xchg
 XDocument
@@ -258,4 +246,3 @@ xtree
 xutility
 YIcon
 YMax
-zwstring
--- a/.github/actions/spelling/allow/microsoft.txt
+++ b/.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
--- a/.github/actions/spelling/allow/names.txt
+++ b/.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
--- a/.github/actions/spelling/excludes.txt
+++ b/.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$
--- a/.github/actions/spelling/expect/alphabet.txt
+++ b/.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
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.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
@@ -221,7 +219,6 @@ cmt
 cmw
 cmyk
 CNL
-cnn
 cnt
 CNTRL
 Codeflow
@@ -255,7 +252,6 @@ conattrs
 conbufferout
 concfg
 conclnt
-concretizations
 conddkrefs
 condrv
 conechokey
@@ -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
@@ -808,6 +792,7 @@ HIBYTE
 hicon
 HIDEWINDOW
 hinst
+Hirots
 HISTORYBUFS
 HISTORYNODUP
 HISTORYSIZE
@@ -819,18 +804,13 @@ hkl
 HKLM
 hlocal
 hlsl
-HMB
-HMK
 hmod
 hmodule
 hmon
-homeglyphs
-homoglyph
 HORZ
 hostable
 hostlib
 HPA
-hpcon
 HPCON
 hpj
 HPR
@@ -912,6 +892,7 @@ INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
 INTERNALNAME
+inthread
 intsafe
 INVALIDARG
 INVALIDATERECT
@@ -1130,7 +1111,6 @@ Mip
 MMBB
 mmcc
 MMCPL
-MMIX
 mmsystem
 MNC
 MNOPQ
@@ -1269,17 +1249,20 @@ ntm
 nto
 ntrtl
 ntstatus
+ntsubauth
 NTSYSCALLAPI
 nttree
 nturtl
 ntuser
 NTVDM
 ntverp
+NTWIN
 nugetversions
 nullability
 nullness
 nullonfailure
 nullopts
+NULs
 numlock
 numpad
 NUMSCROLL
@@ -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
@@ -1768,6 +1758,7 @@ somefile
 SOURCEBRANCH
 sourced
 spammy
+spand
 SRCCODEPAGE
 SRCCOPY
 SRCINVERT
@@ -1775,13 +1766,10 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-srgb
-Srgb
 srv
 srvinit
 srvpipe
 ssa
-startdir
 STARTF
 STARTUPINFO
 STARTUPINFOEX
@@ -1791,7 +1779,6 @@ STARTWPARMS
 STARTWPARMSA
 STARTWPARMSW
 Statusline
-stb
 stdafx
 STDAPI
 stdc
@@ -1831,7 +1818,6 @@ SYSCOMMAND
 SYSDEADCHAR
 SYSKEYDOWN
 SYSKEYUP
-SYSLIB
 SYSLINK
 SYSMENU
 sysparams
@@ -1865,7 +1851,6 @@ TDP
 TEAMPROJECT
 tearoff
 Teb
-Techo
 tellp
 teraflop
 terminalcore
@@ -1957,7 +1942,6 @@ trx
 tsattrs
 tsf
 tsgr
-tsm
 TStr
 TSTRFORMAT
 TSub
@@ -2009,6 +1993,7 @@ unittesting
 unittests
 unk
 unknwn
+unmark
 UNORM
 unparseable
 unregistering
@@ -2121,6 +2106,7 @@ WDDMCONSOLECONTEXT
 wdm
 webpage
 websites
+websockets
 wekyb
 wex
 wextest
@@ -2197,7 +2183,6 @@ wnd
 WNDALLOC
 WNDCLASS
 WNDCLASSEX
-WNDCLASSEXW
 WNDCLASSW
 Wndproc
 WNegative
@@ -2292,6 +2277,7 @@ xunit
 xutr
 XVIRTUALSCREEN
 XWalk
+xwwyzz
 xxyyzz
 yact
 YCast
@@ -2302,7 +2288,6 @@ YOffset
 YSubstantial
 YVIRTUALSCREEN
 YWalk
-zabcd
 Zabcdefghijklmnopqrstuvwxyz
 ZCmd
 ZCtrl
--- a/.github/actions/spelling/patterns/0_t.txt
+++ b/.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])
--- a/.github/actions/spelling/patterns/patterns.txt
+++ b/.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#
--- a/.github/fabricbot.json
+++ b/.github/fabricbot.json
--- a/.github/workflows/addToProject.yml
+++ b/.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
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,57 @@
+---
+###########################
+###########################
+## Linter GitHub Actions ##
+###########################
+###########################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+#
+
+###################################################
+# The linter is noisy; we used to run it on push. #
+###################################################
+#
+#on:
+#  pull_request:
+#    branches: [main]
+
+###############
+# Set the Job #
+###############
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v3
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: main
+          MARKDOWN_CONFIG_FILE: .markdown-lint.yml
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_EDITORCONFIG: false
+          # The json linter doesn't like JSONC, which we use all over. So just disable it.
+          VALIDATE_JSON: false
--- a/.github/workflows/winget.yml
+++ b/.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 }}"
--- a/.gitmodules
+++ b/.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
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="vswhere" version="2.6.7" />
-</packages>
+</packages>
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,13 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-    // List of extensions which should be recommended for users of this workspace.
-    "recommendations": [
-        "ms-vscode.cpptools"
-    ],
-    // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-    "unwantedRecommendations": [
-        
-    ]
-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,24 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug OpenConsole by Launching (x64, debug)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\bin\\x64\\debug\\openconsole.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-        },
-        {
-            "name": "Debug Terminal by Attaching (You go build/register/launch it first.)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,109 +0,0 @@
-{
-    "C_Cpp.default.browse.databaseFilename": "${workspaceFolder}\\.vscode\\.BROWSE.VC.DB",
-    "C_Cpp.default.browse.path": [
-        "${workspaceFolder}"
-    ],
-    "C_Cpp.loggingLevel": "None",
-    "files.associations": {
-        "xstring": "cpp",
-        "*.idl": "midl3",
-        "array": "cpp",
-        "future": "cpp",
-        "istream": "cpp",
-        "memory": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "variant": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "multi_span": "cpp",
-        "pointers": "cpp",
-        "vector": "cpp",
-        "bitset": "cpp",
-        "deque": "cpp",
-        "initializer_list": "cpp",
-        "list": "cpp",
-        "queue": "cpp",
-        "random": "cpp",
-        "regex": "cpp",
-        "stack": "cpp",
-        "xhash": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp",
-        "span": "cpp",
-        "string_span": "cpp",
-        "algorithm": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "cctype": "cpp",
-        "charconv": "cpp",
-        "chrono": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "compare": "cpp",
-        "complex": "cpp",
-        "concepts": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "exception": "cpp",
-        "filesystem": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "iomanip": "cpp",
-        "ios": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "iterator": "cpp",
-        "limits": "cpp",
-        "locale": "cpp",
-        "map": "cpp",
-        "memory_resource": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "ratio": "cpp",
-        "set": "cpp",
-        "shared_mutex": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "stop_token": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "typeinfo": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "xfacet": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "xlocinfo": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xtr1common": "cpp",
-        "coroutine": "cpp",
-        "format": "cpp",
-        "forward_list": "cpp",
-        "latch": "cpp"
-    },
-    "files.exclude": {
-        "**/bin/**": true,
-        "**/obj/**": true,
-        "**/packages/**": true,
-        "**/Generated Files/**": true
-    }
-}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,121 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "process",
-            "label": "Build Terminal/Console",
-            "command": "powershell.exe",
-            "args": [
-              "-Command",
-              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
-              "Set-MsBuildDevEnvironment;",
-              "$project = switch(\"${input:buildProjectChoice}\"){OpenConsole{\"Conhost\\Host_EXE\"} Terminal{\"Terminal\\CascadiaPackage\"}  TermControl{\"Terminal\\TerminalControl\"}};",
-              "$target = switch(\"${input:buildModeChoice}\"){Build{\"\"} Rebuild{\":Rebuild\"} Clean{\":Clean\"}};",
-              "$target = $project + $target;",
-              "msbuild",
-              "${workspaceFolder}\\OpenConsole.sln",
-              "/p:Configuration=${input:configChoice}",
-              "/p:Platform=${input:platformChoice}",
-              "/p:AppxSymbolPackageEnabled=false", // This takes a long time, so false if we don't really need it.
-              "/t:$target",
-              "/m", // Parallel builds
-              "/verbosity:minimal"
-            ],
-            "problemMatcher": ["$msCompile"],
-            "group": {
-              "kind": "build",
-              "isDefault": true
-            },
-            "runOptions": {
-                "reevaluateOnRerun": false,
-                "instanceLimit": 1,
-                "runOn": "default"
-            }
-        },
-        {
-            "type": "process",
-            "label": "Register Windows Terminal x64 Debug",
-            "command": "powershell.exe",
-            "args": [
-              "-Command",
-              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
-              "Set-MsBuildDevEnvironment;",
-              "Set-Location -Path ${workspaceFolder}\\src\\cascadia\\CascadiaPackage\\AppPackages\\CascadiaPackage_0.0.1.0_x64_Debug_Test;",
-              "if ((Get-AppxPackage -Name 'WindowsTerminalDev*') -ne $null) { Remove-AppxPackage 'WindowsTerminalDev_0.0.1.0_x64__8wekyb3d8bbwe'};",
-              "New-Item ..\\loose -Type Directory -Force;",
-              "makeappx unpack /v /o /p .\\CascadiaPackage_0.0.1.0_x64_Debug.msix /d ..\\Loose\\;",
-              "Add-AppxPackage -Path ..\\loose\\AppxManifest.xml -Register -ForceUpdateFromAnyVersion -ForceApplicationShutdown"
-            ],
-            "problemMatcher": ["$msCompile"],
-            "group": {
-              "kind": "build"
-            }
-        },
-        {
-            "type": "process",
-            "label": "Run Windows Terminal Dev",
-            "command": "wtd.exe",
-            "args": [
-            ],
-            "problemMatcher": ["$msCompile"],
-        },
-        {
-            "type": "process",
-            "label": "Run Code Format",
-            "command": "powershell.exe",
-            "args": [
-              "-Command",
-              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
-              "Set-MsBuildDevEnvironment;",
-              "Invoke-CodeFormat",
-            ],
-            "problemMatcher": ["$msCompile"],
-        }
-    ],
-    "inputs":[
-        {
-            "id": "platformChoice",
-            "type": "pickString",
-            "description": "Processor architecture choice",
-            "options":[
-                "x64",
-                "x86",
-                "arm64"
-            ],
-            "default": "x64"
-        },
-        {
-            "id": "configChoice",
-            "type": "pickString",
-            "description": "Debug or release?",
-            "options":[
-                "Debug",
-                "Release"
-            ],
-            "default": "Debug"
-        },
-        {
-            "id": "buildModeChoice",
-            "type": "pickString",
-            "description": "Build, rebuild, or clean?",
-            "options":[
-                "Build",
-                "Rebuild",
-                "Clean"
-            ],
-            "default": "Build"
-        },
-        {
-            "id": "buildProjectChoice",
-            "type": "pickString",
-            "description": "OpenConsole or Terminal?",
-            "options":[
-                "OpenConsole",
-                "Terminal",
-                "TermControl"
-            ],
-            "default": "Terminal"
-        }
-
-    ]
-}
--- a/.vsconfig
+++ b/.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.18362",
    "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"
  ]
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ If no existing item describes your issue/feature, great - please file a new issu
 * Have a question that you don't see answered in docs, videos, etc.? File an issue
 * Want to know if we're planning on building a particular feature? File an issue
 * Got a great idea for a new feature? File an issue/request/idea
-* Don't understand how to do something? File an issue
+* Don't understand how to do something? File an issue/Community Guidance Request
 * Found an existing issue that describes yours? Great - upvote and add additional commentary / info / repro-steps / etc.

 When you hit "New Issue", select the type of issue closest to what you want to report/ask/request:
@@ -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,39 +99,25 @@ 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.

-Specs will be managed in a very similar manner as code contributions so please follow the "[Fork, Branch and Create your PR](CONTRIBUTING.md#fork-clone-branch-and-create-your-pr)" section below.
+Specs will be managed in a very similar manner as code contributions so please follow the "Fork, Branch and Create your PR" below.

 ### Writing / Contributing-to a Spec

 To write/contribute to a spec: fork, branch and commit via PRs, as you would with any code changes.

-Specs are written in markdown, stored under the [`\doc\specs`](./doc/specs) folder and named `[issue id] - [spec description].md`.
+Specs are written in markdown, stored under the `\doc\spec` folder and named `[issue id] - [spec description].md`.

 👉 **It is important to follow the spec templates and complete the requested information**. The available spec templates will help ensure that specs contain the minimum information & decisions necessary to permit development to begin. In particular, specs require you to confirm that you've already discussed the issue/idea with the team in an issue and that you provide the issue ID for reference.

@@ -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).

 ---

--- a/NOTICE.md
+++ b/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,160 +215,5 @@ 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)
-
-### License

 ```
-Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
-
-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.
-```
-
-## 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
-
-This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.
-
-## `GSL`
-
-**Source**: [https://github.com/microsoft/GSL](https://github.com/microsoft/GSL)
-
-## `Microsoft-UI-XAML`
-
-**Source**: [https://github.com/microsoft/Microsoft-UI-XAML](https://github.com/microsoft/Microsoft-UI-XAML)
-
-## `VirtualDesktopUtils`
-
-**Source**: [https://github.com/microsoft/PowerToys](https://github.com/microsoft/PowerToys)
-
-## `wil`
-
-**Source**: [https://github.com/microsoft/wil](https://github.com/microsoft/wil)
-
-### License
-
-```
-The MIT License
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-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.
-```
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <packageSources>
-        <clear />
-        <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
+        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+        <!-- Add repositories here to the list of available repositories -->
+        
+        <!-- Dependencies that we must carry because they're not on public nuget feeds right now. -->
        <!--<add key="Static Package Dependencies" value="dep\packages" />-->
+        
+        <!-- Use our own NuGet Feed -->
        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
+		
+		<!-- Temporarily? use the feeds from our friends in MUX for Helix test stuff -->
+		<add key="dotnetfeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+        <add key="dnceng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+        <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
+        
+        <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
+        <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
+        <add key="OpenConsole - Internal" value="https://microsoft.pkgs.visualstudio.com/_packaging/OpenConsole/nuget/v3/index.json" />-->
    </packageSources>
-    <disabledPackageSources>
-        <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>
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-![terminal-logos](https://user-images.githubusercontent.com/48369326/115790869-4c852b00-a37c-11eb-97f1-f61972c7800c.png)
-
 # Welcome to the Windows Terminal, Console and Command-Line repo

 This repository contains the source code for:
@@ -21,7 +19,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]

@@ -35,27 +33,12 @@ This is our preferred method.

 #### Via GitHub

-For users who are unable to install Windows Terminal from the Microsoft Store,
-released builds can be manually downloaded from this repository's [Releases
+For users who are unable to install Terminal from the Microsoft Store, Terminal
+builds can be manually downloaded from this repository's [Releases
 page](https://github.com/microsoft/terminal/releases).

-Download the `Microsoft.WindowsTerminal_<versionNumber>.msixbundle` file from
-the **Assets** section. To install the app, you can simply double-click on the
-`.msixbundle` file, and the app installer should automatically run. If that
-fails for any reason, you can try the following command at a PowerShell prompt:
-
-```powershell
-# NOTE: If you are using PowerShell 7+, please run
-# Import-Module Appx -UseWindowsPowerShell
-# before using Add-AppxPackage.
-
-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 +50,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 +96,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 +160,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 +199,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 +218,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
@@ -245,7 +228,7 @@ Visual Studio.

 ## Documentation

-All project documentation is located at [aka.ms/terminal-docs](https://aka.ms/terminal-docs). If you would like
+All project documentation is located at aka.ms/terminal-docs. If you would like
 to contribute to the documentation, please submit a pull request on the [Windows
 Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).

@@ -266,7 +249,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,34 +257,34 @@ 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)

 ## Developer Guidance

 ## 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 +322,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
--- a/Scratch.sln
+++ b/Scratch.sln
@@ -1,221 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31205.134
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Package", "scratch\ScratchIslandApp\Package\Package.wapproj", "{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleAppLib", "scratch\ScratchIslandApp\SampleApp\SampleAppLib.vcxproj", "{A4394404-37F7-41C1-802B-49788D3720E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "scratch\ScratchIslandApp\SampleApp\dll\SampleApp.vcxproj", "{26C51792-41A3-4FE0-AB5E-8B69D557BF91}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A4394404-37F7-41C1-802B-49788D3720E3} = {A4394404-37F7-41C1-802B-49788D3720E3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowExe", "scratch\ScratchIslandApp\WindowExe\WindowExe.vcxproj", "{B4427499-9FDE-4208-B456-5BC580637633}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91} = {26C51792-41A3-4FE0-AB5E-8B69D557BF91}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Props", "Common Props", "{53DD5520-E64C-4C06-B472-7CE62CA539C9}"
-	ProjectSection(SolutionItems) = preProject
-		src\common.build.post.props = src\common.build.post.props
-		src\common.build.pre.props = src\common.build.pre.props
-		src\common.build.tests.props = src\common.build.tests.props
-		common.openconsole.props = common.openconsole.props
-		src\cppwinrt.build.post.props = src\cppwinrt.build.post.props
-		src\cppwinrt.build.pre.props = src\cppwinrt.build.pre.props
-		src\wap-common.build.post.props = src\wap-common.build.post.props
-		src\wap-common.build.pre.props = src\wap-common.build.pre.props
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxproj", "{6BAE5851-50D5-4934-8D5E-30361A8A40F3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types", "src\types\lib\types.vcxproj", "{18D09A24-8240-42D6-8CB6-236EEE820263}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		AuditMode|ARM64 = AuditMode|ARM64
-		AuditMode|x64 = AuditMode|x64
-		AuditMode|x86 = AuditMode|x86
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Fuzzing|ARM64 = Fuzzing|ARM64
-		Fuzzing|x64 = Fuzzing|x64
-		Fuzzing|x86 = Fuzzing|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.AuditMode|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Debug|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.Build.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|ARM64.Deploy.0 = Debug|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.ActiveCfg = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.Build.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x64.Deploy.0 = Debug|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.ActiveCfg = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.Build.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Fuzzing|x86.Deploy.0 = Debug|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.Build.0 = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|ARM64.Deploy.0 = Release|ARM64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.ActiveCfg = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.Build.0 = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x64.Deploy.0 = Release|x64
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.ActiveCfg = Release|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.Build.0 = Release|x86
-		{CF31505E-3BAE-4C0A-81D7-F1EB279F40BB}.Release|x86.Deploy.0 = Release|x86
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x64.ActiveCfg = Debug|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x64.Build.0 = Debug|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x86.ActiveCfg = Debug|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Debug|x86.Build.0 = Debug|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|ARM64.Build.0 = Release|ARM64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x64.ActiveCfg = Release|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x64.Build.0 = Release|x64
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x86.ActiveCfg = Release|Win32
-		{A4394404-37F7-41C1-802B-49788D3720E3}.Release|x86.Build.0 = Release|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x64.Build.0 = AuditMode|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|ARM64.Build.0 = Debug|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x64.ActiveCfg = Debug|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x64.Build.0 = Debug|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x86.ActiveCfg = Debug|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Debug|x86.Build.0 = Debug|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|ARM64.ActiveCfg = Release|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|ARM64.Build.0 = Release|ARM64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x64.ActiveCfg = Release|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x64.Build.0 = Release|x64
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x86.ActiveCfg = Release|Win32
-		{26C51792-41A3-4FE0-AB5E-8B69D557BF91}.Release|x86.Build.0 = Release|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x64.Build.0 = AuditMode|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x64.ActiveCfg = Debug|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x64.Build.0 = Debug|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x86.ActiveCfg = Debug|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Debug|x86.Build.0 = Debug|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|ARM64.Build.0 = Release|ARM64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x64.ActiveCfg = Release|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x64.Build.0 = Release|x64
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.ActiveCfg = Release|Win32
-		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.Build.0 = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.ActiveCfg = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.Build.0 = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.ActiveCfg = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.Build.0 = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.Build.0 = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.ActiveCfg = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.Build.0 = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.ActiveCfg = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.Build.0 = Release|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x64.Build.0 = AuditMode|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|ARM64.Build.0 = Debug|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x64.ActiveCfg = Debug|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x64.Build.0 = Debug|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x86.ActiveCfg = Debug|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Debug|x86.Build.0 = Debug|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|ARM64.ActiveCfg = Release|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|ARM64.Build.0 = Release|ARM64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x64.ActiveCfg = Release|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x64.Build.0 = Release|x64
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.ActiveCfg = Release|Win32
-		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
-		{18D09A24-8240-42D6-8CB6-236EEE820263} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {05EAE315-9188-4D7B-B889-7D5F480A8915}
-	EndGlobalSection
-EndGlobal
--- a/XamlStyler.json
+++ b/XamlStyler.json
@@ -1,41 +0,0 @@
-{
-    "AttributesTolerance": 1,
-    "KeepFirstAttributeOnSameLine": true,
-    "MaxAttributeCharactersPerLine": 0,
-    "MaxAttributesPerLine": 1,
-    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
-    "SeparateByGroups": false,
-    "AttributeIndentation": 0,
-    "AttributeIndentationStyle": 1,
-    "RemoveDesignTimeReferences":  false,
-    "EnableAttributeReordering": true,
-    "AttributeOrderingRuleGroups": [
-        "x:Class",
-        "xmlns, xmlns:x",
-        "xmlns:*",
-        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
-        "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
-        "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
-        "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
-        "*:*, *",
-        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
-        "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
-        "Storyboard.*, From, To, Duration"
-    ],
-    "FirstLineAttributes": "",
-    "OrderAttributesByName": true,
-    "PutEndingBracketOnNewLine": false,
-    "RemoveEndingTagOfEmptyElement": true,
-    "SpaceBeforeClosingSlash": true,
-    "RootElementLineBreakRule": 0,
-    "ReorderVSM": 2,
-    "ReorderGridChildren": false,
-    "ReorderCanvasChildren": false,
-    "ReorderSetters": 0,
-    "FormatMarkupExtension": true,
-    "NoNewLineMarkupExtensions": "x:Bind, Binding",
-    "ThicknessSeparator": 2,
-    "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
-    "FormatOnSave": true,
-    "CommentPadding": 2,
-}
--- a/build/Fuzz/notifications-ado.json
+++ b/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"]
-    }
-  }
-}
--- a/build/Helix/AzurePipelinesHelperScripts.ps1
+++ b/build/Helix/AzurePipelinesHelperScripts.ps1
@@ -0,0 +1,32 @@
+function GetAzureDevOpsBaseUri
+{
+    Param(
+        [string]$CollectionUri,
+        [string]$TeamProject
+    )
+
+    return $CollectionUri + $TeamProject
+}
+
+function GetQueryTestRunsUri
+{
+    Param(
+        [string]$CollectionUri,
+        [string]$TeamProject,
+        [string]$BuildUri,
+        [switch]$IncludeRunDetails
+    )
+
+    if ($IncludeRunDetails)
+    {
+        $includeRunDetailsParameter = "&includeRunDetails=true"
+    }
+    else
+    {
+        $includeRunDetailsParameter = ""
+    }
+
+    $baseUri = GetAzureDevOpsBaseUri -CollectionUri $CollectionUri -TeamProject $TeamProject
+    $queryUri = "$baseUri/_apis/test/runs?buildUri=$BuildUri$includeRunDetailsParameter&api-version=5.0"
+    return $queryUri
+}
--- a/build/Helix/EnsureMachineState.ps1
+++ b/build/Helix/EnsureMachineState.ps1
@@ -0,0 +1,112 @@
+$scriptDirectory = $script:MyInvocation.MyCommand.Path | Split-Path -Parent
+
+# List all processes to aid debugging:
+Write-Host "All processes running:"
+Get-Process
+
+tasklist /svc
+
+# Add this test directory as an exclusion for Windows Defender
+Write-Host "Add $scriptDirectory as Exclusion Path"
+Add-MpPreference -ExclusionPath $scriptDirectory
+Write-Host "Add $($env:HELIX_CORRELATION_PAYLOAD) as Exclusion Path"
+Add-MpPreference -ExclusionPath $env:HELIX_CORRELATION_PAYLOAD
+Get-MpPreference
+Get-MpComputerStatus
+
+
+# Minimize all windows:
+$shell = New-Object -ComObject "Shell.Application"
+$shell.minimizeall()
+
+# Kill any instances of Windows Security Alert:
+$windowTitleToMatch = "*Windows Security Alert*"
+$procs = Get-Process | Where {$_.MainWindowTitle -like "*Windows Security Alert*"}
+foreach ($proc in $procs)
+{
+    Write-Host "Found process with '$windowTitleToMatch' title: $proc"
+    $proc.Kill();
+}
+
+# Kill processes by name that are known to interfere with our tests:
+$processNamesToStop = @("Microsoft.Photos", "WinStore.App", "SkypeApp", "SkypeBackgroundHost", "OneDriveSetup", "OneDrive")
+foreach($procName in $processNamesToStop)
+{
+    Write-Host "Attempting to kill $procName if it is running"
+    Stop-Process -ProcessName $procName -Verbose -ErrorAction Ignore   
+}
+Write-Host "All processes running after attempting to kill unwanted processes:"
+Get-Process
+
+tasklist /svc
+
+$platform = $env:testbuildplatform
+if(!$platform)
+{
+    $platform = "x86"
+}
+
+function UninstallApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        } 
+    }
+}
+
+function UninstallTestApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        }
+
+        # Sometimes an app can get into a state where it is no longer returned by Get-AppxPackage, but it is still present
+        # which prevents other versions of the app from being installed.
+        # To handle this, we can directly call Remove-AppxPackage against the full name of the package. However, without
+        # Get-AppxPackage to find the PackageFullName, we just have to manually construct the name.
+        $packageFullName = "$($pkgName)_1.0.0.0_$($platform)__8wekyb3d8bbwe" 
+        Write-Host "Removing $packageFullName if installed"
+        Remove-AppPackage $packageFullName -ErrorVariable appxerror -ErrorAction SilentlyContinue 
+        if($appxerror)
+        {
+            foreach($error in $appxerror)
+            {
+                # In most cases, Remove-AppPackage will fail due to the package not being found. Don't treat this as an error.
+                if(!($error.Exception.Message -match "0x80073CF1"))
+                {
+                    Write-Error $error
+                }
+            }
+        }
+        else
+        {
+            Write-Host "Successfully removed $packageFullName"
+        }
+    }
+}
+
+Write-Host "Uninstall AppX packages that are known to cause issues with our tests"
+UninstallApps("*Skype*", "*Windows.Photos*")
+
+Write-Host "Uninstall any of our test apps that may have been left over from previous test runs"
+UninstallTestApps("NugetPackageTestApp", "NugetPackageTestAppCX", "IXMPTestApp", "MUXControlsTestApp")
+
+Write-Host "Uninstall MUX Framework package that may have been left over from previous test runs"
+# We don't want to uninstall all versions of the MUX Framework package, as there may be other apps preinstalled on the system 
+# that depend on it. We only uninstall the Framework package that corresponds to the version of MUX that we are testing.
+[xml]$versionData = (Get-Content "version.props")
+$versionMajor = $versionData.GetElementsByTagName("MUXVersionMajor").'#text'
+$versionMinor = $versionData.GetElementsByTagName("MUXVersionMinor").'#text'
+UninstallApps("Microsoft.UI.Xaml.$versionMajor.$versionMinor")
+
+Get-Process
--- a/build/Helix/GenerateTestProjFile.ps1
+++ b/build/Helix/GenerateTestProjFile.ps1
@@ -0,0 +1,336 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$TestFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$OutputProjFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$JobTestSuiteName,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TaefPath,
+
+    [string]$TaefQuery
+)
+
+Class TestCollection
+{
+    [string]$Name
+    [string]$SetupMethodName
+    [string]$TeardownMethodName
+    [System.Collections.Generic.Dictionary[string, string]]$Properties
+
+    TestCollection()
+    {
+        if ($this.GetType() -eq [TestCollection])
+        {
+            throw "This class should never be instantiated directly; it should only be derived from."
+        }
+    }
+
+    TestCollection([string]$name)
+    {
+        $this.Init($name)
+    }
+
+    hidden Init([string]$name)
+    {
+        $this.Name = $name
+        $this.Properties = @{}
+    }
+}
+
+Class Test : TestCollection 
+{
+    Test([string]$name)
+    {
+        $this.Init($name)
+    }
+}
+
+Class TestClass : TestCollection
+{
+    [System.Collections.Generic.List[Test]]$Tests
+
+    TestClass([string]$name)
+    {
+        $this.Init($name)
+        $this.Tests = @{}
+    }
+}
+
+Class TestModule : TestCollection
+{
+    [System.Collections.Generic.List[TestClass]]$TestClasses
+
+    TestModule([string]$name)
+    {
+        $this.Init($name)
+        $this.TestClasses = @{}
+    }
+}
+
+function Parse-TestInfo([string]$taefOutput)
+{
+    enum LineType
+    {
+        None
+        TestModule
+        TestClass
+        Test
+        Setup
+        Teardown
+        Property
+    }
+        
+    [string]$testModuleIndentation = "        "
+    [string]$testClassIndentation = "            "
+    [string]$testIndentation = "                "
+    [string]$setupBeginning = "Setup: "
+    [string]$teardownBeginning = "Teardown: "
+    [string]$propertyBeginning = "Property["
+
+    function Get-LineType([string]$line)
+    {
+        if ($line.Contains($setupBeginning))
+        {
+            return [LineType]::Setup;
+        }
+        elseif ($line.Contains($teardownBeginning))
+        {
+            return [LineType]::Teardown;
+        }
+        elseif ($line.Contains($propertyBeginning))
+        {
+            return [LineType]::Property;
+        }
+        elseif ($line.StartsWith($testModuleIndentation) -and -not $line.StartsWith("$testModuleIndentation "))
+        {
+            return [LineType]::TestModule;
+        }
+        elseif ($line.StartsWith($testClassIndentation) -and -not $line.StartsWith("$testClassIndentation "))
+        {
+            return [LineType]::TestClass;
+        }
+        elseif ($line.StartsWith($testIndentation) -and -not $line.StartsWith("$testIndentation "))
+        {
+            return [LineType]::Test;
+        }
+        else
+        {
+            return [LineType]::None;
+        }
+    }
+
+    [string[]]$lines = $taefOutput.Split(@([Environment]::NewLine, "`n"), [StringSplitOptions]::RemoveEmptyEntries)
+    [System.Collections.Generic.List[TestModule]]$testModules = @()
+
+    [TestModule]$currentTestModule = $null
+    [TestClass]$currentTestClass = $null
+    [Test]$currentTest = $null
+
+    [TestCollection]$lastTestCollection = $null
+
+    foreach ($rawLine in $lines)
+    {
+        [LineType]$lineType = (Get-LineType $rawLine)
+
+        # We don't need the whitespace around the line anymore, so we'll discard it to make things easier.
+        [string]$line = $rawLine.Trim()
+
+        if ($lineType -eq [LineType]::TestModule)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            if ($currentTestModule -ne $null)
+            {
+                $testModules.Add($currentTestModule)
+            }
+
+            $currentTestModule = [TestModule]::new($line)
+            $currentTestClass = $null
+            $currentTest = $null
+            $lastTestCollection = $currentTestModule
+        }
+        elseif ($lineType -eq [LineType]::TestClass)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            $currentTestClass = [TestClass]::new($line)
+            $currentTest = $null
+            $lastTestCollection = $currentTestClass
+        }
+        elseif ($lineType -eq [LineType]::Test)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            $currentTest = [Test]::new($line)
+            $lastTestCollection = $currentTest
+        }
+        elseif ($lineType -eq [LineType]::Setup)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.SetupMethodName = $line.Replace($setupBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Teardown)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.TeardownMethodName = $line.Replace($teardownBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Property)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                foreach ($match in [Regex]::Matches($line, "Property\[(.*)\]\s+=\s+(.*)"))
+                {
+                    [string]$propertyKey = $match.Groups[1].Value;
+                    [string]$propertyValue = $match.Groups[2].Value;
+                    $lastTestCollection.Properties.Add($propertyKey, $propertyValue);
+                }
+            }
+        }
+    }
+
+    if ($currentTest -ne $null -and $currentTestClass -ne $null)
+    {
+        $currentTestClass.Tests.Add($currentTest)
+    }
+
+    if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+    {
+        $currentTestModule.TestClasses.Add($currentTestClass)
+    }
+
+    if ($currentTestModule -ne $null)
+    {
+        $testModules.Add($currentTestModule)
+    }
+
+    return $testModules
+}
+
+Write-Verbose "TaefQuery = $TaefQuery"
+
+$TaefSelectQuery = ""
+$TaefQueryToAppend = ""
+if($TaefQuery)
+{
+    $TaefSelectQuery = "/select:`"$TaefQuery`""
+    $TaefQueryToAppend = " and $TaefQuery"
+}
+Write-Verbose "TaefSelectQuery = $TaefSelectQuery"
+
+
+$taefExe = "$TaefPath\te.exe"
+[string]$taefOutput = & "$taefExe" /listproperties $TaefSelectQuery $TestFile | Out-String
+
+[System.Collections.Generic.List[TestModule]]$testModules = (Parse-TestInfo $taefOutput)
+
+$projFileContent = @"
+<Project>
+  <ItemGroup>
+"@
+
+foreach ($testModule in $testModules)
+{
+    foreach ($testClass in $testModules.TestClasses)
+    {
+        Write-Host "Generating Helix work item for test class $($testClass.Name)..."
+        [System.Collections.Generic.List[string]]$testSuiteNames = @()
+        
+        $testSuiteExists = $false
+        $suitelessTestExists = $false
+
+        foreach ($test in $testClass.Tests)
+        {
+            # A test method inherits its 'TestSuite' property from its TestClass
+            if (!$test.Properties.ContainsKey("TestSuite") -and $testClass.Properties.ContainsKey("TestSuite"))
+            {
+                $test.Properties["TestSuite"] = $testClass.Properties["TestSuite"]
+            }
+
+            if ($test.Properties.ContainsKey("TestSuite"))
+            {
+                [string]$testSuite = $test.Properties["TestSuite"]
+
+                if (-not $testSuiteNames.Contains($testSuite))
+                {
+                    Write-Host "    Found test suite $testSuite. Generating Helix work item for it as well."
+                    $testSuiteNames.Add($testSuite)
+                }
+
+                $testSuiteExists = $true
+            }
+            else
+            {
+                $suitelessTestExists = $true
+            }
+        }
+        
+        $testClassSelectPattern = "$($testClass.Name).*"
+        if($testClass.Name.Contains("::"))
+        {
+            $testClassSelectPattern = "$($testClass.Name)::*"
+        }
+        $testNameQuery= "(@Name='$testClassSelectPattern')"
+
+        $workItemName = $testClass.Name
+        # Native tests use '::' as a separator, which is not valid for workItem names.
+        $workItemName = $workItemName -replace "::", "-"
+        
+        if ($suitelessTestExists)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*'$(if ($testSuiteExists) { "and not @TestSuite='*'" }))$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+        
+        foreach ($testSuiteName in $testSuiteNames)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)-$testSuiteName" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*' and @TestSuite='$testSuiteName')$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+    }
+}
+
+$projFileContent += @"
+
+  </ItemGroup>
+</Project>
+"@
+
+Set-Content $OutputProjFile $projFileContent -NoNewline -Encoding UTF8
--- a/build/Helix/HelixTestHelpers.cs
+++ b/build/Helix/HelixTestHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
--- a/build/Helix/InstallTestAppDependencies.ps1
+++ b/build/Helix/InstallTestAppDependencies.ps1
@@ -0,0 +1,12 @@
+# Displaying progress is unnecessary and is just distracting.
+$ProgressPreference = "SilentlyContinue"
+
+$dependencyFiles = Get-ChildItem -Filter "*Microsoft.VCLibs.*.appx"
+
+foreach ($file in $dependencyFiles)
+{
+    Write-Host "Adding dependency $($file)..."
+
+    Add-AppxPackage $file
+    
+}
--- a/build/Helix/OutputFailedTestQuery.ps1
+++ b/build/Helix/OutputFailedTestQuery.ps1
@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath
+)
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+[HelixTestHelpers.FailedTestDetector]::OutputFailedTestQuery($WttInputPath)
--- a/build/Helix/OutputSubResultsJsonFiles.ps1
+++ b/build/Helix/OutputSubResultsJsonFiles.ps1
@@ -0,0 +1,32 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttSingleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttMultipleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TestNamePrefix
+)
+
+# Ideally these would be passed as parameters to the script. However ps makes it difficult to deal with string literals containing '&', so we just 
+# read the values directly from the environment variables
+$helixResultsContainerUri = $Env:HELIX_RESULTS_CONTAINER_URI
+$helixResultsContainerRsas = $Env:HELIX_RESULTS_CONTAINER_RSAS
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+$testResultParser = [HelixTestHelpers.TestResultParser]::new($TestNamePrefix, $helixResultsContainerUri, $helixResultsContainerRsas)
+[System.Collections.Generic.Dictionary[string, string]]$subResultsJsonByMethodName = $testResultParser.GetSubResultsJsonByMethodName($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath)
+
+$subResultsJsonDirectory = [System.IO.Path]::GetDirectoryName($WttInputPath)
+
+foreach ($methodName in $subResultsJsonByMethodName.Keys)
+{
+    $subResultsJson = $subResultsJsonByMethodName[$methodName]
+    $subResultsJsonPath = [System.IO.Path]::Combine($subResultsJsonDirectory, $methodName + "_subresults.json")
+    Out-File $subResultsJsonPath -Encoding utf8 -InputObject $subResultsJson
+}
--- a/build/Helix/OutputTestResults.ps1
+++ b/build/Helix/OutputTestResults.ps1
@@ -0,0 +1,131 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [int]$MinimumExpectedTestsExecutedCount,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI,
+    [bool]$CheckJobAttempt
+)
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+Write-Host "Checking test results..."
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
+Write-Host "queryUri = $queryUri"
+
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+[System.Collections.Generic.List[string]]$failingTests = @()
+[System.Collections.Generic.List[string]]$unreliableTests = @()
+[System.Collections.Generic.List[string]]$unexpectedResultTest = @()
+
+[System.Collections.Generic.List[string]]$namesOfProcessedTestRuns = @()
+$totalTestsExecutedCount = 0
+
+# We assume that we only have one testRun with a given name that we care about
+# We only process the last testRun with a given name (based on completedDate)
+# The name of a testRun is set to the Helix queue that it was run on (e.g. windows.10.amd64.client19h1.xaml)
+# If we have multiple test runs on the same queue that we care about, we will need to re-visit this logic
+foreach ($testRun in ($testRuns.value | Sort-Object -Property "completedDate" -Descending))
+{
+    if ($CheckJobAttempt)
+    {
+        if ($namesOfProcessedTestRuns -contains $testRun.name)
+        {
+            Write-Host "Skipping test run '$($testRun.name)', since we have already processed a test run of that name."
+            continue
+        }
+    }
+    
+    Write-Host "Processing results from test run '$($testRun.name)'"
+    $namesOfProcessedTestRuns.Add($testRun.name)
+
+    $totalTestsExecutedCount += $testRun.totalTests
+
+    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
+        
+    foreach ($testResult in $testResults.value)
+    {
+        $shortTestCaseTitle = $testResult.testCaseTitle -replace "[a-zA-Z0-9]+.[a-zA-Z0-9]+.Windows.UI.Xaml.Tests.MUXControls.",""
+
+        if ($testResult.outcome -eq "Failed")
+        {
+            if (-not $failingTests.Contains($shortTestCaseTitle))
+            {
+                $failingTests.Add($shortTestCaseTitle)
+            }
+        }
+        elseif ($testResult.outcome -eq "Warning")
+        {
+            if (-not $unreliableTests.Contains($shortTestCaseTitle))
+            {
+                $unreliableTests.Add($shortTestCaseTitle)
+            }
+        }
+        elseif ($testResult.outcome -ne "Passed")
+        {
+            # We should only see tests with result "Passed", "Failed" or "Warning"
+            if (-not $unexpectedResultTest.Contains($shortTestCaseTitle))
+            {
+                $unexpectedResultTest.Add($shortTestCaseTitle)
+            }
+        }
+    }
+}
+
+if ($unreliableTests.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=warning;]Unreliable tests:
+##vso[task.logissue type=warning;]$($unreliableTests -join "$([Environment]::NewLine)##vso[task.logissue type=warning;]")
+
+"@
+}
+
+if ($failingTests.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=error;]Failing tests:
+##vso[task.logissue type=error;]$($failingTests -join "$([Environment]::NewLine)##vso[task.logissue type=error;]")
+
+"@
+}
+
+if ($unexpectedResultTest.Count -gt 0)
+{
+    Write-Host @"
+##vso[task.logissue type=error;]Tests with unexpected results:
+##vso[task.logissue type=error;]$($unexpectedResultTest -join "$([Environment]::NewLine)##vso[task.logissue type=error;]")
+
+"@
+}
+
+if($totalTestsExecutedCount -lt $MinimumExpectedTestsExecutedCount)
+{
+    Write-Host "Expected at least $MinimumExpectedTestsExecutedCount tests to be executed."
+    Write-Host "Actual executed test count is: $totalTestsExecutedCount"
+    Write-Host "##vso[task.complete result=Failed;]"
+}
+elseif ($failingTests.Count -gt 0)
+{
+    Write-Host "At least one test failed."
+    Write-Host "##vso[task.complete result=Failed;]"
+}
+elseif ($unreliableTests.Count -gt 0)
+{
+    Write-Host "All tests eventually passed, but some initially failed."
+    Write-Host "##vso[task.complete result=Succeeded;]"
+}
+else
+{
+    Write-Host "All tests passed."
+    Write-Host "##vso[task.complete result=Succeeded;]"
+}
--- a/build/Helix/PrepareHelixPayload.ps1
+++ b/build/Helix/PrepareHelixPayload.ps1
@@ -0,0 +1,54 @@
+[CmdLetBinding()]
+Param(
+    [string]$Platform,
+    [string]$Configuration,
+    [string]$ArtifactName='drop'
+)
+
+$payloadDir = "HelixPayload\$Configuration\$Platform"
+
+$repoDirectory = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\"
+$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
+ 
+# Create the payload directory. Remove it if it already exists.
+If(test-path $payloadDir)
+{
+    Remove-Item $payloadDir -Recurse
+}
+New-Item -ItemType Directory -Force -Path $payloadDir
+
+# Copy files from nuget packages
+Copy-Item "$nugetPackagesDir\microsoft.windows.apps.test.1.0.181203002\lib\netcoreapp2.1\*.dll" $payloadDir
+Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\*" $payloadDir
+Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\CoreClr\*" $payloadDir
+New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
+
+function Copy-If-Exists
+{
+    Param($source, $destinationDir)
+
+    if (Test-Path $source)
+    {
+        Write-Host "Copy from '$source' to '$destinationDir'"
+        Copy-Item -Force $source $destinationDir
+    }
+    else
+    {
+        Write-Host "'$source' does not exist."
+    }
+}
+
+# Copy files from the 'drop' artifact dir
+Copy-Item "$repoDirectory\Artifacts\$ArtifactName\$Configuration\$Platform\Test\*" $payloadDir -Recurse
+
+# Copy files from the repo
+New-Item -ItemType Directory -Force -Path "$payloadDir"
+Copy-Item "build\helix\ConvertWttLogToXUnit.ps1" "$payloadDir"
+Copy-Item "build\helix\OutputFailedTestQuery.ps1" "$payloadDir"
+Copy-Item "build\helix\OutputSubResultsJsonFiles.ps1" "$payloadDir"
+Copy-Item "build\helix\HelixTestHelpers.cs" "$payloadDir"
+Copy-Item "build\helix\runtests.cmd" $payloadDir
+Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir"
+Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"
--- a/build/Helix/ProcessHelixFiles.ps1
+++ b/build/Helix/ProcessHelixFiles.ps1
@@ -0,0 +1,112 @@
+Param(
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$HelixAccessToken = $env:HelixAccessToken,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI,
+    [string]$OutputFolder = "HelixOutput"
+)
+
+$helixLinkFile = "$OutputFolder\LinksToHelixTestFiles.html"
+
+$accessTokenParam = ""
+if($HelixAccessToken)
+{
+    $accessTokenParam = "?access_token=$HelixAccessToken"
+}
+
+function Generate-File-Links
+{
+    Param ([Array[]]$files,[string]$sectionName)
+    if($files.Count -gt 0)
+    {
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<div class=$sectionName>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<h4>$sectionName</h4>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "<ul>"
+        foreach($file in $files)
+        {
+            Out-File -FilePath $helixLinkFile -Append -InputObject "<li><a href=$($file.Link)>$($file.Name)</a></li>"
+        }
+        Out-File -FilePath $helixLinkFile -Append -InputObject "</ul>"
+        Out-File -FilePath $helixLinkFile -Append -InputObject "</div>"
+    }
+}
+
+#Create output directory
+New-Item $OutputFolder -ItemType Directory
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
+Write-Host "queryUri = $queryUri"
+
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+$webClient = New-Object System.Net.WebClient
+[System.Collections.Generic.List[string]]$workItems = @()
+
+foreach ($testRun in $testRuns.value)
+{
+    $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
+    $isTestRunNameShown = $false
+
+    foreach ($testResult in $testResults.value)
+    {
+        if ("comment" -in $testResult)
+        {
+            $info = ConvertFrom-Json $testResult.comment
+            $helixJobId = $info.HelixJobId
+            $helixWorkItemName = $info.HelixWorkItemName
+
+            $workItem = "$helixJobId-$helixWorkItemName"
+
+            if (-not $workItems.Contains($workItem))
+            {
+                $workItems.Add($workItem)
+                $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files$accessTokenParam"
+                $files = Invoke-RestMethod -Uri $filesQueryUri -Method Get
+
+                $screenShots = $files | where { $_.Name.EndsWith(".jpg") }
+                $dumps = $files | where { $_.Name.EndsWith(".dmp") }
+                $pgcFiles = $files | where { $_.Name.EndsWith(".pgc") }
+                if ($screenShots.Count + $dumps.Count + $pgcFiles.Count -gt 0)
+                {
+                    if(-Not $isTestRunNameShown)
+                    {
+                        Out-File -FilePath $helixLinkFile -Append -InputObject "<h2>$($testRun.name)</h2>"
+                        $isTestRunNameShown = $true
+                    }
+                    Out-File -FilePath $helixLinkFile -Append -InputObject "<h3>$helixWorkItemName</h3>"
+                    Generate-File-Links $screenShots "Screenshots"
+                    Generate-File-Links $dumps "CrashDumps"
+                    Generate-File-Links $pgcFiles "PGC files"
+                    $misc = $files | where { ($screenShots -NotContains $_) -And ($dumps -NotContains $_) -And ($visualTreeVerificationFiles -NotContains $_) -And ($pgcFiles -NotContains $_) }
+                    Generate-File-Links $misc "Misc"
+
+                    foreach($pgcFile in $pgcFiles)
+                    {
+                        $flavorPath = $pgcFile.Name.Split('.')[0]
+                        $archPath = $pgcFile.Name.Split('.')[1]
+                        $fileName = $pgcFile.Name.Remove(0, $flavorPath.length + $archPath.length + 2)
+                        $fullPath = "$OutputFolder\PGO\$flavorPath\$archPath"
+                        $destination = "$fullPath\$fileName"
+
+                        Write-Host "Copying $($pgcFile.Name) to $destination"
+
+                        if (-Not (Test-Path $fullPath))
+                        {
+                            New-Item $fullPath -ItemType Directory
+                        }
+
+                        $link = "$($pgcFile.Link)$accessTokenParam"
+                        $webClient.DownloadFile($link, $destination)
+                    }
+                }
+            }
+        }
+    }
+}
--- a/build/Helix/RunTestsInHelix.proj
+++ b/build/Helix/RunTestsInHelix.proj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <PropertyGroup>
+    <HelixSource>pr/terminal/$(BUILD_SOURCEBRANCH)/</HelixSource>
+    <EnableXUnitReporter>true</EnableXUnitReporter>
+    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
+    <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
+    <HelixPreCommands>$(HelixPreCommands);set testnameprefix=$(Configuration).$(Platform);set testbuildplatform=$(Platform);set rerunPassesRequiredToAvoidFailure=$(rerunPassesRequiredToAvoidFailure)</HelixPreCommands>
+    <OutputPath>..\..\bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" />
+  </ItemGroup>
+  
+  <!-- These .proj files are generated by the build machine prior to running tests via GenerateTestProjFile.ps1. -->
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-TerminalAppLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-HostTestsUIA.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+</Project>
--- a/build/Helix/UpdateUnreliableTests.ps1
+++ b/build/Helix/UpdateUnreliableTests.ps1
@@ -0,0 +1,135 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory = $true)] 
+    [int]$RerunPassesRequiredToAvoidFailure,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI
+)
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri
+Write-Host "queryUri = $queryUri"
+
+# To account for unreliable tests, we'll iterate through all of the tests associated with this build, check to see any tests that were unreliable
+# (denoted by being marked as "skipped"), and if so, we'll instead mark those tests with a warning and enumerate all of the attempted runs
+# with their pass/fail states as well as any relevant error messages for failed attempts.
+$testRuns = Invoke-RestMethod -Uri $queryUri -Method Get -Headers $azureDevOpsRestApiHeaders
+
+$timesSeenByRunName = @{}
+      
+foreach ($testRun in $testRuns.value)
+{
+    $testRunResultsUri = "$($testRun.url)/results?api-version=5.0"
+        
+    Write-Host "Marking test run `"$($testRun.name)`" as in progress so we can change its results to account for unreliable tests."
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "InProgress" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+
+    Write-Host "Retrieving test results..."
+    $testResults = Invoke-RestMethod -Uri $testRunResultsUri -Method Get -Headers $azureDevOpsRestApiHeaders
+        
+    foreach ($testResult in $testResults.value)
+    {
+        $testNeedsSubResultProcessing = $false
+        if ($testResult.outcome -eq "NotExecuted")
+        {
+            $testNeedsSubResultProcessing = $true
+        }
+        elseif($testResult.outcome -eq "Failed")
+        {
+            $testNeedsSubResultProcessing = $testResult.errorMessage -like "*_subresults.json*"
+        }
+
+        if ($testNeedsSubResultProcessing)
+        {
+            Write-Host "  Test $($testResult.testCaseTitle) was detected as unreliable. Updating..."
+            
+            # The errorMessage field contains a link to the JSON-encoded rerun result data.
+            $rerunResults = ConvertFrom-Json (New-Object System.Net.WebClient).DownloadString($testResult.errorMessage)
+            [System.Collections.Generic.List[System.Collections.Hashtable]]$rerunDataList = @()
+            $attemptCount = 0
+            $passCount = 0
+            $totalDuration = 0
+            
+            foreach ($rerun in $rerunResults.results)
+            {
+                $rerunData = @{
+                    "displayName" = "Attempt #$($attemptCount + 1) - $($testResult.testCaseTitle)";
+                    "durationInMs" = $rerun.duration;
+                    "outcome" = $rerun.outcome;
+                }
+
+                if ($rerun.outcome -eq "Passed")
+                {
+                    $passCount++
+                }
+                
+                if ($attemptCount -gt 0)
+                {
+                    $rerunData["sequenceId"] = $attemptCount
+                }
+
+                Write-Host "    Attempt #$($attemptCount + 1): $($rerun.outcome)"
+                
+                if ($rerun.outcome -ne "Passed")
+                {
+                    $screenshots = "$($rerunResults.blobPrefix)/$($rerun.screenshots -join @"
+$($rerunResults.blobSuffix)
+$($rerunResults.blobPrefix)
+"@)$($rerunResults.blobSuffix)"
+
+                    # We subtract 1 from the error index because we added 1 so we could use 0
+                    # as a default value not injected into the JSON in order to keep its size down.
+                    # We did this because there's a maximum size enforced for the errorMessage parameter
+                    # in the Azure DevOps REST API.
+                    $fullErrorMessage = @"
+Log: $($rerunResults.blobPrefix)/$($rerun.log)$($rerunResults.blobSuffix)
+
+Screenshots:
+$screenshots
+
+Error log:
+$($rerunResults.errors[$rerun.errorIndex - 1])
+"@
+
+                    $rerunData["errorMessage"] = $fullErrorMessage
+                }
+                
+                $attemptCount++
+                $totalDuration += $rerun.duration
+                $rerunDataList.Add($rerunData)
+            }
+
+            $overallOutcome = "Warning"
+            
+            if ($attemptCount -eq 2)
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on the immediate rerun, so we'll mark it as unreliable."
+            }
+            elseif ($passCount -gt $RerunPassesRequiredToAvoidFailure)
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on $passCount of $attemptCount attempts, which is greater than or equal to the $RerunPassesRequiredToAvoidFailure passes required to avoid being marked as failed. Marking as unreliable."
+            }
+            else
+            {
+                Write-Host "  Test $($testResult.testCaseTitle) passed on only $passCount of $attemptCount attempts, which is less than the $RerunPassesRequiredToAvoidFailure passes required to avoid being marked as failed. Marking as failed."
+                $overallOutcome = "Failed"
+            }
+            
+            $updateBody = ConvertTo-Json @(@{ "id" = $testResult.id; "outcome" = $overallOutcome; "errorMessage" = " "; "durationInMs" = $totalDuration; "subResults" = $rerunDataList; "resultGroupType" = "rerun" }) -Depth 5
+            Invoke-RestMethod -Uri $testRunResultsUri -Method Patch -Headers $azureDevOpsRestApiHeaders -Body $updateBody -ContentType "application/json" | Out-Null
+        }
+    }
+        
+    Write-Host "Finished updates. Re-marking test run `"$($testRun.name)`" as completed."
+    Invoke-RestMethod -Uri "$($testRun.url)?api-version=5.0" -Method Patch -Body (ConvertTo-Json @{ "state" = "Completed" }) -Headers $azureDevOpsRestApiHeaders -ContentType "application/json" | Out-Null
+}
--- a/build/Helix/global.json
+++ b/build/Helix/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20277.5"
+  }
+}
--- a/build/Helix/packages.config
+++ b/build/Helix/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
+  <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
+  <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
+  <package id="runtime.win-x64.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
+</packages>
--- a/build/Helix/readme.md
+++ b/build/Helix/readme.md
@@ -0,0 +1,32 @@
+This directory contains code and configuration files to run WinUI tests in Helix.
+
+Helix is a cloud hosted test execution environment which is accessed via the Arcade SDK.
+More details:
+* [Arcade](https://github.com/dotnet/arcade)
+* [Helix](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk)
+
+WinUI tests are scheduled in Helix by the Azure DevOps Pipeline: [RunHelixTests.yml](../RunHelixTests.yml).
+
+The workflow is as follows:
+1. NuGet Restore is called on the packages.config in this directory. This downloads any runtime dependencies 
+that are needed to run tests.
+2. PrepareHelixPayload.ps1 is called. This copies the necessary files from various locations into a Helix 
+payload directory. This directory is what will get sent to the Helix machines.
+3. RunTestsInHelix.proj is executed. This proj has a dependency on 
+[Microsoft.DotNet.Helix.Sdk](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk) 
+which it uses to publish the Helix payload directory and to schedule the Helix Work Items. The WinUI tests 
+are parallelized into multiple Helix Work Items.
+4. Each Helix Work Item calls [runtests.cmd](runtests.cmd) with a specific query to pass to 
+[TAEF](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) which runs the tests.
+5. If a test is detected to have failed, we run it again, first once, then eight more times if it fails again.
+If it fails all ten times, we report the test as failed; otherwise, we report it as unreliable,
+which will show up as a warning, but which will not fail the build.  When a test is reported as unreliable,
+we include the results for each individual run via a JSON string in the original test's errorMessage field.
+6. TAEF produces logs in WTT format. Helix is able to process logs in XUnit format. We run 
+[ConvertWttLogToXUnit.ps1](ConvertWttLogToXUnit.ps1) to convert the logs into the necessary format.
+7. RunTestsInHelix.proj has EnableAzurePipelinesReporter set to true. This allows the XUnit formatted test 
+results to be reported back to the Azure DevOps Pipeline.
+8. We process unreliable tests once all tests have been reported by reading the JSON string from the
+errorMessage field and calling the Azure DevOps REST API to modify the unreliable tests to have sub-results
+added to the test and to mark the test as "warning", which will enable people to see exactly how the test
+failed in runs where it did.
--- a/build/Helix/runtests.cmd
+++ b/build/Helix/runtests.cmd
@@ -0,0 +1,106 @@
+setlocal ENABLEDELAYEDEXPANSION
+
+echo %TIME%
+
+robocopy %HELIX_CORRELATION_PAYLOAD% . /s /NP > NUL
+
+echo %TIME%
+
+reg add HKLM\Software\Policies\Microsoft\Windows\Appx /v AllowAllTrustedApps /t REG_DWORD /d 1 /f
+
+rem enable dump collection for our test apps:
+rem note, this script is run from a 32-bit cmd, but we need to set the native reg-key
+FOR %%A IN (TestHostApp.exe,te.exe,te.processhost.exe,conhost.exe,OpenConsole.exe,WindowsTerminal.exe) DO (
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpFolder /t REG_EXPAND_SZ /d %HELIX_DUMP_FOLDER% /f
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpType /t REG_DWORD /d 2 /f
+  %systemroot%\sysnative\cmd.exe /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\%%A" /v DumpCount /t REG_DWORD /d 10 /f
+)
+
+echo %TIME%
+
+:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are 
+:: expected to show UI we don't want it running.
+taskkill -f -im dhandler.exe
+
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\EnsureMachineState.ps1
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
+echo %TIME%
+
+set testBinaryCandidates=TerminalApp.LocalTests.dll Conhost.UIA.Tests.dll
+set testBinaries=
+for %%B in (%testBinaryCandidates%) do (
+    if exist %%B (
+        set "testBinaries=!testBinaries! %%B"
+    )
+)
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError %*
+echo %TIME%
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+move te.wtl te_original.wtl
+
+copy /y te_original.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+for /f "tokens=* delims=" %%a in ('dir /b *.pgc') do ren "%%a" "%testnameprefix%.%%~na.pgc"
+copy /y *.pgc %HELIX_WORKITEM_UPLOAD_ROOT%
+
+set FailedTestQuery=
+for /F "tokens=* usebackq" %%I IN (`powershell -ExecutionPolicy Bypass .\OutputFailedTestQuery.ps1 te_original.wtl`) DO (
+  set FailedTestQuery=%%I
+)
+
+rem The first time, we'll just re-run failed tests once.  In many cases, tests fail very rarely, such that
+rem a single re-run will be sufficient to detect many unreliable tests.
+if "%FailedTestQuery%" == "" goto :SkipReruns
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError /select:"%FailedTestQuery%"
+echo %TIME%
+
+move te.wtl te_rerun.wtl
+
+copy /y te_rerun.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+
+rem If there are still failing tests remaining, we'll run them eight more times, so they'll have been run a total of ten times.
+rem If any tests fail all ten times, we can be pretty confident that these are actual test failures rather than unreliable tests.
+if not exist te_rerun.wtl goto :SkipReruns
+
+set FailedTestQuery=
+for /F "tokens=* usebackq" %%I IN (`powershell -ExecutionPolicy Bypass .\OutputFailedTestQuery.ps1 te_rerun.wtl`) DO (
+  set FailedTestQuery=%%I
+)
+
+if "%FailedTestQuery%" == "" goto :SkipReruns
+
+echo %TIME%
+te.exe %testBinaries% /enablewttlogging /unicodeOutput:false /sessionTimeout:0:15 /testtimeout:0:10 /screenCaptureOnError /testmode:Loop /LoopTest:8 /select:"%FailedTestQuery%"
+echo %TIME%
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+move te.wtl te_rerun_multiple.wtl
+
+copy /y te_rerun_multiple.wtl %HELIX_WORKITEM_UPLOAD_ROOT%
+copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT%
+powershell -ExecutionPolicy Bypass .\CopyVisualTreeVerificationFiles.ps1
+
+:SkipReruns
+
+powershell -ExecutionPolicy Bypass Get-Process
+
+echo %TIME%
+powershell -ExecutionPolicy Bypass .\OutputSubResultsJsonFiles.ps1 te_original.wtl te_rerun.wtl te_rerun_multiple.wtl %testnameprefix%
+powershell -ExecutionPolicy Bypass .\ConvertWttLogToXUnit.ps1 te_original.wtl te_rerun.wtl te_rerun_multiple.wtl testResults.xml %testnameprefix%
+echo %TIME%
+
+copy /y *_subresults.json %HELIX_WORKITEM_UPLOAD_ROOT%
+
+type testResults.xml
+
+echo %TIME%
--- a/build/config/GitCheckin.json
+++ b/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"
-      }
-    ]
-  }
--- a/build/config/PolicheckExclusions.xml
+++ b/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>
--- a/build/config/SignConfig.NuGet.xml
+++ b/build/config/SignConfig.NuGet.xml
@@ -0,0 +1,5 @@
+<SignConfigXML>
+  <job platform="" configuration="" dest="__INPATHROOT__" jobname="EngFunSimpleSign" approvers="">
+   <file src="__INPATHROOT__\Microsoft.Terminal*.nupkg" signType="NuGet" /> 
+  </job>
+</SignConfigXML>
--- a/build/config/SignConfig.WindowsTerminal.xml
+++ b/build/config/SignConfig.WindowsTerminal.xml
@@ -0,0 +1,5 @@
+<SignConfigXML>
+  <job platform="" configuration="" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" jobname="EngFunSimpleSign" approvers="">
+   <file src="__INPATHROOT__\Microsoft.WindowsTerminal*.msixbundle" signType="136020001" />
+  </job>
+</SignConfigXML>
--- a/build/config/esrp.build.batch.conpty.json
+++ b/build/config/esrp.build.batch.conpty.json
@@ -1,47 +0,0 @@
-[
-    {
-        "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"
-                }
-            ]
-        }
-    }
-]
--- a/build/config/esrp.build.batch.terminal_constituents.json
+++ b/build/config/esrp.build.batch.terminal_constituents.json
@@ -1,65 +0,0 @@
-[
-    {
-        "MatchedPath": [
-            // Namespaced DLLs
-            "PackageContents/Microsoft.Terminal.*.dll",
-            "PackageContents/Microsoft.Terminal.*.winmd",
-
-            // ConPTY and DefTerm
-            "PackageContents/OpenConsole.exe",
-            "PackageContents/OpenConsoleProxy.dll",
-
-            // Legacy DLLs with old names
-            "PackageContents/TerminalApp.dll",
-            "PackageContents/TerminalApp.winmd",
-            "PackageContents/TerminalConnection.dll",
-            "PackageContents/TerminalThemeHelpers.dll",
-            "PackageContents/WindowsTerminalShellExt.dll",
-
-            // The rest
-            "PackageContents/TerminalAzBridge.exe",
-            "PackageContents/wt.exe",
-            "PackageContents/WindowsTerminal.exe",
-            "PackageContents/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"
-                }
-            ]
-        }
-    }
-]
--- a/build/config/esrp.build.batch.wpf.json
+++ b/build/config/esrp.build.batch.wpf.json
@@ -1,46 +0,0 @@
-[
-    {
-        "MatchedPath": [
-            "PublicTerminalCore.dll"
-        ],
-        "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"
-                }
-            ]
-        }
-    }
-]
--- a/build/config/esrp.build.batch.wpfdotnet.json
+++ b/build/config/esrp.build.batch.wpfdotnet.json
@@ -1,47 +0,0 @@
-[
-    {
-        "MatchedPath": [
-            "WpfTerminalControl/net472/Microsoft.Terminal.Wpf.dll",
-            "WpfTerminalControl/net6.0-windows/Microsoft.Terminal.Wpf.dll"
-        ],
-        "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"
-                }
-            ]
-        }
-    }
-]
--- a/build/config/release.gdnbaselines
+++ b/build/config/release.gdnbaselines
--- a/build/config/tsa.json
+++ b/build/config/tsa.json
@@ -1,6 +0,0 @@
-{
-    "instanceUrl": "https://microsoft.visualstudio.com",
-    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\Terminal",
-    "notificationAliases": ["condev@microsoft.com", "duhowett@microsoft.com"]
-}
--- a/build/packages.config
+++ b/build/packages.config
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
+  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
 </packages>
--- a/build/pgo/PGO.DB.proj
+++ b/build/pgo/PGO.DB.proj
@@ -1,5 +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.props" />
-  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.targets" />
-</Project>
--- a/build/pgo/Terminal.PGO.DB.nuspec
+++ b/build/pgo/Terminal.PGO.DB.nuspec
@@ -1,17 +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"/>
-    <file src="arm64\*.pgd" target="tools\arm64"/>
-  </files>
-</package>
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -1,50 +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>release-1.18</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>
-
-  <!-- Do not import PGO-Helpers props here, as it is too early to detect the C++ tools directory -->
-</Project>
--- a/build/pipelines/ci.yml
+++ b/build/pipelines/ci.yml
@@ -29,80 +29,42 @@ variables:
 #     0.0.1904.0900
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)

-parameters:
-  - name: auditMode
-    displayName: "Build in Audit Mode (x64)"
-    type: boolean
-    default: true
-  - name: runTests
-    displayName: "Run Tests"
-    type: boolean
-    default: true
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-
 stages:
-  - ${{ if eq(parameters.auditMode, true) }}:
-    - stage: Audit_x64
-      displayName: Audit Mode
-      dependsOn: []
-      jobs:
-        - template: ./templates-v2/job-build-project.yml
-          parameters:
-            pool:
-              ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-OSS-L
-              ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-INT-L
-            buildPlatforms: [x64]
-            buildConfigurations: [AuditMode]
-            buildEverything: true
-            keepAllExpensiveBuildOutputs: false
-
-  - stage: CodeHealth
-    displayName: Code Health
+  - stage: Audit_x64
+    displayName: Audit Mode
+    dependsOn: []
+    condition: succeeded()
+    jobs:
+      - template: ./templates/build-console-audit-job.yml
+        parameters:
+          platform: x64
+  - stage: Build_x64
+    displayName: Build x64
+    dependsOn: []
+    condition: succeeded()
+    jobs:
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: x64
+  - stage: Build_x86
+    displayName: Build x86
    dependsOn: []
    jobs:
-      - template: ./templates-v2/job-check-code-format.yml
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: x86
+  - stage: Build_ARM64
+    displayName: Build ARM64
+    dependsOn: []
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
+    jobs:
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: ARM64
+  - stage: Scripts
+    displayName: Code Health Scripts
+    dependsOn: []
+    condition: succeeded()
+    jobs:
+      - template: ./templates/check-formatting.yml

-  - ${{ each platform in parameters.buildPlatforms }}:
-    - stage: Build_${{ platform }}
-      displayName: Build ${{ platform }}
-      dependsOn: []
-      jobs:
-        - template: ./templates-v2/job-build-project.yml
-          parameters:
-            pool:
-              ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-OSS-L
-              ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-INT-L
-            buildPlatforms:
-              - ${{ platform }}
-            buildConfigurations: [Release]
-            buildEverything: true
-            keepAllExpensiveBuildOutputs: false
-
-    - ${{ if eq(parameters.runTests, true) }}:
-      - stage: Test_${{ platform }}
-        displayName: Test ${{ platform }}
-        dependsOn:
-          - Build_${{ platform }}
-        condition: succeeded()
-        jobs:
-          - template: ./templates-v2/job-test-project.yml
-            parameters:
-              platform: ${{ platform }}
-              # The tests might be run more than once; log one artifact per attempt.
-              outputArtifactStem: -$(System.JobAttempt)
-
-  - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-    - stage: CodeIndexer
-      displayName: Github CodeNav Indexer
-      dependsOn: []
-      jobs:
-        - template: ./templates-v2/job-index-github-codenav.yml
--- a/build/pipelines/daily-loc-submission.yml
+++ b/build/pipelines/daily-loc-submission.yml
@@ -1,63 +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!
-  fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-  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
-
-# Saving one of these makes it really easy to inspect the loc output...
- powershell: 'tar czf LocOutput.tar.gz LocOutput'
-  displayName: 'Archive Loc Output for Submission'
-
- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: LocOutput'
-  inputs:
-    PathtoPublish: LocOutput.tar.gz
-    ArtifactName: LocOutput
--- a/build/pipelines/feature-flag-ci.yml
+++ b/build/pipelines/feature-flag-ci.yml
@@ -1,40 +0,0 @@
-trigger: none
-
-pr:
-  branches:
-    include:
-      - main
-  paths:
-    include:
-      - src/features.xml
-      - build/pipelines/feature-flag-ci.yml
-
-variables:
-  - name: runCodesignValidationInjectionBG
-    value: false
-
-parameters:
-  - name: buildBrandings
-    type: object
-    default:
-      - Release
-      - Preview
-      # Dev is built automatically
-      # WindowsInbox does not typically build with VS.
-
-stages:
-  - ${{ each branding in parameters.buildBrandings }}:
-    - stage: Build_${{ branding }}
-      dependsOn: []
-      displayName: Build ${{ branding }}
-      jobs:
-        - template: ./templates-v2/job-build-project.yml
-          parameters:
-            pool: # This only runs in CI
-                name: SHINE-OSS-L
-            buildPlatforms: [x64]
-            buildConfigurations: [Release]
-            buildEverything: true
-            branding: ${{ branding }}
-            keepAllExpensiveBuildOutputs: false
-            artifactStem: -${{ branding }} # Disambiguate artifacts with the same config/platform
--- a/build/pipelines/fuzz.yml
+++ b/build/pipelines/fuzz.yml
@@ -1,67 +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
-    displayName: Fuzzing Build
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-      - template: ./templates-v2/job-build-project.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-OSS-L
-            ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-INT-L
-          buildPlatforms: [x64]
-          buildConfigurations: [Fuzzing]
-          buildEverything: true
-          keepAllExpensiveBuildOutputs: false
-
-  - stage: Submit
-    displayName: Submit to OneFuzz
-    dependsOn: [Build]
-    condition: succeeded()
-    jobs:
-      - job:
-        pool:
-          vmImage: 'ubuntu-latest'
-        steps:
-        - task: DownloadPipelineArtifact@2
-          displayName: Download artifacts
-          inputs:
-            artifactName: build-x64-Fuzzing
-            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)/OpenConsoleFuzzer.exe
-            test_name: WriteCharsLegacy
--- a/build/pipelines/nightly.yml
+++ b/build/pipelines/nightly.yml
@@ -1,23 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-extends:
-  template: templates-v2\pipeline-full-release-build.yml
-  parameters:
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    generateSbom: true
-    publishSymbolsToPublic: true
-    publishVpackToWindows: false
-    symbolExpiryTime: 15 # Nightly builds do not keep symbols for very long!
--- a/build/pipelines/ob-nightly.yml
+++ b/build/pipelines/ob-nightly.yml
@@ -1,49 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-parameters:
-  - name: publishToAzure
-    displayName: "Deploy to **PUBLIC** Azure Storage"
-    type: boolean
-    default: true
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: Canary
-  - template: templates-v2/variables-onebranch-config.yml
-
-extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
-  parameters:
-    official: true
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    publishSymbolsToPublic: true
-    publishVpackToWindows: false
-    symbolExpiryTime: 15
-    ${{ if eq(true, parameters.publishToAzure) }}:
-      extraPublishJobs:
-        - template: job-deploy-to-azure-storage.yml
-          parameters:
-            pool: { type: windows }
-            dependsOn: [PublishSymbols]
-            storagePublicRootURL: $(AppInstallerRootURL)
-            subscription: $(AzureSubscriptionName)
-            storageAccount: $(AzureStorageAccount)
-            storageContainer: $(AzureStorageContainer)
-            buildConfiguration: Release
-            buildPlatforms: [x64, x86, arm64]
-            environment: production-canary
-
--- a/build/pipelines/ob-release.yml
+++ b/build/pipelines/ob-release.yml
@@ -1,83 +0,0 @@
-trigger: none
-pr: none
-
-# Expose all of these parameters for user configuration.
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    displayName: "Build Windows Terminal MSIX"
-    type: boolean
-    default: true
-  - name: buildConPTY
-    displayName: "Build ConPTY NuGet"
-    type: boolean
-    default: false
-  - name: buildWPF
-    displayName: "Build Terminal WPF Control"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    displayName: "PGO Build Mode"
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    displayName: "Build Configurations"
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    displayName: "Build Platforms"
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: terminalInternalPackageVersion
-    displayName: "Terminal Internal Package Version"
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    displayName: "Publish VPack to Windows"
-    type: boolean
-    default: false
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
-  - template: templates-v2/variables-onebranch-config.yml
-
-extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
-  parameters:
-    official: true
-    branding: ${{ parameters.branding }}
-    buildTerminal: ${{ parameters.buildTerminal }}
-    buildConPTY: ${{ parameters.buildConPTY }}
-    buildWPF: ${{ parameters.buildWPF }}
-    pgoBuildMode: ${{ parameters.pgoBuildMode }}
-    buildConfigurations: ${{ parameters.buildConfigurations }}
-    buildPlatforms: ${{ parameters.buildPlatforms }}
-    codeSign: true
-    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
-    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
-    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -1,88 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "0 5 * * 2-6" # Run at 05:00 UTC Tuesday through Saturday (Even later than Localization, after the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Instrumentation Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Preview # By default, we'll PGO the Preview builds to get max coverage
-    values:
-      - Release
-      - Preview
-      - Dev
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - arm64
-
-variables:
-  - name: runCodesignValidationInjectionBG
-    value: false
-
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-stages:
-  - stage: Build
-    displayName: Build
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-      - template: ./templates-v2/job-build-project.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-OSS-L
-            ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-INT-L
-          branding: ${{ parameters.branding }}
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          buildConfigurations: [Release]
-          buildEverything: true
-          pgoBuildMode: Instrument
-          artifactStem: -instrumentation
-
-  - stage: RunPGO
-    displayName: Run PGO
-    dependsOn: [Build]
-    condition: succeeded()
-    jobs:
-      - ${{ each platform in parameters.buildPlatforms }}:
-        - template: ./templates-v2/job-run-pgo-tests.yml
-          parameters:
-            # This job chooses its own pools based on platform
-            buildPlatform: ${{ platform }}
-            buildConfiguration: Release
-            artifactStem: -instrumentation
-
-  - stage: FinalizePGO
-    displayName: Finalize PGO and Publish
-    dependsOn: [RunPGO]
-    condition: succeeded()
-    jobs:
-      # This job takes multiple platforms and fans them back in to a single artifact.
-      - template: ./templates-v2/job-pgo-merge-pgd.yml
-        parameters:
-          jobName: MergePGD
-          pool:
-            vmImage: 'windows-2022'
-          buildConfiguration: Release
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          artifactStem: -instrumentation
-
-      - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
-        parameters:
-          pool:
-            vmImage: 'windows-2022'
-          dependsOn: MergePGD
-          buildConfiguration: Release
-          artifactStem: -instrumentation
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@@ -1,84 +1,48 @@
 trigger: none
 pr: none

-# Expose all of these parameters for user configuration.
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Dev
-  - name: buildTerminal
-    displayName: "Build Windows Terminal MSIX"
-    type: boolean
-    default: true
-  - name: buildConPTY
-    displayName: "Build ConPTY NuGet"
-    type: boolean
-    default: false
-  - name: buildWPF
-    displayName: "Build Terminal WPF Control"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    displayName: "PGO Build Mode"
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    displayName: "Build Configurations"
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    displayName: "Build Platforms"
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    displayName: "Sign all build outputs"
-    type: boolean
-    default: true
-  - name: generateSbom
-    displayName: "Generate a Bill of Materials"
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    displayName: "Terminal Internal Package Version"
-    type: string
-    default: '0.0.8'
+variables:
+  baseYearForVersioning: 2019 # Used by build-console-int
+  versionMajor: 0
+  versionMinor: 1

-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    displayName: "Publish VPack to Windows"
-    type: boolean
-    default: false
+# When we move off PackageES for Versioning, we'll need to switch
+# name to this format. For now, though, we need to use DayOfYear.Rev
+# to unique our builds, as mandated by PackageES's Setup task.
+# name: '$(versionMajor).$(versionMinor).$(DayOfYear)$(Rev:r).0'
+#
+# Build name/version number above must end with .0 to make the
+# store publication machinery happy.
+name: 'Terminal_$(date:yyMM).$(date:dd)$(rev:rrr)'

-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+# Build Arguments:
+#   WindowsTerminalOfficialBuild=[true,false]
+#     true - this is running on our build agent
+#     false - running locally
+#   WindowsTerminalBranding=[Dev,Preview,Release]
+#     <none>  - Development build resources (default)
+#     Preview - Preview build resources
+#     Release - regular build resources
+jobs:
+  - template: ./templates/build-console-audit-job.yml
+    parameters:
+      platform: x64

-extends:
-  template: templates-v2/pipeline-full-release-build.yml
-  parameters:
-    branding: ${{ parameters.branding }}
-    buildTerminal: ${{ parameters.buildTerminal }}
-    buildConPTY: ${{ parameters.buildConPTY }}
-    buildWPF: ${{ parameters.buildWPF }}
-    pgoBuildMode: ${{ parameters.pgoBuildMode }}
-    buildConfigurations: ${{ parameters.buildConfigurations }}
-    buildPlatforms: ${{ parameters.buildPlatforms }}
-    codeSign: ${{ parameters.codeSign }}
-    generateSbom: ${{ parameters.generateSbom }}
-    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
-    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
-    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
+
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: x86
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
+
+  - template: ./templates/build-console-int.yml
+    parameters:
+      platform: arm64
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview
+
+  - template: ./templates/check-formatting.yml
+
+  - template: ./templates/release-sign-and-bundle.yml
--- a/build/pipelines/templates-v2/job-build-package-wpf.yml
+++ b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -1,144 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PackWPF
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Microsoft.Terminal.Wpf
-  ${{ else }}:
-    displayName: Pack Microsoft.Terminal.Wpf
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    OutputBuildPlatform: AnyCPU
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
-    JobOutputArtifactName: wpf-nupkg-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms:
-        - ${{ parameters.buildPlatforms }}
-        - Any CPU # Make sure we grab the precompiled WPF bits
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  - template: .\steps-restore-nuget.yml
-
-  - task: VSBuild@1
-    displayName: Build solution OpenConsole.sln for WPF Control (Pack)
-    inputs:
-      solution: 'OpenConsole.sln'
-      msbuildArgs: >-
-        /p:WindowsTerminalReleaseBuild=true;Version=$(XES_PACKAGEVERSIONNUMBER)
-        /p:NoBuild=true
-        /p:IncludeSymbols=true
-        /t:Terminal\wpf\WpfTerminalControl:Pack
-      platform: Any CPU
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-      clean: false
-
-  - task: CopyFiles@2
-    displayName: Copy *.nupkg to Artifacts
-    inputs:
-      Contents: 'bin/**/*Wpf*.nupkg'
-      TargetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-      OverWrite: true
-      flattenFolders: true
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      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"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (wpf)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate wpf SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish nupkg
--- a/build/pipelines/templates-v2/job-build-project.yml
+++ b/build/pipelines/templates-v2/job-build-project.yml
@@ -1,293 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-    default: Dev
-  - name: additionalBuildOptions
-    type: string
-    default: ''
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: buildWPFDotNetComponents # This weird hack is to make sure we sign and source index the .NET pieces
-    type: boolean
-    default: false
-  - name: buildEverything
-    displayName: "Build Everything (Overrides all other build options)"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: None
-    values: [Optimize, Instrument, None]
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: keepAllExpensiveBuildOutputs
-    type: boolean
-    default: true
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: 'Build'
-  - name: pool
-    type: object
-    default: []
-  - name: beforeBuildSteps
-    type: stepList
-    default: []
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-  - name: removeAllNonSignedFiles
-    type: boolean
-    default: false
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ each platform in parameters.buildPlatforms }}:
-          ${{ config }}_${{ platform }}:
-            BuildConfiguration: ${{ config }}
-            BuildPlatform: ${{ platform }}
-            ${{ if eq(platform, 'x86') }}:
-              OutputBuildPlatform: Win32
-            ${{ elseif eq(platform, 'Any CPU') }}:
-              OutputBuildPlatform: AnyCPU
-            ${{ else }}:
-              OutputBuildPlatform: ${{ platform }}
-  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-    # Azure DevOps abhors a vacuum
-    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
-    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
-    # Yup.
-    BuildTargetParameter: ' '
-    SelectedSigningFragments: ' '
-    JobOutputDirectory: $(Terminal.BinDir)
-    JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  displayName: Build
-  timeoutInMinutes: 240
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  # This generates either nothing for BuildTargetParameter, or /t:X;Y;Z, to control targets later.
-  - pwsh: |-
-      If (-Not [bool]::Parse("${{ parameters.buildEverything }}")) {
-        $BuildTargets = @()
-        $SignFragments = @()
-        If ([bool]::Parse("${{ parameters.buildTerminal }}")) {
-          $BuildTargets += "Terminal\CascadiaPackage"
-          $SignFragments += "terminal_constituents"
-        }
-        If ([bool]::Parse("${{ parameters.buildWPFDotNetComponents }}")) {
-          $BuildTargets += "Terminal\wpf\WpfTerminalControl"
-          $SignFragments += "wpfdotnet"
-        }
-        If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\wpf\PublicTerminalCore"
-          $SignFragments += "wpf"
-        }
-        If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
-          $SignFragments += "conpty"
-        }
-        Write-Host "Targets: $($BuildTargets -Join ";")"
-        Write-Host "Sign targets: $($SignFragments -Join ";")"
-        Write-Host "##vso[task.setvariable variable=BuildTargetParameter]/t:$($BuildTargets -Join ";")"
-        Write-Host "##vso[task.setvariable variable=SelectedSigningFragments]$($SignFragments -Join ";")"
-      }
-    displayName: Prepare Build and Sign Targets
-
-  - pwsh: |-
-      .\build\scripts\Generate-ThirdPartyNotices.ps1 -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
-    displayName: Generate NOTICE.html from NOTICE.md
-
-  - template: .\steps-restore-nuget.yml
-
-  - ${{ parameters.beforeBuildSteps }}
-
-  - task: VSBuild@1
-    displayName: Build OpenConsole.sln
-    inputs:
-      solution: 'OpenConsole.sln'
-      msbuildArgs: >-
-        /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }}
-        ${{ parameters.additionalBuildOptions }}
-        /bl:$(Build.SourcesDirectory)\msbuild.binlog
-        $(BuildTargetParameter)
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(Build.SourcesDirectory)/msbuild.binlog
-      artifact: logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-      condition: always()
-      displayName: Publish Build Log
-  - ${{ else }}:
-    - task: CopyFiles@2
-      displayName: Copy Build Log
-      inputs:
-        contents: $(Build.SourcesDirectory)/msbuild.binlog
-        TargetFolder: $(Terminal.BinDir)
-
-  # This saves ~2GiB per architecture. We won't need these later.
-  # Removes:
-  # - All .lib that do not have an associated .exp (which would indicate that they are import libs)
-  # - All .pdbs from those .libs (which were only used during linking)
-  # - Directories ending in Lib (static lib projects that we fully linked into DLLs which may also contain unnecessary resources)
-  # - All LocalTests_ project outputs, as they were subsumed into TestHostApp
-  # - All PDB files inside the WindowsTerminal/ output, which do not belong there.
-  # - console.dll, which apparently breaks XFGCheck? lol.
-  - pwsh: |-
-      $binDir = '$(Terminal.BinDir)'
-      $ImportLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.exp' | ForEach-Object { $_.FullName -Replace "exp$","lib" }
-      $StaticLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.lib' | Where-Object FullName -NotIn $ImportLibs
-
-      $Items = @()
-      $Items += $StaticLibs
-      $Items += Get-Item ($StaticLibs.FullName -Replace "lib$","pdb") -ErrorAction:Ignore
-      $Items += Get-ChildItem $binDir -Directory -Filter '*Lib'
-      $Items += Get-ChildItem $binDir -Directory -Filter 'LocalTests_*'
-      $Items += Get-ChildItem "${$binDir}\WindowsTerminal" -Filter '*.pdb' -ErrorAction:Ignore
-
-      If (-Not [bool]::Parse('${{ parameters.keepAllExpensiveBuildOutputs }}')) {
-        $Items += Get-ChildItem '$(Terminal.BinDir)' -Filter '*.pdb' -Recurse
-      }
-
-      $Items += Get-ChildItem $binDir -Filter 'console.dll'
-
-      $Items | Remove-Item -Recurse -Force -Verbose -ErrorAction:Ignore
-    displayName: Clean up static libs and extra symbols
-    errorActionPreference: silentlyContinue # It's OK if this silently fails
-
-  # We cannot index PDBs that we have deleted!
-  - ${{ if eq(parameters.keepAllExpensiveBuildOutputs, true) }}:
-    - pwsh: |-
-        build\scripts\Index-Pdbs.ps1 -SearchDir '$(Terminal.BinDir)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-      displayName: Source Index PDBs
-      errorActionPreference: silentlyContinue
-
-  - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-    - pwsh: |-
-        $Package = (Get-ChildItem -Recurse -Filter "CascadiaPackage*.msix" | Select -First 1)
-        $PackageFilename = $Package.FullName
-        Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-      displayName: Locate the MSIX
-
-    # CHECK EXCEPTION
-    # PGO requires a desktop CRT
-    - ${{ if ne(parameters.pgoBuildMode, 'Instrument') }}:
-      - pwsh: |-
-          .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path "$(WindowsTerminalPackagePath)"
-        displayName: Check MSIX for common regressions
-        condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-      
-    - ${{ if eq(parameters.codeSign, true) }}:
-      - pwsh: |-
-          & "$(MakeAppxPath)" unpack /p "$(WindowsTerminalPackagePath)" /d "$(Terminal.BinDir)/PackageContents"
-        displayName: Unpack the MSIX for signing
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-create-signing-config.yml
-      parameters:
-        outFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
-        stage: build
-        fragments: $(SelectedSigningFragments)
-
-    # Code-sign everything we just put together.
-    # We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder.
-    - task: EsrpCodeSigning@3
-      displayName: Submit Signing Request
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Terminal.BinDir)'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
-
-    # We only need to re-pack the MSIX if we actually signed, so this can stay in the codeSign conditional
-    - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-      - pwsh: |-
-          $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_appx" -ErrorAction:Ignore
-          $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(WindowsTerminalPackagePath)")
-          & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(Terminal.BinDir)/PackageContents"
-          Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        displayName: Re-pack the new Terminal package after signing
-
-    # Some of our governed pipelines explicitly fail builds that have *any* non-codesigned filed (!)
-    - ${{ if eq(parameters.removeAllNonSignedFiles, true) }}:
-      - pwsh: |-
-          Get-ChildItem "$(Terminal.BinDir)" -Recurse -Include "*.dll","*.exe" |
-            Where-Object { (Get-AuthenticodeSignature $_).Status -Ne "Valid" } |
-            Remove-Item -Verbose -Force
-        displayName: Remove all non-signed output files
-
-  - ${{ else }}: # No Signing
-    - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-      - pwsh: |-
-          $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_appx" -ErrorAction:Ignore
-          $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(WindowsTerminalPackagePath)")
-          Copy-Item "$(WindowsTerminalPackagePath)" $PackageFilename
-          Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        displayName: Stage the package (unsigned)
-        condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-
-  - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-    - pwsh: |-
-        $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-        $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_unpackaged" -ErrorAction:Ignore
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
-      displayName: Build Unpackaged Distribution (from MSIX)
-      condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest'
-      inputs:
-        BuildDropPath: '$(Terminal.BinDir)'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate SBOM manifest'
-      inputs:
-        BuildDropPath: '$(Terminal.BinDir)'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(Terminal.BinDir)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish All Outputs
--- a/build/pipelines/templates-v2/job-check-code-format.yml
+++ b/build/pipelines/templates-v2/job-check-code-format.yml
@@ -1,15 +0,0 @@
-jobs:
- job: CodeFormatCheck
-  displayName: Check Code Format
-  pool: { vmImage: windows-2022 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: false
-    clean: true
-
-  - powershell: |-
-      .\build\scripts\Invoke-FormattingCheck.ps1
-    displayName: 'Run formatters'
--- a/build/pipelines/templates-v2/job-index-github-codenav.yml
+++ b/build/pipelines/templates-v2/job-index-github-codenav.yml
@@ -1,16 +0,0 @@
-jobs:
- job: CodeNavIndexer
-  displayName: Run Github CodeNav Indexer
-  pool: { vmImage: windows-2022 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: false
-    clean: true
-
-  - task: RichCodeNavIndexer@0
-    inputs:
-      languages: 'cpp,csharp'
-    continueOnError: true
--- a/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
+++ b/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
@@ -1,150 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: Bundle
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-  - name: afterBuildSteps
-    type: stepList
-    default: []
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Terminal MSIXBundle
-  ${{ else }}:
-    displayName: Pack Terminal MSIXBundle
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  variables:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      BundleStemName: Microsoft.WindowsTerminal
-    ${{ elseif eq(parameters.branding, 'Preview') }}:
-      BundleStemName: Microsoft.WindowsTerminalPreview
-    ${{ else }}:
-      BundleStemName: WindowsTerminalDev
-    JobOutputDirectory: '$(System.ArtifactsDirectory)/bundle'
-    JobOutputArtifactName: appxbundle-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  dependsOn: ${{ parameters.dependsOn }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms: ${{ parameters.buildPlatforms }}
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  # 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"
-      $BundlePath = "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-      .\build\scripts\Create-AppxBundle.ps1 -InputPath 'bin/' -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath $BundlePath
-      Write-Host "##vso[task.setvariable variable=MsixBundlePath]${BundlePath}"
-    displayName: Create msixbundle
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      displayName: Submit *.msixbundle to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)\bundle
-        Pattern: $(BundleStemName)*.msixbundle
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolSign",
-                  "Parameters": {
-                      "OpusName": "Microsoft",
-                      "OpusInfo": "http://www.microsoft.com",
-                      "FileDigest": "/fd \"SHA256\"",
-                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  },
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (bundle)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate bundle SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ parameters.afterBuildSteps }}
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish msixbundle
--- a/build/pipelines/templates-v2/job-package-conpty.yml
+++ b/build/pipelines/templates-v2/job-package-conpty.yml
@@ -1,129 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PackConPTY
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Microsoft.Windows.Console.ConPTY
-  ${{ else }}:
-    displayName: Pack Microsoft.Windows.Console.ConPTY
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
-    JobOutputArtifactName: conpty-nupkg-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms: ${{ parameters.buildPlatforms }}
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  - template: steps-ensure-nuget-version.yml
-
-# In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
-# This should be `task: NuGetCommand@2`
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: NuGet pack
-    inputs:
-      command: pack
-      packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
-      packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
-      versioningScheme: byEnvVar
-      versionEnvVar: XES_PACKAGEVERSIONNUMBER
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      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"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (conpty)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate conpty SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish nupkg
--- a/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
+++ b/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
@@ -1,82 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: BuildAndPublishPGONuget
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  dependsOn: ${{ parameters.dependsOn }}
-  displayName: Package and Publish PGO Databases
-
-  variables:
-    artifactsPath: $(Build.SourcesDirectory)\Artifacts
-    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
-    nuspecPath: $(pgoToolsPath)\NuSpecs
-    nuspecFilename: PGO.nuspec
-
-  steps:
-  - checkout: self
-    clean: true
-    # It is important that this be 0, otherwise git will not fetch the branch ref names that the PGO rules require.
-    fetchDepth: 0
-    submodules: false
-    persistCredentials: false
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download Final PGO Databases
-    inputs:
-      artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-      downloadPath: $(artifactsPath)
-
-  - template: steps-ensure-nuget-version.yml
-
-  - task: NuGetAuthenticate@0
-    inputs:
-      nuGetServiceConnections: 'Terminal Public Artifact Feed'
-
-  # 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: MSBuild@1
-    displayName: 'Create PGO Nuget'
-    inputs:
-      solution: $(pgoToolsPath)\PGO.DB.proj
-      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath) /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
-
-  - publish: $(Build.ArtifactStagingDirectory)
-    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-    displayName: "Publish Pipeline Artifact"
-
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: 'NuGet push'
-    inputs:
-      command: push
-      nuGetFeedType: external
-      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
-      # The actual URL and PAT for this feed is configured at
-      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
-      # This is the name of that connection
-      publishFeedCredentials: 'Terminal Public Artifact Feed'
-      feedsToUse: config
-      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
--- a/build/pipelines/templates-v2/job-pgo-merge-pgd.yml
+++ b/build/pipelines/templates-v2/job-pgo-merge-pgd.yml
@@ -1,75 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: buildPlatforms
-    type: object
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: MergePGD
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  dependsOn: ${{ parameters.dependsOn }}
-  displayName: Merge PGO Counts for ${{ parameters.buildConfiguration }}
-
-  steps:
-  # 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'
-
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download PGO Databases for ${{ platform }}
-      inputs:
-        artifactName: build-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        itemPattern: '**/*.pgd'
-        downloadPath: '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-    - task: DownloadPipelineArtifact@2
-      displayName: Download PGO Counts for ${{ platform }}
-      inputs:
-        artifactName: pgc-intermediates-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        downloadPath: '$(Build.SourcesDirectory)/pgc/${{ platform }}/${{ parameters.buildConfiguration }}'
-    - pwsh: |-
-        $Arch = '${{ platform }}'
-        $Conf = '${{ parameters.buildConfiguration }}'
-        $PGCDir = '$(Build.SourcesDirectory)/pgc/${{ platform }}/${{ parameters.buildConfiguration }}'
-        $PGDDir = '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-        # Flatten the PGD directory
-        Get-ChildItem $PGDDir -Recurse -Filter *.pgd | Move-Item -Destination $PGDDir -Verbose
-        Get-ChildItem $PGCDir -Filter *.pgc |
-          ForEach-Object {
-            $Parts = $_.Name -Split "!";
-            $_ | Add-Member Module $Parts[0] -PassThru
-          } |
-          Group-Object Module |
-          ForEach-Object {
-            & "$(VCToolsInstallDir)\bin\Hostx64\${{ platform }}\pgomgr.exe" /merge $_.Group.FullName "$PGDDir\$($_.Name).pgd"
-          }
-      displayName: Merge PGO Counts for ${{ platform }}
-    - task: CopyFiles@2
-      displayName: 'Copy merged pgds to artifact staging'
-      inputs:
-        sourceFolder: '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-        contents: '**\*.pgd'
-        targetFolder: '$(Build.ArtifactStagingDirectory)\out-pgd\${{ platform }}'
-
-  - publish: $(Build.ArtifactStagingDirectory)\out-pgd
-    artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-    displayName: "Publish merged PGDs"
--- a/build/pipelines/templates-v2/job-publish-symbols.yml
+++ b/build/pipelines/templates-v2/job-publish-symbols.yml
@@ -1,97 +0,0 @@
-parameters:
-  - name: includePublicSymbolServer
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PublishSymbols
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: variables
-    type: object
-    default: {}
-  - name: symbolPatGoesInTaskInputs
-    type: boolean
-    default: false
-
-jobs:
- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.includePublicSymbolServer, true) }}:
-    displayName: Publish Symbols to Internal and MSDL
-  ${{ else }}:
-    displayName: Publish Symbols Internally
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download all PDBs from all prior build phases
-    inputs:
-      itemPattern: '**/*.pdb'
-      targetPath: '$(Build.SourcesDirectory)/bin'
-
-  - task: PublishSymbols@2
-    displayName: Publish Symbols (to current Azure DevOps tenant)
-    continueOnError: True
-    inputs:
-      SymbolsFolder: '$(Build.SourcesDirectory)/bin'
-      SearchPattern: '**/*.pdb'
-      IndexSources: false
-      DetailedLog: true
-      SymbolsMaximumWaitTime: 30
-      SymbolServerType: 'TeamServices'
-      SymbolsProduct: 'Windows Terminal Converged Symbols'
-      SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-      SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
-    env:
-      LIB: $(Build.SourcesDirectory)
-
-  - ${{ if eq(parameters.includePublicSymbolServer, true) }}:
-    - task: PublishSymbols@2
-      displayName: 'Publish symbols to MSDL'
-      continueOnError: True
-      inputs:
-        SymbolsFolder: '$(Build.SourcesDirectory)/bin'
-        SearchPattern: '**/*.pdb'
-        IndexSources: false
-        DetailedLog: true
-        SymbolsMaximumWaitTime: 30
-        SymbolServerType: 'TeamServices'
-        SymbolsProduct: 'Windows Terminal Converged Symbols'
-        SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-        SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
-        ${{ if eq(parameters.symbolPatGoesInTaskInputs, true) }}:
-          Pat: $(ADO_microsoftpublicsymbols_PAT)
-        # The ADO task does not support indexing of GitHub sources.
-      # 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
-        ${{ if ne(parameters.symbolPatGoesInTaskInputs, true) }}:
-          ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)
--- a/build/pipelines/templates-v2/job-run-pgo-tests.yml
+++ b/build/pipelines/templates-v2/job-run-pgo-tests.yml
@@ -1,82 +0,0 @@
-parameters:
-  buildConfiguration: 'Release'
-  buildPlatform: ''
-  artifactStem: ''
-  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-
-jobs:
- job: PGO${{ parameters.buildPlatform }}${{ parameters.buildConfiguration }}
-  displayName: PGO ${{ parameters.buildPlatform }} ${{ parameters.buildConfiguration }}
-  variables:
-    BuildConfiguration: ${{ parameters.buildConfiguration }}
-    BuildPlatform: ${{ parameters.buildPlatform }}
-    OutputBuildPlatform: ${{ parameters.buildPlatform }}
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.buildPlatform, 'ARM64') }}:
-        name: SHINE-OSS-Testing-x64
-      ${{ else }}:
-        name: SHINE-OSS-Testing-arm64
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.buildPlatform, 'ARM64') }}:
-        name: SHINE-INT-Testing-x64
-      ${{ else }}:
-        name: SHINE-INT-Testing-arm64
-
-  steps:
-  - checkout: self
-    submodules: false
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download artifacts
-    inputs:
-      artifactName: build-${{ parameters.buildPlatform }}-$(BuildConfiguration)${{ parameters.artifactStem }}
-      downloadPath: $(Terminal.BinDir)
-
-  # The tests expect Terminal to be an unpackaged distribution named terminal-0.0.1.0 (after the dev build version scheme)
-  # Extract to that folder explicitly and strip the embedded folder name from the unpackaged archive.
-  - powershell: |-
-      $TargetDirectory = New-Item -Type Directory (Join-Path "$(Terminal.BinDir)" "terminal-0.0.1.0")
-      & tar.exe -x -v -f (Get-Item "$(Terminal.BinDir)/_unpackaged/*.zip") -C $TargetDirectory.FullName --strip-components=1
-    displayName: Extract the unpackaged build for PGO
-
-  - template: steps-ensure-nuget-version.yml
-
-  - powershell: |-
-      $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'
-      $Version = '1.0.1'
-      & nuget.exe install $Package -Version $Version
-      Write-Host "##vso[task.setvariable variable=TerminalTestContentPath]$(Build.SourcesDirectory)\packages\${Package}.${Version}\content"
-    displayName: Install Test Content
-
-  - task: PowerShell@2
-    displayName: 'Run PGO Tests'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: >-
-        -MatchPattern '*UIA.Tests.dll'
-        -Platform '$(OutputBuildPlatform)'
-        -Configuration '$(BuildConfiguration)'
-        -LogPath '${{ parameters.testLogPath }}'
-        -Root "$(Terminal.BinDir)"
-        -AdditionalTaefArguments '/select:(@IsPGO=true)','/p:WTTestContent=$(TerminalTestContentPath)'
-
-  - task: CopyFiles@2
-    displayName: 'Copy PGO outputs to Artifacts'
-    condition: always()
-    inputs:
-      Contents: |
-       **/*.pgc
-       ${{ parameters.testLogPath }}
-      TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/pgc'
-      OverWrite: true
-      flattenFolders: true
-
-  - publish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/pgc'
-    artifact: pgc-intermediates-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-    condition: always()
--- a/build/pipelines/templates-v2/job-submit-windows-vpack.yml
+++ b/build/pipelines/templates-v2/job-submit-windows-vpack.yml
@@ -1,81 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
- job: VPack
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Create and Submit Windows vPack
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    JobOutputDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-    JobOutputArtifactName: vpack-manifest${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download MSIX Bundle Artifact
-    inputs:
-      artifactName: appxbundle-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-      downloadPath: '$(Build.SourcesDirectory)/bundle'
-
-  # Rename to known/fixed name for Windows build system
-  - powershell: |-
-      # Create vpack directory and place item inside
-      $TargetFolder = New-Item -Type Directory '$(Build.SourcesDirectory)/WindowsTerminal.app'
-      Get-ChildItem bundle/Microsoft.WindowsTerminal_*.msixbundle | Move-Item (Join-Path $TargetFolder.FullName 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle') -Verbose
-    displayName: Stage packages for vpack
-
-  - task: PkgESVPack@12
-    displayName: 'Package ES - VPack'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      sourceDirectory: '$(Build.SourcesDirectory)/WindowsTerminal.app'
-      description: VPack for the Windows Terminal Application
-      pushPkgName: WindowsTerminal.app
-      owner: conhost
-      githubToken: $(GitHubTokenForVpackProvenance)
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: 'Publish VPack Manifest to Drop'
-
-  - task: PkgESFCIBGit@12
-    displayName: 'Submit VPack Manifest to Windows'
-    inputs:
-      configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-      artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-      prTimeOut: 5
-
--- a/build/pipelines/templates-v2/job-test-project.yml
+++ b/build/pipelines/templates-v2/job-test-project.yml
@@ -1,91 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-  inputArtifactStem: ''
-  outputArtifactStem: ''
-
-jobs:
- job: Test${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-    ${{ if eq(parameters.platform, 'x86') }}:
-      OutputBuildPlatform: Win32
-    ${{ else }}:
-      OutputBuildPlatform: ${{ parameters.platform }}
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.platform, 'ARM64') }}:
-        name: SHINE-OSS-Testing-x64
-      ${{ else }}:
-        name: SHINE-OSS-Testing-arm64
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.platform, 'ARM64') }}:
-        name: SHINE-INT-Testing-x64
-      ${{ else }}:
-        name: SHINE-INT-Testing-arm64
-
-  steps:
-  - checkout: self
-    submodules: false
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download artifacts
-    inputs:
-      artifactName: build-${{ parameters.platform }}-$(BuildConfiguration)${{ parameters.inputArtifactStem }}
-      downloadPath: $(Terminal.BinDir)
-
-  - task: PowerShell@2
-    displayName: 'Run Unit Tests'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
-
-  - ${{ if or(eq(parameters.platform, 'x64'), eq(parameters.platform, 'arm64')) }}:
-    - task: PowerShell@2
-      displayName: 'Run Feature Tests'
-      inputs:
-        targetType: filePath
-        filePath: build\scripts\Run-Tests.ps1
-        arguments: -MatchPattern '*feature.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
-
-  - task: PowerShell@2
-    displayName: 'Convert Test Logs from WTL to xUnit format'
-    condition: always()
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\ConvertWttLogToXUnit.ps1
-      arguments: -WttInputPath '${{ parameters.testLogPath }}' -WttSingleRerunInputPath 'unused.wtl' -WttMultipleRerunInputPath 'unused2.wtl' -XUnitOutputPath 'onBuildMachineResults.xml' -TestNamePrefix '$(BuildConfiguration).$(BuildPlatform)'
-
-  - task: PublishTestResults@2
-    displayName: 'Upload converted test logs'
-    condition: always()
-    inputs:
-      testResultsFormat: 'xUnit' # Options: JUnit, NUnit, VSTest, xUnit, cTest
-      testResultsFiles: '**/onBuildMachineResults.xml'
-      testRunTitle: 'On Build Machine Tests' # Optional
-      buildPlatform: $(BuildPlatform) # Optional
-      buildConfiguration: $(BuildConfiguration) # Optional
-
-  - task: CopyFiles@2
-    displayName: 'Copy result logs to Artifacts'
-    condition: always()
-    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: test-logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.outputArtifactStem }}
-    condition: always()
--- a/build/pipelines/templates-v2/pipeline-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-full-release-build.yml
@@ -1,177 +0,0 @@
-# This build should never run as CI or against a pull request.
-trigger: none
-
-parameters:
-  - name: branding
-    type: string
-    default: Release
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: generateSbom
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: publishVpackToWindows
-    type: boolean
-    default: false
-
-  - name: pool
-    type: object
-    default:
-      name: SHINE-INT-S # By default, send jobs to the small agent pool.
-      demands: ImageOverride -equals SHINE-VS17-Latest
-
-variables:
-  - template: variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
-
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
-
-stages:
-  - stage: Build
-    displayName: Build
-    pool: ${{ parameters.pool }}
-    dependsOn: []
-    jobs:
-      - template: ./job-build-project.yml
-        parameters:
-          pool:
-            name: SHINE-INT-L # Run the compilation on the large agent pool, rather than the default small one.
-            demands: ImageOverride -equals SHINE-VS17-Latest
-          branding: ${{ parameters.branding }}
-          buildTerminal: ${{ parameters.buildTerminal }}
-          buildConPTY: ${{ parameters.buildConPTY }}
-          buildWPF: ${{ parameters.buildWPF }}
-          pgoBuildMode: ${{ parameters.pgoBuildMode }}
-          buildConfigurations: ${{ parameters.buildConfigurations }}
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          generateSbom: ${{ parameters.generateSbom }}
-          codeSign: ${{ parameters.codeSign }}
-          beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-            - task: PkgESSetupBuild@12
-              displayName: Package ES - Setup Build
-              inputs:
-                disableOutputRedirect: true
-
-            - task: UniversalPackages@0
-              displayName: Download terminal-internal Universal Package
-              inputs:
-                feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-            - template: ./steps-fetch-and-prepare-localizations.yml
-              parameters:
-                includePseudoLoc: true
-
-      - ${{ if eq(parameters.buildWPF, true) }}:
-        # Add an Any CPU build flavor for the WPF control bits
-        - template: ./job-build-project.yml
-          parameters:
-            # This job is allowed to run on the default small pool.
-            jobName: BuildWPF
-            branding: ${{ parameters.branding }}
-            buildTerminal: false
-            buildWPFDotNetComponents: true
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms:
-              - Any CPU
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-            beforeBuildSteps:
-              - task: PkgESSetupBuild@12
-                displayName: Package ES - Setup Build
-                inputs:
-                  disableOutputRedirect: true
-              # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-  - stage: Package
-    displayName: Package
-    pool: ${{ parameters.pool }}
-    dependsOn: [Build]
-    jobs:
-      - ${{ if eq(parameters.buildTerminal, true) }}:
-        - template: ./job-merge-msix-into-bundle.yml
-          parameters:
-            jobName: Bundle
-            branding: ${{ parameters.branding }}
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-      - ${{ if eq(parameters.buildConPTY, true) }}:
-        - template: ./job-package-conpty.yml
-          parameters:
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-      - ${{ if eq(parameters.buildWPF, true) }}:
-        - template: ./job-build-package-wpf.yml
-          parameters:
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-  - stage: Publish
-    displayName: Publish
-    pool: ${{ parameters.pool }}
-    dependsOn: [Build, Package]
-    jobs:
-      # We only support the vpack for Release builds that include Terminal
-      - ${{ if and(containsValue(parameters.buildConfigurations, 'Release'), parameters.buildTerminal, parameters.publishVpackToWindows) }}:
-        - template: ./job-submit-windows-vpack.yml
-          parameters:
-            buildConfiguration: Release
-            generateSbom: ${{ parameters.generateSbom }}
-
-      - template: ./job-publish-symbols.yml
-        parameters:
-          includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-          symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
-
-...
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -1,256 +0,0 @@
-parameters:
-  - name: official
-    type: boolean
-    default: false
-  - name: branding
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    type: boolean
-    default: false
-
-  - name: extraPublishJobs
-    type: object
-    default: []
-
-resources:
-  repositories:
-  - repository: templates
-    type: git
-    name: OneBranch.Pipelines/GovernedTemplates
-    ref: refs/heads/main
-
-extends:
-  ${{ if eq(parameters.official, true) }}:
-    template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates
-  ${{ else }}:
-    template: v2/Microsoft.NonOfficial.yml@templates
-  parameters:
-    featureFlags:
-      WindowsHostVersion: 1ESWindows2022
-    platform:
-      name: 'windows_undocked'
-      product: 'Windows Terminal'
-    cloudvault: # https://aka.ms/obpipelines/cloudvault
-      enabled: false
-    globalSdl: # https://aka.ms/obpipelines/sdl
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\build\config\tsa.json'
-      binskim:
-        break: false
-        scanOutputDirectoryOnly: true
-      policheck:
-        break: false
-        severity: Note
-      baseline:
-        baselineFile: '$(Build.SourcesDirectory)\build\config\release.gdnbaselines'
-        suppressionSet: default
-
-    stages:
-      - stage: Build
-        displayName: Build
-        dependsOn: []
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-            parameters:
-              pool: { type: windows }
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(JobOutputDirectory)
-                ob_artifactBaseName: $(JobOutputArtifactName)
-              publishArtifacts: false # Handled by OneBranch
-              branding: ${{ parameters.branding }}
-              buildTerminal: ${{ parameters.buildTerminal }}
-              buildConPTY: ${{ parameters.buildConPTY }}
-              buildWPF: ${{ parameters.buildWPF }}
-              pgoBuildMode: ${{ parameters.pgoBuildMode }}
-              buildConfigurations: ${{ parameters.buildConfigurations }}
-              buildPlatforms: ${{ parameters.buildPlatforms }}
-              generateSbom: false # this is handled by onebranch
-              removeAllNonSignedFiles: true # appease the overlords
-              codeSign: ${{ parameters.codeSign }}
-              beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - task: PkgESSetupBuild@12
-                  displayName: Package ES - Setup Build
-                  inputs:
-                    disableOutputRedirect: true
-
-                - task: UniversalPackages@0
-                  displayName: Download terminal-internal Universal Package
-                  inputs:
-                    feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                    packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                    versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-                - template: ./build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml@self
-                  parameters:
-                    includePseudoLoc: true
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            # Add an Any CPU build flavor for the WPF control bits
-            - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                jobName: BuildWPF
-                branding: ${{ parameters.branding }}
-                buildTerminal: false
-                buildWPFDotNetComponents: true
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms:
-                  - Any CPU
-                generateSbom: false # this is handled by onebranch
-                removeAllNonSignedFiles: true # appease the overlords
-                codeSign: ${{ parameters.codeSign }}
-                beforeBuildSteps:
-                  - task: PkgESSetupBuild@12
-                    displayName: Package ES - Setup Build
-                    inputs:
-                      disableOutputRedirect: true
-                  # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-      - stage: Package
-        displayName: Package
-        dependsOn: [Build]
-        jobs:
-          - ${{ if eq(parameters.buildTerminal, true) }}:
-            - template: ./build/pipelines/templates-v2/job-merge-msix-into-bundle.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                  ### This job is also in charge of submitting the vpack to Windows if it's enabled
-                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ### If enabled above, these options are in play.
-                  ob_createvpack_packagename: 'WindowsTerminal.app'
-                  ob_createvpack_owneralias: 'conhost@microsoft.com'
-                  ob_createvpack_description: 'VPack for the Windows Terminal Application'
-                  ob_createvpack_targetDestinationDirectory: '$(Destination)'
-                  ob_createvpack_propsFile: false
-                  ob_createvpack_provData: true
-                  ob_createvpack_metadata: '$(Build.SourceVersion)'
-                  ob_createvpack_topLevelRetries: 0
-                  ob_createvpack_failOnStdErr: true
-                  ob_createvpack_taskLogVerbosity: Detailed
-                  ob_createvpack_verbose: true
-                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
-                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
-                  # folder that it can then update and upload.
-                  # Effectively: it says "destination" but it means "source"
-                  # DH: Don't ask why.
-                  ob_updateOSManifest_destination: $(XES_VPACKMANIFESTDIRECTORY)
-                  ob_updateOSManifest_skipFetch: true
-                publishArtifacts: false # Handled by OneBranch
-                jobName: Bundle
-                branding: ${{ parameters.branding }}
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # Handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-                afterBuildSteps:
-                  - pwsh: |-
-                      $d = New-Item "$(JobOutputDirectory)/vpack" -Type Directory
-                      Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path $d 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
-                    displayName: Stage msixbundle for vpack
-
-          - ${{ if eq(parameters.buildConPTY, true) }}:
-            - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            - template: ./build/pipelines/templates-v2/job-build-package-wpf.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-      - stage: Publish
-        displayName: Publish
-        dependsOn: [Build, Package]
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-publish-symbols.yml@self
-            parameters:
-              pool: { type: windows }
-              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              symbolPatGoesInTaskInputs: true # onebranch tries to muck with the PAT variable, so we need to change how it get the PAT
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(Build.ArtifactStagingDirectory)
-                # Without this, OneBranch will nerf our symbol tasks
-                ob_symbolsPublishing_enabled: true
-
-          - ${{ parameters.extraPublishJobs }}
--- a/build/pipelines/templates-v2/steps-create-signing-config.yml
+++ b/build/pipelines/templates-v2/steps-create-signing-config.yml
@@ -1,35 +0,0 @@
-parameters:
-  - name: stage
-    type: string
-  - name: outFile
-    type: string
-  - name: fragments
-    type: string
-
-# This build step template takes all files named "esrp.STAGE.batch.*.json"
-# and merges them into a single output signing config.
-#
-# We generate the batch signing config by sticking together multiple "batches".
-# The filter below (with Fragments) works by splitting the filename, esrp.s.batch.x.json,
-# to get 'x' and then checking whether x is in Fragments.
-# We have to manually strip comments out of the batch fragments due to https://github.com/PowerShell/PowerShell/issues/14553
-
-steps:
-  - pwsh: |-
-      $SignBatchFiles = (Get-Item build/config/esrp.${{ parameters.stage }}.batch.*.json)
-      $Fragments = "${{ parameters.fragments }}"
-      If (-Not [String]::IsNullOrWhiteSpace($Fragments)) {
-        $FragmentList = $Fragments -Split ";"
-        If ($FragmentList.Length -Gt 0) {
-          $SignBatchFiles = $SignBatchFiles | Where-Object { ($_.Name -Split '\.')[3] -In $FragmentList }
-        }
-      }
-      Write-Host "Found $(@($SignBatchFiles).Length) Signing Configs"
-      Write-Host ($SignBatchFiles.Name -Join ";")
-      $FinalSignConfig = @{
-        Version = "1.0.0";
-        UseMinimatch = $false;
-        SignBatches = @($SignBatchFiles | ForEach-Object { Get-Content $_ | Where-Object { $_ -NotMatch "^\s*\/\/" } | ConvertFrom-Json -Depth 10 });
-      }
-      $FinalSignConfig | ConvertTo-Json -Depth 10 | Out-File -Encoding utf8 "${{ parameters.outFile }}"
-    displayName: Merge ${{ parameters.stage }} signing configs (${{ parameters.outFile }})
--- a/build/pipelines/templates-v2/steps-download-bin-dir-artifact.yml
+++ b/build/pipelines/templates-v2/steps-download-bin-dir-artifact.yml
@@ -1,24 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: artifactStem
-    type: string
-    default: ''
-
-steps:
- ${{ each configuration in parameters.buildConfigurations }}:
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download artifacts for ${{ platform }} ${{ configuration }}
-      inputs:
-        # Make sure to download the entire artifact, because it includes the SPDX SBOM
-        artifactName: build-${{ platform }}-${{ configuration }}${{ parameters.artifactStem }}
-        # Downloading to the source directory should ensure that the later SBOM generator can see the earlier SBOMs.
-        ${{ if eq(platform, 'x86') }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/Win32/${{ configuration }}'
-        ${{ elseif eq(platform, 'Any CPU') }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/AnyCPU/${{ configuration }}'
-        ${{ else }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/${{ platform }}/${{ configuration }}'
--- a/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
+++ b/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
@@ -1,5 +0,0 @@
-steps:
- task: NuGetToolInstaller@1
-  displayName: Use NuGet 6.6.1
-  inputs:
-    versionSpec: 6.6.1
--- a/build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml
+++ b/build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml
@@ -1,27 +0,0 @@
-parameters:
-  - name: includePseudoLoc
-    type: boolean
-    default: true
-
-steps:
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: |
-        src\cascadia\**\en-US\*.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      ${{ if eq(parameters.includePseudoLoc, true) }}:
-        pseudoSetting: Included
-
-  - pwsh: |-
-      $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-      $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-    displayName: Move Loc files into final locations
-
-  - pwsh: |-
-      ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
-    displayName: Copy the Context Menu Loc Resources to CascadiaPackage
--- a/build/pipelines/templates-v2/steps-restore-nuget.yml
+++ b/build/pipelines/templates-v2/steps-restore-nuget.yml
@@ -1,38 +0,0 @@
-steps:
- template: steps-ensure-nuget-version.yml
-
- task: NuGetAuthenticate@0
-
- script: |-
-    echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)
-  displayName: Ensure NuGet restores for $(BuildPlatform)
-  condition: and(succeeded(), ne(variables['BuildPlatform'], 'Any CPU'))
-
-# 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'
--- a/build/pipelines/templates-v2/variables-nuget-package-version.yml
+++ b/build/pipelines/templates-v2/variables-nuget-package-version.yml
@@ -1,27 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-
-variables:
-  # 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
--- a/build/pipelines/templates-v2/variables-onebranch-config.yml
+++ b/build/pipelines/templates-v2/variables-onebranch-config.yml
@@ -1,2 +0,0 @@
-variables:
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
--- a/build/pipelines/templates/build-console-audit-job.yml
+++ b/build/pipelines/templates/build-console-audit-job.yml
@@ -0,0 +1,45 @@
+parameters:
+  platform: ''
+  additionalBuildArguments: ''
+
+jobs:
+- job: Build${{ parameters.platform }}AuditMode
+  displayName: Static Analysis Build ${{ parameters.platform }}
+  variables:
+    BuildConfiguration: AuditMode
+    BuildPlatform: ${{ parameters.platform }}
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }
+
+  steps:
+  - checkout: self
+    submodules: true
+    clean: true
+
+  - 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 }}
+      clean: true
+      maximumCpuCount: true
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -0,0 +1,37 @@
+parameters:
+  configuration: 'Release'
+  platform: ''
+  additionalBuildArguments: ''
+  minimumExpectedTestsExecutedCount: 10  # Sanity check for minimum expected tests to be reported
+  rerunPassesRequiredToAvoidFailure: 5
+
+jobs:
+- job: Build${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    BuildPlatform: ${{ parameters.platform }}
+  pool: "windevbuildagents"
+  # The public pool is also an option!
+  # pool: { vmImage: windows-2019 }
+
+  steps:
+  - template: build-console-steps.yml
+    parameters:
+      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
+
+- template: helix-runtests-job.yml
+  parameters:
+    name: 'RunTestsInHelix'
+    dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
+    condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
+    testSuite: 'DevTestSuite'
+    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
+    
+- template: helix-processtestresults-job.yml
+  parameters:
+    dependsOn:
+    - RunTestsInHelix
+    condition: and(succeededOrFailed(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
+    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
+    minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }}
--- a/build/pipelines/templates/build-console-int.yml
+++ b/build/pipelines/templates/build-console-int.yml
@@ -0,0 +1,30 @@
+parameters:
+  configuration: 'Release'
+  platform: ''
+  additionalBuildArguments: ''
+
+jobs:
+- job: Build${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildConfiguration: ${{ parameters.configuration }}
+    BuildPlatform: ${{ parameters.platform }}
+
+  pool:
+    name: Package ES Lab E
+    demands:
+    - msbuild
+    - visualstudio
+    - vstest
+
+  steps:
+  - task: PkgESSetupBuild@10
+    displayName: 'Package ES - Setup Build'
+    inputs:
+      useDfs: false
+      productName: WindowsTerminal
+      disableOutputRedirect: true
+
+  - template: build-console-steps.yml
+    parameters:
+      additionalBuildArguments: "/p:XesUseOneStoreVersioning=true;XesBaseYearForStoreVersion=$(baseYearForVersioning) ${{ parameters.additionalBuildArguments }}"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin L. Howett	eb72c7fd3b	Migrate spelling-0.0.21 changes from main	2020-11-13 13:16:30 -08:00
Dustin L. Howett	20250c233d	Migrate spelling-0.0.19 changes from main	2020-11-13 13:16:30 -08:00
Michael Niksa	39023426ff	safety check on alpha test.	2020-11-13 13:16:30 -08:00
Michael Niksa	9ea43bace0	corrupt the alphas for v1 only	2020-11-13 13:15:13 -08:00
Michael Niksa	2b9f6388cf	Add theoretical v2 tests too.	2020-11-13 13:12:28 -08:00
Michael Niksa	c340ab5e7b	holy v1 tests, batman	2020-11-13 12:00:41 -08:00
Michael Niksa	42e198e967	so much pain.	2020-11-13 11:40:45 -08:00
Michael Niksa	a6816df2b5	add these miserable tests for direct read.	2020-11-11 16:50:52 -08:00
Michael Niksa	3aee3992ba	update notes and update read function	2020-11-05 16:41:23 -08:00
Michael Niksa	1b3a5e671b	Two more tests that make me sad about chv1	2020-11-05 16:17:01 -08:00
Michael Niksa	18b91c20ef	Add some more tests to discover behaviors.	2020-11-05 15:59:53 -08:00
Michael Niksa	3b7544770b	Make the font be a differentiator in the test.	2020-11-04 10:36:05 -08:00
Michael Niksa	93b95420ac	Alias tests.	2020-11-04 10:36:05 -08:00