Pump the message queue on frozen windows (#16588)

This changeset ensures that the message queue of frozen windows is
always being serviced. This should ensure that it won't fill up and
lead to deadlocks, freezes, or similar. I've tried _a lot_ of different
approaches before settling on this one. Introducing a custom `WM_APP`
message has the benefit of being the least intrusive to the existing
code base.

The approach that I would have favored the most would be to never
destroy the `AppHost` instance in the first place, as I imagined that
this would be more robust in general and resolve other (rare) bugs.
However, I found that this requires rewriting some substantial parts
of the code base around `AppHost` and it could be something that may
be of interest in the future.

Closes #16332
Depends on #16587 and #16575

(cherry picked from commit 5d2fa4782f)
Service-Card-Id: 91642478
Service-Version: 1.18

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

@@ -1,3 +1,4 @@
+aci
 admins
 allcolors
 Apc
@@ -8,6 +9,7 @@ breadcrumbs
 bsd
 calt
 ccmp
+ccon
 changelog
 clickable
 clig
@@ -90,6 +92,7 @@ reserialize
 reserializes
 rlig
 runtimes
+servicebus
 shcha
 slnt
 Sos
@@ -112,6 +115,7 @@ unregister
 versioned
 vsdevcmd
 We'd
+westus
 wildcards
 XBox
 YBox

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

@@ -88,7 +88,6 @@ IObject
 iosfwd
 IPackage
 IPeasant
-isa
 ISetup
 isspace
 IStorage
@@ -214,6 +213,7 @@ UFIELD
 ULARGE
 UOI
 UPDATEINIFILE
+urlmon
 userenv
 USEROBJECTFLAGS
 Vcpp
@@ -224,6 +224,7 @@ wcsstr
 wcstoui
 WDJ
 winhttp
+wininet
 winmain
 winsta
 winstamin

.github/actions/spelling/candidate.patterns

@@ -371,6 +371,8 @@ ipfs://[0-9a-z]*
 \b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
 # c99 hex digits (not the full format, just one I've seen)
 0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
+# Punycode
+\bxn--[-0-9a-z]+
 # sha
 sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
 # sha-... -- uses a fancy capture

.github/actions/spelling/excludes.txt

@@ -106,7 +106,6 @@
 ^src/terminal/parser/ft_fuzzwrapper/run\.bat$
 ^src/terminal/parser/ut_parser/Base64Test.cpp$
 ^src/terminal/parser/ut_parser/run\.bat$
-^src/tools/benchcat
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
 ^src/tools/lnkd/lnkd\.bat$
 ^src/tools/pixels/pixels\.bat$

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

@@ -1,5 +1,4 @@
 aabbcc
-aarch
 ABANDONFONT
 abbcc
 ABCDEFGHIJKLMNOPQRSTUVWXY
@@ -105,7 +104,6 @@ bcx
 bcz
 BEFOREPARENT
 beginthread
-benchcat
 bgfx
 bgidx
 Bgk
@@ -159,6 +157,7 @@ capslock
 CARETBLINKINGENABLED
 CARRIAGERETURN
 cascadia
+castsi
 catid
 cazamor
 CBash
@@ -192,8 +191,10 @@ changelist
 chaof
 charinfo
 CHARSETINFO
+chcbpat
 chh
 chk
+chshdng
 CHT
 Cic
 cielab
@@ -217,6 +218,7 @@ cmder
 CMDEXT
 cmh
 CMOUSEBUTTONS
+cmpeq
 cmt
 cmw
 cmyk
@@ -410,7 +412,6 @@ DECANM
 DECARM
 DECAUPSS
 DECAWM
-DECBI
 DECBKM
 DECCARA
 DECCIR
@@ -419,17 +420,13 @@ DECCKSR
 DECCOLM
 DECCRA
 DECCTR
-DECDC
 DECDHL
 decdld
 DECDMAC
 DECDWL
-DECECM
 DECEKBD
 DECERA
-DECFI
 DECFRA
-DECIC
 DECID
 DECINVM
 DECKPAM
@@ -440,7 +437,6 @@ DECMSR
 DECNKM
 DECNRCM
 DECOM
-decommit
 DECPCTERM
 DECPS
 DECRARA
@@ -509,6 +505,7 @@ directio
 DIRECTX
 DISABLEDELAYEDEXPANSION
 DISABLENOSCROLL
+DISPATCHNOTIFY
 DISPLAYATTRIBUTE
 DISPLAYATTRIBUTEPROPERTY
 DISPLAYCHANGE
@@ -577,7 +574,6 @@ EDITTEXT
 EDITUPDATE
 edputil
 Efast
-efghijklmn
 EHsc
 EINS
 EJO
@@ -979,15 +975,13 @@ KLF
 KLMNO
 KLMNOPQRST
 KLMNOPQRSTQQQQQ
-KLMNOPQRSTUVWXY
-KLMNOPQRSTY
 KOK
 KPRIORITY
 KVM
 langid
 LANGUAGELIST
 lasterror
-LASTEXITCODE
+lastexitcode
 LAYOUTRTL
 lbl
 LBN
@@ -1023,6 +1017,7 @@ lnkd
 lnkfile
 LNM
 LOADONCALL
+loadu
 LOBYTE
 localappdata
 locsrc
@@ -1031,7 +1026,6 @@ LOGFONT
 LOGFONTA
 LOGFONTW
 logissue
-losslessly
 loword
 lparam
 LPCCH
@@ -1144,7 +1138,6 @@ mmsystem
 MNC
 MNOPQ
 MNOPQR
-MNOPQRSTUVWXY
 MODALFRAME
 MODERNCORE
 MONITORINFO
@@ -1154,6 +1147,7 @@ MOUSEACTIVATE
 MOUSEFIRST
 MOUSEHWHEEL
 MOUSEMOVE
+movemask
 MOVESTART
 msb
 msctf
@@ -2052,7 +2046,6 @@ USRDLL
 utr
 UVWX
 UVWXY
-UVWXYZ
 uwa
 uwp
 uxtheme
@@ -2063,7 +2056,6 @@ vcpkg
 vcprintf
 vcxitems
 vec
-vectorize
 vectorized
 VERCTRL
 VERTBAR
@@ -2313,9 +2305,7 @@ YOffset
 YSubstantial
 YVIRTUALSCREEN
 YWalk
-Zab
 zabcd
-Zabcdefghijklmn
 Zabcdefghijklmnopqrstuvwxyz
 ZCmd
 ZCtrl

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

@@ -27,12 +27,6 @@ ROY\sG\.\sBIV
 # Python stringprefix / binaryprefix
 \b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'
 
-# SSE intrinsics like "_mm_subs_epu16"
-\b_mm(?:|256|512)_\w+\b
-
-# ARM NEON intrinsics like "vsubq_u16"
-\bv\w+_[fsu](?:8|16|32|64)\b
-
 # Automatically suggested patterns
 # hit-count: 3831 file-count: 582
 # IServiceProvider

.github/policies/resourceManagement.yml

@@ -1,751 +0,0 @@
-id: 
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner: 
-resource: repository
-disabled: false
-where: 
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - hasLabel:
-          label: No-Recent-Activity
-      - noActivitySince:
-          days: 3
-      actions:
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - noActivitySince:
-          days: 4
-      - isNotLabeledWith:
-          label: No-Recent-Activity
-      actions:
-      - addLabel:
-          label: No-Recent-Activity
-      - addReply:
-          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Duplicate
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - hasLabel:
-          label: No-Recent-Activity
-      - noActivitySince:
-          days: 7
-      actions:
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Needs-Author-Feedback
-      - noActivitySince:
-          days: 7
-      - isNotLabeledWith:
-          label: No-Recent-Activity
-      actions:
-      - addLabel:
-          label: No-Recent-Activity
-      - addReply:
-          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
-    eventResponderTasks:
-    - if:
-      - payloadType: Issues
-      - or:
-        - and:
-          - isAction:
-              action: Opened
-          - not:
-              hasLabel:
-                label: ⛺ Reserved
-      then:
-      - addLabel:
-          label: Needs-Triage
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isAction:
-          action: Created
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - addLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issues
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isAction:
-          action: Submitted
-      - isReviewState:
-          reviewState: Changes_requested
-      then:
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - isActivitySender:
-          issueAuthor: True
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Needs-Author-Feedback
-      then:
-      - removeLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - hasLabel:
-          label: No-Recent-Activity
-      then:
-      - removeLabel:
-          label: No-Recent-Activity
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: AutoMerge
-      then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: AutoMerge
-      then:
-      - disableAutoMerge
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - and:
-          - isLabeled
-          - hasLabel:
-              label: Mass-Chaos
-        - isOpen
-        - isLabeled
-      - not:
-          hasLabel:
-            label: Needs-Tag-Fix
-      - or:
-        - and:
-          - not:
-              hasLabel:
-                label: Area-Accessibility
-          - not:
-              hasLabel:
-                label: Area-Build
-          - not:
-              hasLabel:
-                label: Area-Extensibility
-          - not:
-              hasLabel:
-                label: Area-Fonts
-          - not:
-              hasLabel:
-                label: Area-Input
-          - not:
-              hasLabel:
-                label: Area-Interaction
-          - not:
-              hasLabel:
-                label: Area-Interop
-          - not:
-              hasLabel:
-                label: Area-Output
-          - not:
-              hasLabel:
-                label: Area-Performance
-          - not:
-              hasLabel:
-                label: Area-Rendering
-          - not:
-              hasLabel:
-                label: Area-Server
-          - not:
-              hasLabel:
-                label: Area-Settings
-          - not:
-              hasLabel:
-                label: Area-TerminalConnection
-          - not:
-              hasLabel:
-                label: Area-TerminalControl
-          - not:
-              hasLabel:
-                label: Area-User Interface
-          - not:
-              hasLabel:
-                label: Area-VT
-          - not:
-              hasLabel:
-                label: Area-CodeHealth
-          - not:
-              hasLabel:
-                label: Area-Quality
-          - not:
-              hasLabel:
-                label: Area-AzureShell
-          - not:
-              hasLabel:
-                label: Area-Schema
-          - not:
-              hasLabel:
-                label: Area-Commandline
-          - not:
-              hasLabel:
-                label: Area-ShellExtension
-          - not:
-              hasLabel:
-                label: Area-WPFControl
-          - not:
-              hasLabel:
-                label: Area-Settings UI
-          - not:
-              hasLabel:
-                label: Area-DefApp
-          - not:
-              hasLabel:
-                label: Area-Remoting
-          - not:
-              hasLabel:
-                label: Area-Windowing
-          - not:
-              hasLabel:
-                label: Area-Theming
-          - not:
-              hasLabel:
-                label: Area-Localization
-        - and:
-          - not:
-              hasLabel:
-                label: Issue-Bug
-          - not:
-              hasLabel:
-                label: Issue-Docs
-          - not:
-              hasLabel:
-                label: Issue-Feature
-          - not:
-              hasLabel:
-                label: Issue-Question
-          - not:
-              hasLabel:
-                label: Issue-Samples
-          - not:
-              hasLabel:
-                label: Issue-Task
-          - not:
-              hasLabel:
-                label: Issue-Scenario
-        - and:
-          - not:
-              hasLabel:
-                label: Product-Cmd.exe
-          - not:
-              hasLabel:
-                label: Product-Colortool
-          - not:
-              hasLabel:
-                label: Product-Conhost
-          - not:
-              hasLabel:
-                label: Product-Conpty
-          - not:
-              hasLabel:
-                label: Product-Meta
-          - not:
-              hasLabel:
-                label: Product-Powershell
-          - not:
-              hasLabel:
-                label: Product-Terminal
-          - not:
-              hasLabel:
-                label: Product-WSL
-        - and:
-          - not: isOpen
-          - and:
-            - not:
-                hasLabel:
-                  label: Resolution-Answered
-            - not:
-                hasLabel:
-                  label: Resolution-By-Design
-            - not:
-                hasLabel:
-                  label: Resolution-Duplicate
-            - not:
-                hasLabel:
-                  label: Resolution-External
-            - not:
-                hasLabel:
-                  label: Resolution-Fix-Available
-            - not:
-                hasLabel:
-                  label: Resolution-Fix-Committed
-            - not:
-                hasLabel:
-                  label: Resolution-Won't-Fix
-      - not:
-          hasLabel:
-            label: Needs-Triage
-      - not:
-          hasLabel:
-            label: Resolution-Duplicate
-      - not:
-          hasLabel:
-            label: ⛺ Reserved
-      - not:
-          hasLabel:
-            label: Tracking-External
-      then:
-      - addLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Issues
-      - and:
-        - isLabeled
-        - hasLabel:
-            label: Needs-Tag-Fix
-      - and:
-        - or:
-          - hasLabel:
-              label: Area-Accessibility
-          - hasLabel:
-              label: Area-Build
-          - hasLabel:
-              label: Area-Extensibility
-          - hasLabel:
-              label: Area-Fonts
-          - hasLabel:
-              label: Area-Input
-          - hasLabel:
-              label: Area-Interaction
-          - hasLabel:
-              label: Area-Interop
-          - hasLabel:
-              label: Area-Output
-          - hasLabel:
-              label: Area-Performance
-          - hasLabel:
-              label: Area-Rendering
-          - hasLabel:
-              label: Area-Server
-          - hasLabel:
-              label: Area-Settings
-          - hasLabel:
-              label: Area-TerminalConnection
-          - hasLabel:
-              label: Area-TerminalControl
-          - hasLabel:
-              label: Area-User Interface
-          - hasLabel:
-              label: Area-VT
-          - hasLabel:
-              label: Area-CodeHealth
-          - hasLabel:
-              label: Area-Quality
-          - hasLabel:
-              label: Area-Schema
-          - hasLabel:
-              label: Area-AzureShell
-          - hasLabel:
-              label: Area-Commandline
-          - hasLabel:
-              label: Area-ShellExtension
-          - hasLabel:
-              label: Area-WPFControl
-          - hasLabel:
-              label: Area-Settings UI
-          - hasLabel:
-              label: Area-DefApp
-          - hasLabel:
-              label: Area-Localization
-          - hasLabel:
-              label: Area-Windowing
-          - hasLabel:
-              label: Area-Theming
-          - hasLabel:
-              label: Area-AtlasEngine
-          - hasLabel:
-              label: Area-CmdPal
-        - or:
-          - hasLabel:
-              label: Issue-Bug
-          - hasLabel:
-              label: Issue-Docs
-          - hasLabel:
-              label: Issue-Feature
-          - hasLabel:
-              label: Issue-Question
-          - hasLabel:
-              label: Issue-Samples
-          - hasLabel:
-              label: Issue-Task
-          - hasLabel:
-              label: Issue-Scenario
-        - or:
-          - hasLabel:
-              label: Product-Cmd.exe
-          - hasLabel:
-              label: Product-Colortool
-          - hasLabel:
-              label: Product-Conhost
-          - hasLabel:
-              label: Product-Conpty
-          - hasLabel:
-              label: Product-Meta
-          - hasLabel:
-              label: Product-Powershell
-          - hasLabel:
-              label: Product-Terminal
-          - hasLabel:
-              label: Product-WSL
-        - or:
-          - isOpen
-          - and:
-            - not: isOpen
-            - or:
-              - hasLabel:
-                  label: Resolution-Answered
-              - hasLabel:
-                  label: Resolution-By-Design
-              - hasLabel:
-                  label: Resolution-Duplicate
-              - hasLabel:
-                  label: Resolution-External
-              - hasLabel:
-                  label: Resolution-Fix-Available
-              - hasLabel:
-                  label: Resolution-Fix-Committed
-              - hasLabel:
-                  label: Resolution-Won't-Fix
-              - hasLabel:
-                  label: Tracking-External
-      then:
-      - removeLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - inPrLabel:
-          label: In-PR
-      description: 
-    - if:
-      - payloadType: Issues
-      - hasLabel:
-          label: Needs-Tag-Fix
-      - hasLabel:
-          label: Resolution-Duplicate
-      then:
-      - removeLabel:
-          label: Needs-Tag-Fix
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - titleContains:
-            pattern: ^\s*Bug Report \(IF I DO NOT CHANGE THIS THE ISSUE WILL BE AUTO-CLOSED\)\s*$
-            isRegex: True
-        - titleContains:
-            pattern: ^\s*Bug Report\s*$
-            isRegex: True
-      - or:
-        - isAction:
-            action: Opened
-        - isAction:
-            action: Reopened
-      - not:
-          activitySenderHasPermission:
-            permission: Write
-      - not:
-          activitySenderHasPermission:
-            permission: Admin
-      then:
-      - closeIssue
-      - addLabel:
-          label: Needs-Author-Feedback
-      - addReply:
-          reply: Hi! Thanks for attempting to open an issue. Unfortunately, your title wasn't changed from the original template which makes it very hard for us to track and triage. You are welcome to fix up the title and try again with a new issue.
-      description: 
-    - if:
-      - payloadType: Issues
-      - or:
-        - isAction:
-            action: Opened
-        - isAction:
-            action: Reopened
-      - or:
-        - not:
-            bodyContains:
-              pattern: .+
-              isRegex: True
-      then:
-      - closeIssue
-      - addLabel:
-          label: Needs-Author-Feedback
-      - addReply:
-          reply: "Hi! Thanks for attempting to open an issue. Unfortunately, you didn't write anything in the body which makes it impossible to understand your concern. You are welcome to fix up the issue and try again by opening another issue with the body filled out. "
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - isLabeled
-      - hasLabel:
-          label: Needs-Second
-      - isOpen
-      then:
-      - requestReview:
-          reviewer: zadjii-msft
-      - requestReview:
-          reviewer: PankajBhojwani
-      - requestReview:
-          reviewer: carlos-zamora
-      - requestReview:
-          reviewer: dhowett
-      - requestReview:
-          reviewer: lhecker
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - not: isOpen
-      - hasLabel:
-          label: Needs-Second
-      then:
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issues
-      - hasLabel:
-          label: In-PR
-      - hasLabel:
-          label: Help Wanted
-      - isLabeled
-      then:
-      - removeLabel:
-          label: Help-Wanted
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/dup(licate|e)?(\s+of)?\s+\#[\d]+'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!
-      - closeIssue
-      - removeLabel:
-          label: Needs-Triage
-      - addLabel:
-          label: Resolution-Duplicate
-      - removeLabel:
-          label: Needs-Tag-Fix
-      - removeLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      - removeLabel:
-          label: Needs-Repro
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/feedback'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: >2-
-
-            Hi there!<br><br>Can you please send us feedback with the [Feedback Hub](https://support.microsoft.com/en-us/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332) with this issue? Make sure to click the "Start recording" button, then reproduce the issue before submitting the feedback. Once it's submitted, paste the link here so we can more easily find your crash information on the back end?<br><br>Thanks!<br><br>![image](https://user-images.githubusercontent.com/18356694/140811502-a068f78b-89d2-4587-925a-73e19652b830.png)<br><br>![image](https://user-images.githubusercontent.com/18356694/140811557-cdc22a0f-fa6a-4f6a-953e-73b51f5548a3.png)<br><br>![image](https://user-images.githubusercontent.com/18221333/62478649-6de55400-b760-11e9-806e-5aab7e085a9f.png)
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      then:
-      - cleanEmailReply
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - labelSync:
-          pattern: Issue-
-      - labelSync:
-          pattern: Area-
-      - labelSync:
-          pattern: Priority-
-      - labelSync:
-          pattern: Product-
-      - labelSync:
-          pattern: Severity-
-      - labelSync:
-          pattern: Impact-
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: '\/dup(licate|e)?(\s+of)?\s+https'
-          isRegex: True
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - addReply:
-          reply: Hi! We've identified this issue as a duplicate of one that exists on somebody else's Issue Tracker. Please make sure you subscribe to the referenced external issue for future updates. Thanks for your report!
-      - closeIssue
-      - removeLabel:
-          label: Needs-Triage
-      - addLabel:
-          label: Resolution-External
-      - removeLabel:
-          label: Needs-Attention
-      - removeLabel:
-          label: Needs-Author-Feedback
-      - removeLabel:
-          label: Needs-Bisect
-      - removeLabel:
-          label: Needs-Repro
-      - removeLabel:
-          label: Needs-Second
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - commentContains:
-          pattern: /?
-          isRegex: False
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - activitySenderHasPermission:
-            permission: Write
-      then:
-      - removeLabel:
-          label: Needs-Attention
-      - addLabel:
-          label: Needs-Author-Feedback
-      description: 
-onFailure: 
-onSuccess: 

.vscode/settings.json

@@ -103,9 +103,7 @@
     "files.exclude": {
         "**/bin/**": true,
         "**/obj/**": true,
+        "**/packages/**": true,
         "**/Generated Files/**": true
-    },
-    "search.exclude": {
-        "**/packages/**": true
     }
 }

OpenConsole.sln

@@ -420,8 +420,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalStress", "src\tools
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingTests", "src\tools\RenderingTests\RenderingTests.vcxproj", "{37C995E0-2349-4154-8E77-4A52C0C7F46D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchcat", "src\tools\benchcat\benchcat.vcxproj", "{2C836962-9543-4CE5-B834-D28E1F124B66}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -2782,8 +2780,11 @@ Global
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|ARM.ActiveCfg = Debug|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x64.ActiveCfg = Debug|x64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x64.Build.0 = Debug|x64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x86.ActiveCfg = Debug|Win32
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Debug|x86.Build.0 = Debug|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
@@ -2792,28 +2793,11 @@ Global
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM.ActiveCfg = Release|Win32
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM64.Build.0 = Release|ARM64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x64.ActiveCfg = Release|x64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x64.Build.0 = Release|x64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x64.ActiveCfg = Release|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x86.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|ARM.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|x64.ActiveCfg = Debug|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Debug|x86.ActiveCfg = Debug|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|Any CPU.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|ARM.ActiveCfg = Release|Win32
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|x64.ActiveCfg = Release|x64
-		{2C836962-9543-4CE5-B834-D28E1F124B66}.Release|x86.ActiveCfg = Release|Win32
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2920,7 +2904,6 @@ Global
 		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{2C836962-9543-4CE5-B834-D28E1F124B66} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

build/Helix/AzurePipelinesHelperScripts.ps1

@@ -1,175 +0,0 @@
-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
-}
-
-function Get-HelixJobTypeFromTestRun
-{
-    Param ($testRun)
-
-    $testRunSingleResultUri = "$($testRun.url)/results?`$top=1&`$skip=0&api-version=5.1"
-    $singleTestResult = Invoke-RestMethod -Uri $testRunSingleResultUri -Method Get -Headers $azureDevOpsRestApiHeaders
-    $count = $singleTestResult.value.Length
-    if($count -eq 0)
-    {
-        # If the count is 0, then results have not yet been reported for this run.
-        # We only care about completed runs with results, so it is ok to just return 'UNKNOWN' for this run.
-        return "UNKNOWN"
-    }
-    else
-    {
-        $info = ConvertFrom-Json $singleTestResult.value.comment
-        $helixJobId = $info.HelixJobId
-        $job = Invoke-RestMethodWithRetries "https://helix.dot.net/api/2019-06-17/jobs/${helixJobId}?access_token=${HelixAccessToken}"
-        return $job.Type
-    }
-}
-
-function Append-HelixAccessTokenToUrl
-{
-    Param ([string]$url, [string]$token)
-    if($url.Contains("?"))
-    {
-        $url = "$($url)&access_token=$($token)"
-    }
-    else
-    {
-        $url = "$($url)?access_token=$($token)"
-    }
-    return $url
-}
-
-
-# The Helix Rest api is sometimes unreliable. So we call these apis with retry logic. 
-# Note: The Azure DevOps apis are stable and do not need to be called with this retry logic.
-$helixApiRetries = 0
-$helixApiRetriesMax = 10 
-
-function Download-StringWithRetries
-{
-    Param ([string]$fileName, [string]$url)
-
-    $result = ""
-    $done = $false
-
-    while(!($done))
-    {
-        try
-        {
-            Write-Host "Downloading $fileName"
-            $result = (New-Object System.Net.WebClient).DownloadString($url)
-            $done = $true
-        }
-        catch
-        {
-            Write-Host "Failed to download $fileName $($PSItem.Exception)"
-
-            $helixApiRetries = $helixApiRetries + 1
-            if($helixApiRetries -lt $helixApiRetriesMax)
-            {
-                Write-Host "Sleep and retry download of $fileName"
-                Start-Sleep 60
-            }
-            else
-            {
-                throw "Failed to download $fileName"
-            }
-        }
-    }
-
-    return $result
-}
-
-function Invoke-RestMethodWithRetries
-{
-    Param ([string]$url,$Headers)
-
-    $result = @()
-    $done = $false
-
-    while(!($done))
-    {
-        try
-        {
-            $result = Invoke-RestMethod -Uri $url -Method Get -Headers $Headers
-            $done = $true
-        }
-        catch
-        {
-            Write-Host "Failed to invoke Rest method $($PSItem.Exception)"
-
-            $helixApiRetries = $helixApiRetries + 1
-            if($helixApiRetries -lt $helixApiRetriesMax)
-            {
-                Write-Host "Sleep and retry invoke"
-                Start-Sleep 60
-            }
-            else
-            {
-                throw "Failed to invoke Rest method"
-            }
-        }
-    }
-
-    return $result
-}
-
-function Download-FileWithRetries
-{
-    Param ([string]$fileurl, [string]$destination)
-
-    $done = $false
-
-    while(!($done))
-    {
-        try
-        {
-            Write-Host "Downloading $destination"
-            $webClient.DownloadFile($fileurl, $destination)
-            $done = $true
-        }
-        catch
-        {
-            Write-Host "Failed to download $destination $($PSItem.Exception)"
-
-            $helixApiRetries = $helixApiRetries + 1
-            if($helixApiRetries -lt $helixApiRetriesMax)
-            {
-                Write-Host "Sleep and retry download of $destination"
-                Start-Sleep 60
-            }
-            else
-            {
-                throw "Failed to download $destination"
-            }
-        }
-    }
-}

build/Helix/EnsureMachineState.ps1

@@ -1,112 +0,0 @@
-$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

build/Helix/GenerateTestProjFile.ps1

@@ -1,336 +0,0 @@
-[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

build/Helix/InstallTestAppDependencies.ps1

@@ -1,12 +0,0 @@
-# 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
-    
-}

build/Helix/OutputFailedTestQuery.ps1

@@ -1,8 +0,0 @@
-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)

build/Helix/OutputSubResultsJsonFiles.ps1

@@ -1,32 +0,0 @@
-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
-}

build/Helix/OutputTestResults.ps1

@@ -1,131 +0,0 @@
-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-RestMethodWithRetries $queryUri -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.client21h1.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-RestMethodWithRetries "$($testRun.url)/results?api-version=5.0" -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;]"
-}

build/Helix/PrepareHelixPayload.ps1

@@ -1,62 +0,0 @@
-[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\Microsoft.Taef.10.60.210621002\build\Binaries\$Platform\*" $payloadDir
-Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.60.210621002\build\Binaries\$Platform\NetFx4.5\*" $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\"
-New-Item -ItemType Directory -Force -Path "$payloadDir\content\"
-Copy-Item "$nugetPackagesDir\Microsoft.Internal.Windows.Terminal.TestContent.1.0.1\content\*" "$payloadDir\content\"
-
-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"
-
-# Extract the unpackaged distribution of Windows Terminal to the payload directory,
-# where it will create a subdirectory named terminal-0.0.1.0
-# This is referenced in TerminalApp.cs later as part of the test harness.
-& tar -x -v -f "$repoDirectory\Artifacts\$ArtifactName\unpackaged\WindowsTerminalDev_0.0.1.0_x64.zip" -C "$payloadDir"
-Copy-Item "res\fonts\*.ttf" "$payloadDir\terminal-0.0.1.0"

build/Helix/ProcessHelixFiles.ps1

@@ -1,130 +0,0 @@
-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"
-
-
-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)
-        {
-            $url = Append-HelixAccessTokenToUrl $file.Link "{Your-Helix-Access-Token-Here}"
-            Out-File -FilePath $helixLinkFile -Append -InputObject "<li>$($url)</li>"
-        }
-        Out-File -FilePath $helixLinkFile -Append -InputObject "</ul>"
-        Out-File -FilePath $helixLinkFile -Append -InputObject "</div>"
-    }
-}
-
-function Append-HelixAccessTokenToUrl
-{
-    Param ([string]$url, [string]$token)
-    if($token)
-    {
-        if($url.Contains("?"))
-        {
-            $url = "$($url)&access_token=$($token)"
-        }
-        else
-        {
-            $url = "$($url)?access_token=$($token)"
-        }
-    }
-    return $url
-}
-
-#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-RestMethodWithRetries $queryUri -Headers $azureDevOpsRestApiHeaders
-$webClient = New-Object System.Net.WebClient
-[System.Collections.Generic.List[string]]$workItems = @()
-
-foreach ($testRun in $testRuns.value)
-{
-    Write-Host "testRunUri = $testRun.url"
-    $testResults = Invoke-RestMethodWithRetries "$($testRun.url)/results?api-version=5.0" -Headers $azureDevOpsRestApiHeaders
-    $isTestRunNameShown = $false
-
-    foreach ($testResult in $testResults.value)
-    {
-        $info = ConvertFrom-Json ([System.Web.HttpUtility]::HtmlDecode($testResult.comment))
-        $helixJobId = $info.HelixJobId
-        $helixWorkItemName = $info.HelixWorkItemName
-
-        $workItem = "$helixJobId-$helixWorkItemName"
-
-        Write-Host "Helix Work Item = $workItem"
-
-        if (-not $workItems.Contains($workItem))
-        {
-            $workItems.Add($workItem)
-            $filesQueryUri = "https://helix.dot.net/api/2019-06-17/jobs/$helixJobId/workitems/$helixWorkItemName/files"
-            $filesQueryUri = Append-HelixAccessTokenToUrl $filesQueryUri $helixAccessToken
-            $files = Invoke-RestMethodWithRetries $filesQueryUri
-
-            $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 = $testResult.automatedTestName.Split('.')[0]
-                    $archPath = $testResult.automatedTestName.Split('.')[1]
-                    $fileName = $pgcFile.Name
-                    $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
-
-                    Write-Host "Downloading $link to $destination"
-
-                    $link = Append-HelixAccessTokenToUrl $link $HelixAccessToken
-                    Download-FileWithRetries $link $destination
-                }
-            }
-        }
-    }
-}

build/Helix/RunTestsInHelix.proj

@@ -1,20 +0,0 @@
-<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)\$(Configuration)\$(Platform)\RunTestsInHelix-TerminalAppLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
-  <Import Project="$(ProjFilesPath)\$(Configuration)\$(Platform)\RunTestsInHelix-SettingsModelLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
-  <Import Project="$(ProjFilesPath)\$(Configuration)\$(Platform)\RunTestsInHelix-HostTestsUIA.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
-  <Import Project="$(ProjFilesPath)\$(Configuration)\$(Platform)\RunTestsInHelix-WindowsTerminalUIATests.proj" Condition=" '$(TestSuite)'=='PgoInstrumentationSuite' " />
-</Project>

build/Helix/UpdateUnreliableTests.ps1

@@ -1,136 +0,0 @@
-[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-RestMethodWithRetries $queryUri -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 "$($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-RestMethodWithRetries $testRunResultsUri -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.
-            $resultsJson = Download-StringWithRetries "Error results" $testResult.errorMessage
-            $rerunResults = ConvertFrom-Json $resultsJson
-            [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
-}

build/Helix/global.json

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

build/Helix/packages.config

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
-  <package id="Microsoft.Internal.Windows.Terminal.TestContent" version="1.0.1" />
-  <package id="Microsoft.Taef" version="10.60.210621002" 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>

build/Helix/readme.md

@@ -1,32 +0,0 @@
-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.

build/Helix/runtests.cmd

@@ -1,105 +0,0 @@
-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 SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll WindowsTerminal.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%
-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%

build/config/ESRPSigning_ConPTY.json

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

build/config/ESRPSigning_Terminal.json

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

build/config/esrp.build.batch.conpty.json

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

build/config/esrp.build.batch.terminal_constituents.json

@@ -0,0 +1,65 @@
+[
+    {
+        "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"
+                }
+            ]
+        }
+    }
+]

build/config/esrp.build.batch.wpf.json

@@ -0,0 +1,46 @@
+[
+    {
+        "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"
+                }
+            ]
+        }
+    }
+]

build/config/esrp.build.batch.wpfdotnet.json

@@ -0,0 +1,47 @@
+[
+    {
+        "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"
+                }
+            ]
+        }
+    }
+]

build/config/tsa.json

@@ -0,0 +1,6 @@
+{
+    "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"]
+}

build/pgo/PGO.DB.proj

@@ -1,4 +1,5 @@
 <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>
+</Project>

build/pgo/Terminal.PGO.DB.nuspec

@@ -12,5 +12,6 @@
   <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>

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>main</PGOBranch>
+    <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>
@@ -46,6 +46,5 @@
     <PGOCopyRuntime Condition="'$(PGOBuildMode)' == 'Instrument'">true</PGOCopyRuntime>
   </PropertyGroup>
 
-  <!-- Import PGO-Helpers -->
-  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.props" />
+  <!-- Do not import PGO-Helpers props here, as it is too early to detect the C++ tools directory -->
 </Project>

build/pipelines/ci.yml

@@ -29,76 +29,80 @@ 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:
-  - stage: Audit_x64
-    displayName: Audit Mode
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-      - template: ./templates/build-console-audit-job.yml
-        parameters:
-          platform: x64
+  - ${{ 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: Build_x64
-    displayName: Build x64
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-      - template: ./templates/build-console-ci.yml
-        parameters:
-          platform: x64
-  - stage: Build_x86
-    displayName: Build x86
+  - stage: CodeHealth
+    displayName: Code Health
     dependsOn: []
     jobs:
-      - 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
+      - template: ./templates-v2/job-check-code-format.yml
 
-  - stage: Test_x64
-    displayName: Test x64
-    dependsOn: [Build_x64]
-    condition: succeeded()
-    jobs:
-      - template: ./templates/test-console-ci.yml
-        parameters:
-          platform: x64
-  - stage: Test_x86
-    displayName: Test x86
-    dependsOn: [Build_x86]
-    jobs:
-      - template: ./templates/test-console-ci.yml
-        parameters:
-          platform: x86
+  - ${{ 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
 
-  - stage: Helix_x64
-    displayName: Helix x64
-    dependsOn: [Build_x64]
-    condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')))
-    jobs:
-      - template: ./templates/console-ci-helix-job.yml
-        parameters:
-          platform: x64
+    - ${{ 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)
 
-  - stage: Scripts
-    displayName: Code Health Scripts
-    dependsOn: []
-    condition: succeeded()
-    jobs:
-      - template: ./templates/check-formatting.yml
-
-
-  - stage: CodeIndexer
-    displayName: Github CodeNav Indexer
-    dependsOn: [Build_x64]
-    condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')))
-    jobs:
-      - template: ./templates/codenav-indexer.yml
+  - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+    - stage: CodeIndexer
+      displayName: Github CodeNav Indexer
+      dependsOn: []
+      jobs:
+        - template: ./templates-v2/job-index-github-codenav.yml

build/pipelines/daily-loc-submission.yml

@@ -27,6 +27,7 @@ steps:
   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.
 

build/pipelines/feature-flag-ci.yml

@@ -7,6 +7,7 @@ pr:
   paths:
     include:
       - src/features.xml
+      - build/pipelines/feature-flag-ci.yml
 
 variables:
   - name: runCodesignValidationInjectionBG
@@ -21,9 +22,19 @@ parameters:
       # Dev is built automatically
       # WindowsInbox does not typically build with VS.
 
-jobs:
+stages:
   - ${{ each branding in parameters.buildBrandings }}:
-    - template: ./templates/build-console-ci.yml
-      parameters:
-        platform: x64
-        branding: ${{ branding }}
+    - 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

build/pipelines/fuzz.yml

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

build/pipelines/nightly.yml

@@ -0,0 +1,23 @@
+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!

build/pipelines/ob-nightly.yml

@@ -0,0 +1,49 @@
+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
+

build/pipelines/ob-release.yml

@@ -0,0 +1,83 @@
+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 }}

build/pipelines/pgo.yml

@@ -1,5 +1,27 @@
 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
@@ -10,18 +32,57 @@ variables:
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
 
 stages:
-  - stage: Build_x64
-    displayName: Build x64
+  - stage: Build
+    displayName: Build
     dependsOn: []
     condition: succeeded()
     jobs:
-      - template: ./templates/build-console-pgo.yml
+      - template: ./templates-v2/job-build-project.yml
         parameters:
-          platform: x64
-  - stage: Publish_PGO_Databases
-    displayName: Publish PGO databases
-    dependsOn: ['Build_x64']
+          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:
-      - template: ./templates/pgo-build-and-publish-nuget-job.yml
+      - ${{ 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:
-          pgoArtifact: 'PGO'
+          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

build/pipelines/release.yml

@@ -1,11 +1,7 @@
-# This build should never run as CI or against a pull request.
 trigger: none
 pr: none
 
-pool:
-  name: WinDevPool-L
-  demands: ImageOverride -equals WinDevVS17-latest
-
+# Expose all of these parameters for user configuration.
 parameters:
   - name: branding
     displayName: "Branding (Build Type)"
@@ -14,22 +10,11 @@ parameters:
     values:
       - Release
       - Preview
+      - Dev
   - name: buildTerminal
     displayName: "Build Windows Terminal MSIX"
     type: boolean
     default: true
-  - name: runCompliance
-    displayName: "Run Compliance and Security Build"
-    type: boolean
-    default: true
-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
-  - name: buildTerminalVPack
-    displayName: "Build Windows Terminal VPack"
-    type: boolean
-    default: false
   - name: buildConPTY
     displayName: "Build ConPTY NuGet"
     type: boolean
@@ -47,705 +32,53 @@ parameters:
       - 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:
-  MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
-  TerminalInternalPackageVersion: "0.0.8"
-  # If we are building a branch called "release-*", change the NuGet suffix
-  # to "preview". If we don't do that, XES will set the suffix to "release1"
-  # because it truncates the value after the first period.
-  # We also want to disable the suffix entirely if we're Release branded while
-  # on a release branch.
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label as
-  # well.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Release                    | Preview
-  # ------------------|----------------------------|-----------------------------
-  # release-*         | 1.12.20220427              | 1.13.20220427-preview
-  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
-  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      NoNuGetPackBetaVersion: true
-    ${{ else }}:
-      NuGetPackBetaVersion: preview
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental
+  - 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)
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
-jobs:
-- job: Build
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ each platform in parameters.buildPlatforms }}:
-          ${{ config }}_${{ platform }}:
-            BuildConfiguration: ${{ config }}
-            BuildPlatform: ${{ platform }}
-  displayName: Build
-  timeoutInMinutes: 240
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - task: PowerShell@2
-    displayName: Rationalize Build Platform
-    inputs:
-      targetType: inline
-      script: >-
-        $Arch = "$(BuildPlatform)"
 
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
-
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-  - template: .\templates\restore-nuget-steps.yml
-  - task: UniversalPackages@0
-    displayName: Download terminal-internal Universal Package
-    inputs:
-      feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-      packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-      versionListDownload: $(TerminalInternalPackageVersion)
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: >-
-        src\cascadia\TerminalApp\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalApp\Resources\en-US\ContextMenu.resw
-
-        src\cascadia\TerminalControl\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalConnection\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsModel\Resources\en-US\Resources.resw
-
-        src\cascadia\TerminalSettingsEditor\Resources\en-US\Resources.resw
-
-        src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      pseudoSetting: Included
-  - task: PowerShell@2
-    displayName: Move Loc files one level up
-    inputs:
-      targetType: inline
-      script: >-
-        $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-
-        $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-      pwsh: true
-  - task: PowerShell@2
-    displayName: Copy the Context Menu Loc Resources to CascadiaPackage
-    inputs:
-      filePath: ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
-      pwsh: true
-  - task: PowerShell@2
-    displayName: Generate NOTICE.html from NOTICE.md
-    inputs:
-      filePath: .\build\scripts\Generate-ThirdPartyNotices.ps1
-      arguments: -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
-      pwsh: true
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln
-      condition: true
-      inputs:
-        solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /t:Terminal\CascadiaPackage /p:WindowsTerminalReleaseBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-        clean: true
-        maximumCpuCount: true
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: binlog'
-      condition: failed()
-      continueOnError: True
-      inputs:
-        PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
-        ArtifactName: binlog-$(BuildPlatform)
-    - task: PowerShell@2
-      displayName: Check MSIX for common regressions
-      inputs:
-        targetType: inline
-        script: >-
-          $Package = Get-ChildItem -Recurse -Filter "CascadiaPackage_*.msix"
-
-          .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path $Package.FullName
-        pwsh: true
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for PublicTerminalCore
-      inputs:
-        solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for ConPTY
-      inputs:
-        solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Conhost\Host_EXE;Conhost\winconpty_DLL
-        platform: $(BuildPlatform)
-        configuration: $(BuildConfiguration)
-  - task: PowerShell@2
-    displayName: Source Index PDBs
-    inputs:
-      filePath: build\scripts\Index-Pdbs.ps1
-      arguments: -SearchDir '$(Build.SourcesDirectory)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-      errorActionPreference: silentlyContinue
-      pwsh: true
-  - task: PowerShell@2
-    displayName: Run Unit Tests
-    condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - task: PowerShell@2
-    displayName: Run Feature Tests
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'x64'))
-    enabled: False
-    inputs:
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)'
-  - ${{ if eq(parameters.buildTerminal, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy *.msix and symbols to Artifacts
-      inputs:
-        Contents: >-
-          **/*.msix
-
-          **/*.appxsym
-        TargetFolder: $(Build.ArtifactStagingDirectory)/appx
-        OverWrite: true
-        flattenFolders: true
-
-    - pwsh: |-
-        $Package = (Get-ChildItem "$(Build.ArtifactStagingDirectory)/appx" -Recurse -Filter "Cascadia*.msix" | Select -First 1)
-        $PackageFilename = $Package.FullName
-        Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        & "$(MakeAppxPath)" unpack /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
-      displayName: Unpack the new Terminal package for signing
-
-    - task: EsrpCodeSigning@1
-      displayName: Submit Terminal's binaries for signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Build.SourcesDirectory)\UnpackedTerminalPackage'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_Terminal.json'
-
-    - pwsh: |-
-        $PackageFilename = "$(WindowsTerminalPackagePath)"
-        Remove-Item "$(Build.SourcesDirectory)\UnpackedTerminalPackage\CodeSignSummary*"
-        & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
-      displayName: Re-pack the new Terminal package after signing
-
-    - pwsh: |-
-        $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination "$(Build.ArtifactStagingDirectory)/appx"
-      displayName: Build Unpackaged Distribution
-
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (application)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/appx'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate application SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/appx'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Terminal app)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
-        ArtifactName: terminal-$(BuildPlatform)-$(BuildConfiguration)
-
-  - ${{ if eq(parameters.buildConPTY, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy ConPTY to Artifacts
-      inputs:
-        Contents: |-
-          $(Build.SourcesDirectory)/bin/**/conpty.dll
-          $(Build.SourcesDirectory)/bin/**/conpty.lib
-          $(Build.SourcesDirectory)/bin/**/conpty.pdb
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.exe
-          $(Build.SourcesDirectory)/bin/**/OpenConsole.pdb
-        TargetFolder: $(Build.ArtifactStagingDirectory)/conpty
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (ConPTY)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/conpty
-        ArtifactName: conpty-dll-$(BuildPlatform)-$(BuildConfiguration)
-  - ${{ if eq(parameters.buildWPF, true) }}:
-    - task: CopyFiles@2
-      displayName: Copy PublicTerminalCore.dll to Artifacts
-      inputs:
-        Contents: >-
-          **/PublicTerminalCore.dll
-        TargetFolder: $(Build.ArtifactStagingDirectory)/wpf
-        OverWrite: true
-        flattenFolders: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (PublicTerminalCore)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)/wpf
-        ArtifactName: wpf-dll-$(BuildPlatform)-$(BuildConfiguration)
-
-  - task: PublishSymbols@2
-    displayName: Publish symbols path
-    continueOnError: True
-    inputs:
-      SearchPattern: |
-        $(Build.SourcesDirectory)/bin/**/*.pdb
-        $(Build.SourcesDirectory)/bin/**/*.exe
-        $(Build.SourcesDirectory)/bin/**/*.dll
-      IndexSources: false
-      SymbolServerType: TeamServices
-
-- ${{ if eq(parameters.runCompliance, true) }}:
-  - template: ./templates/build-console-compliance-job.yml
-
-- ${{ if eq(parameters.buildTerminal, true) }}:
-  - job: BundleAndSign
-    displayName: Create and sign AppX/MSIX bundles
-    variables:
-      ${{ if eq(parameters.branding, 'Release') }}:
-        BundleStemName: Microsoft.WindowsTerminal
-      ${{ elseif eq(parameters.branding, 'Preview') }}:
-        BundleStemName: Microsoft.WindowsTerminalPreview
-      ${{ else }}:
-        BundleStemName: WindowsTerminalDev
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@1
-        displayName: Download Artifacts ${{ platform }}
-        inputs:
-          # Make sure to download the entire artifact, because it includes the SPDX SBOM
-          artifactName: terminal-${{ platform }}-Release
-          # Downloading to the source directory should ensure that the later SBOM generator can see the earlier SBOMs.
-          downloadPath: '$(Build.SourcesDirectory)/appx-artifacts'
-    # Add 3000 to the major version component, but only for the bundle.
-    # This is to ensure that it is newer than "2022.xx.yy.zz" or whatever the original bundle versions were before
-    # we switched to uniform naming.
-    - pwsh: |-
-        $VersionEpoch = 3000
-        $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
-        $Components[0] = ([int]$Components[0] + $VersionEpoch)
-        $BundleVersion = $Components -Join "."
-        New-Item -Type Directory "$(System.ArtifactsDirectory)\bundle"
-        .\build\scripts\Create-AppxBundle.ps1 -InputPath "$(Build.SourcesDirectory)/appx-artifacts" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-      displayName: Create WindowsTerminal*.msixbundle
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.msixbundle to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)\bundle
-        Pattern: $(BundleStemName)*.msixbundle
-        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"
-              }
-          ]
-
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (bundle)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-       BuildComponentPath: '$(Build.SourcesDirectory)/appx-artifacts'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate bundle SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: appxbundle-signed'
-      inputs:
-        PathtoPublish: $(System.ArtifactsDirectory)\bundle
-        ArtifactName: appxbundle-signed
-
-- ${{ if eq(parameters.buildConPTY, true) }}:
-  - job: PackageAndSignConPTY
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (ConPTY)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@1
-        displayName: Download ${{ platform }} ConPTY binaries
-        inputs:
-          artifactName: conpty-dll-${{ platform }}-$(BuildConfiguration)
-          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
-          extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts around
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: |-
-          Get-ChildItem bin -Recurse -Directory -Filter conpty-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-          Move-Item bin\x86 bin\Win32
-
-    - task: EsrpCodeSigning@1
-      displayName: Submit ConPTY libraries and OpenConsole for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Build.SourcesDirectory)/bin'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_ConPTY.json'
-
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet pack
-      inputs:
-        command: pack
-        packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
-        packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
-        versioningScheme: byEnvVar
-        versionEnvVar: XES_PACKAGEVERSIONNUMBER
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (nupkg)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
-        ArtifactName: conpty-nupkg-$(BuildConfiguration)
-
-
-- ${{ if eq(parameters.buildWPF, true) }}:
-  - job: PackageAndSignWPF
-    strategy:
-      matrix:
-        ${{ each config in parameters.buildConfigurations }}:
-          ${{ config }}:
-            BuildConfiguration: ${{ config }}
-    displayName: Create NuGet Package (WPF Terminal Control)
-    dependsOn: Build
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-      persistCredentials: True
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-      inputs:
-        disableOutputRedirect: true
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@1
-        displayName: Download ${{ platform }} PublicTerminalCore
-        inputs:
-          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)
-          itemPattern: '**/*.dll'
-          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
-          extractTars: false
-    - task: PowerShell@2
-      displayName: Move downloaded artifacts around
-      inputs:
-        targetType: inline
-        # Find all artifact files and move them up a directory. Ugh.
-        script: |-
-          Get-ChildItem bin -Recurse -Directory -Filter wpf-dll-* | % {
-            $_ | Get-ChildItem -Recurse -File | % {
-              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
-            }
-          }
-          Move-Item bin\x86 bin\Win32
-    - task: NuGetToolInstaller@1
-      displayName: Use NuGet 5.10.0
-      inputs:
-        versionSpec: 5.10.0
-    - task: NuGetCommand@2
-      displayName: NuGet restore copy
-      inputs:
-        selectOrConfig: config
-        nugetConfigPath: NuGet.Config
-    - task: VSBuild@1
-      displayName: Build solution **\OpenConsole.sln for WPF Control
-      inputs:
-        solution: '**\OpenConsole.sln'
-        msbuildArgs: /p:WindowsTerminalReleaseBuild=$(UseReleaseBranding);Version=$(XES_PACKAGEVERSIONNUMBER) /t:Pack
-        platform: Any CPU
-        configuration: $(BuildConfiguration)
-        maximumCpuCount: true
-    - task: PublishSymbols@2
-      displayName: Publish symbols path
-      continueOnError: True
-      inputs:
-        SearchPattern: |
-          $(Build.SourcesDirectory)/bin/**/*.pdb
-          $(Build.SourcesDirectory)/bin/**/*.exe
-          $(Build.SourcesDirectory)/bin/**/*.dll
-        IndexSources: false
-        SymbolServerType: TeamServices
-        SymbolsArtifactName: Symbols_WPF_$(BuildConfiguration)
-    - task: CopyFiles@2
-      displayName: Copy *.nupkg to Artifacts
-      inputs:
-        Contents: '**/*Wpf*.nupkg'
-        TargetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-        OverWrite: true
-        flattenFolders: true
-    - task: EsrpCodeSigning@1
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (nupkg)
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
-        ArtifactName: wpf-nupkg-$(BuildConfiguration)
-
-- ${{ if eq(parameters.publishSymbolsToPublic, true) }}:
-  - job: PublishSymbols
-    displayName: Publish Symbols
-    dependsOn: BundleAndSign
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-
-    - template: .\templates\restore-nuget-steps.yml
-
-    # Download the terminal-PLATFORM-CONFIG-VERSION artifact for every platform/version combo
-    - ${{ each platform in parameters.buildPlatforms }}:
-      - task: DownloadBuildArtifacts@1
-        displayName: Download Symbols ${{ platform }}
-        inputs:
-          artifactName: terminal-${{ platform }}-Release
-          itemPattern: '**/*.appxsym'
-
-    # It seems easier to do this -- download every appxsym -- then enumerate all the PDBs in the build directory for the
-    # public symbol push. Otherwise, we would have to list all of the PDB files one by one.
-    - pwsh: |-
-        mkdir $(Build.SourcesDirectory)/appxsym-temp
-        Get-ChildItem "$(System.ArtifactsDirectory)" -Filter *.appxsym -Recurse | % {
-          $src = $_.FullName
-          $dest = Join-Path "$(Build.SourcesDirectory)/appxsym-temp/" $_.Name
-
-          mkdir $dest
-          Write-Host "Extracting $src to $dest..."
-          tar -x -v -f $src -C $dest
-        }
-      displayName: Extract symbols for public consumption
-
-    - task: PowerShell@2
-      displayName: Source Index PDBs (the public ones)
-      inputs:
-        filePath: build\scripts\Index-Pdbs.ps1
-        arguments: -SearchDir '$(Build.SourcesDirectory)/appxsym-temp' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-        pwsh: true
-
-    # Publish the app symbols to the public MSDL symbol server
-    # accessible via https://msdl.microsoft.com/download/symbols
-    - task: PublishSymbols@2
-      displayName: 'Publish app symbols to MSDL'
-      inputs:
-        symbolsFolder: '$(Build.SourcesDirectory)/appxsym-temp'
-        searchPattern: '**/*.pdb'
-        SymbolsMaximumWaitTime: 30
-        SymbolServerType: 'TeamServices'
-        SymbolsProduct: 'Windows Terminal Application Binaries'
-        SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-        # The ADO task does not support indexing of GitHub sources.
-        indexSources: false
-        detailedLog: true
-      # There is a bug which causes this task to fail if LIB includes an inaccessible path (even though it does not depend on it).
-      # To work around this issue, we just force LIB to be any dir that we know exists.
-      # Copied from https://github.com/microsoft/icu/blob/f869c214adc87415dfe751d81f42f1bca55dcf5f/build/azure-nuget.yml#L564-L583
-      env:
-        LIB: $(Build.SourcesDirectory)
-        ArtifactServices_Symbol_AccountName: microsoftpublicsymbols
-        ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)
-
-
-- ${{ if eq(parameters.buildTerminalVPack, true) }}:
-  - job: VPack
-    displayName: Create Windows vPack
-    dependsOn: BundleAndSign
-    steps:
-    - checkout: self
-      clean: true
-      fetchDepth: 1
-      submodules: true
-    - task: PkgESSetupBuild@12
-      displayName: Package ES - Setup Build
-    - task: DownloadBuildArtifacts@1
-      displayName: Download Build Artifacts
-      inputs:
-        artifactName: appxbundle-signed
-        extractTars: false
-    - task: PowerShell@2
-      displayName: Rename and stage packages for vpack
-      inputs:
-        targetType: inline
-        script: >-
-          # Rename to known/fixed name for Windows build system
-
-          Get-ChildItem Microsoft.WindowsTerminal_*.msixbundle | Rename-Item -NewName { 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle' }
-
-
-          # Create vpack directory and place item inside
-
-          mkdir WindowsTerminal.app
-
-          mv Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle .\WindowsTerminal.app\
-        workingDirectory: $(System.ArtifactsDirectory)\appxbundle-signed
-    - task: PkgESVPack@12
-      displayName: 'Package ES - VPack'
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        sourceDirectory: $(System.ArtifactsDirectory)\appxbundle-signed\WindowsTerminal.app
-        description: VPack for the Windows Terminal Application
-        pushPkgName: WindowsTerminal.app
-        owner: conhost
-        githubToken: $(GitHubTokenForVpackProvenance)
-    - task: PublishPipelineArtifact@1
-      displayName: 'Copy VPack Manifest to Drop'
-      inputs:
-        targetPath: $(XES_VPACKMANIFESTDIRECTORY)
-        artifactName: VPackManifest
-    - task: PkgESFCIBGit@12
-      displayName: 'Submit VPack Manifest to Windows'
-      inputs:
-        configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-        artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-        prTimeOut: 5
-...
+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 }}

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -0,0 +1,144 @@
+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

build/pipelines/templates-v2/job-build-project.yml

@@ -0,0 +1,293 @@
+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

build/pipelines/templates-v2/job-check-code-format.yml

@@ -0,0 +1,15 @@
+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'

build/pipelines/templates-v2/job-index-github-codenav.yml

@@ -1,21 +1,15 @@
-parameters:
-  artifactName: 'drop'
-
 jobs:
 - job: CodeNavIndexer
   displayName: Run Github CodeNav Indexer
-  pool: { vmImage: windows-2019 }
+  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: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-
   - task: RichCodeNavIndexer@0
     inputs:
       languages: 'cpp,csharp'

build/pipelines/templates-v2/job-merge-msix-into-bundle.yml

@@ -0,0 +1,150 @@
+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

build/pipelines/templates-v2/job-package-conpty.yml

@@ -0,0 +1,129 @@
+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

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

@@ -1,14 +1,26 @@
-# From our friends at MUX: https://github.com/microsoft/microsoft-ui-xaml/blob/main/build/AzurePipelinesTemplates/MUX-BuildAndPublishPGONuGet-Job.yml
-
 parameters:
-  dependsOn: ''
-  pgoArtifact: PGO
+  - 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: BuildAndPublishPGONuGet
+- job: ${{ parameters.jobName }}
+  ${{ if ne(length(parameters.pool), 0) }}:
+    pool: ${{ parameters.pool }}
   dependsOn: ${{ parameters.dependsOn }}
-  pool:
-    vmImage: 'windows-2019'
+  displayName: Package and Publish PGO Databases
+
   variables:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
     pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
@@ -16,20 +28,25 @@ jobs:
     nuspecFilename: PGO.nuspec
 
   steps:
-  - task: DownloadBuildArtifacts@0
+  - 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:
-      artifactName: ${{ parameters.pgoArtifact }}
+      artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
       downloadPath: $(artifactsPath)
 
+  - template: steps-ensure-nuget-version.yml
+
   - task: NuGetAuthenticate@0
     inputs:
       nuGetServiceConnections: 'Terminal Public Artifact Feed'
 
-  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 5.8.0'
-    inputs:
-      versionSpec: 5.8.0
-
   # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
   # This should be `task: NuGetCommand@2`
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
@@ -45,12 +62,11 @@ jobs:
     displayName: 'Create PGO Nuget'
     inputs:
       solution: $(pgoToolsPath)\PGO.DB.proj
-      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath)\${{ parameters.pgoArtifact }} /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
+      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath) /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathToPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: ${{ parameters.pgoArtifact }}
+  - publish: $(Build.ArtifactStagingDirectory)
+    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
+    displayName: "Publish Pipeline Artifact"
 
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet push'

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

@@ -0,0 +1,75 @@
+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"

build/pipelines/templates-v2/job-publish-symbols.yml

@@ -0,0 +1,97 @@
+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)

build/pipelines/templates-v2/job-run-pgo-tests.yml

@@ -0,0 +1,82 @@
+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()

build/pipelines/templates-v2/job-submit-windows-vpack.yml

@@ -0,0 +1,81 @@
+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
+

build/pipelines/templates-v2/job-test-project.yml

@@ -0,0 +1,91 @@
+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()

build/pipelines/templates-v2/pipeline-full-release-build.yml

@@ -0,0 +1,177 @@
+# 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 }}
+
+...

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -0,0 +1,256 @@
+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 }}

build/pipelines/templates-v2/steps-create-signing-config.yml

@@ -0,0 +1,35 @@
+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 }})

build/pipelines/templates-v2/steps-download-bin-dir-artifact.yml

@@ -0,0 +1,24 @@
+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 }}'

build/pipelines/templates-v2/steps-ensure-nuget-version.yml

@@ -0,0 +1,5 @@
+steps:
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet 6.6.1
+  inputs:
+    versionSpec: 6.6.1

build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml

@@ -0,0 +1,27 @@
+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

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

@@ -1,14 +1,12 @@
 steps:
-- task: NuGetToolInstaller@0
-  displayName: 'Use NuGet 6.3.0'
-  inputs:
-    versionSpec: 6.3.0
+- 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`

build/pipelines/templates-v2/variables-nuget-package-version.yml

@@ -0,0 +1,27 @@
+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

build/pipelines/templates-v2/variables-onebranch-config.yml

@@ -0,0 +1,2 @@
+variables:
+  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'

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

@@ -1,34 +0,0 @@
-parameters:
-  platform: ''
-  additionalBuildArguments: ''
-
-jobs:
-- job: Build${{ parameters.platform }}AuditMode
-  displayName: Static Analysis Build ${{ parameters.platform }}
-  variables:
-    BuildConfiguration: AuditMode
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - checkout: self
-    submodules: true
-    clean: true
-    fetchDepth: 1
-
-  - template: restore-nuget-steps.yml
-
-  - task: VSBuild@1
-    displayName: 'Build solution **\OpenConsole.sln'
-    inputs:
-      solution: '**\OpenConsole.sln'
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      msbuildArgs: ${{ parameters.additionalBuildArguments }}
-      clean: true
-      maximumCpuCount: true

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

@@ -1,31 +0,0 @@
-parameters:
-  configuration: 'Release'
-  branding: 'Dev'
-  platform: ''
-  additionalBuildArguments: ''
-
-jobs:
-- job: Build${{ parameters.platform }}${{ parameters.configuration }}${{ parameters.branding }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }} ${{ parameters.branding }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-    WindowsTerminalBranding: ${{ parameters.branding }}
-    EnableRichCodeNavigation: true
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - template: build-console-steps.yml
-    parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
-
-  # It appears that the Component Governance build task that gets automatically injected stopped working
-  # when we renamed our main branch.
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    condition: and(succeededOrFailed(), not(eq(variables['Build.Reason'], 'PullRequest')))

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

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

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

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

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

@@ -1,55 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: ''
-  minimumExpectedTestsExecutedCount: 1  # 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 }}
-    PGOBuildMode: 'Instrument'
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - template: build-console-steps.yml
-    parameters:
-      additionalBuildArguments: '${{ parameters.additionalBuildArguments }}'
-
-- template: helix-runtests-job.yml
-  parameters:
-    name: 'RunTestsInHelix'
-    dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
-    condition: succeeded()
-    testSuite: 'PgoInstrumentationSuite'
-    taefQuery: '@IsPgo=true'
-    configuration: ${{ parameters.configuration }}
-    platform: ${{ parameters.platform }}
-    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
-
-- template: helix-processtestresults-job.yml
-  parameters:
-    name: 'ProcessTestResults'
-    pgoArtifact: 'PGO'
-    dependsOn:
-    - RunTestsInHelix
-    condition: succeededOrFailed()
-    rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
-    minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }}
-
-- template: pgo-merge-pgd-job.yml
-  parameters:
-    name: 'MergePGD'
-    dependsOn:
-    - ProcessTestResults
-    pgoArtifact: 'PGO'
-    platform: ${{ parameters.platform }}
-    configuration: ${{ parameters.configuration }}

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

@@ -1,137 +0,0 @@
-parameters:
-  additionalBuildArguments: ''
-
-steps:
-- checkout: self
-  submodules: true
-  clean: true
-  fetchDepth: 1
-
-- template: restore-nuget-steps.yml
-
-# The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
-- script: |
-    "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
-    set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
-    del %TEMP%\vsinstalldir.txt
-    call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
-    echo VCToolsInstallDir = %VCToolsInstallDir%
-    echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
-  displayName: 'Retrieve VC tools directory'
-
-- task: CmdLine@1
-  displayName: 'Display build machine environment variables'
-  inputs:
-    filename: 'set'
-
-- task: VSBuild@1
-  displayName: 'Build solution **\OpenConsole.sln'
-  inputs:
-    solution: '**\OpenConsole.sln'
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: "${{ parameters.additionalBuildArguments }} /p:PGOBuildMode=$(PGOBuildMode) /bl:$(Build.SourcesDirectory)\\msbuild.binlog"
-    clean: true
-    maximumCpuCount: true
-
-- task: PowerShell@2
-  displayName: 'Check MSIX for common regressions'
-  # PGO runtime needs its own CRT and it's in the package for convenience.
-  # That will make this script mad so skip since we're not shipping the PGO Instrumentation one anyway.
-  condition: ne(variables['PGOBuildMode'], 'Instrument')
-  inputs:
-    targetType: inline
-    script: |
-      $Package = Get-ChildItem -Recurse -Filter "CascadiaPackage_*.msix"
-      .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path $Package.FullName
-
-- task: powershell@2
-  displayName: 'Source Index PDBs'
-  condition: ne(variables['PGOBuildMode'], 'Instrument')
-  inputs:
-    targetType: filePath
-    filePath: build\scripts\Index-Pdbs.ps1
-    arguments: -SearchDir '$(Build.SourcesDirectory)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-    errorActionPreference: silentlyContinue
-
-- task: PowerShell@2
-  displayName: 'Rationalize build platform'
-  inputs:
-    targetType: inline
-    script: |
-      $Arch = "$(BuildPlatform)"
-      If ($Arch -Eq "x86") { $Arch = "Win32" }
-      Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-
-- task: CopyFiles@2
-  displayName: 'Copy *.msix to Artifacts'
-  inputs:
-    Contents: |
-     **/*.msix
-     **/*.appxsym
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/appx'
-    OverWrite: true
-    flattenFolders: true
-
-- pwsh: |-
-    $TerminalMsixPath = (Get-Item "$(Build.ArtifactStagingDirectory)\appx\Cascadia*.msix").FullName
-    $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-    & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $TerminalMsixPath -XamlAppX $XamlAppxPath -Destination "$(Build.ArtifactStagingDirectory)/unpackaged"
-  displayName: Build Unpackaged Distribution
-
-- publish: $(Build.ArtifactStagingDirectory)/unpackaged
-  artifact: unpackaged-$(BuildPlatform)-$(BuildConfiguration)
-  displayName: Publish Artifact (unpackaged)
-
-- task: CopyFiles@2
-  displayName: 'Copy outputs needed for test runs to Artifacts'
-  inputs:
-    Contents: |
-     $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.exe
-     $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.dll
-     $(Build.SourcesDirectory)/bin/$(RationalizedBuildPlatform)/$(BuildConfiguration)/*.xml
-     **/Microsoft.VCLibs.*.appx
-     **/*unit.test*.dll
-     **/*unit.test*.manifest
-     **/TestHostApp/*.exe
-     **/TestHostApp/*.dll
-     **/TestHostApp/*.xml
-     !**/*.pdb
-     !**/*.ipdb
-     !**/*.obj
-     !**/*.pch
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
-    OverWrite: true
-    flattenFolders: true
-  condition: succeeded()
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish All Build Artifacts'
-  inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-    ArtifactName: 'drop'
-
-- task: CopyFiles@2
-  displayName: 'Copy PGO databases needed for PGO instrumentation run'
-  inputs:
-    Contents: |
-     **/*.pgd
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/PGO/$(BuildPlatform)'
-    OverWrite: true
-    flattenFolders: true
-  condition: and(succeeded(), eq(variables['PGOBuildMode'], 'Instrument'))
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish All PGO Artifacts'
-  inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/PGO'
-    ArtifactName: 'PGO'
-  condition: and(succeeded(), eq(variables['PGOBuildMode'], 'Instrument'))
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: binlog'
-  condition: always()
-  continueOnError: True
-  inputs:
-    PathtoPublish: $(Build.SourcesDirectory)\msbuild.binlog
-    ArtifactName: binlog-$(BuildPlatform)

build/pipelines/templates/check-formatting.yml

@@ -1,17 +0,0 @@
-
-jobs:
-- job: CodeFormatCheck
-  displayName: Proper Code Formatting Check
-  pool: { vmImage: windows-2022 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    submodules: false
-    clean: true
-
-  - task: PowerShell@2
-    displayName: 'Code Formatting Check'
-    inputs:
-      targetType: filePath
-      filePath: '.\build\scripts\Invoke-FormattingCheck.ps1'

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

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

build/pipelines/templates/helix-createprojfile-steps.yml

@@ -1,15 +0,0 @@
-parameters:
-  condition: ''
-  testFilePath: ''
-  outputProjFileName: ''
-  testSuite: ''
-  taefQuery: ''
-
-steps:
-  - task: powershell@2
-    displayName: 'Create ${{ parameters.outputProjFileName }}'
-    condition: ${{ parameters.condition }}
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\GenerateTestProjFile.ps1
-      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\$(BuildPlatform)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.60.210621002\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'

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

@@ -1,71 +0,0 @@
-parameters:
-  condition: 'succeededOrFailed()'
-  dependsOn: ''
-  rerunPassesRequiredToAvoidFailure: 5
-  minimumExpectedTestsExecutedCount: 10
-  checkJobAttempt: false
-  pgoArtifact: ''
-
-jobs:
-- job: ProcessTestResults
-  displayName: Process Helix Results ${{ parameters.platform }} ${{ parameters.configuration }}
-  condition: ${{ parameters.condition }}
-  dependsOn: ${{ parameters.dependsOn }}
-  pool:
-    vmImage: 'windows-2019'
-  timeoutInMinutes: 120
-  variables:
-    helixOutputFolder: $(Build.SourcesDirectory)\HelixOutput
-
-  steps:
-  - task: powershell@2
-    displayName: 'UpdateUnreliableTests.ps1'
-    condition: succeededOrFailed()
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\UpdateUnreliableTests.ps1
-      arguments: -RerunPassesRequiredToAvoidFailure '${{ parameters.rerunPassesRequiredToAvoidFailure }}'
-
-  - task: powershell@2
-    displayName: 'OutputTestResults.ps1'
-    condition: succeededOrFailed()
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\OutputTestResults.ps1
-      arguments: -MinimumExpectedTestsExecutedCount '${{ parameters.minimumExpectedTestsExecutedCount }}' -CheckJobAttempt $${{ parameters.checkJobAttempt }}
-
-  - task: powershell@2
-    displayName: 'ProcessHelixFiles.ps1'
-    condition: succeededOrFailed()
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\ProcessHelixFiles.ps1
-      arguments: -OutputFolder '$(helixOutputFolder)'
-
-  - ${{if ne(parameters.pgoArtifact, '') }}:
-    - script: move /y $(helixOutputFolder)\PGO $(Build.ArtifactStagingDirectory)
-      displayName: 'Move pgc files to PGO artifact'
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Helix files'
-    condition: succeededOrFailed()
-    inputs:
-      PathtoPublish: $(helixOutputFolder)
-      artifactName: drop
-
-  - ${{if ne(parameters.pgoArtifact, '') }}:
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish pgc files'
-      condition: succeededOrFailed()
-      inputs:
-        PathtoPublish: $(Build.ArtifactStagingDirectory)\PGO\Release
-        artifactName: ${{ parameters.pgoArtifact }}

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

@@ -1,164 +0,0 @@
-parameters:
-  name: 'RunTestsInHelix'
-  dependsOn: ''
-  condition: ''
-  testSuite: ''
-  # If a Pipeline runs this template more than once, this parameter should be unique per build flavor to differentiate the
-  # the different test runs:
-  helixType: 'test/devtest'
-  artifactName: 'drop'
-  maxParallel: 4
-  rerunPassesRequiredToAvoidFailure: 5
-  taefQuery: ''
-  configuration: ''
-  platform: ''
-  # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
-  useBuildOutputFromPipeline: $(System.DefinitionId)
-  openHelixTargetQueues: 'windows.11.amd64.client.open.reunion'
-  closedHelixTargetQueues: 'windows.11.amd64.client.reunion'
-
-jobs:
-- job: ${{ parameters.name }}
-  displayName: Submit Helix ${{ parameters.platform }} ${{ parameters.configuration }}
-  dependsOn: ${{ parameters.dependsOn }}
-  condition: ${{ parameters.condition }}
-  pool:
-    vmImage: 'windows-2019'
-  timeoutInMinutes: 120
-  strategy:
-    maxParallel: ${{ parameters.maxParallel }}
-  variables:
-    buildConfiguration: ${{ parameters.configuration }}
-    buildPlatform: ${{ parameters.platform }}
-    openHelixTargetQueues: ${{ parameters.openHelixTargetQueues }}
-    closedHelixTargetQueues: ${{ parameters.closedHelixTargetQueues }}
-    artifactsDir: $(Build.SourcesDirectory)\Artifacts
-    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.60.210621002\build\Binaries\$(buildPlatform)
-    helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'
-
-  steps:
-  - task: CmdLine@1
-    displayName: 'Display build machine environment variables'
-    inputs:
-      filename: 'set'
-
-  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 6.3.0'
-    inputs:
-      versionSpec: 6.3.0
-
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: 'NuGet restore build/Helix/packages.config'
-    inputs:
-      restoreSolution: build/Helix/packages.config
-      feedsToUse: config
-      nugetConfigPath: nuget.config
-      restoreDirectory: packages
-
-  - task: DownloadBuildArtifacts@0
-    condition:
-      and(succeeded(),eq(variables['useBuildOutputFromBuildId'],''))
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-      downloadPath: '$(artifactsDir)'
-
-  - task: DownloadBuildArtifacts@0
-    condition:
-      and(succeeded(),ne(variables['useBuildOutputFromBuildId'],''))
-    inputs:
-      buildType: specific
-      buildVersionToDownload: specific
-      project: $(System.TeamProjectId)
-      pipeline: ${{ parameters.useBuildOutputFromPipeline }}
-      buildId: $(useBuildOutputFromBuildId)
-      artifactName: ${{ parameters.artifactName }}
-      downloadPath: '$(artifactsDir)'
-
-  - task: CmdLine@1
-    displayName: 'Display Artifact Directory payload contents'
-    inputs:
-      filename: 'dir'
-      arguments: '/s $(artifactsDir)'
-
-  - task: powershell@2
-    displayName: 'PrepareHelixPayload.ps1'
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\PrepareHelixPayload.ps1
-      arguments: -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)' -ArtifactName '${{ parameters.artifactName }}'
-
-  - task: CmdLine@1
-    displayName: 'Display Helix payload contents'
-    inputs:
-      filename: 'dir'
-      arguments: '/s $(Build.SourcesDirectory)\HelixPayload'
-
-  - task: PowerShell@2
-    displayName: 'Make artifact directories'
-    inputs:
-      targetType: inline
-      script: |
-        New-Item -ItemType Directory -Force -Path "$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\"
-        New-Item -ItemType Directory -Force -Path "$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\$(BuildPlatform)\"
-
-  - template: helix-createprojfile-steps.yml
-    parameters:
-      condition: and(succeeded(),eq('${{ parameters.testSuite }}','DevTestSuite'))
-      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\TerminalApp.LocalTests.dll'
-      outputProjFileName: 'RunTestsInHelix-TerminalAppLocalTests.proj'
-      testSuite: '${{ parameters.testSuite }}'
-      taefQuery: ${{ parameters.taefQuery }}
-
-  - template: helix-createprojfile-steps.yml
-    parameters:
-      condition: and(succeeded(),eq('${{ parameters.testSuite }}','DevTestSuite'))
-      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\SettingsModel.LocalTests.dll'
-      outputProjFileName: 'RunTestsInHelix-SettingsModelLocalTests.proj'
-      testSuite: '${{ parameters.testSuite }}'
-      taefQuery: ${{ parameters.taefQuery }}
-
-
-  - template: helix-createprojfile-steps.yml
-    parameters:
-      condition: and(succeeded(),eq('${{ parameters.testSuite }}','DevTestSuite'))
-      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\Conhost.UIA.Tests.dll'
-      outputProjFileName: 'RunTestsInHelix-HostTestsUIA.proj'
-      testSuite: '${{ parameters.testSuite }}'
-      taefQuery: ${{ parameters.taefQuery }}
-
-  - template: helix-createprojfile-steps.yml
-    parameters:
-      condition: and(succeeded(),or(eq('${{ parameters.testSuite }}','PgoInstrumentationSuite'),eq('${{ parameters.testSuite }}','DevTestSuite')))
-      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\WindowsTerminal.UIA.Tests.dll'
-      outputProjFileName: 'RunTestsInHelix-WindowsTerminalUIATests.proj'
-      testSuite: '${{ parameters.testSuite }}'
-      taefQuery: ${{ parameters.taefQuery }}
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish generated .proj files'
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: ${{ parameters.artifactName }}
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run tests in Helix (open queues)'
-    condition: and(succeeded(),eq(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      command: custom
-      projects: build\Helix\RunTestsInHelix.proj
-      custom: msbuild
-      arguments: '$(helixCommonArgs) /p:IsExternal=true /p:Creator=Terminal /p:HelixTargetQueues=$(openHelixTargetQueues)'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run tests in Helix (closed queues)'
-    condition: and(succeeded(),ne(variables['System.CollectionUri'],'https://dev.azure.com/ms/'))
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      HelixAccessToken: $(HelixApiAccessToken)
-    inputs:
-      command: custom
-      projects: build\Helix\RunTestsInHelix.proj
-      custom: msbuild
-      arguments: '$(helixCommonArgs) /p:HelixTargetQueues=$(closedHelixTargetQueues)'

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

@@ -1,70 +0,0 @@
-parameters:
-  dependsOn: ''
-  pgoArtifact: PGO
-  platform: ''
-  configuration: ''
-
-jobs:
-- job: MergePGD
-  dependsOn: ${{ parameters.dependsOn }}
-  pool:
-    vmImage: 'windows-2019'
-  variables:
-    artifactsPath: $(Build.SourcesDirectory)\Artifacts
-    pgoArtifactsPath: $(artifactsPath)\${{ parameters.pgoArtifact }}
-    buildPlatform: ${{ parameters.platform }}
-    buildConfiguration: ${{ parameters.configuration }}
-
-  steps:
-  # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
-  - script: |
-      "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
-      set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
-      del %TEMP%\vsinstalldir.txt
-      call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
-      echo VCToolsInstallDir = %VCToolsInstallDir%
-      echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
-    displayName: 'Retrieve VC tools directory'
-
-  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 6.3.0'
-    inputs:
-      versionSpec: 6.3.0
-
-  - task: NuGetAuthenticate@0
-
-  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
-  # This should be `task: NuGetCommand@2`
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: Restore NuGet packages for extraneous build actions
-    inputs:
-      command: restore
-      feedsToUse: config
-      configPath: NuGet.config
-      restoreSolution: build/packages.config
-      restoreDirectory: '$(Build.SourcesDirectory)\packages'
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.pgoArtifact }}
-      downloadPath: $(artifactsPath)
-
-  - task: MSBuild@1
-    displayName: Merge counts into PGD
-    inputs:
-      solution: $(Build.SourcesDirectory)\OpenConsole.sln
-      platform: $(buildPlatform)
-      configuration: $(buildConfiguration)
-      msbuildArguments: '/t:MergePGOCounts /p:PGOBuildMode=Instrument /p:PGDPath=$(pgoArtifactsPath)\$(buildPlatform) /p:PGCRootPath=$(pgoArtifactsPath)\$(buildPlatform)'
-
-  - task: CopyFiles@2
-    displayName: 'Copy merged pgd to artifact staging'
-    inputs:
-      sourceFolder: $(pgoArtifactsPath)
-      contents: '**\$(buildPlatform)\*.pgd'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathToPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: ${{ parameters.pgoArtifact }}

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

@@ -1,90 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: ''
-  artifactName: 'drop'
-  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-
-jobs:
-- job: Test${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
-
-  steps:
-  - checkout: self
-    submodules: true
-    clean: true
-    fetchDepth: 1
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: ${{ parameters.artifactName }}
-
-  - task: PowerShell@2
-    displayName: 'Rationalize build platform'
-    inputs:
-      targetType: inline
-      script: |
-        $Arch = "$(BuildPlatform)"
-        If ($Arch -Eq "x86") { $Arch = "Win32" }
-        Write-Host "##vso[task.setvariable variable=RationalizedBuildPlatform]${Arch}"
-
-  - task: PowerShell@2
-    displayName: 'Run Unit Tests'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*unit.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(System.ArtifactsDirectory)\\${{ parameters.artifactName }}\\$(BuildConfiguration)\\$(BuildPlatform)\\test"
-    condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-
-  - task: PowerShell@2
-    displayName: 'Run Feature Tests (x64 only)'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: -MatchPattern '*feature.test*.dll' -Platform '$(RationalizedBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(System.ArtifactsDirectory)\\${{ parameters.artifactName }}\\$(BuildConfiguration)\\$(BuildPlatform)\\test"
-    condition: and(and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument')), eq(variables['BuildPlatform'], 'x64'))
-
-  - task: PowerShell@2
-    displayName: 'Convert Test Logs from WTL to xUnit format'
-    inputs:
-      targetType: filePath
-      filePath: build\Helix\ConvertWttLogToXUnit.ps1
-      arguments: -WttInputPath '${{ parameters.testLogPath }}' -WttSingleRerunInputPath 'unused.wtl' -WttMultipleRerunInputPath 'unused2.wtl' -XUnitOutputPath 'onBuildMachineResults.xml' -TestNamePrefix '$(BuildConfiguration).$(BuildPlatform)'
-    condition: and(ne(variables['PGOBuildMode'], 'Instrument'),or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
-
-  - task: PublishTestResults@2
-    displayName: 'Upload converted test logs'
-    condition: ne(variables['PGOBuildMode'], 'Instrument')
-    inputs:
-      testResultsFormat: 'xUnit' # Options: JUnit, NUnit, VSTest, xUnit, cTest
-      testResultsFiles: '**/onBuildMachineResults.xml'
-      #searchFolder: '$(System.DefaultWorkingDirectory)' # Optional
-      #mergeTestResults: false # Optional
-      #failTaskOnFailedTests: false # Optional
-      testRunTitle: 'On Build Machine Tests' # Optional
-      buildPlatform: $(BuildPlatform) # Optional
-      buildConfiguration: $(BuildConfiguration) # Optional
-      #publishRunAttachments: true # Optional
-
-  - task: CopyFiles@2
-    displayName: 'Copy result logs to Artifacts'
-    inputs:
-      Contents: |
-       **/*.wtl
-       **/*onBuildMachineResults.xml
-       ${{ parameters.testLogPath }}
-      TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test-logs'
-      OverWrite: true
-      flattenFolders: true
-
-  - publish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test-logs'
-    artifact: TestLogs$(BuildPlatform)$(BuildConfiguration)

build/rules/GenerateSxsManifestsFromWinmds.targets

@@ -30,7 +30,7 @@
           DependsOnTargets="_ConsoleMapWinmdsToManifestFiles">
 
     <!-- This target is batched and a new Exec is spawned for each entry in _ConsoleWinmdManifest. -->
-    <Exec Command="mt.exe -winmd:&quot;%(_ConsoleWinmdManifest.WinMDPath)&quot; -dll:%(_ConsoleWinmdManifest.Implementation) -out:&quot;%(_ConsoleWinmdManifest.Identity)&quot;" />
+    <Exec Command="mt.exe -winmd:%(_ConsoleWinmdManifest.WinMDPath) -dll:%(_ConsoleWinmdManifest.Implementation) -out:%(_ConsoleWinmdManifest.Identity)" />
 
     <ItemGroup>
       <!-- Emit the generated manifest into the Link inputs. -->

build/scripts/Invoke-FormattingCheck.ps1

@@ -10,7 +10,7 @@ function Invoke-CheckBadCodeFormatting() {
 
     # returns a non-zero exit code if there are any diffs in the tracked files in the repo
     git diff-index --quiet HEAD --
-    if ($LASTEXITCODE -eq 1) {
+    if ($lastExitCode -eq 1) {
 
         # Write the list of files that need updating to the log
         git diff-index --name-only HEAD

build/scripts/Run-Tests.ps1

@@ -9,7 +9,8 @@ Param(
     [Parameter(Mandatory=$false, Position=3)]
     [string]$LogPath,
     [Parameter(Mandatory=$false)]
-    [string]$Root = ".\bin\$Platform\$Configuration"
+    [string]$Root = ".\bin\$Platform\$Configuration",
+    [string[]]$AdditionalTaefArguments
 )
 
 # Find test DLLs based on the provided root, match pattern, and recursion
@@ -26,7 +27,7 @@ if ($LogPath) {
 }
 
 # Invoke the te.exe executable with arguments and test DLLs
-& "$Root\te.exe" $args $testDlls.FullName
+& "$Root\te.exe" $args $testDlls.FullName $AdditionalTaefArguments
 
 # Check the exit code of the te.exe process and exit accordingly
 if ($LASTEXITCODE -ne 0) {

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2023</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>19</VersionMinor>
+    <VersionMinor>18</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/cascadia/profiles.schema.json

@@ -260,7 +260,8 @@
           "description": "Name of the scheme to use when the app is using dark theme",
           "type": "string"
         }
-      }
+      },
+      "type": "object"
     },
     "FontConfig": {
       "properties": {
@@ -421,7 +422,6 @@
         "scrollToMark",
         "clearMark",
         "clearAllMarks",
-        "searchWeb",
         "experimental.colorSelection",
         "unbound"
       ],
@@ -640,7 +640,7 @@
             },
             "allowEmpty": {
               "description": "Whether to render a folder without entries, or to hide it",
-              "default": "false",
+              "default": false,
               "type": "boolean"
             }
           }
@@ -799,11 +799,6 @@
               "default": false,
               "description": "If true, the copied content will be copied as a single line (even if there are hard line breaks present in the text). If false, newlines persist from the selected text."
             },
-            "dismissSelection": {
-              "type": "boolean",
-              "default": true,
-              "description": "If false, the copied content will be copied and the selection will not be dismissed. If true, the selection will be dismissed."
-            },
             "copyFormatting": {
               "default": null,
               "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied. Not setting this value inherits the behavior of the `copyFormatting` global setting.",
@@ -1715,29 +1710,6 @@
         }
       ]
     },
-    "SearchWebAction": {
-      "description": "Search the web for selected text",
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortcutAction"
-        },
-        {
-          "properties": {
-            "action": {
-              "type": "string",
-              "const": "searchWeb"
-            },
-            "queryUrl": {
-              "type": "string",
-              "description": "URL of the web page to launch, %s is replaced with the selected text"
-            }
-          }
-        }
-      ],
-      "required": [
-        "queryUrl"
-      ]
-    },
     "AdjustOpacityAction": {
       "description": "Changes the opacity of the active Terminal window. If `relative` is specified, then this action will increase/decrease relative to the current opacity.",
       "allOf": [
@@ -1842,19 +1814,6 @@
           "description": "True if the Terminal should use a Mica backdrop for the window. This will apply underneath all controls (including the terminal panes and the titlebar)",
           "type": "boolean",
           "default": false
-        },
-        "experimental.rainbowFrame": {
-          "description": "When enabled, the frame of the window will cycle through all the colors. Enabling this will override the `frame` and `unfocusedFrame` settings.",
-          "type": "boolean",
-          "default": false
-        },
-        "frame": {
-          "description": "The color of the window frame when the window is inactive. This only works on Windows 11",
-          "$ref": "#/$defs/ThemeColor"
-        },
-        "unfocusedFrame": {
-          "description": "The color of the window frame when the window is inactive. This only works on Windows 11",
-          "$ref": "#/$defs/ThemeColor"
         }
       }
     },
@@ -2033,9 +1992,6 @@
             {
               "$ref": "#/$defs/ColorSelectionAction"
             },
-            {
-              "$ref": "#/$defs/SearchWebAction"
-            },
             {
               "type": "null"
             }
@@ -2215,11 +2171,6 @@
           "description": "When set to true, the background image for the currently focused profile is expanded to encompass the entire window, beneath other panes.",
           "type": "boolean"
         },
-        "compatibility.reloadEnvironmentVariables": {
-          "default": true,
-          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
-          "type": "boolean"
-        },
         "initialCols": {
           "default": 120,
           "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
@@ -2468,6 +2419,11 @@
             "null"
           ]
         },
+        "compatibility.reloadEnvironmentVariables": {
+          "default": true,
+          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
+          "type": "boolean"
+        },
         "unfocusedAppearance": {
           "$ref": "#/$defs/AppearanceConfig",
           "description": "Sets the appearance of the terminal when it is unfocused.",

src/buffer/out/Row.cpp

@@ -9,8 +9,6 @@
 #include "textBuffer.hpp"
 #include "../../types/inc/GlyphWidth.hpp"
 
-extern "C" int __isa_available;
-
 // The STL is missing a std::iota_n analogue for std::iota, so I made my own.
 template<typename OutIt, typename Diff, typename T>
 constexpr OutIt iota_n(OutIt dest, Diff count, T val)
@@ -84,7 +82,10 @@ ROW::ROW(wchar_t* charsBuffer, uint16_t* charOffsetsBuffer, uint16_t rowWidth, c
     _attr{ rowWidth, fillAttribute },
     _columnCount{ rowWidth }
 {
-    _init();
+    if (_chars.data())
+    {
+        _init();
+    }
 }
 
 void ROW::SetWrapForced(const bool wrap) noexcept
@@ -117,25 +118,17 @@ LineRendition ROW::GetLineRendition() const noexcept
     return _lineRendition;
 }
 
-uint16_t ROW::GetLineWidth() const noexcept
-{
-    const auto scale = _lineRendition != LineRendition::SingleWidth ? 1 : 0;
-    return _columnCount >> scale;
-}
-
 // Routine Description:
 // - Sets all properties of the ROW to default values
 // Arguments:
 // - Attr - The default attribute (color) to fill
 // Return Value:
 // - <none>
-void ROW::Reset(const TextAttribute& attr) noexcept
+void ROW::Reset(const TextAttribute& attr)
 {
     _charsHeap.reset();
     _chars = { _charsBuffer, _columnCount };
-    // Constructing and then moving objects into place isn't free.
-    // Modifying the existing object is _much_ faster.
-    *_attr.runs().unsafe_shrink_to_size(1) = til::rle_pair{ attr, _columnCount };
+    _attr = { _columnCount, attr };
     _lineRendition = LineRendition::SingleWidth;
     _wrapForced = false;
     _doubleBytePadded = false;
@@ -144,117 +137,8 @@ void ROW::Reset(const TextAttribute& attr) noexcept
 
 void ROW::_init() noexcept
 {
-#pragma warning(push)
-#pragma warning(disable : 26462) // The value pointed to by '...' is assigned only once, mark it as a pointer to const (con.4).
-#pragma warning(disable : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-#pragma warning(disable : 26490) // Don't use reinterpret_cast (type.1).
-
-    // Fills _charsBuffer with whitespace and correspondingly _charOffsets
-    // with successive numbers from 0 to _columnCount+1.
-#if defined(TIL_SSE_INTRINSICS)
-    alignas(__m256i) static constexpr uint16_t whitespaceData[]{ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 };
-    alignas(__m256i) static constexpr uint16_t offsetsData[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-    alignas(__m256i) static constexpr uint16_t increment16Data[]{ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16 };
-    alignas(__m128i) static constexpr uint16_t increment8Data[]{ 8, 8, 8, 8, 8, 8, 8, 8 };
-
-    // The AVX loop operates on 32 bytes at a minimum. Since _charsBuffer/_charOffsets uses 2 byte large
-    // wchar_t/uint16_t respectively, this translates to 16-element writes, which equals a _columnCount of 15,
-    // because it doesn't include the past-the-end char-offset as described in the _charOffsets member comment.
-    if (__isa_available >= __ISA_AVAILABLE_AVX2 && _columnCount >= 15)
-    {
-        auto chars = _charsBuffer;
-        auto charOffsets = _charOffsets.data();
-
-        // The backing buffer for both chars and charOffsets is guaranteed to be 16-byte aligned,
-        // but AVX operations are 32-byte large. As such, when we write out the last chunk, we
-        // have to align it to the ends of the 2 buffers. This results in a potential overlap of
-        // 16 bytes between the last write in the main loop below and the final write afterwards.
-        //
-        // An example:
-        // If you have a terminal between 16 and 23 columns the buffer has a size of 48 bytes.
-        // The main loop below will iterate once, as it writes out bytes 0-31 and then exits.
-        // The final write afterwards cannot write bytes 32-63 because that would write
-        // out of bounds. Instead it writes bytes 16-47, overwriting 16 overlapping bytes.
-        // This is better than branching and switching to SSE2, because both things are slow.
-        //
-        // Since we want to exit the main loop with at least 1 write left to do as the final write,
-        // we need to subtract 1 alignment from the buffer length (= 16 bytes). Since _columnCount is
-        // in wchar_t's we subtract -8. The same applies to the ~7 here vs ~15. If you squint slightly
-        // you'll see how this is effectively the inverse of what CalculateCharsBufferStride does.
-        const auto tailColumnOffset = gsl::narrow_cast<uint16_t>((_columnCount - 8u) & ~7);
-        const auto charsEndLoop = chars + tailColumnOffset;
-        const auto charOffsetsEndLoop = charOffsets + tailColumnOffset;
-
-        const auto whitespace = _mm256_load_si256(reinterpret_cast<const __m256i*>(&whitespaceData[0]));
-        auto offsetsLoop = _mm256_load_si256(reinterpret_cast<const __m256i*>(&offsetsData[0]));
-        const auto offsets = _mm256_add_epi16(offsetsLoop, _mm256_set1_epi16(tailColumnOffset));
-
-        if (chars < charsEndLoop)
-        {
-            const auto increment = _mm256_load_si256(reinterpret_cast<const __m256i*>(&increment16Data[0]));
-
-            do
-            {
-                _mm256_storeu_si256(reinterpret_cast<__m256i*>(chars), whitespace);
-                _mm256_storeu_si256(reinterpret_cast<__m256i*>(charOffsets), offsetsLoop);
-                offsetsLoop = _mm256_add_epi16(offsetsLoop, increment);
-                chars += 16;
-                charOffsets += 16;
-            } while (chars < charsEndLoop);
-        }
-
-        _mm256_storeu_si256(reinterpret_cast<__m256i*>(charsEndLoop), whitespace);
-        _mm256_storeu_si256(reinterpret_cast<__m256i*>(charOffsetsEndLoop), offsets);
-    }
-    else
-    {
-        auto chars = _charsBuffer;
-        auto charOffsets = _charOffsets.data();
-        const auto charsEnd = chars + _columnCount;
-
-        const auto whitespace = _mm_load_si128(reinterpret_cast<const __m128i*>(&whitespaceData[0]));
-        const auto increment = _mm_load_si128(reinterpret_cast<const __m128i*>(&increment8Data[0]));
-        auto offsets = _mm_load_si128(reinterpret_cast<const __m128i*>(&offsetsData[0]));
-
-        do
-        {
-            _mm_storeu_si128(reinterpret_cast<__m128i*>(chars), whitespace);
-            _mm_storeu_si128(reinterpret_cast<__m128i*>(charOffsets), offsets);
-            offsets = _mm_add_epi16(offsets, increment);
-            chars += 8;
-            charOffsets += 8;
-            // If _columnCount is something like 120, the actual backing buffer for charOffsets is 121 items large.
-            // --> The while loop uses <= to emit at least 1 more write.
-        } while (chars <= charsEnd);
-    }
-#elif defined(TIL_ARM_NEON_INTRINSICS)
-    alignas(uint16x8_t) static constexpr uint16_t offsetsData[]{ 0, 1, 2, 3, 4, 5, 6, 7 };
-
-    auto chars = _charsBuffer;
-    auto charOffsets = _charOffsets.data();
-    const auto charsEnd = chars + _columnCount;
-
-    const auto whitespace = vdupq_n_u16(L' ');
-    const auto increment = vdupq_n_u16(8);
-    auto offsets = vld1q_u16(&offsetsData[0]);
-
-    do
-    {
-        vst1q_u16(chars, whitespace);
-        vst1q_u16(charOffsets, offsets);
-        offsets = vaddq_u16(offsets, increment);
-        chars += 8;
-        charOffsets += 8;
-        // If _columnCount is something like 120, the actual backing buffer for charOffsets is 121 items large.
-        // --> The while loop uses <= to emit at least 1 more write.
-    } while (chars <= charsEnd);
-#else
-#error "Vectorizing this function improves overall performance by up to 40%. Don't remove this warning, just add the vectorized code."
-    std::fill_n(_charsBuffer, _columnCount, UNICODE_SPACE);
+    std::fill_n(_chars.begin(), _columnCount, UNICODE_SPACE);
     std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
-#endif
-
-#pragma warning(push)
 }
 
 void ROW::TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& attr, til::CoordType newWidth)
@@ -263,15 +147,6 @@ void ROW::TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& a
     _attr.resize_trailing_extent(gsl::narrow<uint16_t>(newWidth));
 }
 
-void ROW::CopyFrom(const ROW& source)
-{
-    RowCopyTextFromState state{ .source = source };
-    CopyTextFrom(state);
-    TransferAttributes(source.Attributes(), _columnCount);
-    _lineRendition = source._lineRendition;
-    _wrapForced = source._wrapForced;
-}
-
 // Returns the previous possible cursor position, preceding the given column.
 // Returns 0 if column is less than or equal to 0.
 til::CoordType ROW::NavigateToPrevious(til::CoordType column) const noexcept
@@ -441,9 +316,10 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType c
     return it;
 }
 
-void ROW::SetAttrToEnd(const til::CoordType columnBegin, const TextAttribute attr)
+bool ROW::SetAttrToEnd(const til::CoordType columnBegin, const TextAttribute attr)
 {
     _attr.replace(_clampedColumnInclusive(columnBegin), _attr.size(), attr);
+    return true;
 }
 
 void ROW::ReplaceAttributes(const til::CoordType beginIndex, const til::CoordType endIndex, const TextAttribute& newAttr)
@@ -544,135 +420,68 @@ catch (...)
 
 [[msvc::forceinline]] void ROW::WriteHelper::ReplaceText() noexcept
 {
-    // This function starts with a fast-pass for ASCII. ASCII is still predominant in technical areas.
-    //
-    // We can infer the "end" from the amount of columns we're given (colLimit - colBeg),
-    // because ASCII is always 1 column wide per character.
-    auto it = chars.begin();
-    const auto end = it + std::min<size_t>(chars.size(), colLimit - colBeg);
     size_t ch = chBeg;
 
-    while (it != end)
+    for (const auto& s : til::utf16_iterator{ chars })
     {
-        if (*it >= 0x80) [[unlikely]]
-        {
-            _replaceTextUnicode(ch, it);
-            return;
-        }
-
-        til::at(row._charOffsets, colEnd) = gsl::narrow_cast<uint16_t>(ch);
-        ++colEnd;
-        ++ch;
-        ++it;
-    }
-
-    colEndDirty = colEnd;
-    charsConsumed = ch - chBeg;
-}
-
-[[msvc::forceinline]] void ROW::WriteHelper::_replaceTextUnicode(size_t ch, std::wstring_view::const_iterator it) noexcept
-{
-    const auto end = chars.end();
-
-    while (it != end)
-    {
-        unsigned int width = 1;
-        auto ptr = &*it;
-        const auto wch = *ptr;
-        size_t advance = 1;
-
-        ++it;
-
-        // Even in our slow-path we can avoid calling IsGlyphFullWidth if the current character is ASCII.
-        // It also allows us to skip the surrogate pair decoding at the same time.
-        if (wch >= 0x80)
-        {
-            if (til::is_surrogate(wch))
-            {
-                if (it != end && til::is_leading_surrogate(wch) && til::is_trailing_surrogate(*it))
-                {
-                    advance = 2;
-                    ++it;
-                }
-                else
-                {
-                    ptr = &UNICODE_REPLACEMENT;
-                }
-            }
-
-            width = IsGlyphFullWidth({ ptr, advance }) + 1u;
-        }
-
-        const auto colEndNew = gsl::narrow_cast<uint16_t>(colEnd + width);
+        const auto wide = til::at(s, 0) < 0x80 ? false : IsGlyphFullWidth(s);
+        const auto colEndNew = gsl::narrow_cast<uint16_t>(colEnd + 1u + wide);
         if (colEndNew > colLimit)
         {
             colEndDirty = colLimit;
-            charsConsumed = ch - chBeg;
-            return;
+            break;
         }
 
-        // Fill our char-offset buffer with 1 entry containing the mapping from the
-        // current column (colEnd) to the start of the glyph in the string (ch)...
         til::at(row._charOffsets, colEnd++) = gsl::narrow_cast<uint16_t>(ch);
-        // ...followed by 0-N entries containing an indication that the
-        // columns are just a wide-glyph extension of the preceding one.
-        while (colEnd < colEndNew)
+        if (wide)
         {
             til::at(row._charOffsets, colEnd++) = gsl::narrow_cast<uint16_t>(ch | CharOffsetsTrailer);
         }
 
-        ch += advance;
+        colEndDirty = colEnd;
+        ch += s.size();
     }
 
-    colEndDirty = colEnd;
     charsConsumed = ch - chBeg;
 }
 
-void ROW::CopyTextFrom(RowCopyTextFromState& state)
+til::CoordType ROW::CopyRangeFrom(til::CoordType columnBegin, til::CoordType columnLimit, const ROW& other, til::CoordType& otherBegin, til::CoordType otherLimit)
 try
 {
-    auto& source = state.source;
-    const auto sourceColBeg = source._clampedColumnInclusive(state.sourceColumnBegin);
-    const auto sourceColLimit = source._clampedColumnInclusive(state.sourceColumnLimit);
-    std::span<const uint16_t> charOffsets;
+    const auto otherColBeg = other._clampedColumnInclusive(otherBegin);
+    const auto otherColLimit = other._clampedColumnInclusive(otherLimit);
+    std::span<uint16_t> charOffsets;
     std::wstring_view chars;
 
-    if (sourceColBeg < sourceColLimit)
+    if (otherColBeg < otherColLimit)
     {
-        charOffsets = source._charOffsets.subspan(sourceColBeg, static_cast<size_t>(sourceColLimit) - sourceColBeg + 1);
+        charOffsets = other._charOffsets.subspan(otherColBeg, static_cast<size_t>(otherColLimit) - otherColBeg + 1);
         const auto charsOffset = charOffsets.front() & CharOffsetsMask;
         // We _are_ using span. But C++ decided that string_view and span aren't convertible.
         // _chars is a std::span for performance and because it refers to raw, shared memory.
 #pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-        chars = { source._chars.data() + charsOffset, source._chars.size() - charsOffset };
+        chars = { other._chars.data() + charsOffset, other._chars.size() - charsOffset };
     }
 
-    WriteHelper h{ *this, state.columnBegin, state.columnLimit, chars };
-
-    if (!h.IsValid() ||
-        // If we were to copy text from ourselves, we'd overwrite
-        // our _charOffsets and break Finish() which reads from it.
-        this == &state.source ||
-        // Any valid charOffsets array is at least 2 elements long (the 1st element is the start offset and the 2nd
-        // element is the length of the first glyph) and begins/ends with a non-trailer offset. We don't really
-        // need to test for the end offset, since `WriteHelper::WriteWithOffsets` already takes care of that.
-        charOffsets.size() < 2 || WI_IsFlagSet(charOffsets.front(), CharOffsetsTrailer))
+    WriteHelper h{ *this, columnBegin, columnLimit, chars };
+    if (!h.IsValid())
     {
-        state.columnEnd = h.colBeg;
-        state.columnBeginDirty = h.colBeg;
-        state.columnEndDirty = h.colBeg;
-        state.sourceColumnEnd = source._columnCount;
-        return;
+        return h.colBeg;
     }
-
-    h.CopyTextFrom(charOffsets);
+    // Any valid charOffsets array is at least 2 elements long (the 1st element is the start offset and the 2nd
+    // element is the length of the first glyph) and begins/ends with a non-trailer offset. We don't really
+    // need to test for the end offset, since `WriteHelper::WriteWithOffsets` already takes care of that.
+    if (charOffsets.size() < 2 || WI_IsFlagSet(charOffsets.front(), CharOffsetsTrailer))
+    {
+        assert(false);
+        otherBegin = other.size();
+        return h.colBeg;
+    }
+    h.CopyRangeFrom(charOffsets);
     h.Finish();
 
-    // state.columnEnd is computed identical to ROW::ReplaceText. Check it out for more information.
-    state.columnEnd = h.charsConsumed == chars.size() ? h.colEnd : h.colLimit;
-    state.columnBeginDirty = h.colBegDirty;
-    state.columnEndDirty = h.colEndDirty;
-    state.sourceColumnEnd = sourceColBeg + h.colEnd - h.colBeg;
+    otherBegin += h.colEnd - h.colBeg;
+    return h.colEndDirty;
 }
 catch (...)
 {
@@ -680,7 +489,7 @@ catch (...)
     throw;
 }
 
-[[msvc::forceinline]] void ROW::WriteHelper::CopyTextFrom(const std::span<const uint16_t>& charOffsets) noexcept
+[[msvc::forceinline]] void ROW::WriteHelper::CopyRangeFrom(const std::span<const uint16_t>& charOffsets) noexcept
 {
     // Since our `charOffsets` input is already in columns (just like the `ROW::_charOffsets`),
     // we can directly look up the end char-offset, but...
@@ -695,36 +504,26 @@ catch (...)
     const auto baseOffset = til::at(charOffsets, 0);
     const auto endOffset = til::at(charOffsets, colEndInput);
     const auto inToOutOffset = gsl::narrow_cast<uint16_t>(chBeg - baseOffset);
-#pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-    const auto dst = row._charOffsets.data() + colEnd;
 
-    _copyOffsets(dst, charOffsets.data(), colEndInput, inToOutOffset);
+    // Now with the `colEndInput` figured out, we can easily copy the `charOffsets` into the `_charOffsets`.
+    // It's possible to use SIMD for this loop for extra perf gains. Something like this for SSE2 (~8x faster):
+    //   const auto in = _mm_loadu_si128(...);
+    //   const auto off = _mm_and_epi32(in, _mm_set1_epi16(CharOffsetsMask));
+    //   const auto trailer  = _mm_and_epi32(in, _mm_set1_epi16(CharOffsetsTrailer));
+    //   const auto out = _mm_or_epi32(_mm_add_epi16(off, _mm_set1_epi16(inToOutOffset)), trailer);
+    //   _mm_store_si128(..., out);
+    for (uint16_t i = 0; i < colEndInput; ++i, ++colEnd)
+    {
+        const auto ch = til::at(charOffsets, i);
+        const auto off = ch & CharOffsetsMask;
+        const auto trailer = ch & CharOffsetsTrailer;
+        til::at(row._charOffsets, colEnd) = gsl::narrow_cast<uint16_t>((off + inToOutOffset) | trailer);
+    }
 
-    colEnd += colEndInput;
     colEndDirty = gsl::narrow_cast<uint16_t>(colBeg + colEndDirtyInput);
     charsConsumed = endOffset - baseOffset;
 }
 
-#pragma warning(push)
-#pragma warning(disable : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-[[msvc::forceinline]] void ROW::WriteHelper::_copyOffsets(uint16_t* __restrict dst, const uint16_t* __restrict src, uint16_t size, uint16_t offset) noexcept
-{
-    __assume(src != nullptr);
-    __assume(dst != nullptr);
-
-    // All tested compilers (including MSVC) will neatly unroll and vectorize
-    // this loop, which is why it's written in this particular way.
-    for (const auto end = src + size; src != end; ++src, ++dst)
-    {
-        const uint16_t ch = *src;
-        const uint16_t off = ch & CharOffsetsMask;
-        const uint16_t trailer = ch & CharOffsetsTrailer;
-        const uint16_t newOff = off + offset;
-        *dst = newOff | trailer;
-    }
-}
-#pragma warning(pop)
-
 [[msvc::forceinline]] void ROW::WriteHelper::Finish()
 {
     colEndDirty = row._adjustForward(colEndDirty);
@@ -947,17 +746,6 @@ std::wstring_view ROW::GetText() const noexcept
     return { _chars.data(), _charSize() };
 }
 
-std::wstring_view ROW::GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept
-{
-    const til::CoordType columns = _columnCount;
-    const auto colBeg = std::max(0, std::min(columns, columnBegin));
-    const auto colEnd = std::max(colBeg, std::min(columns, columnEnd));
-    const size_t chBeg = _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-    const size_t chEnd = _uncheckedCharOffset(gsl::narrow_cast<size_t>(colEnd));
-#pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-    return { _chars.data() + chBeg, chEnd - chBeg };
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
     const auto col = _clampedColumn(column);

src/buffer/out/Row.hpp

@@ -1,5 +1,22 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- Row.hpp
+
+Abstract:
+- data structure for information associated with one row of screen buffer
+
+Author(s):
+- Michael Niksa (miniksa) 10-Apr-2014
+- Paul Campbell (paulcam) 10-Apr-2014
+
+Revision History:
+- From components of output.h/.c
+  by Therese Stowell (ThereseS) 1990-1991
+- Pulled into its own file from textBuffer.hpp/cpp (AustDi, 2017)
+--*/
 
 #pragma once
 
@@ -9,7 +26,6 @@
 #include "OutputCell.hpp"
 #include "OutputCellIterator.hpp"
 
-class ROW;
 class TextBuffer;
 
 enum class DelimiterClass
@@ -27,7 +43,7 @@ struct RowWriteState
     // The column at which to start writing.
     til::CoordType columnBegin = 0; // IN
     // The first column which should not be written to anymore.
-    til::CoordType columnLimit = til::CoordTypeMax; // IN
+    til::CoordType columnLimit = 0; // IN
 
     // The column 1 past the last glyph that was successfully written into the row. If you need to call
     // ReplaceAttributes() to colorize the written range, etc., this is the columnEnd parameter you want.
@@ -41,56 +57,9 @@ struct RowWriteState
     til::CoordType columnEndDirty = 0; // OUT
 };
 
-struct RowCopyTextFromState
-{
-    // The row to copy text from.
-    const ROW& source; // IN
-    // The column at which to start writing.
-    til::CoordType columnBegin = 0; // IN
-    // The first column which should not be written to anymore.
-    til::CoordType columnLimit = til::CoordTypeMax; // IN
-    // The column at which to start reading from source.
-    til::CoordType sourceColumnBegin = 0; // IN
-    // The first column which should not be read from anymore.
-    til::CoordType sourceColumnLimit = til::CoordTypeMax; // IN
-
-    til::CoordType columnEnd = 0; // OUT
-    // The first column that got modified by this write operation. In case that the first glyph we write overwrites
-    // the trailing half of a wide glyph, leadingSpaces will be 1 and this value will be 1 less than colBeg.
-    til::CoordType columnBeginDirty = 0; // OUT
-    // This is 1 past the last column that was modified and will be 1 past columnEnd if we overwrote
-    // the leading half of a wide glyph and had to fill the trailing half with whitespace.
-    til::CoordType columnEndDirty = 0; // OUT
-    // This is 1 past the last column that was read from.
-    til::CoordType sourceColumnEnd = 0; // OUT
-};
-
 class ROW final
 {
 public:
-    // The implicit agreement between ROW and TextBuffer is that the `charsBuffer` and `charOffsetsBuffer`
-    // arrays have a minimum alignment of 16 Bytes and a size of `rowWidth+1`. The former is used to
-    // implement Reset() efficiently via SIMD and the latter is used to store the past-the-end offset
-    // into the `charsBuffer`. Even though the `charsBuffer` could be only `rowWidth` large we need them
-    // to be the same size so that the SIMD code can process both arrays in the same loop simultaneously.
-    // This wastes up to 5.8% memory but increases overall scrolling performance by around 40%.
-    // These methods exists to make this agreement explicit and serve as a reminder.
-    //
-    // TextBuffer calculates the distance in bytes between two ROWs (_bufferRowStride) as the sum of these values.
-    // As such it's important that we return sizes with a minimum alignment of alignof(ROW).
-    static constexpr size_t CalculateRowSize() noexcept
-    {
-        return (sizeof(ROW) + 15) & ~15;
-    }
-    static constexpr size_t CalculateCharsBufferSize(size_t columns) noexcept
-    {
-        return (columns * sizeof(wchar_t) + 16) & ~15;
-    }
-    static constexpr size_t CalculateCharOffsetsBufferSize(size_t columns) noexcept
-    {
-        return (columns * sizeof(uint16_t) + 16) & ~15;
-    }
-
     ROW() = default;
     ROW(wchar_t* charsBuffer, uint16_t* charOffsetsBuffer, uint16_t rowWidth, const TextAttribute& fillAttribute);
 
@@ -106,22 +75,20 @@ public:
     bool WasDoubleBytePadded() const noexcept;
     void SetLineRendition(const LineRendition lineRendition) noexcept;
     LineRendition GetLineRendition() const noexcept;
-    uint16_t GetLineWidth() const noexcept;
 
-    void Reset(const TextAttribute& attr) noexcept;
+    void Reset(const TextAttribute& attr);
     void TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& attr, til::CoordType newWidth);
-    void CopyFrom(const ROW& source);
 
     til::CoordType NavigateToPrevious(til::CoordType column) const noexcept;
     til::CoordType NavigateToNext(til::CoordType column) const noexcept;
 
     void ClearCell(til::CoordType column);
     OutputCellIterator WriteCells(OutputCellIterator it, til::CoordType columnBegin, std::optional<bool> wrap = std::nullopt, std::optional<til::CoordType> limitRight = std::nullopt);
-    void SetAttrToEnd(til::CoordType columnBegin, TextAttribute attr);
+    bool SetAttrToEnd(til::CoordType columnBegin, TextAttribute attr);
     void ReplaceAttributes(til::CoordType beginIndex, til::CoordType endIndex, const TextAttribute& newAttr);
     void ReplaceCharacters(til::CoordType columnBegin, til::CoordType width, const std::wstring_view& chars);
     void ReplaceText(RowWriteState& state);
-    void CopyTextFrom(RowCopyTextFromState& state);
+    til::CoordType CopyRangeFrom(til::CoordType columnBegin, til::CoordType columnLimit, const ROW& other, til::CoordType& otherBegin, til::CoordType otherLimit);
 
     til::small_rle<TextAttribute, uint16_t, 1>& Attributes() noexcept;
     const til::small_rle<TextAttribute, uint16_t, 1>& Attributes() const noexcept;
@@ -135,7 +102,6 @@ public:
     std::wstring_view GlyphAt(til::CoordType column) const noexcept;
     DbcsAttribute DbcsAttrAt(til::CoordType column) const noexcept;
     std::wstring_view GetText() const noexcept;
-    std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
     DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;
 
     auto AttrBegin() const noexcept { return _attr.begin(); }
@@ -155,9 +121,7 @@ private:
         bool IsValid() const noexcept;
         void ReplaceCharacters(til::CoordType width) noexcept;
         void ReplaceText() noexcept;
-        void _replaceTextUnicode(size_t ch, std::wstring_view::const_iterator it) noexcept;
-        void CopyTextFrom(const std::span<const uint16_t>& charOffsets) noexcept;
-        static void _copyOffsets(uint16_t* dst, const uint16_t* src, uint16_t size, uint16_t offset) noexcept;
+        void CopyRangeFrom(const std::span<const uint16_t>& charOffsets) noexcept;
         void Finish();
 
         // Parent pointer.

src/buffer/out/textBuffer.hpp

@@ -72,22 +72,14 @@ public:
                const UINT cursorSize,
                const bool isActiveBuffer,
                Microsoft::Console::Render::Renderer& renderer);
-
-    TextBuffer(const TextBuffer&) = delete;
-    TextBuffer(TextBuffer&&) = delete;
-    TextBuffer& operator=(const TextBuffer&) = delete;
-    TextBuffer& operator=(TextBuffer&&) = delete;
-
-    ~TextBuffer();
+    TextBuffer(const TextBuffer& a) = delete;
 
     // Used for duplicating properties to another text buffer
     void CopyProperties(const TextBuffer& OtherBuffer) noexcept;
 
     // row manipulation
-    ROW& GetScratchpadRow();
-    ROW& GetScratchpadRow(const TextAttribute& attributes);
-    const ROW& GetRowByOffset(til::CoordType index) const;
-    ROW& GetRowByOffset(til::CoordType index);
+    const ROW& GetRowByOffset(const til::CoordType index) const noexcept;
+    ROW& GetRowByOffset(const til::CoordType index) noexcept;
 
     TextBufferCellIterator GetCellDataAt(const til::point at) const;
     TextBufferCellIterator GetCellLineDataAt(const til::point at) const;
@@ -98,8 +90,7 @@ public:
 
     // Text insertion functions
     static void ConsumeGrapheme(std::wstring_view& chars) noexcept;
-    void Write(til::CoordType row, const TextAttribute& attributes, RowWriteState& state);
-    void FillRect(const til::rect& rect, const std::wstring_view& fill, const TextAttribute& attributes);
+    void WriteLine(til::CoordType row, bool wrapAtEOL, const TextAttribute& attributes, RowWriteState& state);
 
     OutputCellIterator Write(const OutputCellIterator givenIt);
 
@@ -112,13 +103,13 @@ public:
                                  const std::optional<bool> setWrap = std::nullopt,
                                  const std::optional<til::CoordType> limitRight = std::nullopt);
 
-    void InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
-    void InsertCharacter(const std::wstring_view chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
-    void IncrementCursor();
-    void NewlineCursor();
+    bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
+    bool InsertCharacter(const std::wstring_view chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
+    bool IncrementCursor();
+    bool NewlineCursor();
 
     // Scroll needs access to this to quickly rotate around the buffer.
-    void IncrementCircularBuffer(const TextAttribute& fillAttributes = {});
+    bool IncrementCircularBuffer(const bool inVtMode = false);
 
     til::point GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;
 
@@ -133,22 +124,21 @@ public:
 
     til::CoordType TotalRowCount() const noexcept;
 
-    const TextAttribute& GetCurrentAttributes() const noexcept;
+    [[nodiscard]] TextAttribute GetCurrentAttributes() const noexcept;
 
     void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;
 
-    void SetWrapForced(til::CoordType y, bool wrap);
-    void SetCurrentLineRendition(const LineRendition lineRendition, const TextAttribute& fillAttributes);
-    void ResetLineRenditionRange(const til::CoordType startRow, const til::CoordType endRow);
-    LineRendition GetLineRendition(const til::CoordType row) const;
-    bool IsDoubleWidthLine(const til::CoordType row) const;
+    void SetCurrentLineRendition(const LineRendition lineRendition);
+    void ResetLineRenditionRange(const til::CoordType startRow, const til::CoordType endRow) noexcept;
+    LineRendition GetLineRendition(const til::CoordType row) const noexcept;
+    bool IsDoubleWidthLine(const til::CoordType row) const noexcept;
 
-    til::CoordType GetLineWidth(const til::CoordType row) const;
-    til::point ClampPositionWithinLine(const til::point position) const;
-    til::point ScreenToBufferPosition(const til::point position) const;
-    til::point BufferToScreenPosition(const til::point position) const;
+    til::CoordType GetLineWidth(const til::CoordType row) const noexcept;
+    til::point ClampPositionWithinLine(const til::point position) const noexcept;
+    til::point ScreenToBufferPosition(const til::point position) const noexcept;
+    til::point BufferToScreenPosition(const til::point position) const noexcept;
 
-    void Reset() noexcept;
+    void Reset();
 
     [[nodiscard]] HRESULT ResizeTraditional(const til::size newSize) noexcept;
 
@@ -229,27 +219,23 @@ public:
     interval_tree::IntervalTree<til::point, size_t> GetPatterns(const til::CoordType firstRow, const til::CoordType lastRow) const;
 
 private:
-    void _reserve(til::size screenBufferSize, const TextAttribute& defaultAttributes);
-    void _commit(const std::byte* row);
-    void _decommit() noexcept;
-    void _construct(const std::byte* until) noexcept;
-    void _destroy() const noexcept;
-    ROW& _getRowByOffsetDirect(size_t offset);
-    til::CoordType _estimateOffsetOfLastCommittedRow() const noexcept;
+    static wil::unique_virtualalloc_ptr<std::byte> _allocateBuffer(til::size sz, const TextAttribute& attributes, std::vector<ROW>& rows);
 
+    void _UpdateSize();
     void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
-    til::point _GetPreviousFromCursor() const;
-    void _SetWrapOnCurrentRow();
-    void _AdjustWrapOnCurrentRow(const bool fSet);
+    til::point _GetPreviousFromCursor() const noexcept;
+    void _SetWrapOnCurrentRow() noexcept;
+    void _AdjustWrapOnCurrentRow(const bool fSet) noexcept;
     // Assist with maintaining proper buffer state for Double Byte character sequences
-    void _PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute);
+    bool _PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute);
     bool _AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribute);
+    ROW& _GetFirstRow() noexcept;
     void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
-    DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const noexcept;
+    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const noexcept;
+    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const noexcept;
     til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
-    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const noexcept;
     void _PruneHyperlinks();
 
     static void _AppendRTFText(std::ostringstream& contentBuilder, const std::wstring_view& text);
@@ -263,67 +249,13 @@ private:
     std::unordered_map<size_t, std::wstring> _idsAndPatterns;
     size_t _currentPatternId = 0;
 
-    // This block describes the state of the underlying virtual memory buffer that holds all ROWs, text and attributes.
-    // Initially memory is only allocated with MEM_RESERVE to reduce the private working set of conhost.
-    // ROWs are laid out like this in memory:
-    //   ROW                <-- sizeof(ROW), stores
-    //   (padding)
-    //   ROW::_charsBuffer  <-- _width * sizeof(wchar_t)
-    //   (padding)
-    //   ROW::_charOffsets  <-- (_width + 1) * sizeof(uint16_t)
-    //   (padding)
-    //   ...
-    // Padding may exist for alignment purposes.
-    //
-    // The base (start) address of the memory arena.
-    wil::unique_virtualalloc_ptr<std::byte> _buffer;
-    // The past-the-end pointer of the memory arena.
-    std::byte* _bufferEnd = nullptr;
-    // The range between _buffer (inclusive) and _commitWatermark (exclusive) is the range of
-    // memory that has already been committed via MEM_COMMIT and contains ready-to-use ROWs.
-    //
-    // The problem is that calling VirtualAlloc(MEM_COMMIT) on each ROW one by one is extremely expensive, which forces
-    // us to commit ROWs in batches and avoid calling it on already committed ROWs. Let's say we commit memory in
-    // batches of 128 ROWs. One option to know whether a ROW has already been committed is to allocate a vector<uint8_t>
-    // of size `(height + 127) / 128` and mark the corresponding slot as 1 if that 128-sized batch has been committed.
-    // That way we know not to commit it again. But ROWs aren't accessed randomly. Instead, they're usually accessed
-    // fairly linearly from row 1 to N. As such we can just commit ROWs up to the point of the highest accessed ROW
-    // plus some read-ahead of 128 ROWs. This is exactly what _commitWatermark stores: The highest accessed ROW plus
-    // some read-ahead. It's the amount of memory that has been committed and is ready to use.
-    //
-    // _commitWatermark will always be a multiple of _bufferRowStride away from _buffer.
-    // In other words, _commitWatermark itself will either point exactly onto the next ROW
-    // that should be committed or be equal to _bufferEnd when all ROWs are committed.
-    std::byte* _commitWatermark = nullptr;
-    // This will MEM_COMMIT 128 rows more than we need, to avoid us from having to call VirtualAlloc too often.
-    // This equates to roughly the following commit chunk sizes at these column counts:
-    // *  80 columns (the usual minimum) =  60KB chunks,  4.1MB buffer at 9001 rows
-    // * 120 columns (the most common)   =  80KB chunks,  5.6MB buffer at 9001 rows
-    // * 400 columns (the usual maximum) = 220KB chunks, 15.5MB buffer at 9001 rows
-    // There's probably a better metric than this. (This comment was written when ROW had both,
-    // a _chars array containing text and a _charOffsets array contain column-to-text indices.)
-    static constexpr size_t _commitReadAheadRowCount = 128;
-    // Before TextBuffer was made to use virtual memory it initialized the entire memory arena with the initial
-    // attributes right away. To ensure it continues to work the way it used to, this stores these initial attributes.
-    TextAttribute _initialAttributes;
-    // ROW ---------------+--+--+
-    // (padding)          |  |  v _bufferOffsetChars
-    // ROW::_charsBuffer  |  |
-    // (padding)          |  v _bufferOffsetCharOffsets
-    // ROW::_charOffsets  |
-    // (padding)          v _bufferRowStride
-    size_t _bufferRowStride = 0;
-    size_t _bufferOffsetChars = 0;
-    size_t _bufferOffsetCharOffsets = 0;
-    // The width of the buffer in columns.
-    uint16_t _width = 0;
-    // The height of the buffer in rows, excluding the scratchpad row.
-    uint16_t _height = 0;
-
+    wil::unique_virtualalloc_ptr<std::byte> _charBuffer;
+    std::vector<ROW> _storage;
     TextAttribute _currentAttributes;
     til::CoordType _firstRow = 0; // indexes top row (not necessarily 0)
 
     Cursor _cursor;
+    Microsoft::Console::Types::Viewport _size;
 
     bool _isActiveBuffer = false;
 

src/buffer/out/textBufferCellIterator.cpp

@@ -287,7 +287,7 @@ ptrdiff_t TextBufferCellIterator::operator-(const TextBufferCellIterator& it)
 // - Sets the coordinate position that this iterator will inspect within the text buffer on dereference.
 // Arguments:
 // - newPos - The new coordinate position.
-void TextBufferCellIterator::_SetPos(const til::point newPos)
+void TextBufferCellIterator::_SetPos(const til::point newPos) noexcept
 {
     if (newPos.y != _pos.y)
     {
@@ -315,7 +315,7 @@ void TextBufferCellIterator::_SetPos(const til::point newPos)
 // - pos - Position inside screen buffer bounds to retrieve row
 // Return Value:
 // - Pointer to the underlying CharRow structure
-const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const til::point pos)
+const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept
 {
     return &buffer.GetRowByOffset(pos.y);
 }

src/buffer/out/textBufferCellIterator.hpp

@@ -49,9 +49,9 @@ public:
     til::point Pos() const noexcept;
 
 protected:
-    void _SetPos(const til::point newPos);
+    void _SetPos(const til::point newPos) noexcept;
     void _GenerateView() noexcept;
-    static const ROW* s_GetRow(const TextBuffer& buffer, const til::point pos);
+    static const ROW* s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept;
 
     til::small_rle<TextAttribute, uint16_t, 1>::const_iterator _attrIter;
     OutputCellView _view;

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

@@ -125,6 +125,10 @@
     <value>Terminal Dev</value>
     <comment>{Locked}</comment>
   </data>
+  <data name="AppNameCan" xml:space="preserve">
+    <value>Terminal Canary</value>
+    <comment>{Locked}</comment>
+  </data>
   <data name="AppNamePre" xml:space="preserve">
     <value>Terminal Preview</value>
     <comment>{Locked}</comment>
@@ -137,6 +141,10 @@
     <value>Windows Terminal Dev</value>
     <comment>{Locked}</comment>
   </data>
+  <data name="AppStoreNameCan" xml:space="preserve">
+    <value>Windows Terminal Canary</value>
+    <comment>{Locked}</comment>
+  </data>
   <data name="AppStoreNamePre" xml:space="preserve">
     <value>Windows Terminal Preview</value>
     <comment>{Locked}</comment>
@@ -149,6 +157,10 @@
     <value>Terminal Dev</value>
     <comment>{Locked}</comment>
   </data>
+  <data name="AppShortNameCan" xml:space="preserve">
+    <value>Terminal Canary</value>
+    <comment>{Locked}</comment>
+  </data>
   <data name="AppShortNamePre" xml:space="preserve">
     <value>Terminal Preview</value>
     <comment>{Locked}</comment>
@@ -161,6 +173,10 @@
     <value>The Windows Terminal, but Unofficial</value>
     <comment>{Locked}</comment>
   </data>
+  <data name="AppDescriptionCan" xml:space="preserve">
+    <value>The Windows Terminal (Canary build)</value>
+    <comment>{Locked}</comment>
+  </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Windows Terminal with a preview of upcoming features</value>
     <comment>{Locked}</comment>

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -74,6 +74,8 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestInheritedCommand);
         TEST_METHOD(LoadFragmentsWithMultipleUpdates);
 
+        TEST_METHOD(MigrateReloadEnvVars);
+
     private:
         static winrt::com_ptr<implementation::CascadiaSettings> createSettings(const std::string_view& userJSON)
         {
@@ -2020,4 +2022,40 @@ namespace SettingsModelLocalTests
         // GH#12520: Fragments should be able to override the name of builtin profiles.
         VERIFY_ARE_EQUAL(L"NewName", loader.userSettings.profiles[0]->Name());
     }
+
+    void DeserializationTests::MigrateReloadEnvVars()
+    {
+        static constexpr std::string_view settings1Json{ R"(
+        {
+            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+            "compatibility.reloadEnvironmentVariables": false,
+            "profiles": [
+                {
+                    "name": "profile0",
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1,
+                    "commandline": "cmd.exe"
+                }
+            ],
+            "actions": [
+                {
+                    "name": "foo",
+                    "command": "closePane",
+                    "keys": "ctrl+shift+w"
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader loader{ settings1Json, DefaultJson };
+        loader.MergeInboxIntoUserSettings();
+        loader.FinalizeLayering();
+
+        VERIFY_IS_TRUE(loader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
+
+        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
+
+        Log::Comment(L"Ensure that the profile defaults have the new setting added");
+        VERIFY_IS_TRUE(settings->ProfileDefaults().HasReloadEnvironmentVariables());
+        VERIFY_IS_FALSE(settings->ProfileDefaults().ReloadEnvironmentVariables());
+    }
 }

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -42,6 +42,9 @@ namespace SettingsModelLocalTests
         TEST_METHOD(CascadiaSettings);
         TEST_METHOD(LegacyFontSettings);
 
+        TEST_METHOD(RoundtripReloadEnvVars);
+        TEST_METHOD(DontRoundtripNoReloadEnvVars);
+
     private:
         // Method Description:
         // - deserializes and reserializes a json string representing a settings object model of type T
@@ -513,4 +516,114 @@ namespace SettingsModelLocalTests
 
         VERIFY_ARE_EQUAL(toString(jsonOutput), toString(result));
     }
+
+    void SerializationTests::RoundtripReloadEnvVars()
+    {
+        static constexpr std::string_view oldSettingsJson{ R"(
+        {
+            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+            "compatibility.reloadEnvironmentVariables": false,
+            "profiles": [
+                {
+                    "name": "profile0",
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1,
+                    "commandline": "cmd.exe"
+                }
+            ],
+            "actions": [
+                {
+                    "name": "foo",
+                    "command": "closePane",
+                    "keys": "ctrl+shift+w"
+                }
+            ]
+        })" };
+
+        static constexpr std::string_view newSettingsJson{ R"(
+        {
+            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+            "profiles":
+            {
+                "defaults":
+                {
+                    "compatibility.reloadEnvironmentVariables": false
+                },
+                "list":
+                [
+                    {
+                        "name": "profile0",
+                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                        "historySize": 1,
+                        "commandline": "cmd.exe"
+                    }
+                ]
+            },
+            "actions": [
+                {
+                    "name": "foo",
+                    "command": "closePane",
+                    "keys": "ctrl+shift+w"
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
+        oldLoader.MergeInboxIntoUserSettings();
+        oldLoader.FinalizeLayering();
+        VERIFY_IS_TRUE(oldLoader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
+        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
+        const auto oldResult{ oldSettings->ToJson() };
+
+        implementation::SettingsLoader newLoader{ newSettingsJson, DefaultJson };
+        newLoader.MergeInboxIntoUserSettings();
+        newLoader.FinalizeLayering();
+        newLoader.FixupUserSettings();
+        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
+        const auto newResult{ newSettings->ToJson() };
+
+        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
+    }
+
+    void SerializationTests::DontRoundtripNoReloadEnvVars()
+    {
+        // Kinda like the above test, but confirming that _nothing_ happens if
+        // we don't have a setting to migrate.
+
+        static constexpr std::string_view oldSettingsJson{ R"(
+        {
+            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name": "profile0",
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1,
+                    "commandline": "cmd.exe"
+                }
+            ],
+            "actions": [
+                {
+                    "name": "foo",
+                    "command": "closePane",
+                    "keys": "ctrl+shift+w"
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
+        oldLoader.MergeInboxIntoUserSettings();
+        oldLoader.FinalizeLayering();
+        oldLoader.FixupUserSettings();
+        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
+        const auto oldResult{ oldSettings->ToJson() };
+
+        Log::Comment(L"Now, create a _new_ settings object from the re-serialization of the first");
+        implementation::SettingsLoader newLoader{ toString(oldResult), DefaultJson };
+        newLoader.MergeInboxIntoUserSettings();
+        newLoader.FinalizeLayering();
+        newLoader.FixupUserSettings();
+        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
+        VERIFY_IS_FALSE(newSettings->ProfileDefaults().HasReloadEnvironmentVariables(),
+                        L"Ensure that the new settings object didn't find a reloadEnvironmentVariables");
+    }
 }

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -64,6 +64,7 @@ Author(s):
 
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
+#include <til/winrt.h>
 
 // Common includes for most tests:
 #include "../../inc/conattrs.hpp"

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -517,7 +517,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the first pane"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
+            page->_SplitPane(nullptr, SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -535,7 +535,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the pane, and don't crash"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
+            page->_SplitPane(nullptr, SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -857,7 +857,7 @@ namespace TerminalAppLocalTests
             // |   1    |   2    |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Right, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
+            page->_SplitPane(nullptr, SplitDirection::Right, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
             secondId = tab->_activePane->Id().value();
         });
         Sleep(250);
@@ -875,7 +875,7 @@ namespace TerminalAppLocalTests
             // |   3    |        |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
+            page->_SplitPane(nullptr, SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
             // Split again to make the 3rd tab
             thirdId = tab->_activePane->Id().value();
@@ -895,7 +895,7 @@ namespace TerminalAppLocalTests
             // |   3    |   4    |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
+            page->_SplitPane(nullptr, SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
             fourthId = tab->_activePane->Id().value();
         });

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -68,9 +68,12 @@ Author(s):
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
 
+#include <SafeDispatcherTimer.h>
+
 // Common includes for most tests:
 #include "../../inc/conattrs.hpp"
 #include "../../types/inc/utils.hpp"
 #include "../../inc/DefaultSettings.h"
 
 #include <cppwinrt_utils.h>
+#include <til/winrt.h>

src/cascadia/Remoting/CommandlineArgs.h

@@ -15,10 +15,12 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
         CommandlineArgs(const winrt::array_view<const winrt::hstring>& args,
                         winrt::hstring currentDirectory,
-                        const uint32_t showWindowCommand) :
+                        const uint32_t showWindowCommand,
+                        winrt::hstring envString) :
             _args{ args.begin(), args.end() },
             _cwd{ currentDirectory },
-            _ShowWindowCommand{ showWindowCommand }
+            _ShowWindowCommand{ showWindowCommand },
+            CurrentEnvironment{ envString }
         {
         }
 
@@ -27,6 +29,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void Commandline(const winrt::array_view<const winrt::hstring>& value);
         winrt::com_array<winrt::hstring> Commandline();
 
+        til::property<winrt::hstring> CurrentEnvironment;
+
         WINRT_PROPERTY(uint32_t, ShowWindowCommand, SW_NORMAL); // SW_NORMAL is 1, 0 is SW_HIDE
 
     private:

src/cascadia/Remoting/Monarch.cpp

@@ -119,8 +119,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_AddPeasant_Failed",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
             // We can only get into this try/catch if the peasant died on us. So
             // the return value doesn't _really_ matter. They're not about to
@@ -164,8 +163,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_handleQuitAll_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not close"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(callback, onError);
@@ -326,8 +324,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_lookupPeasantIdForName_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not get the name of"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(callback, onError);
@@ -382,8 +379,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_HandleActivatePeasant_Failed",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
 
@@ -514,8 +510,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_getMostRecentPeasantID_NoPeasants",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             return 0;
         }
 
@@ -552,8 +547,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                                      "We thought this peasant was the MRU one, but it was actually already dead."),
                                   TraceLoggingGuid(mruWindowArgs.DesktopID(), "desktopGuid", "The GUID of the desktop the window is on"),
                                   TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                                  TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                 // We'll go through the loop again. We removed the current one
                 // at positionInList, so the next one in positionInList will be
                 // a new, different peasant.
@@ -630,8 +624,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_getMostRecentPeasantID_NotFound",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
 
         return result;
@@ -764,8 +757,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                                       "succeeded",
                                                       "true if we successfully dispatched the commandline to the peasant"),
                                   TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                                  TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                 return *result;
             }
             else if (windowID > 0)
@@ -798,8 +790,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           "Monarch_ProposeCommandline_NewWindow",
                           TraceLoggingInt64(targetWindow, "targetWindow", "The provided ID"),
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                          TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         // In this case, no usable ID was provided. Return { true, nullopt }
         auto result = winrt::make_self<Remoting::implementation::ProposeCommandlineResult>(true);
@@ -832,8 +823,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_identifyWindows_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not identify"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(callback, onError);
@@ -885,8 +875,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_renameRequested_Failed",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
 
@@ -958,8 +947,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   TraceLoggingUInt64(windowId, "peasantID", "The id of the window we tried to summon"),
                                   TraceLoggingBoolean(args.OnCurrentDesktop(), "OnCurrentDesktop", "true iff the window needs to be on the current virtual desktop"),
                                   TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                                  TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
         catch (...)
@@ -969,8 +957,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_SummonWindow_Failed",
                               TraceLoggingWideString(searchedForName.c_str(), "searchedForName", "The name of the window we tried to summon"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
 
@@ -998,8 +985,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_identifyWindows_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not identify"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(func, onError);
@@ -1024,8 +1010,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_DoesQuakeWindowExist_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not ask for its name"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(func, onError);
@@ -1045,8 +1030,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_SummonAll_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not summon"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
 
         _forEachPeasant(func, onError);
@@ -1069,8 +1053,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               "Monarch_GetAllWindowLayouts_Failed",
                               TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not get a window layout from"),
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         };
         _forEachPeasant(callback, onError);
 
@@ -1086,8 +1069,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           "Monarch_MoveContent_Requested",
                           TraceLoggingWideString(window.c_str(), "window", "The name of the window we tried to move to"),
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                          TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         uint64_t windowId = _lookupPeasantIdForName(window);
         if (windowId == 0)
@@ -1099,8 +1081,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                 TraceLoggingWrite(g_hRemotingProvider,
                                   "Monarch_MoveContent_FailedToParseId",
                                   TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                                  TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
             else
             {
@@ -1147,8 +1128,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           TraceLoggingUInt64(args.SourceWindow(), "source", "The window which started the drag"),
                           TraceLoggingUInt64(args.TargetWindow(), "target", "The window which was the target of the drop"),
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                          TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                          TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         if (auto senderPeasant{ _getPeasant(args.SourceWindow()) })
         {
@@ -1168,8 +1148,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             TraceLoggingWrite(g_hRemotingProvider,
                               "Monarch_SendContent_NoWindow",
                               TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                              TraceLoggingKeyword(TIL_KEYWORD_TRACE),
-                              TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
 }