wip

2026-04-22 06:01:27 +00:00 · 2024-08-08 19:01:48 +02:00
567 changed files with 8416 additions and 14093 deletions
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -9,7 +9,6 @@ CMMI
 colorbrewer
 consvc
 copyable
-CText
 dalet
 dcs
 deselection
@@ -21,7 +20,6 @@ dze
 dzhe
 Emacspeak
 Fitt
-flac
 FTCS
 gantt
 ghe
@@ -29,7 +27,6 @@ gje
 godbolt
 hyperlinking
 hyperlinks
-Kbds
 kje
 libfuzzer
 liga
@@ -46,7 +43,6 @@ mkmk
 mnt
 mru
 nje
-NTMTo
 notwrapped
 ogonek
 overlined
@@ -57,7 +53,6 @@ ptys
 pwn
 pwshw
 qof
-QOL
 qps
 quickfix
 rclt
@@ -76,7 +71,6 @@ slnt
 stakeholders
 sustainability
 sxn
-Tencent
 TLDR
 tonos
 toolset
--- a/.github/actions/spelling/allow/apis.txt
+++ b/.github/actions/spelling/allow/apis.txt
@@ -96,7 +96,6 @@ IGraphics
 IImage
 IInheritable
 IMap
-imm
 IMonarch
 IObject
 iosfwd
@@ -285,5 +284,4 @@ xtree
 xutility
 YIcon
 YMax
-zstring
 zwstring
--- a/.github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt
+++ b/.github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt
@@ -0,0 +1,5 @@
+EOB
+swrapped
+wordi
+wordiswrapped
+wrappe
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -9,6 +9,7 @@ ABORTIFHUNG
 ACCESSTOKEN
 acidev
 ACIOSS
+ACover
 acp
 actctx
 ACTCTXW
@@ -16,8 +17,6 @@ ADDALIAS
 ADDREF
 ADDSTRING
 ADDTOOL
-adml
-admx
 AFill
 AFX
 AHelper
@@ -87,9 +86,7 @@ autoscrolling
 Autowrap
 AVerify
 awch
-AZCOPY
 azurecr
-AZZ
 backgrounded
 Backgrounder
 backgrounding
@@ -146,8 +143,8 @@ BTNFACE
 bufferout
 buffersize
 buflen
-buildsystems
 buildtransitive
+buildsystems
 BValue
 bytebuffer
 cac
@@ -183,6 +180,7 @@ CFuzz
 cgscrn
 chafa
 changelists
+charinfo
 CHARSETINFO
 chh
 chshdng
@@ -215,7 +213,6 @@ codepages
 codepath
 coinit
 colorizing
-COLORONCOLOR
 COLORREFs
 colorschemes
 colorspec
@@ -267,6 +264,7 @@ consolegit
 consolehost
 CONSOLEIME
 consoleinternal
+Consoleroot
 CONSOLESETFOREGROUND
 consoletaeftemplates
 consoleuwp
@@ -343,7 +341,6 @@ CXVIRTUALSCREEN
 CXVSCROLL
 CYFRAME
 CYFULLSCREEN
-cygdrive
 CYHSCROLL
 CYMIN
 CYPADDEDBORDER
@@ -389,7 +386,7 @@ DECCIR
 DECCKM
 DECCKSR
 DECCOLM
-deccra
+DECCRA
 DECCTR
 DECDC
 DECDHL
@@ -401,7 +398,7 @@ DECEKBD
 DECERA
 DECFI
 DECFNK
-decfra
+DECFRA
 DECGCI
 DECGCR
 DECGNL
@@ -569,7 +566,6 @@ entrypoints
 ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
-EOB
 EOK
 EPres
 EQU
@@ -731,6 +727,7 @@ GHIJKL
 gitcheckin
 gitfilters
 gitlab
+gitmodules
 gle
 GLOBALFOCUS
 GLYPHENTRY
@@ -788,7 +785,6 @@ HIWORD
 HKCU
 hkey
 hkl
-HKLM
 hlocal
 hlsl
 HMB
@@ -871,7 +867,6 @@ INLINEPREFIX
 inproc
 Inputkeyinfo
 Inputreadhandledata
-INPUTSCOPE
 INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
@@ -1026,6 +1021,7 @@ lstatus
 lstrcmp
 lstrcmpi
 LTEXT
+LTLTLTLTL
 ltsc
 LUID
 luma
@@ -1160,8 +1156,6 @@ nfe
 NLSMODE
 nnn
 NOACTIVATE
-NOACTIVATEKEYBOARDLAYOUT
-NOACTIVATETIP
 NOAPPLYNOW
 NOCLIP
 NOCOMM
@@ -1223,6 +1217,7 @@ ntlpcapi
 ntm
 ntrtl
 ntstatus
+NTSYSCALLAPI
 nttree
 nturtl
 ntuser
@@ -1299,7 +1294,6 @@ parms
 PATCOPY
 pathcch
 PATTERNID
-pbstr
 pcb
 pcch
 PCCHAR
@@ -1385,11 +1379,9 @@ POSTCHARBREAKS
 POSX
 POSXSCROLL
 POSYSCROLL
-ppbstr
 PPEB
 ppf
 ppidl
-pprg
 PPROC
 ppropvar
 ppsi
@@ -1430,7 +1422,6 @@ propvar
 propvariant
 propvarutil
 psa
-PSCRED
 PSECURITY
 pseudoconsole
 pseudoterminal
@@ -1534,6 +1525,7 @@ rftp
 rgbi
 RGBQUAD
 rgbs
+rgci
 rgfae
 rgfte
 rgn
@@ -1601,6 +1593,7 @@ scrolllock
 scrolloffset
 SCROLLSCALE
 SCROLLSCREENBUFFER
+scursor
 sddl
 SDKDDK
 securityappcontainer
@@ -1610,7 +1603,6 @@ SELECTALL
 SELECTEDFONT
 SELECTSTRING
 Selfhosters
-Serbo
 SERVERDLL
 SETACTIVE
 SETBUDDYINT
@@ -1692,7 +1684,6 @@ SMARTQUOTE
 SMTO
 snapcx
 snapcy
-snk
 SOLIDBOX
 Solutiondir
 somefile
@@ -1706,7 +1697,6 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-SRGS
 srvinit
 srvpipe
 ssa
@@ -1744,7 +1734,6 @@ swapchain
 swapchainpanel
 SWMR
 SWP
-swrapped
 SYMED
 SYNCPAINT
 syscalls
@@ -1817,12 +1806,10 @@ TEXTMETRICW
 textmode
 texttests
 TFunction
-TFCAT
 THUMBPOSITION
 THUMBTRACK
 TIcon
 tilunittests
-TIPCAP
 titlebars
 TITLEISLINKNAME
 TJson
@@ -1844,6 +1831,8 @@ TOPDOWNDIB
 TOpt
 tosign
 touchpad
+Tpp
+Tpqrst
 tracelogging
 traceviewpp
 trackbar
@@ -1856,6 +1845,7 @@ triaging
 TRIMZEROHEADINGS
 trx
 tsa
+tsattrs
 tsgr
 tsm
 TStr
@@ -1885,8 +1875,6 @@ UIACCESS
 uiacore
 uiautomationcore
 uielem
-UIELEMENTENABLED
-UIELEMENTENABLEDONLY
 UINTs
 ul
 uld
@@ -1969,6 +1957,7 @@ VPACKMANIFESTDIRECTORY
 VPR
 VREDRAW
 vsc
+vsconfig
 vscprintf
 VSCROLL
 vsdevshell
@@ -1985,8 +1974,10 @@ vswhere
 vtapp
 VTE
 VTID
+vtio
 vtmode
 vtpipeterm
+vtpt
 VTRGB
 VTRGBTo
 vtseq
@@ -2008,6 +1999,7 @@ wcswidth
 wddm
 wddmcon
 WDDMCONSOLECONTEXT
+WDK
 wdm
 webpage
 websites
@@ -2081,6 +2073,7 @@ winuserp
 WINVER
 wistd
 wmain
+wmemory
 WMSZ
 wnd
 WNDALLOC
@@ -2091,8 +2084,6 @@ WNDCLASSW
 Wndproc
 WNegative
 WNull
-wordi
-wordiswrapped
 workarea
 WOutside
 WOWARM
@@ -2106,7 +2097,6 @@ WPrep
 WPresent
 wprp
 wprpi
-wrappe
 wregex
 writeback
 WRITECONSOLE
@@ -2150,7 +2140,6 @@ XBUTTONDOWN
 XBUTTONUP
 XCast
 XCENTER
-xchar
 xcopy
 XCount
 xdy
@@ -2182,7 +2171,6 @@ yact
 YCast
 YCENTER
 YCount
-yizz
 YLimit
 YPan
 YSubstantial
@@ -2196,4 +2184,3 @@ ZCtrl
 ZWJs
 ZYXWVU
 ZYXWVUTd
-zzf
--- a/.github/actions/spelling/patterns/patterns.txt
+++ b/.github/actions/spelling/patterns/patterns.txt
@@ -22,7 +22,6 @@ 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
--- a/.wt.json
+++ b/.wt.json
@@ -23,12 +23,6 @@
            "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"
        }
    ]
 }
--- a/NuGet.Config
+++ b/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/shine-oss/terminal/_packaging/TerminalDependencies%40Local/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 />
--- a/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
@@ -56,15 +56,7 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
  <ReleaseNotes>
    Version __VERSION_NUMBER__

-– 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.
+Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml
@@ -56,13 +56,6 @@ 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>
--- a/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
@@ -56,14 +56,7 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
  <ReleaseNotes>
    Versión __VERSION_NUMBER__

- 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.
+Para más información, consulte nuestra página de versiones de GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
@@ -56,14 +56,7 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- 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.
+Consultez la page des versions de GitHub pour plus d’informations.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
@@ -54,16 +54,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
    
  </DevStudio>
  <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__

- È 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.
+Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

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

- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다! 발생한 버그를 보고하세요.
- 터미널에서 이제 Sixels를 지원합니다!
- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 제안하는 "빠른 팁" 아이콘을 볼 수 있습니다.
- 이제 선택한 텍스트가 훨씬 더 잘 표시됩니다(사용자 지정도 가능!).
- 여러 신뢰성 버그, 편의 문제 및 성가신 사항이 수정되었습니다.
-
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
  <ScreenshotCaptions>
--- a/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
@@ -56,14 +56,7 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
  <ReleaseNotes>
    Versão __VERSION_NUMBER__

- 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.
+Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

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

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

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

-– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
-– Терминал теперь поддерживает форматы Sixel!
-– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
-– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
-– Выделенный текст теперь станет более видимым (и настраиваемым!)
-– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.
-
-Дополнительные сведения см. на странице выпусков GitHub.
+Дополнительные сведения см. на странице «Выпуски GitHub».
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
@@ -54,14 +54,7 @@
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
-
- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
- 终端现在支持 Sixels!
- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
- 所选文本现在将具有更高的可见性(和可自定义性!)
- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。
+    版本 __VERSION_NUMBER__

 有关其他详细信息，请参阅我们的 GitHub 发布页面。
  </ReleaseNotes>
--- a/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    版本 __VERSION_NUMBER__

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

-– 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.
+Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml
@@ -56,13 +56,6 @@ 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>
--- a/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
@@ -56,14 +56,7 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
  <ReleaseNotes>
    Versión __VERSION_NUMBER__

- 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.
+Para más información, consulte nuestra página de versiones de GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
@@ -56,14 +56,7 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- 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.
+Consultez la page des versions de GitHub pour plus d’informations.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
@@ -54,16 +54,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
    
  </DevStudio>
  <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__

- 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.
+Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

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

- 터미널은 이제 세션 복원을 사용할 때 창의 내용을 기억합니다.
- 이제 여러 글꼴을 동시에 사용할 수 있습니다.
- 상자 그리기 캐릭터가 이제 픽셀 완성도로 렌더링됩니다.
- 터미널 내에서 IME를 사용하는 환경이 크게 개선되었습니다. 
- 이제 JSON 파일 내의 색 구성표가 훨씬 더 간단해집니다.
- URL 처리, 이중 너비 행, 줄 바꿈 등과 관련된 여러 버그가 수정되었습니다.
-
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
  <ScreenshotCaptions>
--- a/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
@@ -56,14 +56,7 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
  <ReleaseNotes>
    Versão __VERSION_NUMBER__

- 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.
+Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

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

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

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

-– Терминал теперь будет запоминать содержимое окна при восстановлении сеанса.
-– Теперь вы можете использовать несколько шрифтов одновременно.
-– Символы псевдографики теперь отрисовываются с пиксельной точностью.
-– Значительно улучшена возможность использования IME внутри Терминала.
-– Цветовые схемы в JSON-файле теперь будут намного проще.
-– Исправлено несколько ошибок в обработке URL-адресов, строках двойной ширины, переносе строк и т. д.
-
-Дополнительные сведения см. на странице выпусков GitHub.
+Дополнительные сведения см. на странице «Выпуски GitHub».
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
@@ -54,14 +54,7 @@
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
-
- 现在，使用会话还原时，终端将记住窗口的内容。
- 现在可以同时使用多种字体。
- 现在以像素为单位呈现框绘图字符。
- 在终端内使用输入法的体验已得到显著提升。
- JSON 文件中的配色方案现在要简单得多。
- 已修复有关 URL 处理、双倍行宽、换行等大量 bug。
+    版本 __VERSION_NUMBER__

 有关其他详细信息，请参阅我们的 GitHub 发布页面。
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
@@ -56,14 +56,7 @@
  <ReleaseNotes>
    版本 __VERSION_NUMBER__

- 當您使用工作階段還原時，終端機現在會記住視窗的內容。
- 現在您可以同時使用多個字型。
- 製表格圖字元現在會以完美像素模式呈現。
- 在終端機內使用 IME 的體驗已大幅改善。
- JSON 檔案內的色彩配置現在將變得更簡單了。
- 已修正一些 URL 處理、雙寬度列、換行等相關錯誤。
-
-如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
+如需詳細資訊，請參閱我們的 GitHub 版本頁面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/config/272MSSharedLibSN2048.snk
+++ b/build/config/272MSSharedLibSN2048.snk
--- a/build/config/esrp.build.batch.wpfdotnet.json
+++ b/build/config/esrp.build.batch.wpfdotnet.json
@@ -6,20 +6,6 @@
        ],
        "SigningInfo": {
            "Operations": [
-                {
-                    "KeyCode": "CP-233904-SN",
-                    "OperationSetCode": "StrongNameSign",
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0",
-                    "Parameters": []
-                },
-                {
-                    "KeyCode": "CP-233904-SN",
-                    "OperationSetCode": "StrongNameVerify",
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0",
-                    "Parameters": []
-                },
                {
                    "KeyCode": "CP-230012",
                    "OperationSetCode": "SigntoolSign",
--- a/build/config/tsa.json
+++ b/build/config/tsa.json
@@ -1,6 +1,6 @@
 {
    "instanceUrl": "https://microsoft.visualstudio.com",
    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SHINE\\Terminal",
+    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\Terminal",
    "notificationAliases": ["condev@microsoft.com", "duhowett@microsoft.com"]
 }
--- a/build/packages.config
+++ b/build/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
+  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
  <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />
  <package id="Microsoft.Debugging.Tools.SrcTool" version="20220617.1556.0" targetFramework="native" />
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -9,7 +9,7 @@

  <PropertyGroup>
    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.22</PGOBranch>
+    <PGOBranch>main</PGOBranch>

    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
--- a/build/pipelines/ob-nightly.yml
+++ b/build/pipelines/ob-nightly.yml
@@ -28,7 +28,7 @@ extends:
    official: true
    branding: Canary
    buildTerminal: true
-    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
+    pgoBuildMode: Optimize
    codeSign: true
    signingIdentity:
      serviceName: $(SigningServiceName)
@@ -37,8 +37,6 @@ extends:
      akvName: $(SigningAKVName)
      authCertName: $(SigningAuthCertName)
      signCertName: $(SigningSignCertName)
-      useManagedIdentity: $(SigningUseManagedIdentity)
-      clientId: $(SigningOriginalClientId)
    publishSymbolsToPublic: true
    publishVpackToWindows: false
    symbolExpiryTime: 15
--- a/build/pipelines/ob-release.yml
+++ b/build/pipelines/ob-release.yml
@@ -27,7 +27,7 @@ parameters:
  - name: pgoBuildMode
    displayName: "PGO Build Mode"
    type: string
-    default: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
+    default: Optimize
    values:
      - Optimize
      - Instrument
@@ -85,8 +85,6 @@ extends:
      akvName: $(SigningAKVName)
      authCertName: $(SigningAuthCertName)
      signCertName: $(SigningSignCertName)
-      useManagedIdentity: $(SigningUseManagedIdentity)
-      clientId: $(SigningOriginalClientId)
    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}
--- a/build/pipelines/templates-v2/job-build-package-wpf.yml
+++ b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -59,7 +59,10 @@ jobs:
    submodules: true
    persistCredentials: True

-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true

  - template: steps-download-bin-dir-artifact.yml
    parameters:
--- a/build/pipelines/templates-v2/job-deploy-to-azure-storage.yml
+++ b/build/pipelines/templates-v2/job-deploy-to-azure-storage.yml
@@ -75,13 +75,18 @@ jobs:
      }
    displayName: "Wrangle Unpackaged builds into place, rename"

-  - task: AzurePowerShell@5
+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
+  - task: AzureFileCopy@6
    displayName: Publish to Storage Account
    inputs:
+      sourcePath: _out/*
+      Destination: AzureBlob
      azureSubscription: ${{ parameters.subscription }}
-      azurePowerShellVersion: LatestVersion
-      pwsh: true
-      ScriptType: InlineScript
-      Inline: |-
-        $Env:AZCOPY_AUTO_LOGIN_TYPE="PSCRED"
-        & AzCopy copy "_out\*" "https://${{ parameters.storageAccount }}.blob.core.windows.net/${{ parameters.storageContainer }}/" --content-type application/octet-stream
+      storage: ${{ parameters.storageAccount }}
+      ContainerName: ${{ parameters.storageContainer }}
+      AdditionalArgumentsForBlobCopy: "--content-type application/octet-stream"
+
--- a/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
+++ b/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
@@ -69,9 +69,10 @@ jobs:
    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
    submodules: true
    persistCredentials: True
-
-  - template: steps-setup-versioning.yml
-
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
  - template: steps-download-bin-dir-artifact.yml
    parameters:
      buildPlatforms: ${{ parameters.buildPlatforms }}
@@ -147,10 +148,6 @@ jobs:
        ValidateSignature: true
        Verbosity: 'Verbose'

-  - pwsh: |-
-      tar -c -v --format=zip -f "$(JobOutputDirectory)/GroupPolicyTemplates_$(XES_APPXMANIFESTVERSION).zip" -C "$(Build.SourcesDirectory)/policies" *
-    displayName: Package GPO Templates
-
  - ${{ parameters.afterBuildSteps }}

  - ${{ if eq(parameters.publishArtifacts, true) }}:
--- a/build/pipelines/templates-v2/job-package-conpty.yml
+++ b/build/pipelines/templates-v2/job-package-conpty.yml
@@ -57,7 +57,10 @@ jobs:
    submodules: true
    persistCredentials: True

-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true

  - template: steps-download-bin-dir-artifact.yml
    parameters:
--- a/build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml
+++ b/build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml
@@ -44,7 +44,10 @@ jobs:
    submodules: true
    persistCredentials: True

-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true

  - task: DownloadPipelineArtifact@2
    displayName: Download all PDBs from all prior build phases
@@ -52,6 +55,11 @@ jobs:
      itemPattern: '**/*.pdb'
      targetPath: '$(Build.SourcesDirectory)/bin'

+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
  # Transit the Azure token from the Service Connection into a secret variable for the rest of the pipeline to use.
  - task: AzurePowerShell@5
    displayName: Generate an Azure Token
@@ -61,7 +69,7 @@ jobs:
      pwsh: true
      ScriptType: InlineScript
      Inline: |-
-        $AzToken = (Get-AzAccessToken -AsSecureString -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token | ConvertFrom-SecureString -AsPlainText
+        $AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
        Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"


--- a/build/pipelines/templates-v2/job-publish-symbols.yml
+++ b/build/pipelines/templates-v2/job-publish-symbols.yml
@@ -43,7 +43,10 @@ jobs:
    submodules: true
    persistCredentials: True

-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true

  - task: DownloadPipelineArtifact@2
    displayName: Download all PDBs from all prior build phases
--- a/build/pipelines/templates-v2/job-submit-windows-vpack.yml
+++ b/build/pipelines/templates-v2/job-submit-windows-vpack.yml
@@ -38,7 +38,10 @@ jobs:
    submodules: true
    persistCredentials: True

-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true

  - task: DownloadPipelineArtifact@2
    displayName: Download MSIX Bundle Artifact
@@ -69,3 +72,10 @@ jobs:
      artifact: $(JobOutputArtifactName)
      displayName: 'Publish VPack Manifest to Drop'

+  - task: PkgESFCIBGit@12
+    displayName: 'Submit VPack Manifest to Windows'
+    inputs:
+      configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
+      artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
+      prTimeOut: 5
+
--- a/build/pipelines/templates-v2/pipeline-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-full-release-build.yml
@@ -92,7 +92,10 @@ stages:
          generateSbom: ${{ parameters.generateSbom }}
          codeSign: ${{ parameters.codeSign }}
          beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-            - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+            - task: PkgESSetupBuild@12
+              displayName: Package ES - Setup Build
+              inputs:
+                disableOutputRedirect: true

            - task: UniversalPackages@0
              displayName: Download terminal-internal Universal Package
@@ -116,7 +119,10 @@ stages:
            generateSbom: ${{ parameters.generateSbom }}
            codeSign: ${{ parameters.codeSign }}
            beforeBuildSteps:
-              - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+              - task: PkgESSetupBuild@12
+                displayName: Package ES - Setup Build
+                inputs:
+                  disableOutputRedirect: true
              # WPF doesn't need the localizations or the universal package, but if it does... put them here.

  - stage: Package
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -78,9 +78,7 @@ extends:
    template: v2/Microsoft.NonOfficial.yml@templates
  parameters:
    featureFlags:
-      WindowsHostVersion:
-        Version: 2022
-        Network: R1
+      WindowsHostVersion: 1ESWindows2022
    platform:
      name: 'windows_undocked'
      product: 'Windows Terminal'
@@ -132,7 +130,10 @@ extends:
              codeSign: ${{ parameters.codeSign }}
              signingIdentity: ${{ parameters.signingIdentity }}
              beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+                - task: PkgESSetupBuild@12
+                  displayName: Package ES - Setup Build
+                  inputs:
+                    disableOutputRedirect: true

                - task: UniversalPackages@0
                  displayName: Download terminal-internal Universal Package
@@ -166,7 +167,10 @@ extends:
                codeSign: ${{ parameters.codeSign }}
                signingIdentity: ${{ parameters.signingIdentity }}
                beforeBuildSteps:
-                  - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+                  - task: PkgESSetupBuild@12
+                    displayName: Package ES - Setup Build
+                    inputs:
+                      disableOutputRedirect: true
                  # WPF doesn't need the localizations or the universal package, but if it does... put them here.

      - stage: Package
--- a/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
+++ b/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
@@ -1,12 +1,5 @@
 steps:
- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-  - pwsh: |-
-      Write-Host "Assuming NuGet is already installed..."
-      & nuget.exe help
-    displayName: Assume NuGet is fine
-
- ${{ else }}:
-  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 6.6.1
-    inputs:
-      versionSpec: 6.6.1
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet 6.6.1
+  inputs:
+    versionSpec: 6.6.1
--- a/build/pipelines/templates-v2/steps-esrp-signing.yml
+++ b/build/pipelines/templates-v2/steps-esrp-signing.yml
@@ -19,6 +19,4 @@ steps:
      AuthAKVName: ${{ parameters.signingIdentity.akvName }}
      AuthCertName: ${{ parameters.signingIdentity.authCertName }}
      AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
-      UseMSIAuthentication: ${{ coalesce(parameters.signingIdentity.useManagedIdentity, 'false') }}
-      EsrpClientId: ${{ parameters.signingIdentity.clientId }}
      ${{ insert }}: ${{ parameters.inputs }}
--- a/build/pipelines/templates-v2/steps-setup-versioning.yml
+++ b/build/pipelines/templates-v2/steps-setup-versioning.yml
@@ -1,6 +0,0 @@
-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
--- a/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets
+++ b/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets
@@ -1,22 +0,0 @@
-<?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>
--- a/build/scripts/Set-LatestVCToolsVersion.ps1
+++ b/build/scripts/Set-LatestVCToolsVersion.ps1
@@ -1,28 +1,8 @@
 $VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
-$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.CRT.Source" })
 $LatestVCToolsVersion = $LatestVCPackage.version;

-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
-$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
-
-# We have observed a few instances where the VC tools package version actually
-# differs from the version on the files themselves. We might as well check
-# whether the version we just found _actually exists_ before we use it.
-# We'll use whichever highest version exists.
-$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
-        [Version]$_.Name
-    } | Sort -Descending
-    $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
-
-    If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
-        Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
-        $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
-    }
-}
-
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
 Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"
--- a/custom.props
+++ b/custom.props
@@ -7,8 +7,5 @@
    <VersionMajor>1</VersionMajor>
    <VersionMinor>22</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
-    <VersionInfoCulture>1033</VersionInfoCulture>
-    <!-- The default has a spacing problem -->
-    <VersionInfoCopyRight>\xa9 Microsoft Corporation. All rights reserved.</VersionInfoCopyRight>
  </PropertyGroup>
 </Project>
--- a/dep/nuget/packages.config
+++ b/dep/nuget/packages.config
@@ -3,14 +3,13 @@
 <packages>
  <!-- Native packages -->
  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.60.210621002" 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" />
--- a/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
+++ b/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88c12148..967b53dd 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
-   join(netfxpath
-        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
-        ".NETFramework\\v4.0")
-  file(WRITE run-msbuild.bat "
-+  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
-     ${MSBUILD_SETUP}
-     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
- endif ()
--- a/dep/vcpkg-overlay-ports/fmt/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/fmt/portfile.cmake
@@ -1,38 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO fmtlib/fmt
-    REF "${VERSION}"
-    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
-    HEAD_REF master
-    PATCHES
-        fix-write-batch.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DFMT_CMAKE_DIR=share/fmt
-        -DFMT_TEST=OFF
-        -DFMT_DOC=OFF
-        -DFMT_PEDANTIC=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
-        "defined(FMT_SHARED)"
-        "1"
-    )
-endif()
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-)
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/dep/vcpkg-overlay-ports/fmt/usage
+++ b/dep/vcpkg-overlay-ports/fmt/usage
@@ -1,8 +0,0 @@
-The package fmt provides CMake targets:
-
-    find_package(fmt CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE fmt::fmt)
-
-    # Or use the header-only version
-    find_package(fmt CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE fmt::fmt-header-only)
--- a/dep/vcpkg-overlay-ports/fmt/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/fmt/vcpkg.json
@@ -1,17 +0,0 @@
-{
-  "name": "fmt",
-  "version": "11.1.4",
-  "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
-  "homepage": "https://github.com/fmtlib/fmt",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
--- a/doc/cascadia/Unittesting-CppWinRT-Xaml.md
+++ b/doc/cascadia/Unittesting-CppWinRT-Xaml.md
@@ -380,7 +380,7 @@ Here's the AppxManifest we're using:
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
  </Dependencies>
@@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest:

 ```xml
  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
  </Dependencies>
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -35,8 +35,7 @@
      "enum": [
        "Windows.Terminal.Wsl",
        "Windows.Terminal.Azure",
-        "Windows.Terminal.PowershellCore",
-        "Windows.Terminal.VisualStudio"
+        "Windows.Terminal.PowershellCore"
      ],
      "type": "string"
    },
@@ -619,11 +618,6 @@
          "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"
@@ -2356,25 +2350,11 @@
          "description": "When set to true, the terminal will focus the pane on mouse hover.",
          "type": "boolean"
        },
-        "compatibility.allowHeadless": {
-          "default": false,
-          "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.isolatedMode": {
          "default": false,
          "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
          "type": "boolean"
        },
-        "compatibility.textMeasurement": {
-          "default": "graphemes",
-          "description": "This changes the way incoming text is grouped into cells. The \"graphemes\" option is the most modern and Unicode-correct way to do so, while \"wcswidth\" is a common approach on UNIX, and \"console\" replicates the way it used to work on Windows.",
-          "enum": [
-            "graphemes",
-            "wcswidth",
-            "console"
-          ]
-        },
        "copyFormatting": {
          "default": true,
          "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2473,6 +2453,11 @@
          "minimum": 1,
          "type": "integer"
        },
+        "startOnUserLogin": {
+          "default": false,
+          "description": "When set to true, this enables the launch of Terminal at startup. Setting this to false will disable the startup task entry. If the Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect.",
+          "type": "boolean"
+        },
        "firstWindowPreference": {
          "default": "defaultProfile",
          "description": "Defines what behavior the terminal takes when it starts. \"defaultProfile\" will have the terminal launch with one tab of the default profile, and \"persistedWindowLayout\" will cause the terminal to save its layout on close and reload it on open.",
@@ -2709,16 +2694,6 @@
          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
          "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"
-        },
-        "compatibility.allowOSC52": {
-          "default": true,
-          "description": "When set to true, VT applications will be allowed to set the contents of the local clipboard using OSC 52 (Manipulate Selection Data).",
-          "type": "boolean"
-        },
        "unfocusedAppearance": {
          "$ref": "#/$defs/AppearanceConfig",
          "description": "Sets the appearance of the terminal when it is unfocused.",
@@ -2875,7 +2850,7 @@
          }
        },
        "autoMarkPrompts": {
-          "default": true,
+          "default": false,
          "description": "When set to true, prompts will automatically be marked.",
          "type": "boolean"
        },
@@ -3099,17 +3074,6 @@
          "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"
        }
      }
    },
--- a/policies/WindowsTerminal.admx
+++ b/policies/WindowsTerminal.admx
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <policyNamespaces>
-    <target prefix="terminal" namespace="Microsoft.Policies.WindowsTerminal" />
-    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
-  </policyNamespaces>
-  <resources minRequiredRevision="1.0" />
-  <supportedOn>
-    <definitions>
-      <definition name="SUPPORTED_WindowsTerminal_1_21" displayName="$(string.SUPPORTED_WindowsTerminal_1_21)" />
-      <definition name="SUPPORTED_DefaultTerminalApplication" displayName="$(string.SUPPORTED_DefaultTerminalApplication)" />
-    </definitions>
-  </supportedOn>
-  <categories>
-    <category name="WindowsTerminal" displayName="$(string.WindowsTerminal)">
-      <parentCategory ref="windows:WindowsComponents" />
-    </category>
-  </categories>
-  <policies>
-    <policy name="DisabledProfileSources" class="Both" displayName="$(string.DisabledProfileSources)" explainText="$(string.DisabledProfileSourcesText)" presentation="$(presentation.DisabledProfileSources)" key="Software\Policies\Microsoft\Windows Terminal">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_WindowsTerminal_1_21" />
-      <elements>
-        <multiText id="DisabledProfileSources" valueName="DisabledProfileSources" required="true" />
-      </elements>
-    </policy>
-    <policy name="DefaultTerminalApplication" class="User" displayName="$(string.DefaultTerminalApplication)" explainText="$(string.DefaultTerminalApplicationText)" presentation="$(presentation.TermAppSelection)" key="Console\%%Startup">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_DefaultTerminalApplication" />
-      <elements>
-        <enum id="TermAppSelect" required="true" valueName="DelegationTerminal">
-          <item displayName="$(string.TermAppAutomatic)">
-            <value>
-              <string>{00000000-0000-0000-0000-000000000000}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{00000000-0000-0000-0000-000000000000}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppConsoleHost)">
-            <value>
-              <string>{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppWindowsTerminal)">
-            <value>
-              <string>{E12CFF52-A866-4C77-9A90-F570A7AA2C6B}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppWindowsTerminalPreview)">
-            <value>
-              <string>{86633F1F-6454-40EC-89CE-DA4EBA977EE2}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{06EC847C-C0A5-46B8-92CB-7C92F6E35CD5}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-  </policies>
-</policyDefinitions>
--- a/policies/en-US/WindowsTerminal.adml
+++ b/policies/en-US/WindowsTerminal.adml
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <displayName>Windows Terminal</displayName>
-  <description>Windows Terminal</description>
-  <resources>
-    <stringTable>
-      <string id="WindowsTerminal">Windows Terminal</string>
-      <string id="SUPPORTED_WindowsTerminal_1_21">At least Windows Terminal 1.21</string>
-      <string id="SUPPORTED_DefaultTerminalApplication">At least Windows 11 22H2 or Windows 10 22H2 (Build 19045.3031, KB5026435) with Windows Terminal 1.17</string>
-      <string id="DisabledProfileSources">Disabled Profile Sources</string>
-      <string id="DisabledProfileSourcesText">Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file.
-
-Common sources are:
- Windows.Terminal.Azure
- Windows.Terminal.PowershellCore
- Windows.Terminal.Wsl
-
-For instance, setting this policy to Windows.Terminal.Wsl will disable the builtin WSL integration of Windows Terminal.
-
-Note: Existing profiles will disappear from Windows Terminal after adding their source to this policy.</string>
-      <string id="DefaultTerminalApplication">Default terminal application</string>
-      <string id="DefaultTerminalApplicationText">Select the default terminal application used in Windows.
-
-If you select Windows Terminal Preview and it is not installed the system will fallback to the legacy Windows Console Host. (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.)</string>
-      <string id="TermAppAutomatic">Automatic selection (Windows Terminal, if available)</string>
-      <string id="TermAppConsoleHost">Windows Console Host (legacy)</string>
-      <string id="TermAppWindowsTerminal">Windows Terminal</string>
-      <string id="TermAppWindowsTerminalPreview">Windows Terminal Preview (if available)</string>
-    </stringTable>
-    <presentationTable>
-      <presentation id="DisabledProfileSources">
-        <multiTextBox refId="DisabledProfileSources">List of disabled sources (one per line)</multiTextBox>
-      </presentation>
-      <presentation id="TermAppSelection">
-        <dropdownList refId="TermAppSelect" noSort="true" defaultItem="0">Select from the following options:</dropdownList>
-      </presentation>
-    </presentationTable>
-  </resources>
-</policyDefinitionResources>
--- a/res/fonts/CascadiaCode.ttf
+++ b/res/fonts/CascadiaCode.ttf
--- a/res/fonts/CascadiaCodeItalic.ttf
+++ b/res/fonts/CascadiaCodeItalic.ttf
--- a/res/fonts/CascadiaMono.ttf
+++ b/res/fonts/CascadiaMono.ttf
--- a/res/fonts/CascadiaMonoItalic.ttf
+++ b/res/fonts/CascadiaMonoItalic.ttf
--- a/res/fonts/README.md
+++ b/res/fonts/README.md
@@ -8,5 +8,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code, Cascadia Mono (2407.24)
-   * from microsoft/cascadia-code@56bcca3f2c1e4cb19458954f0e2bb4635960df91
+* Cascadia Code, Cascadia Mono (2404.23)
+   * from microsoft/cascadia-code@1034791e5fc6e060a448d2b29cd94a6c683edb36
--- a/scratch/ScratchIslandApp/Package/Package.appxmanifest
+++ b/scratch/ScratchIslandApp/Package/Package.appxmanifest
@@ -27,7 +27,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
  </Dependencies>

  <Resources>
--- a/src/buffer/out/ImageSlice.cpp
+++ b/src/buffer/out/ImageSlice.cpp
@@ -65,6 +65,7 @@ RGBQUAD* ImageSlice::MutablePixels(const til::CoordType columnBegin, const til::
        _columnBegin = existingData ? std::min(_columnBegin, columnBegin) : columnBegin;
        _columnEnd = existingData ? std::max(_columnEnd, columnEnd) : columnEnd;
        _pixelWidth = (_columnEnd - _columnBegin) * _cellSize.width;
+        _pixelWidth = (_pixelWidth + 3) & ~3; // Renderer needs this as a multiple of 4
        const auto bufferSize = _pixelWidth * _cellSize.height;
        if (existingData)
        {
@@ -186,20 +187,18 @@ bool ImageSlice::_copyCells(const ImageSlice& srcSlice, const til::CoordType src
    }

    // The used destination before and after the written area must be erased.
-    // If this results in the entire range being erased, we return true to let
-    // the caller know that the slice should be deleted.
-    if (dstUsedBegin < dstWriteBegin && _eraseCells(dstUsedBegin, dstWriteBegin))
+    if (dstUsedBegin < dstWriteBegin)
    {
-        return true;
+        _eraseCells(dstUsedBegin, dstWriteBegin);
    }
-    if (dstUsedEnd > dstWriteEnd && _eraseCells(dstWriteEnd, dstUsedEnd))
+    if (dstUsedEnd > dstWriteEnd)
    {
-        return true;
+        _eraseCells(dstWriteEnd, dstUsedEnd);
    }

-    // At this point, if the beginning column is not less than the end, that
-    // means this was an empty slice into which nothing was copied, so we can
-    // again return true to let the caller know it should be deleted.
+    // If the beginning column is now not less than the end, that means the
+    // content has been entirely erased, so we return true to let the caller
+    // know that the slice should be deleted.
    return _columnBegin >= _columnEnd;
 }

@@ -212,19 +211,10 @@ void ImageSlice::EraseBlock(TextBuffer& buffer, const til::rect rect)
    }
 }

-void ImageSlice::EraseCells(TextBuffer& buffer, const til::point at, const til::CoordType distance)
+void ImageSlice::EraseCells(TextBuffer& buffer, const til::point at, const size_t distance)
 {
-    auto x = at.x;
-    auto y = at.y;
-    auto distanceRemaining = distance;
-    while (distanceRemaining > 0)
-    {
-        auto& row = buffer.GetMutableRowByOffset(y);
-        EraseCells(row, x, x + distanceRemaining);
-        distanceRemaining -= (static_cast<til::CoordType>(row.size()) - x);
-        x = 0;
-        y++;
-    }
+    auto& row = buffer.GetMutableRowByOffset(at.y);
+    EraseCells(row, at.x, gsl::narrow_cast<til::CoordType>(at.x + distance));
 }

 void ImageSlice::EraseCells(ROW& row, const til::CoordType columnBegin, const til::CoordType columnEnd)
--- a/src/buffer/out/ImageSlice.hpp
+++ b/src/buffer/out/ImageSlice.hpp
@@ -41,7 +41,7 @@ public:
    static void CopyRow(const ROW& srcRow, ROW& dstRow);
    static void CopyCells(const ROW& srcRow, const til::CoordType srcColumn, ROW& dstRow, const til::CoordType dstColumnBegin, const til::CoordType dstColumnEnd);
    static void EraseBlock(TextBuffer& buffer, const til::rect rect);
-    static void EraseCells(TextBuffer& buffer, const til::point at, const til::CoordType distance);
+    static void EraseCells(TextBuffer& buffer, const til::point at, const size_t distance);
    static void EraseCells(ROW& row, const til::CoordType columnBegin, const til::CoordType columnEnd);

 private:
--- a/src/buffer/out/OutputCell.cpp
+++ b/src/buffer/out/OutputCell.cpp
@@ -5,14 +5,9 @@

 #include "OutputCell.hpp"

-#include "../../types/inc/GlyphWidth.hpp"
 #include "../../types/inc/convert.hpp"
 #include "../../inc/conattrs.hpp"

-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR };

 OutputCell::OutputCell() noexcept :
--- a/src/buffer/out/OutputCellIterator.cpp
+++ b/src/buffer/out/OutputCellIterator.cpp
@@ -8,31 +8,10 @@
 #include <til/unicode.h>

 #include "../../types/inc/convert.hpp"
-#include "../../types/inc/GlyphWidth.hpp"
 #include "../../inc/conattrs.hpp"

-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR, INVALID_COLOR };

-// Routine Description:
-// - This is a fill-mode iterator for one particular wchar. It will repeat forever if fillLimit is 0.
-// Arguments:
-// - wch - The character to use for filling
-// - fillLimit - How many times to allow this value to be viewed/filled. Infinite if 0.
-OutputCellIterator::OutputCellIterator(const wchar_t& wch, const size_t fillLimit) noexcept :
-    _mode(Mode::Fill),
-    _currentView(s_GenerateView(wch)),
-    _run(),
-    _attr(InvalidTextAttribute),
-    _pos(0),
-    _distance(0),
-    _fillLimit(fillLimit)
-{
-}
-
 // Routine Description:
 // - This is a fill-mode iterator for one particular color. It will repeat forever if fillLimit is 0.
 // Arguments:
@@ -49,70 +28,6 @@ OutputCellIterator::OutputCellIterator(const TextAttribute& attr, const size_t f
 {
 }

-// Routine Description:
-// - This is a fill-mode iterator for one particular character and color. It will repeat forever if fillLimit is 0.
-// Arguments:
-// - wch - The character to use for filling
-// - attr - The color attribute to use for filling
-// - fillLimit - How many times to allow this value to be viewed/filled. Infinite if 0.
-OutputCellIterator::OutputCellIterator(const wchar_t& wch, const TextAttribute& attr, const size_t fillLimit) noexcept :
-    _mode(Mode::Fill),
-    _currentView(s_GenerateView(wch, attr)),
-    _run(),
-    _attr(InvalidTextAttribute),
-    _pos(0),
-    _distance(0),
-    _fillLimit(fillLimit)
-{
-}
-
-// Routine Description:
-// - This is a fill-mode iterator for one particular CHAR_INFO. It will repeat forever if fillLimit is 0.
-// Arguments:
-// - charInfo - The legacy character and color data to use for filling (uses Unicode portion of text data)
-// - fillLimit - How many times to allow this value to be viewed/filled. Infinite if 0.
-OutputCellIterator::OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit) noexcept :
-    _mode(Mode::Fill),
-    _currentView(s_GenerateView(charInfo)),
-    _run(),
-    _attr(InvalidTextAttribute),
-    _pos(0),
-    _distance(0),
-    _fillLimit(fillLimit)
-{
-}
-
-// Routine Description:
-// - This is an iterator over a range of text only. No color data will be modified as the text is inserted.
-// Arguments:
-// - utf16Text - UTF-16 text range
-OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text) noexcept :
-    _mode(Mode::LooseTextOnly),
-    _currentView(s_GenerateView(utf16Text)),
-    _run(utf16Text),
-    _attr(InvalidTextAttribute),
-    _pos(0),
-    _distance(0),
-    _fillLimit(0)
-{
-}
-
-// Routine Description:
-// - This is an iterator over a range text that will apply the same color to every position.
-// Arguments:
-// - utf16Text - UTF-16 text range
-// - attribute - Color to apply over the entire range
-OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute& attribute, const size_t fillLimit) noexcept :
-    _mode(Mode::Loose),
-    _currentView(s_GenerateView(utf16Text, attribute)),
-    _run(utf16Text),
-    _attr(attribute),
-    _distance(0),
-    _pos(0),
-    _fillLimit(fillLimit)
-{
-}
-
 // Routine Description:
 // - This is an iterator over legacy colors only. The text is not modified.
 // Arguments:
@@ -128,21 +43,6 @@ OutputCellIterator::OutputCellIterator(const std::span<const WORD> legacyAttrs)
 {
 }

-// Routine Description:
-// - This is an iterator over legacy cell data. We will use the unicode text and the legacy color attribute.
-// Arguments:
-// - charInfos - Multiple cell with unicode text and legacy color data.
-OutputCellIterator::OutputCellIterator(const std::span<const CHAR_INFO> charInfos) noexcept :
-    _mode(Mode::CharInfo),
-    _currentView(s_GenerateView(til::at(charInfos, 0))),
-    _run(charInfos),
-    _attr(InvalidTextAttribute),
-    _distance(0),
-    _pos(0),
-    _fillLimit(0)
-{
-}
-
 // Routine Description:
 // - This is an iterator over existing OutputCells with full text and color data.
 // Arguments:
@@ -168,13 +68,6 @@ OutputCellIterator::operator bool() const noexcept
    {
        switch (_mode)
        {
-        case Mode::Loose:
-        case Mode::LooseTextOnly:
-        {
-            // In lieu of using start and end, this custom iterator type simply becomes bool false
-            // when we run out of items to iterate over.
-            return _pos < std::get<std::wstring_view>(_run).length();
-        }
        case Mode::Fill:
        {
            if (_fillLimit > 0)
@@ -187,10 +80,6 @@ OutputCellIterator::operator bool() const noexcept
        {
            return _pos < std::get<std::span<const OutputCell>>(_run).size();
        }
-        case Mode::CharInfo:
-        {
-            return _pos < std::get<std::span<const CHAR_INFO>>(_run).size();
-        }
        case Mode::LegacyAttr:
        {
            return _pos < std::get<std::span<const WORD>>(_run).size();
@@ -218,34 +107,6 @@ OutputCellIterator& OutputCellIterator::operator++()

    switch (_mode)
    {
-    case Mode::Loose:
-    {
-        if (!_TryMoveTrailing())
-        {
-            // When walking through a text sequence, we need to move forward by the number of wchar_ts consumed in the previous view
-            // in case we had a surrogate pair (or wider complex sequence) in the previous view.
-            _pos += _currentView.Chars().size();
-            if (operator bool())
-            {
-                _currentView = s_GenerateView(std::get<std::wstring_view>(_run).substr(_pos), _attr);
-            }
-        }
-        break;
-    }
-    case Mode::LooseTextOnly:
-    {
-        if (!_TryMoveTrailing())
-        {
-            // When walking through a text sequence, we need to move forward by the number of wchar_ts consumed in the previous view
-            // in case we had a surrogate pair (or wider complex sequence) in the previous view.
-            _pos += _currentView.Chars().size();
-            if (operator bool())
-            {
-                _currentView = s_GenerateView(std::get<std::wstring_view>(_run).substr(_pos));
-            }
-        }
-        break;
-    }
    case Mode::Fill:
    {
        if (!_TryMoveTrailing())
@@ -276,16 +137,6 @@ OutputCellIterator& OutputCellIterator::operator++()
        }
        break;
    }
-    case Mode::CharInfo:
-    {
-        // Walk forward by one because char infos are just the legacy version of cells and prealigned to columns
-        _pos++;
-        if (operator bool())
-        {
-            _currentView = s_GenerateView(til::at(std::get<std::span<const CHAR_INFO>>(_run), _pos));
-        }
-        break;
-    }
    case Mode::LegacyAttr:
    {
        // Walk forward by one because color attributes apply cell by cell (no complex text information)
@@ -357,69 +208,6 @@ bool OutputCellIterator::_TryMoveTrailing() noexcept
    }
 }

-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and specify that the attributes shouldn't be changed.
-// Arguments:
-// - view - View representing characters corresponding to a single glyph
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const std::wstring_view view) noexcept
-{
-    return s_GenerateView(view, InvalidTextAttribute, TextAttributeBehavior::Current);
-}
-
-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - view - View representing characters corresponding to a single glyph
-// - attr - Color attributes to apply to the text
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const std::wstring_view view, const TextAttribute attr) noexcept
-{
-    return s_GenerateView(view, attr, TextAttributeBehavior::Stored);
-}
-
-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - view - View representing characters corresponding to a single glyph
-// - attr - Color attributes to apply to the text
-// - behavior - Behavior of the given text attribute (used when writing)
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const std::wstring_view view, const TextAttribute attr, const TextAttributeBehavior behavior) noexcept
-{
-    const auto glyph = til::utf16_next(view);
-    const auto dbcsAttr = IsGlyphFullWidth(glyph) ? DbcsAttribute::Leading : DbcsAttribute::Single;
-    return OutputCellView(glyph, dbcsAttr, attr, behavior);
-}
-
-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - wch - View representing a single UTF-16 character (that can be represented without surrogates)
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const wchar_t& wch) noexcept
-{
-    const auto glyph = std::wstring_view(&wch, 1);
-    const auto dbcsAttr = IsGlyphFullWidth(wch) ? DbcsAttribute::Leading : DbcsAttribute::Single;
-    return OutputCellView(glyph, dbcsAttr, InvalidTextAttribute, TextAttributeBehavior::Current);
-}
-
 // Routine Description:
 // - Static function to create a view.
 // - It's pulled out statically so it can be used during construction with just the given
@@ -434,23 +222,6 @@ OutputCellView OutputCellIterator::s_GenerateView(const TextAttribute& attr) noe
    return OutputCellView({}, {}, attr, TextAttributeBehavior::StoredOnly);
 }

-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - wch - View representing a single UTF-16 character (that can be represented without surrogates)
-// - attr - View representing a single color
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const wchar_t& wch, const TextAttribute& attr) noexcept
-{
-    const auto glyph = std::wstring_view(&wch, 1);
-    const auto dbcsAttr = IsGlyphFullWidth(wch) ? DbcsAttribute::Leading : DbcsAttribute::Single;
-    return OutputCellView(glyph, dbcsAttr, attr, TextAttributeBehavior::Stored);
-}
-
 // Routine Description:
 // - Static function to create a view.
 // - It's pulled out statically so it can be used during construction with just the given
@@ -469,35 +240,6 @@ OutputCellView OutputCellIterator::s_GenerateViewLegacyAttr(const WORD& legacyAt
    return s_GenerateView(attr);
 }

-// Routine Description:
-// - Static function to create a view.
-// - It's pulled out statically so it can be used during construction with just the given
-//   variables (so OutputCellView doesn't need an empty default constructor)
-// - This will infer the width of the glyph and apply the appropriate attributes to the view.
-// Arguments:
-// - charInfo - character and attribute pair representing a single cell
-// Return Value:
-// - Object representing the view into this cell
-OutputCellView OutputCellIterator::s_GenerateView(const CHAR_INFO& charInfo) noexcept
-{
-    const auto glyph = std::wstring_view(&charInfo.Char.UnicodeChar, 1);
-
-    DbcsAttribute dbcsAttr = DbcsAttribute::Single;
-    if (WI_IsFlagSet(charInfo.Attributes, COMMON_LVB_LEADING_BYTE))
-    {
-        dbcsAttr = DbcsAttribute::Leading;
-    }
-    else if (WI_IsFlagSet(charInfo.Attributes, COMMON_LVB_TRAILING_BYTE))
-    {
-        dbcsAttr = DbcsAttribute::Trailing;
-    }
-
-    const TextAttribute textAttr(charInfo.Attributes);
-
-    const auto behavior = TextAttributeBehavior::Stored;
-    return OutputCellView(glyph, dbcsAttr, textAttr, behavior);
-}
-
 // Routine Description:
 // - Static function to create a view.
 // - It's pulled out statically so it can be used during construction with just the given
--- a/src/buffer/out/OutputCellIterator.hpp
+++ b/src/buffer/out/OutputCellIterator.hpp
@@ -34,14 +34,8 @@ public:
    using reference = OutputCellView&;

    OutputCellIterator() = default;
-    OutputCellIterator(const wchar_t& wch, const size_t fillLimit = 0) noexcept;
    OutputCellIterator(const TextAttribute& attr, const size_t fillLimit = 0) noexcept;
-    OutputCellIterator(const wchar_t& wch, const TextAttribute& attr, const size_t fillLimit = 0) noexcept;
-    OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit = 0) noexcept;
-    OutputCellIterator(const std::wstring_view utf16Text) noexcept;
-    OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute& attribute, const size_t fillLimit = 0) noexcept;
    OutputCellIterator(const std::span<const WORD> legacyAttributes) noexcept;
-    OutputCellIterator(const std::span<const CHAR_INFO> charInfos) noexcept;
    OutputCellIterator(const std::span<const OutputCell> cells);
    ~OutputCellIterator() = default;

@@ -63,14 +57,6 @@ public:
 private:
    enum class Mode
    {
-        // Loose mode is where we're given text and attributes in a raw sort of form
-        // like while data is being inserted from an API call.
-        Loose,
-
-        // Loose mode with only text is where we're given just text and we want
-        // to use the attribute already in the buffer when writing
-        LooseTextOnly,
-
        // Fill mode is where we were given one thing and we just need to keep giving
        // that back over and over for eternity.
        Fill,
@@ -78,10 +64,6 @@ private:
        // Given a run of legacy attributes, convert each of them and insert only attribute data.
        LegacyAttr,

-        // CharInfo mode is where we've been given a pair of text and attribute for each
-        // cell in the legacy format from an API call.
-        CharInfo,
-
        // Cell mode is where we have an already fully structured cell data usually
        // from accessing/copying data already put into the OutputBuffer.
        Cell,
@@ -91,9 +73,7 @@ private:
    std::span<const WORD> _legacyAttrs;

    std::variant<
-        std::wstring_view,
        std::span<const WORD>,
-        std::span<const CHAR_INFO>,
        std::span<const OutputCell>,
        std::monostate>
        _run;
@@ -102,14 +82,10 @@ private:

    bool _TryMoveTrailing() noexcept;

-    static OutputCellView s_GenerateView(const std::wstring_view view) noexcept;
-    static OutputCellView s_GenerateView(const std::wstring_view view, const TextAttribute attr) noexcept;
-    static OutputCellView s_GenerateView(const std::wstring_view view, const TextAttribute attr, const TextAttributeBehavior behavior) noexcept;
    static OutputCellView s_GenerateView(const wchar_t& wch) noexcept;
    static OutputCellView s_GenerateViewLegacyAttr(const WORD& legacyAttr) noexcept;
    static OutputCellView s_GenerateView(const TextAttribute& attr) noexcept;
    static OutputCellView s_GenerateView(const wchar_t& wch, const TextAttribute& attr) noexcept;
-    static OutputCellView s_GenerateView(const CHAR_INFO& charInfo) noexcept;

    static OutputCellView s_GenerateView(const OutputCell& cell);

--- a/src/buffer/out/OutputCellView.cpp
+++ b/src/buffer/out/OutputCellView.cpp
@@ -5,10 +5,6 @@

 #include "OutputCellView.hpp"

-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 // Routine Description:
 // - Constructs a read-only view of data formatted as a single output buffer cell
 // Arguments:
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -426,7 +426,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType c
    THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= size());

    // If we're given a right-side column limit, use it. Otherwise, the write limit is the final column index available in the char row.
-    const auto finalColumnInRow = gsl::narrow_cast<uint16_t>(limitRight.value_or(size() - 1));
+    const auto finalColumnInRow = limitRight.value_or(size() - 1);

    auto currentColor = it->TextAttr();
    uint16_t colorUses = 0;
@@ -937,12 +937,12 @@ void ROW::_resizeChars(uint16_t colEndDirty, uint16_t chBegDirty, size_t chEndDi
    }
 }

-RowAttributes& ROW::Attributes() noexcept
+til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() noexcept
 {
    return _attr;
 }

-const RowAttributes& ROW::Attributes() const noexcept
+const til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() const noexcept
 {
    return _attr;
 }
--- a/src/buffer/out/Row.hpp
+++ b/src/buffer/out/Row.hpp
@@ -14,11 +14,6 @@
 class ROW;
 class TextBuffer;

-// Because MarkKind::Output gets set only on the actually written text,
-// most rows will end up having at least 2 runs: The start of the line
-// with MarkKind::Output and the rest of the line with MarkKind::None.
-using RowAttributes = til::small_rle<TextAttribute, uint16_t, 2>;
-
 enum class DelimiterClass
 {
    ControlChar,
@@ -153,8 +148,8 @@ public:
    void ReplaceText(RowWriteState& state);
    void CopyTextFrom(RowCopyTextFromState& state);

-    RowAttributes& Attributes() noexcept;
-    const RowAttributes& Attributes() const noexcept;
+    til::small_rle<TextAttribute, uint16_t, 1>& Attributes() noexcept;
+    const til::small_rle<TextAttribute, uint16_t, 1>& Attributes() const noexcept;
    TextAttribute GetAttrByColumn(til::CoordType column) const;
    std::vector<uint16_t> GetHyperlinks() const;
    ImageSlice* SetImageSlice(ImageSlice::Pointer imageSlice) noexcept;
@@ -302,7 +297,7 @@ private:
    std::span<uint16_t> _charOffsets;
    // _attr is a run-length-encoded vector of TextAttribute with a decompressed
    // length equal to _columnCount (= 1 TextAttribute per column).
-    RowAttributes _attr;
+    til::small_rle<TextAttribute, uint16_t, 1> _attr;
    // The width of the row in visual columns.
    uint16_t _columnCount = 0;
    // Stores double-width/height (DECSWL/DECDWL/DECDHL) attributes.
--- a/src/buffer/out/TextColor.h
+++ b/src/buffer/out/TextColor.h
@@ -82,8 +82,7 @@ public:
    static constexpr size_t FRAME_FOREGROUND = 263;
    static constexpr size_t FRAME_BACKGROUND = 264;
    static constexpr size_t CURSOR_COLOR = 265;
-    static constexpr size_t SELECTION_BACKGROUND = 266;
-    static constexpr size_t TABLE_SIZE = 267;
+    static constexpr size_t TABLE_SIZE = 266;

    constexpr TextColor() noexcept :
        _meta{ ColorType::IsDefault },
--- a/src/buffer/out/search.cpp
+++ b/src/buffer/out/search.cpp
@@ -16,7 +16,7 @@ bool Search::IsStale(const Microsoft::Console::Render::IRenderData& renderData,
           _lastMutationId != renderData.GetTextBuffer().GetLastMutationId();
 }

-void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
+bool Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
 {
    const auto& textBuffer = renderData.GetTextBuffer();

@@ -30,15 +30,15 @@ void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const st
    _results = std::move(result).value_or(std::vector<til::point_span>{});
    _index = reverse ? gsl::narrow_cast<ptrdiff_t>(_results.size()) - 1 : 0;
    _step = reverse ? -1 : 1;
+    return true;
+}

+void Search::MoveToCurrentSelection()
+{
    if (_renderData->IsSelectionActive())
    {
        MoveToPoint(_renderData->GetTextBuffer().ScreenToBufferPosition(_renderData->GetSelectionAnchor()));
    }
-    else if (const auto span = _renderData->GetSearchHighlightFocused())
-    {
-        MoveToPoint(_step > 0 ? span->start : span->end);
-    }
 }

 void Search::MoveToPoint(const til::point anchor) noexcept
--- a/src/buffer/out/search.h
+++ b/src/buffer/out/search.h
@@ -36,8 +36,9 @@ public:
    Search() = default;

    bool IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags) const noexcept;
-    void Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
+    bool Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);

+    void MoveToCurrentSelection();
    void MoveToPoint(til::point anchor) noexcept;
    void MovePastPoint(til::point anchor) noexcept;
    void FindNext(bool reverse) noexcept;
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
@@ -12,10 +12,6 @@
 #include "../types/inc/utils.hpp"
 #include "search.h"

-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 using namespace Microsoft::Console;
 using namespace Microsoft::Console::Types;

@@ -378,22 +374,30 @@ TextBufferCellIterator TextBuffer::GetCellDataAt(const til::point at, const View
 // Given the character offset `position` in the `chars` string, this function returns the starting position of the next grapheme.
 // For instance, given a `chars` of L"x\uD83D\uDE42y" and a `position` of 1 it'll return 3.
 // GraphemePrev would do the exact inverse of this operation.
-size_t TextBuffer::GraphemeNext(const std::wstring_view& chars, size_t position) noexcept
+size_t TextBuffer::GraphemeNext(const std::wstring_view& chars, size_t position, til::CoordType* width) noexcept
 {
    auto& cwd = CodepointWidthDetector::Singleton();
 #pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
    GraphemeState state{ .beg = chars.data() + position };
    cwd.GraphemeNext(state, chars);
+    if (width)
+    {
+        *width = state.width;
+    }
    return position + state.len;
 }

 // It's the counterpart to GraphemeNext. See GraphemeNext.
-size_t TextBuffer::GraphemePrev(const std::wstring_view& chars, size_t position) noexcept
+size_t TextBuffer::GraphemePrev(const std::wstring_view& chars, size_t position, til::CoordType* width) noexcept
 {
    auto& cwd = CodepointWidthDetector::Singleton();
 #pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
    GraphemeState state{ .beg = chars.data() + position };
    cwd.GraphemePrev(state, chars);
+    if (width)
+    {
+        *width = state.width;
+    }
    return position - state.len;
 }

@@ -451,9 +455,14 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
        cwd.GraphemeNext(state, chars);
        col += state.width;

+        // If we ran out of columns, we need to always return `columnLimit` and not `cols`,
+        // because if we tried inserting a wide glyph into just 1 remaining column it will
+        // fail to fit, but that remaining column still has been used up. When the caller sees
+        // `columns == columnLimit` they will line-wrap and continue inserting into the next row.
        if (col > columnLimit)
        {
-            break;
+            columns = columnLimit;
+            return dist;
        }

        dist += state.len;
@@ -461,7 +470,7 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord

    // But if we simply ran out of text we just need to return the actual number of columns.
    columns = col;
-    return dist;
+    return chars.size();
 }

 // Pretend as if `position` is a regular cursor in the TextBuffer.
@@ -3261,30 +3270,23 @@ MarkExtents TextBuffer::_scrollMarkExtentForRow(const til::CoordType rowOffset,
    return mark;
 }

-std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset,
-                                        const til::CoordType bottomInclusive,
-                                        const bool clipAtCursor) const
+std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const
 {
    std::wstring commandBuilder;
    MarkKind lastMarkKind = MarkKind::Prompt;
-    const auto cursorPosition = GetCursor().GetPosition();
    for (auto y = rowOffset; y <= bottomInclusive; y++)
    {
-        const bool onCursorRow = clipAtCursor && y == cursorPosition.y;
        // Now we need to iterate over text attributes. We need to find a
        // segment of Prompt attributes, we'll skip those. Then there should be
        // Command attributes. Collect up all of those, till we get to the next
        // Output attribute.
+
        const auto& row = GetRowByOffset(y);
        const auto runs = row.Attributes().runs();
        auto x = 0;
        for (const auto& [attr, length] : runs)
        {
-            auto nextX = gsl::narrow_cast<uint16_t>(x + length);
-            if (onCursorRow)
-            {
-                nextX = std::min(nextX, gsl::narrow_cast<uint16_t>(cursorPosition.x));
-            }
+            const auto nextX = gsl::narrow_cast<uint16_t>(x + length);
            const auto markKind{ attr.GetMarkAttributes() };
            if (markKind != lastMarkKind)
            {
@@ -3304,10 +3306,6 @@ std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset,
            }
            // advance to next run of text
            x = nextX;
-            if (onCursorRow && x == cursorPosition.x)
-            {
-                return commandBuilder;
-            }
        }
        // we went over all the runs in this row, but we're not done yet. Keep iterating on the next row.
    }
@@ -3331,7 +3329,7 @@ std::wstring TextBuffer::CurrentCommand() const
        // This row did start a prompt! Find the prompt that starts here.
        // Presumably, no rows below us will have prompts, so pass in the last
        // row with text as the bottom
-        return _commandForRow(promptY, _estimateOffsetOfLastCommittedRow(), true);
+        return _commandForRow(promptY, _estimateOffsetOfLastCommittedRow());
    }
    return L"";
 }
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -99,8 +99,8 @@ public:

    size_t GetCellDistance(const til::point from, const til::point to) const;

-    static size_t GraphemeNext(const std::wstring_view& chars, size_t position) noexcept;
-    static size_t GraphemePrev(const std::wstring_view& chars, size_t position) noexcept;
+    static size_t GraphemeNext(const std::wstring_view& chars, size_t position, til::CoordType* width = nullptr) noexcept;
+    static size_t GraphemePrev(const std::wstring_view& chars, size_t position, til::CoordType* width = nullptr) noexcept;
    static size_t FitTextIntoColumns(const std::wstring_view& chars, til::CoordType columnLimit, til::CoordType& columns) noexcept;

    til::point NavigateCursor(til::point position, til::CoordType distance) const;
@@ -326,7 +326,7 @@ private:
    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
    void _PruneHyperlinks();

-    std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive, const bool clipAtCursor = false) const;
+    std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const;
    MarkExtents _scrollMarkExtentForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const;
    bool _createPromptMarkIfNeeded();

--- a/src/buffer/out/ut_textbuffer/ReflowTests.cpp
+++ b/src/buffer/out/ut_textbuffer/ReflowTests.cpp
@@ -7,7 +7,6 @@

 #include "../textBuffer.hpp"
 #include "../../renderer/inc/DummyRenderer.hpp"
-#include "../../types/inc/GlyphWidth.hpp"

 #include <IDataSource.h>

--- a/src/cascadia/CascadiaPackage/Package-Can.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Can.appxmanifest
@@ -38,7 +38,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
  </Dependencies>

  <Resources>
--- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
@@ -38,7 +38,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
  </Dependencies>

  <Resources>
--- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
@@ -39,7 +39,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
  </Dependencies>

  <Resources>
--- a/src/cascadia/CascadiaPackage/Package.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -39,7 +39,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
  </Dependencies>

  <Resources>
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-100.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-100.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-150.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-150.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-200.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-cmd.scale-200.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-100.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-100.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-150.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-150.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-200.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-powershell.scale-200.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-100.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-100.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-150.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-150.png
--- a/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-200.png
+++ b/src/cascadia/CascadiaPackage/ProfileIcons/vs-pwsh.scale-200.png
--- a/src/cascadia/CascadiaPackage/Resources/cs-CZ/Resources.resw
+++ b/src/cascadia/CascadiaPackage/Resources/cs-CZ/Resources.resw
@@ -154,7 +154,7 @@
    <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
  </data>
  <data name="AppDescription" xml:space="preserve">
-    <value>Nový Terminál Windows</value>
+    <value>Nová Terminál Windows</value>
  </data>
  <data name="AppDescriptionPre" xml:space="preserve">
    <value>Terminál Windows s náhledem připravovaných funkcí</value>
@@ -164,11 +164,11 @@
    <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
  </data>
  <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
-    <value>Otevřít &amp;náhled Terminálu</value>
+    <value>Otevřít náhled &amp;aplikace Terminal</value>
    <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
  </data>
  <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
-    <value>Otevřít v &amp;Terminálu</value>
+    <value>Otevřít v aplikaci &amp;Terminal</value>
    <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
  </data>
 </root>
--- a/Show More
+++ b/Show More