Merge remote-tracking branch 'origin/dev/cazamor/SUI/nullable-color-picker' into dev/lhecker/bugbash

# Conflicts:
#	src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -1,6 +1,7 @@
 name: "Bug report 🐛"
 description: Report errors or unexpected behavior
 labels: [Issue-Bug, Needs-Triage]
+type: Bug
 body:
 - type: markdown
   attributes:
@@ -12,7 +13,7 @@ body:
 - type: input
   attributes:
     label: Windows Terminal version
-    placeholder: "1.7.3651.0"
+    placeholder: "1.21.2701.0"
     description: |
       You can copy the version number from the About dialog. Open the About dialog by opening the menu with the "V" button (to the right of the "+" button that opens a new tab) and choosing About from the end of the list.
   validations:
@@ -21,7 +22,7 @@ body:
 - type: input
   attributes:
     label: Windows build number
-    placeholder: "10.0.19042.0"
+    placeholder: "10.0.22621.0"
     description: |
       Please run `ver` or `[Environment]::OSVersion`.
   validations:
@@ -32,9 +33,9 @@ body:
     label: Other Software
     description: If you're reporting a bug about our interaction with other software, what software? What versions?
     placeholder: |
-      vim 8.2 (inside WSL)
-      OpenSSH_for_Windows_8.1p1
-      My Cool Application v0.3 (include a code snippet if it would help!)
+      vim 9.1 (inside WSL)
+      OpenSSH_for_Windows_9.5p1
+      My Cool Application v0.4 (include a code snippet if it would help!)
   validations:
     required: false
 

.github/ISSUE_TEMPLATE/Documentation_Issue.md

@@ -1,10 +0,0 @@
----
-name: "Documentation Issue 📚"
-about: Report issues in our documentation
-title: ''
-labels: Issue-Docs
-assignees: ''
-
----
-
-<!-- Briefly describe which document needs to be corrected and why. -->

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -1,35 +0,0 @@
----
-name: "Feature Request/Idea 🚀"
-about: Suggest a new feature or improvement (this does not mean you have to implement
-  it)
-title: ''
-labels: Issue-Feature
-assignees: ''
-
----
-
-<!-- 
-🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
-
-I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
-1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
-2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
-3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
-4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
-5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
-
-All good? Then proceed!
--->
-
-# Description of the new feature/enhancement
-
-<!-- 
-A clear and concise description of what the problem is that the new feature would solve.
-Describe why and how a user would use this new functionality (if applicable).
--->
-
-# Proposed technical implementation details (optional)
-
-<!-- 
-A clear and concise description of what you want to happen.
--->

.github/ISSUE_TEMPLATE/Feature_Request.yml

@@ -0,0 +1,20 @@
+name: "Feature Request/Idea 🚀"
+description: Suggest a new feature or improvement (this does not mean you have to implement it)
+labels: [Issue-Feature]
+type: Feature
+body:
+- type: textarea
+  attributes:
+    label: Description of the new feature
+    description: A clear and concise description of what the problem is that the new feature would solve.
+    placeholder: |
+      ... and guess what? I have four Terminals. And I have a hover car, and a hover house. And my computer's a runner, and it shows.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Proposed technical implementation details
+    description: This field is optional. If you have any ideas, let us know!
+  validations:
+    required: false

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

@@ -1,10 +1,13 @@
 aci
+AIIs
+AILLM
 allcolors
 breadcrumb
 breadcrumbs
 ccmp
 ccon
 clickable
+cmark
 CMMI
 colorbrewer
 consvc
@@ -22,16 +25,22 @@ Emacspeak
 Fitt
 FTCS
 gantt
+gfm
 ghe
 gje
 godbolt
+gpt
 hyperlinking
 hyperlinks
+ILM
+Kbds
 kje
 libfuzzer
 liga
 lje
 Llast
+lm
+llm
 Lmid
 locl
 lol
@@ -43,8 +52,10 @@ mkmk
 mnt
 mru
 nje
+NTMTo
 notwrapped
 ogonek
+openai
 overlined
 perlw
 postmodern
@@ -54,6 +65,7 @@ pwn
 pwshw
 qof
 qps
+Quarternary
 quickfix
 rclt
 reimplementation

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

@@ -43,6 +43,7 @@ DONTADDTORECENT
 DWMSBT
 DWMWA
 DWORDLONG
+EMPH
 endfor
 ENDSESSION
 enumset
@@ -62,11 +63,12 @@ GETDESKWALLPAPER
 GETHIGHCONTRAST
 GETMOUSEHOVERTIME
 GETTEXTLENGTH
+HARDBREAKS
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
-hinternet
 HIGHQUALITYSCALE
+hinternet
 HINTERNET
 hotkeys
 href
@@ -96,11 +98,10 @@ IGraphics
 IImage
 IInheritable
 IMap
-IMonarch
+imm
 IObject
 iosfwd
 IPackage
-IPeasant
 isa
 ISetup
 isspace
@@ -114,6 +115,7 @@ IUri
 IVirtual
 KEYSELECT
 LCID
+LINEBREAK
 llabs
 llu
 localtime
@@ -147,7 +149,9 @@ NIF
 NIN
 NOAGGREGATION
 NOASYNC
+NOBREAKS
 NOCHANGEDIR
+NOCRLF
 NOPROGRESS
 NOREDIRECTIONBITMAP
 NOREPEAT
@@ -155,6 +159,7 @@ NOTIFYBYPOS
 NOTIFYICON
 NOTIFYICONDATA
 ntprivapi
+NTSYSCALLAPI
 numr
 oaidl
 ocidl
@@ -173,6 +178,7 @@ PALLOC
 PATINVERT
 PEXPLICIT
 PICKFOLDERS
+PINPUT
 pmr
 ptstr
 QUERYENDSESSION
@@ -201,6 +207,7 @@ SINGLEUSE
 SIZENS
 smoothstep
 snprintf
+SOFTBREAK
 spsc
 sregex
 SRWLOC
@@ -248,6 +255,7 @@ wcsnlen
 wcsstr
 wcstoui
 WDJ
+wincrypt
 winhttp
 wininet
 winmain

.github/actions/spelling/excludes.txt

@@ -104,7 +104,9 @@
 ^doc/reference/UTF8-torture-test\.txt$
 ^doc/reference/windows-terminal-logo\.ans$
 ^oss/
+^NOTICE.md
 ^samples/PixelShaders/Screenshots/
+^src/cascadia/TerminalSettingsEditor/SegoeFluentIconList.h$
 ^src/interactivity/onecore/BgfxEngine\.
 ^src/renderer/atlas/
 ^src/renderer/wddmcon/WddmConRenderer\.
@@ -128,3 +130,4 @@
 ^XamlStyler\.json$
 ignore$
 Resources/(?!en)
+^\.vsconfig$

.github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt

@@ -1,5 +0,0 @@
-EOB
-swrapped
-wordi
-wordiswrapped
-wrappe

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

@@ -1,20 +1,15 @@
-AAAAA
-AAAAAAAAAAAAA
 AAAAAABBBBBBCCC
 AAAAABBBBBBCCC
 abcd
 abcd
 ABCDEFGHIJ
 abcdefghijk
-ABCDEFGHIJKLMNO
-abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRS
 ABCDEFGHIJKLMNOPQRST
 ABCG
 ABE
 abf
 BBBBB
-BBBBBBBB
 BBBBBCCC
 BBBBCCCCC
 BBGGRR
@@ -29,10 +24,8 @@ QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJPQRST
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
-qrstuvwxyz
 qwerty
 qwertyuiopasdfg
-YYYYYYYDDDDDDDDDDD
 ZAAZZ
 ZABBZ
 ZBAZZ

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

@@ -9,7 +9,6 @@ ABORTIFHUNG
 ACCESSTOKEN
 acidev
 ACIOSS
-ACover
 acp
 actctx
 ACTCTXW
@@ -17,7 +16,8 @@ ADDALIAS
 ADDREF
 ADDSTRING
 ADDTOOL
-AFew
+adml
+admx
 AFill
 AFX
 AHelper
@@ -39,6 +39,7 @@ ANSISYS
 ANSISYSRC
 ANSISYSSC
 answerback
+ANSWERBACKMESSAGE
 antialiasing
 ANull
 anycpu
@@ -53,6 +54,7 @@ appium
 appletname
 applicationmodel
 APPLMODAL
+Applocal
 appmodel
 APPWINDOW
 APPXMANIFESTVERSION
@@ -65,7 +67,6 @@ ARRAYSIZE
 ARROWKEYS
 asan
 ASBSET
-asdfghjkl
 ASetting
 ASingle
 ASYNCDONTCARE
@@ -87,6 +88,7 @@ Autowrap
 AVerify
 awch
 azurecr
+AZZ
 backgrounded
 Backgrounder
 backgrounding
@@ -124,6 +126,7 @@ BKCOLOR
 BKGND
 Bksp
 Blt
+blu
 BLUESCROLL
 bmi
 BODGY
@@ -142,8 +145,8 @@ BTNFACE
 bufferout
 buffersize
 buflen
+buildsystems
 buildtransitive
-burriter
 BValue
 bytebuffer
 cac
@@ -162,6 +165,7 @@ CBN
 cbt
 Ccc
 CCCBB
+CCCDDD
 cch
 CCHAR
 CCmd
@@ -170,6 +174,7 @@ CCom
 CConsole
 CCRT
 cdd
+cds
 CELLSIZE
 cfae
 cfie
@@ -179,7 +184,6 @@ CFuzz
 cgscrn
 chafa
 changelists
-charinfo
 CHARSETINFO
 chh
 chshdng
@@ -208,7 +212,6 @@ cmw
 CNL
 cnn
 Codeflow
-codenav
 codepages
 codepath
 coinit
@@ -264,7 +267,6 @@ consolegit
 consolehost
 CONSOLEIME
 consoleinternal
-Consoleroot
 CONSOLESETFOREGROUND
 consoletaeftemplates
 consoleuwp
@@ -280,6 +282,8 @@ contypes
 conwinuserrefs
 coordnew
 COPYCOLOR
+COPYDATA
+COPYDATASTRUCT
 CORESYSTEM
 cotaskmem
 countof
@@ -341,6 +345,7 @@ CXVIRTUALSCREEN
 CXVSCROLL
 CYFRAME
 CYFULLSCREEN
+cygdrive
 CYHSCROLL
 CYMIN
 CYPADDEDBORDER
@@ -360,12 +365,14 @@ DBGFONTS
 DBGOUTPUT
 dbh
 dblclk
+Dcd
 DColor
 DCOLORVALUE
 dcommon
 dcompiler
 DComposition
 dde
+DDDCCC
 DDESHARE
 DDevice
 DEADCHAR
@@ -377,7 +384,7 @@ DECALN
 DECANM
 DECARM
 DECAUPSS
-DECAWM
+decawm
 DECBI
 DECBKM
 DECCARA
@@ -385,7 +392,7 @@ DECCIR
 DECCKM
 DECCKSR
 DECCOLM
-DECCRA
+deccra
 DECCTR
 DECDC
 DECDHL
@@ -397,7 +404,7 @@ DECEKBD
 DECERA
 DECFI
 DECFNK
-DECFRA
+decfra
 DECGCI
 DECGCR
 DECGNL
@@ -419,6 +426,7 @@ DECPCCM
 DECPCTERM
 DECPS
 DECRARA
+decrc
 DECRC
 DECREQTPARM
 DECRLM
@@ -434,6 +442,7 @@ DECRSPS
 decrst
 DECSACE
 DECSASD
+decsc
 DECSC
 DECSCA
 DECSCNM
@@ -473,7 +482,6 @@ DEFPUSHBUTTON
 defterm
 DELAYLOAD
 DELETEONRELEASE
-Delt
 depersist
 deprioritized
 deserializers
@@ -554,7 +562,6 @@ Efast
 efghijklmn
 EHsc
 EINS
-EJO
 ELEMENTNOTAVAILABLE
 EMPTYBOX
 enabledelayedexpansion
@@ -565,10 +572,12 @@ entrypoints
 ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
+EOB
 EOK
 EPres
 EQU
 ERASEBKGND
+ERRORONEXIT
 ESFCIB
 esrp
 ESV
@@ -624,7 +633,6 @@ FINDDOWN
 FINDREGEX
 FINDSTRINGEXACT
 FINDUP
-FIter
 FITZPATRICK
 FIXEDFILEINFO
 Flg
@@ -721,12 +729,12 @@ GETWHEELSCROLLLINES
 Gfun
 gfx
 GGI
+GHgh
 GHIJK
 GHIJKL
 gitcheckin
 gitfilters
 gitlab
-gitmodules
 gle
 GLOBALFOCUS
 GLYPHENTRY
@@ -784,6 +792,7 @@ HIWORD
 HKCU
 hkey
 hkl
+HKLM
 hlocal
 hlsl
 HMB
@@ -866,6 +875,7 @@ INLINEPREFIX
 inproc
 Inputkeyinfo
 Inputreadhandledata
+INPUTSCOPE
 INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
@@ -915,6 +925,7 @@ Keymapping
 keyscan
 keystate
 keyups
+Kickstart
 KILLACTIVE
 KILLFOCUS
 kinda
@@ -946,7 +957,6 @@ LCONTROL
 LCTRL
 lcx
 LEFTALIGN
-libpopcnt
 libsancov
 libtickit
 licate
@@ -1021,7 +1031,6 @@ lstatus
 lstrcmp
 lstrcmpi
 LTEXT
-LTLTLTLTL
 ltsc
 LUID
 luma
@@ -1044,7 +1053,6 @@ MAPBITMAP
 MAPVIRTUALKEY
 MAPVK
 MAXDIMENSTRING
-maxing
 MAXSHORT
 maxval
 maxversiontested
@@ -1117,7 +1125,6 @@ msrc
 MSVCRTD
 MTSM
 Munged
-munges
 murmurhash
 muxes
 myapplet
@@ -1219,7 +1226,6 @@ ntlpcapi
 ntm
 ntrtl
 ntstatus
-NTSYSCALLAPI
 nttree
 nturtl
 ntuser
@@ -1235,6 +1241,7 @@ NUMSCROLL
 NUnit
 nupkg
 NVIDIA
+NVT
 OACR
 objbase
 ocolor
@@ -1295,6 +1302,7 @@ parms
 PATCOPY
 pathcch
 PATTERNID
+pbstr
 pcb
 pcch
 PCCHAR
@@ -1380,9 +1388,11 @@ POSTCHARBREAKS
 POSX
 POSXSCROLL
 POSYSCROLL
+ppbstr
 PPEB
 ppf
 ppidl
+pprg
 PPROC
 ppropvar
 ppsi
@@ -1409,6 +1419,7 @@ processenv
 processhost
 PROCESSINFOCLASS
 PRODEXT
+Productize
 PROPERTYID
 PROPERTYKEY
 propertyval
@@ -1460,6 +1471,7 @@ QWER
 Qxxxxxxxxxxxxxxx
 qzmp
 RAII
+Ralph
 RALT
 rasterbar
 rasterfont
@@ -1502,7 +1514,6 @@ REGSTR
 RELBINPATH
 remoting
 renamer
-renderengine
 rendersize
 reparented
 reparenting
@@ -1526,7 +1537,6 @@ rftp
 rgbi
 RGBQUAD
 rgbs
-rgci
 rgfae
 rgfte
 rgn
@@ -1604,6 +1614,7 @@ SELECTALL
 SELECTEDFONT
 SELECTSTRING
 Selfhosters
+Serbo
 SERVERDLL
 SETACTIVE
 SETBUDDYINT
@@ -1698,6 +1709,7 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
+SRGS
 srvinit
 srvpipe
 ssa
@@ -1735,6 +1747,7 @@ swapchain
 swapchainpanel
 SWMR
 SWP
+swrapped
 SYMED
 SYNCPAINT
 syscalls
@@ -1816,6 +1829,7 @@ TITLEISLINKNAME
 TJson
 TLambda
 TLDP
+tldr
 TLEN
 TMAE
 TMPF
@@ -1831,8 +1845,6 @@ TOPDOWNDIB
 TOpt
 tosign
 touchpad
-Tpp
-Tpqrst
 tracelogging
 traceviewpp
 trackbar
@@ -1842,11 +1854,9 @@ Trd
 TREX
 triaged
 triaging
-Tribool
 TRIMZEROHEADINGS
 trx
 tsa
-tsattrs
 tsgr
 tsm
 TStr
@@ -1936,7 +1946,6 @@ uxtheme
 Vanara
 vararg
 vclib
-vcprintf
 vcxitems
 vectorize
 VERCTRL
@@ -1959,7 +1968,6 @@ VPACKMANIFESTDIRECTORY
 VPR
 VREDRAW
 vsc
-vsconfig
 vscprintf
 VSCROLL
 vsdevshell
@@ -1976,11 +1984,8 @@ vswhere
 vtapp
 VTE
 VTID
-vtio
 vtmode
 vtpipeterm
-vtpt
-vtrenderer
 VTRGB
 VTRGBTo
 vtseq
@@ -2016,6 +2021,7 @@ WHelper
 wic
 WIDTHSCROLL
 Widthx
+Wiggum
 wil
 WImpl
 WINAPI
@@ -2069,14 +2075,12 @@ Winperf
 WInplace
 winres
 winrt
-wintelnet
 winternl
 winuser
 winuserp
 WINVER
 wistd
 wmain
-wmemory
 WMSZ
 wnd
 WNDALLOC
@@ -2087,6 +2091,8 @@ WNDCLASSW
 Wndproc
 WNegative
 WNull
+wordi
+wordiswrapped
 workarea
 WOutside
 WOWARM
@@ -2100,6 +2106,7 @@ WPrep
 WPresent
 wprp
 wprpi
+wrappe
 wregex
 writeback
 WRITECONSOLE
@@ -2143,6 +2150,7 @@ XBUTTONDOWN
 XBUTTONUP
 XCast
 XCENTER
+xchar
 xcopy
 XCount
 xdy
@@ -2170,16 +2178,15 @@ XTWINOPS
 xunit
 xutr
 XVIRTUALSCREEN
-XWalk
 yact
 YCast
 YCENTER
 YCount
+yizz
 YLimit
 YPan
 YSubstantial
 YVIRTUALSCREEN
-YWalk
 Zab
 zabcd
 Zabcdefghijklmn
@@ -2187,6 +2194,6 @@ Zabcdefghijklmnopqrstuvwxyz
 ZCmd
 ZCtrl
 ZWJs
-zxcvbnm
 ZYXWVU
 ZYXWVUTd
+zzf

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

@@ -22,6 +22,7 @@ vcvars\w*
 ROY\sG\.\sBIV
 !(?:(?i)ESC)!\[
 !(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
+(?i)rgb:[a-z0-9]{2,4}/[a-z0-9]{2,4}/[a-z0-9]{2,4}
 
 # SSE intrinsics like "_mm_subs_epu16"
 \b_mm(?:|256|512)_\w+\b

.github/workflows/addToProject.yml

@@ -13,7 +13,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v1.0.1
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/microsoft/projects/159
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.github/workflows/similarIssues.yml

@@ -1,33 +0,0 @@
-name: GitGudSimilarIssues comments
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  getSimilarIssues:
-    runs-on: ubuntu-latest
-    outputs:
-      message: ${{ steps.getBody.outputs.message }}
-    steps:
-      - id: getBody
-        uses: craigloewen-msft/GitGudSimilarIssues@main
-        with:
-          issueTitle: ${{ github.event.issue.title }}
-          issueBody: ${{ github.event.issue.body }}
-          repo: ${{ github.repository }}
-          similaritytolerance: "0.8"
-  add-comment:
-    needs: getSimilarIssues
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    if: needs.getSimilarIssues.outputs.message != ''
-    steps:
-      - name: Add comment
-        run: gh issue comment "$NUMBER" --repo "$REPO" --body "$BODY"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NUMBER: ${{ github.event.issue.number }}
-          REPO: ${{ github.repository }}
-          BODY: ${{ needs.getSimilarIssues.outputs.message }}

.gitmodules

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

.vsconfig

@@ -1,35 +1,51 @@
 {
   "version": "1.0",
   "components": [
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
+    "Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
+    "Microsoft.VisualStudio.Component.SQL.CLR",
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.VisualStudio.Workload.Universal",
-    "Microsoft.VisualStudio.Workload.NativeDesktop",
-    "Microsoft.VisualStudio.Workload.ManagedDesktop",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
+    "Microsoft.Net.Component.4.8.SDK",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.VisualStudio.Component.TextTemplating",
     "Microsoft.VisualStudio.Component.NuGet",
-    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
-    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
-    "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
-    "Microsoft.Component.MSBuild",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
-    "Microsoft.Net.Component.4.TargetingPack",
-    "Microsoft.Net.Component.4.5.TargetingPack",
+    "Microsoft.NetCore.Component.Runtime.8.0",
+    "Microsoft.NetCore.Component.SDK",
+    "Microsoft.VisualStudio.Component.AppInsights.Tools",
+    "Microsoft.Net.Component.4.8.TargetingPack",
     "Microsoft.VisualStudio.Component.DiagnosticTools",
-    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
+    "Microsoft.NetCore.Component.Runtime.6.0",
+    "Microsoft.VisualStudio.Component.ClassDesigner",
+    "Microsoft.VisualStudio.Component.GraphDocument",
+    "Microsoft.VisualStudio.Component.CodeMap",
     "Microsoft.VisualStudio.Component.VC.CoreIde",
-    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
-    "Microsoft.VisualStudio.Component.Graphics",
-    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
+    "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
+    "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs",
+    "Microsoft.ComponentGroup.Blend",
+    "Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native",
+    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
+    "Microsoft.VisualStudio.Component.Vcpkg",
+    "Microsoft.Component.NetFX.Native",
+    "Microsoft.VisualStudio.Component.Graphics",
+    "Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin",
+    "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",
+    "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC",
     "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
-    "Microsoft.VisualStudio.Component.VC.ASAN",
-    "Microsoft.VisualStudio.Component.VC.v143.x86.x64",
-    "Microsoft.VisualStudio.Component.VC.v143.ARM64",
+    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v143",
-    "Microsoft.VisualStudio.Component.UWP.VC.ARM64"
-  ]
+    "Microsoft.VisualStudio.Workload.NativeDesktop",
+    "Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites",
+    "Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
+    "Microsoft.VisualStudio.Workload.Universal"
+  ],
+  "extensions": []
 }

.wt.json

@@ -0,0 +1,34 @@
+{
+    "$version": "1.0.0",
+    "snippets":
+    [
+        {
+            "input": "bx\r",
+            "name": "Build project",
+            "description": "Build the project in the CWD"
+        },
+        {
+            "input": "bz\r",
+            "name": "Build solution, incremental",
+            "description": "Just build changes to the solution"
+        },
+        {
+            "input": "bcz\r",
+            "name": "Clean & build solution",
+            "icon": "\uE8e6",
+            "description": "Start over. Go get your coffee. "
+        },
+        {
+            "input": "nuget push -ApiKey az -source TerminalDependencies %userprofile%\\Downloads",
+            "name": "Upload package to nuget feed",
+            "icon": "\uE898",
+            "description": "Go download a .nupkg, put it in ~/Downloads, and use this to push to our private feed."
+        },
+        {
+            "input": "runut /name:**\u001b[D",
+            "name": "Run a test",
+            "icon": "",
+            "description": "Enter the name of a test to run"
+        }
+    ]
+}

Directory.Build.props

@@ -41,6 +41,11 @@
     -->
     <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);bin\**</MSBuildCacheIdenticalDuplicateOutputPatterns>
 
+    <!-- 
+      vcpkg is invoked for each and every vcxproj and each invocation uses the same base dir for logging, so allow these duplicate "outputs".
+    -->
+    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);obj\*\vcpkg\**</MSBuildCacheIdenticalDuplicateOutputPatterns>
+
     <!-- version of MSBuildCache is not part of the cache key -->
     <PackagesConfigFile>$(MSBuildThisFileDirectory)\dep\nuget\packages.config</PackagesConfigFile>
     <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>

NOTICE.md

@@ -84,71 +84,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ```
 
-## kimwalisch/libpopcnt
-
-**Source**: [https://github.com/kimwalisch/libpopcnt](https://github.com/kimwalisch/libpopcnt)
-
-### License
-
-```
-BSD 2-Clause License
-
-Copyright (c) 2016 - 2019, Kim Walisch
-Copyright (c) 2016 - 2019, Wojciech Muła
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. 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.
-
-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 OWNER 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.
-```
-
-## dynamic_bitset
-
-**Source**: [https://github.com/pinam45/dynamic_bitset](https://github.com/pinam45/dynamic_bitset)
-
-### License
-
-```
-MIT License
-
-Copyright (c) 2019 Maxime Pinard
-
-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.
-```
-
 ## \{fmt\}
 
 **Source**: [https://github.com/fmtlib/fmt](https://github.com/fmtlib/fmt)
@@ -346,6 +281,181 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 ```
 
+## cmark
+**Source**: [https://github.com/commonmark/cmark](https://github.com/commonmark/cmark)
+
+### License
+Copyright (c) 2014, John MacFarlane
+
+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.
+
+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
+OWNER 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.
+
+-----
+
+houdini.h, houdini_href_e.c, houdini_html_e.c, houdini_html_u.c
+
+derive from https://github.com/vmg/houdini (with some modifications)
+
+Copyright (C) 2012 Vicent Martí
+
+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.
+
+-----
+
+buffer.h, buffer.c, chunk.h
+
+are derived from code (C) 2012 Github, Inc.
+
+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.
+
+-----
+
+utf8.c and utf8.c
+
+are derived from utf8proc
+(<http://www.public-software-group.org/utf8proc>),
+(C) 2009 Public Software Group e. V., Berlin, Germany.
+
+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.
+
+-----
+
+The normalization code in normalize.py was derived from the
+markdowntest project, Copyright 2013 Karl Dubost:
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Karl Dubost
+
+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.
+
+-----
+
+The CommonMark spec (test/spec.txt) is
+
+Copyright (C) 2014-15 John MacFarlane
+
+Released under the Creative Commons CC-BY-SA 4.0 license:
+<http://creativecommons.org/licenses/by-sa/4.0/>.
+
+-----
+
+The test software in test/ is
+
+Copyright (c) 2014, John MacFarlane
+
+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.
+
+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
+OWNER 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
 
 This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.

NuGet.Config

@@ -4,7 +4,7 @@
         <clear />
         <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
         <!--<add key="Static Package Dependencies" value="dep\packages" />-->
-        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
+        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
     </packageSources>
     <disabledPackageSources>
         <clear />

OpenConsole.sln

@@ -131,7 +131,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InteractivityWin32", "src\interactivity\win32\lib\win32.LIB.vcxproj", "{06EC74CB-9A12-429C-B551-8532EC964726}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1C959542-BAC2-4E55-9A6D-13251914CBB9} = {1C959542-BAC2-4E55-9A6D-13251914CBB9}
-		{990F2657-8580-4828-943F-5DD657D11842} = {990F2657-8580-4828-943F-5DD657D11842}
 		{AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F} = {AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F}
 	EndProjectSection
 EndProject
@@ -140,14 +139,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InteractivityBase", "src\interactivity\base\lib\InteractivityBase.vcxproj", "{06EC74CB-9A12-429C-B551-8562EC964846}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interactivity.Win32.Tests.Unit", "src\interactivity\win32\ut_interactivity_win32\Interactivity.Win32.UnitTests.vcxproj", "{D3B92829-26CB-411A-BDA2-7F5DA3D25DD4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{990F2657-8580-4828-943F-5DD657D11842} = {990F2657-8580-4828-943F-5DD657D11842}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CloseTest", "src\tools\closetest\CloseTest.vcxproj", "{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererVt", "src\renderer\vt\lib\vt.vcxproj", "{990F2657-8580-4828-943F-5DD657D11842}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VtPipeTerm", "src\tools\vtpipeterm\VtPipeTerm.vcxproj", "{814DBDDE-894E-4327-A6E1-740504850098}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
@@ -157,8 +151,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConEchoKey", "src\tools\ech
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types", "src\types\lib\types.vcxproj", "{18D09A24-8240-42D6-8CB6-236EEE820263}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererVt.unittest", "src\renderer\vt\ut_lib\vt.unittest.vcxproj", "{990F2657-8580-4828-943F-5DD657D11843}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BufferOut", "src\buffer\out\lib\bufferout.vcxproj", "{0CF235BD-2DA0-407E-90EE-C467E8BBC714}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalConnection", "src\cascadia\TerminalConnection\TerminalConnection.vcxproj", "{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}"
@@ -186,7 +178,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Control"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj", "{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
@@ -196,6 +187,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {6085A85F-59A9-41CA-AE74-8F4922AAE55E}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
@@ -247,6 +239,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {6085A85F-59A9-41CA-AE74-8F4922AAE55E}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
@@ -323,12 +316,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAzBridge", "src\cas
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxproj", "{6BAE5851-50D5-4934-8D5E-30361A8A40F3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
+		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
@@ -358,26 +349,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_SettingsModel", "
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MonarchPeasantSample", "src\tools\MonarchPeasantSample\MonarchPeasantSample.vcxproj", "{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
-	EndProjectSection
-EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MonarchPeasantPackage", "src\tools\MonarchPeasantPackage\MonarchPeasantPackage.wapproj", "{F75E29D0-D288-478B-8D83-2C190F321A3F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting.Lib", "src\cascadia\Remoting\Microsoft.Terminal.RemotingLib.vcxproj", "{43CE4CE5-0010-4B99-9569-672670D26E26}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting", "src\cascadia\Remoting\dll\Microsoft.Terminal.Remoting.vcxproj", "{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Remoting", "src\cascadia\UnitTests_Remoting\Remoting.UnitTests.vcxproj", "{68A10CD3-AA64-465B-AF5F-ED4E9700543C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
-		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wpf", "wpf", "{4DAF0299-495E-4CD1-A982-9BAC16A45932}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenConsoleProxy", "src\host\proxy\Host.Proxy.vcxproj", "{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}"
@@ -413,8 +384,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalStress", "src\tools
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingTests", "src\tools\RenderingTests\RenderingTests.vcxproj", "{37C995E0-2349-4154-8E77-4A52C0C7F46D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Query.Extension", "src\cascadia\QueryExtension\Microsoft.Terminal.Query.Extension.vcxproj", "{6085A85F-59A9-41CA-AE74-8F4922AAE55E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\cascadia\UIHelpers\UIHelpers.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI.Markdown", "src\cascadia\UIMarkdown\UIMarkdown.vcxproj", "{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchcat", "src\tools\benchcat\benchcat.vcxproj", "{2C836962-9543-4CE5-B834-D28E1F124B66}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleMonitor", "src\tools\ConsoleMonitor\ConsoleMonitor.vcxproj", "{328729E9-6723-416E-9C98-951F1473BBE1}"
@@ -1119,29 +1097,6 @@ Global
 		{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}.Release|x64.Build.0 = Release|x64
 		{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}.Release|x86.ActiveCfg = Release|Win32
 		{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}.Release|x86.Build.0 = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.AuditMode|x64.ActiveCfg = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.AuditMode|x86.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|ARM64.Build.0 = Debug|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|x64.ActiveCfg = Debug|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|x64.Build.0 = Debug|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|x86.ActiveCfg = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Debug|x86.Build.0 = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|Any CPU.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|ARM64.ActiveCfg = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|ARM64.Build.0 = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|x64.ActiveCfg = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|x64.Build.0 = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|x86.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11842}.Release|x86.Build.0 = Release|Win32
 		{814DBDDE-894E-4327-A6E1-740504850098}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{814DBDDE-894E-4327-A6E1-740504850098}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{814DBDDE-894E-4327-A6E1-740504850098}.AuditMode|x64.ActiveCfg = Release|x64
@@ -1212,28 +1167,6 @@ Global
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x64.Build.0 = Release|x64
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.ActiveCfg = Release|Win32
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.Release|x86.Build.0 = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.AuditMode|x64.ActiveCfg = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.AuditMode|x86.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|ARM64.Build.0 = Debug|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|x64.ActiveCfg = Debug|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|x64.Build.0 = Debug|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|x86.ActiveCfg = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Debug|x86.Build.0 = Debug|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|Any CPU.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|ARM64.ActiveCfg = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|ARM64.Build.0 = Release|ARM64
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|x64.ActiveCfg = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|x64.Build.0 = Release|x64
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|x86.ActiveCfg = Release|Win32
-		{990F2657-8580-4828-943F-5DD657D11843}.Release|x86.Build.0 = Release|Win32
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
@@ -1801,32 +1734,6 @@ Global
 		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x64.Build.0 = Release|x64
 		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.ActiveCfg = Release|Win32
 		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.Build.0 = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.ActiveCfg = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.Build.0 = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.ActiveCfg = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.Build.0 = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|Any CPU.ActiveCfg = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.Build.0 = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.ActiveCfg = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.Build.0 = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.ActiveCfg = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.Build.0 = Release|Win32
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|Any CPU.ActiveCfg = Debug|Any CPU
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|ARM64.ActiveCfg = Debug|Any CPU
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|x64.ActiveCfg = Debug|Any CPU
@@ -2004,135 +1911,6 @@ Global
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.Build.0 = Release|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|x64.ActiveCfg = Release|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|x86.ActiveCfg = Release|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x64.ActiveCfg = Debug|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x64.Build.0 = Debug|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x86.ActiveCfg = Debug|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x86.Build.0 = Debug|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|ARM64.Build.0 = Release|ARM64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x64.ActiveCfg = Release|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x64.Build.0 = Release|x64
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.ActiveCfg = Release|Win32
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.Build.0 = Release|Win32
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.ActiveCfg = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Build.0 = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Deploy.0 = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.ActiveCfg = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Build.0 = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Deploy.0 = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.ActiveCfg = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Build.0 = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Deploy.0 = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.ActiveCfg = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Build.0 = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Deploy.0 = Debug|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.ActiveCfg = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Build.0 = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Deploy.0 = Debug|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|x64.ActiveCfg = Release|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|x86.ActiveCfg = Release|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Build.0 = Release|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Deploy.0 = Release|ARM64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.ActiveCfg = Release|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Build.0 = Release|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Deploy.0 = Release|x64
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.ActiveCfg = Release|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.Build.0 = Release|x86
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.Deploy.0 = Release|x86
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x64.ActiveCfg = Release|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x64.Build.0 = Release|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|ARM64.Build.0 = Debug|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x64.ActiveCfg = Debug|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x64.Build.0 = Debug|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x86.ActiveCfg = Debug|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x86.Build.0 = Debug|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|Any CPU.ActiveCfg = Release|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|ARM64.ActiveCfg = Release|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|ARM64.Build.0 = Release|ARM64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x64.ActiveCfg = Release|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x64.Build.0 = Release|x64
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x86.ActiveCfg = Release|Win32
-		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x86.Build.0 = Release|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x64.ActiveCfg = Release|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x64.ActiveCfg = Debug|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x64.Build.0 = Debug|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x86.ActiveCfg = Debug|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x86.Build.0 = Debug|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|ARM64.Build.0 = Release|ARM64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x64.ActiveCfg = Release|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x64.Build.0 = Release|x64
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x86.ActiveCfg = Release|Win32
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x86.Build.0 = Release|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x64.ActiveCfg = Debug|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x64.Build.0 = Debug|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x86.ActiveCfg = Debug|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x86.Build.0 = Debug|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|Any CPU.ActiveCfg = Release|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|ARM64.Build.0 = Release|ARM64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x64.ActiveCfg = Release|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x64.Build.0 = Release|x64
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x86.ActiveCfg = Release|Win32
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x86.Build.0 = Release|Win32
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
@@ -2360,6 +2138,29 @@ Global
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM64.ActiveCfg = Release|ARM64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x64.ActiveCfg = Release|x64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.ActiveCfg = Release|Win32
+		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.Build.0 = Release|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x64.ActiveCfg = Debug|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x64.Build.0 = Debug|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x86.ActiveCfg = Debug|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x86.Build.0 = Debug|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|Any CPU.ActiveCfg = Release|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|ARM64.Build.0 = Release|ARM64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x64.ActiveCfg = Release|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x64.Build.0 = Release|x64
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x86.ActiveCfg = Release|Win32
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x86.Build.0 = Release|Win32
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|x64.ActiveCfg = AuditMode|x64
@@ -2383,6 +2184,28 @@ Global
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.Build.0 = Release|x64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x86.ActiveCfg = Release|Win32
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x86.Build.0 = Release|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x64.ActiveCfg = Debug|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x64.Build.0 = Debug|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x86.ActiveCfg = Debug|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x86.Build.0 = Debug|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|Any CPU.ActiveCfg = Release|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|ARM64.Build.0 = Release|ARM64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x64.ActiveCfg = Release|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x64.Build.0 = Release|x64
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x86.ActiveCfg = Release|Win32
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x86.Build.0 = Release|Win32
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x64.ActiveCfg = Release|x64
@@ -2472,11 +2295,9 @@ Global
 		{06EC74CB-9A12-429C-B551-8562EC964846} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{D3B92829-26CB-411A-BDA2-7F5DA3D25DD4} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{990F2657-8580-4828-943F-5DD657D11842} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 		{814DBDDE-894E-4327-A6E1-740504850098} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{814CBEEE-894E-4327-A6E1-740504850098} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
-		{990F2657-8580-4828-943F-5DD657D11843} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {1E4A062E-293B-4817-B20D-BF16B979E350}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {9921CA0A-320C-4460-8623-3A3196E7F4CB}
@@ -2509,7 +2330,6 @@ Global
 		{D3EF7B96-CD5E-47C9-B9A9-136259563033} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
 		{024052DE-83FB-4653-AEA4-90790D29D5BD} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{067F0A06-FCB7-472C-96E9-B03B54E8E18D} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87}
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
 		{416FD703-BAA7-4F6E-9361-64F550EC8FCA} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
@@ -2517,11 +2337,6 @@ Global
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {77875138-BB08-49F9-8BB1-409C2150E0E1}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {77875138-BB08-49F9-8BB1-409C2150E0E1}
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
-		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{F75E29D0-D288-478B-8D83-2C190F321A3F} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{43CE4CE5-0010-4B99-9569-672670D26E26} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE}
-		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE}
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{4DAF0299-495E-4CD1-A982-9BAC16A45932} = {59840756-302F-44DF-AA47-441A9D673202}
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{2D17E75D-2DDC-42C4-AD70-704D95A937AE} = {59840756-302F-44DF-AA47-441A9D673202}
@@ -2538,7 +2353,9 @@ Global
 		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
+		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {59840756-302F-44DF-AA47-441A9D673202}
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
+		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
 		{2C836962-9543-4CE5-B834-D28E1F124B66} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{328729E9-6723-416E-9C98-951F1473BBE1} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{BE92101C-04F8-48DA-99F0-E1F4F1D2DC48} = {A10C4720-DCA4-4640-9749-67F4314F527C}

README.md

@@ -1,5 +1,7 @@
 ![terminal-logos](https://github.com/microsoft/terminal/assets/91625426/333ddc76-8ab2-4eb4-a8c0-4d7b953b1179)
 
+[![Terminal Build Status](https://dev.azure.com/shine-oss/terminal/_apis/build/status%2FTerminal%20CI?branchName=main)](https://dev.azure.com/shine-oss/terminal/_build/latest?definitionId=1&branchName=main)
+
 # Welcome to the Windows Terminal, Console and Command-Line repo
 
 This repository contains the source code for:
@@ -145,15 +147,6 @@ _Learn more about the [types of Windows Terminal distributions](https://learn.mi
 The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and
 will be updated as the project proceeds.
 
-## Project Build Status
-
-Project|Build Status
----|---
-Terminal|[![Terminal Build Status](https://dev.azure.com/ms/terminal/_apis/build/status/terminal%20CI?branchName=main)](https://dev.azure.com/ms/terminal/_build?definitionId=136)
-ColorTool|![Colortool Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
-
----
-
 ## Terminal & Console Overview
 
 Please take a few minutes to review the overview below before diving into the

Scratch.sln

@@ -29,8 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Props", "Common Prop
 		src\wap-common.build.pre.props = src\wap-common.build.pre.props
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxproj", "{6BAE5851-50D5-4934-8D5E-30361A8A40F3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types", "src\types\lib\types.vcxproj", "{18D09A24-8240-42D6-8CB6-236EEE820263}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}"
@@ -159,30 +157,6 @@ Global
 		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x64.Build.0 = Release|x64
 		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.ActiveCfg = Release|Win32
 		{B4427499-9FDE-4208-B456-5BC580637633}.Release|x86.Build.0 = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x64.Build.0 = AuditMode|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.ActiveCfg = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x64.Build.0 = Debug|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.ActiveCfg = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Debug|x86.Build.0 = Debug|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x64.Build.0 = Fuzzing|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|ARM64.Build.0 = Release|ARM64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.ActiveCfg = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x64.Build.0 = Release|x64
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.ActiveCfg = Release|Win32
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3}.Release|x86.Build.0 = Release|Win32
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
 		{18D09A24-8240-42D6-8CB6-236EEE820263}.AuditMode|x64.ActiveCfg = AuditMode|x64
@@ -212,7 +186,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {75AC9360-76FD-4ABC-AFEC-EF342BD2B3E9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,7 +56,15 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
+– Wir haben umgeschrieben, wie Konsolenanwendungen im Terminal gehostet werden! Melden Sie alle auftretenden Fehler.
+- Terminal unterstützt jetzt Sixels!
+- Sie können jetzt ein angedocktes Fenster öffnen, das Ausschnitte von Befehlen enthält, die Sie gespeichert haben, um sie später zu verwenden.
+- Für Benutzer der Eingabeaufforderung der neuesten Version von Windows 11 wird möglicherweise ein „Kurzer Tipp“-Symbol angezeigt, das installierbare Software von WinGet
+ vorschlägt
+- Ausgewählter Text wird jetzt viel sichtbarer (und anpassbarer!)
+- Eine Reihe von Zuverlässigkeitsfehlern, Komfortproblemen und Ärgernissen wurden behoben.
+
+Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/en-US/PDP.xml

@@ -56,6 +56,13 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Version __VERSION_NUMBER__
 
+- We've rewritten how console applications are hosted inside Terminal! Please report any bugs you encounter.
+- Terminal now supports Sixels!
+- You can now open a docked panel containing snippets of commands you have saved to use later
+- Command Prompt users on the latest Windows 11 release may see a "quick tip" icon that suggests installable software from WinGet
+- Selected text will now be much more visible (and customizable!)
+- A number of reliabilty bugs, convenience issues and annoyances have been fixed.
+
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -56,7 +56,14 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-Para más información, consulte nuestra página de versiones de GitHub.
+- Hemos reescrito cómo se hospedan las aplicaciones de consola en Terminal. Informe de los errores que encuentre.
+- Terminal ahora admite sixeles.
+- Ahora puede abrir un panel acoplado que contenga fragmentos de comandos que haya guardado para usarlos más adelante
+- Los usuarios del símbolo del sistema de la versión más reciente de Windows 11 pueden ver un icono de "sugerencia rápida" que sugiere software instalable de WinGet
+- El texto seleccionado ahora será mucho más visible (y personalizable)
+- Se han corregido varios errores de fiabilidad, problemas de comodidad y molestias.
+
+Consulte la página de versiones de GitHub para más información.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -56,7 +56,14 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-Consultez la page des versions de GitHub pour plus d’informations.
+- Nous avons réécrit la manière dont les applications de console sont hébergées dans Terminal ! Veuillez signaler tout bug que vous rencontrez.
+- Le terminal prend désormais en charge Sixels !
+- Vous pouvez désormais ouvrir un panneau ancré contenant des extraits de commandes que vous avez enregistrées pour les utiliser ultérieurement
+- Les utilisateurs de l'invite de commande sur la dernière version de Windows 11 peuvent voir une icône « astuce rapide » qui suggère un logiciel installable à partir de WinGet
+- Le texte sélectionné sera désormais beaucoup plus visible (et personnalisable !)
+- Un certain nombre de bugs de fiabilité, de problèmes de commodité et de désagréments ont été corrigés.
+
+Veuillez consulter notre page de versions GitHub pour plus de détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,9 +54,16 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__
+    Versione __VERSION_NUMBER__ 
 
-Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
+- È stato riscritto il modo in cui le applicazioni della console vengono ospitate all'interno di Terminale. Segnala eventuali bug riscontrati.
+- Terminal supporta ora Sixel.
+- È ora possibile aprire un pannello ancorato contenente frammenti di comandi salvati per usarli in seguito
+- Gli utenti del prompt dei comandi nella versione più recente di Windows 11 potrebbero visualizzare un'icona di "suggerimento rapido" che consiglia il software installabile da WinGet
+- Il testo selezionato sarà ora molto più visibile, oltre che personalizzabile.
+- Sono stati risolti diversi bug di affidabilità, problemi di praticità e fastidi.
+
+Per altri dettagli, vedi la pagina delle versioni di GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-詳細については、GitHub リリースのページをご覧ください。
+- ターミナル内でのコンソール アプリケーションのホスト方法を書き換えました。発生したバグを報告してください。
+- ターミナルで Sixels がサポートされるようになりました。
+- 後で使用するために保存したコマンドのスニペットを含むドッキング パネルを開けるようになりました
+- 最新の Windows 11 リリースのコマンド プロンプト ユーザーには、WinGet からインストール可能なソフトウェアを提案する "クイック ヒント" アイコンが表示される場合があります
+- 選択したテキストが大幅に見やすくなりました (カスタマイズも可能です)
+- 信頼性に関するバグ、利便性の問題、不快な問題の多くが修正されました。
+
+詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,6 +56,13 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
+- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다! 발생한 버그를 보고하세요.
+- 터미널에서 이제 Sixels를 지원합니다!
+- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
+- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 제안하는 "빠른 팁" 아이콘을 볼 수 있습니다.
+- 이제 선택한 텍스트가 훨씬 더 잘 표시됩니다(사용자 지정도 가능!).
+- 여러 신뢰성 버그, 편의 문제 및 성가신 사항이 수정되었습니다.
+
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -56,7 +56,14 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Versão __VERSION_NUMBER__
 
-Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
+- Reescrevemos a forma como os aplicativos de console são hospedados no Terminal! Certifique-se de reportar os bugs que você encontrar.
+- O terminal agora é compatível com o Sixels!
+- Agora você pode abrir um painel acoplado contendo snippets de comandos que você salvou para usar mais tarde
+- Os usuários do Prompt de Comando na versão mais recente do Windows 11 podem ver um ícone de "dica rápida", que sugere softwares instaláveis a partir do WinGet
+- O texto selecionado agora ficará muito mais visível (e personalizável!)
+- Vários bugs de confiabilidade, problemas de conveniência e incômodos foram resolvidos.
+
+Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-Дополнительные сведения см. на странице «Выпуски GitHub».
+– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
+– Терминал теперь поддерживает форматы Sixel!
+– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
+– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
+– Выделенный текст теперь станет более видимым (и настраиваемым!)
+– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.
+
+Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -54,7 +54,14 @@
     
   </DevStudio>
   <ReleaseNotes>
-    版本 __VERSION_NUMBER__
+    Version __VERSION_NUMBER__
+
+- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
+- 终端现在支持 Sixels!
+- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
+- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
+- 所选文本现在将具有更高的可见性(和可自定义性!)
+- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     版本 __VERSION_NUMBER__
 
-如需詳細資訊，請參閱我們的 GitHub 版本頁面。
+- 我們已重寫主機應用程式在終端機內託管的方式!請報告您遇到的錯誤。
+- 終端機現在支援 Sixels!
+- 現在，您可以開啟包含已儲存命令程式碼片段的固定面板，以供稍後使用
+- 最新 Windows 11 版本中的 [命令提示] 使用者可能會看到「快速提示」圖示，建議可自 WinGet 安裝的軟體
+- 選取的文字現在會更明顯 (且可自訂!)
+- 已修正一些可靠性錯誤、便利性問題和令人困擾的問題。
+
+如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,7 +56,14 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
+– Terminal speichert jetzt den Inhalt des Fensters, wenn Sie die Sitzungswiederherstellung verwenden.
+– Sie können jetzt mehrere Schriftarten gleichzeitig verwenden.
+– Kästchenzeichnende Zeichen werden jetzt pixelgenau gerendert.
+– Die Verwendung eines IME innerhalb des Terminals wurde erheblich verbessert.
+– Die Farbschemas in Ihrer JSON-Datei sind jetzt viel einfacher.
+– Eine Reihe von Fehlern im Zusammenhang mit der URL-Verarbeitung, Zeilen mit doppelter Breite, Zeilenumbruch und mehr wurden behoben.
+
+Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/en-US/PDP.xml

@@ -56,6 +56,13 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Version __VERSION_NUMBER__
 
+- Terminal will now remember the contents of the window when you use session restoration.
+- You can now use multiple fonts at the same time.
+- Box-drawing characters are now rendered with pixel perfection.
+- The experience of using an IME inside Terminal has been significantly improved.
+- The color schemes inside your JSON file will now be much simpler.
+- A number of bugs around URL handling, double-width rows, line wrapping, and more have been fixed.
+
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,7 +56,14 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-Para más información, consulte nuestra página de versiones de GitHub.
+- Terminal recordará ahora el contenido de la ventana cuando use la restauración de la sesión.
+- Ahora puede usar varias fuentes al mismo tiempo.
+- Los caracteres que dibujan recuadros ahora se representan con precisión de píxel.
+- Se ha mejorado significativamente la experiencia de utilizar un IME dentro de Terminal.
+- Las combinaciones de colores dentro del archivo JSON ahora serán mucho más sencillas.
+- Se han corregido varios errores relacionados con el control de direcciones URL, las filas de ancho doble, el ajuste de líneas y mucho más.
+
+Consulte la página de versiones de GitHub para más información.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,7 +56,14 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-Consultez la page des versions de GitHub pour plus d’informations.
+- Le terminal mémorisera désormais le contenu de la fenêtre lorsque vous utiliserez la restauration de session.
+- Vous pouvez désormais utiliser plusieurs polices en même temps.
+- Les personnages dessinés en boîte sont désormais rendus avec une perfection de pixel.
+- L'expérience d'utilisation d'un IME dans le Terminal a été considérablement améliorée.
+- Les schémas de couleurs à l'intérieur de votre fichier JSON seront désormais beaucoup plus simples.
+- Un certain nombre de bugs concernant la gestion des URL, les lignes à double largeur, le retour à la ligne, etc. ont été corrigés.
+
+Veuillez consulter notre page de versions GitHub pour plus de détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -54,9 +54,16 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__
+    Versione __VERSION_NUMBER__ 
 
-Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
+- Il terminale ricorda ora il contenuto della finestra quando si usa il ripristino della sessione.
+- È ora possibile usare più tipi di carattere contemporaneamente.
+- I caratteri tracciati vengono ora sottoposti a rendering con pixel di perfezionamento.
+- L'esperienza di utilizzo di un IME all'interno di Terminale è stata notevolmente migliorata.
+- Le combinazioni di colori all'interno del file JSON saranno ora molto più semplici.
+- Sono stati corretti alcuni bug relativi alla gestione degli URL, alle righe a doppia larghezza, al ritorno a capo delle righe e altro ancora.
+
+Per altri dettagli, vedi la pagina delle versioni di GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-詳細については、GitHub リリースのページをご覧ください。
+- セッションの復元を使用すると、ターミナルがウィンドウの内容を記憶するようになりました。
+- 複数のフォントを同時に使用できるようになりました。
+- ボックス描画文字がピクセル単位の精度でレンダリングされるようになりました。
+- ターミナル内での IME の使用エクスペリエンスが大幅に改善されました。
+- JSON ファイル内の配色がはるかにシンプルになりました。
+- URL 処理、二重幅の行、行の折り返しなどに関するいくつかのバグが修正されました。
+
+詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,6 +56,13 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
+- 터미널은 이제 세션 복원을 사용할 때 창의 내용을 기억합니다.
+- 이제 여러 글꼴을 동시에 사용할 수 있습니다.
+- 상자 그리기 캐릭터가 이제 픽셀 완성도로 렌더링됩니다.
+- 터미널 내에서 IME를 사용하는 환경이 크게 개선되었습니다. 
+- 이제 JSON 파일 내의 색 구성표가 훨씬 더 간단해집니다.
+- URL 처리, 이중 너비 행, 줄 바꿈 등과 관련된 여러 버그가 수정되었습니다.
+
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -56,7 +56,14 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Versão __VERSION_NUMBER__
 
-Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
+- O terminal agora se lembra do conteúdo da janela quando você usa a restauração de sessão.
+- Agora você pode usar várias fontes ao mesmo tempo.
+- Os caracteres da caixa de desenho agora são renderizados com a perfeição de pixels.
+- A experiência de usar uma IME dentro do Terminal foi significativamente aprimorada.
+- Os esquemas de cores dentro do seu arquivo JSON agora estão muito mais simples.
+- Foram corrigidos vários bugs envolvendo o tratamento de URLs, linhas de largura dupla, quebra de linha automática e muito mais.
+
+Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
+- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
+- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
+- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
+- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
+- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
+- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
+- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
+- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
+- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
+- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+
+Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-Дополнительные сведения см. на странице «Выпуски GitHub».
+– Терминал теперь будет запоминать содержимое окна при восстановлении сеанса.
+– Теперь вы можете использовать несколько шрифтов одновременно.
+– Символы псевдографики теперь отрисовываются с пиксельной точностью.
+– Значительно улучшена возможность использования IME внутри Терминала.
+– Цветовые схемы в JSON-файле теперь будут намного проще.
+– Исправлено несколько ошибок в обработке URL-адресов, строках двойной ширины, переносе строк и т. д.
+
+Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -54,7 +54,14 @@
     
   </DevStudio>
   <ReleaseNotes>
-    版本 __VERSION_NUMBER__
+    Version __VERSION_NUMBER__
+
+- 现在，使用会话还原时，终端将记住窗口的内容。
+- 现在可以同时使用多种字体。
+- 现在以像素为单位呈现框绘图字符。
+- 在终端内使用输入法的体验已得到显著提升。
+- JSON 文件中的配色方案现在要简单得多。
+- 已修复有关 URL 处理、双倍行宽、换行等大量 bug。
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -56,7 +56,14 @@
   <ReleaseNotes>
     版本 __VERSION_NUMBER__
 
-如需詳細資訊，請參閱我們的 GitHub 版本頁面。
+- 當您使用工作階段還原時，終端機現在會記住視窗的內容。
+- 現在您可以同時使用多個字型。
+- 製表格圖字元現在會以完美像素模式呈現。
+- 在終端機內使用 IME 的體驗已大幅改善。
+- JSON 檔案內的色彩配置現在將變得更簡單了。
+- 已修正一些 URL 處理、雙寬度列、換行等相關錯誤。
+
+如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/config/tsa.json

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

build/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
   <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />
   <package id="Microsoft.Debugging.Tools.SrcTool" version="20220617.1556.0" targetFramework="native" />

build/pipelines/ob-nightly.yml

@@ -28,7 +28,7 @@ extends:
     official: true
     branding: Canary
     buildTerminal: true
-    pgoBuildMode: Optimize
+    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
     codeSign: true
     signingIdentity:
       serviceName: $(SigningServiceName)

build/pipelines/ob-release.yml

@@ -27,7 +27,7 @@ parameters:
   - name: pgoBuildMode
     displayName: "PGO Build Mode"
     type: string
-    default: Optimize
+    default: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
     values:
       - Optimize
       - Instrument
@@ -47,7 +47,7 @@ parameters:
   - name: terminalInternalPackageVersion
     displayName: "Terminal Internal Package Version"
     type: string
-    default: '0.0.8'
+    default: '0.0.9'
 
   - name: publishSymbolsToPublic
     displayName: "Publish Symbols to MSDL"

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

@@ -59,10 +59,7 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
+  - template: steps-setup-versioning.yml
 
   - template: steps-download-bin-dir-artifact.yml
     parameters:

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

@@ -159,6 +159,8 @@ jobs:
       .\build\scripts\Generate-ThirdPartyNotices.ps1 -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
     displayName: Generate NOTICE.html from NOTICE.md
 
+  - template: .\steps-install-vcpkg.yml
+
   - template: .\steps-restore-nuget.yml
 
   - pwsh: |-

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

@@ -10,6 +10,6 @@ jobs:
     submodules: false
     clean: true
 
-  - powershell: |-
+  - pwsh: |-
       .\build\scripts\Invoke-FormattingCheck.ps1
     displayName: 'Run formatters'

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

@@ -69,10 +69,9 @@ jobs:
     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-setup-versioning.yml
+
   - template: steps-download-bin-dir-artifact.yml
     parameters:
       buildPlatforms: ${{ parameters.buildPlatforms }}

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

@@ -57,10 +57,7 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
+  - template: steps-setup-versioning.yml
 
   - template: steps-download-bin-dir-artifact.yml
     parameters:

build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml

@@ -44,10 +44,7 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
+  - template: steps-setup-versioning.yml
 
   - task: DownloadPipelineArtifact@2
     displayName: Download all PDBs from all prior build phases

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

@@ -43,10 +43,7 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
+  - template: steps-setup-versioning.yml
 
   - task: DownloadPipelineArtifact@2
     displayName: Download all PDBs from all prior build phases

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

@@ -38,10 +38,7 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - task: PkgESSetupBuild@12
-    displayName: Package ES - Setup Build
-    inputs:
-      disableOutputRedirect: true
+  - template: steps-setup-versioning.yml
 
   - task: DownloadPipelineArtifact@2
     displayName: Download MSIX Bundle Artifact

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

@@ -39,7 +39,7 @@ parameters:
     default: true
   - name: terminalInternalPackageVersion
     type: string
-    default: '0.0.8'
+    default: '0.0.9'
 
   - name: publishSymbolsToPublic
     type: boolean
@@ -92,10 +92,7 @@ stages:
           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
+            - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
 
             - task: UniversalPackages@0
               displayName: Download terminal-internal Universal Package
@@ -119,10 +116,7 @@ stages:
             generateSbom: ${{ parameters.generateSbom }}
             codeSign: ${{ parameters.codeSign }}
             beforeBuildSteps:
-              - task: PkgESSetupBuild@12
-                displayName: Package ES - Setup Build
-                inputs:
-                  disableOutputRedirect: true
+              - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
               # WPF doesn't need the localizations or the universal package, but if it does... put them here.
 
   - stage: Package

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

@@ -41,7 +41,7 @@ parameters:
     default: true
   - name: terminalInternalPackageVersion
     type: string
-    default: '0.0.8'
+    default: '0.0.9'
 
   - name: publishSymbolsToPublic
     type: boolean
@@ -106,11 +106,6 @@ extends:
       - stage: Build
         displayName: Build
         dependsOn: []
-        variables:
-          # This was set by the parent build, but we need to override it to select a specific compiler version
-          - template: ./build/pipelines/templates-v2/variables-onebranch-config.yml@self
-            parameters:
-              containerVersion: 1.0.02566.28
         jobs:
           - template: ./build/pipelines/templates-v2/job-build-project.yml@self
             parameters:
@@ -135,10 +130,11 @@ extends:
               codeSign: ${{ parameters.codeSign }}
               signingIdentity: ${{ parameters.signingIdentity }}
               beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - task: PkgESSetupBuild@12
-                  displayName: Package ES - Setup Build
-                  inputs:
-                    disableOutputRedirect: true
+                - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+
+                - template: ./build/pipelines/templates-v2/steps-inject-secrets.yml@self
+                  parameters:
+                    githubClientSecret: $(GithubClientSecret)
 
                 - task: UniversalPackages@0
                   displayName: Download terminal-internal Universal Package
@@ -172,10 +168,7 @@ extends:
                 codeSign: ${{ parameters.codeSign }}
                 signingIdentity: ${{ parameters.signingIdentity }}
                 beforeBuildSteps:
-                  - task: PkgESSetupBuild@12
-                    displayName: Package ES - Setup Build
-                    inputs:
-                      disableOutputRedirect: true
+                  - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
                   # WPF doesn't need the localizations or the universal package, but if it does... put them here.
 
       - stage: Package

build/pipelines/templates-v2/steps-inject-secrets.yml

@@ -0,0 +1,14 @@
+parameters:
+  - name: githubClientSecret
+    type: string
+    default: 'FineKeepYourSecrets'
+
+steps:
+  - pwsh: |-
+      $header = Get-Item src/cascadia/QueryExtension/WindowsTerminalIDAndSecret.h -ErrorAction:Ignore
+      If ($Null -ne $header) {
+        $content = Get-Content $header -ReadCount 0
+        $content = $content -Replace "FineKeepYourSecrets","${{parameters.githubClientSecret}}"
+        Set-Content $header $content
+      }
+    displayName: Inject GitHub Secret

build/pipelines/templates-v2/steps-install-vcpkg.yml

@@ -0,0 +1,16 @@
+steps:
+  - pwsh: |-
+      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -requires Microsoft.VisualStudio.Component.Vcpkg -property installationPath
+      If ([String]::IsNullOrEmpty($VsInstallRoot)) {
+        Remove-Item -Recurse -Force dep/vcpkg -ErrorAction:Ignore
+        git clone https://github.com/microsoft/vcpkg dep/vcpkg
+        cd dep/vcpkg
+        & ./bootstrap-vcpkg.bat
+        $VcpkgRoot = $PWD
+        Write-Host "Using vcpkg from local checkout ($VcpkgRoot)"
+      } Else {
+        $VcpkgRoot = Join-Path $VsInstallRoot "VC\vcpkg"
+        Write-Host "Using vcpkg from Visual Studio installation ($VcpkgRoot)"
+      }
+      echo "##vso[task.setvariable variable=VCPKG_ROOT]$VcpkgRoot"
+    displayName: Detect VS vcpkg or bootstrap locally

build/pipelines/templates-v2/steps-setup-versioning.yml

@@ -0,0 +1,6 @@
+steps:
+  - pwsh: |-
+      nuget install Microsoft.Windows.Terminal.Versioning -OutputDirectory _versioning
+      $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
+      & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "$(Build.SourcesDirectory)" -Verbose
+    displayName: Set up versioning via M.W.T.V

build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
+    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
+      <IsWinMDFile>true</IsWinMDFile>
+    </Reference>
+  </ItemGroup>
+  <Target Name="_FixWinGetWinmdPackaging" BeforeTargets="_ComputeAppxPackagePayload">
+    <ItemGroup>
+      <PackagingOutputs Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
+        <OutputGroup>CustomOutputGroupForPackaging</OutputGroup>
+        <ProjectName>$(ProjectName)</ProjectName>
+        <TargetPath>Microsoft.Management.Deployment.winmd</TargetPath>
+      </PackagingOutputs>
+    </ItemGroup>
+  </Target>
+</Project>

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -34,7 +34,7 @@ Param(
 )
 
 $filesToRemove = @("*.xml", "*.winmd", "Appx*", "Images/*Tile*", "Images/*Logo*") # Remove from Terminal
-$filesToKeep = @("Microsoft.Terminal.Remoting.winmd") # ... except for these
+$filesToKeep = @() # ... except for these
 $filesToCopyFromXaml = @("Microsoft.UI.Xaml.dll", "Microsoft.UI.Xaml") # We don't need the .winmd
 
 $ErrorActionPreference = 'Stop'

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -58,7 +58,7 @@ Try {
 
     ### Check the activatable class entries for a few DLLs we need.
     $inProcServers = $Manifest.Package.Extensions.Extension.InProcessServer.Path
-    $RequiredInProcServers = ("TerminalApp.dll", "Microsoft.Terminal.Control.dll", "Microsoft.Terminal.Remoting.dll", "Microsoft.Terminal.Settings.Editor.dll", "Microsoft.Terminal.Settings.Model.dll", "TerminalConnection.dll")
+    $RequiredInProcServers = ("TerminalApp.dll", "Microsoft.Terminal.Control.dll", "Microsoft.Terminal.Settings.Editor.dll", "Microsoft.Terminal.Settings.Model.dll", "TerminalConnection.dll")
 
     Write-Verbose "InProc Servers: $inProcServers"
 

consolegit2gitfilters.json

@@ -24,8 +24,6 @@
     "/doc/specs/",
     "/doc/cascadia/",
     "/doc/user-docs/",
-    "/src/tools/MonarchPeasantSample/",
-    "/src/tools/MonarchPeasantPackage/",
     "/src/tools/ansi-color/",
     "/src/tools/ColorTool/",
     "/scratch/",

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2024</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>22</VersionMinor>
+    <VersionMinor>23</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

dep/CLI11/README.md

@@ -1,4 +0,0 @@
-# CLI11
-
-Taken from [release v2.4.1](https://github.com/CLIUtils/CLI11/releases/tag/v2.4.1), source commit
-[f4d0731](https://github.com/CLIUtils/CLI11/commit/f4d0731cebb123ff0ace712c099dffbcd2c58e5a)

dep/CLI11/cgmanifest.json

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

dep/Console/winconp.h

@@ -104,6 +104,7 @@ GetConsoleKeyboardLayoutNameW(
 #define CONSOLE_REGISTRY_DEFAULTFOREGROUND             L"DefaultForeground"
 #define CONSOLE_REGISTRY_DEFAULTBACKGROUND             L"DefaultBackground"
 #define CONSOLE_REGISTRY_TERMINALSCROLLING             L"TerminalScrolling"
+#define CONSOLE_REGISTRY_ANSWERBACKMESSAGE             L"AnswerbackMessage"
 // end V2 console settings
 
     /*

dep/jsoncpp/README.md

@@ -1,16 +0,0 @@
-# jsoncpp
-
-[Amalgamated](https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated)
-from source commit
-[5defb4e](https://github.com/open-source-parsers/jsoncpp/commit/5defb4ed1a4293b8e2bf641e16b156fb9de498cc),
-release 1.9.5.
-
-> Generating amalgamated source and header JsonCpp is provided with a script to
-> generate a single header and a single source file to ease inclusion into an
-> existing project. The amalgamated source can be generated at any time by
-> running the following command from the top-directory (this requires Python
-> 3.4+):
->
-> ```
-> python amalgamate.py
-> ```

dep/jsoncpp/cgmanifest.json

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

dep/jsoncpp/json/json-forwards.h

@@ -1,446 +0,0 @@
-/// Json-cpp amalgamated forward header (http://jsoncpp.sourceforge.net/).
-/// It is intended to be used with #include "json/json-forwards.h"
-/// This header provides forward declaration for all JsonCpp types.
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-/*
-The JsonCpp library's source code, including accompanying documentation,
-tests and demonstration applications, are licensed under the following
-conditions...
-
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
-this software is released into the Public Domain.
-
-In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
-The JsonCpp Authors, and is released under the terms of the MIT License (see below).
-
-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
-Public Domain/MIT License conditions described here, as they choose.
-
-The MIT License is about as close to Public Domain as a license can get, and is
-described in clear, concise terms at:
-
-   http://en.wikipedia.org/wiki/MIT_License
-
-The full text of the MIT License follows:
-
-========================================================================
-Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-
-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.
-========================================================================
-(END LICENSE TEXT)
-
-The MIT license is compatible with both the GPL and commercial
-software, affording one all of the rights of Public Domain with the
-minor nuisance of being required to keep the above copyright notice
-and license text in the source code. Note also that by accepting the
-Public Domain "license" you can re-license your copy using whatever
-license you like.
-
-*/
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-#ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED
-# define JSON_FORWARD_AMALGAMATED_H_INCLUDED
-/// If defined, indicates that the source file is amalgamated
-/// to prevent private header inclusion.
-#define JSON_IS_AMALGAMATION
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/version.h
-// //////////////////////////////////////////////////////////////////////
-
-#ifndef JSON_VERSION_H_INCLUDED
-#define JSON_VERSION_H_INCLUDED
-
-// Note: version must be updated in three places when doing a release. This
-// annoying process ensures that amalgamate, CMake, and meson all report the
-// correct version.
-// 1. /meson.build
-// 2. /include/json/version.h
-// 3. /CMakeLists.txt
-// IMPORTANT: also update the SOVERSION!!
-
-#define JSONCPP_VERSION_STRING "1.9.5"
-#define JSONCPP_VERSION_MAJOR 1
-#define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 5
-#define JSONCPP_VERSION_QUALIFIER
-#define JSONCPP_VERSION_HEXA                                                   \
-  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
-   (JSONCPP_VERSION_PATCH << 8))
-
-#ifdef JSONCPP_USING_SECURE_MEMORY
-#undef JSONCPP_USING_SECURE_MEMORY
-#endif
-#define JSONCPP_USING_SECURE_MEMORY 0
-// If non-zero, the library zeroes any memory that it has allocated before
-// it frees its memory.
-
-#endif // JSON_VERSION_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/version.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/allocator.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_ALLOCATOR_H_INCLUDED
-#define JSON_ALLOCATOR_H_INCLUDED
-
-#include <cstring>
-#include <memory>
-
-#pragma pack(push, 8)
-
-namespace Json {
-template <typename T> class SecureAllocator {
-public:
-  // Type definitions
-  using value_type = T;
-  using pointer = T*;
-  using const_pointer = const T*;
-  using reference = T&;
-  using const_reference = const T&;
-  using size_type = std::size_t;
-  using difference_type = std::ptrdiff_t;
-
-  /**
-   * Allocate memory for N items using the standard allocator.
-   */
-  pointer allocate(size_type n) {
-    // allocate using "global operator new"
-    return static_cast<pointer>(::operator new(n * sizeof(T)));
-  }
-
-  /**
-   * Release memory which was allocated for N items at pointer P.
-   *
-   * The memory block is filled with zeroes before being released.
-   */
-  void deallocate(pointer p, size_type n) {
-    // memset_s is used because memset may be optimized away by the compiler
-    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
-    // free using "global operator delete"
-    ::operator delete(p);
-  }
-
-  /**
-   * Construct an item in-place at pointer P.
-   */
-  template <typename... Args> void construct(pointer p, Args&&... args) {
-    // construct using "placement new" and "perfect forwarding"
-    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
-  }
-
-  size_type max_size() const { return size_t(-1) / sizeof(T); }
-
-  pointer address(reference x) const { return std::addressof(x); }
-
-  const_pointer address(const_reference x) const { return std::addressof(x); }
-
-  /**
-   * Destroy an item in-place at pointer P.
-   */
-  void destroy(pointer p) {
-    // destroy using "explicit destructor"
-    p->~T();
-  }
-
-  // Boilerplate
-  SecureAllocator() {}
-  template <typename U> SecureAllocator(const SecureAllocator<U>&) {}
-  template <typename U> struct rebind { using other = SecureAllocator<U>; };
-};
-
-template <typename T, typename U>
-bool operator==(const SecureAllocator<T>&, const SecureAllocator<U>&) {
-  return true;
-}
-
-template <typename T, typename U>
-bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) {
-  return false;
-}
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#endif // JSON_ALLOCATOR_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/allocator.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/config.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_CONFIG_H_INCLUDED
-#define JSON_CONFIG_H_INCLUDED
-#include <cstddef>
-#include <cstdint>
-#include <istream>
-#include <memory>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <type_traits>
-
-// If non-zero, the library uses exceptions to report bad input instead of C
-// assertion macros. The default is to use exceptions.
-#ifndef JSON_USE_EXCEPTION
-#define JSON_USE_EXCEPTION 1
-#endif
-
-// Temporary, tracked for removal with issue #982.
-#ifndef JSON_USE_NULLREF
-#define JSON_USE_NULLREF 1
-#endif
-
-/// If defined, indicates that the source file is amalgamated
-/// to prevent private header inclusion.
-/// Remarks: it is automatically defined in the generated amalgamated header.
-// #define JSON_IS_AMALGAMATION
-
-// Export macros for DLL visibility
-#if defined(JSON_DLL_BUILD)
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define JSON_API __declspec(dllexport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#elif defined(__GNUC__) || defined(__clang__)
-#define JSON_API __attribute__((visibility("default")))
-#endif // if defined(_MSC_VER)
-
-#elif defined(JSON_DLL)
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define JSON_API __declspec(dllimport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#endif // if defined(_MSC_VER)
-#endif // ifdef JSON_DLL_BUILD
-
-#if !defined(JSON_API)
-#define JSON_API
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#error                                                                         \
-    "ERROR:  Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-// As recommended at
-// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
-extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
-                                              const char* format, ...);
-#define jsoncpp_snprintf msvc_pre1900_c99_snprintf
-#else
-#define jsoncpp_snprintf std::snprintf
-#endif
-
-// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
-// integer
-// Storages, and 64 bits integer support is disabled.
-// #define JSON_NO_INT64 1
-
-// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools.
-// C++11 should be used directly in JSONCPP.
-#define JSONCPP_OVERRIDE override
-
-#ifdef __clang__
-#if __has_extension(attribute_deprecated_with_message)
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-#elif defined(__GNUC__) // not clang (gcc comes later since clang emulates gcc)
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
-#endif                  // GNUC version
-#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
-                        // MSVC)
-#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#endif // __clang__ || __GNUC__ || _MSC_VER
-
-#if !defined(JSONCPP_DEPRECATED)
-#define JSONCPP_DEPRECATED(message)
-#endif // if !defined(JSONCPP_DEPRECATED)
-
-#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
-#define JSON_USE_INT64_DOUBLE_CONVERSION 1
-#endif
-
-#if !defined(JSON_IS_AMALGAMATION)
-
-#include "allocator.h"
-#include "version.h"
-
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-using Int = int;
-using UInt = unsigned int;
-#if defined(JSON_NO_INT64)
-using LargestInt = int;
-using LargestUInt = unsigned int;
-#undef JSON_HAS_INT64
-#else                 // if defined(JSON_NO_INT64)
-// For Microsoft Visual use specific types as long long is not supported
-#if defined(_MSC_VER) // Microsoft Visual Studio
-using Int64 = __int64;
-using UInt64 = unsigned __int64;
-#else                 // if defined(_MSC_VER) // Other platforms, use long long
-using Int64 = int64_t;
-using UInt64 = uint64_t;
-#endif                // if defined(_MSC_VER)
-using LargestInt = Int64;
-using LargestUInt = UInt64;
-#define JSON_HAS_INT64
-#endif // if defined(JSON_NO_INT64)
-
-template <typename T>
-using Allocator =
-    typename std::conditional<JSONCPP_USING_SECURE_MEMORY, SecureAllocator<T>,
-                              std::allocator<T>>::type;
-using String = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
-using IStringStream =
-    std::basic_istringstream<String::value_type, String::traits_type,
-                             String::allocator_type>;
-using OStringStream =
-    std::basic_ostringstream<String::value_type, String::traits_type,
-                             String::allocator_type>;
-using IStream = std::istream;
-using OStream = std::ostream;
-} // namespace Json
-
-// Legacy names (formerly macros).
-using JSONCPP_STRING = Json::String;
-using JSONCPP_ISTRINGSTREAM = Json::IStringStream;
-using JSONCPP_OSTRINGSTREAM = Json::OStringStream;
-using JSONCPP_ISTREAM = Json::IStream;
-using JSONCPP_OSTREAM = Json::OStream;
-
-#endif // JSON_CONFIG_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/config.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/forwards.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FORWARDS_H_INCLUDED
-#define JSON_FORWARDS_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-// writer.h
-class StreamWriter;
-class StreamWriterBuilder;
-class Writer;
-class FastWriter;
-class StyledWriter;
-class StyledStreamWriter;
-
-// reader.h
-class Reader;
-class CharReader;
-class CharReaderBuilder;
-
-// json_features.h
-class Features;
-
-// value.h
-using ArrayIndex = unsigned int;
-class StaticString;
-class Path;
-class PathArgument;
-class Value;
-class ValueIteratorBase;
-class ValueIterator;
-class ValueConstIterator;
-
-} // namespace Json
-
-#endif // JSON_FORWARDS_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/forwards.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-#endif //ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED

dep/nuget/packages.config

@@ -3,13 +3,14 @@
 <packages>
   <!-- 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.Taef" version="10.93.240607003" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
   <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.7.230706001" targetFramework="native" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
   <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.WindowsPackageManager.ComInterop" version="1.8.1911" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />
@@ -19,7 +20,7 @@
   <package id="Selenium.WebDriver" version="3.5.0" targetFramework="net45" />
 
   <!-- MSBuildCache -->
-  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.273-preview" />
-  <package id="Microsoft.MSBuildCache.Local" version="0.1.273-preview" />
-  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.273-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.283-preview" />
 </packages>

dep/telemetry/ProjectTelemetry.h

@@ -14,4 +14,5 @@ Abstract:
 #define PDT_ProductAndServicePerformance       0x0u
 #define PDT_ProductAndServiceUsage             0x0u
 #define MICROSOFT_KEYWORD_TELEMETRY     0x0
-#define MICROSOFT_KEYWORD_MEASURES      0x0
+#define MICROSOFT_KEYWORD_MEASURES      0x0
+#define MICROSOFT_KEYWORD_CRITICAL_DATA 0x0

doc/cascadia/profiles.schema.json

@@ -459,6 +459,7 @@
         "switchSelectionEndpoint",
         "switchToTab",
         "tabSearch",
+        "terminalChat",
         "toggleAlwaysOnTop",
         "toggleBlockSelection",
         "toggleFocusMode",
@@ -618,6 +619,11 @@
           "type": "boolean",
           "default": false,
           "description": "This will override the profile's `elevate` setting."
+        },
+        "reloadEnvironmentVariables": {
+          "type": "boolean",
+          "default": true,
+          "description": "When set to true, a new environment block will be generated when creating a new session. Otherwise, the session will inherit the variables the Terminal was started with."
         }
       },
       "type": "object"
@@ -728,6 +734,9 @@
               "type": "string",
               "default": "",
               "description": "The name or GUID of the profile to show in this entry"
+            },
+            "icon": {
+              "$ref": "#/$defs/Icon"
             }
           }
         }
@@ -799,6 +808,9 @@
               "type": "string",
               "default": "",
               "description": "The ID of the action to show in this entry"
+            },
+            "icon": {
+              "$ref": "#/$defs/Icon"
             }
           }
         }
@@ -2335,7 +2347,7 @@
           "description": "When set to `true`, the terminal window will auto-center itself on the display it opens on. The terminal will use the \"initialPosition\" to determine which display to open on.",
           "type": "boolean"
         },
-        "inputServiceWarning": {
+        "warning.inputService": {
           "default": true,
           "description": "Warning if 'Touch Keyboard and Handwriting Panel Service' is disabled.",
           "type": "boolean"
@@ -2350,9 +2362,14 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
-        "compatibility.isolatedMode": {
+        "compatibility.allowHeadless": {
           "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.",
+          "description": "When set to true, Windows Terminal will run in the background. This allows globalSummon and quakeMode actions to work even when no windows are open.",
+          "type": "boolean"
+        },
+        "compatibility.allowDECRQCRA": {
+          "default": false,
+          "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
           "type": "boolean"
         },
         "copyFormatting": {
@@ -2385,12 +2402,12 @@
           "description": "When set to `true`, visual animations will be disabled across the application.",
           "type": "boolean"
         },
-        "largePasteWarning": {
+        "warning.largePaste": {
           "default": true,
           "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
         },
-        "multiLinePasteWarning": {
+        "warning.multiLinePaste": {
           "default": true,
           "description": "When set to true, trying to paste text with a \"new line\" character will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
@@ -2588,7 +2605,7 @@
           "description": "Determines the delimiters used in a double click selection.",
           "type": "string"
         },
-        "confirmCloseAllTabs": {
+        "warning.confirmCloseAllTabs": {
           "default": true,
           "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
@@ -2850,7 +2867,7 @@
           }
         },
         "autoMarkPrompts": {
-          "default": false,
+          "default": true,
           "description": "When set to true, prompts will automatically be marked.",
           "type": "boolean"
         },
@@ -3032,6 +3049,10 @@
           "description": "By default Windows treats Ctrl+Alt as an alias for AltGr. When altGrAliasing is set to false, this behavior will be disabled.",
           "type": "boolean"
         },
+        "answerbackMessage": {
+          "description": "The response that is sent when an ENQ control character is received.",
+          "type": "string"
+        },
         "source": {
           "description": "Stores the name of the profile generator that originated this profile.",
           "type": [
@@ -3070,6 +3091,17 @@
           "default": false,
           "description": "When set to true, the window will have an acrylic material background. When set to false, the window will have a plain, untextured background.",
           "type": "boolean"
+        },
+        "pathTranslationStyle": {
+          "default": "none",
+          "description": "Controls how file paths are transformed when they are dragged and dropped on the terminal. Possible values are \"none\", \"wsl\", \"cygwin\" and \"msys2\".",
+          "enum": [
+            "none",
+            "wsl",
+            "cygwin",
+            "msys2"
+          ],
+          "type": "string"
         }
       }
     },

doc/specs/#13000 - In-process ConPTY.md

@@ -0,0 +1,840 @@
+---
+author: Leonard Hecker @lhecker
+created on: 2024-06-07
+last updated: 2024-06-07
+issue id: 13000
+---
+
+# In-process ConPTY
+
+## tl;dr
+
+**Why?**
+* Out-of-process leads to out-of-sync issues.
+* Not all Console APIs have a VT equivalent.
+* Time consuming maintenance work due to poor encapsulation inside conhost.
+
+**How?**
+1. Remove `VtEngine` and translate Console API calls directly to VT.
+2. Move all Console API related code from the `Host` to the `Server` project.
+   Narrow the `IApiRoutines` interface down to its essentials.
+   Replace relevant singletons with instances.
+3. Make `Server` a standalone library with `IApiRoutines` as its primary callback interface.
+   Integrate the library in Windows Terminal.
+4. (Long term goal:) Ship the `Server` library as part of Windows. Build conhost itself on top of it.
+
+## Why?
+
+**Before:**
+
+```mermaid
+%%{ init: { "flowchart": { "curve": "monotoneX" } } }%%
+flowchart TD
+    subgraph conhost
+        direction LR
+
+        subgraph Server
+            server_io[Console API calls]
+        end
+
+        subgraph ConPTY
+            VtIo
+            VtEngine
+            ConPTY_output[ConPTY Output]
+        end
+
+        conhost_parser[VT parser]
+        conhost_buffer[Text Buffer]
+        conhost_renderer[Render Thread]
+        conhost_atlas[Text Renderer]
+
+        server_io-->conhost_parser
+        server_io--scroll, clear, etc.-->VtIo
+        conhost_parser--resize, focus-->VtIo
+        VtIo--scroll, clear, etc.-->VtEngine
+        conhost_parser--unknown escape sequences-->VtEngine
+        conhost_buffer--manual flushing-->VtEngine
+        conhost_renderer-->VtEngine
+        VtEngine-->ConPTY_output
+        conhost_buffer--dirty rects-->conhost_renderer
+        conhost_parser--dirty rects-->conhost_renderer
+        conhost_parser--plain text-->conhost_buffer
+        conhost_renderer-->conhost_atlas
+        conhost_buffer--ReadBuffer-->server_io
+    end
+
+    subgraph wt[Windows Terminal]
+        direction LR
+
+        input[ConPTY Input]
+        parser[VT parser]
+        buffer[Text Buffer]
+        renderer[Render Thread]
+        atlas[Text Renderer]
+
+        input-->parser
+        parser-->buffer
+        buffer-->renderer
+        renderer-->atlas
+        parser-->renderer
+    end
+
+    conhost--ConPTY's text pipe across processes-->wt
+```
+
+**After:**
+
+```mermaid
+%%{ init: { "flowchart": { "curve": "monotoneX" } } }%%
+flowchart LR
+    subgraph ConPTY_lib["ConPTY (static library)"]
+        server_io[Console API calls]
+        ConPTY_Translation[VT Translation]
+
+        server_io<-->ConPTY_Translation
+    end
+
+    subgraph ConPTY["ConPTY (dynamic library)"]
+        ConPTY_impl[IApiRoutines impl]
+        ConPTY_parser[VT parser]
+        ConPTY_buffer[Text Buffer]
+        ConPTY_output[ConPTY Output]
+
+        ConPTY_Translation<-->ConPTY_impl
+        ConPTY_impl-->ConPTY_parser
+        ConPTY_parser-->ConPTY_buffer
+        ConPTY_buffer--ReadBuffer-->ConPTY_impl
+        ConPTY_impl------>ConPTY_output
+    end
+
+    subgraph conhost
+        conhost_impl[IApiRoutines impl]
+        conhost_parser[VT parser]
+        conhost_buffer[Text Buffer]
+        conhost_renderer[Render Thread]
+        conhost_atlas[Text Renderer]
+
+        ConPTY_Translation<-->conhost_impl
+        conhost_impl-->conhost_parser
+        conhost_parser-->conhost_buffer
+        conhost_buffer--->conhost_renderer
+        conhost_buffer--ReadBuffer-->conhost_impl
+        conhost_renderer-->conhost_atlas
+    end
+
+    subgraph wt[Windows Terminal]
+        impl[IApiRoutines impl]
+        parser[VT parser]
+        buffer[Text Buffer]
+        renderer[Render Thread]
+        atlas[Text Renderer]
+
+        ConPTY_Translation<-->impl
+        impl-->parser
+        parser-->buffer
+        buffer--->renderer
+        buffer--ReadBuffer-->impl
+        renderer-->atlas
+    end
+```
+
+To extend on the [tl;dr](#tldr):
+* ConPTY runs outside the hosting terminal which leads to an unsolvable issue: The buffer contents between ConPTY and the terminal can go out of sync.
+  * The terminal and ConPTY may implement escape sequences differently.
+  * ...may implement text processing differently.
+  * ...may implement text reflow (resize) differently.
+  * Resizing the terminal and ConPTY is asynchronous and there may be concurrent text output.
+  * ...and it may uncover text from the scrollback, which ConPTY doesn't know about.
+* Some Console API methods cannot be represented via escape sequences and so ConPTY cannot produce them either.
+  The most basic example of this is the lack of LVB gridlines.
+* The above suggested new architecture represents a significant simplification with no loss in features.
+* ConPTY has fulfilled our needs a thousand times over, but as it's layered on top of conhost it has resulted in software decay.
+  The layer boundary has blurred over the years resulting in debugging and maintenance difficulties.
+  Lastly, its performance is insufficient and has been subject to much debate.
+  It's on us now to pay our debt and clean up the architecture so that ConPTY, conhost, and Windows Terminal can be built on top of it.
+
+Considerations:
+* A named `MUTEX` can theoretically solve parts of the out-of-sync issue, because it could be used to synchronize buffer reflow.
+  However, this requires the lock to be acquired on every API call, on top of the regular console lock, which raises ABBA deadlock concerns.
+  Making this setup not just hopefully but also provably robust, is likely to be very difficult.
+  It also doesn't solve any of the other listed problems.
+
+## Goal 1: Remove VtEngine
+
+### Goal
+
+```mermaid
+%%{ init: { "flowchart": { "curve": "monotoneX" } } }%%
+flowchart TD
+    subgraph conhost
+        direction LR
+
+        subgraph Server
+            server_io[Console API calls]
+        end
+
+        subgraph ConPTY
+            VtIo
+            VtEngine
+            ConPTY_output[ConPTY Output]
+        end
+
+        conhost_parser[VT parser]
+        conhost_buffer[Text Buffer]
+        conhost_renderer[Render Thread]
+        conhost_atlas[Text Renderer]
+
+        server_io-->conhost_parser
+        server_io--VT translation-->VtIo
+        server_io-->VtIo
+        conhost_parser-->VtIo
+        VtIo-->VtEngine
+        conhost_parser-->VtEngine
+        conhost_buffer-->VtEngine
+        conhost_renderer-->VtEngine
+        VtIo-->ConPTY_output
+        VtEngine-->ConPTY_output
+        conhost_buffer--dirty rects-->conhost_renderer
+        conhost_parser-->conhost_renderer
+        conhost_parser--plain text-->conhost_buffer
+        conhost_renderer-->conhost_atlas
+        conhost_buffer--ReadBuffer-->server_io
+    end
+
+    subgraph wt[Windows Terminal]
+        direction LR
+
+        input[ConPTY Input]
+        parser[VT parser]
+        buffer[Text Buffer]
+        renderer[Render Thread]
+        atlas[Text Renderer]
+
+        input-->parser
+        parser-->buffer
+        buffer-->renderer
+        renderer-->atlas
+        parser-->renderer
+    end
+
+    conhost--ConPTY's text pipe across processes-->wt
+
+    linkStyle 2,3,4,5,6,7,9,11 opacity:0.2
+    style VtEngine opacity:0.2
+```
+
+### Goals
+
+* Remove VtEngine
+* Remove `--vtmode`
+* Remove `--resizeQuirk`
+* Add buffering to `VtIo` and hook it up to the output pipe
+* Implement direct VT translations for all relevant Console APIs
+
+### Discussion
+
+The idea is that we can translate Console API calls directly to VT at least as well as the current VtEngine setup can.
+For instance, a call to `SetConsoleCursorPosition` clearly translates directly to a `CUP` escape sequence.
+Effectively, instead of translating output asynchronously in the renderer thread, we'll do it synchronously right during the Console API call.
+
+Apart from the Console APIs, the "cooked read" implementation, which handles our builtin "readline"-like text editor, will need to receive some larger changes as well.
+Its popups use `ReadConsoleOutput` and `WriteConsoleOutput` to backup and restore the affected rectangle.
+It also directly interfaces with the backing text buffer and its translation to VT relies on the existence of VtEngine.
+This results in all of the same issues that were previously outlined.
+In order to solve this, the popups need to be rewritten to use escape sequences so that they can be directly passed to the hosting terminal.
+They should also always be below the current prompt line so that we don't need to perform a potentially lossy backup/restore operation.
+
+The `--vtmode xterm-ascii` switch exists for the telnet client as it only supports ASCII as per RFC854 section "THE NVT PRINTER AND KEYBOARD".
+However, telnet is the only user of this flag and it's trivial to do there (for instance by stripping high codepoints in `WriteOutputToClient` in `telnet/console.cpp`), so there's no reason for us to keep this logic in the new code.
+
+This change will result in a significant reduction in complexity of our architecture.
+VT input from the shell or other clients will be given 1:1 to the hosting terminal, which will resolve our ordering and buffering issues.
+
+## Goal 2: Move Console API implementations to Server
+
+### Goal
+
+```mermaid
+%%{ init: { "flowchart": { "curve": "monotoneX" } } }%%
+flowchart TD
+    subgraph conhost
+        direction LR
+
+        subgraph Server[Server w/ ConPTY]
+            server_io[Console API calls]
+            ConPTY_Translation[VT Translation]
+
+            server_io<-->ConPTY_Translation
+        end
+
+        subgraph ConPTY
+            VtIo
+            ConPTY_output[ConPTY Output]
+
+            VtIo-->ConPTY_output
+        end
+
+        conhost_impl[IApiRoutines impl]
+        conhost_parser[VT parser]
+        conhost_buffer[Text Buffer]
+        conhost_renderer[Render Thread]
+        conhost_atlas[Text Renderer]
+        output_new[ConPTY Output]
+
+        ConPTY_Translation<-->conhost_impl
+        conhost_impl-->conhost_parser
+        conhost_impl----->output_new
+        server_io---->VtIo
+        server_io-->conhost_parser
+        conhost_parser-->conhost_buffer
+        conhost_parser-->conhost_renderer
+        conhost_buffer-->conhost_renderer
+        conhost_buffer--ReadBuffer-->conhost_impl
+        conhost_buffer-->server_io
+        conhost_renderer-->conhost_atlas
+    end
+
+    subgraph wt[Windows Terminal]
+        direction LR
+
+        input[ConPTY Input]
+        parser[VT parser]
+        buffer[Text Buffer]
+        renderer[Render Thread]
+        atlas[Text Renderer]
+
+        input-->parser
+        parser-->buffer
+        buffer-->renderer
+        renderer-->atlas
+        parser-->renderer
+    end
+
+    conhost--ConPTY's text pipe across processes-->wt
+
+    linkStyle 1,5,6,11 opacity:0.2
+    style ConPTY opacity:0.2
+    style VtIo opacity:0.2
+    style ConPTY_output opacity:0.2
+```
+
+### Goals
+
+* Move the API implementation from the `Host` to the `Server` project.
+* Narrow down the `IApiRoutines` interface to its essentials.
+* Replace affected singletons with regular class instances.
+
+### Discussion
+
+The basic idea is that instead of having 3 arrows going in and out of the Server component, we got exactly 1.
+This makes the console server and its VT translation a reusable component, which we need so that we can solve the out-of-sync issues by integrating it into Windows Terminal.
+To make the Server API convenient to use, the interface needs to be narrowed down to as few methods as possible. This interface is currently called `IApiRoutines`.
+
+### API Design
+
+Design goals:
+* Low overhead<br>
+  The API should never be the reason why the terminal is slow.
+  Among others, the design includes both UTF8 and UTF16 functions, as both encodings are common on Windows and the server component should not make assumptions which one the terminal prefers.
+* Easy to use<br>
+  The Console API is unfortunately quite powerful.
+  In order to make implementing the callback interface still reasonably easy, the API should have as few methods as are needed.
+  If a complex Console API call can be expressed as a series of simpler ones, and if no other performance expectations exist, it should be expressed via the simpler ones.
+* Works even if only partially implemented<br>
+  Example: `CreateConsoleScreenBuffer` is seldomly used, but its existence adds significant complexity to the callback API design and potential implementations.
+  A terminal should either be able to return `E_NOTIMPL` and we provide a fallback, or we provide guidance for how reasonable fallbacks can be implemented (e.g. by using the xterm alt buffer in this example).
+
+> [!IMPORTANT]
+> The following API design is a rough draft just to convey the general idea.
+> It does not represent a complete, finished design.
+> This document will be updated once work on the API begins and the actual API requirements become clearer.
+
+```cs
+// The Console API is built around a freely addressable frame buffer. It allows you to
+// address any part of the buffer, even those outside of what's considered the "viewport":
+//
+//                       ┌──────────────────┐
+//                       │y=-3              │
+//                       │                  │    ╮
+//                       │                  │    │
+//                    ╭  ├──────────────────┤    ├── VT scrollback (partially addressed)
+//                    │  │y=0               │    │
+//                    │  │                  │  ╮ ╯
+//                    │  │                  │  │
+//   Console Buffer ──┤  ├──────────────────┤  ├──── VT Viewport (top y = 1)
+//                    │  │y=3               │  │
+//                    │  │                  │  ╯
+//                    │  │                  │
+//                    ╰  └──────────────────┘
+//
+// The good news is that nothing prevents you from giving the Console Buffer the exact
+// same size as the VT Viewport and for modern terminals doing so is recommended.
+// That way, coordinates are viewport-relative and content below/above the viewport is never addressed:
+//
+//                       ┌──────────────────┐    ╮
+//                       │y=-3              │    │
+//                       │                  │    ├── VT scrollback (unused)
+//                       │                  │    │
+//                    ╭  ├──────────────────┤  ╮ ╯
+//                    │  │y=0               │  │
+//   Console Buffer ──┤  │                  │  ├──── VT Viewport
+//                    │  │                  │  │
+//                    ╰  └──────────────────┘  ╯
+//
+// Coordinates are 0-indexed. Note that while INT32 coordinates are used by this API, coordinates below
+// 0 and above 65535 are generally invalid as the Console ABI currently uses unsigned 16-Bit integers.
+
+struct CONSRV_POINT_I32 {
+    INT32 x;
+    INT32 y;
+};
+
+struct CONSRV_POINT_F32 {
+    float x;
+    float y;
+};
+
+// These flags are also defined via Windows.h.
+#if 0
+// These flags are equivalent to the classic 4-bit indexed colors in VT via SGR.
+// However, the position of the blue and red bits are swapped.
+#define FOREGROUND_BLUE            0x0001 // Text color contains blue.
+#define FOREGROUND_GREEN           0x0002 // Text color contains green.
+#define FOREGROUND_RED             0x0004 // Text color contains red.
+#define FOREGROUND_INTENSITY       0x0008 // Text color is intensified.
+#define BACKGROUND_BLUE            0x0010 // Background color contains blue.
+#define BACKGROUND_GREEN           0x0020 // Background color contains green.
+#define BACKGROUND_RED             0x0040 // Background color contains red.
+#define BACKGROUND_INTENSITY       0x0080 // Background color is intensified.
+
+// These two bits are used to represent wide glyphs.
+#define COMMON_LVB_LEADING_BYTE    0x0100 // Leading byte.
+#define COMMON_LVB_TRAILING_BYTE   0x0200 // Trailing byte.
+
+// This bit is equivalent to the "CSI 7 m" reverse video escape sequence.
+#define COMMON_LVB_REVERSE_VIDEO   0x4000 // Reverse foreground and background attribute.
+
+// NOTE: These flags have no equivalent in VT. COMMON_LVB_UNDERSCORE in particular is not the same as a
+// "CSI 4 m" underline in VT, despite the name. They're used to give a cell border (= grid) lines.
+#define COMMON_LVB_GRID_HORIZONTAL 0x0400 // Top horizontal.
+#define COMMON_LVB_GRID_LVERTICAL  0x0800 // Left vertical.
+#define COMMON_LVB_GRID_RVERTICAL  0x1000 // Right vertical.
+#define COMMON_LVB_UNDERSCORE      0x8000 // Underscore.
+#endif
+
+// This struct is binary compatible to the CHAR_INFO struct from the Windows API and functionally equivalent.
+//
+// The following rules MUST be followed:
+// * Each instance represents 1 column in the terminal.
+// * Any cells that aren't representable with a single UCS-2 character, or are wider than 2 columns,
+//   must be replaced with U+FFFD. Grapheme clusters, surrogate pairs, and similar, are not allowed.
+//   Keep in mind that U+FFFD is a narrow character. It does not get the wide wide-glyph treatment below.
+// * Colors that cannot be represented via the `attributes` flags can be replaced with an approximation.
+//   Alternatively, `FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED` can be used (no `BACKGROUND` bit set).
+// * If a wide glyph (2 columns wide) is encountered, the following applies:
+//   * Create 2 consecutive CONSRV_CHAR_INFO instances (as per the first rule).
+//   * Repeat the same `character` in both instances, even if it's U+FFFD.
+//   * Assign the first instance an `attributes` flag of `COMMON_LVB_LEADING_BYTE`
+//     and the second one `COMMON_LVB_TRAILING_BYTE`.
+//   * BUT if the request for a CONSRV_CHAR_INFO only partially intersects a wide glyph, replace the character
+//     (and only the character) with U+0020 whitespace. This also means that `COMMON_LVB_LEADING/TRAILING_BYTE`
+//     should not be set, because the returned character isn't wide anymore. An example:
+//     If you have a red "猫" on top of a blue background in the buffer and a single `CONSRV_CHAR_INFO` is requested
+//     for the left half of the glyph, then you should set `character` to whitespace and `attributes` to
+//     `FOREGROUND_RED | BACKGROUND_BLUE`. Debug builds of ConPTY will assert that you do this.
+//
+// For more documentation about the `attributes` flags, see the constants defined above.
+struct CONSRV_CHAR_INFO {
+    wchar_t character;
+    UINT16 attributes;
+};
+
+struct CONSRV_UTF8_STRING {
+    [size_is(length)] const char* data;
+    DWORD length;
+};
+
+struct CONSRV_UTF16_STRING {
+    [size_is(length)] const wchar_t* data;
+    DWORD length;
+};
+
+// NOTE: At the time of writing the required fields are not fully known.
+// NOTE: boolean is 8 Bits large.
+struct CONSRV_INFO {
+    // NOTE: msys2 relies on the HWND value to uniquely identify terminal sessions.
+    // If we were to hand out the multiplexed terminal window HWND to msys2, it will break. Either we need to
+    // create fake windows inside conhost (very bad & buggy) or break msys2 intentionally (also very bad).
+    HWND window;
+    CONSRV_UTF16_STRING originalWindowTitle;
+    CONSRV_UTF16_STRING windowTitle;
+
+    CONSRV_POINT_I32 bufferSizeInCells;
+    CONSRV_POINT_I32 cursorPositionInCells;
+    CONSRV_POINT_I32 viewPositionInCells;
+    CONSRV_POINT_I32 viewSizeInCells;
+    CONSRV_POINT_F32 cellSizeInDIP;
+    COLORREF colorTable[16];
+
+    CONSRV_POINT_I32 selectionStart;
+    CONSRV_POINT_I32 selectionEnd;
+    boolean selectionActive;
+    boolean selectionRectangular;
+    boolean selectionMouseDown;
+
+    float cursorHeight;
+    boolean cursorHidden;
+};
+
+// Any item that has changed relative to the current CONSRV_INFO will be set to a non-null pointer.
+// In other words, members that are null represent those that remain unchanged.
+//
+// If the request cannot be supported return E_INVALIDARG. For instance, you may choose to
+// do so if you receive a `bufferSizeInCells` change while the xterm alt buffer is active.
+//
+// NOTE: At the time of writing the required fields are not fully known.
+struct CONSRV_INFO_CHANGE {
+    CONSRV_POINT_I32* bufferSizeInCells;
+    CONSRV_POINT_I32* cursorPositionInCells;
+    CONSRV_POINT_I32* viewPositionInCells;
+    CONSRV_POINT_I32* viewSizeInCells;
+    COLORREF* colorTable; // The referenced array is always 16 items large.
+
+    float* cursorHeight;
+    boolean* cursorHidden;
+
+    CONSRV_UTF16_STRING* fontName;
+    UINT32* fontFamily;
+    UINT32* fontWeight;
+    CONSRV_POINT_I32* fontSize;
+};
+
+interface IConsoleServer : IUnknown {
+    // TODO: This interface is incomplete. Among others, a way to launch new application into the server is missing.
+
+    // ConPTY manages stdin as a ring buffer for you. When the terminal has focus, you simply need to write your input.
+    // Keyboard input MUST be written via `WriteInputRecords`. The other 2 functions DO NOT parse any VT sequences.
+    // They're instead meant either for VT responses (DECRPM, etc.) and for dumping plain text (clipboard, etc.).
+    void WriteInputRecords([in] DWORD count, [in, length_is(count)] const INPUT_RECORD* records);
+    void WriteInputUTF8([in] CONSRV_UTF8_STRING text);
+    void WriteInputUTF16([in] CONSRV_UTF16_STRING text);
+};
+
+// First of all: You don't need to implement all functions and all structs perfectly for ConPTY to work decently well.
+// For instance, if you don't implement `CONSRV_INFO::cursorHeight` properly, barely anything will happen.
+interface IConsoleServerCallback : IUnknown {
+    // The console server is single-threaded and no two calls will be made simultaneously. These two functions
+    // simply allow you to synchronize the calls down below if your application is multi-threaded.
+    //
+    // Lock() will always be called before any of the functions below are called.
+    // Lock() and Unlock() do not need to support recursive locking.
+    // Any other calls between Lock() and Unlock() should be treated as an atomic operation.
+    //
+    // It is recommended to use a fair lock instead of OS primitives like SRWLOCK. These callback functions may be
+    // much more often than your text renderer, etc., runs. An unfair lock will result in thread starvation.
+    HRESULT Lock();
+    HRESULT Unlock();
+
+    // If called, you're requested to create a new console alt buffer. The Console API supports having
+    // multiple concurrent such buffers. They're not the same as the xterm alt buffer, however (CSI ? 1049 h):
+    // They can be resized to be larger than the current viewport and switching between such buffers DOES NOT
+    // clear them nor does it reset any other per-buffer state.
+    //
+    // If you have trouble adding support for multiple console alt buffers, consider using the xterm alt buffer
+    // (CSI ? 1049 h) for the first buffer that gets created, and return E_OUTOFMEMORY for any further buffers.
+    HRESULT CreateBuffer([out] void** buffer);
+
+    // ReleaseBuffer is called once the buffer isn't needed anymore. It's guaranteed to be called and it's guaranteed
+    // to be called after ActivateBuffer() was used to switch to another buffer (or the main buffer).
+    HRESULT ReleaseBuffer([in] void* buffer);
+
+    // This switches between different console alt buffers. Switching to a buffer should change the content that's
+    // being shown, similar to the xterm alt buffer, however unlike it doing so DOES NOT reset any per-buffer state.
+    // All it does is to basically swap out the underlying, active text buffer of the terminal.
+    //
+    // If `buffer` is NULL it's a request to switch back to the main buffer.
+    //
+    // `temporary` is a hint. If it's `true` it indicates that the previous buffer will soon be activated again.
+    // In other words, on Unlock() the buffer was active during Lock() will be active again.
+    // It's recommended that temporary switches are lightweight as they may occur relatively often.
+    HRESULT ActivateBuffer([in] void* buffer, [in] boolean temporary);
+
+    //
+    // Any functions past this point operate on the currently active buffer.
+    //
+
+    // This function gets a snapshot of the terminal and buffer state.
+    //
+    // You must ensure that the returned pointer stays valid until the next GetInfo() or Unlock() call,
+    //   or until the currently active buffer is released.
+    // You don't need to return a new instance on each call. ConPTY will only use the last returned pointer.
+    // You don't need to keep the CONSRV_INFO struct constantly up to date, but you're allowed to do so.
+    //   For instance, it's valid to change the `.cursorPosition` when SetCursorPosition() is called.
+    //
+    // It's recommended that this function is lightweight as it may be called relatively often.
+    const CONSRV_INFO* GetInfo();
+
+    // When this method is called you're asked to apply any non-null member of the given CONSRV_INFO_CHANGE struct
+    // to the active buffer. For instance a non-null `.cursorPosition` is identical to calling `SetCursorPosition`,
+    // a non-null `.bufferSize` is a request to resize the terminal, and so on.
+    HRESULT SetInfo([in] const CONSRV_INFO_CHANGE* info);
+
+    // As explained in the CONSRV_POINT_I32 documentation, ConPTY coordinates may be outside of the VT viewport.
+    // This function is necessary in order to support this. If you assign the console buffer the same size
+    // as the VT viewport, `pos` can be translated to VT using
+    //   printf("\x1b[%d;%dC", pos.y + 1, pos.x + 1);
+    HRESULT SetCursorPosition([in] CONSRV_POINT_I32 pos);
+
+    // The Console API supports 4 gridline attributes which cannot be translated to VT.
+    // This function is necessary to represent those. If you don't plan to support the gridlines,
+    // you can translate the attributes to VT with the following code or some equivalent:
+    //   static const uint8_t lut[] = { 30, 34, 32, 36, 31, 35, 33, 37, 90, 94, 92, 96, 91, 95, 93, 97 };
+    //   const auto fg = lut[attributes & 0xf];
+    //   const auto bg = lut[(attributes >> 4) & 0xf] + 10;
+    //   printf("\x1b[%d;%dm", fg, bg);
+    //
+    // `attributes` of exactly `FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED` are often used to indicate the
+    // default colors in Windows Console applications, and so you may choose to translate attributes like that as:
+    //   printf("\x1b[39;49");
+    //
+    // You may also choose to support COMMON_LVB_REVERSE_VIDEO, which translates to:
+    //   printf("\x1b[7m");
+    HRESULT SetCurrentAttributes([in] UINT16 attributes);
+
+    // Starting from column `pos.x` in row `pos.y`, this reads `count`-many characters and attributes.
+    // `pos` and `count` will be clamped such that reads never extend outside of the `CONSRV_INFO::bufferSize`.
+    //
+    // However, it may still read cells that have never been written to (for instance below the current viewport!).
+    // Such reads should not fail. Simply fill the `infos` array with whitespaces and a default attribute of your chosing,
+    // but `FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED` is recommended (no other bits set).
+    //
+    // NOTE that this API should ignore any line renditions (DECDWL, DECDHL), margins (DECSLRM, ...), etc.
+    // Reading outside of the "valid" range for a given row should behave exactly like reading below the viewport,
+    // as described in the previous paragraph.
+    HRESULT ReadBuffer([in] CONSRV_POINT_I32 pos, [in] INT32 count, [out, length_is(count)] CONSRV_CHAR_INFO* infos);
+
+    // These two functions are used to layout text for the internal "GNU Readline"-like implementation.
+    // `text`        is the string to operate on. As with any other method, input validation should be performed.
+    //               It's preferred to pretend as if invalid codepoints (in particular invalid surrogate pairs)
+    //               are U+FFFD, because this provides the user with some level of text editing capability.
+    //               The alternative is to have none at all when facing invalid strings which is strictly worse.
+    // `maxClusters` is the maximum amount of "cursor movements" these functions should apply
+    //               (like when pressing the left/right arrow buttons).
+    // `maxColumns`  is the maximum amount of columns the functions may iterate over. When the text is "a猫" and
+    //               `maxColumns` is 2, then the result should be "a", because "猫" doesn't fit anymore.
+    // `position`    on input contains the current position of the cursor inside `text`, counted in characters from the
+    //               start of the `text`. On output it's supposed to contain the new cursor position.
+    //               `position` may be out of bounds and you should clamp it to a valid range first.
+    // `columns`     on output should contain the number of columns that have been iterated over.
+    //
+    // The idea is that a `maxClusters = 1` and `maxColumns = inf` can be used to implement left/right cursor movement,
+    // while `maxClusters = inf` and `maxColumns = window width` can be used to layout text within the window.
+    //
+    // You don't need to handle escape characters. These functions will never be called with any present.
+    // For robustness against bugs it's however recommended to handle them anyway, in whatever way you wish.
+    // If you have no preference, it's recommended to treat them as zero-width characters.
+    HRESULT MeasureTextForward([in] CONSRV_UTF16_STRING text, [in] DWORD maxClusters, [in] DWORD maxColumns, [in, out] DWORD* position, [out] DWORD* columns);
+    HRESULT MeasureTextBackward([in] CONSRV_UTF16_STRING text, [in] DWORD maxClusters, [in] DWORD maxColumns, [in, out] DWORD* position, [out] DWORD* columns);
+
+    // UTF8 and UTF16 are both widely used text encodings on Windows and it's recommended that both
+    // functions are reasonably fast. ConPTY will translate all non-Unicode text to UTF16 for you.
+    // You must validate incoming text. It's recommended to replace invalid codepoints with U+FFFD.
+    // You don't need to check for broken up codepoints at the start/end of the text, as ConPTY will handle that for you.
+    HRESULT WriteUTF8([in] boolean raw, [in] CONSRV_UTF8_STRING text);
+    HRESULT WriteUTF16([in] boolean raw, [in] CONSRV_UTF16_STRING text);
+};
+```
+
+The list shows how each Console API function is implemented in terms of the above interface.
+* Aliases
+  <br>Fully implemented inside the server component without API.
+  * `AddConsoleAlias`
+  * `GetConsoleAlias`
+  * `GetConsoleAliases`
+  * `GetConsoleAliasesLength`
+  * `GetConsoleAliasExes`
+  * `GetConsoleAliasExesLength`
+* History
+  <br>Fully implemented inside the server component without API.
+  * `ExpungeConsoleCommandHistory`
+  * `GetConsoleCommandHistory`
+  * `GetConsoleCommandHistoryLength`
+  * `GetConsoleHistoryInfo`
+  * `SetConsoleHistoryInfo`
+  * `SetConsoleNumberOfCommands`
+* stdin
+  <br>Fully implemented inside the server component without API.
+  * `FlushConsoleInputBuffer`
+  * `GetConsoleInput`
+  * `GetConsoleInputCodePage`
+  * `GetConsoleInputMode`
+  * `GetNumberOfConsoleInputEvents`
+  * `ReadConsole`
+  * `SetConsoleInputCodePage`
+  * `SetConsoleInputMode`
+  * `WriteConsoleInput`
+* Unsupported since conhost v1
+  * `GetConsoleDisplayMode`
+  * `GetConsoleLangId`
+  * `SetConsoleDisplayMode`
+* Buffer management
+  * `GetConsoleScreenBufferInfoEx`:
+    Gets information from server's internal `SCREEN_INFORMATION` class (which represents the `HANDLE`).
+  * `SetConsoleScreenBufferInfoEx`:
+    Sets information on server's internal `SCREEN_INFORMATION` class.
+  * `CreateConsoleScreenBuffer`:
+    `CreateBuffer`
+  * `SetConsoleActiveScreenBuffer`:
+    `ActivateBuffer` + `SetInfo`
+  * `SetConsoleScreenBufferSize`:
+    `SetInfo`
+* Cursor
+  * `GetConsoleCursorInfo`:
+    `GetInfo`
+  * `SetConsoleCursorInfo`:
+    `SetInfo`
+  * `SetConsoleCursorPosition`:
+    `GetInfo`
+* Fonts
+  * `GetConsoleFontSize`:
+    `GetInfo`
+  * `GetCurrentConsoleFontEx`:
+    `GetInfo`
+  * `SetCurrentConsoleFontEx`:
+    `SetInfo`
+* Window management
+  * `GetConsoleOriginalTitle`:
+    `GetInfo`
+  * `GetConsoleSelectionInfo`:
+    `GetInfo`
+  * `GetConsoleTitle`:
+    `GetInfo`
+  * `GetConsoleWindow`:
+    `GetInfo`
+  * `GetLargestConsoleWindowSize`:
+    `GetInfo`; The window frame size can be inferred from the difference between the `GetWindowRect(hwnd)` and the `viewSizeInCells * cellSizeInDIP`.
+    The max. cell count can then be calculated by getting the `MonitorFromWindow(hwnd)` size, subtracting the frame size and calculating the cell count.
+  * `GetNumberOfConsoleMouseButtons`:
+    Implemented inside the server component via `GetSystemMetrics(SM_CMOUSEBUTTONS)`
+  * `SetConsoleTitle`:
+    `SetInfo`
+  * `SetConsoleWindowInfo`:
+    `SetInfo`
+* stdout (writing)
+  * `FillConsoleOutputAttribute`:
+    Set the new attributes with `SetCurrentAttributes`.
+    For each line, get the existing contents with `ReadBuffer`, `SetCursorPosition` to the start, concatenate the cells and write them with `WriteUTF16`.
+  * `FillConsoleOutputCharacter`:
+    For each line, get the existing contents with `ReadBuffer`, `SetCursorPosition` to the start, concatenate the cells and write them with `WriteUTF16`.
+    At the start of each line and every time the attributes change use `SetCurrentAttributes` to set them up.
+  * `GetConsoleOutputCodePage`:
+    Implemented inside the server component.
+  * `GetConsoleOutputMode`:
+    Implemented inside the server component.
+  * `ScrollConsoleScreenBuffer`:
+    **TODO**: It may be necessary to add a `ScrollBuffer` API to make vertical scrolling across the entire buffer width faster. This fast pass currently exists as well.
+    Otherwise, this will be translated to: Read all lines in the source rectangle with `ReadBuffer`.
+    Then refer to the `WriteConsoleOutput` implementation for writing it to the target.
+  * `SetConsoleOutputCodePage`:
+    Implemented inside the server component.
+  * `SetConsoleOutputMode`:
+    Implemented inside the server component.
+  * `SetConsoleTextAttribute`:
+    `SetCurrentAttributes`
+  * `WriteConsole`:
+    `WriteUTF8` if `CP_UTF8` is active and otherwise `WriteUTF16`.
+  * `WriteConsoleOutput`:
+    For each line, `SetCursorPosition` to the start, concatenate the cells and write them with `WriteUTF16`.
+    At the start of each line and every time the attributes change use `SetCurrentAttributes` to set them up.
+  * `WriteConsoleOutputAttribute`:
+    Same as `FillConsoleOutputAttribute`, but with varying attributes.
+  * `WriteConsoleOutputCharacter`:
+    Same as `FillConsoleOutputCharacter`, but with varying characters.
+* stdout (reading)
+  <br>Each of these will be translated to a series of `ReadBuffer` calls, one for each line.
+  * `ReadConsoleOutput`
+  * `ReadConsoleOutputAttribute`
+  * `ReadConsoleOutputCharacter`
+
+## Goal 3: Productize Server
+
+### Goal
+
+```mermaid
+flowchart LR
+    subgraph ConPTY_lib["ConPTY (static library)"]
+        server_io[Console API calls]
+        ConPTY_Translation[VT Translation]
+
+        server_io<-->ConPTY_Translation
+    end
+
+    subgraph ConPTY["ConPTY (dynamic library)"]
+        ConPTY_impl[IApiRoutines impl]
+        ConPTY_parser[VT parser]
+        ConPTY_buffer[Text Buffer]
+        ConPTY_output[ConPTY Output]
+
+        ConPTY_Translation<-->ConPTY_impl
+        ConPTY_impl-->ConPTY_parser
+        ConPTY_parser-->ConPTY_buffer
+        ConPTY_buffer--ReadBuffer-->ConPTY_impl
+        ConPTY_impl------>ConPTY_output
+    end
+
+    subgraph conhost
+        subgraph conhost_Server[Server]
+            conhost_server_io[Console API calls]
+            conhost_ConPTY_Translation[VT Translation]
+
+            conhost_server_io<-->conhost_ConPTY_Translation
+        end
+
+        conhost_impl[IApiRoutines impl]
+        conhost_parser[VT parser]
+        conhost_buffer[Text Buffer]
+        conhost_renderer[Render Thread]
+        conhost_atlas[Text Renderer]
+        output_new[ConPTY Output]
+
+        conhost_ConPTY_Translation<-->conhost_impl
+        conhost_impl-.remains for<br>back compat.....->output_new
+
+        ConPTY_Translation<-->conhost_impl
+        conhost_impl-->conhost_parser
+        conhost_parser-->conhost_buffer
+        conhost_buffer--->conhost_renderer
+        conhost_buffer--ReadBuffer-->conhost_impl
+        conhost_renderer-->conhost_atlas
+    end
+
+    subgraph wt[Windows Terminal]
+        impl[IApiRoutines impl]
+        parser[VT parser]
+        buffer[Text Buffer]
+        renderer[Render Thread]
+        atlas[Text Renderer]
+
+        ConPTY_Translation<-->impl
+        impl-->parser
+        parser-->buffer
+        buffer--->renderer
+        buffer--ReadBuffer-->impl
+        renderer-->atlas
+    end
+
+    linkStyle 6,7 opacity:0.2
+    style conhost_Server opacity:0.2
+    style conhost_server_io opacity:0.2
+    style conhost_ConPTY_Translation opacity:0.2
+```
+
+After creating an _internal_ API in conhost, the next logical step is for us to extract the interface as a public one and consume it in Windows Terminal.
+At this point we should also see if we can find early adopters of the API in other projects.
+
+## Stretch Goal 4: Ship Server in Windows
+
+The console server on Windows has been an internal ABI for the longest time.
+As we have started shipping ConPTY bundled with conhost/OpenConsole to other projects, the internal ABI has become a public one.
+While we have no intention of ever breaking forward compatability of the console server with future Windows versions, it would be reassuring if the ABI long-term became internal once more.
+This will allow us complete freedom over its design, even in the decades to come, and allow us to fully shim any 3rd party applications on Windows if a ABI change were to ever happen.

oss/dynamic_bitset/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Maxime Pinard
-
-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.

oss/dynamic_bitset/MAINTAINER_README.md

@@ -1,17 +0,0 @@
-### Notes for Future Maintainers
-
-This was originally imported by @miniksa in March 2020.
-
-The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
-Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
-
-## What should be done to update this in the future?
-
-1. Go to pinam45/dynamic_bitset repository on GitHub.
-2. Take the entire contents of the include directory wholesale and drop it in the root directory here.
-3. Don't change anything about it.
-4. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in the same directory as this readme. 
-   If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-5. Submit the pull.
-

oss/dynamic_bitset/cgmanifest.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
-    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/pinam45/dynamic_bitset",
-          "commitHash": "00f2d066ce9deebf28b006636150e5a882beb83f"
-        }
-      }
-    }
-  ],
-  "Version": 1
-}

oss/fmt/LICENSE.rst

@@ -1,27 +0,0 @@
-Copyright (c) 2012 - present, Victor Zverovich
-
-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.
-
---- Optional exception to the license ---
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into a machine-executable object form of such
-source code, you may redistribute such embedded portions in such object form
-without including the above copyright and permission notices.

oss/fmt/MAINTAINER_README.md

@@ -1,17 +0,0 @@
-### Notes for Future Maintainers
-
-This was originally imported by @DHowett-MSFT in April 2020.
-
-The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
-Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropriate governance standards.
-
-## What should be done to update this in the future?
-
-1. Go to fmtlib/fmt repository on GitHub.
-2. Take the entire contents of the include/ and src/ directories and drop them in this directory.
-3. Don't change anything about it.
-4. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in the same directory as this readme. 
-   If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-5. Submit the pull.
-

oss/fmt/cgmanifest.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-  "Registrations": [
-    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/fmtlib/fmt",
-          "commitHash": "7bdf0628b1276379886c7f6dda2cef2b3b374f0b"
-        }
-      }
-    }
-  ],
-  "Version": 1
-}

oss/fmt/include/fmt/color.h

@@ -1,603 +0,0 @@
-// Formatting library for C++ - color support
-//
-// Copyright (c) 2018 - present, Victor Zverovich and fmt contributors
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-#ifndef FMT_COLOR_H_
-#define FMT_COLOR_H_
-
-#include "format.h"
-
-FMT_BEGIN_NAMESPACE
-
-enum class color : uint32_t {
-  alice_blue = 0xF0F8FF,               // rgb(240,248,255)
-  antique_white = 0xFAEBD7,            // rgb(250,235,215)
-  aqua = 0x00FFFF,                     // rgb(0,255,255)
-  aquamarine = 0x7FFFD4,               // rgb(127,255,212)
-  azure = 0xF0FFFF,                    // rgb(240,255,255)
-  beige = 0xF5F5DC,                    // rgb(245,245,220)
-  bisque = 0xFFE4C4,                   // rgb(255,228,196)
-  black = 0x000000,                    // rgb(0,0,0)
-  blanched_almond = 0xFFEBCD,          // rgb(255,235,205)
-  blue = 0x0000FF,                     // rgb(0,0,255)
-  blue_violet = 0x8A2BE2,              // rgb(138,43,226)
-  brown = 0xA52A2A,                    // rgb(165,42,42)
-  burly_wood = 0xDEB887,               // rgb(222,184,135)
-  cadet_blue = 0x5F9EA0,               // rgb(95,158,160)
-  chartreuse = 0x7FFF00,               // rgb(127,255,0)
-  chocolate = 0xD2691E,                // rgb(210,105,30)
-  coral = 0xFF7F50,                    // rgb(255,127,80)
-  cornflower_blue = 0x6495ED,          // rgb(100,149,237)
-  cornsilk = 0xFFF8DC,                 // rgb(255,248,220)
-  crimson = 0xDC143C,                  // rgb(220,20,60)
-  cyan = 0x00FFFF,                     // rgb(0,255,255)
-  dark_blue = 0x00008B,                // rgb(0,0,139)
-  dark_cyan = 0x008B8B,                // rgb(0,139,139)
-  dark_golden_rod = 0xB8860B,          // rgb(184,134,11)
-  dark_gray = 0xA9A9A9,                // rgb(169,169,169)
-  dark_green = 0x006400,               // rgb(0,100,0)
-  dark_khaki = 0xBDB76B,               // rgb(189,183,107)
-  dark_magenta = 0x8B008B,             // rgb(139,0,139)
-  dark_olive_green = 0x556B2F,         // rgb(85,107,47)
-  dark_orange = 0xFF8C00,              // rgb(255,140,0)
-  dark_orchid = 0x9932CC,              // rgb(153,50,204)
-  dark_red = 0x8B0000,                 // rgb(139,0,0)
-  dark_salmon = 0xE9967A,              // rgb(233,150,122)
-  dark_sea_green = 0x8FBC8F,           // rgb(143,188,143)
-  dark_slate_blue = 0x483D8B,          // rgb(72,61,139)
-  dark_slate_gray = 0x2F4F4F,          // rgb(47,79,79)
-  dark_turquoise = 0x00CED1,           // rgb(0,206,209)
-  dark_violet = 0x9400D3,              // rgb(148,0,211)
-  deep_pink = 0xFF1493,                // rgb(255,20,147)
-  deep_sky_blue = 0x00BFFF,            // rgb(0,191,255)
-  dim_gray = 0x696969,                 // rgb(105,105,105)
-  dodger_blue = 0x1E90FF,              // rgb(30,144,255)
-  fire_brick = 0xB22222,               // rgb(178,34,34)
-  floral_white = 0xFFFAF0,             // rgb(255,250,240)
-  forest_green = 0x228B22,             // rgb(34,139,34)
-  fuchsia = 0xFF00FF,                  // rgb(255,0,255)
-  gainsboro = 0xDCDCDC,                // rgb(220,220,220)
-  ghost_white = 0xF8F8FF,              // rgb(248,248,255)
-  gold = 0xFFD700,                     // rgb(255,215,0)
-  golden_rod = 0xDAA520,               // rgb(218,165,32)
-  gray = 0x808080,                     // rgb(128,128,128)
-  green = 0x008000,                    // rgb(0,128,0)
-  green_yellow = 0xADFF2F,             // rgb(173,255,47)
-  honey_dew = 0xF0FFF0,                // rgb(240,255,240)
-  hot_pink = 0xFF69B4,                 // rgb(255,105,180)
-  indian_red = 0xCD5C5C,               // rgb(205,92,92)
-  indigo = 0x4B0082,                   // rgb(75,0,130)
-  ivory = 0xFFFFF0,                    // rgb(255,255,240)
-  khaki = 0xF0E68C,                    // rgb(240,230,140)
-  lavender = 0xE6E6FA,                 // rgb(230,230,250)
-  lavender_blush = 0xFFF0F5,           // rgb(255,240,245)
-  lawn_green = 0x7CFC00,               // rgb(124,252,0)
-  lemon_chiffon = 0xFFFACD,            // rgb(255,250,205)
-  light_blue = 0xADD8E6,               // rgb(173,216,230)
-  light_coral = 0xF08080,              // rgb(240,128,128)
-  light_cyan = 0xE0FFFF,               // rgb(224,255,255)
-  light_golden_rod_yellow = 0xFAFAD2,  // rgb(250,250,210)
-  light_gray = 0xD3D3D3,               // rgb(211,211,211)
-  light_green = 0x90EE90,              // rgb(144,238,144)
-  light_pink = 0xFFB6C1,               // rgb(255,182,193)
-  light_salmon = 0xFFA07A,             // rgb(255,160,122)
-  light_sea_green = 0x20B2AA,          // rgb(32,178,170)
-  light_sky_blue = 0x87CEFA,           // rgb(135,206,250)
-  light_slate_gray = 0x778899,         // rgb(119,136,153)
-  light_steel_blue = 0xB0C4DE,         // rgb(176,196,222)
-  light_yellow = 0xFFFFE0,             // rgb(255,255,224)
-  lime = 0x00FF00,                     // rgb(0,255,0)
-  lime_green = 0x32CD32,               // rgb(50,205,50)
-  linen = 0xFAF0E6,                    // rgb(250,240,230)
-  magenta = 0xFF00FF,                  // rgb(255,0,255)
-  maroon = 0x800000,                   // rgb(128,0,0)
-  medium_aquamarine = 0x66CDAA,        // rgb(102,205,170)
-  medium_blue = 0x0000CD,              // rgb(0,0,205)
-  medium_orchid = 0xBA55D3,            // rgb(186,85,211)
-  medium_purple = 0x9370DB,            // rgb(147,112,219)
-  medium_sea_green = 0x3CB371,         // rgb(60,179,113)
-  medium_slate_blue = 0x7B68EE,        // rgb(123,104,238)
-  medium_spring_green = 0x00FA9A,      // rgb(0,250,154)
-  medium_turquoise = 0x48D1CC,         // rgb(72,209,204)
-  medium_violet_red = 0xC71585,        // rgb(199,21,133)
-  midnight_blue = 0x191970,            // rgb(25,25,112)
-  mint_cream = 0xF5FFFA,               // rgb(245,255,250)
-  misty_rose = 0xFFE4E1,               // rgb(255,228,225)
-  moccasin = 0xFFE4B5,                 // rgb(255,228,181)
-  navajo_white = 0xFFDEAD,             // rgb(255,222,173)
-  navy = 0x000080,                     // rgb(0,0,128)
-  old_lace = 0xFDF5E6,                 // rgb(253,245,230)
-  olive = 0x808000,                    // rgb(128,128,0)
-  olive_drab = 0x6B8E23,               // rgb(107,142,35)
-  orange = 0xFFA500,                   // rgb(255,165,0)
-  orange_red = 0xFF4500,               // rgb(255,69,0)
-  orchid = 0xDA70D6,                   // rgb(218,112,214)
-  pale_golden_rod = 0xEEE8AA,          // rgb(238,232,170)
-  pale_green = 0x98FB98,               // rgb(152,251,152)
-  pale_turquoise = 0xAFEEEE,           // rgb(175,238,238)
-  pale_violet_red = 0xDB7093,          // rgb(219,112,147)
-  papaya_whip = 0xFFEFD5,              // rgb(255,239,213)
-  peach_puff = 0xFFDAB9,               // rgb(255,218,185)
-  peru = 0xCD853F,                     // rgb(205,133,63)
-  pink = 0xFFC0CB,                     // rgb(255,192,203)
-  plum = 0xDDA0DD,                     // rgb(221,160,221)
-  powder_blue = 0xB0E0E6,              // rgb(176,224,230)
-  purple = 0x800080,                   // rgb(128,0,128)
-  rebecca_purple = 0x663399,           // rgb(102,51,153)
-  red = 0xFF0000,                      // rgb(255,0,0)
-  rosy_brown = 0xBC8F8F,               // rgb(188,143,143)
-  royal_blue = 0x4169E1,               // rgb(65,105,225)
-  saddle_brown = 0x8B4513,             // rgb(139,69,19)
-  salmon = 0xFA8072,                   // rgb(250,128,114)
-  sandy_brown = 0xF4A460,              // rgb(244,164,96)
-  sea_green = 0x2E8B57,                // rgb(46,139,87)
-  sea_shell = 0xFFF5EE,                // rgb(255,245,238)
-  sienna = 0xA0522D,                   // rgb(160,82,45)
-  silver = 0xC0C0C0,                   // rgb(192,192,192)
-  sky_blue = 0x87CEEB,                 // rgb(135,206,235)
-  slate_blue = 0x6A5ACD,               // rgb(106,90,205)
-  slate_gray = 0x708090,               // rgb(112,128,144)
-  snow = 0xFFFAFA,                     // rgb(255,250,250)
-  spring_green = 0x00FF7F,             // rgb(0,255,127)
-  steel_blue = 0x4682B4,               // rgb(70,130,180)
-  tan = 0xD2B48C,                      // rgb(210,180,140)
-  teal = 0x008080,                     // rgb(0,128,128)
-  thistle = 0xD8BFD8,                  // rgb(216,191,216)
-  tomato = 0xFF6347,                   // rgb(255,99,71)
-  turquoise = 0x40E0D0,                // rgb(64,224,208)
-  violet = 0xEE82EE,                   // rgb(238,130,238)
-  wheat = 0xF5DEB3,                    // rgb(245,222,179)
-  white = 0xFFFFFF,                    // rgb(255,255,255)
-  white_smoke = 0xF5F5F5,              // rgb(245,245,245)
-  yellow = 0xFFFF00,                   // rgb(255,255,0)
-  yellow_green = 0x9ACD32              // rgb(154,205,50)
-};                                     // enum class color
-
-enum class terminal_color : uint8_t {
-  black = 30,
-  red,
-  green,
-  yellow,
-  blue,
-  magenta,
-  cyan,
-  white,
-  bright_black = 90,
-  bright_red,
-  bright_green,
-  bright_yellow,
-  bright_blue,
-  bright_magenta,
-  bright_cyan,
-  bright_white
-};
-
-enum class emphasis : uint8_t {
-  bold = 1,
-  italic = 1 << 1,
-  underline = 1 << 2,
-  strikethrough = 1 << 3
-};
-
-// rgb is a struct for red, green and blue colors.
-// Using the name "rgb" makes some editors show the color in a tooltip.
-struct rgb {
-  FMT_CONSTEXPR rgb() : r(0), g(0), b(0) {}
-  FMT_CONSTEXPR rgb(uint8_t r_, uint8_t g_, uint8_t b_) : r(r_), g(g_), b(b_) {}
-  FMT_CONSTEXPR rgb(uint32_t hex)
-      : r((hex >> 16) & 0xFF), g((hex >> 8) & 0xFF), b(hex & 0xFF) {}
-  FMT_CONSTEXPR rgb(color hex)
-      : r((uint32_t(hex) >> 16) & 0xFF),
-        g((uint32_t(hex) >> 8) & 0xFF),
-        b(uint32_t(hex) & 0xFF) {}
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
-};
-
-namespace detail {
-
-// color is a struct of either a rgb color or a terminal color.
-struct color_type {
-  FMT_CONSTEXPR color_type() FMT_NOEXCEPT : is_rgb(), value{} {}
-  FMT_CONSTEXPR color_type(color rgb_color) FMT_NOEXCEPT : is_rgb(true),
-                                                           value{} {
-    value.rgb_color = static_cast<uint32_t>(rgb_color);
-  }
-  FMT_CONSTEXPR color_type(rgb rgb_color) FMT_NOEXCEPT : is_rgb(true), value{} {
-    value.rgb_color = (static_cast<uint32_t>(rgb_color.r) << 16) |
-                      (static_cast<uint32_t>(rgb_color.g) << 8) | rgb_color.b;
-  }
-  FMT_CONSTEXPR color_type(terminal_color term_color) FMT_NOEXCEPT : is_rgb(),
-                                                                     value{} {
-    value.term_color = static_cast<uint8_t>(term_color);
-  }
-  bool is_rgb;
-  union color_union {
-    uint8_t term_color;
-    uint32_t rgb_color;
-  } value;
-};
-}  // namespace detail
-
-// Experimental text formatting support.
-class text_style {
- public:
-  FMT_CONSTEXPR text_style(emphasis em = emphasis()) FMT_NOEXCEPT
-      : set_foreground_color(),
-        set_background_color(),
-        ems(em) {}
-
-  FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) {
-    if (!set_foreground_color) {
-      set_foreground_color = rhs.set_foreground_color;
-      foreground_color = rhs.foreground_color;
-    } else if (rhs.set_foreground_color) {
-      if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
-        FMT_THROW(format_error("can't OR a terminal color"));
-      foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color;
-    }
-
-    if (!set_background_color) {
-      set_background_color = rhs.set_background_color;
-      background_color = rhs.background_color;
-    } else if (rhs.set_background_color) {
-      if (!background_color.is_rgb || !rhs.background_color.is_rgb)
-        FMT_THROW(format_error("can't OR a terminal color"));
-      background_color.value.rgb_color |= rhs.background_color.value.rgb_color;
-    }
-
-    ems = static_cast<emphasis>(static_cast<uint8_t>(ems) |
-                                static_cast<uint8_t>(rhs.ems));
-    return *this;
-  }
-
-  friend FMT_CONSTEXPR text_style operator|(text_style lhs,
-                                            const text_style& rhs) {
-    return lhs |= rhs;
-  }
-
-  FMT_CONSTEXPR text_style& operator&=(const text_style& rhs) {
-    if (!set_foreground_color) {
-      set_foreground_color = rhs.set_foreground_color;
-      foreground_color = rhs.foreground_color;
-    } else if (rhs.set_foreground_color) {
-      if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
-        FMT_THROW(format_error("can't AND a terminal color"));
-      foreground_color.value.rgb_color &= rhs.foreground_color.value.rgb_color;
-    }
-
-    if (!set_background_color) {
-      set_background_color = rhs.set_background_color;
-      background_color = rhs.background_color;
-    } else if (rhs.set_background_color) {
-      if (!background_color.is_rgb || !rhs.background_color.is_rgb)
-        FMT_THROW(format_error("can't AND a terminal color"));
-      background_color.value.rgb_color &= rhs.background_color.value.rgb_color;
-    }
-
-    ems = static_cast<emphasis>(static_cast<uint8_t>(ems) &
-                                static_cast<uint8_t>(rhs.ems));
-    return *this;
-  }
-
-  friend FMT_CONSTEXPR text_style operator&(text_style lhs,
-                                            const text_style& rhs) {
-    return lhs &= rhs;
-  }
-
-  FMT_CONSTEXPR bool has_foreground() const FMT_NOEXCEPT {
-    return set_foreground_color;
-  }
-  FMT_CONSTEXPR bool has_background() const FMT_NOEXCEPT {
-    return set_background_color;
-  }
-  FMT_CONSTEXPR bool has_emphasis() const FMT_NOEXCEPT {
-    return static_cast<uint8_t>(ems) != 0;
-  }
-  FMT_CONSTEXPR detail::color_type get_foreground() const FMT_NOEXCEPT {
-    FMT_ASSERT(has_foreground(), "no foreground specified for this style");
-    return foreground_color;
-  }
-  FMT_CONSTEXPR detail::color_type get_background() const FMT_NOEXCEPT {
-    FMT_ASSERT(has_background(), "no background specified for this style");
-    return background_color;
-  }
-  FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT {
-    FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
-    return ems;
-  }
-
- private:
-  FMT_CONSTEXPR text_style(bool is_foreground,
-                           detail::color_type text_color) FMT_NOEXCEPT
-      : set_foreground_color(),
-        set_background_color(),
-        ems() {
-    if (is_foreground) {
-      foreground_color = text_color;
-      set_foreground_color = true;
-    } else {
-      background_color = text_color;
-      set_background_color = true;
-    }
-  }
-
-  friend FMT_CONSTEXPR_DECL text_style fg(detail::color_type foreground)
-      FMT_NOEXCEPT;
-  friend FMT_CONSTEXPR_DECL text_style bg(detail::color_type background)
-      FMT_NOEXCEPT;
-
-  detail::color_type foreground_color;
-  detail::color_type background_color;
-  bool set_foreground_color;
-  bool set_background_color;
-  emphasis ems;
-};
-
-FMT_CONSTEXPR text_style fg(detail::color_type foreground) FMT_NOEXCEPT {
-  return text_style(/*is_foreground=*/true, foreground);
-}
-
-FMT_CONSTEXPR text_style bg(detail::color_type background) FMT_NOEXCEPT {
-  return text_style(/*is_foreground=*/false, background);
-}
-
-FMT_CONSTEXPR text_style operator|(emphasis lhs, emphasis rhs) FMT_NOEXCEPT {
-  return text_style(lhs) | rhs;
-}
-
-namespace detail {
-
-template <typename Char> struct ansi_color_escape {
-  FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color,
-                                  const char* esc) FMT_NOEXCEPT {
-    // If we have a terminal color, we need to output another escape code
-    // sequence.
-    if (!text_color.is_rgb) {
-      bool is_background = esc == detail::data::background_color;
-      uint32_t value = text_color.value.term_color;
-      // Background ASCII codes are the same as the foreground ones but with
-      // 10 more.
-      if (is_background) value += 10u;
-
-      size_t index = 0;
-      buffer[index++] = static_cast<Char>('\x1b');
-      buffer[index++] = static_cast<Char>('[');
-
-      if (value >= 100u) {
-        buffer[index++] = static_cast<Char>('1');
-        value %= 100u;
-      }
-      buffer[index++] = static_cast<Char>('0' + value / 10u);
-      buffer[index++] = static_cast<Char>('0' + value % 10u);
-
-      buffer[index++] = static_cast<Char>('m');
-      buffer[index++] = static_cast<Char>('\0');
-      return;
-    }
-
-    for (int i = 0; i < 7; i++) {
-      buffer[i] = static_cast<Char>(esc[i]);
-    }
-    rgb color(text_color.value.rgb_color);
-    to_esc(color.r, buffer + 7, ';');
-    to_esc(color.g, buffer + 11, ';');
-    to_esc(color.b, buffer + 15, 'm');
-    buffer[19] = static_cast<Char>(0);
-  }
-  FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT {
-    uint8_t em_codes[4] = {};
-    uint8_t em_bits = static_cast<uint8_t>(em);
-    if (em_bits & static_cast<uint8_t>(emphasis::bold)) em_codes[0] = 1;
-    if (em_bits & static_cast<uint8_t>(emphasis::italic)) em_codes[1] = 3;
-    if (em_bits & static_cast<uint8_t>(emphasis::underline)) em_codes[2] = 4;
-    if (em_bits & static_cast<uint8_t>(emphasis::strikethrough))
-      em_codes[3] = 9;
-
-    size_t index = 0;
-    for (int i = 0; i < 4; ++i) {
-      if (!em_codes[i]) continue;
-      buffer[index++] = static_cast<Char>('\x1b');
-      buffer[index++] = static_cast<Char>('[');
-      buffer[index++] = static_cast<Char>('0' + em_codes[i]);
-      buffer[index++] = static_cast<Char>('m');
-    }
-    buffer[index++] = static_cast<Char>(0);
-  }
-  FMT_CONSTEXPR operator const Char*() const FMT_NOEXCEPT { return buffer; }
-
-  FMT_CONSTEXPR const Char* begin() const FMT_NOEXCEPT { return buffer; }
-  FMT_CONSTEXPR const Char* end() const FMT_NOEXCEPT {
-    return buffer + std::char_traits<Char>::length(buffer);
-  }
-
- private:
-  Char buffer[7u + 3u * 4u + 1u];
-
-  static FMT_CONSTEXPR void to_esc(uint8_t c, Char* out,
-                                   char delimiter) FMT_NOEXCEPT {
-    out[0] = static_cast<Char>('0' + c / 100);
-    out[1] = static_cast<Char>('0' + c / 10 % 10);
-    out[2] = static_cast<Char>('0' + c % 10);
-    out[3] = static_cast<Char>(delimiter);
-  }
-};
-
-template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_foreground_color(
-    detail::color_type foreground) FMT_NOEXCEPT {
-  return ansi_color_escape<Char>(foreground, detail::data::foreground_color);
-}
-
-template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_background_color(
-    detail::color_type background) FMT_NOEXCEPT {
-  return ansi_color_escape<Char>(background, detail::data::background_color);
-}
-
-template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) FMT_NOEXCEPT {
-  return ansi_color_escape<Char>(em);
-}
-
-template <typename Char>
-inline void fputs(const Char* chars, FILE* stream) FMT_NOEXCEPT {
-  std::fputs(chars, stream);
-}
-
-template <>
-inline void fputs<wchar_t>(const wchar_t* chars, FILE* stream) FMT_NOEXCEPT {
-  std::fputws(chars, stream);
-}
-
-template <typename Char> inline void reset_color(FILE* stream) FMT_NOEXCEPT {
-  fputs(detail::data::reset_color, stream);
-}
-
-template <> inline void reset_color<wchar_t>(FILE* stream) FMT_NOEXCEPT {
-  fputs(detail::data::wreset_color, stream);
-}
-
-template <typename Char>
-inline void reset_color(buffer<Char>& buffer) FMT_NOEXCEPT {
-  const char* begin = data::reset_color;
-  const char* end = begin + sizeof(data::reset_color) - 1;
-  buffer.append(begin, end);
-}
-
-template <typename Char>
-void vformat_to(buffer<Char>& buf, const text_style& ts,
-                basic_string_view<Char> format_str,
-                basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  bool has_style = false;
-  if (ts.has_emphasis()) {
-    has_style = true;
-    auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
-    buf.append(emphasis.begin(), emphasis.end());
-  }
-  if (ts.has_foreground()) {
-    has_style = true;
-    auto foreground = detail::make_foreground_color<Char>(ts.get_foreground());
-    buf.append(foreground.begin(), foreground.end());
-  }
-  if (ts.has_background()) {
-    has_style = true;
-    auto background = detail::make_background_color<Char>(ts.get_background());
-    buf.append(background.begin(), background.end());
-  }
-  detail::vformat_to(buf, format_str, args);
-  if (has_style) detail::reset_color<Char>(buf);
-}
-}  // namespace detail
-
-template <typename S, typename Char = char_t<S>>
-void vprint(std::FILE* f, const text_style& ts, const S& format,
-            basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  basic_memory_buffer<Char> buf;
-  detail::vformat_to(buf, ts, to_string_view(format), args);
-  buf.push_back(Char(0));
-  detail::fputs(buf.data(), f);
-}
-
-/**
-  \rst
-  Formats a string and prints it to the specified file stream using ANSI
-  escape sequences to specify text formatting.
-
-  **Example**::
-
-    fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
-               "Elapsed time: {0:.2f} seconds", 1.23);
-  \endrst
- */
-template <typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_string<S>::value)>
-void print(std::FILE* f, const text_style& ts, const S& format_str,
-           const Args&... args) {
-  vprint(f, ts, format_str,
-         fmt::make_args_checked<Args...>(format_str, args...));
-}
-
-/**
-  Formats a string and prints it to stdout using ANSI escape sequences to
-  specify text formatting.
-  Example:
-    fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
-               "Elapsed time: {0:.2f} seconds", 1.23);
- */
-template <typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_string<S>::value)>
-void print(const text_style& ts, const S& format_str, const Args&... args) {
-  return print(stdout, ts, format_str, args...);
-}
-
-template <typename S, typename Char = char_t<S>>
-inline std::basic_string<Char> vformat(
-    const text_style& ts, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  basic_memory_buffer<Char> buf;
-  detail::vformat_to(buf, ts, to_string_view(format_str), args);
-  return fmt::to_string(buf);
-}
-
-/**
-  \rst
-  Formats arguments and returns the result as a string using ANSI
-  escape sequences to specify text formatting.
-
-  **Example**::
-
-    #include <fmt/color.h>
-    std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
-                                      "The answer is {}", 42);
-  \endrst
-*/
-template <typename S, typename... Args, typename Char = char_t<S>>
-inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
-                                      const Args&... args) {
-  return vformat(ts, to_string_view(format_str),
-                 fmt::make_args_checked<Args...>(format_str, args...));
-}
-
-/**
-  Formats a string with the given text_style and writes the output to ``out``.
- */
-template <typename OutputIt, typename Char,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
-OutputIt vformat_to(
-    OutputIt out, const text_style& ts, basic_string_view<Char> format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  decltype(detail::get_buffer<Char>(out)) buf(detail::get_buffer_init(out));
-  detail::vformat_to(buf, ts, format_str, args);
-  return detail::get_iterator(buf);
-}
-
-/**
-  \rst
-  Formats arguments with the given text_style, writes the result to the output
-  iterator ``out`` and returns the iterator past the end of the output range.
-
-  **Example**::
-
-    std::vector<char> out;
-    fmt::format_to(std::back_inserter(out),
-                   fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
-  \endrst
-*/
-template <typename OutputIt, typename S, typename... Args,
-          bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value&&
-              detail::is_string<S>::value>
-inline auto format_to(OutputIt out, const text_style& ts, const S& format_str,
-                      Args&&... args) ->
-    typename std::enable_if<enable, OutputIt>::type {
-  return vformat_to(out, ts, to_string_view(format_str),
-                    fmt::make_args_checked<Args...>(format_str, args...));
-}
-
-FMT_END_NAMESPACE
-
-#endif  // FMT_COLOR_H_

oss/fmt/include/fmt/compile.h

@@ -1,701 +0,0 @@
-// Formatting library for C++ - experimental format string compilation
-//
-// Copyright (c) 2012 - present, Victor Zverovich and fmt contributors
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-#ifndef FMT_COMPILE_H_
-#define FMT_COMPILE_H_
-
-#include <vector>
-
-#include "format.h"
-
-FMT_BEGIN_NAMESPACE
-namespace detail {
-
-// A compile-time string which is compiled into fast formatting code.
-class compiled_string {};
-
-template <typename S>
-struct is_compiled_string : std::is_base_of<compiled_string, S> {};
-
-/**
-  \rst
-  Converts a string literal *s* into a format string that will be parsed at
-  compile time and converted into efficient formatting code. Requires C++17
-  ``constexpr if`` compiler support.
-
-  **Example**::
-
-    // Converts 42 into std::string using the most efficient method and no
-    // runtime format string processing.
-    std::string s = fmt::format(FMT_COMPILE("{}"), 42);
-  \endrst
- */
-#define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::detail::compiled_string)
-
-template <typename T, typename... Tail>
-const T& first(const T& value, const Tail&...) {
-  return value;
-}
-
-// Part of a compiled format string. It can be either literal text or a
-// replacement field.
-template <typename Char> struct format_part {
-  enum class kind { arg_index, arg_name, text, replacement };
-
-  struct replacement {
-    arg_ref<Char> arg_id;
-    dynamic_format_specs<Char> specs;
-  };
-
-  kind part_kind;
-  union value {
-    int arg_index;
-    basic_string_view<Char> str;
-    replacement repl;
-
-    FMT_CONSTEXPR value(int index = 0) : arg_index(index) {}
-    FMT_CONSTEXPR value(basic_string_view<Char> s) : str(s) {}
-    FMT_CONSTEXPR value(replacement r) : repl(r) {}
-  } val;
-  // Position past the end of the argument id.
-  const Char* arg_id_end = nullptr;
-
-  FMT_CONSTEXPR format_part(kind k = kind::arg_index, value v = {})
-      : part_kind(k), val(v) {}
-
-  static FMT_CONSTEXPR format_part make_arg_index(int index) {
-    return format_part(kind::arg_index, index);
-  }
-  static FMT_CONSTEXPR format_part make_arg_name(basic_string_view<Char> name) {
-    return format_part(kind::arg_name, name);
-  }
-  static FMT_CONSTEXPR format_part make_text(basic_string_view<Char> text) {
-    return format_part(kind::text, text);
-  }
-  static FMT_CONSTEXPR format_part make_replacement(replacement repl) {
-    return format_part(kind::replacement, repl);
-  }
-};
-
-template <typename Char> struct part_counter {
-  unsigned num_parts = 0;
-
-  FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
-    if (begin != end) ++num_parts;
-  }
-
-  FMT_CONSTEXPR int on_arg_id() { return ++num_parts, 0; }
-  FMT_CONSTEXPR int on_arg_id(int) { return ++num_parts, 0; }
-  FMT_CONSTEXPR int on_arg_id(basic_string_view<Char>) {
-    return ++num_parts, 0;
-  }
-
-  FMT_CONSTEXPR void on_replacement_field(int, const Char*) {}
-
-  FMT_CONSTEXPR const Char* on_format_specs(int, const Char* begin,
-                                            const Char* end) {
-    // Find the matching brace.
-    unsigned brace_counter = 0;
-    for (; begin != end; ++begin) {
-      if (*begin == '{') {
-        ++brace_counter;
-      } else if (*begin == '}') {
-        if (brace_counter == 0u) break;
-        --brace_counter;
-      }
-    }
-    return begin;
-  }
-
-  FMT_CONSTEXPR void on_error(const char*) {}
-};
-
-// Counts the number of parts in a format string.
-template <typename Char>
-FMT_CONSTEXPR unsigned count_parts(basic_string_view<Char> format_str) {
-  part_counter<Char> counter;
-  parse_format_string<true>(format_str, counter);
-  return counter.num_parts;
-}
-
-template <typename Char, typename PartHandler>
-class format_string_compiler : public error_handler {
- private:
-  using part = format_part<Char>;
-
-  PartHandler handler_;
-  part part_;
-  basic_string_view<Char> format_str_;
-  basic_format_parse_context<Char> parse_context_;
-
- public:
-  FMT_CONSTEXPR format_string_compiler(basic_string_view<Char> format_str,
-                                       PartHandler handler)
-      : handler_(handler),
-        format_str_(format_str),
-        parse_context_(format_str) {}
-
-  FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
-    if (begin != end)
-      handler_(part::make_text({begin, to_unsigned(end - begin)}));
-  }
-
-  FMT_CONSTEXPR int on_arg_id() {
-    part_ = part::make_arg_index(parse_context_.next_arg_id());
-    return 0;
-  }
-
-  FMT_CONSTEXPR int on_arg_id(int id) {
-    parse_context_.check_arg_id(id);
-    part_ = part::make_arg_index(id);
-    return 0;
-  }
-
-  FMT_CONSTEXPR int on_arg_id(basic_string_view<Char> id) {
-    part_ = part::make_arg_name(id);
-    return 0;
-  }
-
-  FMT_CONSTEXPR void on_replacement_field(int, const Char* ptr) {
-    part_.arg_id_end = ptr;
-    handler_(part_);
-  }
-
-  FMT_CONSTEXPR const Char* on_format_specs(int, const Char* begin,
-                                            const Char* end) {
-    auto repl = typename part::replacement();
-    dynamic_specs_handler<basic_format_parse_context<Char>> handler(
-        repl.specs, parse_context_);
-    auto it = parse_format_specs(begin, end, handler);
-    if (*it != '}') on_error("missing '}' in format string");
-    repl.arg_id = part_.part_kind == part::kind::arg_index
-                      ? arg_ref<Char>(part_.val.arg_index)
-                      : arg_ref<Char>(part_.val.str);
-    auto part = part::make_replacement(repl);
-    part.arg_id_end = begin;
-    handler_(part);
-    return it;
-  }
-};
-
-// Compiles a format string and invokes handler(part) for each parsed part.
-template <bool IS_CONSTEXPR, typename Char, typename PartHandler>
-FMT_CONSTEXPR void compile_format_string(basic_string_view<Char> format_str,
-                                         PartHandler handler) {
-  parse_format_string<IS_CONSTEXPR>(
-      format_str,
-      format_string_compiler<Char, PartHandler>(format_str, handler));
-}
-
-template <typename OutputIt, typename Context, typename Id>
-void format_arg(
-    basic_format_parse_context<typename Context::char_type>& parse_ctx,
-    Context& ctx, Id arg_id) {
-  ctx.advance_to(visit_format_arg(
-      arg_formatter<OutputIt, typename Context::char_type>(ctx, &parse_ctx),
-      ctx.arg(arg_id)));
-}
-
-// vformat_to is defined in a subnamespace to prevent ADL.
-namespace cf {
-template <typename Context, typename OutputIt, typename CompiledFormat>
-auto vformat_to(OutputIt out, CompiledFormat& cf,
-                basic_format_args<Context> args) -> typename Context::iterator {
-  using char_type = typename Context::char_type;
-  basic_format_parse_context<char_type> parse_ctx(
-      to_string_view(cf.format_str_));
-  Context ctx(out, args);
-
-  const auto& parts = cf.parts();
-  for (auto part_it = std::begin(parts); part_it != std::end(parts);
-       ++part_it) {
-    const auto& part = *part_it;
-    const auto& value = part.val;
-
-    using format_part_t = format_part<char_type>;
-    switch (part.part_kind) {
-    case format_part_t::kind::text: {
-      const auto text = value.str;
-      auto output = ctx.out();
-      auto&& it = reserve(output, text.size());
-      it = std::copy_n(text.begin(), text.size(), it);
-      ctx.advance_to(output);
-      break;
-    }
-
-    case format_part_t::kind::arg_index:
-      advance_to(parse_ctx, part.arg_id_end);
-      detail::format_arg<OutputIt>(parse_ctx, ctx, value.arg_index);
-      break;
-
-    case format_part_t::kind::arg_name:
-      advance_to(parse_ctx, part.arg_id_end);
-      detail::format_arg<OutputIt>(parse_ctx, ctx, value.str);
-      break;
-
-    case format_part_t::kind::replacement: {
-      const auto& arg_id_value = value.repl.arg_id.val;
-      const auto arg = value.repl.arg_id.kind == arg_id_kind::index
-                           ? ctx.arg(arg_id_value.index)
-                           : ctx.arg(arg_id_value.name);
-
-      auto specs = value.repl.specs;
-
-      handle_dynamic_spec<width_checker>(specs.width, specs.width_ref, ctx);
-      handle_dynamic_spec<precision_checker>(specs.precision,
-                                             specs.precision_ref, ctx);
-
-      error_handler h;
-      numeric_specs_checker<error_handler> checker(h, arg.type());
-      if (specs.align == align::numeric) checker.require_numeric_argument();
-      if (specs.sign != sign::none) checker.check_sign();
-      if (specs.alt) checker.require_numeric_argument();
-      if (specs.precision >= 0) checker.check_precision();
-
-      advance_to(parse_ctx, part.arg_id_end);
-      ctx.advance_to(
-          visit_format_arg(arg_formatter<OutputIt, typename Context::char_type>(
-                               ctx, nullptr, &specs),
-                           arg));
-      break;
-    }
-    }
-  }
-  return ctx.out();
-}
-}  // namespace cf
-
-struct basic_compiled_format {};
-
-template <typename S, typename = void>
-struct compiled_format_base : basic_compiled_format {
-  using char_type = char_t<S>;
-  using parts_container = std::vector<detail::format_part<char_type>>;
-
-  parts_container compiled_parts;
-
-  explicit compiled_format_base(basic_string_view<char_type> format_str) {
-    compile_format_string<false>(format_str,
-                                 [this](const format_part<char_type>& part) {
-                                   compiled_parts.push_back(part);
-                                 });
-  }
-
-  const parts_container& parts() const { return compiled_parts; }
-};
-
-template <typename Char, unsigned N> struct format_part_array {
-  format_part<Char> data[N] = {};
-  FMT_CONSTEXPR format_part_array() = default;
-};
-
-template <typename Char, unsigned N>
-FMT_CONSTEXPR format_part_array<Char, N> compile_to_parts(
-    basic_string_view<Char> format_str) {
-  format_part_array<Char, N> parts;
-  unsigned counter = 0;
-  // This is not a lambda for compatibility with older compilers.
-  struct {
-    format_part<Char>* parts;
-    unsigned* counter;
-    FMT_CONSTEXPR void operator()(const format_part<Char>& part) {
-      parts[(*counter)++] = part;
-    }
-  } collector{parts.data, &counter};
-  compile_format_string<true>(format_str, collector);
-  if (counter < N) {
-    parts.data[counter] =
-        format_part<Char>::make_text(basic_string_view<Char>());
-  }
-  return parts;
-}
-
-template <typename T> constexpr const T& constexpr_max(const T& a, const T& b) {
-  return (a < b) ? b : a;
-}
-
-template <typename S>
-struct compiled_format_base<S, enable_if_t<is_compile_string<S>::value>>
-    : basic_compiled_format {
-  using char_type = char_t<S>;
-
-  FMT_CONSTEXPR explicit compiled_format_base(basic_string_view<char_type>) {}
-
-// Workaround for old compilers. Format string compilation will not be
-// performed there anyway.
-#if FMT_USE_CONSTEXPR
-  static FMT_CONSTEXPR_DECL const unsigned num_format_parts =
-      constexpr_max(count_parts(to_string_view(S())), 1u);
-#else
-  static const unsigned num_format_parts = 1;
-#endif
-
-  using parts_container = format_part<char_type>[num_format_parts];
-
-  const parts_container& parts() const {
-    static FMT_CONSTEXPR_DECL const auto compiled_parts =
-        compile_to_parts<char_type, num_format_parts>(
-            detail::to_string_view(S()));
-    return compiled_parts.data;
-  }
-};
-
-template <typename S, typename... Args>
-class compiled_format : private compiled_format_base<S> {
- public:
-  using typename compiled_format_base<S>::char_type;
-
- private:
-  basic_string_view<char_type> format_str_;
-
-  template <typename Context, typename OutputIt, typename CompiledFormat>
-  friend auto cf::vformat_to(OutputIt out, CompiledFormat& cf,
-                             basic_format_args<Context> args) ->
-      typename Context::iterator;
-
- public:
-  compiled_format() = delete;
-  explicit constexpr compiled_format(basic_string_view<char_type> format_str)
-      : compiled_format_base<S>(format_str), format_str_(format_str) {}
-};
-
-#ifdef __cpp_if_constexpr
-template <typename... Args> struct type_list {};
-
-// Returns a reference to the argument at index N from [first, rest...].
-template <int N, typename T, typename... Args>
-constexpr const auto& get([[maybe_unused]] const T& first,
-                          [[maybe_unused]] const Args&... rest) {
-  static_assert(N < 1 + sizeof...(Args), "index is out of bounds");
-  if constexpr (N == 0)
-    return first;
-  else
-    return get<N - 1>(rest...);
-}
-
-template <int N, typename> struct get_type_impl;
-
-template <int N, typename... Args> struct get_type_impl<N, type_list<Args...>> {
-  using type = remove_cvref_t<decltype(get<N>(std::declval<Args>()...))>;
-};
-
-template <int N, typename T>
-using get_type = typename get_type_impl<N, T>::type;
-
-template <typename T> struct is_compiled_format : std::false_type {};
-
-template <typename Char> struct text {
-  basic_string_view<Char> data;
-  using char_type = Char;
-
-  template <typename OutputIt, typename... Args>
-  OutputIt format(OutputIt out, const Args&...) const {
-    return write<Char>(out, data);
-  }
-};
-
-template <typename Char>
-struct is_compiled_format<text<Char>> : std::true_type {};
-
-template <typename Char>
-constexpr text<Char> make_text(basic_string_view<Char> s, size_t pos,
-                               size_t size) {
-  return {{&s[pos], size}};
-}
-
-template <typename Char> struct code_unit {
-  Char value;
-  using char_type = Char;
-
-  template <typename OutputIt, typename... Args>
-  OutputIt format(OutputIt out, const Args&...) const {
-    return write<Char>(out, value);
-  }
-};
-
-template <typename Char>
-struct is_compiled_format<code_unit<Char>> : std::true_type {};
-
-// A replacement field that refers to argument N.
-template <typename Char, typename T, int N> struct field {
-  using char_type = Char;
-
-  template <typename OutputIt, typename... Args>
-  OutputIt format(OutputIt out, const Args&... args) const {
-    // This ensures that the argument type is convertile to `const T&`.
-    const T& arg = get<N>(args...);
-    return write<Char>(out, arg);
-  }
-};
-
-template <typename Char, typename T, int N>
-struct is_compiled_format<field<Char, T, N>> : std::true_type {};
-
-// A replacement field that refers to argument N and has format specifiers.
-template <typename Char, typename T, int N> struct spec_field {
-  using char_type = Char;
-  mutable formatter<T, Char> fmt;
-
-  template <typename OutputIt, typename... Args>
-  OutputIt format(OutputIt out, const Args&... args) const {
-    // This ensures that the argument type is convertile to `const T&`.
-    const T& arg = get<N>(args...);
-    const auto& vargs =
-        make_format_args<basic_format_context<OutputIt, Char>>(args...);
-    basic_format_context<OutputIt, Char> ctx(out, vargs);
-    return fmt.format(arg, ctx);
-  }
-};
-
-template <typename Char, typename T, int N>
-struct is_compiled_format<spec_field<Char, T, N>> : std::true_type {};
-
-template <typename L, typename R> struct concat {
-  L lhs;
-  R rhs;
-  using char_type = typename L::char_type;
-
-  template <typename OutputIt, typename... Args>
-  OutputIt format(OutputIt out, const Args&... args) const {
-    out = lhs.format(out, args...);
-    return rhs.format(out, args...);
-  }
-};
-
-template <typename L, typename R>
-struct is_compiled_format<concat<L, R>> : std::true_type {};
-
-template <typename L, typename R>
-constexpr concat<L, R> make_concat(L lhs, R rhs) {
-  return {lhs, rhs};
-}
-
-struct unknown_format {};
-
-template <typename Char>
-constexpr size_t parse_text(basic_string_view<Char> str, size_t pos) {
-  for (size_t size = str.size(); pos != size; ++pos) {
-    if (str[pos] == '{' || str[pos] == '}') break;
-  }
-  return pos;
-}
-
-template <typename Args, size_t POS, int ID, typename S>
-constexpr auto compile_format_string(S format_str);
-
-template <typename Args, size_t POS, int ID, typename T, typename S>
-constexpr auto parse_tail(T head, S format_str) {
-  if constexpr (POS !=
-                basic_string_view<typename S::char_type>(format_str).size()) {
-    constexpr auto tail = compile_format_string<Args, POS, ID>(format_str);
-    if constexpr (std::is_same<remove_cvref_t<decltype(tail)>,
-                               unknown_format>())
-      return tail;
-    else
-      return make_concat(head, tail);
-  } else {
-    return head;
-  }
-}
-
-template <typename T, typename Char> struct parse_specs_result {
-  formatter<T, Char> fmt;
-  size_t end;
-  int next_arg_id;
-};
-
-template <typename T, typename Char>
-constexpr parse_specs_result<T, Char> parse_specs(basic_string_view<Char> str,
-                                                  size_t pos, int arg_id) {
-  str.remove_prefix(pos);
-  auto ctx = basic_format_parse_context<Char>(str, {}, arg_id + 1);
-  auto f = formatter<T, Char>();
-  auto end = f.parse(ctx);
-  return {f, pos + (end - str.data()) + 1, ctx.next_arg_id()};
-}
-
-// Compiles a non-empty format string and returns the compiled representation
-// or unknown_format() on unrecognized input.
-template <typename Args, size_t POS, int ID, typename S>
-constexpr auto compile_format_string(S format_str) {
-  using char_type = typename S::char_type;
-  constexpr basic_string_view<char_type> str = format_str;
-  if constexpr (str[POS] == '{') {
-    if (POS + 1 == str.size())
-      throw format_error("unmatched '{' in format string");
-    if constexpr (str[POS + 1] == '{') {
-      return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
-    } else if constexpr (str[POS + 1] == '}') {
-      using type = get_type<ID, Args>;
-      return parse_tail<Args, POS + 2, ID + 1>(field<char_type, type, ID>(),
-                                               format_str);
-    } else if constexpr (str[POS + 1] == ':') {
-      using type = get_type<ID, Args>;
-      constexpr auto result = parse_specs<type>(str, POS + 2, ID);
-      return parse_tail<Args, result.end, result.next_arg_id>(
-          spec_field<char_type, type, ID>{result.fmt}, format_str);
-    } else {
-      return unknown_format();
-    }
-  } else if constexpr (str[POS] == '}') {
-    if (POS + 1 == str.size())
-      throw format_error("unmatched '}' in format string");
-    return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
-  } else {
-    constexpr auto end = parse_text(str, POS + 1);
-    if constexpr (end - POS > 1) {
-      return parse_tail<Args, end, ID>(make_text(str, POS, end - POS),
-                                       format_str);
-    } else {
-      return parse_tail<Args, end, ID>(code_unit<char_type>{str[POS]},
-                                       format_str);
-    }
-  }
-}
-
-template <typename... Args, typename S,
-          FMT_ENABLE_IF(is_compile_string<S>::value ||
-                        detail::is_compiled_string<S>::value)>
-constexpr auto compile(S format_str) {
-  constexpr basic_string_view<typename S::char_type> str = format_str;
-  if constexpr (str.size() == 0) {
-    return detail::make_text(str, 0, 0);
-  } else {
-    constexpr auto result =
-        detail::compile_format_string<detail::type_list<Args...>, 0, 0>(
-            format_str);
-    if constexpr (std::is_same<remove_cvref_t<decltype(result)>,
-                               detail::unknown_format>()) {
-      return detail::compiled_format<S, Args...>(to_string_view(format_str));
-    } else {
-      return result;
-    }
-  }
-}
-#else
-template <typename... Args, typename S,
-          FMT_ENABLE_IF(is_compile_string<S>::value)>
-constexpr auto compile(S format_str) -> detail::compiled_format<S, Args...> {
-  return detail::compiled_format<S, Args...>(to_string_view(format_str));
-}
-#endif  // __cpp_if_constexpr
-
-// Compiles the format string which must be a string literal.
-template <typename... Args, typename Char, size_t N>
-auto compile(const Char (&format_str)[N])
-    -> detail::compiled_format<const Char*, Args...> {
-  return detail::compiled_format<const Char*, Args...>(
-      basic_string_view<Char>(format_str, N - 1));
-}
-}  // namespace detail
-
-// DEPRECATED! use FMT_COMPILE instead.
-template <typename... Args>
-FMT_DEPRECATED auto compile(const Args&... args)
-    -> decltype(detail::compile(args...)) {
-  return detail::compile(args...);
-}
-
-#if FMT_USE_CONSTEXPR
-#  ifdef __cpp_if_constexpr
-
-template <typename CompiledFormat, typename... Args,
-          typename Char = typename CompiledFormat::char_type,
-          FMT_ENABLE_IF(detail::is_compiled_format<CompiledFormat>::value)>
-FMT_INLINE std::basic_string<Char> format(const CompiledFormat& cf,
-                                          const Args&... args) {
-  basic_memory_buffer<Char> buffer;
-  cf.format(detail::buffer_appender<Char>(buffer), args...);
-  return to_string(buffer);
-}
-
-template <typename OutputIt, typename CompiledFormat, typename... Args,
-          FMT_ENABLE_IF(detail::is_compiled_format<CompiledFormat>::value)>
-OutputIt format_to(OutputIt out, const CompiledFormat& cf,
-                   const Args&... args) {
-  return cf.format(out, args...);
-}
-#  endif  // __cpp_if_constexpr
-#endif    // FMT_USE_CONSTEXPR
-
-template <typename CompiledFormat, typename... Args,
-          typename Char = typename CompiledFormat::char_type,
-          FMT_ENABLE_IF(std::is_base_of<detail::basic_compiled_format,
-                                        CompiledFormat>::value)>
-std::basic_string<Char> format(const CompiledFormat& cf, const Args&... args) {
-  basic_memory_buffer<Char> buffer;
-  using context = buffer_context<Char>;
-  detail::cf::vformat_to<context>(detail::buffer_appender<Char>(buffer), cf,
-                                  make_format_args<context>(args...));
-  return to_string(buffer);
-}
-
-template <typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-FMT_INLINE std::basic_string<typename S::char_type> format(const S&,
-                                                           Args&&... args) {
-#ifdef __cpp_if_constexpr
-  if constexpr (std::is_same<typename S::char_type, char>::value) {
-    constexpr basic_string_view<typename S::char_type> str = S();
-    if (str.size() == 2 && str[0] == '{' && str[1] == '}')
-      return fmt::to_string(detail::first(args...));
-  }
-#endif
-  constexpr auto compiled = detail::compile<Args...>(S());
-  return format(compiled, std::forward<Args>(args)...);
-}
-
-template <typename OutputIt, typename CompiledFormat, typename... Args,
-          FMT_ENABLE_IF(std::is_base_of<detail::basic_compiled_format,
-                                        CompiledFormat>::value)>
-OutputIt format_to(OutputIt out, const CompiledFormat& cf,
-                   const Args&... args) {
-  using char_type = typename CompiledFormat::char_type;
-  using context = format_context_t<OutputIt, char_type>;
-  return detail::cf::vformat_to<context>(out, cf,
-                                         make_format_args<context>(args...));
-}
-
-template <typename OutputIt, typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-OutputIt format_to(OutputIt out, const S&, const Args&... args) {
-  constexpr auto compiled = detail::compile<Args...>(S());
-  return format_to(out, compiled, args...);
-}
-
-template <typename OutputIt, typename CompiledFormat, typename... Args>
-auto format_to_n(OutputIt out, size_t n, const CompiledFormat& cf,
-                 const Args&... args) ->
-    typename std::enable_if<
-        detail::is_output_iterator<OutputIt,
-                                   typename CompiledFormat::char_type>::value &&
-            std::is_base_of<detail::basic_compiled_format,
-                            CompiledFormat>::value,
-        format_to_n_result<OutputIt>>::type {
-  auto it =
-      format_to(detail::truncating_iterator<OutputIt>(out, n), cf, args...);
-  return {it.base(), it.count()};
-}
-
-template <typename OutputIt, typename S, typename... Args,
-          FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n, const S&,
-                                         const Args&... args) {
-  constexpr auto compiled = detail::compile<Args...>(S());
-  auto it = format_to(detail::truncating_iterator<OutputIt>(out, n), compiled,
-                      args...);
-  return {it.base(), it.count()};
-}
-
-template <typename CompiledFormat, typename... Args>
-size_t formatted_size(const CompiledFormat& cf, const Args&... args) {
-  return format_to(detail::counting_iterator(), cf, args...).count();
-}
-
-FMT_END_NAMESPACE
-
-#endif  // FMT_COMPILE_H_

oss/fmt/include/fmt/locale.h

@@ -1,64 +0,0 @@
-// Formatting library for C++ - std::locale support
-//
-// Copyright (c) 2012 - present, Victor Zverovich
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-#ifndef FMT_LOCALE_H_
-#define FMT_LOCALE_H_
-
-#include <locale>
-
-#include "format.h"
-
-FMT_BEGIN_NAMESPACE
-
-namespace detail {
-template <typename Char>
-std::basic_string<Char> vformat(
-    const std::locale& loc, basic_string_view<Char> format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  basic_memory_buffer<Char> buffer;
-  detail::vformat_to(buffer, format_str, args, detail::locale_ref(loc));
-  return fmt::to_string(buffer);
-}
-}  // namespace detail
-
-template <typename S, typename Char = char_t<S>>
-inline std::basic_string<Char> vformat(
-    const std::locale& loc, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  return detail::vformat(loc, to_string_view(format_str), args);
-}
-
-template <typename S, typename... Args, typename Char = char_t<S>>
-inline std::basic_string<Char> format(const std::locale& loc,
-                                      const S& format_str, Args&&... args) {
-  return detail::vformat(loc, to_string_view(format_str),
-                         fmt::make_args_checked<Args...>(format_str, args...));
-}
-
-template <typename S, typename OutputIt, typename... Args,
-          typename Char = char_t<S>,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
-inline OutputIt vformat_to(
-    OutputIt out, const std::locale& loc, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
-  decltype(detail::get_buffer<Char>(out)) buf(detail::get_buffer_init(out));
-  vformat_to(buf, to_string_view(format_str), args, detail::locale_ref(loc));
-  return detail::get_iterator(buf);
-}
-
-template <typename OutputIt, typename S, typename... Args,
-          bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value>
-inline auto format_to(OutputIt out, const std::locale& loc,
-                      const S& format_str, Args&&... args) ->
-    typename std::enable_if<enable, OutputIt>::type {
-  const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...);
-  return vformat_to(out, loc, to_string_view(format_str), vargs);
-}
-
-FMT_END_NAMESPACE
-
-#endif  // FMT_LOCALE_H_