Default to XamlRoot when unable to find focused object (#15189)

Default to XamlRoot when unable to find a focused object in
DirectKeyEvents

This may not be the most appropriate "fix" for this. Certainly open to
criticism and feedback. We are trapping the alt+space key chord on the
win32 side and forwarding it to the xaml side. There we try to find a
focused object by walking the xaml tree. If we are unable to find a
focused object we return false and do nothing. I suspect that the area
that has focus that prevents this from working normally is on the win32
side. Since we want to handle the system menu anyway and are explicitly
trapping that key combo and forwarding it on I thought this was the best
approach. If we cant find a focused object default to the xaml root.

## Validation Steps Performed
System menu opens as it should.

Closes #14397

.clang-format

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

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

@@ -29,13 +29,11 @@ Dacl
 dataobject
 dcomp
 DERR
-delayimp
 dlldata
 DNE
 DONTADDTORECENT
 DWMSBT
 DWMWA
-DWMWA
 DWORDLONG
 endfor
 ENDSESSION
@@ -77,7 +75,6 @@ IConnection
 ICustom
 IDialog
 IDirect
-Idn
 IExplorer
 IFACEMETHOD
 IFile
@@ -162,12 +159,12 @@ rcx
 REGCLS
 RETURNCMD
 rfind
+RLO
 ROOTOWNER
 roundf
 RSHIFT
 SACL
 schandle
-SEH
 semver
 serializer
 SETVERSION
@@ -215,7 +212,6 @@ UOI
 UPDATEINIFILE
 userenv
 USEROBJECTFLAGS
-Vcpp
 Viewbox
 virtualalloc
 wcsstr
@@ -255,3 +251,4 @@ xtree
 xutility
 YIcon
 YMax
+zwstring

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

@@ -9,9 +9,11 @@ appxbundle
 appxerror
 appxmanifest
 ATL
+autoexec
 backplating
 bitmaps
 BOMs
+COMPUTERNAME
 CPLs
 cpptools
 cppvsdbg
@@ -26,6 +28,7 @@ dotnetfeed
 DTDs
 DWINRT
 enablewttlogging
+HOMESHARE
 Intelli
 IVisual
 libucrt
@@ -63,6 +66,7 @@ SACLs
 segoe
 sdkddkver
 Shobjidl
+sid
 Skype
 SRW
 sxs
@@ -75,6 +79,7 @@ tdbuildteamid
 ucrt
 ucrtd
 unvirtualized
+USERDNSDOMAIN
 VCRT
 vcruntime
 Virtualization

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

@@ -1,6 +1,6 @@
 Anup
-arkthur
 austdi
+arkthur
 Ballmer
 bhoj
 Bhojwani
@@ -31,8 +31,8 @@ jerrysh
 Kaiyu
 kimwalisch
 KMehrain
-Kodelife
 KODELIFE
+Kodelife
 Kourosh
 kowalczyk
 leonardder
@@ -61,7 +61,6 @@ oising
 oldnewthing
 opengl
 osgwiki
-Ottosson
 pabhojwa
 panos
 paulcam
@@ -89,8 +88,8 @@ Wirt
 Wojciech
 zadjii
 Zamor
-zamora
 Zamora
+zamora
 zljubisic
 Zoey
 zorio

.github/actions/spelling/excludes.txt

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

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

@@ -18,6 +18,7 @@ BBBBBBBB
 BBBBBCCC
 BBBBCCCCC
 BBGGRR
+efg
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ

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

@@ -2,6 +2,7 @@ aabbcc
 ABANDONFONT
 abbcc
 ABCDEFGHIJKLMNOPQRSTUVWXY
+ABCF
 abgr
 abi
 ABORTIFHUNG
@@ -37,11 +38,11 @@ ansicpg
 ANSISYS
 ANSISYSRC
 ANSISYSSC
+answerback
 antialiasing
 ANull
 anycpu
 APARTMENTTHREADED
-APCA
 APCs
 APIENTRY
 apiset
@@ -176,7 +177,6 @@ CConsole
 CConversion
 CCRT
 cdd
-CDeclaration
 CEdit
 CELLSIZE
 cfae
@@ -194,9 +194,6 @@ chh
 chk
 CHT
 Cic
-CLA
-cielab
-Cielab
 Clcompile
 CLE
 cleartype
@@ -221,7 +218,6 @@ cmt
 cmw
 cmyk
 CNL
-cnn
 cnt
 CNTRL
 Codeflow
@@ -261,6 +257,7 @@ condrv
 conechokey
 conemu
 configurability
+confusables
 conhost
 conime
 conimeinfo
@@ -335,7 +332,7 @@ Cspace
 csrmsg
 CSRSS
 csrutil
-cstyle
+CSTYLE
 CSwitch
 CTerminal
 CText
@@ -412,6 +409,7 @@ DECAUPSS
 DECAWM
 DECBKM
 DECCARA
+DECCIR
 DECCKM
 DECCKSR
 DECCOLM
@@ -441,9 +439,12 @@ DECRC
 DECREQTPARM
 DECRLM
 DECRPM
+DECRQCRA
 DECRQM
+DECRQPSR
 DECRQSS
 DECRQTSR
+DECRSPS
 decrst
 DECSACE
 DECSASD
@@ -464,6 +465,7 @@ DECSTBM
 DECSTGLT
 DECSTR
 DECSWL
+DECTABSR
 DECTCEM
 DECXCPR
 DEFAPP
@@ -483,7 +485,6 @@ defterm
 DELAYLOAD
 DELETEONRELEASE
 Delt
-demoable
 depersist
 deprioritized
 deserializers
@@ -540,7 +541,6 @@ DSSCL
 DSwap
 DTest
 DTTERM
-DUMMYUNIONNAME
 dup'ed
 dvi
 dwl
@@ -584,7 +584,6 @@ ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
 enumranges
-EOK
 eplace
 EPres
 EQU
@@ -594,7 +593,6 @@ ETW
 EUDC
 EVENTID
 eventing
-everytime
 evflags
 evt
 execd
@@ -616,8 +614,12 @@ FACESIZE
 FAILIFTHERE
 fastlink
 fcharset
+FDEA
 fdw
+FECF
+FEEF
 fesb
+FFAF
 FFDE
 FFrom
 fgbg
@@ -802,6 +804,7 @@ HIBYTE
 hicon
 HIDEWINDOW
 hinst
+Hirots
 HISTORYBUFS
 HISTORYNODUP
 HISTORYSIZE
@@ -813,11 +816,11 @@ hkl
 HKLM
 hlocal
 hlsl
+HMB
+HMK
 hmod
 hmodule
 hmon
-homeglyphs
-homoglyph
 HORZ
 hostable
 hostlib
@@ -904,7 +907,6 @@ INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
 INTERNALNAME
-inthread
 intsafe
 INVALIDARG
 INVALIDATERECT
@@ -1123,6 +1125,7 @@ Mip
 MMBB
 mmcc
 MMCPL
+MMIX
 mmsystem
 MNC
 MNOPQ
@@ -1261,19 +1264,18 @@ ntm
 nto
 ntrtl
 ntstatus
-ntsubauth
 NTSYSCALLAPI
 nttree
 nturtl
 ntuser
 NTVDM
 ntverp
-NTWIN
 nugetversions
 nullability
 nullness
 nullonfailure
 nullopts
+NULs
 numlock
 numpad
 NUMSCROLL
@@ -1288,8 +1290,6 @@ OEMFONT
 OEMFORMAT
 OEMs
 offboarded
-oklab
-Oklab
 OLEAUT
 OLECHAR
 onecore
@@ -1308,8 +1308,6 @@ opencode
 opencon
 openconsole
 openconsoleproxy
-OPENIF
-OPENLINK
 openps
 openvt
 ORIGINALFILENAME
@@ -1362,9 +1360,7 @@ pcg
 pch
 PCIDLIST
 PCIS
-PCLIENT
 PCLONG
-PCOBJECT
 pcon
 PCONSOLE
 PCONSOLEENDTASK
@@ -1376,7 +1372,6 @@ pcshell
 PCSHORT
 PCSR
 PCSTR
-PCUNICODE
 PCWCH
 PCWCHAR
 PCWSTR
@@ -1425,7 +1420,6 @@ PLOGICAL
 pnm
 PNMLINK
 pntm
-PNTSTATUS
 POBJECT
 Podcast
 POINTSLIST
@@ -1444,7 +1438,6 @@ ppf
 ppguid
 ppidl
 PPROC
-PPROCESS
 ppropvar
 ppsi
 ppsl
@@ -1508,7 +1501,6 @@ ptrs
 ptsz
 PTYIn
 PUCHAR
-PUNICODE
 pwch
 PWDDMCONSOLECONTEXT
 pws
@@ -1570,7 +1562,6 @@ REGISTEROS
 REGISTERVDM
 regkey
 REGSTR
-reingest
 RELBINPATH
 remoting
 renamer
@@ -1771,6 +1762,7 @@ somefile
 SOURCEBRANCH
 sourced
 spammy
+spand
 SRCCODEPAGE
 SRCCOPY
 SRCINVERT
@@ -1778,8 +1770,6 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-srgb
-Srgb
 srv
 srvinit
 srvpipe
@@ -1867,6 +1857,7 @@ TDP
 TEAMPROJECT
 tearoff
 Teb
+Techo
 tellp
 teraflop
 terminalcore
@@ -2010,7 +2001,6 @@ unittesting
 unittests
 unk
 unknwn
-unmark
 UNORM
 unparseable
 unregistering
@@ -2294,6 +2284,7 @@ xunit
 xutr
 XVIRTUALSCREEN
 XWalk
+xwwyzz
 xxyyzz
 yact
 YCast

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

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

.github/workflows/winget.yml

@@ -5,7 +5,7 @@ on:
     types: [published]
 
 env:
-  REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_Win10_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
+  REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
 
 jobs:
   publish:
@@ -14,7 +14,7 @@ jobs:
       - name: Publish Windows Terminal ${{ github.event.release.prerelease && 'Preview' || 'Stable' }}
         run: |
           $assets = '${{ toJSON(github.event.release.assets) }}' | ConvertFrom-Json
-          $wingetRelevantAsset = $assets | Where-Object { $_.name -like '*Win10*' } | Select-Object -First 1
+          $wingetRelevantAsset = $assets | Where-Object { $_.name -like '*.msixbundle' } | Select-Object -First 1
           $regex = [Regex]::New($env:REGEX)
           $version = $regex.Match($wingetRelevantAsset.name).Groups[1].Value
 

.vscode/settings.json

@@ -6,7 +6,7 @@
     "C_Cpp.loggingLevel": "None",
     "files.associations": {
         "xstring": "cpp",
-        "*.idl": "cpp",
+        "*.idl": "midl3",
         "array": "cpp",
         "future": "cpp",
         "istream": "cpp",
@@ -106,4 +106,4 @@
         "**/packages/**": true,
         "**/Generated Files/**": true
     }
-}
+}

NOTICE.md

@@ -276,28 +276,41 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
-## Oklab
-**Source**: [https://bottosson.github.io/posts/oklab/](https://bottosson.github.io/posts/oklab/)
+## ConEmu
+**Source**: [https://github.com/Maximus5/ConEmu](https://github.com/Maximus5/ConEmu)
 
 ### License
 
 ```
-Copyright (c) 2020 Björn Ottosson
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+BSD 3-Clause License
+
+Copyright (c) 2009-2017, Maximus5 <ConEmu.Maximus5@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ```
 
 # Microsoft Open Source

OpenConsole.sln

@@ -418,6 +418,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MidiAudio", "src\audio\midi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalStress", "src\tools\TerminalStress\TerminalStress.csproj", "{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingTests", "src\tools\RenderingTests\RenderingTests.vcxproj", "{37C995E0-2349-4154-8E77-4A52C0C7F46D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -2770,6 +2772,32 @@ Global
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x64.Build.0 = Release|Any CPU
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|ARM64.ActiveCfg = Release|ARM64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|x64.ActiveCfg = Release|x64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.AuditMode|x86.ActiveCfg = Release|Win32
+		{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
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{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
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2875,6 +2903,7 @@ Global
 		{40BD8415-DD93-4200-8D82-498DDDC08CC8} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

build/Helix/AzurePipelinesHelperScripts.ps1

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

@@ -0,0 +1,112 @@
+$scriptDirectory = $script:MyInvocation.MyCommand.Path | Split-Path -Parent
+
+# List all processes to aid debugging:
+Write-Host "All processes running:"
+Get-Process
+
+tasklist /svc
+
+# Add this test directory as an exclusion for Windows Defender
+Write-Host "Add $scriptDirectory as Exclusion Path"
+Add-MpPreference -ExclusionPath $scriptDirectory
+Write-Host "Add $($env:HELIX_CORRELATION_PAYLOAD) as Exclusion Path"
+Add-MpPreference -ExclusionPath $env:HELIX_CORRELATION_PAYLOAD
+Get-MpPreference
+Get-MpComputerStatus
+
+
+# Minimize all windows:
+$shell = New-Object -ComObject "Shell.Application"
+$shell.minimizeall()
+
+# Kill any instances of Windows Security Alert:
+$windowTitleToMatch = "*Windows Security Alert*"
+$procs = Get-Process | Where {$_.MainWindowTitle -like "*Windows Security Alert*"}
+foreach ($proc in $procs)
+{
+    Write-Host "Found process with '$windowTitleToMatch' title: $proc"
+    $proc.Kill();
+}
+
+# Kill processes by name that are known to interfere with our tests:
+$processNamesToStop = @("Microsoft.Photos", "WinStore.App", "SkypeApp", "SkypeBackgroundHost", "OneDriveSetup", "OneDrive")
+foreach($procName in $processNamesToStop)
+{
+    Write-Host "Attempting to kill $procName if it is running"
+    Stop-Process -ProcessName $procName -Verbose -ErrorAction Ignore   
+}
+Write-Host "All processes running after attempting to kill unwanted processes:"
+Get-Process
+
+tasklist /svc
+
+$platform = $env:testbuildplatform
+if(!$platform)
+{
+    $platform = "x86"
+}
+
+function UninstallApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        } 
+    }
+}
+
+function UninstallTestApps {
+    Param([string[]]$appsToUninstall)
+
+    foreach($pkgName in $appsToUninstall)
+    {
+        foreach($pkg in (Get-AppxPackage $pkgName).PackageFullName) 
+        {
+            Write-Output "Removing: $pkg" 
+            Remove-AppxPackage $pkg
+        }
+
+        # Sometimes an app can get into a state where it is no longer returned by Get-AppxPackage, but it is still present
+        # which prevents other versions of the app from being installed.
+        # To handle this, we can directly call Remove-AppxPackage against the full name of the package. However, without
+        # Get-AppxPackage to find the PackageFullName, we just have to manually construct the name.
+        $packageFullName = "$($pkgName)_1.0.0.0_$($platform)__8wekyb3d8bbwe" 
+        Write-Host "Removing $packageFullName if installed"
+        Remove-AppPackage $packageFullName -ErrorVariable appxerror -ErrorAction SilentlyContinue 
+        if($appxerror)
+        {
+            foreach($error in $appxerror)
+            {
+                # In most cases, Remove-AppPackage will fail due to the package not being found. Don't treat this as an error.
+                if(!($error.Exception.Message -match "0x80073CF1"))
+                {
+                    Write-Error $error
+                }
+            }
+        }
+        else
+        {
+            Write-Host "Successfully removed $packageFullName"
+        }
+    }
+}
+
+Write-Host "Uninstall AppX packages that are known to cause issues with our tests"
+UninstallApps("*Skype*", "*Windows.Photos*")
+
+Write-Host "Uninstall any of our test apps that may have been left over from previous test runs"
+UninstallTestApps("NugetPackageTestApp", "NugetPackageTestAppCX", "IXMPTestApp", "MUXControlsTestApp")
+
+Write-Host "Uninstall MUX Framework package that may have been left over from previous test runs"
+# We don't want to uninstall all versions of the MUX Framework package, as there may be other apps preinstalled on the system 
+# that depend on it. We only uninstall the Framework package that corresponds to the version of MUX that we are testing.
+[xml]$versionData = (Get-Content "version.props")
+$versionMajor = $versionData.GetElementsByTagName("MUXVersionMajor").'#text'
+$versionMinor = $versionData.GetElementsByTagName("MUXVersionMinor").'#text'
+UninstallApps("Microsoft.UI.Xaml.$versionMajor.$versionMinor")
+
+Get-Process

build/Helix/GenerateTestProjFile.ps1

@@ -0,0 +1,336 @@
+[CmdLetBinding()]
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$TestFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$OutputProjFile,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$JobTestSuiteName,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TaefPath,
+
+    [string]$TaefQuery
+)
+
+Class TestCollection
+{
+    [string]$Name
+    [string]$SetupMethodName
+    [string]$TeardownMethodName
+    [System.Collections.Generic.Dictionary[string, string]]$Properties
+
+    TestCollection()
+    {
+        if ($this.GetType() -eq [TestCollection])
+        {
+            throw "This class should never be instantiated directly; it should only be derived from."
+        }
+    }
+
+    TestCollection([string]$name)
+    {
+        $this.Init($name)
+    }
+
+    hidden Init([string]$name)
+    {
+        $this.Name = $name
+        $this.Properties = @{}
+    }
+}
+
+Class Test : TestCollection 
+{
+    Test([string]$name)
+    {
+        $this.Init($name)
+    }
+}
+
+Class TestClass : TestCollection
+{
+    [System.Collections.Generic.List[Test]]$Tests
+
+    TestClass([string]$name)
+    {
+        $this.Init($name)
+        $this.Tests = @{}
+    }
+}
+
+Class TestModule : TestCollection
+{
+    [System.Collections.Generic.List[TestClass]]$TestClasses
+
+    TestModule([string]$name)
+    {
+        $this.Init($name)
+        $this.TestClasses = @{}
+    }
+}
+
+function Parse-TestInfo([string]$taefOutput)
+{
+    enum LineType
+    {
+        None
+        TestModule
+        TestClass
+        Test
+        Setup
+        Teardown
+        Property
+    }
+        
+    [string]$testModuleIndentation = "        "
+    [string]$testClassIndentation = "            "
+    [string]$testIndentation = "                "
+    [string]$setupBeginning = "Setup: "
+    [string]$teardownBeginning = "Teardown: "
+    [string]$propertyBeginning = "Property["
+
+    function Get-LineType([string]$line)
+    {
+        if ($line.Contains($setupBeginning))
+        {
+            return [LineType]::Setup;
+        }
+        elseif ($line.Contains($teardownBeginning))
+        {
+            return [LineType]::Teardown;
+        }
+        elseif ($line.Contains($propertyBeginning))
+        {
+            return [LineType]::Property;
+        }
+        elseif ($line.StartsWith($testModuleIndentation) -and -not $line.StartsWith("$testModuleIndentation "))
+        {
+            return [LineType]::TestModule;
+        }
+        elseif ($line.StartsWith($testClassIndentation) -and -not $line.StartsWith("$testClassIndentation "))
+        {
+            return [LineType]::TestClass;
+        }
+        elseif ($line.StartsWith($testIndentation) -and -not $line.StartsWith("$testIndentation "))
+        {
+            return [LineType]::Test;
+        }
+        else
+        {
+            return [LineType]::None;
+        }
+    }
+
+    [string[]]$lines = $taefOutput.Split(@([Environment]::NewLine, "`n"), [StringSplitOptions]::RemoveEmptyEntries)
+    [System.Collections.Generic.List[TestModule]]$testModules = @()
+
+    [TestModule]$currentTestModule = $null
+    [TestClass]$currentTestClass = $null
+    [Test]$currentTest = $null
+
+    [TestCollection]$lastTestCollection = $null
+
+    foreach ($rawLine in $lines)
+    {
+        [LineType]$lineType = (Get-LineType $rawLine)
+
+        # We don't need the whitespace around the line anymore, so we'll discard it to make things easier.
+        [string]$line = $rawLine.Trim()
+
+        if ($lineType -eq [LineType]::TestModule)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            if ($currentTestModule -ne $null)
+            {
+                $testModules.Add($currentTestModule)
+            }
+
+            $currentTestModule = [TestModule]::new($line)
+            $currentTestClass = $null
+            $currentTest = $null
+            $lastTestCollection = $currentTestModule
+        }
+        elseif ($lineType -eq [LineType]::TestClass)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+            {
+                $currentTestModule.TestClasses.Add($currentTestClass)
+            }
+
+            $currentTestClass = [TestClass]::new($line)
+            $currentTest = $null
+            $lastTestCollection = $currentTestClass
+        }
+        elseif ($lineType -eq [LineType]::Test)
+        {
+            if ($currentTest -ne $null -and $currentTestClass -ne $null)
+            {
+                $currentTestClass.Tests.Add($currentTest)
+            }
+
+            $currentTest = [Test]::new($line)
+            $lastTestCollection = $currentTest
+        }
+        elseif ($lineType -eq [LineType]::Setup)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.SetupMethodName = $line.Replace($setupBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Teardown)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                $lastTestCollection.TeardownMethodName = $line.Replace($teardownBeginning, "")
+            }
+        }
+        elseif ($lineType -eq [LineType]::Property)
+        {
+            if ($lastTestCollection -ne $null)
+            {
+                foreach ($match in [Regex]::Matches($line, "Property\[(.*)\]\s+=\s+(.*)"))
+                {
+                    [string]$propertyKey = $match.Groups[1].Value;
+                    [string]$propertyValue = $match.Groups[2].Value;
+                    $lastTestCollection.Properties.Add($propertyKey, $propertyValue);
+                }
+            }
+        }
+    }
+
+    if ($currentTest -ne $null -and $currentTestClass -ne $null)
+    {
+        $currentTestClass.Tests.Add($currentTest)
+    }
+
+    if ($currentTestClass -ne $null -and $currentTestModule -ne $null)
+    {
+        $currentTestModule.TestClasses.Add($currentTestClass)
+    }
+
+    if ($currentTestModule -ne $null)
+    {
+        $testModules.Add($currentTestModule)
+    }
+
+    return $testModules
+}
+
+Write-Verbose "TaefQuery = $TaefQuery"
+
+$TaefSelectQuery = ""
+$TaefQueryToAppend = ""
+if($TaefQuery)
+{
+    $TaefSelectQuery = "/select:`"$TaefQuery`""
+    $TaefQueryToAppend = " and $TaefQuery"
+}
+Write-Verbose "TaefSelectQuery = $TaefSelectQuery"
+
+
+$taefExe = "$TaefPath\te.exe"
+[string]$taefOutput = & "$taefExe" /listproperties $TaefSelectQuery $TestFile | Out-String
+
+[System.Collections.Generic.List[TestModule]]$testModules = (Parse-TestInfo $taefOutput)
+
+$projFileContent = @"
+<Project>
+  <ItemGroup>
+"@
+
+foreach ($testModule in $testModules)
+{
+    foreach ($testClass in $testModules.TestClasses)
+    {
+        Write-Host "Generating Helix work item for test class $($testClass.Name)..."
+        [System.Collections.Generic.List[string]]$testSuiteNames = @()
+        
+        $testSuiteExists = $false
+        $suitelessTestExists = $false
+
+        foreach ($test in $testClass.Tests)
+        {
+            # A test method inherits its 'TestSuite' property from its TestClass
+            if (!$test.Properties.ContainsKey("TestSuite") -and $testClass.Properties.ContainsKey("TestSuite"))
+            {
+                $test.Properties["TestSuite"] = $testClass.Properties["TestSuite"]
+            }
+
+            if ($test.Properties.ContainsKey("TestSuite"))
+            {
+                [string]$testSuite = $test.Properties["TestSuite"]
+
+                if (-not $testSuiteNames.Contains($testSuite))
+                {
+                    Write-Host "    Found test suite $testSuite. Generating Helix work item for it as well."
+                    $testSuiteNames.Add($testSuite)
+                }
+
+                $testSuiteExists = $true
+            }
+            else
+            {
+                $suitelessTestExists = $true
+            }
+        }
+        
+        $testClassSelectPattern = "$($testClass.Name).*"
+        if($testClass.Name.Contains("::"))
+        {
+            $testClassSelectPattern = "$($testClass.Name)::*"
+        }
+        $testNameQuery= "(@Name='$testClassSelectPattern')"
+
+        $workItemName = $testClass.Name
+        # Native tests use '::' as a separator, which is not valid for workItem names.
+        $workItemName = $workItemName -replace "::", "-"
+        
+        if ($suitelessTestExists)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*'$(if ($testSuiteExists) { "and not @TestSuite='*'" }))$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+        
+        foreach ($testSuiteName in $testSuiteNames)
+        {
+            $projFileContent += @"
+
+    <HelixWorkItem Include="$($workItemName)-$testSuiteName" Condition="'`$(TestSuite)'=='$($JobTestSuiteName)'">
+      <Timeout>00:30:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /select:"(@Name='$($testClass.Name)*' and @TestSuite='$testSuiteName')$($TaefQueryToAppend)"</Command>
+    </HelixWorkItem>
+"@
+        }
+    }
+}
+
+$projFileContent += @"
+
+  </ItemGroup>
+</Project>
+"@
+
+Set-Content $OutputProjFile $projFileContent -NoNewline -Encoding UTF8

build/Helix/InstallTestAppDependencies.ps1

@@ -0,0 +1,12 @@
+# Displaying progress is unnecessary and is just distracting.
+$ProgressPreference = "SilentlyContinue"
+
+$dependencyFiles = Get-ChildItem -Filter "*Microsoft.VCLibs.*.appx"
+
+foreach ($file in $dependencyFiles)
+{
+    Write-Host "Adding dependency $($file)..."
+
+    Add-AppxPackage $file
+    
+}

build/Helix/OutputFailedTestQuery.ps1

@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath
+)
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+[HelixTestHelpers.FailedTestDetector]::OutputFailedTestQuery($WttInputPath)

build/Helix/OutputSubResultsJsonFiles.ps1

@@ -0,0 +1,32 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [string]$WttInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttSingleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$WttMultipleRerunInputPath,
+
+    [Parameter(Mandatory = $true)] 
+    [string]$TestNamePrefix
+)
+
+# Ideally these would be passed as parameters to the script. However ps makes it difficult to deal with string literals containing '&', so we just 
+# read the values directly from the environment variables
+$helixResultsContainerUri = $Env:HELIX_RESULTS_CONTAINER_URI
+$helixResultsContainerRsas = $Env:HELIX_RESULTS_CONTAINER_RSAS
+
+Add-Type -Language CSharp -ReferencedAssemblies System.Xml,System.Xml.Linq,System.Runtime.Serialization,System.Runtime.Serialization.Json (Get-Content $PSScriptRoot\HelixTestHelpers.cs -Raw)
+
+$testResultParser = [HelixTestHelpers.TestResultParser]::new($TestNamePrefix, $helixResultsContainerUri, $helixResultsContainerRsas)
+[System.Collections.Generic.Dictionary[string, string]]$subResultsJsonByMethodName = $testResultParser.GetSubResultsJsonByMethodName($WttInputPath, $WttSingleRerunInputPath, $WttMultipleRerunInputPath)
+
+$subResultsJsonDirectory = [System.IO.Path]::GetDirectoryName($WttInputPath)
+
+foreach ($methodName in $subResultsJsonByMethodName.Keys)
+{
+    $subResultsJson = $subResultsJsonByMethodName[$methodName]
+    $subResultsJsonPath = [System.IO.Path]::Combine($subResultsJsonDirectory, $methodName + "_subresults.json")
+    Out-File $subResultsJsonPath -Encoding utf8 -InputObject $subResultsJson
+}

build/Helix/OutputTestResults.ps1

@@ -0,0 +1,131 @@
+Param(
+    [Parameter(Mandatory = $true)] 
+    [int]$MinimumExpectedTestsExecutedCount,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN,
+    [string]$CollectionUri = $env:SYSTEM_COLLECTIONURI,
+    [string]$TeamProject = $env:SYSTEM_TEAMPROJECT,
+    [string]$BuildUri = $env:BUILD_BUILDURI,
+    [bool]$CheckJobAttempt
+)
+
+$azureDevOpsRestApiHeaders = @{
+    "Accept"="application/json"
+    "Authorization"="Basic $([System.Convert]::ToBase64String([System.Text.ASCIIEncoding]::ASCII.GetBytes(":$AccessToken")))"
+}
+
+. "$PSScriptRoot/AzurePipelinesHelperScripts.ps1"
+
+Write-Host "Checking test results..."
+
+$queryUri = GetQueryTestRunsUri -CollectionUri $CollectionUri -TeamProject $TeamProject -BuildUri $BuildUri -IncludeRunDetails
+Write-Host "queryUri = $queryUri"
+
+$testRuns = Invoke-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

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

build/Helix/ProcessHelixFiles.ps1

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

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

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

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

build/Helix/packages.config

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

@@ -0,0 +1,32 @@
+This directory contains code and configuration files to run WinUI tests in Helix.
+
+Helix is a cloud hosted test execution environment which is accessed via the Arcade SDK.
+More details:
+* [Arcade](https://github.com/dotnet/arcade)
+* [Helix](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk)
+
+WinUI tests are scheduled in Helix by the Azure DevOps Pipeline: [RunHelixTests.yml](../RunHelixTests.yml).
+
+The workflow is as follows:
+1. NuGet Restore is called on the packages.config in this directory. This downloads any runtime dependencies 
+that are needed to run tests.
+2. PrepareHelixPayload.ps1 is called. This copies the necessary files from various locations into a Helix 
+payload directory. This directory is what will get sent to the Helix machines.
+3. RunTestsInHelix.proj is executed. This proj has a dependency on 
+[Microsoft.DotNet.Helix.Sdk](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk) 
+which it uses to publish the Helix payload directory and to schedule the Helix Work Items. The WinUI tests 
+are parallelized into multiple Helix Work Items.
+4. Each Helix Work Item calls [runtests.cmd](runtests.cmd) with a specific query to pass to 
+[TAEF](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) which runs the tests.
+5. If a test is detected to have failed, we run it again, first once, then eight more times if it fails again.
+If it fails all ten times, we report the test as failed; otherwise, we report it as unreliable,
+which will show up as a warning, but which will not fail the build.  When a test is reported as unreliable,
+we include the results for each individual run via a JSON string in the original test's errorMessage field.
+6. TAEF produces logs in WTT format. Helix is able to process logs in XUnit format. We run 
+[ConvertWttLogToXUnit.ps1](ConvertWttLogToXUnit.ps1) to convert the logs into the necessary format.
+7. RunTestsInHelix.proj has EnableAzurePipelinesReporter set to true. This allows the XUnit formatted test 
+results to be reported back to the Azure DevOps Pipeline.
+8. We process unreliable tests once all tests have been reported by reading the JSON string from the
+errorMessage field and calling the Azure DevOps REST API to modify the unreliable tests to have sub-results
+added to the test and to mark the test as "warning", which will enable people to see exactly how the test
+failed in runs where it did.

build/Helix/runtests.cmd

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

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

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

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

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

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

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

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

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

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

build/config/tsa.json

@@ -1,6 +0,0 @@
-{
-    "instanceUrl": "https://microsoft.visualstudio.com",
-    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\Terminal",
-    "notificationAliases": ["condev@microsoft.com", "duhowett@microsoft.com"]
-}

build/pgo/PGO.DB.proj

@@ -1,5 +1,4 @@
 <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,6 +12,5 @@
   <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>release-1.17</PGOBranch>
+    <PGOBranch>main</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
@@ -46,5 +46,6 @@
     <PGOCopyRuntime Condition="'$(PGOBuildMode)' == 'Instrument'">true</PGOCopyRuntime>
   </PropertyGroup>
 
-  <!-- Do not import PGO-Helpers props here, as it is too early to detect the C++ tools directory -->
+  <!-- Import PGO-Helpers -->
+  <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.props" />
 </Project>

build/pipelines/ci.yml

@@ -29,80 +29,76 @@ variables:
 #     0.0.1904.0900
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
 
-parameters:
-  - name: auditMode
-    displayName: "Build in Audit Mode (x64)"
-    type: boolean
-    default: true
-  - name: runTests
-    displayName: "Run Tests"
-    type: boolean
-    default: true
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-
 stages:
-  - ${{ if eq(parameters.auditMode, true) }}:
-    - stage: Audit_x64
-      displayName: Audit Mode
-      dependsOn: []
-      jobs:
-        - template: ./templates-v2/job-build-project.yml
-          parameters:
-            pool:
-              ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-OSS-L
-              ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-                name: SHINE-INT-L
-            buildPlatforms: [x64]
-            buildConfigurations: [AuditMode]
-            buildEverything: true
-            keepAllExpensiveBuildOutputs: false
+  - stage: Audit_x64
+    displayName: Audit Mode
+    dependsOn: []
+    condition: succeeded()
+    jobs:
+      - template: ./templates/build-console-audit-job.yml
+        parameters:
+          platform: x64
 
-  - stage: CodeHealth
-    displayName: Code Health
+  - stage: Build_x64
+    displayName: Build x64
+    dependsOn: []
+    condition: succeeded()
+    jobs:
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: x64
+  - stage: Build_x86
+    displayName: Build x86
     dependsOn: []
     jobs:
-      - template: ./templates-v2/job-check-code-format.yml
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: x86
+  - stage: Build_ARM64
+    displayName: Build ARM64
+    dependsOn: []
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
+    jobs:
+      - template: ./templates/build-console-ci.yml
+        parameters:
+          platform: ARM64
 
-  - ${{ 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: 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
 
-    - ${{ 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: 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 ne(variables['Build.Reason'], 'PullRequest') }}:
-    - stage: CodeIndexer
-      displayName: Github CodeNav Indexer
-      dependsOn: []
-      jobs:
-        - template: ./templates-v2/job-index-github-codenav.yml
+  - 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

build/pipelines/daily-loc-submission.yml

@@ -27,7 +27,6 @@ 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,7 +7,6 @@ pr:
   paths:
     include:
       - src/features.xml
-      - build/pipelines/feature-flag-ci.yml
 
 variables:
   - name: runCodesignValidationInjectionBG
@@ -22,19 +21,9 @@ parameters:
       # Dev is built automatically
       # WindowsInbox does not typically build with VS.
 
-stages:
+jobs:
   - ${{ each branding in parameters.buildBrandings }}:
-    - stage: Build_${{ branding }}
-      dependsOn: []
-      displayName: Build ${{ branding }}
-      jobs:
-        - template: ./templates-v2/job-build-project.yml
-          parameters:
-            pool: # This only runs in CI
-                name: SHINE-OSS-L
-            buildPlatforms: [x64]
-            buildConfigurations: [Release]
-            buildEverything: true
-            branding: ${{ branding }}
-            keepAllExpensiveBuildOutputs: false
-            artifactStem: -${{ branding }} # Disambiguate artifacts with the same config/platform
+    - template: ./templates/build-console-ci.yml
+      parameters:
+        platform: x64
+        branding: ${{ branding }}

build/pipelines/fuzz.yml

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

build/pipelines/nightly.yml

@@ -1,23 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-extends:
-  template: templates-v2\pipeline-full-release-build.yml
-  parameters:
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    generateSbom: true
-    publishSymbolsToPublic: true
-    publishVpackToWindows: false
-    symbolExpiryTime: 15 # Nightly builds do not keep symbols for very long!

build/pipelines/ob-nightly.yml

@@ -1,49 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-parameters:
-  - name: publishToAzure
-    displayName: "Deploy to **PUBLIC** Azure Storage"
-    type: boolean
-    default: true
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: Canary
-  - template: templates-v2/variables-onebranch-config.yml
-
-extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
-  parameters:
-    official: true
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    publishSymbolsToPublic: true
-    publishVpackToWindows: false
-    symbolExpiryTime: 15
-    ${{ if eq(true, parameters.publishToAzure) }}:
-      extraPublishJobs:
-        - template: job-deploy-to-azure-storage.yml
-          parameters:
-            pool: { type: windows }
-            dependsOn: [PublishSymbols]
-            storagePublicRootURL: $(AppInstallerRootURL)
-            subscription: $(AzureSubscriptionName)
-            storageAccount: $(AzureStorageAccount)
-            storageContainer: $(AzureStorageContainer)
-            buildConfiguration: Release
-            buildPlatforms: [x64, x86, arm64]
-            environment: production-canary
-

build/pipelines/ob-release.yml

@@ -1,83 +0,0 @@
-trigger: none
-pr: none
-
-# Expose all of these parameters for user configuration.
-parameters:
-  - name: branding
-    displayName: "Branding (Build Type)"
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    displayName: "Build Windows Terminal MSIX"
-    type: boolean
-    default: true
-  - name: buildConPTY
-    displayName: "Build ConPTY NuGet"
-    type: boolean
-    default: false
-  - name: buildWPF
-    displayName: "Build Terminal WPF Control"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    displayName: "PGO Build Mode"
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    displayName: "Build Configurations"
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    displayName: "Build Platforms"
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: terminalInternalPackageVersion
-    displayName: "Terminal Internal Package Version"
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    displayName: "Publish VPack to Windows"
-    type: boolean
-    default: false
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
-  - template: templates-v2/variables-onebranch-config.yml
-
-extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
-  parameters:
-    official: true
-    branding: ${{ parameters.branding }}
-    buildTerminal: ${{ parameters.buildTerminal }}
-    buildConPTY: ${{ parameters.buildConPTY }}
-    buildWPF: ${{ parameters.buildWPF }}
-    pgoBuildMode: ${{ parameters.pgoBuildMode }}
-    buildConfigurations: ${{ parameters.buildConfigurations }}
-    buildPlatforms: ${{ parameters.buildPlatforms }}
-    codeSign: true
-    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
-    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
-    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

build/pipelines/pgo.yml

@@ -1,27 +1,5 @@
 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
@@ -32,57 +10,18 @@ variables:
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
 
 stages:
-  - stage: Build
-    displayName: Build
+  - stage: Build_x64
+    displayName: Build x64
     dependsOn: []
     condition: succeeded()
     jobs:
-      - template: ./templates-v2/job-build-project.yml
+      - template: ./templates/build-console-pgo.yml
         parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-OSS-L
-            ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-              name: SHINE-INT-L
-          branding: ${{ parameters.branding }}
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          buildConfigurations: [Release]
-          buildEverything: true
-          pgoBuildMode: Instrument
-          artifactStem: -instrumentation
-
-  - stage: RunPGO
-    displayName: Run PGO
-    dependsOn: [Build]
-    condition: succeeded()
+          platform: x64
+  - stage: Publish_PGO_Databases
+    displayName: Publish PGO databases
+    dependsOn: ['Build_x64']
     jobs:
-      - ${{ each platform in parameters.buildPlatforms }}:
-        - template: ./templates-v2/job-run-pgo-tests.yml
-          parameters:
-            # This job chooses its own pools based on platform
-            buildPlatform: ${{ platform }}
-            buildConfiguration: Release
-            artifactStem: -instrumentation
-
-  - stage: FinalizePGO
-    displayName: Finalize PGO and Publish
-    dependsOn: [RunPGO]
-    condition: succeeded()
-    jobs:
-      # This job takes multiple platforms and fans them back in to a single artifact.
-      - template: ./templates-v2/job-pgo-merge-pgd.yml
+      - template: ./templates/pgo-build-and-publish-nuget-job.yml
         parameters:
-          jobName: MergePGD
-          pool:
-            vmImage: 'windows-2022'
-          buildConfiguration: Release
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          artifactStem: -instrumentation
-
-      - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
-        parameters:
-          pool:
-            vmImage: 'windows-2022'
-          dependsOn: MergePGD
-          buildConfiguration: Release
-          artifactStem: -instrumentation
+          pgoArtifact: 'PGO'

build/pipelines/release.yml

@@ -1,7 +1,11 @@
+# This build should never run as CI or against a pull request.
 trigger: none
 pr: none
 
-# Expose all of these parameters for user configuration.
+pool:
+  name: WinDevPool-L
+  demands: ImageOverride -equals WinDevVS17-latest
+
 parameters:
   - name: branding
     displayName: "Branding (Build Type)"
@@ -10,11 +14,22 @@ 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
@@ -32,57 +47,682 @@ 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'
 
-  - name: runCompliance
-    displayName: "Run Compliance and Security Build"
-    type: boolean
-    default: true
-  - name: publishSymbolsToPublic
-    displayName: "Publish Symbols to MSDL"
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    displayName: "Publish VPack to Windows"
-    type: boolean
-    default: false
+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: $(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)"
 
-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 }}
+        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
+    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      displayName: 'Generate SBOM manifest'
+      inputs:
+       BuildDropPath: '$(System.ArtifactsDirectory)/appx'
+
+    - pwsh: |-
+        $Package = (Get-ChildItem "$(Build.ArtifactStagingDirectory)/appx" -Recurse -Filter "Cascadia*.msix" | Select -First 1)
+        $PackageFilename = $Package.FullName
+        Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
+        & "$(MakeAppxPath)" unpack /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
+      displayName: Unpack the new Terminal package for signing
+
+    - task: EsrpCodeSigning@1
+      displayName: Submit Terminal's binaries for signing
+      inputs:
+        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
+        FolderPath: '$(Build.SourcesDirectory)\UnpackedTerminalPackage'
+        signType: batchSigning
+        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_Terminal.json'
+
+    - pwsh: |-
+        $PackageFilename = "$(WindowsTerminalPackagePath)"
+        Remove-Item "$(Build.SourcesDirectory)\UnpackedTerminalPackage\CodeSignSummary*"
+        & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(Build.SourcesDirectory)\UnpackedTerminalPackage"
+      displayName: Re-pack the new Terminal package after signing
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (appx)
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
+        ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)
+
+    - pwsh: |-
+        $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
+        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination "$(Build.ArtifactStagingDirectory)/unpackaged"
+      displayName: Build Unpackaged Distribution
+
+    - publish: $(Build.ArtifactStagingDirectory)/unpackaged
+      artifact: unpackaged-$(BuildPlatform)-$(BuildConfiguration)
+      displayName: Publish Artifact (unpackaged)
+
+  - ${{ if eq(parameters.buildConPTY, true) }}:
+    - task: CopyFiles@2
+      displayName: Copy ConPTY to Artifacts
+      inputs:
+        Contents: |-
+          $(Build.SourcesDirectory)/bin/**/conpty.dll
+          $(Build.SourcesDirectory)/bin/**/conpty.lib
+          $(Build.SourcesDirectory)/bin/**/conpty.pdb
+          $(Build.SourcesDirectory)/bin/**/OpenConsole.exe
+          $(Build.SourcesDirectory)/bin/**/OpenConsole.pdb
+        TargetFolder: $(Build.ArtifactStagingDirectory)/conpty
+        OverWrite: true
+        flattenFolders: true
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (ConPTY)
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)/conpty
+        ArtifactName: conpty-dll-$(BuildPlatform)-$(BuildConfiguration)
+  - ${{ if eq(parameters.buildWPF, true) }}:
+    - task: CopyFiles@2
+      displayName: Copy PublicTerminalCore.dll to Artifacts
+      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@0
+        displayName: Download Artifacts ${{ platform }}
+        inputs:
+          artifactName: appx-${{ platform }}-Release
+    # Add 3000 to the major version component, but only for the bundle.
+    # This is to ensure that it is newer than "2022.xx.yy.zz" or whatever the original bundle versions were before
+    # we switched to uniform naming.
+    - pwsh: |-
+        $VersionEpoch = 3000
+        $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
+        $Components[0] = ([int]$Components[0] + $VersionEpoch)
+        $BundleVersion = $Components -Join "."
+        New-Item -Type Directory "$(System.ArtifactsDirectory)\bundle"
+        .\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
+      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: 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@0
+        displayName: Download ${{ platform }} ConPTY binaries
+        inputs:
+          artifactName: conpty-dll-${{ platform }}-$(BuildConfiguration)
+          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
+          extractTars: false
+    - task: PowerShell@2
+      displayName: Move downloaded artifacts around
+      inputs:
+        targetType: inline
+        # Find all artifact files and move them up a directory. Ugh.
+        script: |-
+          Get-ChildItem bin -Recurse -Directory -Filter conpty-dll-* | % {
+            $_ | Get-ChildItem -Recurse -File | % {
+              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
+            }
+          }
+          Move-Item bin\x86 bin\Win32
+
+    - task: EsrpCodeSigning@1
+      displayName: Submit ConPTY libraries and OpenConsole for code signing
+      inputs:
+        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
+        FolderPath: '$(Build.SourcesDirectory)/bin'
+        signType: batchSigning
+        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_ConPTY.json'
+
+    - task: NuGetToolInstaller@1
+      displayName: Use NuGet 5.10.0
+      inputs:
+        versionSpec: 5.10.0
+    - task: NuGetCommand@2
+      displayName: NuGet pack
+      inputs:
+        command: pack
+        packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
+        packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
+        versioningScheme: byEnvVar
+        versionEnvVar: XES_PACKAGEVERSIONNUMBER
+    - task: EsrpCodeSigning@1
+      displayName: Submit *.nupkg to ESRP for code signing
+      inputs:
+        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
+        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
+        Pattern: '*.nupkg'
+        UseMinimatch: true
+        signConfigType: inlineSignParams
+        inlineOperation: >-
+          [
+              {
+                  "KeyCode": "CP-401405",
+                  "OperationCode": "NuGetSign",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              },
+              {
+                  "KeyCode": "CP-401405",
+                  "OperationCode": "NuGetVerify",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              }
+          ]
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (nupkg)
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
+        ArtifactName: conpty-nupkg-$(BuildConfiguration)
+
+
+- ${{ if eq(parameters.buildWPF, true) }}:
+  - job: PackageAndSignWPF
+    strategy:
+      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@0
+        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 appx-PLATFORM-CONFIG-VERSION artifact for every platform/version combo
+    - ${{ each platform in parameters.buildPlatforms }}:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Symbols ${{ platform }}
+        inputs:
+          artifactName: appx-${{ platform }}-Release
+
+    # It seems easier to do this -- download every appxsym -- then enumerate all the PDBs in the build directory for the
+    # public symbol push. Otherwise, we would have to list all of the PDB files one by one.
+    - pwsh: |-
+        mkdir $(Build.SourcesDirectory)/appxsym-temp
+        Get-ChildItem "$(System.ArtifactsDirectory)" -Filter *.appxsym -Recurse | % {
+          $src = $_.FullName
+          $dest = Join-Path "$(Build.SourcesDirectory)/appxsym-temp/" $_.Name
+
+          mkdir $dest
+          Write-Host "Extracting $src to $dest..."
+          tar -x -v -f $src -C $dest
+        }
+      displayName: Extract symbols for public consumption
+
+    - task: PowerShell@2
+      displayName: Source Index PDBs (the public ones)
+      inputs:
+        filePath: build\scripts\Index-Pdbs.ps1
+        arguments: -SearchDir '$(Build.SourcesDirectory)/appxsym-temp' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
+        pwsh: true
+
+    # Publish the app symbols to the public MSDL symbol server
+    # accessible via https://msdl.microsoft.com/download/symbols
+    - task: PublishSymbols@2
+      displayName: 'Publish app symbols to MSDL'
+      inputs:
+        symbolsFolder: '$(Build.SourcesDirectory)/appxsym-temp'
+        searchPattern: '**/*.pdb'
+        SymbolsMaximumWaitTime: 30
+        SymbolServerType: 'TeamServices'
+        SymbolsProduct: 'Windows Terminal Application Binaries'
+        SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
+        # The ADO task does not support indexing of GitHub sources.
+        indexSources: false
+        detailedLog: true
+      # There is a bug which causes this task to fail if LIB includes an inaccessible path (even though it does not depend on it).
+      # To work around this issue, we just force LIB to be any dir that we know exists.
+      # Copied from https://github.com/microsoft/icu/blob/f869c214adc87415dfe751d81f42f1bca55dcf5f/build/azure-nuget.yml#L564-L583
+      env:
+        LIB: $(Build.SourcesDirectory)
+        ArtifactServices_Symbol_AccountName: microsoftpublicsymbols
+        ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)
+
+
+- ${{ if eq(parameters.buildTerminalVPack, true) }}:
+  - job: VPack
+    displayName: Create Windows vPack
+    dependsOn: BundleAndSign
+    steps:
+    - checkout: self
+      clean: true
+      fetchDepth: 1
+      submodules: true
+    - task: PkgESSetupBuild@12
+      displayName: Package ES - Setup Build
+    - task: DownloadBuildArtifacts@0
+      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
+...

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

@@ -1,144 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PackWPF
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Microsoft.Terminal.Wpf
-  ${{ else }}:
-    displayName: Pack Microsoft.Terminal.Wpf
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    OutputBuildPlatform: AnyCPU
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
-    JobOutputArtifactName: wpf-nupkg-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms:
-        - ${{ parameters.buildPlatforms }}
-        - Any CPU # Make sure we grab the precompiled WPF bits
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  - template: .\steps-restore-nuget.yml
-
-  - task: VSBuild@1
-    displayName: Build solution OpenConsole.sln for WPF Control (Pack)
-    inputs:
-      solution: 'OpenConsole.sln'
-      msbuildArgs: >-
-        /p:WindowsTerminalReleaseBuild=true;Version=$(XES_PACKAGEVERSIONNUMBER)
-        /p:NoBuild=true
-        /p:IncludeSymbols=true
-        /t:Terminal\wpf\WpfTerminalControl:Pack
-      platform: Any CPU
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-      clean: false
-
-  - task: CopyFiles@2
-    displayName: Copy *.nupkg to Artifacts
-    inputs:
-      Contents: 'bin/**/*Wpf*.nupkg'
-      TargetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-      OverWrite: true
-      flattenFolders: true
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (wpf)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate wpf SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish nupkg

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

@@ -1,293 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-    default: Dev
-  - name: additionalBuildOptions
-    type: string
-    default: ''
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: buildWPFDotNetComponents # This weird hack is to make sure we sign and source index the .NET pieces
-    type: boolean
-    default: false
-  - name: buildEverything
-    displayName: "Build Everything (Overrides all other build options)"
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: None
-    values: [Optimize, Instrument, None]
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: keepAllExpensiveBuildOutputs
-    type: boolean
-    default: true
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: 'Build'
-  - name: pool
-    type: object
-    default: []
-  - name: beforeBuildSteps
-    type: stepList
-    default: []
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-  - name: removeAllNonSignedFiles
-    type: boolean
-    default: false
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ each platform in parameters.buildPlatforms }}:
-          ${{ config }}_${{ platform }}:
-            BuildConfiguration: ${{ config }}
-            BuildPlatform: ${{ platform }}
-            ${{ if eq(platform, 'x86') }}:
-              OutputBuildPlatform: Win32
-            ${{ elseif eq(platform, 'Any CPU') }}:
-              OutputBuildPlatform: AnyCPU
-            ${{ else }}:
-              OutputBuildPlatform: ${{ platform }}
-  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-    # Azure DevOps abhors a vacuum
-    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
-    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
-    # Yup.
-    BuildTargetParameter: ' '
-    SelectedSigningFragments: ' '
-    JobOutputDirectory: $(Terminal.BinDir)
-    JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  displayName: Build
-  timeoutInMinutes: 240
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-  # This generates either nothing for BuildTargetParameter, or /t:X;Y;Z, to control targets later.
-  - pwsh: |-
-      If (-Not [bool]::Parse("${{ parameters.buildEverything }}")) {
-        $BuildTargets = @()
-        $SignFragments = @()
-        If ([bool]::Parse("${{ parameters.buildTerminal }}")) {
-          $BuildTargets += "Terminal\CascadiaPackage"
-          $SignFragments += "terminal_constituents"
-        }
-        If ([bool]::Parse("${{ parameters.buildWPFDotNetComponents }}")) {
-          $BuildTargets += "Terminal\wpf\WpfTerminalControl"
-          $SignFragments += "wpfdotnet"
-        }
-        If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\wpf\PublicTerminalCore"
-          $SignFragments += "wpf"
-        }
-        If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
-          $SignFragments += "conpty"
-        }
-        Write-Host "Targets: $($BuildTargets -Join ";")"
-        Write-Host "Sign targets: $($SignFragments -Join ";")"
-        Write-Host "##vso[task.setvariable variable=BuildTargetParameter]/t:$($BuildTargets -Join ";")"
-        Write-Host "##vso[task.setvariable variable=SelectedSigningFragments]$($SignFragments -Join ";")"
-      }
-    displayName: Prepare Build and Sign Targets
-
-  - pwsh: |-
-      .\build\scripts\Generate-ThirdPartyNotices.ps1 -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
-    displayName: Generate NOTICE.html from NOTICE.md
-
-  - template: .\steps-restore-nuget.yml
-
-  - ${{ parameters.beforeBuildSteps }}
-
-  - task: VSBuild@1
-    displayName: Build OpenConsole.sln
-    inputs:
-      solution: 'OpenConsole.sln'
-      msbuildArgs: >-
-        /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }}
-        ${{ parameters.additionalBuildOptions }}
-        /bl:$(Build.SourcesDirectory)\msbuild.binlog
-        $(BuildTargetParameter)
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(Build.SourcesDirectory)/msbuild.binlog
-      artifact: logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-      condition: always()
-      displayName: Publish Build Log
-  - ${{ else }}:
-    - task: CopyFiles@2
-      displayName: Copy Build Log
-      inputs:
-        contents: $(Build.SourcesDirectory)/msbuild.binlog
-        TargetFolder: $(Terminal.BinDir)
-
-  # This saves ~2GiB per architecture. We won't need these later.
-  # Removes:
-  # - All .lib that do not have an associated .exp (which would indicate that they are import libs)
-  # - All .pdbs from those .libs (which were only used during linking)
-  # - Directories ending in Lib (static lib projects that we fully linked into DLLs which may also contain unnecessary resources)
-  # - All LocalTests_ project outputs, as they were subsumed into TestHostApp
-  # - All PDB files inside the WindowsTerminal/ output, which do not belong there.
-  # - console.dll, which apparently breaks XFGCheck? lol.
-  - pwsh: |-
-      $binDir = '$(Terminal.BinDir)'
-      $ImportLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.exp' | ForEach-Object { $_.FullName -Replace "exp$","lib" }
-      $StaticLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.lib' | Where-Object FullName -NotIn $ImportLibs
-
-      $Items = @()
-      $Items += $StaticLibs
-      $Items += Get-Item ($StaticLibs.FullName -Replace "lib$","pdb") -ErrorAction:Ignore
-      $Items += Get-ChildItem $binDir -Directory -Filter '*Lib'
-      $Items += Get-ChildItem $binDir -Directory -Filter 'LocalTests_*'
-      $Items += Get-ChildItem "${$binDir}\WindowsTerminal" -Filter '*.pdb' -ErrorAction:Ignore
-
-      If (-Not [bool]::Parse('${{ parameters.keepAllExpensiveBuildOutputs }}')) {
-        $Items += Get-ChildItem '$(Terminal.BinDir)' -Filter '*.pdb' -Recurse
-      }
-
-      $Items += Get-ChildItem $binDir -Filter 'console.dll'
-
-      $Items | Remove-Item -Recurse -Force -Verbose -ErrorAction:Ignore
-    displayName: Clean up static libs and extra symbols
-    errorActionPreference: silentlyContinue # It's OK if this silently fails
-
-  # We cannot index PDBs that we have deleted!
-  - ${{ if eq(parameters.keepAllExpensiveBuildOutputs, true) }}:
-    - pwsh: |-
-        build\scripts\Index-Pdbs.ps1 -SearchDir '$(Terminal.BinDir)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
-      displayName: Source Index PDBs
-      errorActionPreference: silentlyContinue
-
-  - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-    - pwsh: |-
-        $Package = (Get-ChildItem -Recurse -Filter "CascadiaPackage*.msix" | Select -First 1)
-        $PackageFilename = $Package.FullName
-        Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-      displayName: Locate the MSIX
-
-    # CHECK EXCEPTION
-    # PGO requires a desktop CRT
-    - ${{ if ne(parameters.pgoBuildMode, 'Instrument') }}:
-      - pwsh: |-
-          .\build\scripts\Test-WindowsTerminalPackage.ps1 -Verbose -Path "$(WindowsTerminalPackagePath)"
-        displayName: Check MSIX for common regressions
-        condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-      
-    - ${{ if eq(parameters.codeSign, true) }}:
-      - pwsh: |-
-          & "$(MakeAppxPath)" unpack /p "$(WindowsTerminalPackagePath)" /d "$(Terminal.BinDir)/PackageContents"
-        displayName: Unpack the MSIX for signing
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-create-signing-config.yml
-      parameters:
-        outFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
-        stage: build
-        fragments: $(SelectedSigningFragments)
-
-    # Code-sign everything we just put together.
-    # We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder.
-    - task: EsrpCodeSigning@3
-      displayName: Submit Signing Request
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: '$(Terminal.BinDir)'
-        signType: batchSigning
-        batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
-
-    # We only need to re-pack the MSIX if we actually signed, so this can stay in the codeSign conditional
-    - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-      - pwsh: |-
-          $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_appx" -ErrorAction:Ignore
-          $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(WindowsTerminalPackagePath)")
-          & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(Terminal.BinDir)/PackageContents"
-          Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        displayName: Re-pack the new Terminal package after signing
-
-    # Some of our governed pipelines explicitly fail builds that have *any* non-codesigned filed (!)
-    - ${{ if eq(parameters.removeAllNonSignedFiles, true) }}:
-      - pwsh: |-
-          Get-ChildItem "$(Terminal.BinDir)" -Recurse -Include "*.dll","*.exe" |
-            Where-Object { (Get-AuthenticodeSignature $_).Status -Ne "Valid" } |
-            Remove-Item -Verbose -Force
-        displayName: Remove all non-signed output files
-
-  - ${{ else }}: # No Signing
-    - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-      - pwsh: |-
-          $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_appx" -ErrorAction:Ignore
-          $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(WindowsTerminalPackagePath)")
-          Copy-Item "$(WindowsTerminalPackagePath)" $PackageFilename
-          Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
-        displayName: Stage the package (unsigned)
-        condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-
-  - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
-    - pwsh: |-
-        $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
-        $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_unpackaged" -ErrorAction:Ignore
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
-      displayName: Build Unpackaged Distribution (from MSIX)
-      condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest'
-      inputs:
-        BuildDropPath: '$(Terminal.BinDir)'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate SBOM manifest'
-      inputs:
-        BuildDropPath: '$(Terminal.BinDir)'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(Terminal.BinDir)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish All Outputs

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

@@ -1,15 +0,0 @@
-jobs:
-- job: CodeFormatCheck
-  displayName: Check Code Format
-  pool: { vmImage: windows-2022 }
-
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: false
-    clean: true
-
-  - powershell: |-
-      .\build\scripts\Invoke-FormattingCheck.ps1
-    displayName: 'Run formatters'

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

@@ -1,150 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: Bundle
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-  - name: afterBuildSteps
-    type: stepList
-    default: []
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Terminal MSIXBundle
-  ${{ else }}:
-    displayName: Pack Terminal MSIXBundle
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  variables:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      BundleStemName: Microsoft.WindowsTerminal
-    ${{ elseif eq(parameters.branding, 'Preview') }}:
-      BundleStemName: Microsoft.WindowsTerminalPreview
-    ${{ else }}:
-      BundleStemName: WindowsTerminalDev
-    JobOutputDirectory: '$(System.ArtifactsDirectory)/bundle'
-    JobOutputArtifactName: appxbundle-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  dependsOn: ${{ parameters.dependsOn }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms: ${{ parameters.buildPlatforms }}
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  # Add 3000 to the major version component, but only for the bundle.
-  # This is to ensure that it is newer than "2022.xx.yy.zz" or whatever the original bundle versions were before
-  # we switched to uniform naming.
-  - pwsh: |-
-      $VersionEpoch = 3000
-      $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
-      $Components[0] = ([int]$Components[0] + $VersionEpoch)
-      $BundleVersion = $Components -Join "."
-      New-Item -Type Directory "$(System.ArtifactsDirectory)/bundle"
-      $BundlePath = "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-      .\build\scripts\Create-AppxBundle.ps1 -InputPath 'bin/' -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath $BundlePath
-      Write-Host "##vso[task.setvariable variable=MsixBundlePath]${BundlePath}"
-    displayName: Create msixbundle
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      displayName: Submit *.msixbundle to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(System.ArtifactsDirectory)\bundle
-        Pattern: $(BundleStemName)*.msixbundle
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolSign",
-                  "Parameters": {
-                      "OpusName": "Microsoft",
-                      "OpusInfo": "http://www.microsoft.com",
-                      "FileDigest": "/fd \"SHA256\"",
-                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  },
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "Dynamic",
-                  "CertTemplateName": "WINMSAPP1ST",
-                  "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
-                  "OperationCode": "SigntoolVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (bundle)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate bundle SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/bundle'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ parameters.afterBuildSteps }}
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish msixbundle

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

@@ -1,129 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PackConPTY
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.codeSign, true) }}:
-    displayName: Pack and Sign Microsoft.Windows.Console.ConPTY
-  ${{ else }}:
-    displayName: Pack Microsoft.Windows.Console.ConPTY
-  strategy:
-    matrix:
-      ${{ each config in parameters.buildConfigurations }}:
-        ${{ config }}:
-          BuildConfiguration: ${{ config }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
-    JobOutputArtifactName: conpty-nupkg-$(BuildConfiguration)${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - template: steps-download-bin-dir-artifact.yml
-    parameters:
-      buildPlatforms: ${{ parameters.buildPlatforms }}
-      # This build is already matrix'd on configuration, so
-      # just pass a single config into the download template.
-      buildConfigurations:
-        - $(BuildConfiguration)
-      artifactStem: ${{ parameters.artifactStem }}
-
-  - template: steps-ensure-nuget-version.yml
-
-# In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
-# This should be `task: NuGetCommand@2`
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: NuGet pack
-    inputs:
-      command: pack
-      packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
-      packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
-      versioningScheme: byEnvVar
-      versionEnvVar: XES_PACKAGEVERSIONNUMBER
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
-      displayName: Submit *.nupkg to ESRP for code signing
-      inputs:
-        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
-        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-        Pattern: '*.nupkg'
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: >-
-          [
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetSign",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-401405",
-                  "OperationCode": "NuGetVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]
-
-  - ${{ if eq(parameters.generateSbom, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: 'Generate SBOM manifest (conpty)'
-      inputs:
-       BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-       BuildComponentPath: '$(Build.SourcesDirectory)/bin'
-
-    - task: DropValidatorTask@0
-      displayName: 'Validate conpty SBOM manifest'
-      inputs:
-        BuildDropPath: '$(System.ArtifactsDirectory)/nupkg'
-        OutputPath: 'output.json'
-        ValidateSignature: true
-        Verbosity: 'Verbose'
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish nupkg

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

@@ -1,75 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: buildPlatforms
-    type: object
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: MergePGD
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  dependsOn: ${{ parameters.dependsOn }}
-  displayName: Merge PGO Counts for ${{ parameters.buildConfiguration }}
-
-  steps:
-  # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
-  - script: |
-      "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
-      set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
-      del %TEMP%\vsinstalldir.txt
-      call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
-      echo VCToolsInstallDir = %VCToolsInstallDir%
-      echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
-    displayName: 'Retrieve VC tools directory'
-
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download PGO Databases for ${{ platform }}
-      inputs:
-        artifactName: build-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        itemPattern: '**/*.pgd'
-        downloadPath: '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-    - task: DownloadPipelineArtifact@2
-      displayName: Download PGO Counts for ${{ platform }}
-      inputs:
-        artifactName: pgc-intermediates-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        downloadPath: '$(Build.SourcesDirectory)/pgc/${{ platform }}/${{ parameters.buildConfiguration }}'
-    - pwsh: |-
-        $Arch = '${{ platform }}'
-        $Conf = '${{ parameters.buildConfiguration }}'
-        $PGCDir = '$(Build.SourcesDirectory)/pgc/${{ platform }}/${{ parameters.buildConfiguration }}'
-        $PGDDir = '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-        # Flatten the PGD directory
-        Get-ChildItem $PGDDir -Recurse -Filter *.pgd | Move-Item -Destination $PGDDir -Verbose
-        Get-ChildItem $PGCDir -Filter *.pgc |
-          ForEach-Object {
-            $Parts = $_.Name -Split "!";
-            $_ | Add-Member Module $Parts[0] -PassThru
-          } |
-          Group-Object Module |
-          ForEach-Object {
-            & "$(VCToolsInstallDir)\bin\Hostx64\${{ platform }}\pgomgr.exe" /merge $_.Group.FullName "$PGDDir\$($_.Name).pgd"
-          }
-      displayName: Merge PGO Counts for ${{ platform }}
-    - task: CopyFiles@2
-      displayName: 'Copy merged pgds to artifact staging'
-      inputs:
-        sourceFolder: '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
-        contents: '**\*.pgd'
-        targetFolder: '$(Build.ArtifactStagingDirectory)\out-pgd\${{ platform }}'
-
-  - publish: $(Build.ArtifactStagingDirectory)\out-pgd
-    artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-    displayName: "Publish merged PGDs"

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

@@ -1,97 +0,0 @@
-parameters:
-  - name: includePublicSymbolServer
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: PublishSymbols
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: variables
-    type: object
-    default: {}
-  - name: symbolPatGoesInTaskInputs
-    type: boolean
-    default: false
-
-jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  ${{ if eq(parameters.includePublicSymbolServer, true) }}:
-    displayName: Publish Symbols to Internal and MSDL
-  ${{ else }}:
-    displayName: Publish Symbols Internally
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download all PDBs from all prior build phases
-    inputs:
-      itemPattern: '**/*.pdb'
-      targetPath: '$(Build.SourcesDirectory)/bin'
-
-  - task: PublishSymbols@2
-    displayName: Publish Symbols (to current Azure DevOps tenant)
-    continueOnError: True
-    inputs:
-      SymbolsFolder: '$(Build.SourcesDirectory)/bin'
-      SearchPattern: '**/*.pdb'
-      IndexSources: false
-      DetailedLog: true
-      SymbolsMaximumWaitTime: 30
-      SymbolServerType: 'TeamServices'
-      SymbolsProduct: 'Windows Terminal Converged Symbols'
-      SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-      SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
-    env:
-      LIB: $(Build.SourcesDirectory)
-
-  - ${{ if eq(parameters.includePublicSymbolServer, true) }}:
-    - task: PublishSymbols@2
-      displayName: 'Publish symbols to MSDL'
-      continueOnError: True
-      inputs:
-        SymbolsFolder: '$(Build.SourcesDirectory)/bin'
-        SearchPattern: '**/*.pdb'
-        IndexSources: false
-        DetailedLog: true
-        SymbolsMaximumWaitTime: 30
-        SymbolServerType: 'TeamServices'
-        SymbolsProduct: 'Windows Terminal Converged Symbols'
-        SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
-        SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
-        ${{ if eq(parameters.symbolPatGoesInTaskInputs, true) }}:
-          Pat: $(ADO_microsoftpublicsymbols_PAT)
-        # The ADO task does not support indexing of GitHub sources.
-      # There is a bug which causes this task to fail if LIB includes an inaccessible path (even though it does not depend on it).
-      # To work around this issue, we just force LIB to be any dir that we know exists.
-      # Copied from https://github.com/microsoft/icu/blob/f869c214adc87415dfe751d81f42f1bca55dcf5f/build/azure-nuget.yml#L564-L583
-      env:
-        LIB: $(Build.SourcesDirectory)
-        ArtifactServices_Symbol_AccountName: microsoftpublicsymbols
-        ${{ if ne(parameters.symbolPatGoesInTaskInputs, true) }}:
-          ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)

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

@@ -1,83 +0,0 @@
-parameters:
-  buildConfiguration: 'Release'
-  buildPlatform: ''
-  artifactStem: ''
-  testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-
-jobs:
-- job: PGO${{ parameters.buildPlatform }}${{ parameters.buildConfiguration }}
-  displayName: PGO ${{ parameters.buildPlatform }} ${{ parameters.buildConfiguration }}
-  variables:
-    BuildConfiguration: ${{ parameters.buildConfiguration }}
-    BuildPlatform: ${{ parameters.buildPlatform }}
-    OutputBuildPlatform: ${{ parameters.buildPlatform }}
-    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
-  pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.buildPlatform, 'ARM64') }}:
-        name: SHINE-OSS-Testing-x64
-      ${{ else }}:
-        name: SHINE-OSS-Testing-arm64
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
-      ${{ if ne(parameters.buildPlatform, 'ARM64') }}:
-        name: SHINE-INT-Testing-x64
-      ${{ else }}:
-        name: SHINE-INT-Testing-arm64
-
-  steps:
-  - checkout: self
-    submodules: false
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download artifacts
-    inputs:
-      artifactName: build-${{ parameters.buildPlatform }}-$(BuildConfiguration)${{ parameters.artifactStem }}
-      downloadPath: $(Terminal.BinDir)
-
-  # The tests expect Terminal to be an unpackaged distribution named terminal-0.0.1.0 (after the dev build version scheme)
-  # Extract to that folder explicitly and strip the embedded folder name from the unpackaged archive.
-  - powershell: |-
-      $TargetDirectory = New-Item -Type Directory (Join-Path "$(Terminal.BinDir)" "terminal-0.0.1.0")
-      & tar.exe -x -v -f (Get-Item "$(Terminal.BinDir)/_unpackaged/*.zip") -C $TargetDirectory.FullName --strip-components=1
-    displayName: Extract the unpackaged build for PGO
-
-  - template: steps-ensure-nuget-version.yml
-
-  - powershell: |-
-      $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'
-      $Version = '1.0.1'
-      & nuget.exe install $Package -Version $Version
-      Write-Host "##vso[task.setvariable variable=TerminalTestContentPath]$(Build.SourcesDirectory)\packages\${Package}.${Version}\content"
-    displayName: Install Test Content
-
-  - task: PowerShell@2
-    displayName: 'Run PGO Tests'
-    inputs:
-      targetType: filePath
-      filePath: build\scripts\Run-Tests.ps1
-      arguments: >-
-        -MatchPattern '*UIA.Tests.dll'
-        -Platform '$(OutputBuildPlatform)'
-        -Configuration '$(BuildConfiguration)'
-        -LogPath '${{ parameters.testLogPath }}'
-        -Root "$(Terminal.BinDir)"
-        -AdditionalTaefArguments '/select:(@IsPGO=true)','/p:WTTestContent=$(TerminalTestContentPath)'
-    condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
-
-  - 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

@@ -1,81 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: generateSbom
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: variables
-    type: object
-    default: {}
-  - name: publishArtifacts
-    type: boolean
-    default: true
-
-jobs:
-- job: VPack
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Create and Submit Windows vPack
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    JobOutputDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-    JobOutputArtifactName: vpack-manifest${{ parameters.artifactStem }}
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download MSIX Bundle Artifact
-    inputs:
-      artifactName: appxbundle-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-      downloadPath: '$(Build.SourcesDirectory)/bundle'
-
-  # Rename to known/fixed name for Windows build system
-  - powershell: |-
-      # Create vpack directory and place item inside
-      $TargetFolder = New-Item -Type Directory '$(Build.SourcesDirectory)/WindowsTerminal.app'
-      Get-ChildItem bundle/Microsoft.WindowsTerminal_*.msixbundle | Move-Item (Join-Path $TargetFolder.FullName 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle') -Verbose
-    displayName: Stage packages for vpack
-
-  - task: PkgESVPack@12
-    displayName: 'Package ES - VPack'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      sourceDirectory: '$(Build.SourcesDirectory)/WindowsTerminal.app'
-      description: VPack for the Windows Terminal Application
-      pushPkgName: WindowsTerminal.app
-      owner: conhost
-      githubToken: $(GitHubTokenForVpackProvenance)
-
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: 'Publish VPack Manifest to Drop'
-
-  - task: PkgESFCIBGit@12
-    displayName: 'Submit VPack Manifest to Windows'
-    inputs:
-      configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-      artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
-      prTimeOut: 5
-

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

@@ -1,177 +0,0 @@
-# This build should never run as CI or against a pull request.
-trigger: none
-
-parameters:
-  - name: branding
-    type: string
-    default: Release
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: generateSbom
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: publishVpackToWindows
-    type: boolean
-    default: false
-
-  - name: pool
-    type: object
-    default:
-      name: SHINE-INT-S # By default, send jobs to the small agent pool.
-      demands: ImageOverride -equals SHINE-VS17-Latest
-
-variables:
-  - template: variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
-
-resources:
-  repositories:
-  - repository: self
-    type: git
-    ref: main
-
-stages:
-  - stage: Build
-    displayName: Build
-    pool: ${{ parameters.pool }}
-    dependsOn: []
-    jobs:
-      - template: ./job-build-project.yml
-        parameters:
-          pool:
-            name: SHINE-INT-L # Run the compilation on the large agent pool, rather than the default small one.
-            demands: ImageOverride -equals SHINE-VS17-Latest
-          branding: ${{ parameters.branding }}
-          buildTerminal: ${{ parameters.buildTerminal }}
-          buildConPTY: ${{ parameters.buildConPTY }}
-          buildWPF: ${{ parameters.buildWPF }}
-          pgoBuildMode: ${{ parameters.pgoBuildMode }}
-          buildConfigurations: ${{ parameters.buildConfigurations }}
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          generateSbom: ${{ parameters.generateSbom }}
-          codeSign: ${{ parameters.codeSign }}
-          beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-            - task: PkgESSetupBuild@12
-              displayName: Package ES - Setup Build
-              inputs:
-                disableOutputRedirect: true
-
-            - task: UniversalPackages@0
-              displayName: Download terminal-internal Universal Package
-              inputs:
-                feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-            - template: ./steps-fetch-and-prepare-localizations.yml
-              parameters:
-                includePseudoLoc: true
-
-      - ${{ if eq(parameters.buildWPF, true) }}:
-        # Add an Any CPU build flavor for the WPF control bits
-        - template: ./job-build-project.yml
-          parameters:
-            # This job is allowed to run on the default small pool.
-            jobName: BuildWPF
-            branding: ${{ parameters.branding }}
-            buildTerminal: false
-            buildWPFDotNetComponents: true
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms:
-              - Any CPU
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-            beforeBuildSteps:
-              - task: PkgESSetupBuild@12
-                displayName: Package ES - Setup Build
-                inputs:
-                  disableOutputRedirect: true
-              # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-  - stage: Package
-    displayName: Package
-    pool: ${{ parameters.pool }}
-    dependsOn: [Build]
-    jobs:
-      - ${{ if eq(parameters.buildTerminal, true) }}:
-        - template: ./job-merge-msix-into-bundle.yml
-          parameters:
-            jobName: Bundle
-            branding: ${{ parameters.branding }}
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-      - ${{ if eq(parameters.buildConPTY, true) }}:
-        - template: ./job-package-conpty.yml
-          parameters:
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-      - ${{ if eq(parameters.buildWPF, true) }}:
-        - template: ./job-build-package-wpf.yml
-          parameters:
-            buildConfigurations: ${{ parameters.buildConfigurations }}
-            buildPlatforms: ${{ parameters.buildPlatforms }}
-            generateSbom: ${{ parameters.generateSbom }}
-            codeSign: ${{ parameters.codeSign }}
-
-  - stage: Publish
-    displayName: Publish
-    pool: ${{ parameters.pool }}
-    dependsOn: [Build, Package]
-    jobs:
-      # We only support the vpack for Release builds that include Terminal
-      - ${{ if and(containsValue(parameters.buildConfigurations, 'Release'), parameters.buildTerminal, parameters.publishVpackToWindows) }}:
-        - template: ./job-submit-windows-vpack.yml
-          parameters:
-            buildConfiguration: Release
-            generateSbom: ${{ parameters.generateSbom }}
-
-      - template: ./job-publish-symbols.yml
-        parameters:
-          includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-          symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
-
-...

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

@@ -1,256 +0,0 @@
-parameters:
-  - name: official
-    type: boolean
-    default: false
-  - name: branding
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: publishVpackToWindows
-    type: boolean
-    default: false
-
-  - name: extraPublishJobs
-    type: object
-    default: []
-
-resources:
-  repositories:
-  - repository: templates
-    type: git
-    name: OneBranch.Pipelines/GovernedTemplates
-    ref: refs/heads/main
-
-extends:
-  ${{ if eq(parameters.official, true) }}:
-    template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates
-  ${{ else }}:
-    template: v2/Microsoft.NonOfficial.yml@templates
-  parameters:
-    featureFlags:
-      WindowsHostVersion: 1ESWindows2022
-    platform:
-      name: 'windows_undocked'
-      product: 'Windows Terminal'
-    cloudvault: # https://aka.ms/obpipelines/cloudvault
-      enabled: false
-    globalSdl: # https://aka.ms/obpipelines/sdl
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\build\config\tsa.json'
-      binskim:
-        break: false
-        scanOutputDirectoryOnly: true
-      policheck:
-        break: false
-        severity: Note
-      baseline:
-        baselineFile: '$(Build.SourcesDirectory)\build\config\release.gdnbaselines'
-        suppressionSet: default
-
-    stages:
-      - stage: Build
-        displayName: Build
-        dependsOn: []
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-            parameters:
-              pool: { type: windows }
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(JobOutputDirectory)
-                ob_artifactBaseName: $(JobOutputArtifactName)
-              publishArtifacts: false # Handled by OneBranch
-              branding: ${{ parameters.branding }}
-              buildTerminal: ${{ parameters.buildTerminal }}
-              buildConPTY: ${{ parameters.buildConPTY }}
-              buildWPF: ${{ parameters.buildWPF }}
-              pgoBuildMode: ${{ parameters.pgoBuildMode }}
-              buildConfigurations: ${{ parameters.buildConfigurations }}
-              buildPlatforms: ${{ parameters.buildPlatforms }}
-              generateSbom: false # this is handled by onebranch
-              removeAllNonSignedFiles: true # appease the overlords
-              codeSign: ${{ parameters.codeSign }}
-              beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - task: PkgESSetupBuild@12
-                  displayName: Package ES - Setup Build
-                  inputs:
-                    disableOutputRedirect: true
-
-                - task: UniversalPackages@0
-                  displayName: Download terminal-internal Universal Package
-                  inputs:
-                    feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                    packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                    versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-                - template: ./build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml@self
-                  parameters:
-                    includePseudoLoc: true
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            # Add an Any CPU build flavor for the WPF control bits
-            - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                jobName: BuildWPF
-                branding: ${{ parameters.branding }}
-                buildTerminal: false
-                buildWPFDotNetComponents: true
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms:
-                  - Any CPU
-                generateSbom: false # this is handled by onebranch
-                removeAllNonSignedFiles: true # appease the overlords
-                codeSign: ${{ parameters.codeSign }}
-                beforeBuildSteps:
-                  - task: PkgESSetupBuild@12
-                    displayName: Package ES - Setup Build
-                    inputs:
-                      disableOutputRedirect: true
-                  # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-      - stage: Package
-        displayName: Package
-        dependsOn: [Build]
-        jobs:
-          - ${{ if eq(parameters.buildTerminal, true) }}:
-            - template: ./build/pipelines/templates-v2/job-merge-msix-into-bundle.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                  ### This job is also in charge of submitting the vpack to Windows if it's enabled
-                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ### If enabled above, these options are in play.
-                  ob_createvpack_packagename: 'WindowsTerminal.app'
-                  ob_createvpack_owneralias: 'conhost@microsoft.com'
-                  ob_createvpack_description: 'VPack for the Windows Terminal Application'
-                  ob_createvpack_targetDestinationDirectory: '$(Destination)'
-                  ob_createvpack_propsFile: false
-                  ob_createvpack_provData: true
-                  ob_createvpack_metadata: '$(Build.SourceVersion)'
-                  ob_createvpack_topLevelRetries: 0
-                  ob_createvpack_failOnStdErr: true
-                  ob_createvpack_taskLogVerbosity: Detailed
-                  ob_createvpack_verbose: true
-                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
-                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
-                  # folder that it can then update and upload.
-                  # Effectively: it says "destination" but it means "source"
-                  # DH: Don't ask why.
-                  ob_updateOSManifest_destination: $(XES_VPACKMANIFESTDIRECTORY)
-                  ob_updateOSManifest_skipFetch: true
-                publishArtifacts: false # Handled by OneBranch
-                jobName: Bundle
-                branding: ${{ parameters.branding }}
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # Handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-                afterBuildSteps:
-                  - pwsh: |-
-                      $d = New-Item "$(JobOutputDirectory)/vpack" -Type Directory
-                      Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path $d 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
-                    displayName: Stage msixbundle for vpack
-
-          - ${{ if eq(parameters.buildConPTY, true) }}:
-            - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            - template: ./build/pipelines/templates-v2/job-build-package-wpf.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-      - stage: Publish
-        displayName: Publish
-        dependsOn: [Build, Package]
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-publish-symbols.yml@self
-            parameters:
-              pool: { type: windows }
-              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              symbolPatGoesInTaskInputs: true # onebranch tries to muck with the PAT variable, so we need to change how it get the PAT
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(Build.ArtifactStagingDirectory)
-                # Without this, OneBranch will nerf our symbol tasks
-                ob_symbolsPublishing_enabled: true
-
-          - ${{ parameters.extraPublishJobs }}

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

@@ -1,35 +0,0 @@
-parameters:
-  - name: stage
-    type: string
-  - name: outFile
-    type: string
-  - name: fragments
-    type: string
-
-# This build step template takes all files named "esrp.STAGE.batch.*.json"
-# and merges them into a single output signing config.
-#
-# We generate the batch signing config by sticking together multiple "batches".
-# The filter below (with Fragments) works by splitting the filename, esrp.s.batch.x.json,
-# to get 'x' and then checking whether x is in Fragments.
-# We have to manually strip comments out of the batch fragments due to https://github.com/PowerShell/PowerShell/issues/14553
-
-steps:
-  - pwsh: |-
-      $SignBatchFiles = (Get-Item build/config/esrp.${{ parameters.stage }}.batch.*.json)
-      $Fragments = "${{ parameters.fragments }}"
-      If (-Not [String]::IsNullOrWhiteSpace($Fragments)) {
-        $FragmentList = $Fragments -Split ";"
-        If ($FragmentList.Length -Gt 0) {
-          $SignBatchFiles = $SignBatchFiles | Where-Object { ($_.Name -Split '\.')[3] -In $FragmentList }
-        }
-      }
-      Write-Host "Found $(@($SignBatchFiles).Length) Signing Configs"
-      Write-Host ($SignBatchFiles.Name -Join ";")
-      $FinalSignConfig = @{
-        Version = "1.0.0";
-        UseMinimatch = $false;
-        SignBatches = @($SignBatchFiles | ForEach-Object { Get-Content $_ | Where-Object { $_ -NotMatch "^\s*\/\/" } | ConvertFrom-Json -Depth 10 });
-      }
-      $FinalSignConfig | ConvertTo-Json -Depth 10 | Out-File -Encoding utf8 "${{ parameters.outFile }}"
-    displayName: Merge ${{ parameters.stage }} signing configs (${{ parameters.outFile }})

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

@@ -1,24 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-  - name: buildPlatforms
-    type: object
-  - name: artifactStem
-    type: string
-    default: ''
-
-steps:
-- ${{ each configuration in parameters.buildConfigurations }}:
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download artifacts for ${{ platform }} ${{ configuration }}
-      inputs:
-        # Make sure to download the entire artifact, because it includes the SPDX SBOM
-        artifactName: build-${{ platform }}-${{ configuration }}${{ parameters.artifactStem }}
-        # Downloading to the source directory should ensure that the later SBOM generator can see the earlier SBOMs.
-        ${{ if eq(platform, 'x86') }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/Win32/${{ configuration }}'
-        ${{ elseif eq(platform, 'Any CPU') }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/AnyCPU/${{ configuration }}'
-        ${{ else }}:
-          downloadPath: '$(Build.SourcesDirectory)/bin/${{ platform }}/${{ configuration }}'

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

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

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

@@ -1,27 +0,0 @@
-parameters:
-  - name: includePseudoLoc
-    type: boolean
-    default: true
-
-steps:
-  - task: TouchdownBuildTask@1
-    displayName: Download Localization Files
-    inputs:
-      teamId: 7105
-      authId: $(TouchdownAppId)
-      authKey: $(TouchdownAppKey)
-      resourceFilePath: |
-        src\cascadia\**\en-US\*.resw
-      appendRelativeDir: true
-      localizationTarget: false
-      ${{ if eq(parameters.includePseudoLoc, true) }}:
-        pseudoSetting: Included
-
-  - pwsh: |-
-      $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-      $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
-    displayName: Move Loc files into final locations
-
-  - pwsh: |-
-      ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
-    displayName: Copy the Context Menu Loc Resources to CascadiaPackage

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

@@ -1,27 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-
-variables:
-  # If we are building a branch called "release-*", change the NuGet suffix
-  # to "preview". If we don't do that, XES will set the suffix to "release1"
-  # because it truncates the value after the first period.
-  # We also want to disable the suffix entirely if we're Release branded while
-  # on a release branch.
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label as
-  # well.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Release                    | Preview
-  # ------------------|----------------------------|-----------------------------
-  # release-*         | 1.12.20220427              | 1.13.20220427-preview
-  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
-  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      NoNuGetPackBetaVersion: true
-    ${{ else }}:
-      NuGetPackBetaVersion: preview
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+
+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/codenav-indexer.yml

@@ -1,15 +1,21 @@
+parameters:
+  artifactName: 'drop'
+
 jobs:
 - job: CodeNavIndexer
   displayName: Run Github CodeNav Indexer
-  pool: { vmImage: windows-2022 }
+  pool: { vmImage: windows-2019 }
 
   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/console-ci-helix-job.yml

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

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

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

@@ -0,0 +1,164 @@
+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-build-and-publish-nuget-job.yml

@@ -1,26 +1,14 @@
+# From our friends at MUX: https://github.com/microsoft/microsoft-ui-xaml/blob/main/build/AzurePipelinesTemplates/MUX-BuildAndPublishPGONuGet-Job.yml
+
 parameters:
-  - name: buildConfiguration
-    type: string
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: jobName
-    type: string
-    default: BuildAndPublishPGONuget
+  dependsOn: ''
+  pgoArtifact: PGO
 
 jobs:
-- job: ${{ parameters.jobName }}
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
+- job: BuildAndPublishPGONuGet
   dependsOn: ${{ parameters.dependsOn }}
-  displayName: Package and Publish PGO Databases
-
+  pool:
+    vmImage: 'windows-2019'
   variables:
     artifactsPath: $(Build.SourcesDirectory)\Artifacts
     pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
@@ -28,25 +16,20 @@ jobs:
     nuspecFilename: PGO.nuspec
 
   steps:
-  - checkout: self
-    clean: true
-    # It is important that this be 0, otherwise git will not fetch the branch ref names that the PGO rules require.
-    fetchDepth: 0
-    submodules: false
-    persistCredentials: false
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download Final PGO Databases
+  - task: DownloadBuildArtifacts@0
     inputs:
-      artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
+      artifactName: ${{ parameters.pgoArtifact }}
       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
@@ -62,11 +45,12 @@ jobs:
     displayName: 'Create PGO Nuget'
     inputs:
       solution: $(pgoToolsPath)\PGO.DB.proj
-      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath) /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
+      msbuildArguments: '/t:CreatePGONuGet /p:PGOBuildMode=Instrument /p:PGDPathForAllArch=$(artifactsPath)\${{ parameters.pgoArtifact }} /p:PGOOutputPath=$(Build.ArtifactStagingDirectory)'
 
-  - publish: $(Build.ArtifactStagingDirectory)
-    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-    displayName: "Publish Pipeline Artifact"
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathToPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: ${{ parameters.pgoArtifact }}
 
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet push'

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

@@ -0,0 +1,70 @@
+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/restore-nuget-steps.yml

@@ -1,12 +1,14 @@
 steps:
-- template: steps-ensure-nuget-version.yml
+- task: NuGetToolInstaller@0
+  displayName: 'Use NuGet 6.3.0'
+  inputs:
+    versionSpec: 6.3.0
 
 - task: NuGetAuthenticate@0
 
 - script: |-
     echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)
   displayName: Ensure NuGet restores for $(BuildPlatform)
-  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/test-console-ci.yml

@@ -1,9 +1,9 @@
 parameters:
   configuration: 'Release'
   platform: ''
+  additionalBuildArguments: ''
+  artifactName: 'drop'
   testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
-  inputArtifactStem: ''
-  outputArtifactStem: ''
 
 jobs:
 - job: Test${{ parameters.platform }}${{ parameters.configuration }}
@@ -11,52 +11,47 @@ jobs:
   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
+      name: WinDevPoolOSS-L
     ${{ 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
+      name: WinDevPool-L
+    demands: ImageOverride -equals WinDevVS17-latest
 
   steps:
   - checkout: self
-    submodules: false
+    submodules: true
     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
+  - task: DownloadBuildArtifacts@0
     inputs:
-      artifactName: build-${{ parameters.platform }}-$(BuildConfiguration)${{ parameters.inputArtifactStem }}
-      downloadPath: $(Terminal.BinDir)
+      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 '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
-    condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
+      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')))
 
-  - ${{ 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)"
-      condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
+  - 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'
@@ -64,7 +59,7 @@ jobs:
       targetType: filePath
       filePath: build\Helix\ConvertWttLogToXUnit.ps1
       arguments: -WttInputPath '${{ parameters.testLogPath }}' -WttSingleRerunInputPath 'unused.wtl' -WttMultipleRerunInputPath 'unused2.wtl' -XUnitOutputPath 'onBuildMachineResults.xml' -TestNamePrefix '$(BuildConfiguration).$(BuildPlatform)'
-    condition: ne(variables['PGOBuildMode'], 'Instrument')
+    condition: and(ne(variables['PGOBuildMode'], 'Instrument'),or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'x86')))
 
   - task: PublishTestResults@2
     displayName: 'Upload converted test logs'
@@ -72,9 +67,13 @@ jobs:
     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'
@@ -88,5 +87,4 @@ jobs:
       flattenFolders: true
 
   - publish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test-logs'
-    artifact: test-logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.outputArtifactStem }}
-    condition: always()
+    artifact: TestLogs$(BuildPlatform)$(BuildConfiguration)

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

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

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -1,21 +1,28 @@
+[CmdletBinding(DefaultParameterSetName = 'AppX')]
 Param(
-    [Parameter(Mandatory,
-      HelpMessage="Path to Terminal AppX")]
+    [Parameter(Mandatory, HelpMessage="Path to Terminal AppX", ParameterSetName = 'AppX')]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
     $TerminalAppX,
 
-    [Parameter(Mandatory,
-      HelpMessage="Path to Xaml AppX")]
+    [Parameter(Mandatory, HelpMessage="Path to Terminal Layout Deployment", ParameterSetName='Layout')]
+    [ValidateScript({Test-Path $_ -Type Container})]
+    [string]
+    $TerminalLayout,
+
+    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='AppX')]
+    [Parameter(Mandatory, HelpMessage="Path to Xaml AppX", ParameterSetName='Layout')]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
     $XamlAppX,
 
-    [Parameter(HelpMessage="Output Directory")]
+    [Parameter(HelpMessage="Output Directory", ParameterSetName='AppX')]
+    [Parameter(HelpMessage="Output Directory", ParameterSetName='Layout')]
     [string]
     $Destination = ".",
 
-    [Parameter(HelpMessage="Path to makeappx.exe")]
+    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='AppX')]
+    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='Layout')]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
     $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe"
@@ -36,14 +43,17 @@ $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString
 New-Item -ItemType Directory -Path $tempDir | Out-Null
 
 $XamlAppX = Get-Item $XamlAppX | Select-Object -Expand FullName
-$TerminalAppX = Get-Item $TerminalAppX | Select-Object -Expand FullName
 
 ########
 # Reading the AppX Manifest for preliminary info
 ########
 
-$appxManifestPath = Join-Path $tempDir AppxManifest.xml
-& tar.exe -x -f "$TerminalAppX" -C $tempDir AppxManifest.xml
+If ($TerminalAppX) {
+	$appxManifestPath = Join-Path $tempDir AppxManifest.xml
+	& tar.exe -x -f "$TerminalAppX" -C $tempDir AppxManifest.xml
+} ElseIf($TerminalLayout) {
+	$appxManifestPath = Join-Path $TerminalLayout AppxManifest.xml
+}
 $manifest = [xml](Get-Content $appxManifestPath)
 $pfn = $manifest.Package.Identity.Name
 $version = $manifest.Package.Identity.Version
@@ -57,13 +67,20 @@ $terminalDir = "terminal-{0}" -f ($version)
 ########
 
 $terminalAppPath = Join-Path $tempdir $terminalDir
-$xamlAppPath = Join-Path $tempdir "xaml"
-New-Item -ItemType Directory -Path $terminalAppPath | Out-Null
-New-Item -ItemType Directory -Path $xamlAppPath | Out-Null
-& $MakeAppxPath unpack /p $TerminalAppX /d $terminalAppPath /o | Out-Null
-If ($LASTEXITCODE -Ne 0) {
-    Throw "Unpacking $TerminalAppX failed"
+
+If ($TerminalAppX) {
+	$TerminalAppX = Get-Item $TerminalAppX | Select-Object -Expand FullName
+	New-Item -ItemType Directory -Path $terminalAppPath | Out-Null
+	& $MakeAppxPath unpack /p $TerminalAppX /d $terminalAppPath /o | Out-Null
+	If ($LASTEXITCODE -Ne 0) {
+	    Throw "Unpacking $TerminalAppX failed"
+	}
+} ElseIf ($TerminalLayout) {
+	Copy-Item -Recurse -Path $TerminalLayout -Destination $terminalAppPath
 }
+
+$xamlAppPath = Join-Path $tempdir "xaml"
+New-Item -ItemType Directory -Path $xamlAppPath | Out-Null
 & $MakeAppxPath unpack /p $XamlAppX /d $xamlAppPath /o | Out-Null
 If ($LASTEXITCODE -Ne 0) {
     Throw "Unpacking $XamlAppX failed"
@@ -105,13 +122,19 @@ $finalTerminalPriFile = Join-Path $terminalAppPath "resources.pri"
     -TerminalRoot $terminalAppPath `
     -XamlRoot $xamlAppPath `
     -OutputPath $finalTerminalPriFile `
-    -Verbose:$Verbose
+    -Verbose:$Verbose | Out-Host
 
 ########
 # Packaging
 ########
 
-New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null
-$outputZip = (Join-Path $Destination ("{0}.zip" -f ($distributionName)))
-& tar -c --format=zip -f $outputZip -C $tempDir $terminalDir
-Get-Item $outputZip
+If ($PSCmdlet.ParameterSetName -Eq "AppX") {
+	# We only produce a ZIP when we're combining two AppX directories.
+	New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null
+	$outputZip = (Join-Path $Destination ("{0}.zip" -f ($distributionName)))
+	& tar -c --format=zip -f $outputZip -C $tempDir $terminalDir
+	Remove-Item -Recurse -Force $tempDir -EA:SilentlyContinue
+	Get-Item $outputZip
+} ElseIf ($PSCmdlet.ParameterSetName -Eq "Layout") {
+	Get-Item $terminalAppPath
+}

build/scripts/Run-Tests.ps1

@@ -1,37 +1,27 @@
 [CmdLetBinding()]
 Param(
-    [Parameter(Mandatory=$true, Position=0)]
-    [string]$MatchPattern,
-    [Parameter(Mandatory=$true, Position=1)]
-    [string]$Platform,
-    [Parameter(Mandatory=$true, Position=2)]
-    [string]$Configuration,
-    [Parameter(Mandatory=$false, Position=3)]
-    [string]$LogPath,
-    [Parameter(Mandatory=$false)]
-    [string]$Root = ".\bin\$Platform\$Configuration",
-    [string[]]$AdditionalTaefArguments
+    [Parameter(Mandatory=$true, Position=0)][string]$MatchPattern,
+    [Parameter(Mandatory=$true, Position=1)][string]$Platform,
+    [Parameter(Mandatory=$true, Position=2)][string]$Configuration,
+    [Parameter(Mandatory=$false, Position=3)][string]$LogPath,
+    [Parameter(Mandatory=$false)][string]$Root = ".\bin\$Platform\$Configuration"
 )
 
-# Find test DLLs based on the provided root, match pattern, and recursion
-$testDlls = Get-ChildItem -Path $Root -Recurse -Filter $MatchPattern
+$testdlls = Get-ChildItem -Path "$Root" -Recurse -Filter $MatchPattern
 
-$args = @()
 
-# Check if the LogPath parameter is provided and enable WTT logging
-if ($LogPath) {
-    $args += '/enablewttlogging'
-    $args += '/appendwttlogging'
-    $args += "/logFile:$LogPath"
-    Write-Host "WTT Logging Enabled"
+$args = @();
+
+if ($LogPath)
+{
+    $args += '/enablewttlogging';
+    $args += '/appendwttlogging';
+    $args += "/logFile:$LogPath";
+    Write-Host "Wtt Logging Enabled";
 }
 
-# Invoke the te.exe executable with arguments and test DLLs
-& "$Root\te.exe" $args $testDlls.FullName $AdditionalTaefArguments
+&"$Root\te.exe" $args $testdlls.FullName
 
-# Check the exit code of the te.exe process and exit accordingly
-if ($LASTEXITCODE -ne 0) {
-    Exit $LASTEXITCODE
-}
+if ($lastexitcode -Ne 0) { Exit $lastexitcode }
 
 Exit 0

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -70,23 +70,24 @@ Try {
 
     $dependencies = $Manifest.Package.Dependencies.PackageDependency.Name
     $depsHasVclibsDesktop = ("Microsoft.VCLibs.140.00.UWPDesktop" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug.UWPDesktop" -in $dependencies)
-    $depsHasVcLibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
+    $depsHasVclibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
     $filesHasVclibsDesktop = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d.dll" -EA:Ignore))
     $filesHasVclibsAppX = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140_app.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d_app.dll" -EA:Ignore))
 
-    If ($depsHasVclibsDesktop -Eq $filesHasVclibsDesktop) {
-        $eitherBoth = if ($depsHasVclibsDesktop) { "both" } else { "neither" }
-        $neitherNor = if ($depsHasVclibsDesktop) { "and" } else { "nor" }
-        Throw "Package has $eitherBoth Dependency $neitherNor Integrated Desktop VCLibs"
+    If ($filesHasVclibsDesktop) {
+        Throw "Package contains the desktop VCLibs"
     }
 
-    If ($depsHasVclibsAppx -Eq $filesHasVclibsAppx) {
-        if ($depsHasVclibsAppx) {
-            # We've shipped like this forever, so downgrade to warning.
-            Write-Warning "Package has both Dependency and Integrated AppX VCLibs"
-        } else {
-            Throw "Package has neither Dependency nor Integrated AppX VCLibs"
-        }
+    If ($depsHasVclibsDesktop) {
+        Throw "Package has a dependency on the desktop VCLibs"
+    }
+
+    If ($filesHasVclibsAppX) {
+        Throw "Package contains the AppX VCLibs"
+    }
+
+    If ($depsHasVclibsAppX) {
+        Throw "Package has a dependency on the AppX VCLibs"
     }
 
     ### Check that we have an App.xbf (which is a proxy for our resources having been merged)

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2022</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2023</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>17</VersionMinor>
+    <VersionMinor>18</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

dep/nuget/packages.config

@@ -4,11 +4,11 @@
   <!-- Native packages -->
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
-  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
-  <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.7.230706001" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
+  <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.6.220404001" targetFramework="native" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.8.3" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->

doc/cascadia/profiles.schema.json

@@ -24,6 +24,13 @@
       "pattern": "^(-?\\d+)?(,\\s?(-?\\d+)?)?$",
       "type": "string"
     },
+    "CSSLengthPercentage": {
+      "pattern": "^[+-]?\\d+(?:\\.\\d+)?(?:%|ch|pt|px)?$",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "DynamicProfileSource": {
       "enum": [
         "Windows.Terminal.Wsl",
@@ -253,8 +260,7 @@
           "description": "Name of the scheme to use when the app is using dark theme",
           "type": "string"
         }
-      },
-      "type": "object"
+      }
     },
     "FontConfig": {
       "properties": {
@@ -315,6 +321,14 @@
             }
           },
           "additionalProperties": false
+        },
+        "cellWidth": {
+          "$ref": "#/$defs/CSSLengthPercentage",
+          "description": "Override the width of the terminal's cells. The override works similar to CSS' letter-spacing. It defaults to the natural glyph advance width of the primary font rounded to the nearest pixel."
+        },
+        "cellHeight": {
+          "$ref": "#/$defs/CSSLengthPercentage",
+          "description": "Override the height of the terminal's cells. The override works similar to CSS' line-height. Defaults to the sum of the natural glyph ascend, descend and line-gap of the primary font rounded to the nearest pixel. The default is usually quite close to setting this to 1.2."
         }
       },
       "type": "object"
@@ -1808,7 +1822,7 @@
         "name": {
           "type": "string",
           "description": "The name of the theme. This will be displayed in the settings UI.",
-          "not": { 
+          "not": {
             "enum": [ "light", "dark", "system" ]
           }
         },
@@ -2078,6 +2092,11 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
+        "compatibility.isolatedMode": {
+          "default": false,
+          "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
+          "type": "boolean"
+        },
         "copyFormatting": {
           "default": true,
           "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.",
@@ -2150,6 +2169,11 @@
           "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.",
@@ -2550,6 +2574,13 @@
           "default": false,
           "description": "When true, this profile should always open in an elevated context. If the window isn't running as an Administrator, then a new elevated window will be created."
         },
+        "environment": {
+          "description": "Key-value pairs representing environment variables to set. Environment variable names are not case sensitive. You can reference existing environment variable names by enclosing them in literal percent characters (e.g. %PATH%).",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
         "experimental.autoMarkPrompts": {
           "default": false,
           "description": "When set to true, prompts will automatically be marked.",

doc/color_nudging.html

@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <title>Perceptual Color Nudging</title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <style>
-        html {
-            background-color: #0c0c0c;
-            color: #cccccc;
-            font-family: "Cascadia Code", "Cascadia Mono", monospace;
-        }
-
-        body {
-            display: flex;
-            margin: 0;
-            white-space: nowrap;
-            min-height: 100vh;
-        }
-
-        body>div {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            padding: 2rem;
-        }
-
-        form,
-        h2 {
-            margin: 1rem;
-        }
-
-        p,
-        pre {
-            margin: 0.5rem;
-        }
-
-        table {
-            border-collapse: collapse;
-        }
-
-        table td {
-            padding: 0.5rem;
-        }
-
-    </style>
-</head>
-
-<body>
-    <div style="flex: 2; align-items: flex-start; background-color: #0c0c0c">
-        <form>
-            <input id="background-color" name="background-color" type="color" value="#0c0c0c" />
-            <label for="background-color">background color</label>
-        </form>
-        <table>
-            <tr>
-                <td>Input</td>
-                <td>WCAG21:<br>APCA:</td>
-                <td id="stats-input"></td>
-            </tr>
-            <tr>
-                <td>&Delta;E2000<br>(ConEmu)</td>
-                <td>WCAG21:<br>APCA:</td>
-                <td id="stats-cielab"></td>
-            </tr>
-            <tr>
-                <td>&Delta;EOK</td>
-                <td>WCAG21:<br>APCA:</td>
-                <td id="stats-oklab"></td>
-            </tr>
-        </table>
-    </div>
-    <div id="input" style="flex: 1">
-        <h2>Input</h2>
-        <pre style="font-size: 8pt">&#29483;</pre>
-        <pre style="font-size: 10pt">&#29483;</pre>
-        <pre style="font-size: 12pt">&#29483;</pre>
-        <pre style="font-size: 14pt">&#29483;</pre>
-        <pre style="font-size: 16pt">&#29483;</pre>
-        <pre style="font-size: 32pt">&#29483;</pre>
-        <pre style="font-size: 64pt">&#29483;</pre>
-    </div>
-    <div id="cielab" style="flex: 1">
-        <h2>&Delta;E2000 (ConEmu)</h2>
-        <pre style="font-size: 8pt">&#29483;</pre>
-        <pre style="font-size: 10pt">&#29483;</pre>
-        <pre style="font-size: 12pt">&#29483;</pre>
-        <pre style="font-size: 14pt">&#29483;</pre>
-        <pre style="font-size: 16pt">&#29483;</pre>
-        <pre style="font-size: 32pt">&#29483;</pre>
-        <pre style="font-size: 64pt">&#29483;</pre>
-    </div>
-    <div id="oklab" style="flex: 1">
-        <h2>&Delta;EOK</h2>
-        <pre style="font-size: 8pt">&#29483;</pre>
-        <pre style="font-size: 10pt">&#29483;</pre>
-        <pre style="font-size: 12pt">&#29483;</pre>
-        <pre style="font-size: 14pt">&#29483;</pre>
-        <pre style="font-size: 16pt">&#29483;</pre>
-        <pre style="font-size: 32pt">&#29483;</pre>
-        <pre style="font-size: 64pt">&#29483;</pre>
-    </div>
-    <script type="module">
-        import Color from "https://cdn.jsdelivr.net/npm/colorjs.io@0.4.3/+esm";
-
-        window.Color = Color;
-
-        const input = document.getElementById("input");
-        const cielab = document.getElementById("cielab");
-        const oklab = document.getElementById("oklab");
-
-        const statsInput = document.getElementById("stats-input");
-        const statsCielab = document.getElementById("stats-cielab");
-        const statsOklab = document.getElementById("stats-oklab");
-
-        let backgroundColor = new Color("#0c0c0c");
-        let foregroundColor = new Color("#0c0c0c");
-        let foregroundColorRange = null;
-        let previousSecsIntegral = -1;
-
-        function saturate(val) {
-            return val < 0 ? 0 : val > 1 ? 1 : val;
-        }
-
-        function clipToSrgb(color) {
-            return color.to("srgb").toGamut({ method: "clip" });
-        }
-
-        function nudgeCielab(backgroundColor, foregroundColor) {
-            const backgroundCielab = backgroundColor.to("lab-d65");
-            const foregroundCielab = foregroundColor.to("lab-d65");
-
-            const de1 = Color.deltaE(foregroundColor, backgroundCielab, "2000");
-            if (de1 >= 12.0) {
-                return foregroundColor;
-            }
-
-            for (let i = 0; i <= 1; i++) {
-                const step = (i == 0) ? 5.0 : -5.0;
-                foregroundCielab.l += step;
-
-                while (((i == 0) && foregroundCielab.l <= 100) || (i == 1 && foregroundCielab.l >= 0)) {
-                    const de2 = Color.deltaE(foregroundCielab, backgroundCielab, "2000");
-                    if (de2 >= 20.0) {
-                        return clipToSrgb(foregroundCielab);
-                    }
-                    foregroundCielab.l += step;
-                }
-            }
-        }
-
-        function nudgeOklab(backgroundColor, foregroundColor) {
-            const backgroundOklab = backgroundColor.to("oklab");
-            const foregroundOklab = foregroundColor.to("oklab");
-            const deltaSquared = {
-                l: (backgroundOklab.l - foregroundOklab.l) ** 2,
-                a: (backgroundOklab.a - foregroundOklab.a) ** 2,
-                b: (backgroundOklab.b - foregroundOklab.b) ** 2,
-            };
-            const distance = deltaSquared.l + deltaSquared.a + deltaSquared.b;
-
-            if (distance >= 0.25) {
-                return foregroundColor;
-            }
-
-            let deltaL = Math.sqrt(0.25 - deltaSquared.a - deltaSquared.b);
-            if (foregroundOklab.l < backgroundOklab.l)
-            {
-                deltaL = -deltaL;
-            }
-
-            foregroundOklab.l = backgroundOklab.l + deltaL;
-            if (foregroundOklab.l < 0 || foregroundOklab.l > 1)
-            {
-                foregroundOklab.l = backgroundOklab.l - deltaL;
-            }
-
-            return clipToSrgb(foregroundOklab);
-        }
-
-        function contrastStringLevels(num, level0, level1) {
-            const str = num.toFixed(1);
-            if (num < level0) {
-                return `<span style="color:crimson">${str}</span>`;
-            }
-            if (num < level1) {
-                return `<span style="color:coral">${str}</span>`;
-            }
-            return str;
-        }
-
-        function contrastString(foregroundColor) {
-            const contrastWCAG21 = contrastStringLevels(foregroundColor.contrast(backgroundColor, "WCAG21"), 3, 4.5);
-            const contrastAPCA = contrastStringLevels(Math.abs(foregroundColor.contrast(backgroundColor, "APCA")), 45, 60);
-            return `${contrastWCAG21}<br/>${contrastAPCA}`;
-        }
-
-        function animate(time) {
-            const timeScale = time / 1000;
-            const secsIntegral = Math.trunc(timeScale);
-            const secsFractional = timeScale % 1;
-
-            if (previousSecsIntegral != secsIntegral) {
-                const foregroundColorTarget = new Color("srgb", backgroundColor.coords.map(c => saturate(c + Math.random() - 0.5)));
-                foregroundColorRange = foregroundColor.range(foregroundColorTarget, { space: "srgb" });
-                previousSecsIntegral = secsIntegral;
-            }
-
-            foregroundColor = foregroundColorRange(secsFractional);
-            input.style.color = foregroundColor.toString({ inGamut: false });
-
-            const foregroundCielabNudged = nudgeCielab(backgroundColor, foregroundColor);
-            const foregroundOklabNudged = nudgeOklab(backgroundColor, foregroundColor);
-
-            cielab.style.color = foregroundCielabNudged;
-            oklab.style.color = foregroundOklabNudged;
-
-            statsInput.innerHTML = contrastString(foregroundColor);
-            statsCielab.innerHTML = contrastString(foregroundCielabNudged);
-            statsOklab.innerHTML = contrastString(foregroundOklabNudged);
-
-            requestAnimationFrame(animate);
-        }
-        requestAnimationFrame(animate);
-
-        document.getElementById("background-color").addEventListener("input", event => {
-            backgroundColor = new Color(event.target.value);
-            document.documentElement.style.backgroundColor = backgroundColor;
-        }, false);
-
-        document.documentElement.style.backgroundColor = backgroundColor;
-    </script>
-</body>
-
-</html>

doc/specs/portable-mode-spec.md

@@ -0,0 +1,90 @@
+---
+author: Dustin L. Howett @DHowett
+created on: 2023-03-22
+last updated: 2023-03-22
+issue id: none
+---
+
+# Windows Terminal "Portable" Mode
+
+## Abstract
+
+Since we are planning on officially supporting unpackaged execution, I propose a special mode where Terminal stores its
+settings in a `settings` folder next to `WindowsTerminal.exe`.
+
+## Inspiration
+
+- [PortableApps](https://portableapps.com)
+- "Embeddable" Python, which relies on the deployment of a specific file to the Python root
+
+## Solution Design
+
+- _If running without package identity,_ `CascadiaSettings` will look for the presence of a file called `.portable` next
+  to `Microsoft.Terminal.Settings.Model.dll`.
+- If that file is present, it will change the settings and state paths to be rooted in a subfolder named `settings` next
+  to `Microsoft.Terminal.Settings.Model.dll`.
+
+Right now, _the only thing_ that makes Terminal not work in a "portable" manner is that it saves settings to
+`%LOCALAPPDATA%`.
+
+## UI/UX Design
+
+_No UI/UX impact is expected._
+
+## Capabilities
+
+- Distributors could ship a self-contained and preconfigured Terminal installation.
+- Users could archive fully-working preconfigured versions of Terminal.
+- Developers (such as those on the team) could easily test multiple versions of Terminal without worrying about global
+  settings pollution.
+
+### Accessibility
+
+_No change is expected._
+
+### Security
+
+_No change is expected._
+
+### Reliability
+
+More code always bears a risk.
+
+### Compatibility
+
+This is a net new feature, and it does not break any existing features. A distributor (or a user) can opt in (or out) by
+adding (or removing) the `.portable` file.
+
+The following features may be impacted.
+
+- **Dynamic Profiles** and **Fragment Extensions**
+  - _No impact expected._ Dynamic profiles will still be generated. If a portable installation is moved to a machine without the dynamic profile source, that profile will disappear.
+- `firstWindowPreference` and `state.json`
+  - _No impact expected._
+  - State is stored next to settings, even for portable installations.
+  - If a dynamic profile was saved in `state` and has been removed, Terminal will proceed as in non-portable mode.
+- Moving an install from Windows 10 to Windows 11 and back
+  - _No impact expected._
+- "Machine-specific" settings, like those about rendering and repainting
+  - _No impact expected._
+  - Terminal does not distinguish settings that are specific to a machine. These settings will move along with the portable install.
+- The shell extension
+  - _No impact expected._
+  - The shell extension will not be registered with Windows.
+  - If we choose to register the shell extension, it is already prepared for running a version of WT from the same directory. Registering the portable shell extension will make it launch portable Terminal.
+
+### Performance, Power, and Efficiency
+
+_No change is expected._
+
+## Potential Issues
+
+- User confusion around where settings are stored.
+
+## Future considerations
+
+- In the future, perhaps `.portable` could itself contain a directory path into which we would store settings.
+- We could consider adding an indicator in the Settings UI.
+- Because we are using the module path of the Settings Model DLL, a future unpackaged version of the shell extension
+  that supports profile loading would read the right settings file (assuming it used the settings model.)
+- If we choose to store the shell extension cache in the registry, we would need to avoid doing so in portable mode.

scratch/ScratchIslandApp/SampleApp/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
 </packages>

scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj

@@ -17,8 +17,6 @@
 
   <PropertyGroup Label="NuGet Dependencies">
     <TerminalCppWinrt>true</TerminalCppWinrt>
-    <TerminalXamlApplicationToolkit>true</TerminalXamlApplicationToolkit>
-    <TerminalVCRTForwarders>true</TerminalVCRTForwarders>
     <TerminalThemeHelpers>true</TerminalThemeHelpers>
   </PropertyGroup>
 

scratch/ScratchIslandApp/WindowExe/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.7.3" targetFramework="native" />
-  <package id="Microsoft.VCRTForwarders.140" version="1.0.4" targetFramework="native" />
 </packages>

src/buffer/out/OutputCellIterator.cpp

@@ -113,7 +113,7 @@ OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const
 // - This is an iterator over legacy colors only. The text is not modified.
 // Arguments:
 // - legacyAttrs - One legacy color item per cell
-OutputCellIterator::OutputCellIterator(const gsl::span<const WORD> legacyAttrs) noexcept :
+OutputCellIterator::OutputCellIterator(const std::span<const WORD> legacyAttrs) noexcept :
     _mode(Mode::LegacyAttr),
     _currentView(s_GenerateViewLegacyAttr(til::at(legacyAttrs, 0))),
     _run(legacyAttrs),
@@ -128,7 +128,7 @@ OutputCellIterator::OutputCellIterator(const gsl::span<const WORD> legacyAttrs)
 // - This is an iterator over legacy cell data. We will use the unicode text and the legacy color attribute.
 // Arguments:
 // - charInfos - Multiple cell with unicode text and legacy color data.
-OutputCellIterator::OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept :
+OutputCellIterator::OutputCellIterator(const std::span<const CHAR_INFO> charInfos) noexcept :
     _mode(Mode::CharInfo),
     _currentView(s_GenerateView(til::at(charInfos, 0))),
     _run(charInfos),
@@ -143,7 +143,7 @@ OutputCellIterator::OutputCellIterator(const gsl::span<const CHAR_INFO> charInfo
 // - This is an iterator over existing OutputCells with full text and color data.
 // Arguments:
 // - cells - Multiple cells in a run
-OutputCellIterator::OutputCellIterator(const gsl::span<const OutputCell> cells) :
+OutputCellIterator::OutputCellIterator(const std::span<const OutputCell> cells) :
     _mode(Mode::Cell),
     _currentView(s_GenerateView(til::at(cells, 0))),
     _run(cells),
@@ -181,15 +181,15 @@ OutputCellIterator::operator bool() const noexcept
         }
         case Mode::Cell:
         {
-            return _pos < std::get<gsl::span<const OutputCell>>(_run).size();
+            return _pos < std::get<std::span<const OutputCell>>(_run).size();
         }
         case Mode::CharInfo:
         {
-            return _pos < std::get<gsl::span<const CHAR_INFO>>(_run).size();
+            return _pos < std::get<std::span<const CHAR_INFO>>(_run).size();
         }
         case Mode::LegacyAttr:
         {
-            return _pos < std::get<gsl::span<const WORD>>(_run).size();
+            return _pos < std::get<std::span<const WORD>>(_run).size();
         }
         default:
             FAIL_FAST_HR(E_NOTIMPL);
@@ -268,7 +268,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateView(til::at(std::get<gsl::span<const OutputCell>>(_run), _pos));
+            _currentView = s_GenerateView(til::at(std::get<std::span<const OutputCell>>(_run), _pos));
         }
         break;
     }
@@ -278,7 +278,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateView(til::at(std::get<gsl::span<const CHAR_INFO>>(_run), _pos));
+            _currentView = s_GenerateView(til::at(std::get<std::span<const CHAR_INFO>>(_run), _pos));
         }
         break;
     }
@@ -288,7 +288,7 @@ OutputCellIterator& OutputCellIterator::operator++()
         _pos++;
         if (operator bool())
         {
-            _currentView = s_GenerateViewLegacyAttr(til::at(std::get<gsl::span<const WORD>>(_run), _pos));
+            _currentView = s_GenerateViewLegacyAttr(til::at(std::get<std::span<const WORD>>(_run), _pos));
         }
         break;
     }

src/buffer/out/OutputCellIterator.hpp

@@ -39,9 +39,9 @@ public:
     OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit = 0) noexcept;
     OutputCellIterator(const std::wstring_view utf16Text) noexcept;
     OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute& attribute, const size_t fillLimit = 0) noexcept;
-    OutputCellIterator(const gsl::span<const WORD> legacyAttributes) noexcept;
-    OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept;
-    OutputCellIterator(const gsl::span<const OutputCell> cells);
+    OutputCellIterator(const std::span<const WORD> legacyAttributes) noexcept;
+    OutputCellIterator(const std::span<const CHAR_INFO> charInfos) noexcept;
+    OutputCellIterator(const std::span<const OutputCell> cells);
     ~OutputCellIterator() = default;
 
     OutputCellIterator& operator=(const OutputCellIterator& it) = default;
@@ -87,13 +87,13 @@ private:
     };
     Mode _mode;
 
-    gsl::span<const WORD> _legacyAttrs;
+    std::span<const WORD> _legacyAttrs;
 
     std::variant<
         std::wstring_view,
-        gsl::span<const WORD>,
-        gsl::span<const CHAR_INFO>,
-        gsl::span<const OutputCell>,
+        std::span<const WORD>,
+        std::span<const CHAR_INFO>,
+        std::span<const OutputCell>,
         std::monostate>
         _run;
 

src/buffer/out/OutputCellRect.cpp

@@ -34,9 +34,9 @@ OutputCellRect::OutputCellRect(const til::CoordType rows, const til::CoordType c
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Read/write span of OutputCells
-gsl::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
+std::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
 {
-    return gsl::span<OutputCell>(_FindRowOffset(row), _cols);
+    return std::span<OutputCell>(_FindRowOffset(row), _cols);
 }
 
 // Routine Description:
@@ -47,7 +47,7 @@ gsl::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
 // - Read-only iterator of OutputCells
 OutputCellIterator OutputCellRect::GetRowIter(const til::CoordType row) const
 {
-    const gsl::span<const OutputCell> view(_FindRowOffset(row), _cols);
+    const std::span<const OutputCell> view(_FindRowOffset(row), _cols);
 
     return OutputCellIterator(view);
 }

src/buffer/out/OutputCellRect.hpp

@@ -32,7 +32,7 @@ public:
     OutputCellRect() noexcept;
     OutputCellRect(const til::CoordType rows, const til::CoordType cols);
 
-    gsl::span<OutputCell> GetRow(const til::CoordType row);
+    std::span<OutputCell> GetRow(const til::CoordType row);
     OutputCellIterator GetRowIter(const til::CoordType row) const;
 
     til::CoordType Height() const noexcept;

src/buffer/out/Row.cpp

@@ -4,7 +4,10 @@
 #include "precomp.h"
 #include "Row.hpp"
 
+#include <til/unicode.h>
+
 #include "textBuffer.hpp"
+#include "../../types/inc/GlyphWidth.hpp"
 
 // The STL is missing a std::iota_n analogue for std::iota, so I made my own.
 template<typename OutIt, typename Diff, typename T>
@@ -85,19 +88,6 @@ ROW::ROW(wchar_t* charsBuffer, uint16_t* charOffsetsBuffer, uint16_t rowWidth, c
     }
 }
 
-void swap(ROW& lhs, ROW& rhs) noexcept
-{
-    std::swap(lhs._charsBuffer, rhs._charsBuffer);
-    std::swap(lhs._charsHeap, rhs._charsHeap);
-    std::swap(lhs._chars, rhs._chars);
-    std::swap(lhs._charOffsets, rhs._charOffsets);
-    std::swap(lhs._attr, rhs._attr);
-    std::swap(lhs._columnCount, rhs._columnCount);
-    std::swap(lhs._lineRendition, rhs._lineRendition);
-    std::swap(lhs._wrapForced, rhs._wrapForced);
-    std::swap(lhs._doubleBytePadded, rhs._doubleBytePadded);
-}
-
 void ROW::SetWrapForced(const bool wrap) noexcept
 {
     _wrapForced = wrap;
@@ -151,84 +141,46 @@ void ROW::_init() noexcept
     std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
 }
 
-// Routine Description:
-// - resizes ROW to new width
-// Arguments:
-// - charsBuffer - a new backing buffer to use for _charsBuffer
-// - charOffsetsBuffer - a new backing buffer to use for _charOffsets
-// - rowWidth - the new width, in cells
-// - fillAttribute - the attribute to use for any newly added, trailing cells
-void ROW::Resize(wchar_t* charsBuffer, uint16_t* charOffsetsBuffer, uint16_t rowWidth, const TextAttribute& fillAttribute)
-{
-    // A default-constructed ROW has no cols/chars to copy.
-    // It can be detected by the lack of a _charsBuffer (among others).
-    //
-    // Otherwise, this block figures out how much we can copy into the new `rowWidth`.
-    uint16_t colsToCopy = 0;
-    uint16_t charsToCopy = 0;
-    if (_charsBuffer)
-    {
-        colsToCopy = std::min(rowWidth, _columnCount);
-        // Safety: colsToCopy is [0, _columnCount].
-        charsToCopy = _uncheckedCharOffset(colsToCopy);
-        // Safety: colsToCopy is [0, _columnCount] due to colsToCopy != 0.
-        for (; colsToCopy != 0 && _uncheckedIsTrailer(colsToCopy); --colsToCopy)
-        {
-        }
-    }
-
-    // If we grow the row width, we have to append a bunch of whitespace.
-    // `trailingWhitespace` stores that amount.
-    // Safety: The preceding block left colsToCopy in the range [0, rowWidth].
-    const uint16_t trailingWhitespace = rowWidth - colsToCopy;
-
-    // Allocate memory for the new `_chars` array.
-    // Use the provided charsBuffer if possible, otherwise allocate a `_charsHeap`.
-    std::unique_ptr<wchar_t[]> charsHeap;
-    std::span chars{ charsBuffer, rowWidth };
-    const std::span charOffsets{ charOffsetsBuffer, ::base::strict_cast<size_t>(rowWidth) + 1u };
-    if (const uint16_t charsCapacity = charsToCopy + trailingWhitespace; charsCapacity > rowWidth)
-    {
-        charsHeap = std::make_unique_for_overwrite<wchar_t[]>(charsCapacity);
-        chars = { charsHeap.get(), charsCapacity };
-    }
-
-    // Copy chars and charOffsets over.
-    {
-        const auto it = std::copy_n(_chars.begin(), charsToCopy, chars.begin());
-        std::fill_n(it, trailingWhitespace, L' ');
-    }
-    {
-        const auto it = std::copy_n(_charOffsets.begin(), colsToCopy, charOffsets.begin());
-        // The _charOffsets array is 1 wider than newWidth indicates.
-        // This is because the extra column contains the past-the-end index into _chars.
-        iota_n(it, trailingWhitespace + 1u, charsToCopy);
-    }
-
-    _charsBuffer = charsBuffer;
-    _charsHeap = std::move(charsHeap);
-    _chars = chars;
-    _charOffsets = charOffsets;
-    _columnCount = rowWidth;
-
-    // .resize_trailing_extent() doesn't work if the vector is empty,
-    // since there's no trailing item that could be extended.
-    if (_attr.empty())
-    {
-        _attr = { rowWidth, fillAttribute };
-    }
-    else
-    {
-        _attr.resize_trailing_extent(rowWidth);
-    }
-}
-
 void ROW::TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& attr, til::CoordType newWidth)
 {
     _attr = attr;
     _attr.resize_trailing_extent(gsl::narrow<uint16_t>(newWidth));
 }
 
+// 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
+{
+    return _adjustBackward(_clampedColumn(column - 1));
+}
+
+// Returns the next possible cursor position, following the given column.
+// Returns the row width if column is beyond the width of the row.
+til::CoordType ROW::NavigateToNext(til::CoordType column) const noexcept
+{
+    return _adjustForward(_clampedColumn(column + 1));
+}
+
+uint16_t ROW::_adjustBackward(uint16_t column) const noexcept
+{
+    // Safety: This is a little bit more dangerous. The first column is supposed
+    // to never be a trailer and so this loop should exit if column == 0.
+    for (; _uncheckedIsTrailer(column); --column)
+    {
+    }
+    return column;
+}
+
+uint16_t ROW::_adjustForward(uint16_t column) const noexcept
+{
+    // Safety: This is a little bit more dangerous. The last column is supposed
+    // to never be a trailer and so this loop should exit if column == _columnCount.
+    for (; _uncheckedIsTrailer(column); ++column)
+    {
+    }
+    return column;
+}
+
 // Routine Description:
 // - clears char data in column in row
 // Arguments:
@@ -375,90 +327,245 @@ void ROW::ReplaceAttributes(const til::CoordType beginIndex, const til::CoordTyp
     _attr.replace(_clampedColumnInclusive(beginIndex), _clampedColumnInclusive(endIndex), newAttr);
 }
 
-void ROW::ReplaceCharacters(til::CoordType columnBegin, til::CoordType width, const std::wstring_view& chars)
+[[msvc::forceinline]] ROW::WriteHelper::WriteHelper(ROW& row, til::CoordType columnBegin, til::CoordType columnLimit, const std::wstring_view& chars) noexcept :
+    row{ row },
+    chars{ chars }
 {
-    const auto colBeg = _clampedUint16(columnBegin);
-    const auto colEnd = _clampedUint16(columnBegin + width);
+    colBeg = row._clampedColumnInclusive(columnBegin);
+    colLimit = row._clampedColumnInclusive(columnLimit);
+    chBegDirty = row._uncheckedCharOffset(colBeg);
+    colBegDirty = row._adjustBackward(colBeg);
+    leadingSpaces = colBeg - colBegDirty;
+    chBeg = chBegDirty + leadingSpaces;
+    colEnd = colBeg;
+    colEndDirty = 0;
+    charsConsumed = 0;
+}
 
-    if (colBeg >= colEnd || colEnd > _columnCount || chars.empty())
+[[msvc::forceinline]] bool ROW::WriteHelper::IsValid() const noexcept
+{
+    return colBeg < colLimit && !chars.empty();
+}
+
+void ROW::ReplaceCharacters(til::CoordType columnBegin, til::CoordType width, const std::wstring_view& chars)
+try
+{
+    WriteHelper h{ *this, columnBegin, _columnCount, chars };
+    if (!h.IsValid())
     {
         return;
     }
+    h.ReplaceCharacters(width);
+    h.Finish();
+}
+catch (...)
+{
+    // Due to this function writing _charOffsets first, then calling _resizeChars (which may throw) and only then finally
+    // filling in _chars, we might end up in a situation were _charOffsets contains offsets outside of the _chars array.
+    // --> Restore this row to a known "okay"-state.
+    Reset(TextAttribute{});
+    throw;
+}
 
-    // Safety:
-    // * colBeg is now [0, _columnCount)
-    // * colEnd is now (colBeg, _columnCount]
+[[msvc::forceinline]] void ROW::WriteHelper::ReplaceCharacters(til::CoordType width) noexcept
+{
+    const auto colEndNew = gsl::narrow_cast<uint16_t>(colEnd + width);
+    if (colEndNew > colLimit)
+    {
+        colEndDirty = colLimit;
+    }
+    else
+    {
+        til::at(row._charOffsets, colEnd++) = chBeg;
+        for (; colEnd < colEndNew; ++colEnd)
+        {
+            til::at(row._charOffsets, colEnd) = gsl::narrow_cast<uint16_t>(chBeg | CharOffsetsTrailer);
+        }
 
-    // Algorithm explanation
+        colEndDirty = colEnd;
+        charsConsumed = chars.size();
+    }
+}
+
+void ROW::ReplaceText(RowWriteState& state)
+try
+{
+    WriteHelper h{ *this, state.columnBegin, state.columnLimit, state.text };
+    if (!h.IsValid())
+    {
+        state.columnEnd = h.colBeg;
+        state.columnBeginDirty = h.colBeg;
+        state.columnEndDirty = h.colBeg;
+        return;
+    }
+    h.ReplaceText();
+    h.Finish();
+
+    state.text = state.text.substr(h.charsConsumed);
+    // Here's why we set `state.columnEnd` to `colLimit` if there's remaining text:
+    // Callers should be able to use `state.columnEnd` as the next cursor position, as well as the parameter for a
+    // follow-up call to ReplaceAttributes(). But if we fail to insert a wide glyph into the last column of a row,
+    // that last cell (which now contains padding whitespace) should get the same attributes as the rest of the
+    // string so that the row looks consistent. This requires us to return `colLimit` instead of `colLimit - 1`.
+    // Additionally, this has the benefit that callers can detect line wrapping by checking `columnEnd >= columnLimit`.
+    state.columnEnd = state.text.empty() ? h.colEnd : h.colLimit;
+    state.columnBeginDirty = h.colBegDirty;
+    state.columnEndDirty = h.colEndDirty;
+}
+catch (...)
+{
+    Reset(TextAttribute{});
+    throw;
+}
+
+[[msvc::forceinline]] void ROW::WriteHelper::ReplaceText() noexcept
+{
+    size_t ch = chBeg;
+
+    for (const auto& s : til::utf16_iterator{ chars })
+    {
+        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;
+            break;
+        }
+
+        til::at(row._charOffsets, colEnd++) = gsl::narrow_cast<uint16_t>(ch);
+        if (wide)
+        {
+            til::at(row._charOffsets, colEnd++) = gsl::narrow_cast<uint16_t>(ch | CharOffsetsTrailer);
+        }
+
+        colEndDirty = colEnd;
+        ch += s.size();
+    }
+
+    charsConsumed = ch - chBeg;
+}
+
+til::CoordType ROW::CopyRangeFrom(til::CoordType columnBegin, til::CoordType columnLimit, const ROW& other, til::CoordType& otherBegin, til::CoordType otherLimit)
+try
+{
+    const auto otherColBeg = other._clampedColumnInclusive(otherBegin);
+    const auto otherColLimit = other._clampedColumnInclusive(otherLimit);
+    std::span<uint16_t> charOffsets;
+    std::wstring_view chars;
+
+    if (otherColBeg < otherColLimit)
+    {
+        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 = { other._chars.data() + charsOffset, other._chars.size() - charsOffset };
+    }
+
+    WriteHelper h{ *this, columnBegin, columnLimit, chars };
+    if (!h.IsValid())
+    {
+        return h.colBeg;
+    }
+    // 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();
+
+    otherBegin += h.colEnd - h.colBeg;
+    return h.colEndDirty;
+}
+catch (...)
+{
+    Reset(TextAttribute{});
+    throw;
+}
+
+[[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...
+    const auto colEndDirtyInput = std::min(gsl::narrow_cast<uint16_t>(colLimit - colBeg), gsl::narrow<uint16_t>(charOffsets.size() - 1));
+
+    // ...since the colLimit might intersect with a wide glyph in `charOffset`, we need to adjust our input-colEnd.
+    auto colEndInput = colEndDirtyInput;
+    for (; WI_IsFlagSet(til::at(charOffsets, colEndInput), CharOffsetsTrailer); --colEndInput)
+    {
+    }
+
+    const auto baseOffset = til::at(charOffsets, 0);
+    const auto endOffset = til::at(charOffsets, colEndInput);
+    const auto inToOutOffset = gsl::narrow_cast<uint16_t>(chBeg - baseOffset);
+
+    // 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);
+    }
+
+    colEndDirty = gsl::narrow_cast<uint16_t>(colBeg + colEndDirtyInput);
+    charsConsumed = endOffset - baseOffset;
+}
+
+[[msvc::forceinline]] void ROW::WriteHelper::Finish()
+{
+    colEndDirty = row._adjustForward(colEndDirty);
+
+    const uint16_t trailingSpaces = colEndDirty - colEnd;
+    const auto chEndDirtyOld = row._uncheckedCharOffset(colEndDirty);
+    const auto chEndDirty = chBegDirty + charsConsumed + leadingSpaces + trailingSpaces;
+
+    if (chEndDirty != chEndDirtyOld)
+    {
+        row._resizeChars(colEndDirty, chBegDirty, chEndDirty, chEndDirtyOld);
+    }
+
+    {
+        // std::copy_n compiles to memmove. We can do better. It also gets rid of an extra branch,
+        // because std::copy_n avoids calling memmove if the count is 0. It's never 0 for us.
+        const auto itBeg = row._chars.begin() + chBeg;
+        memcpy(&*itBeg, chars.data(), charsConsumed * sizeof(wchar_t));
+
+        if (leadingSpaces)
+        {
+            fill_n_small(row._chars.begin() + chBegDirty, leadingSpaces, L' ');
+            iota_n(row._charOffsets.begin() + colBegDirty, leadingSpaces, chBegDirty);
+        }
+        if (trailingSpaces)
+        {
+            fill_n_small(itBeg + charsConsumed, trailingSpaces, L' ');
+            iota_n(row._charOffsets.begin() + colEnd, trailingSpaces, gsl::narrow_cast<uint16_t>(chBeg + charsConsumed));
+        }
+    }
+
+    // This updates `_doubleBytePadded` whenever we write the last column in the row. `_doubleBytePadded` tells our text
+    // reflow algorithm whether it should ignore the last column. This is important when writing wide characters into
+    // the terminal: If the last wide character in a row only fits partially, we should render whitespace, but
+    // during text reflow pretend as if no whitespace exists. After all, the user didn't write any whitespace there.
     //
-    // Task:
-    //   Replace the characters in cells [colBeg, colEnd) with a single `width`-wide glyph consisting of `chars`.
-    //
-    // Problem:
-    //   Imagine that we have the following ROW contents:
-    //     "xxyyzz"
-    //   xx, yy, zz are 2 cell wide glyphs. We want to insert a 2 cell wide glyph ww at colBeg 1:
-    //       ^^
-    //       ww
-    //   An incorrect result would be:
-    //     "xwwyzz"
-    //   The half cut off x and y glyph wouldn't make much sense, so we need to fill them with whitespace:
-    //     " ww zz"
-    //
-    // Solution:
-    //   Given the range we want to replace [colBeg, colEnd), we "extend" it to encompass leading (preceding)
-    //   and trailing wide glyphs we partially overwrite resulting in the range [colExtBeg, colExtEnd), where
-    //   colExtBeg <= colBeg and colExtEnd >= colEnd. In other words, the to be replaced range has been "extended".
-    //   The amount of leading whitespace we need to insert is thus colBeg - colExtBeg
-    //   and the amount of trailing whitespace colExtEnd - colEnd.
-
-    // Extend range downwards (leading whitespace)
-    uint16_t colExtBeg = colBeg;
-    // Safety: colExtBeg is [0, _columnCount], because colBeg is.
-    const uint16_t chExtBeg = _uncheckedCharOffset(colExtBeg);
-    // Safety: colExtBeg remains [0, _columnCount] due to colExtBeg != 0.
-    for (; colExtBeg != 0 && _uncheckedIsTrailer(colExtBeg); --colExtBeg)
+    // The way this is written, it'll set `_doubleBytePadded` to `true` no matter whether a wide character didn't fit,
+    // or if the last 2 columns contain a wide character and a narrow character got written into the left half of it.
+    // In both cases `trailingSpaces` is 1 and fills the last column and `_doubleBytePadded` will be `true`.
+    if (colEndDirty == row._columnCount)
     {
-    }
-
-    // Extend range upwards (trailing whitespace)
-    uint16_t colExtEnd = colEnd;
-    // Safety: colExtEnd cannot be incremented past _columnCount, because the last
-    // _charOffset at index _columnCount will never get the CharOffsetsTrailer flag.
-    for (; _uncheckedIsTrailer(colExtEnd); ++colExtEnd)
-    {
-    }
-    // Safety: After the previous loop colExtEnd is [0, _columnCount].
-    const uint16_t chExtEnd = _uncheckedCharOffset(colExtEnd);
-
-    const uint16_t leadingSpaces = colBeg - colExtBeg;
-    const uint16_t trailingSpaces = colExtEnd - colEnd;
-    const size_t chExtEndNew = chars.size() + leadingSpaces + trailingSpaces + chExtBeg;
-
-    if (chExtEndNew != chExtEnd)
-    {
-        _resizeChars(colExtEnd, chExtBeg, chExtEnd, chExtEndNew);
-    }
-
-    // Add leading/trailing whitespace and copy chars
-    {
-        auto it = _chars.begin() + chExtBeg;
-        it = fill_n_small(it, leadingSpaces, L' ');
-        it = copy_n_small(chars.begin(), chars.size(), it);
-        it = fill_n_small(it, trailingSpaces, L' ');
-    }
-    // Update char offsets with leading/trailing whitespace and the chars columns.
-    {
-        auto chPos = chExtBeg;
-        auto it = _charOffsets.begin() + colExtBeg;
-
-        it = iota_n_mut(it, leadingSpaces, chPos);
-
-        *it++ = chPos;
-        it = fill_small(it, _charOffsets.begin() + colEnd, gsl::narrow_cast<uint16_t>(chPos | CharOffsetsTrailer));
-        chPos = gsl::narrow_cast<uint16_t>(chPos + chars.size());
-
-        it = iota_n_mut(it, trailingSpaces, chPos);
+        row.SetDoubleBytePadded(colEnd < row._columnCount);
     }
 }
 
@@ -466,15 +573,15 @@ void ROW::ReplaceCharacters(til::CoordType columnBegin, til::CoordType width, co
 // as it reallocates the backing buffer and shifts the char offsets.
 // The parameters are difficult to explain, but their names are identical to
 // local variables in ReplaceCharacters() which I've attempted to document there.
-void ROW::_resizeChars(uint16_t colExtEnd, uint16_t chExtBeg, uint16_t chExtEnd, size_t chExtEndNew)
+void ROW::_resizeChars(uint16_t colEndDirty, uint16_t chBegDirty, size_t chEndDirty, uint16_t chEndDirtyOld)
 {
-    const auto diff = chExtEndNew - chExtEnd;
+    const auto diff = chEndDirty - chEndDirtyOld;
     const auto currentLength = _charSize();
     const auto newLength = currentLength + diff;
 
     if (newLength <= _chars.size())
     {
-        std::copy_n(_chars.begin() + chExtEnd, currentLength - chExtEnd, _chars.begin() + chExtEndNew);
+        std::copy_n(_chars.begin() + chEndDirtyOld, currentLength - chEndDirtyOld, _chars.begin() + chEndDirty);
     }
     else
     {
@@ -484,14 +591,14 @@ void ROW::_resizeChars(uint16_t colExtEnd, uint16_t chExtBeg, uint16_t chExtEnd,
         auto charsHeap = std::make_unique_for_overwrite<wchar_t[]>(newCapacity);
         const std::span chars{ charsHeap.get(), newCapacity };
 
-        std::copy_n(_chars.begin(), chExtBeg, chars.begin());
-        std::copy_n(_chars.begin() + chExtEnd, currentLength - chExtEnd, chars.begin() + chExtEndNew);
+        std::copy_n(_chars.begin(), chBegDirty, chars.begin());
+        std::copy_n(_chars.begin() + chEndDirtyOld, currentLength - chEndDirtyOld, chars.begin() + chEndDirty);
 
         _charsHeap = std::move(charsHeap);
         _chars = chars;
     }
 
-    auto it = _charOffsets.begin() + colExtEnd;
+    auto it = _charOffsets.begin() + colEndDirty;
     const auto end = _charOffsets.end();
     for (; it != end; ++it)
     {
@@ -499,6 +606,11 @@ void ROW::_resizeChars(uint16_t colExtEnd, uint16_t chExtBeg, uint16_t chExtEnd,
     }
 }
 
+til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() noexcept
+{
+    return _attr;
+}
+
 const til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() const noexcept
 {
     return _attr;
@@ -527,6 +639,12 @@ uint16_t ROW::size() const noexcept
     return _columnCount;
 }
 
+til::CoordType ROW::LineRenditionColumns() const noexcept
+{
+    const auto scale = _lineRendition != LineRendition::SingleWidth ? 1 : 0;
+    return _columnCount >> scale;
+}
+
 til::CoordType ROW::MeasureLeft() const noexcept
 {
     const auto text = GetText();
@@ -681,11 +799,13 @@ uint16_t ROW::_charSize() const noexcept
 // Safety: col must be [0, _columnCount].
 uint16_t ROW::_uncheckedCharOffset(size_t col) const noexcept
 {
+    assert(col < _charOffsets.size());
     return til::at(_charOffsets, col) & CharOffsetsMask;
 }
 
 // Safety: col must be [0, _columnCount].
 bool ROW::_uncheckedIsTrailer(size_t col) const noexcept
 {
+    assert(col < _charOffsets.size());
     return WI_IsFlagSet(til::at(_charOffsets, col), CharOffsetsTrailer);
 }

src/buffer/out/Row.hpp

@@ -20,8 +20,6 @@ Revision History:
 
 #pragma once
 
-#include <span>
-
 #include <til/rle.h>
 
 #include "LineRendition.hpp"
@@ -37,6 +35,28 @@ enum class DelimiterClass
     RegularChar
 };
 
+struct RowWriteState
+{
+    // The text you want to write into the given ROW. When ReplaceText() returns,
+    // this is updated to remove all text from the beginning that was successfully written.
+    std::wstring_view text; // IN/OUT
+    // 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 = 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.
+    // If you want to continue writing where you left off, this is also the next columnBegin parameter.
+    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
+};
+
 class ROW final
 {
 public:
@@ -46,11 +66,9 @@ public:
     ROW(const ROW& other) = delete;
     ROW& operator=(const ROW& other) = delete;
 
-    explicit ROW(ROW&& other) = default;
+    ROW(ROW&& other) = default;
     ROW& operator=(ROW&& other) = default;
 
-    friend void swap(ROW& lhs, ROW& rhs) noexcept;
-
     void SetWrapForced(const bool wrap) noexcept;
     bool WasWrapForced() const noexcept;
     void SetDoubleBytePadded(const bool doubleBytePadded) noexcept;
@@ -59,19 +77,25 @@ public:
     LineRendition GetLineRendition() const noexcept;
 
     void Reset(const TextAttribute& attr);
-    void Resize(wchar_t* charsBuffer, uint16_t* charOffsetsBuffer, uint16_t rowWidth, const TextAttribute& fillAttribute);
     void TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& attr, til::CoordType newWidth);
 
+    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);
     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);
+    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;
     TextAttribute GetAttrByColumn(til::CoordType column) const;
     std::vector<uint16_t> GetHyperlinks() const;
     uint16_t size() const noexcept;
+    til::CoordType LineRenditionColumns() const noexcept;
     til::CoordType MeasureLeft() const noexcept;
     til::CoordType MeasureRight() const noexcept;
     bool ContainsText() const noexcept;
@@ -89,6 +113,50 @@ public:
 #endif
 
 private:
+    // WriteHelper exists because other forms of abstracting this functionality away (like templates with lambdas)
+    // where only very poorly optimized by MSVC as it failed to inline the templates.
+    struct WriteHelper
+    {
+        explicit WriteHelper(ROW& row, til::CoordType columnBegin, til::CoordType columnLimit, const std::wstring_view& chars) noexcept;
+        bool IsValid() const noexcept;
+        void ReplaceCharacters(til::CoordType width) noexcept;
+        void ReplaceText() noexcept;
+        void CopyRangeFrom(const std::span<const uint16_t>& charOffsets) noexcept;
+        void Finish();
+
+        // Parent pointer.
+        ROW& row;
+        // The text given by the caller.
+        const std::wstring_view& chars;
+
+        // This is the same as the columnBegin parameter for ReplaceText(), etc.,
+        // but clamped to a valid range via _clampedColumnInclusive.
+        uint16_t colBeg;
+        // This is the same as the columnLimit parameter for ReplaceText(), etc.,
+        // but clamped to a valid range via _clampedColumnInclusive.
+        uint16_t colLimit;
+
+        // 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.
+        // If you want to continue writing where you left off, this is also the next columnBegin parameter.
+        uint16_t colEnd;
+        // 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.
+        uint16_t colBegDirty;
+        // Similar to dirtyBeg, this is 1 past the last column that was modified and will be 1 past colEnd if
+        // we overwrote the leading half of a wide glyph and had to fill the trailing half with whitespace.
+        uint16_t colEndDirty;
+        // The offset in ROW::chars at which we start writing the contents of WriteHelper::chars.
+        uint16_t chBeg;
+        // The offset at which we start writing leadingSpaces-many whitespaces.
+        uint16_t chBegDirty;
+        // The same as `colBeg - colBegDirty`. This is the amount of whitespace
+        // we write at chBegDirty, before the actual WriteHelper::chars content.
+        uint16_t leadingSpaces;
+        // The amount of characters copied from WriteHelper::chars.
+        size_t charsConsumed;
+    };
+
     // To simplify the detection of wide glyphs, we don't just store the simple character offset as described
     // for _charOffsets. Instead we use the most significant bit to indicate whether any column is the
     // trailing half of a wide glyph. This simplifies many implementation details via _uncheckedIsTrailer.
@@ -102,13 +170,16 @@ private:
     template<typename T>
     constexpr uint16_t _clampedColumnInclusive(T v) const noexcept;
 
+    uint16_t _adjustBackward(uint16_t column) const noexcept;
+    uint16_t _adjustForward(uint16_t column) const noexcept;
+
     wchar_t _uncheckedChar(size_t off) const noexcept;
     uint16_t _charSize() const noexcept;
     uint16_t _uncheckedCharOffset(size_t col) const noexcept;
     bool _uncheckedIsTrailer(size_t col) const noexcept;
 
     void _init() noexcept;
-    void _resizeChars(uint16_t colExtEnd, uint16_t chExtBeg, uint16_t chExtEnd, size_t chExtEndNew);
+    void _resizeChars(uint16_t colEndDirty, uint16_t chBegDirty, size_t chEndDirty, uint16_t chEndDirtyOld);
 
     // These fields are a bit "wasteful", but it makes all this a bit more robust against
     // programming errors during initial development (which is when this comment was written).

src/buffer/out/TextColor.cpp

@@ -64,7 +64,7 @@ bool TextColor::CanBeBrightened() const noexcept
 
 bool TextColor::IsLegacy() const noexcept
 {
-    return (IsIndex16() || IsIndex256()) && _index < 16;
+    return IsIndex16() || (IsIndex256() && _index < 16);
 }
 
 bool TextColor::IsIndex16() const noexcept
@@ -82,11 +82,6 @@ bool TextColor::IsDefault() const noexcept
     return _meta == ColorType::IsDefault;
 }
 
-bool TextColor::IsDefaultOrLegacy() const noexcept
-{
-    return _meta != ColorType::IsRgb && _index < 16;
-}
-
 bool TextColor::IsRgb() const noexcept
 {
     return _meta == ColorType::IsRgb;

src/buffer/out/TextColor.h

@@ -37,14 +37,12 @@ Revision History:
 #include "WexTestClass.h"
 #endif
 
-// The enum values being in this particular order allows the compiler to do some useful optimizations,
-// like simplifying `IsIndex16() || IsIndex256()` into a simple range check without branching.
 enum class ColorType : BYTE
 {
-    IsDefault,
-    IsIndex16,
-    IsIndex256,
-    IsRgb
+    IsIndex256 = 0x0,
+    IsIndex16 = 0x1,
+    IsDefault = 0x2,
+    IsRgb = 0x3
 };
 
 enum class ColorAlias : size_t
@@ -123,7 +121,6 @@ public:
     bool IsIndex16() const noexcept;
     bool IsIndex256() const noexcept;
     bool IsDefault() const noexcept;
-    bool IsDefaultOrLegacy() const noexcept;
     bool IsRgb() const noexcept;
 
     void SetColor(const COLORREF rgbColor) noexcept;