faster 2

Reverts the noraajunker.ch -> PR link change. As confirmed by @niels9001,
personal contributor links are standard in PowerToys settings pages.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.github/actions/spell-check/allow/code.txt

@@ -309,11 +309,6 @@ pwa
 AOT
 Aot
 ify
-LAF
-Laf
-languagemodel
-philm
-phisilica
 TFM
 
 # YML
@@ -370,10 +365,7 @@ FILESYSONLY
 URLIS
 WAITTIMEOUT
 DEFAULTTONEAREST
-DWRITE
-LWIN
-VCENTER
-VREDRAW
+
 
 # COM/WinRT interface prefixes and type fragments
 BAlt
@@ -437,6 +429,3 @@ SHELLEXPERIENCEHOST
 SHELLHOST
 STARTMENUEXPERIENCEHOST
 WIDGETBOARD
-
-# URIs
-actioncenter

.github/actions/spell-check/allow/zoomit.txt

@@ -1,51 +1,23 @@
 accelscroll
 acq
-ADDTO
-ADDTOOL
 adr
 Adr
-ALWAYSTIP
 APPLYTOSUBMENUS
-ARCHMASK
-archs
 AUDCLNT
-autocorr
-avx
 axisdefer
 axisflip
 axisstart
-backlight
-BEOS
-bfi
-BFIN
-bfly
 BGRX
 bitmaps
-bitrev
 blits
-Borgerding
-Borland
-breakc
 BREAKSCR
 BUFFERFLAGS
-bugzilla
 Cands
 capturepath
-cbs
 centiseconds
-cexp
-cfx
-cfy
-cgem
-cifx
-cify
 CLASSW
 coeffs
-colblocks
-constantbuffer
 coprime
-cpuid
-cpx
 CREATEDIBSECTION
 CREATESTRUCTW
 crossfades
@@ -56,216 +28,109 @@ CTLCOLORDLG
 CTLCOLOREDIT
 CTLCOLORLISTBOX
 CTrim
-CVTEPI
 DBuffer
-dcl
-dct
 ddx
 ddy
-Deinterleave
-denoise
-denoised
 DEVSOURCE
 DFCS
-DIVSCALAR
-DJGPP
 dlg
 dlu
-dnn
 DONTCARE
 downsample
 DRAWITEM
 DRAWITEMSTRUCT
 droppedband
 Droppedband
-DSPs
 dsum
 dupburst
 dupsegments
 DWLP
-eband
-ebx
-ECX
 EDITCONTROL
-EDSP
-emmintrin
-EMX
 ENABLEHOOK
-endloop
 ENDOFSTREAM
-ener
-enh
-ettings
 expectedlock
-expf
-fabs
 fabsf
-facbuf
 fastscroll
 FDE
-ffast
-FIXDIV
-floorf
-fmadd
-fout
-fstride
-fxc
 GETCHANNELRECT
 GETCHECK
 GETCOUNT
-GETDISPINFO
 GETSCREENSAVEACTIVE
 GETSCREENSAVETIMEOUT
 GETTHUMBRECT
 GIFs
-glu
-groupshared
-gru
 hcfdark
 hcfwhitespace
-hlsl
-Hsieh
-hstride
 HTBOTTOMRIGHT
 HTHEME
 htol
 ICONINFORMATION
 ICONWARNING
-idct
-IDIn
-IDISHWND
-ifft
 igc
-ilog
-imad
-imax
-imin
-immintrin
 Inj
-interp
-inttypes
-ishl
-itof
 jumprecover
-kfft
-kheight
-kissfft
 KSDATAFORMAT
-ksize
-ktime
-lastg
 latestcapture
 ldx
 LEFTNOWORDWRAP
 legitjumps
-lenmem
 letterbox
 lld
-lldx
 llu
 llums
 logfont
 lookback
-lpc
-lpcnet
-LPNMHDR
-LPNMTTDISPINFO
 lround
 lte
 luma
 Luma
-maj
 manualdrop
 maskcache
-maxabs
-maxcorr
-MAXFACTORS
-maxperiod
 maxstep
-memalign
-memid
-memneeded
 MENUINFO
 MFSTARTUP
 mfxhw
 mic
 middledrop
-minperiod
-MIPSr
 MJPEG
 MMRESULT
 momentumreversal
-movc
 mrate
 mrt
-MULBYSCALAR
-MULC
-MWERKS
-mycfg
 narrowstrip
-nbak
-nbytes
 ncapture
-nchw
 ncm
 nduplicates
-nfft
-NHWC
 niterations
 nmonitor
-nnet
 NONCLIENTMETRICS
 NONOTIFY
 nonvle
-normf
 nredraw
 nstop
 nsubpixel
 ntorn
-numthreads
 nvw
-Octasic
 osc
-OSCE
-ovflw
 OWNERDRAW
 PBGRA
 periodictrap
-pfdc
 pillarbox
+pfdc
 playhead
-pnmh
 pointerreuse
-PPW
-prereq
-PSHR
-pstdint
 PSWA
 pwfx
-QCONST
 qpc
 Qpc
 quantums
-qweight
-RCSEGMODEL
 RCZOOMITSCR
 readback
 READERF
 realcapture
 REFKNOWNFOLDERID
-relu
 reposted
 RETURNCMD
-rnn
-rnnoise
-rotateleft
-rsqrt
-rtcd
-RTEXT
-RTH
-rtvs
-SCALEIN
-SCALEOUT
 SCREENSAVE
 SCRNSAVE
 SCRNSAVECONFIGURE
@@ -273,80 +138,43 @@ scrnsavw
 Scrnsavw
 scrollramp
 SCROLLSIZEGRIP
-selfie
 selftest
 SETBARCOLOR
 SETBKCOLOR
 SETDEFID
 SETRECT
 SETSCREENSAVETIMEOUT
-SETTIPSIDE
-sgem
-sgemv
-sgv
 SHAREMODE
 SHAREVIOLATION
 shortlist
-simde
-siv
 slowthenfast
 smallstart
 SNIPOCR
-softmax
 sqrtf
-SROUND
-srvs
 ssi
 startuprecovery
-stdint
 stf
 stopafter
 STREAMFLAGS
-SUBFROM
-subias
 submix
 sxx
 sxy
-symbian
 synthesising
 syy
 tallportal
-TBTS
 tci
 tcsicmp
-TEXTCALLBACK
 TEXTMETRIC
-tgsm
-THIRDPARTY
 tinystep
 tme
 toolbars
-TOOLINFO
 TRACKMOUSEEVENT
-TRIANGLELIST
-TTM
-TTN
-TWID
-UADD
-uav
-uavs
-uge
 Unadvise
-upscaled
-upscales
-USUB
-utof
-vad
 vaddq
 vaddvq
-valgrind
-Valin
 vandq
-vblank
 vcgeq
 vdup
-vectorizer
-VERTID
 VIDCAP
 vld
 vle
@@ -356,7 +184,6 @@ vminq
 vmlal
 vmull
 vqaddq
-VSHR
 vshrn
 vsntprintf
 vsnwprintf
@@ -367,9 +194,7 @@ WAVEFORMATEXTENSIBLE
 webcam
 Webcam
 webcams
-Wextra
 wfopen
-WGC
 wideportal
 wil
 WMU
@@ -377,46 +202,11 @@ wrapjump
 wtol
 WTSSESSION
 WTSUn
-wxyz
-xchg
-xcorr
 XEnd
-Xfl
-Xiang
-Xiph
-xmmintrin
-xptr
-xshift
 XStart
 XStep
-xxxy
-xxyx
-xxyz
-xyw
-xywx
-xyxx
-xyxz
-xyzw
-xyzx
-xzwx
-xzxx
-Yfl
 YInternal
-yshift
-YUV
-yyyx
-yyzw
-yzw
-yzwy
-yzyy
-Zhou
-Zhu
 ZMBS
 zncc
 Zncc
 ZNCC
-zrh
-zwzz
-zyzw
-zzwz
-zzzw

.github/actions/spell-check/excludes.txt

@@ -105,13 +105,13 @@
 ^src/common/ManagedCommon/ColorFormatHelper\.cs$
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
-^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherComparisonTests.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherDiacriticsTests.cs$
-^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
+^doc/devdocs/modules/cmdpal/initial-sdk-spec/list-elements-mock-002\.pdn$
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/.*\.TestData\.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/Text/.*\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherComparisonTests.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherDiacriticsTests.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
@@ -135,8 +135,6 @@
 ^src/modules/previewpane/SvgPreviewHandler/SvgHTMLPreviewGenerator\.cs$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag\.txt$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
-^src/modules/ZoomIt/ZoomIt/rnnoise/
-^src/modules/ZoomIt/ZoomIt/selfie_segmentation\.onnx$
 ^src/modules/ZoomIt/ZoomIt/ZoomIt\.idc$
 ^src/Monaco/
 ^tools/project_template/ModuleTemplate/resource\.h$

.github/actions/spell-check/expect.txt

@@ -1,6 +1,7 @@
 AAAAs
 abcdefghjkmnpqrstuvxyz
 abgr
+ABlocked
 ABORTIFHUNG
 ABOUTBOX
 Abug
@@ -10,13 +11,18 @@ ACCESSDENIED
 ACCESSTOKEN
 acfs
 ACIE
+AClient
+AColumn
+ACR
 acrt
 ACTIVATEAPP
 ACTIVATEOPTIONS
 activationaction
 adaptivecards
+ADate
 ADDSTRING
 ADDUNDORECORD
+ADifferent
 ADMINS
 adml
 admx
@@ -30,8 +36,10 @@ AFX
 agentskills
 AGGREGATABLE
 AHK
+AHybrid
 AIUI
 akv
+ALarger
 ALIGNRIGHT
 ALLAPPS
 ALLCHILDREN
@@ -43,13 +51,17 @@ ALLOWUNDO
 ALLVIEW
 ALPHATYPE
 altkey
+AModifier
 amr
 ANDSCANS
 animatedvisuals
 Animnate
+ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
+AOklab
 aot
+APeriod
 apicontract
 apidl
 APIENTRY
@@ -63,7 +75,6 @@ APPEXECLINK
 appext
 apphost
 APPLICATIONFRAMEHOST
-Applocal
 appmanifest
 APPMODEL
 APPNAME
@@ -76,7 +87,9 @@ appxpackage
 APSTUDIO
 AQS
 Aquadrant
+ARandom
 ARCHITEW
+ARemapped
 ARPINSTALLLOCATION
 ARPPRODUCTICON
 ARRAYSIZE
@@ -87,9 +100,11 @@ ARTIFACTSTAGINGDIRECTORY
 asf
 Ashcraft
 AShortcut
+ASingle
 ASSOCCHANGED
 ASSOCF
 ASSOCSTR
+ASUS
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
@@ -113,12 +128,14 @@ azman
 azureaiinference
 azureinference
 azureopenai
+Backlight
 backticks
 Badflags
 Badmode
 Badparam
 bbwe
 BCIE
+bck
 BESTEFFORT
 bezelled
 bhid
@@ -145,7 +162,9 @@ bluelightreductionstate
 BLURBEHIND
 BLURREGION
 bmi
+BNumber
 BODGY
+BOklab
 BOOTSTRAPPERINSTALLFOLDER
 Bootstrappers
 BOTTOMALIGN
@@ -165,10 +184,11 @@ bugreport
 bugreportfile
 BUILDARCH
 BUILDNUMBER
-buildsystems
 buildtransitive
 builttoroam
 BUNDLEINFO
+BVal
+BValue
 byapp
 BYCOMMAND
 BYPOSITION
@@ -184,13 +204,18 @@ CAPTURECHANGED
 CARETBLINKING
 carlos
 Carlseibert
+CAtl
 caub
 CBN
 cch
 CCHDEVICENAME
 CCHFORMNAME
+CCom
+CContext
+CDeclaration
 CDPX
 Cds
+CElems
 CENTERALIGN
 cer
 certlm
@@ -204,10 +229,12 @@ CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
 chu
+Chunghwa
 CIBUILD
 cidl
 CIELCh
 cim
+CImage
 cla
 CLASSDC
 classguid
@@ -236,6 +263,7 @@ CMIC
 CMINVOKECOMMANDINFO
 CMINVOKECOMMANDINFOEX
 CMN
+CMock
 CMONITORS
 cmph
 CNF
@@ -292,6 +320,7 @@ Cowait
 cpcontrols
 cph
 cplusplus
+CPower
 cpptools
 cppvsdbg
 cppwinrt
@@ -310,9 +339,14 @@ CROPTOSQUARE
 Crossdevice
 crt
 csdevkit
+CSearch
+CSettings
 cso
+CSOT
 CSRW
+CStyle
 cswin
+CTest
 CTEXT
 CTLCOLORSTATIC
 CURRENTDIR
@@ -323,7 +357,9 @@ cursorwrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
+CVal
 cvd
+CVirtual
 CWMO
 CXSCREEN
 CXSMICON
@@ -336,6 +372,7 @@ Dac
 dacl
 DAffine
 DAFFINETRANSFORM
+DArchitectures
 datareader
 Datasheet
 datatracker
@@ -351,6 +388,7 @@ DBT
 DCapabilities
 DCBA
 DCOM
+DComposition
 DCR
 ddc
 DDEIf
@@ -367,6 +405,7 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTSIZE
+defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -399,7 +438,6 @@ DEVMODE
 DEVMODEW
 DEVNODES
 devpal
-devpackages
 DEVTYP
 dfx
 DIALOGEX
@@ -416,6 +454,7 @@ DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
 DISPLAYPORT
+diu
 divyan
 DLGFRAME
 dlgmodalframe
@@ -443,9 +482,9 @@ drawingcolor
 dreamsofameaningfullife
 drivedetectionwarning
 DROPFILES
-DSPDLOG
 DSTINVERT
 DString
+DSVG
 dto
 DUMMYUNIONNAME
 dumpbin
@@ -471,9 +510,12 @@ DWMWINDOWATTRIBUTE
 DWMWINDOWMAXIMIZEDCHANGE
 DWORDLONG
 dworigin
+dwrite
+DWRITE
 dxgi
 Dxva
 eab
+EAccess
 easeofaccess
 ecount
 edid
@@ -481,6 +523,8 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 eep
+EFile
+EInvalid
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -490,24 +534,28 @@ ENABLETEMPLATE
 encodedlaunch
 encryptor
 ENDSESSION
+ENot
 ENSUREVISIBLE
 ENTERSIZEMOVE
 ENTRYW
 ENU
 environmentvariables
 EPO
+EProvider
 epu
 ERASEBKGND
 EREOF
 EResize
 ERRORIMAGE
 ERRORTITLE
+ESettings
 esrp
 etd
 ETDT
 etl
 etw
 eula
+eurochange
 eventvwr
 evt
 EWXFORCE
@@ -543,6 +591,7 @@ FANCYZONESEDITOR
 FARPROC
 fdw
 fdx
+FErase
 fesf
 FFFF
 fffffffzzz
@@ -569,13 +618,16 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
+FInc
 findfast
 findmymouse
 FIXEDFILEINFO
 FIXEDSYS
 flac
 flyouts
+FMask
 fmtid
+FNumber
 FOF
 FOFX
 FOLDERID
@@ -588,6 +640,7 @@ formatetc
 FORPARSING
 foundrylocal
 framechanged
+FRestore
 frm
 FROMTOUCH
 fsanitize
@@ -627,6 +680,7 @@ gfx
 GHND
 gitmodules
 GMEM
+GNumber
 googleai
 googlegemini
 Gotchas
@@ -647,10 +701,12 @@ GSM
 gtm
 guiddata
 GUITHREADINFO
+GValue
 gwl
 GWLP
 GWLSTYLE
 hangeul
+Hann
 Hantai
 Hanzi
 Hardlines
@@ -683,6 +739,7 @@ hgdiobj
 HGFE
 hglobal
 hhk
+HHmmssfff
 hhx
 Hiber
 Hiberboot
@@ -722,6 +779,7 @@ HORZSIZE
 Hostbackdropbrush
 hostfxr
 hostsfileeditor
+Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
@@ -729,6 +787,7 @@ hotkeys
 hotlight
 hotspot
 HPAINTBUFFER
+HPhysical
 HPS
 HRAWINPUT
 HREDRAW
@@ -739,11 +798,15 @@ HROW
 hsb
 HSCROLL
 hsi
+HSpeed
+HSync
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
 HTTRANSPARENT
 hutchinsoniana
+HVal
+HValue
 Hvci
 hwb
 HWHEEL
@@ -754,6 +817,7 @@ HWNDLAST
 HWNDNEXT
 HWNDPARENT
 HWNDPREV
+HWP
 hyjiacan
 IAI
 icf
@@ -835,6 +899,7 @@ INVALIDARG
 invalidoperatioexception
 invokecommand
 ipcmanager
+IPREVIEW
 ipreviewhandlervisualssetfont
 IPTC
 irow
@@ -850,8 +915,10 @@ issuecomment
 istep
 Italicise
 ith
+ITHUMBNAIL
 IUI
 IUWP
+IVO
 IWIC
 jeli
 jfif
@@ -869,6 +936,7 @@ jsonval
 jxr
 Kantai
 KBSC
+kdc
 keybd
 KEYBDDATA
 KEYBDINPUT
@@ -886,7 +954,6 @@ keynum
 keyremaps
 keyring
 keyvault
-kfull
 KILLFOCUS
 killrunner
 kmph
@@ -913,6 +980,7 @@ LEFTTEXT
 Lenovo
 LError
 LEVELID
+LExit
 LFU
 LGD
 lhwnd
@@ -952,6 +1020,7 @@ lowlevel
 LOWORD
 lparam
 LPBITMAPINFOHEADER
+LPCFHOOKPROC
 lpch
 LPCITEMIDLIST
 LPCLSID
@@ -970,6 +1039,7 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
+LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -983,6 +1053,7 @@ LPW
 lpwcx
 lpwndpl
 lquadrant
+LReader
 LRESULT
 LSTATUS
 lstrcmp
@@ -990,12 +1061,15 @@ lstrcmpi
 lstrcpyn
 lstrlen
 LTEXT
-LTM
 LTRREADING
 luid
+LUMA
 lusrmgr
+LVal
 LVDS
 LWA
+lwin
+LWIN
 LZero
 MAGTRANSFORM
 makeappx
@@ -1064,6 +1138,7 @@ mkdn
 mlcfg
 mmc
 mmcexe
+MMdd
 mmi
 mmsys
 mobileredirect
@@ -1089,6 +1164,7 @@ mouseutils
 MOVESIZEEND
 MOVESIZESTART
 MRM
+MRT
 mru
 msaccess
 MSAL
@@ -1099,6 +1175,8 @@ msdata
 msdia
 MSDL
 MSGFLT
+MSHCTX
+MSHLFLAGS
 msiexec
 MSIFASTINSTALL
 MSIHANDLE
@@ -1135,6 +1213,7 @@ myorg
 myrepo
 NAMECHANGE
 namespaceanddescendants
+Nanjing
 nao
 NCACTIVATE
 ncc
@@ -1160,6 +1239,7 @@ netcpl
 netframework
 netsetup
 netsh
+newcolor
 NEWDIALOGSTYLE
 NEWFILE
 NEWFILEHEADER
@@ -1172,6 +1252,7 @@ newrow
 nicksnettravels
 NIF
 nightlight
+NLog
 NLSTEXT
 NMAKE
 NNN
@@ -1205,6 +1286,7 @@ nonclient
 NONCLIENTMETRICSW
 NONELEVATED
 nonspace
+nonstd
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
@@ -1260,6 +1342,7 @@ OFN
 ofs
 OICI
 OICIIO
+oldcolor
 olditem
 oldpath
 oldtheme
@@ -1290,6 +1373,7 @@ OUTOFCONTEXT
 Outptr
 outputtype
 outsettings
+outsourced
 OVERLAPPEDWINDOW
 Oversampling
 OVERWRITEPROMPT
@@ -1316,6 +1400,7 @@ PATINVERT
 PATPAINT
 pbc
 pbi
+PBlob
 PBP
 pbrush
 pcb
@@ -1326,7 +1411,6 @@ pchast
 PCIDLIST
 PCTSTR
 PCWSTR
-pdbs
 PDBs
 PDEVMODE
 PDFs
@@ -1338,6 +1422,7 @@ pdto
 pdtobj
 pdw
 Peb
+PElems
 Pels
 PELSHEIGHT
 PELSWIDTH
@@ -1354,6 +1439,7 @@ pguid
 phbm
 phbmp
 phicon
+PHL
 Photoshop
 photoshop
 phwnd
@@ -1361,6 +1447,7 @@ pici
 pidl
 PIDLIST
 pii
+pinboard
 pinfo
 pinvoke
 pipename
@@ -1385,7 +1472,6 @@ Pokedex
 Pomodoro
 popups
 POPUPWINDOW
-portfile
 POSITIONITEM
 POWERBROADCAST
 powerdisplay
@@ -1418,6 +1504,7 @@ Prefixer
 Premul
 prependpath
 prepopulate
+Prereq
 prevhost
 previewer
 PREVIEWHANDLERFRAMEINFO
@@ -1461,6 +1548,7 @@ psrm
 psrree
 pstatstg
 pstm
+PStr
 pstream
 pstrm
 PSYSTEM
@@ -1471,6 +1559,7 @@ PTCHAR
 ptcontrols
 ptd
 PTOKEN
+PToy
 ptstr
 ptsym
 pui
@@ -1481,6 +1570,7 @@ PWSTR
 pwsz
 pwtd
 qdc
+QDS
 qit
 QITAB
 QITABENT
@@ -1495,7 +1585,9 @@ quicklinks
 quickmask
 QUNS
 RAII
+RAlt
 randi
+RAquadrant
 rasterization
 Rasterize
 rasterizing
@@ -1513,6 +1605,7 @@ READMODE
 READOBJECTS
 recents
 RECTDESTINATION
+rectp
 RECTSOURCE
 recursesubdirs
 recyclebin
@@ -1571,6 +1664,8 @@ RIDEV
 RIGHTBUTTON
 RIGHTSCROLLBAR
 riid
+RKey
+RNumber
 rollups
 rop
 ROUNDSMALL
@@ -1600,6 +1695,7 @@ SAMESHORTCUTPREVIOUSLYMAPPED
 samsung
 sancov
 SAVEFAILED
+scanled
 schedtasks
 SCID
 Scode
@@ -1777,7 +1873,6 @@ STDAPI
 stdc
 stdcpp
 stdcpplatest
-stdext
 STDMETHODCALLTYPE
 STDMETHODIMP
 steamapps
@@ -1808,6 +1903,7 @@ sublang
 SUBMODULEUPDATE
 subresource
 sug
+suntimes
 Superbar
 SUPPRESSMSGBOXES
 sut
@@ -1883,6 +1979,7 @@ thickframe
 THISCOMPONENT
 threadpool
 throughs
+Tianma
 TILEDWINDOW
 TILLSON
 timedate
@@ -1900,7 +1997,6 @@ TNP
 Toggleable
 tontrager
 Toolhelp
-toolsets
 toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
@@ -1933,11 +2029,16 @@ UACUI
 UAL
 uap
 UBR
+UBreak
 ubrk
+UCallback
 ucrt
 ucrtd
 uefi
+UError
 uesc
+UFlags
+UHash
 UIA
 UIDs
 UIEx
@@ -1946,6 +2047,8 @@ uitests
 UITo
 ULONGLONG
 Ultrawide
+UMax
+UMin
 ums
 uncompilable
 UNCPRIORITY
@@ -1964,11 +2067,12 @@ UNORM
 unparsable
 unremapped
 Unsend
-Unsubscribes
+unsubscribes
 untriaged
 unvirtualized
 unwide
 unzoom
+UOffset
 UOI
 UPDATENOW
 updown
@@ -1984,6 +2088,7 @@ USEINSTALLERFORTEST
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
+UType
 uuidv
 uwp
 uxt
@@ -1994,15 +2099,17 @@ valuegenerator
 VARTYPE
 vbcscompiler
 vcamp
+vcenter
+VCENTER
 vcgtq
 VCINSTALLDIR
 vcp
 Vcpkg
-vcpkg
 vcpname
 VCRT
 vcruntime
 vcvars
+VDesktop
 vdupq
 VERBSONLY
 VERBW
@@ -2031,6 +2138,8 @@ vorrq
 VOS
 vpaddlq
 vqsubq
+vredraw
+VREDRAW
 vreinterpretq
 VSC
 VSCBD
@@ -2042,20 +2151,24 @@ VSINSTALLDIR
 VSM
 vso
 vsonline
+VSpeed
 vstemplate
 vstest
 VSTHRD
 vstprintf
 VSTT
 vswhere
+VSync
 Vtbl
 WANTNUKEWARNING
 WANTPALM
 WASDK
 wbem
+WBounds
 Wca
 WCE
 wcex
+WClass
 WCRAPI
 wcsicmp
 wcsncpy
@@ -2138,6 +2251,7 @@ WNDCLASSW
 wndproc
 wnode
 wom
+workerw
 WORKSPACESEDITOR
 WORKSPACESLAUNCHER
 WORKSPACESSNAPSHOTTOOL
@@ -2152,6 +2266,7 @@ wpr
 wprp
 wql
 wregex
+WReserved
 WResize
 WRITEOBJECTS
 Wrk
@@ -2169,23 +2284,49 @@ Wubi
 WUX
 Wwanpp
 xap
+XAxis
+XButton
 Xbuttondown
 xclip
 xcopy
+XDeployment
 xdf
+XDimension
+XDocument
+XElement
 xfd
+XFile
+XIncrement
+XLoc
 xmp
+XNamespace
 Xoshiro
+XPels
+XPixel
+XPos
+XResource
 xsi
+XSpeed
+XStr
 xstyler
+XTimer
 XUP
 XVIRTUALSCREEN
 XXL
 xxxxxx
+YAxis
 ycombinator
+YDimension
+YIncrement
 yinle
 yinyue
 yoko
+YPels
+YPos
+YResolution
+YSpeed
+YStr
+YTimer
 YVIRTUALSCREEN
 zamora
 Zenbook

.github/actions/spell-check/patterns.txt

@@ -312,12 +312,3 @@ ms-windows-store://\S+
 
 # ANSI color codes
 (?:\\(?:u00|x)1[Bb]|\\03[1-7]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+)*m
-
-# Phi Silica internal token/ID literals
-<PhiSilicaLafToken\b[^>]*>[^<]+</PhiSilicaLafToken>
-\bdjwsxzxb4ksa8\b
-# Special licenses text from RNNoise (BSD-style disclaimer: ``AS IS'')
-``AS IS''
-
-# Old school moniker for macOS from RNNoise
-MacOS

.github/policies/resourceManagement.yml

@@ -163,7 +163,7 @@ configuration:
             association: Collaborator
       then:
       - addReply:
-          reply: We've identified this issue as a duplicate of an existing one and are closing this thread so discussion stays in one place.<br/><br/>Please see the comment above for the link to the original tracking issue, and feel free to subscribe there for updates.
+          reply: Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!
       - closeIssue
       - removeLabel:
           label: Needs-Triage

.github/scripts/telemetry-pr-check.js

@@ -9,22 +9,21 @@
  */
 
 const fs = require('node:fs');
-const REVIEWER_LOGIN = 'chatasweetie';
-const REVIEWER_MENTION = `@${REVIEWER_LOGIN}`;
 
 const COMMENT_MARKER = '<!-- telemetry-event-check -->';
 const COMMENT_BODY_WITH_PRIVACY_UPDATE = `${COMMENT_MARKER}
-Thank you for contributing to PowerToys. We've detected that this PR might include a new or modified telemetry event. After this PR is merged, please follow these next steps:
+THIS IS A TEST | @chatasweetie is testing this functionality
+Thanks for contributing to PowerToys. This change might include a new or modified telemetry event, and we want to help make sure you can get your data end to end.
 
-- [ ] Reach out to Jessica (${REVIEWER_MENTION}) to follow up on the next steps: https://aka.ms/pt-telemetry-process
-`;
+1. Reach out to Jessica (@chatasweetie) to follow up on the next steps to add these telemetry events to our pipelines.`;
 
 const COMMENT_BODY_WITHOUT_PRIVACY_UPDATE = `${COMMENT_MARKER}
-Thank you for contributing to PowerToys. We've detected that this PR might include a new or modified telemetry event. Please ensure the following before merging:
+THIS IS A TEST | @chatasweetie is testing this functionality
+Thanks for contributing to PowerToys. This change might include a new or modified telemetry event, and we want to help make sure you can get your data end to end.
 
-- [ ] Add your telemetry events to [DATA_AND_PRIVACY](https://github.com/microsoft/PowerToys/blob/main/DATA_AND_PRIVACY.md).md within this PR.
+1. Make sure to add your telemetry events to DATA_AND_PRIVACY.md.
 
-- [ ] Reach out to Jessica (${REVIEWER_MENTION}) to follow up on the next steps: https://aka.ms/pt-telemetry-process`;
+2. Reach out to Jessica (@chatasweetie) to follow up on the next steps to add these telemetry events to our pipelines.`;
 
 const TELEMETRY_PATH_PATTERNS = [
   /(^|\/)trace\.(h|hpp|cpp|cs)$/i,
@@ -192,48 +191,6 @@ async function getAllPullFiles(apiBaseUrl, repository, pullNumber) {
   return files;
 }
 
-async function getPullRequest(apiBaseUrl, repository, pullNumber) {
-  const url = `${apiBaseUrl}/repos/${repository}/pulls/${pullNumber}`;
-  const pullRequest = await apiRequest(url);
-  if (!pullRequest || typeof pullRequest !== 'object') {
-    throw new Error('Unexpected response while fetching pull request details.');
-  }
-  return pullRequest;
-}
-
-async function ensureReviewerRequested(apiBaseUrl, repository, pullNumber, pullRequest) {
-  const authorLogin = String(pullRequest?.user?.login || '').toLowerCase();
-  const targetReviewer = REVIEWER_LOGIN.toLowerCase();
-
-  if (authorLogin === targetReviewer) {
-    console.log(`Skipping reviewer request: ${REVIEWER_LOGIN} is the PR author.`);
-    return;
-  }
-
-  const requestedReviewers = Array.isArray(pullRequest?.requested_reviewers)
-    ? pullRequest.requested_reviewers
-    : [];
-  const alreadyRequested = requestedReviewers.some(
-    (reviewer) => String(reviewer?.login || '').toLowerCase() === targetReviewer
-  );
-
-  if (alreadyRequested) {
-    console.log(`Reviewer ${REVIEWER_LOGIN} is already requested.`);
-    return;
-  }
-
-  const url = `${apiBaseUrl}/repos/${repository}/pulls/${pullNumber}/requested_reviewers`;
-  try {
-    await apiRequest(url, 'POST', { reviewers: [REVIEWER_LOGIN] });
-    console.log(`Requested reviewer ${REVIEWER_LOGIN}.`);
-  } catch (error) {
-    // Reviewer request should not fail the telemetry guidance workflow.
-    console.warn(
-      `Unable to request reviewer ${REVIEWER_LOGIN}: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
 async function findExistingTelemetryComment(apiBaseUrl, repository, pullNumber) {
   let page = 1;
 
@@ -353,16 +310,6 @@ async function main() {
     );
   }
 
-  try {
-    const pullRequest = await getPullRequest(parsedApiBaseUrl.origin, repository, pullNumber);
-    await ensureReviewerRequested(parsedApiBaseUrl.origin, repository, pullNumber, pullRequest);
-  } catch (error) {
-    console.warn(
-      'Failed to fetch PR details or request reviewer; continuing to post telemetry guidance comment.'
-    );
-    console.warn(error instanceof Error ? error.stack || error.message : error);
-  }
-
   const commentBody = dataAndPrivacyChanged
     ? COMMENT_BODY_WITH_PRIVACY_UPDATE
     : COMMENT_BODY_WITHOUT_PRIVACY_UPDATE;

.gitignore

@@ -19,9 +19,6 @@
 [Rr]eleases/
 x64/
 x86/
-!**/rnnoise/
-!**/rnnoise/x86/
-!**/rnnoise/x86/**
 ARM64/
 bld/
 [Bb]in/
@@ -373,11 +370,3 @@ installer/*/*.wxs.bk
 .squad-workstream
 .github/agents/**squad**.md
 .github/workflows/**squad**.yml
-
-# vcpkg manifest mode installed packages
-vcpkg_installed/
-
-deps/vcpkg/
-
-# Superpowers-generated docs (specs, design, plans) — local-only, not committed
-docs/superpowers/

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "deps/spdlog"]
+	path = deps/spdlog
+	url = https://github.com/gabime/spdlog.git
+[submodule "deps/expected-lite"]
+	path = deps/expected-lite
+	url = https://github.com/martinmoene/expected-lite.git

.pipelines/ESRPSigning_core.json

@@ -212,7 +212,6 @@
             "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
 
             "PowerAccent.Core.dll",
-            "PowerAccent.Common.dll",
             "PowerToys.PowerAccent.dll",
             "PowerToys.PowerAccent.exe",
             "PowerToys.PowerAccentModuleInterface.dll",
@@ -392,7 +391,6 @@
                 "WinUI3Apps\\Google.Apis.Auth.dll",
                 "WinUI3Apps\\Google.Apis.Core.dll",
                 "WinUI3Apps\\Google.GenAI.dll",
-                "WinUI3Apps\\YamlDotNet.dll",
 
                 "boost_regex-vc143-mt-gd-x32-1_87.dll",
                 "boost_regex-vc143-mt-gd-x64-1_87.dll",

.pipelines/v2/release.yml

@@ -102,12 +102,8 @@ extends:
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
-              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=true /p:PhiSilicaLafToken=$(PhiSilicaLafToken) /p:PhiSilicaLafAttestation="$(PhiSilicaLafAttestation)"
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=true
               beforeBuildSteps:
-                # Install the Terrapin retrieval tool, which replaces vcpkg's download handler
-                # to redirect it to a safe Microsoft-controlled location
-                - template: .pipelines/v2/templates/steps-install-terrapin.yml@self
-
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-
                     .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
@@ -144,10 +140,6 @@ extends:
                 signCertName: $(SigningSignCertName)
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
-              beforeBuildSteps:
-                # Install the Terrapin retrieval tool, which replaces vcpkg's download handler
-                # to redirect it to a safe Microsoft-controlled location
-                - template: .pipelines/v2/templates/steps-install-terrapin.yml@self
 
       - stage: Publish
         displayName: Publish

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

@@ -266,49 +266,10 @@ jobs:
         VCWhereExtraVersionTarget: '-prerelease'
 
   - ${{ if eq(parameters.official, true) }}:
-    # M.W.T.V Setup.ps1 sets the pipeline-level XES_APPXMANIFESTVERSION env var
-    # from the supplied -ProjectDirectory's custom.props. Whichever invocation
-    # runs last wins. cmdpal MUST run last because $(CmdPalVersion) (used by the
-    # VNext installer and CmdPal's AppxPackageTestDir) falls back to that env
-    # var; if AP wins, CmdPal's folder name and MSIX filename disagree on
-    # VersionMinor and the installer fails with WIX0103. Each project's own
-    # custom.props is still applied at MSBuild time, so AP versioning is
-    # unaffected by the order.
-    - template: .\steps-setup-versioning.yml
-      parameters:
-        directory: $(build.sourcesdirectory)\src\modules\AdvancedPaste
     - template: .\steps-setup-versioning.yml
       parameters:
         directory: $(build.sourcesdirectory)\src\modules\cmdpal
 
-  # --- vcpkg detection + binary cache --------------------------------------
-  # PowerToys consumes spdlog (and, over time, other native deps) via vcpkg in
-  # manifest mode. steps-install-vcpkg.yml prefers the vcpkg shipped with
-  # Visual Studio (Microsoft.VisualStudio.Component.Vcpkg) and falls back to a
-  # fresh clone of microsoft/vcpkg into deps/vcpkg if VS doesn't have it.
-  # Either way it sets the VCPKG_ROOT pipeline variable; MSBuild integration
-  # is wired globally from Cpp.Build.props (with vcpkg.targets in
-  # Cpp.Build.targets) using the three-tier VcpkgRoot fallback
-  # (env var > VS-shipped > deps/vcpkg runtime clone).
-  #
-  # Vcpkg's MSBuild integration runs `vcpkg install` once per project, so the
-  # binary cache below saves ~3-5 minutes per triplet on cache hits.
-  - template: .\steps-install-vcpkg.yml
-    parameters:
-      useVSPreview: ${{ parameters.useVSPreview }}
-
-  - ${{ if eq(parameters.enablePackageCaching, true) }}:
-    - task: Cache@2
-      displayName: 'Cache vcpkg binary archives'
-      inputs:
-        # Key on the inputs vcpkg uses to compute its package ABI: the manifest,
-        # configuration, every overlay-port file, and the agent OS.
-        key: '"vcpkg" | "$(Agent.OS)" | vcpkg.json | vcpkg-configuration.json | deps/vcpkg-overlays/**'
-        restoreKeys: |
-           "vcpkg" | "$(Agent.OS)"
-           "vcpkg"
-        path: $(LOCALAPPDATA)\vcpkg\archives
-
 
 
   - ${{ parameters.beforeBuildSteps }}

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

@@ -15,9 +15,6 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
-  - name: beforeBuildSteps
-    type: stepList
-    default: []
 
 jobs:
 - job: "BuildSDK"
@@ -48,8 +45,6 @@ jobs:
       parameters:
         directory: $(build.sourcesdirectory)\src\modules\cmdpal
 
-  - ${{ parameters.beforeBuildSteps }}
-
   - pwsh: |-
       & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "build" -IsAzurePipelineBuild
     displayName: Build SDK

.pipelines/v2/templates/steps-install-terrapin.yml

@@ -1,6 +0,0 @@
-steps:
-- pwsh: |-
-    nuget install -source "https://microsoft.pkgs.visualstudio.com/Dart/_packaging/PowerToysDependencies/nuget/v3/index.json" TerrapinRetrievalTool -Prerelease -OutputDirectory _trt -Config "$(Build.SourcesDirectory)\.pipelines\release-nuget.config"
-    $TerrapinRetrievalToolPath = (Get-Item _trt\TerrapinRetrievalTool.*\win-x64\TerrapinRetrievalTool.exe).FullName
-    Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES]x-script,${TerrapinRetrievalToolPath} -b https://vcpkg.storage.devpackages.microsoft.io/artifacts/ -a true -u None -p {url} -s {sha512} -d {dst};x-block-origin"
-  displayName: Set up the Terrapin Retrieval Tool (vcpkg cache)

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

@@ -1,41 +0,0 @@
-# Adapted from microsoft/terminal build/pipelines/templates-v2/steps-install-vcpkg.yml.
-#
-# Detects vcpkg from (in order):
-#   1. The Visual Studio installation (Microsoft.VisualStudio.Component.Vcpkg,
-#      declared in the repo-root .vsconfig).
-#   2. A local clone at deps/vcpkg, cloned and bootstrapped on demand.
-#
-# Sets the pipeline-scoped VCPKG_ROOT variable; the rest of the build
-# resolves vcpkg through it (see the three-tier VcpkgRoot fallback in
-# Cpp.Build.props). No repo-level vcpkg submodule required.
-parameters:
-- name: useVSPreview
-  type: boolean
-  default: false
-
-steps:
-  - pwsh: |-
-      # vswhere -prerelease is opt-in via the useVSPreview parameter so CI on
-      # stable VS doesn't accidentally pick up a Preview install when both
-      # are present. Matches the existing useVSPreview plumbing for
-      # verifyAndSetLatestVCToolsVersion.ps1.
-      $vswhereArgs = @('-latest', '-requires', 'Microsoft.VisualStudio.Component.Vcpkg', '-property', 'installationPath')
-      $useVSPreview = '${{ parameters.useVSPreview }}' -eq 'True'
-      if ($useVSPreview) { $vswhereArgs = @('-prerelease') + $vswhereArgs }
-      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' @vswhereArgs
-      If ([String]::IsNullOrEmpty($VsInstallRoot)) {
-        Remove-Item -Recurse -Force deps/vcpkg -ErrorAction:Ignore
-        git clone https://github.com/microsoft/vcpkg deps/vcpkg
-        if ($LASTEXITCODE -ne 0) { throw "git clone vcpkg failed (exit $LASTEXITCODE)" }
-        Push-Location deps/vcpkg
-        & ./bootstrap-vcpkg.bat -disableMetrics
-        if ($LASTEXITCODE -ne 0) { Pop-Location; throw "bootstrap-vcpkg failed (exit $LASTEXITCODE)" }
-        $VcpkgRoot = $PWD
-        Pop-Location
-        Write-Host "Using vcpkg from local checkout ($VcpkgRoot)"
-      } Else {
-        $VcpkgRoot = Join-Path $VsInstallRoot 'VC\vcpkg'
-        Write-Host "Using vcpkg from Visual Studio installation ($VcpkgRoot)"
-      }
-      Write-Host "##vso[task.setvariable variable=VCPKG_ROOT]$VcpkgRoot"
-    displayName: Detect VS vcpkg or bootstrap locally

.pipelines/verifyCommonProps.ps1

@@ -48,11 +48,6 @@ foreach ($csprojFile in $csprojFilesArray) {
         continue
     }
 
-    # The PowerAccent.Common project does not target WinRT, so skip it
-    if ($csprojFile -like '*PowerAccent.Common.csproj') {
-        continue
-    }
-
     $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
     if (!$importExists) {
         Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."

.vsconfig

@@ -18,7 +18,6 @@
     "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre",
     "Microsoft.VisualStudio.Component.VC.ATL",
     "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
-    "Microsoft.VisualStudio.Component.Vcpkg",
     "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs"
   ]
 }

Cpp.Build.props

@@ -39,8 +39,7 @@
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
-    <!-- vcpkg.targets is imported via Cpp.Build.targets after Microsoft.Cpp.targets. -->
-    <ForceImportAfterCppTargets>$(MSBuildThisFileDirectory)Cpp.Build.targets</ForceImportAfterCppTargets>
+    <VcpkgEnabled>false</VcpkgEnabled>
     <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
     <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
@@ -122,48 +121,6 @@
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
 
-  <!--
-    vcpkg integration. Set globally and loaded before Microsoft.Cpp.props (via
-    ForceImportBeforeCppProps) so that vcpkg.props' ClCompile hook is in place
-    before the C++ targets run. VcpkgRoot is resolved via the same three-tier
-    fallback used by microsoft/terminal (env var → VS-shipped → deps/vcpkg).
-  -->
-  <PropertyGroup Label="vcpkg">
-    <VcpkgEnabled>true</VcpkgEnabled>
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
-    <VcpkgManifestEnabled>true</VcpkgManifestEnabled>
-    <VcpkgManifestRoot>$(MSBuildThisFileDirectory)</VcpkgManifestRoot>
-    <VcpkgOSTarget>windows</VcpkgOSTarget>
-    <VcpkgUseStatic>true</VcpkgUseStatic>
-    <!--
-      Force VcpkgConfiguration to follow $(Configuration). Without this,
-      vcpkg.props infers VcpkgConfiguration from $(UseDebugLibraries), which
-      Microsoft.Cpp.Default.props has already defaulted to 'false' by the
-      time vcpkg.props is imported here (the PowerToys-wide Debug override
-      below runs LATER). That would silently link the Release-built spdlog
-      into Debug consumers and trigger LNK2038 (MT/MTd, _ITERATOR_DEBUG_LEVEL).
-    -->
-    <VcpkgConfiguration>$(Configuration)</VcpkgConfiguration>
-    <!-- vcpkg validates triplets case-sensitively; PowerToys uses ARM64 capital-case. -->
-    <VcpkgPlatformTarget Condition="'$(Platform)' == 'ARM64'">arm64</VcpkgPlatformTarget>
-    <VcpkgApplocalDeps>false</VcpkgApplocalDeps>
-    <VcpkgInstalledDir>$(MSBuildThisFileDirectory)vcpkg_installed\$(Platform)\</VcpkgInstalledDir>
-    <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$(VCPKG_ROOT)</VcpkgRoot>
-    <VcpkgRoot Condition="'$(VcpkgRoot)' == '' and '$(VsInstallRoot)' != ''">$(VsInstallRoot)\VC\vcpkg</VcpkgRoot>
-    <VcpkgRoot Condition="'$(VcpkgRoot)' == '' or !Exists('$(VcpkgRoot)\vcpkg.exe')">$(MSBuildThisFileDirectory)deps\vcpkg</VcpkgRoot>
-    <CAExcludePath>$(CAExcludePath);$(VcpkgInstalledDir)</CAExcludePath>
-    <VCPkgLocalAppDataDisabled>true</VCPkgLocalAppDataDisabled>
-  </PropertyGroup>
-  <!-- Fail fast with an actionable message instead of opaque C1083 spdlog/spdlog.h errors. -->
-  <Target Name="PowerToysEnsureVcpkgAvailable"
-          BeforeTargets="PrepareForBuild"
-          Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and '$(VcpkgEnabled)' == 'true' and !Exists('$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.props')">
-    <Error Text="PowerToys requires the 'vcpkg' Visual Studio component, but it was not found.%0A%0AOpen the Visual Studio Installer, click Modify on your VS install, search for 'vcpkg', enable 'C++ vcpkg package manager', and click Modify. (Visual Studio will also prompt you to install missing .vsconfig components when you open PowerToys.slnx.)%0A%0AIf you have vcpkg installed elsewhere, set the VCPKG_ROOT environment variable to its root before building.%0A%0ASearched: '$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.props'" />
-  </Target>
-  <Import Project="$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.props"
-          Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and Exists('$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.props')" />
-
-
   <!-- Debug/Release props -->
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

Cpp.Build.targets

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <!--
-    PowerToys global C++ post-targets. Wired in via
-    <ForceImportAfterCppTargets> in Cpp.Build.props so MSBuild loads this
-    file AFTER Microsoft.Cpp.targets for every .vcxproj.
-
-    Conditionally imports vcpkg.targets to hook ClCompile into vcpkg's
-    VcpkgInstallManifestDependencies target so spdlog headers are
-    auto-discovered on the include path and spdlog.lib is auto-linked.
-    vcpkg.props is imported in Cpp.Build.props (before Microsoft.Cpp.props);
-    vcpkg.targets needs the matching "after" hook here.
-  -->
-  <Import Project="$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.targets"
-          Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and '$(VcpkgEnabled)' == 'true' and Exists('$(VcpkgRoot)\scripts\buildsystems\msbuild\vcpkg.targets')" />
-</Project>

Directory.Build.props

@@ -3,7 +3,6 @@
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
   </PropertyGroup>
   <Import Project="$(RepoRoot)src\Version.props" />
-  <Import Project="$(RepoRoot)src\PhiSilicaLaf.props" />
   <PropertyGroup>
     <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
     <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>

Directory.Packages.props

@@ -41,21 +41,21 @@
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.102" />
     <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.9.260303001" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.7" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.250303.1" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="10.2.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.1-preview.1.25571.5" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AI.Foundry.Local" Version="0.3.0" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.71.0" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.71.0" />
@@ -66,9 +66,9 @@
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3719.77" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="10.0.7" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.269" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -78,10 +78,10 @@
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.250325.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="2.1.0" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="2.2.3" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.1" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="2.0.20" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="2.0.185" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="2.0.1" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
@@ -106,28 +106,28 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="10.0.8" />
+    <PackageVersion Include="System.CodeDom" Version="10.0.7" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="10.0.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="10.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="10.0.7" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.7" />
+    <PackageVersion Include="System.Data.OleDb" Version="10.0.7" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="10.0.8" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="10.0.7" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.8" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.7" />
     <PackageVersion Include="System.ClientModel" Version="1.8.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="10.0.8" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.7" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="10.0.8" />
+    <PackageVersion Include="System.Management" Version="10.0.7" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Numerics.Tensors" Version="10.0.2" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="10.0.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="10.0.7" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.7" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.7" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="ToolGood.Words.Pinyin" Version="3.1.0.3" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />

PowerToys.slnx

@@ -57,7 +57,6 @@
     <Project Path="src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj" Id="1a066c63-64b3-45f8-92fe-664e1cce8077" />
     <Project Path="src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj" Id="8b5cfb38-ccba-40a8-ad7a-89c57b070884" />
     <Project Path="src/common/updating/updating.vcxproj" Id="17da04df-e393-4397-9cf0-84dabe11032e" />
-    <Project Path="src/common/updating/UnitTests/UpdatingUnitTests.vcxproj" Id="a1b2c3d4-e5f6-7890-abcd-ef1234567890" />
     <Project Path="src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
   </Folder>
   <Folder Name="/common/interop/">
@@ -68,7 +67,10 @@
     <Project Path="src/common/interop/PowerToys.Interop.vcxproj" Id="f055103b-f80b-4d0c-bf48-057c55620033" />
   </Folder>
   <Folder Name="/common/log/">
-    <Project Path="src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd" />
+    <Project Path="src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd">
+      <BuildDependency Project="src/logging/logging.vcxproj" />
+    </Project>
+    <Project Path="src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f" />
   </Folder>
   <Folder Name="/common/notifications/">
     <Project Path="src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj" Id="0b593a6c-4143-4337-860e-db5710fb87db" />
@@ -799,14 +801,6 @@
     <Project Path="src/modules/peek/peek/peek.vcxproj" Id="a1425b53-3d61-4679-8623-e64a0d3d0a48" />
   </Folder>
   <Folder Name="/modules/PowerAccent/">
-    <Project Path="src/modules/poweraccent/PowerAccent.Common.UnitTests/PowerAccent.Common.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/poweraccent/PowerAccent.Common/PowerAccent.Common.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -1139,5 +1133,3 @@
   <Project Path="src/Update/PowerToys.Update.vcxproj" Id="44ce9ae1-4390-42c5-bacc-0fd6b40aa203" />
   <Project Path="tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj" Id="64a80062-4d8b-4229-8a38-dfa1d7497749" />
 </Solution>
-
-

deps/expected.props

@@ -0,0 +1,7 @@
+<Project>
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)expected-lite\include\nonstd\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ClCompile>
+	</ItemDefinitionGroup>
+</Project>

deps/spdlog-msvc-fix/include/spdlog-msvc-fix.h

@@ -0,0 +1,94 @@
+// spdlog-msvc-fix.h
+//
+// Workaround for MSVC 14.51 (compiler version 19.51, _MSC_VER >= 1951) removing
+// stdext::checked_array_iterator. Force-included for all spdlog consumers via
+// deps/spdlog.props, because spdlog v1.8.5's bundled fmt format.h(357) still
+// references this type inside #if defined(_SECURE_SCL) && _SECURE_SCL -- a
+// branch entered in Debug builds where _ITERATOR_DEBUG_LEVEL > 0.
+//
+// On MSVC 14.50 and earlier, the type still exists in <iterator>, so this shim
+// is a no-op via the _MSC_VER guard. On MSVC 14.51+, it provides a minimal
+// pointer-backed substitute that satisfies the bundled fmt's usage:
+//
+//   template <typename T> using checked_ptr = stdext::checked_array_iterator<T*>;
+//   template <typename T> checked_ptr<T> make_checked(T* p, size_t size) {
+//     return {p, size};
+//   }
+//   ... return make_checked(get_data(c) + size, n);
+//
+// When deps/spdlog is bumped past v1.14 (which ships fmt 10.2 and drops this
+// dependency), this shim and its <ForcedIncludeFiles> entry in deps/spdlog.props
+// can be deleted.
+
+#pragma once
+
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER >= 1951
+
+#include <cstddef>
+#include <iterator>
+#include <type_traits>
+
+namespace stdext
+{
+    template <typename _Ptr>
+    class checked_array_iterator
+    {
+        _Ptr _Myarray = nullptr;
+        std::size_t _Mysize = 0;
+        std::size_t _Myindex = 0;
+
+    public:
+        using iterator_category = std::random_access_iterator_tag;
+        using value_type = std::remove_cv_t<std::remove_pointer_t<_Ptr>>;
+        using difference_type = std::ptrdiff_t;
+        using pointer = _Ptr;
+        using reference = std::remove_pointer_t<_Ptr>&;
+
+        constexpr checked_array_iterator() = default;
+
+        constexpr checked_array_iterator(_Ptr arr, std::size_t size, std::size_t idx = 0) noexcept
+            : _Myarray(arr), _Mysize(size), _Myindex(idx)
+        {
+        }
+
+        constexpr reference operator*() const noexcept { return _Myarray[_Myindex]; }
+        constexpr pointer operator->() const noexcept { return _Myarray + _Myindex; }
+        constexpr reference operator[](difference_type n) const noexcept
+        {
+            return _Myarray[_Myindex + static_cast<std::size_t>(n)];
+        }
+
+        constexpr checked_array_iterator& operator++() noexcept { ++_Myindex; return *this; }
+        constexpr checked_array_iterator operator++(int) noexcept { auto t = *this; ++_Myindex; return t; }
+        constexpr checked_array_iterator& operator--() noexcept { --_Myindex; return *this; }
+        constexpr checked_array_iterator operator--(int) noexcept { auto t = *this; --_Myindex; return t; }
+
+        constexpr checked_array_iterator& operator+=(difference_type n) noexcept
+        {
+            _Myindex = static_cast<std::size_t>(static_cast<difference_type>(_Myindex) + n);
+            return *this;
+        }
+        constexpr checked_array_iterator& operator-=(difference_type n) noexcept
+        {
+            _Myindex = static_cast<std::size_t>(static_cast<difference_type>(_Myindex) - n);
+            return *this;
+        }
+
+        friend constexpr checked_array_iterator operator+(checked_array_iterator it, difference_type n) noexcept { it += n; return it; }
+        friend constexpr checked_array_iterator operator+(difference_type n, checked_array_iterator it) noexcept { return it + n; }
+        friend constexpr checked_array_iterator operator-(checked_array_iterator it, difference_type n) noexcept { it -= n; return it; }
+        friend constexpr difference_type operator-(checked_array_iterator a, checked_array_iterator b) noexcept
+        {
+            return static_cast<difference_type>(a._Myindex) - static_cast<difference_type>(b._Myindex);
+        }
+
+        friend constexpr bool operator==(checked_array_iterator a, checked_array_iterator b) noexcept { return a._Myindex == b._Myindex; }
+        friend constexpr bool operator!=(checked_array_iterator a, checked_array_iterator b) noexcept { return !(a == b); }
+        friend constexpr bool operator<(checked_array_iterator a, checked_array_iterator b) noexcept { return a._Myindex < b._Myindex; }
+        friend constexpr bool operator>(checked_array_iterator a, checked_array_iterator b) noexcept { return b < a; }
+        friend constexpr bool operator<=(checked_array_iterator a, checked_array_iterator b) noexcept { return !(b < a); }
+        friend constexpr bool operator>=(checked_array_iterator a, checked_array_iterator b) noexcept { return !(a < b); }
+    };
+} // namespace stdext
+
+#endif // __cplusplus && _MSC_VER >= 1951

deps/spdlog.props

@@ -1,14 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <!--
-    SPDLOG_* preprocessor defines for spdlog consumers. The actual vcpkg
-    integration (VcpkgEnabled, VcpkgRoot, triplet, manifest install) lives
-    in Cpp.Build.props; this file just carries the defines that match how
-    the pre-vcpkg in-tree build was configured.
-  -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)spdlog\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ForcedIncludeFiles>$(MSBuildThisFileDirectory)spdlog-msvc-fix\include\spdlog-msvc-fix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+		</ClCompile>
+	</ItemDefinitionGroup>
 </Project>

deps/vcpkg-overlays/spdlog/msvc-14.51-stdext-checked-array-iterator.patch

@@ -1,16 +0,0 @@
---- a/include/spdlog/fmt/bundled/format.h
-+++ b/include/spdlog/fmt/bundled/format.h
-@@ -354,7 +354,12 @@ inline typename Container::value_type* get_data(Container& c) {
-   return c.data();
- }
- 
--#if defined(_SECURE_SCL) && _SECURE_SCL
-+// PowerToys: stdext::checked_array_iterator was deprecated in VS 2019 16.10
-+// and removed entirely in MSVC 14.51 (compiler 19.51, _MSC_VER >= 1951;
-+// see microsoft/STL STL4043). Skip the broken branch on those toolsets so the
-+// pointer-based fallback below is used instead. Drop this guard once
-+// deps/spdlog is bumped past v1.14 (which ships fmt 10.2 and removes this code).
-+#if defined(_SECURE_SCL) && _SECURE_SCL && (!defined(_MSC_VER) || _MSC_VER < 1951)
- // Make a checked iterator to avoid MSVC warnings.
- template <typename T> using checked_ptr = stdext::checked_array_iterator<T*>;
- template <typename T> checked_ptr<T> make_checked(T* p, size_t size) {

deps/vcpkg-overlays/spdlog/portfile.cmake

@@ -1,43 +0,0 @@
-# PowerToys overlay port for spdlog.
-#
-# Pinned to the same git commit that the deleted deps/spdlog submodule pointed
-# at, so this is a 1:1 submodule->vcpkg migration with no version change
-# (per the maintainer guidance: convert one submodule at a time, atomic
-# commit, don't also bump the version).
-#
-# A single hunk patch works around MSVC 14.51 STL4043 (removal of
-# stdext::checked_array_iterator) in spdlog's bundled fmt 7. Drop this overlay
-# (and switch to upstream vcpkg's spdlog port) once PowerToys bumps spdlog
-# past v1.14, which ships fmt 10.2 and removes the affected code path.
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO gabime/spdlog
-    REF 616866fcf40340ea25a8f218369bad810ef58e72
-    SHA512 2076c527c7768627e6856b2f7ef663b185fd6251894cffd9299203d00f3d2de5696461060442dd72b96c9d3f0fd27f7f63ad2edfdf295e9b06c5fac6d6212faf
-    HEAD_REF v1.x
-    PATCHES
-        msvc-14.51-stdext-checked-array-iterator.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DSPDLOG_BUILD_EXAMPLE=OFF
-        -DSPDLOG_BUILD_TESTS=OFF
-        -DSPDLOG_BUILD_BENCH=OFF
-        -DSPDLOG_FMT_EXTERNAL=OFF
-        -DSPDLOG_WCHAR_SUPPORT=ON
-        -DSPDLOG_WCHAR_FILENAMES=ON
-        -DSPDLOG_NO_EXCEPTIONS=OFF
-        -DSPDLOG_BUILD_SHARED=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME spdlog CONFIG_PATH lib/cmake/spdlog)
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

deps/vcpkg-overlays/spdlog/vcpkg.json

@@ -1,18 +0,0 @@
-{
-  "name": "spdlog",
-  "version-string": "1.8.5-pt-616866fc",
-  "port-version": 0,
-  "description": "Very fast, header-only/compiled, C++ logging library. PowerToys overlay pinned to gabime/spdlog@616866fc (the exact submodule commit before this migration), with a single-hunk patch that works around MSVC 14.51 removing stdext::checked_array_iterator (STL4043).",
-  "homepage": "https://github.com/gabime/spdlog",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}

doc/devdocs/development/debugging.md

@@ -97,10 +97,6 @@ The Shell Process Debugging Tool is a Visual Studio extension that helps debug m
 - Check Event Viewer for application crashes related to `PowerToys.Settings.exe`
 - Crash dumps can be obtained from Event Viewer
 
-### Debugging Command Palette
-Command Palette can be easily debugged using the solution filter in `src/modules/cmdpal/Command Palette.slnf`. This will open Command Palette as its own Visual Studio solution that can be run and debugged directly in Visual Studio without the need for the Shell Process Debugging Tool.
-
-
 ## Troubleshooting Build Errors
 
 ### Missing Image Files or Corrupted Build State

doc/devdocs/modules/advancedpaste-phisilica-local-testing.md

@@ -1,100 +0,0 @@
-# Advanced Paste – Phi Silica local testing
-
-How to build, register, and test **Phi Silica** in **Advanced Paste (AP)** on a dev machine,
-plus the few things that actually break it.
-
-## How it fits together
-
-AP ships as an **unpackaged, self-contained WinUI 3 exe** (`PowerToys.AdvancedPaste.exe`).
-The Windows AI `LanguageModel` (Phi Silica) API is a **Limited Access Feature (LAF)**. For it
-to work, all of these must line up:
-
-1. **Package identity** — AP runs with identity granted by the sparse MSIX
-   `Microsoft.PowerToys.SparseApp`.
-2. **Matching LAF creds** — the token/attestation baked into the exe match the registered
-   sparse package's publisher.
-3. **AI metadata deployed** — the `Microsoft.Windows.AI*.winmd` files ship next to the exe;
-   the AI runtime resolves them **at runtime**.
-4. **Model ready** — supported hardware and the on-device model downloaded
-   (`GetReadyState() == Ready`).
-
-Two identities — the baked token must match the registered package's publisher:
-
-| Build | Publisher Id | LAF creds |
-|-------|--------------|-----------|
-| **Dev** | `djwsxzxb4ksa8` | dev default in [`src/PhiSilicaLaf.props`](../../../src/PhiSilicaLaf.props) |
-| **Prod** | `8wekyb3d8bbwe` | secret, injected only by `.pipelines/v2/release.yml` |
-
-Non-secret pairing check: the exe's baked **Attestation** must equal the registered package's
-**PublisherId**.
-
-## Build + register (dev loop)
-
-```powershell
-$repo = "X:\GitHub\PowerToys"; $Plat = "ARM64"; $Cfg = "Debug"   # or x64 / Release
-
-# Build AP only (C#; reuses existing C++ outputs):
-dotnet restore "$repo\src\modules\AdvancedPaste\AdvancedPaste\AdvancedPaste.csproj" /p:Platform=$Plat
-& "$repo\tools\build\build.cmd" -Path "$repo\src\modules\AdvancedPaste\AdvancedPaste" `
-    -Platform $Plat -Configuration $Cfg /p:BuildProjectReferences=false
-
-# Register the dev sparse package (creates + trusts a dev cert, grants identity):
-pwsh -ExecutionPolicy Bypass -File "$repo\src\PackageIdentity\BuildSparsePackage.ps1" `
-    -Platform $Plat -Configuration $Cfg -DevRegister
-# Expect: PublisherId djwsxzxb4ksa8, IsDevelopmentMode True
-```
-
-## Check the API
-
-`PowerToys.AdvancedPaste.exe` is a **GUI-subsystem** app — run directly in a console it prints
-nothing and returns no exit code. **Redirect** stdout/stderr and wait:
-
-```powershell
-$exe = "$repo\$Plat\$Cfg\WinUI3Apps\PowerToys.AdvancedPaste.exe"
-$o = "$env:TEMP\ap.out"; $e = "$env:TEMP\ap.err"
-$p = Start-Process $exe '--check-phi-silica' -Wait -PassThru -WindowStyle Hidden `
-        -RedirectStandardOutput $o -RedirectStandardError $e
-"exit=$($p.ExitCode)  stdout=$((Get-Content $o -Raw).Trim())"
-Get-Content $e -Raw   # stderr: [phi-silica] LAF unlock status: <…>; ReadyState: <…>
-```
-
-| `--check-phi-silica` | `--prepare-phi-silica` (downloads the model) |
-|----------------------|----------------------------------------------|
-| `0` Available · `1` NotReady · `2` NotSupported / unlock failed | `0` Ready · `1` Failed · `2` NotSupported |
-
-`--check` only reads state; use `--prepare` to trigger the model download (`EnsureReadyAsync`).
-On failure it prints the `HRESULT` to stderr.
-
-Confirm the running AP has identity:
-
-```powershell
-$apPid = (Get-Process PowerToys.AdvancedPaste -EA SilentlyContinue | Select-Object -First 1).Id
-if ($apPid) { & "$repo\src\PackageIdentity\Check-ProcessIdentity.ps1" -ProcessId $apPid }
-# Expect a PFN ending in the publisher id that matches the baked attestation
-```
-
-## What actually breaks it
-
-- **Missing `.winmd` (most important).** The Windows AI runtime resolves
-  `Microsoft.Windows.AI*.winmd` from the app folder at runtime. If they aren't deployed,
-  `GetReadyState()` returns `NotReady` and `EnsureReadyAsync()` fails with
-  `RO_E_METADATA_NAME_NOT_FOUND` (`0x8000000F`) — even though identity, token, and the AI DLLs
-  are all correct. The build emits these winmd into `WinUI3Apps\`; the **installer must harvest
-  them** (`*.winmd` is in the inclusion list of
-  [`generateAllFileComponents.ps1`](../../../installer/PowerToysSetupVNext/generateAllFileComponents.ps1)).
-  Classic symptom: "works from the build output but not from the installer" → check that the
-  installed `WinUI3Apps\` contains `Microsoft.Windows.AI*.winmd`.
-- **Dev/prod mismatch.** A dev-cred exe running against a prod sparse package (or vice versa)
-  makes the LAF unlock silently return `Unavailable`. Keep the exe and the registered package
-  the same flavor, and verify with the attestation == publisherId check above.
-- **Forgot to redirect.** `--check-phi-silica` in a console prints nothing — that's the
-  GUI-subsystem quirk, not a result.
-
-## Cleanup
-
-```powershell
-pwsh -ExecutionPolicy Bypass -File "$repo\src\PackageIdentity\BuildSparsePackage.ps1" -Unregister
-```
-
-⚠️ This removes any `Microsoft.PowerToys.SparseApp` registration, **including a prod one** from
-an installer — reinstall/repair PowerToys to restore it.

doc/devdocs/modules/advancedpaste.md

@@ -33,81 +33,7 @@ See the `ExecutePasteFormatAsync(PasteFormat, PasteActionSource)` method in `Opt
 
 ## Debugging
 
-Advanced Paste is an unpackaged, self-contained WinUI 3 app (`PowerToys.AdvancedPaste.exe`). To call Windows AI APIs (Phi Silica / `Microsoft.Windows.AI.Text.LanguageModel`) it acquires **package identity** at runtime via a shared sparse MSIX package (`Microsoft.PowerToys.SparseApp`).
-
-### Running and attaching the debugger
-
-1. Set the **Runner** project (`src/runner`) as the startup project in Visual Studio.
-2. Launch the Runner (F5). This starts the PowerToys tray icon and loads all module interfaces.
-3. Open Settings (right-click tray icon → Settings) and enable the **Advanced Paste** module if it isn't already. The module launches `PowerToys.AdvancedPaste.exe` in the background immediately.
-4. In Visual Studio, go to **Debug → Attach to Process** (`Ctrl+Alt+P`) and attach to `PowerToys.AdvancedPaste.exe` (select **Managed (.NET Core)** debugger).
-
-Alternatively, use the VS Code launch configuration **"Run AdvancedPaste"** from [.vscode/launch.json](/.vscode/launch.json) to launch the exe directly — but note that without the Runner, IPC and hotkeys won't work.
-
-### Sparse package identity (local development)
-
-#### Why is this needed?
-
-- The `LanguageModel` API requires a Limited Access Feature (LAF) unlock, which only succeeds when the calling process has a matching package identity.
-- Advanced Paste is an unpackaged, self-contained WinUI 3 app. The sparse package grants it identity without converting it to a full MSIX.
-- The csproj uses `<ProjectPriFileName>PowerToys.AdvancedPaste.pri</ProjectPriFileName>` (matching the convention of other WinUI3 apps like ImageResizer). This requires WindowsAppSDK Foundation >= 2.0.22 ([PR #6376](https://github.com/microsoft/WindowsAppSDK/pull/6376)) which fixes MRT PRI lookup under sparse identity so `Application.LoadComponent` resolves custom-named PRI files instead of hard-coding `resources.pri`.
-
-#### One-step dev setup
-
-```powershell
-pwsh src/PackageIdentity/BuildSparsePackage.ps1 -Platform ARM64 -Configuration Debug -DevRegister
-```
-
-`-DevRegister`:
-1. Generates a dev certificate under `src/PackageIdentity/.user/` (first run only).
-2. Auto-imports that certificate into `CurrentUser\TrustedPeople` and `CurrentUser\Root` so the OS grants sparse identity to AP (without trust, `GetPackageFamilyName` returns `APPMODEL_ERROR_NO_PACKAGE` and LAF unlock silently fails).
-3. Removes any prior registration.
-4. Rewrites the publisher in a temp copy of `AppxManifest.xml` to match the dev cert subject.
-5. Registers via `Add-AppxPackage -Register … -ExternalLocation X:\…\<Platform>\<Config>\WinUI3Apps`.
-
-After registration verify:
-
-```powershell
-$pkg = Get-AppxPackage -Name '*SparseApp*'
-$pkg.PackageFamilyName    # Microsoft.PowerToys.SparseApp_<PublisherId>
-$pkg.PublisherId          # djwsxzxb4ksa8
-$pkg.IsDevelopmentMode    # True
-```
-
-Confirm AP picks up sparse identity at runtime:
-
-```powershell
-& 'ARM64\Debug\WinUI3Apps\PowerToys.AdvancedPaste.exe' --check-phi-silica
-# Exit 0 = Available, 1 = NotReady, 2 = NotSupported
-```
-
-Re-register after rebuilding AP, changing `src/PackageIdentity/AppxManifest.xml`, or switching platforms/configurations by re-running the same command. Unregister with `-Unregister`.
-
-#### Troubleshooting
-
-| Problem | Cause | Fix |
-|---------|-------|-----|
-| `GetPackageFamilyName` returns `APPMODEL_ERROR_NO_PACKAGE` (15700) at runtime; LAF unlock returns `Unavailable` | Dev certificate not trusted (or sparse package not registered) | Re-run `BuildSparsePackage.ps1 -DevRegister` — auto-imports the cert into `TrustedPeople` and `Root`. |
-| `Microsoft.UI.Xaml.dll` crash with `0xC000027B` (class-not-registered) on AP or Settings startup | `<Application>` `Executable` path in `src/PackageIdentity/AppxManifest.xml` does not resolve under the registered `ExternalLocation` (`<Config>\WinUI3Apps\`) | Confirm every `Executable` is relative to `WinUI3Apps\` (per #47177) and the file exists under the build output. |
-| AP launches but never shows a window when triggered via hotkey | Runner's pipe-server wait timed out before AP's cold-start finished bootstrapping WinAppSDK + DI host | Already mitigated by the 15 s pipe timeout in `AdvancedPasteProcessManager.cpp`; warm-start launches connect in well under 1 s. |
-| `XamlParseException` / `ms-appx:///Microsoft.UI.Xaml/Themes/…` not found | WindowsAppSDK Foundation < 2.0.22; MRT can't resolve custom PRI name under sparse identity | Ensure `Microsoft.WindowsAppSDK.Foundation` >= 2.0.22 in `Directory.Packages.props`. |
-
-### How Settings UI checks Phi Silica availability
-
-Settings UI does not have sparse package identity. To check whether Phi Silica is available, it launches Advanced Paste as a short-lived subprocess:
-
-```
-PowerToys.AdvancedPaste.exe --check-phi-silica
-```
-
-`Program.Main` recognizes this flag, calls `PhiSilicaLafHelper.TryUnlock()` + `LanguageModel.GetReadyState()`, prints one of `Available` / `NotReady` / `NotSupported` to stdout, and exits with the matching code (0/1/2). Settings reads stdout with a 10 s wait. Because each call is a fresh process, transient `Unavailable` results are not cached across checks.
-
-### See also
-
-- [Phi Silica local testing & troubleshooting guide](advancedpaste-phisilica-local-testing.md) — layer-by-layer diagnostics for Phi Silica availability
-- [`src/PackageIdentity/readme.md`](/src/PackageIdentity/readme.md) — full sparse package documentation
-- [microsoft/microsoft-ui-xaml#10856](https://github.com/microsoft/microsoft-ui-xaml/issues/10856) — original WinUI sparse-identity PRI bug
-- [microsoft/WindowsAppSDK#6376](https://github.com/microsoft/WindowsAppSDK/pull/6376) — MRT sparse PRI fix (Foundation >= 2.0.22)
+TODO: Add debugging information
 
 ## Settings
 

doc/specs/WinGet Manifest Keyboard Shortcuts schema.md

@@ -87,7 +87,7 @@ Per Application/Package one or more Keyboard manifests can be declared. Every ma
 <details>
  <summary><b>WindowFilter</b> - The filter of window processes to which the shortcuts apply to</summary>
 
- This field declares for which process name the shortcuts should be shown (To rephrase: For which processes the shortcut will have an effect if pressed). The value can be either an exact process executable name, for example `explorer.exe` or `chrome.exe`, or a single asterisk (`*`) to apply to any process. No other wildcard patterns are supported by this specification.
+ This field declares for which process name the shortcuts should be showed (To rephrase: For which processes the shortcut will have an effect if pressed). You can use an asterisk to leave out a certain part. For example `*.PowerToys.*.exe` targets all PowerToys processes and `*` apply to any process.
 
 </details>
 

doc/thirdPartyRunPlugins.md

@@ -79,4 +79,3 @@ Below are community created plugins that target a website or software.  They are
 | [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
 | [PerplexitySearchShortcut](https://github.com/0x6f677548/PowerToys-Run-PerplexitySearchShortcut) | [0x6f677548](https://github.com/0x6f677548) | Search Perplexity |
 | [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
-| [DiskAnalyzer](https://github.com/valley-soft/powertoys-diskanalyzer) | [ValleySoft](https://github.com/valley-soft) | Scan folders, find the largest files, and view drive space usage. |

installer/PowerToysSetup.slnx

@@ -8,6 +8,9 @@
   </Project>
   <Project Path="../src/common/Telemetry/EtwTrace/EtwTrace.vcxproj" Id="8f021b46-362b-485c-bfba-ccf83e820cbd" />
   <Project Path="../src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
+  <Project Path="../src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f">
+    <Build Solution="Debug|ARM64" Project="false" />
+  </Project>
   <Project Path="PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj" Id="b3a354b0-1e54-4b55-a962-fb5af9330c19">
     <Build Solution="Debug|ARM64" Project="false" />
   </Project>

installer/PowerToysSetupVNext/ShortcutGuide.wxs

@@ -4,23 +4,15 @@
 
   <?define ShortcutGuideAssetsFiles=?>
   <?define ShortcutGuideAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ShortcutGuide\?>
-  <?define ShortcutGuideManifestsFiles=?>
-  <?define ShortcutGuideManifestsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ShortcutGuide\Manifests\?>
 
   <Fragment>
     <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="ShortcutGuideAssetsFolder" Name="ShortcutGuide">
-        <Directory Id="ShortcutGuideManifestsFolder" Name="Manifests" />
-      </Directory>
+      <Directory Id="ShortcutGuideAssetsFolder" Name="ShortcutGuide" />
     </DirectoryRef>
     <DirectoryRef Id="ShortcutGuideAssetsFolder" FileSource="$(var.ShortcutGuideAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--ShortcutGuideAssetsFiles_Component_Def-->
     </DirectoryRef>
-    <DirectoryRef Id="ShortcutGuideManifestsFolder" FileSource="$(var.ShortcutGuideManifestsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShortcutGuideManifestsFiles_Component_Def-->
-    </DirectoryRef>
 
     <!-- Shortcut guide -->
     <ComponentGroup Id="ShortcutGuideComponentGroup" >
@@ -30,12 +22,6 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderShortcutGuideAssetsInstallFolder" Directory="ShortcutGuideAssetsFolder" On="uninstall"/>
       </Component>
-      <Component Id="RemoveShortcutGuideManifestsFolder" Guid="F47E2C3A-8D91-4B6F-A2E5-9C8D7F6A1B3E" Directory="ShortcutGuideManifestsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveShortcutGuideManifestsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderShortcutGuideManifestsInstallFolder" Directory="ShortcutGuideManifestsFolder" On="uninstall"/>
-      </Component>
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -28,23 +28,12 @@ Function Generate-FileList() {
 
     $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
 
-    # *.winmd: WinRT metadata for the Windows App SDK AI APIs (Phi Silica, Imaging, etc.). The AI
-    # runtime resolves these from the app directory at runtime, so they must ship with the product.
-    # Without them GetReadyState() reports NotReady and EnsureReadyAsync() fails with
-    # RO_E_METADATA_NAME_NOT_FOUND (0x8000000F). The build already emits them into the app output
-    # (e.g. WinUI3Apps); they were previously dropped here because the harvest didn't include them.
-    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "srt.js", "monacoSpecialLanguages.js", "customTokenThemeRules.js", "*.pri", "*.yml", "*.winmd")
+    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "srt.js", "monacoSpecialLanguages.js", "customTokenThemeRules.js", "*.pri")
 
     # MFC DLLs leak into the output via WindowsAppSDKSelfContained but no PowerToys binary imports them.
     # Verified with dumpbin /dependents across all 2176 binaries — zero consumers.
     $fileExclusionList += @("mfc140.dll", "mfc140u.dll", "mfcm140.dll", "mfcm140u.dll")
 
-    # Microsoft.CommandPalette.Extensions.winmd already has a dedicated WiX component
-    # (Microsoft_CommandPalette_Extensions_winmd in BaseApplications.wxs, placed in WinUI3Apps for
-    # CmdPal's WinRT resolution). Exclude it from the generic *.winmd harvest so it isn't declared
-    # by two components (WIX ICE30 "installed by two different components" breaks ref-counting).
-    $fileExclusionList += @("Microsoft.CommandPalette.Extensions.winmd")
-
     $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
 
     if ($fileDepsJson -eq [string]::Empty) {
@@ -123,8 +112,6 @@ Function Generate-FileComponents() {
 
     foreach ($file in $fileList) {
         $fileTmp = $file -replace "-", "_"
-        $fileTmp = $fileTmp -replace "[^A-Za-z0-9_.]", "_"
-        if ($fileTmp -match "^[^A-Za-z_]") { $fileTmp = "_$fileTmp" }
         $componentDefs +=
     @"
               <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
@@ -410,24 +397,8 @@ Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePat
 ## Plugins
 
 #ShortcutGuide
-# Ensure manifest yml files are in the build output (the Build target's CopyToOutputDirectory
-# may not run reliably under -graph mode in solution builds).
-$sgManifestsSrc = "$PSScriptRoot..\..\..\src\modules\ShortcutGuide\ShortcutGuide.Ui\Assets\ShortcutGuide\Manifests"
-$sgManifestsDst = "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ShortcutGuide\Manifests"
-Write-Host "ShortcutGuide manifests: src=$sgManifestsSrc exists=$(Test-Path $sgManifestsSrc)"
-Write-Host "ShortcutGuide manifests: dst=$sgManifestsDst exists=$(Test-Path $sgManifestsDst)"
-if (Test-Path $sgManifestsSrc) {
-    New-Item -Path $sgManifestsDst -ItemType Directory -Force | Out-Null
-    Copy-Item "$sgManifestsSrc\*.yml" -Destination $sgManifestsDst -Force
-    $copied = (Get-ChildItem "$sgManifestsDst\*.yml" -ErrorAction SilentlyContinue).Count
-    Write-Host "ShortcutGuide manifests: copied $copied yml files to build output"
-} else {
-    Write-Host "WARNING: ShortcutGuide manifest source not found at $sgManifestsSrc"
-}
 Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideAssetsFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideAssetsFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
-Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideManifestsFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ShortcutGuide\Manifests\"
-Generate-FileComponents -fileListName "ShortcutGuideManifestsFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
+Generate-FileComponents -fileListName "ShortcutGuideAssetsFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
 
 #Settings
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"

src/ActionRunner/actionRunner.vcxproj

@@ -14,6 +14,7 @@
   <PropertyGroup Label="Configuration">
     
   </PropertyGroup>
+  <Import Project="$(RepoRoot)deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>

src/PackageIdentity/AppxManifest.xml

@@ -58,16 +58,6 @@
         AppListEntry="none">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.AdvancedPasteUI" Executable="PowerToys.AdvancedPaste.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements
-        DisplayName="PowerToys.AdvancedPaste"
-        Description="PowerToys Advanced Paste"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
-      </uap:VisualElements>
-    </Application>
     <Application Id="PowerToys.CmdPalExtension" Executable="Microsoft.CmdPal.Ext.PowerToys.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.CommandPaletteExtension"

src/PackageIdentity/BuildSparsePackage.ps1

@@ -13,9 +13,7 @@ Param(
     [switch]$Clean,
     [switch]$ForceCert,
     [switch]$NoSign,
-    [switch]$CIBuild,
-    [switch]$DevRegister,
-    [switch]$Unregister
+    [switch]$CIBuild
 )
 
 # PowerToys sparse packaging helper.
@@ -24,19 +22,6 @@ Param(
 
 $ErrorActionPreference = 'Stop'
 
-# Handle -Unregister early exit
-if ($Unregister) {
-    $existing = Get-AppxPackage -Name 'Microsoft.PowerToys.SparseApp' -ErrorAction SilentlyContinue
-    if ($existing) {
-        Write-Host "Removing Microsoft.PowerToys.SparseApp..."
-        $existing | Remove-AppxPackage
-        Write-Host "Done."
-    } else {
-        Write-Host "Microsoft.PowerToys.SparseApp is not registered."
-    }
-    exit 0
-}
-
 $isCIBuild = $false
 if ($CIBuild.IsPresent) {
     $isCIBuild = $true
@@ -436,85 +421,3 @@ $winUI3AppsDir = Join-Path $outDir "WinUI3Apps"
 Write-BuildLog "Register sparse package:" -Level Info
 Write-BuildLog "  Add-AppxPackage -Path `"$msixPath`" -ExternalLocation `"$winUI3AppsDir`"" -Level Warning
 Write-BuildLog "(If already installed and you changed manifest only): Add-AppxPackage -Register `"$manifestPath`" -ExternalLocation `"$winUI3AppsDir`" -ForceApplicationShutdown" -Level Warning
-
-# -DevRegister: automatically register the sparse package for local development
-if ($DevRegister) {
-    Write-BuildLog "`nDev registration requested..." -Level Info
-
-    # Ensure the dev certificate is trusted (CurrentUser\TrustedPeople + CurrentUser\Root).
-    # Without trust, sparse identity lookup silently fails at runtime (GetPackageFamilyName
-    # returns APPMODEL_ERROR_NO_PACKAGE) so LAF unlocks like Phi Silica return Unavailable.
-    if (Test-Path $CertCerFile) {
-        try {
-            $devCert = (Get-PfxCertificate -FilePath $CertCerFile -ErrorAction Stop)
-            $devThumbprint = $devCert.Thumbprint
-            foreach ($store in @('TrustedPeople', 'Root')) {
-                $storePath = "Cert:\CurrentUser\$store"
-                $present = Get-ChildItem $storePath -ErrorAction SilentlyContinue |
-                    Where-Object { $_.Thumbprint -eq $devThumbprint }
-                if (-not $present) {
-                    Write-BuildLog "Importing dev certificate ($devThumbprint) into CurrentUser\$store" -Level Info
-                    Import-Certificate -FilePath $CertCerFile -CertStoreLocation $storePath | Out-Null
-                }
-            }
-        } catch {
-            Write-BuildLog "Failed to import dev certificate into trust stores: $($_.Exception.Message)" -Level Warning
-            Write-BuildLog "Sparse identity may not be granted at runtime; LAF unlocks (e.g., Phi Silica) will fail." -Level Warning
-        }
-    } else {
-        Write-BuildLog "Certificate .cer file not found at $CertCerFile; skipping trust-store import." -Level Warning
-    }
-
-    # Remove existing registration
-    $existing = Get-AppxPackage -Name $script:Config.IdentityName -ErrorAction SilentlyContinue
-    if ($existing) {
-        Write-BuildLog "Removing existing registration..." -Level Info
-        $existing | Remove-AppxPackage
-    }
-
-    # Create a temp manifest with the dev publisher for -Register
-    $devRegDir = Join-Path ([System.IO.Path]::GetTempPath()) "PowerToysSparseDevReg"
-    if (Test-Path $devRegDir) { Remove-Item $devRegDir -Recurse -Force }
-    New-Item -ItemType Directory -Path $devRegDir -Force | Out-Null
-
-    try {
-        Copy-Item $manifestPath (Join-Path $devRegDir 'AppxManifest.xml')
-        $imagesDir = Join-Path $sparseDir 'Images'
-        if (Test-Path $imagesDir) {
-            Copy-Item $imagesDir (Join-Path $devRegDir 'Images') -Recurse
-        }
-
-        $devManifest = Join-Path $devRegDir 'AppxManifest.xml'
-        [xml]$devXml = Get-Content $devManifest -Raw
-        $devIdentity = $devXml.Package.Identity
-
-        if ($devIdentity.Publisher -ne $script:Config.CertSubject) {
-            Write-BuildLog "Rewriting publisher for dev registration" -Level Info
-            $devIdentity.SetAttribute('Publisher', $script:Config.CertSubject)
-            $devXml.Save($devManifest)
-        }
-
-        Write-BuildLog "Registering with ExternalLocation: $winUI3AppsDir" -Level Info
-        Add-AppxPackage -Register $devManifest -ExternalLocation $winUI3AppsDir
-
-        $pkg = Get-AppxPackage -Name $script:Config.IdentityName -ErrorAction SilentlyContinue
-        if ($pkg) {
-            Write-BuildLog "Dev registration successful:" -Level Success
-            Write-BuildLog "  Publisher:         $($pkg.Publisher)" -Level Info
-            Write-BuildLog "  PublisherId:       $($pkg.PublisherId)" -Level Info
-            Write-BuildLog "  IsDevelopmentMode: $($pkg.IsDevelopmentMode)" -Level Info
-            Write-BuildLog "  InstallLocation:   $($pkg.InstallLocation)" -Level Info
-
-            if ($pkg.PublisherId -ne 'djwsxzxb4ksa8') {
-                Write-BuildLog "PublisherId mismatch! Expected 'djwsxzxb4ksa8', got '$($pkg.PublisherId)'. LAF unlock will fail." -Level Warning
-            }
-        } else {
-            Write-BuildLog "Dev registration failed — package not found." -Level Error
-            exit 1
-        }
-    } finally {
-        if (Test-Path $devRegDir) {
-            Remove-Item $devRegDir -Recurse -Force -ErrorAction SilentlyContinue
-        }
-    }
-}

src/PhiSilicaLaf.props

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!-- Phi Silica Limited Access Feature credentials.
-         Local dev defaults below; overridden by /p: in release pipelines. -->
-    <PhiSilicaLafToken Condition="'$(PhiSilicaLafToken)'==''">RmToMMYJHZkQSrKP5lWesA==</PhiSilicaLafToken>
-    <PhiSilicaLafAttestation Condition="'$(PhiSilicaLafAttestation)'==''">djwsxzxb4ksa8</PhiSilicaLafAttestation>
-  </PropertyGroup>
-</Project>

src/Update/PowerToys.Update.cpp

@@ -14,8 +14,6 @@
 #include <common/updating/updating.h>
 #include <common/updating/updateState.h>
 #include <common/updating/installer.h>
-#include <common/updating/configBackup.h>
-#include <common/updating/updateLifecycle.h>
 
 #include <common/utils/elevation.h>
 #include <common/utils/HttpClient.h>
@@ -23,8 +21,6 @@
 #include <common/utils/resources.h>
 #include <common/utils/timeutil.h>
 
-#include <wil/resource.h>
-
 #include <common/SettingsAPI/settings_helpers.h>
 
 #include <common/logger/logger.h>
@@ -40,59 +36,17 @@ using namespace cmdArg;
 
 namespace fs = std::filesystem;
 
-void CleanupStaleTempUpdaters()
-{
-    // Remove orphaned PowerToys.Update.*.exe files from previous runs
-    try
-    {
-        std::error_code ec;
-        const auto tempDir = fs::temp_directory_path();
-        for (const auto& entry : fs::directory_iterator(tempDir, ec))
-        {
-            if (ec)
-            {
-                break;
-            }
-
-            if (!entry.is_regular_file())
-            {
-                continue;
-            }
-
-            const auto filename = entry.path().filename().wstring();
-            if (filename.starts_with(L"PowerToys.Update.") && filename.ends_with(L".exe"))
-            {
-                // Skip our own file (current PID)
-                const auto ownFilename = L"PowerToys.Update." + std::to_wstring(GetCurrentProcessId()) + L".exe";
-                if (filename == ownFilename)
-                {
-                    continue;
-                }
-
-                fs::remove(entry.path(), ec);
-                // Failure to delete is expected if another updater is still running
-            }
-        }
-    }
-    catch (...)
-    {
-        // Best-effort cleanup; don't block the update
-    }
-}
-
 std::optional<fs::path> CopySelfToTempDir()
 {
-    CleanupStaleTempUpdaters();
-
     std::error_code error;
-    auto dst_path = fs::temp_directory_path() / (L"PowerToys.Update." + std::to_wstring(GetCurrentProcessId()) + L".exe");
+    auto dst_path = fs::temp_directory_path() / "PowerToys.Update.exe";
     fs::copy_file(get_module_filename(), dst_path, fs::copy_options::overwrite_existing, error);
     if (error)
     {
         return std::nullopt;
     }
 
-    return dst_path;
+    return std::move(dst_path);
 }
 
 std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
@@ -103,9 +57,34 @@ std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
 
     auto state = UpdateState::read();
 
-    // Handle readyToInstall first — the installer is already on disk,
-    // so we don't need a GitHub API call (which may fail if offline).
-    if (state.state == UpdateState::readyToInstall)
+    const auto new_version_info = std::move(get_github_version_info_async()).get();
+    if (std::holds_alternative<version_up_to_date>(*new_version_info))
+    {
+        isUpToDate = true;
+        Logger::error("Invoked with -update_now argument, but no update was available");
+        return std::nullopt;
+    }
+
+    if (state.state == UpdateState::readyToDownload || state.state == UpdateState::errorDownloading)
+    {
+        if (!new_version_info)
+        {
+            Logger::error(L"Couldn't obtain github version info: {}", new_version_info.error());
+            return std::nullopt;
+        }
+
+        // Cleanup old updates before downloading the latest
+        updating::cleanup_updates();
+
+        auto downloaded_installer = std::move(download_new_version_async(std::get<new_version_download_info>(*new_version_info))).get();
+        if (!downloaded_installer)
+        {
+            Logger::error("Couldn't download new installer");
+        }
+
+        return downloaded_installer;
+    }
+    else if (state.state == UpdateState::readyToInstall)
     {
         fs::path installer{ get_pending_updates_path() / state.downloadedInstallerFilename };
         if (fs::is_regular_file(installer))
@@ -118,44 +97,12 @@ std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
             return std::nullopt;
         }
     }
-
-    if (state.state == UpdateState::upToDate)
+    else if (state.state == UpdateState::upToDate)
     {
         isUpToDate = true;
         return std::nullopt;
     }
 
-    const auto new_version_info = std::move(get_github_version_info_async()).get();
-
-    // Check for error BEFORE dereferencing — the old code crashed here
-    // when GitHub API was unreachable (new_version_info held an error string).
-    if (!new_version_info)
-    {
-        Logger::error(L"Couldn't obtain github version info: {}", new_version_info.error());
-        return std::nullopt;
-    }
-
-    if (std::holds_alternative<version_up_to_date>(*new_version_info))
-    {
-        isUpToDate = true;
-        Logger::error("Invoked with -update_now argument, but no update was available");
-        return std::nullopt;
-    }
-
-    if (state.state == UpdateState::readyToDownload || state.state == UpdateState::errorDownloading)
-    {
-        // Cleanup old updates before downloading the latest
-        updating::cleanup_updates();
-
-        auto downloaded_installer = std::move(download_new_version_async(std::get<new_version_download_info>(*new_version_info))).get();
-        if (!downloaded_installer)
-        {
-            Logger::error("Couldn't download new installer");
-        }
-
-        return downloaded_installer;
-    }
-
     Logger::error("Invoked with -update_now argument, but update state was invalid");
     return std::nullopt;
 }
@@ -169,32 +116,13 @@ bool InstallNewVersionStage1(fs::path installer)
 
         if (pt_main_window != nullptr)
         {
-            // Get the process that owns the tray window so we can wait for it to exit
-            DWORD ptProcessId = 0;
-            GetWindowThreadProcessId(pt_main_window, &ptProcessId);
-
-            // Use SendMessageTimeoutW to avoid blocking indefinitely if the
-            // tray window thread is hung or unresponsive.
-            DWORD_PTR result = 0;
-            SendMessageTimeoutW(pt_main_window, WM_CLOSE, 0, 0, SMTO_ABORTIFHUNG, 5000, &result);
-
-            // Wait for PT to actually exit before launching installer.
-            // Without this, the installer may find PT files locked.
-            if (ptProcessId != 0)
-            {
-                wil::unique_handle ptProcess{ OpenProcess(SYNCHRONIZE, FALSE, ptProcessId) };
-                if (ptProcess)
-                {
-                    WaitForSingleObject(ptProcess.get(), 10000); // 10 second timeout
-                }
-            }
+            SendMessageW(pt_main_window, WM_CLOSE, 0, 0);
         }
 
-        // Pass the install directory so Stage 2 can relaunch PowerToys after install
-        const std::wstring installDir = get_module_folderpath();
-
-        std::wstring arguments = updating::BuildStage2Arguments(
-            UPDATE_NOW_LAUNCH_STAGE2, installer, fs::path(installDir));
+        std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
+        arguments += L" \"";
+        arguments += installer.c_str();
+        arguments += L"\"";
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
         sei.lpFile = copy_in_temp->c_str();
@@ -262,16 +190,9 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     LPWSTR* args = CommandLineToArgvW(GetCommandLineW(), &nArgs);
     if (!args || nArgs < 2)
     {
-        if (args)
-        {
-            LocalFree(args);
-        }
         return 1;
     }
 
-    // D3 fix: ensure args is freed on all exit paths
-    auto freeArgs = wil::scope_exit([&] { LocalFree(args); });
-
     std::wstring_view action{ args[1] };
 
     std::filesystem::path logFilePath(PTSettingsHelper::get_root_save_folder_location());
@@ -280,11 +201,6 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 
     if (action == UPDATE_NOW_LAUNCH_STAGE1)
     {
-        // Backup config files before the update to protect against corruption
-        Logger::info("Backing up config files before update");
-        auto backupResult = updating::BackupConfigFiles(fs::path(PTSettingsHelper::get_root_save_folder_location()));
-        Logger::info("Config backup complete: {} files backed up, {} errors", backupResult.filesBackedUp, backupResult.errors);
-
         bool isUpToDate = false;
         auto installerPath = ObtainInstaller(isUpToDate);
         bool failed = !installerPath.has_value();
@@ -301,12 +217,6 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     }
     else if (action == UPDATE_NOW_LAUNCH_STAGE2)
     {
-        if (nArgs < 3)
-        {
-            Logger::error("Stage 2 invoked without installer path argument");
-            return 1;
-        }
-
         using namespace std::string_view_literals;
         const bool failed = !InstallNewVersionStage2(args[2]);
         if (failed)
@@ -317,39 +227,6 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
                 state.state = UpdateState::errorDownloading;
             });
         }
-
-        // Always check for corrupted configs after Stage 2, regardless
-        // of install success/failure. A failed install may still corrupt configs.
-        Logger::info("Checking for corrupted config files after update");
-        auto restoreResult = updating::RestoreCorruptedConfigs(fs::path(PTSettingsHelper::get_root_save_folder_location()));
-        Logger::info("Config restore check complete: {}/{} files restored, {} errors",
-                     restoreResult.filesRestored, restoreResult.filesChecked, restoreResult.errors);
-
-        if (!failed)
-        {
-            // Relaunch PowerToys from the install directory
-            if (updating::CanRelaunchAfterUpdate(nArgs))
-            {
-                std::wstring ptExePath = updating::BuildPowerToysExePath(args[3]);
-
-                Logger::info(L"Relaunching PowerToys after update: {}", ptExePath);
-
-                SHELLEXECUTEINFOW sei{ sizeof(sei) };
-                sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
-                sei.lpFile = ptExePath.c_str();
-                sei.nShow = SW_SHOWNORMAL;
-                sei.lpParameters = UPDATE_REPORT_SUCCESS;
-
-                if (!ShellExecuteExW(&sei))
-                {
-                    Logger::error(L"Failed to relaunch PowerToys after update");
-                }
-            }
-            else
-            {
-                Logger::warn("Install directory not provided to Stage 2 - cannot relaunch PowerToys");
-            }
-        }
         return failed;
     }
 

src/Update/PowerToys.Update.vcxproj

@@ -14,6 +14,7 @@
   <PropertyGroup Label="Configuration">
     
   </PropertyGroup>
+  <Import Project="$(RepoRoot)deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -73,8 +73,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
-      <!-- TODO: _SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS: suppress VS 2026 STL hard error for <experimental/coroutine> until the code is ported to <coroutine> -->
-      <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;_SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
     </ClCompile>

src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj

@@ -27,7 +27,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp23</LanguageStandard>
       <PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

src/common/logger/logger.vcxproj

@@ -70,6 +70,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\logging\logging.vcxproj">
+      <Project>{7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\version\version.vcxproj">
       <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
     </ProjectReference>

src/common/updating/UnitTests/UpdatingTests.cpp

@@ -1,679 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#include "pch.h"
-
-#include <algorithm>
-#include <filesystem>
-#include <fstream>
-#include <iterator>
-#include <string>
-#include <vector>
-
-#include <common/updating/configBackup.h>
-#include <common/updating/updateLifecycle.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace fs = std::filesystem;
-
-namespace UpdatingUnitTests
-{
-    // Helper to create a temp directory for test isolation.
-    // Each instance gets a unique subdirectory to prevent test interference.
-    class TempDir
-    {
-    public:
-        TempDir()
-        {
-            wchar_t tempPath[MAX_PATH + 1];
-            GetTempPathW(MAX_PATH, tempPath);
-            static std::atomic<int> counter{0};
-            m_path = fs::path(tempPath) / (L"PowerToysUpdateTests_" + std::to_wstring(counter++));
-
-            // Ensure clean state
-            std::error_code ec;
-            fs::remove_all(m_path, ec);
-            fs::create_directories(m_path, ec);
-        }
-
-        ~TempDir()
-        {
-            std::error_code ec;
-            fs::remove_all(m_path, ec);
-        }
-
-        const fs::path& path() const { return m_path; }
-
-        // Write a file with the given content
-        void WriteFile(const fs::path& relativePath, const std::string& content)
-        {
-            auto fullPath = m_path / relativePath;
-            fs::create_directories(fullPath.parent_path());
-            std::ofstream file(fullPath, std::ios::binary);
-            file.write(content.data(), content.size());
-        }
-
-        // Write a file with raw bytes (including null bytes for corruption testing)
-        void WriteFileBytes(const fs::path& relativePath, const std::vector<char>& bytes)
-        {
-            auto fullPath = m_path / relativePath;
-            fs::create_directories(fullPath.parent_path());
-            std::ofstream file(fullPath, std::ios::binary);
-            file.write(bytes.data(), bytes.size());
-        }
-
-        // Read file content as string
-        std::string ReadFile(const fs::path& relativePath)
-        {
-            auto fullPath = m_path / relativePath;
-            std::ifstream file(fullPath, std::ios::binary);
-            return std::string(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>());
-        }
-
-        bool FileExists(const fs::path& relativePath)
-        {
-            return fs::exists(m_path / relativePath);
-        }
-
-    private:
-        fs::path m_path;
-    };
-
-    TEST_CLASS(IsJsonFileCorruptedTests)
-    {
-    public:
-        // Tests IsJsonFileCorrupted: valid JSON with no null bytes returns false.
-        // Covers: configBackup.h IsJsonFileCorrupted — happy path, full file scan.
-        TEST_METHOD(CleanJsonFileIsNotCorrupted)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark","startup":true})");
-
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"settings.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: zero-length file returns false (empty is not corrupted).
-        // Covers: configBackup.h IsJsonFileCorrupted — file.read returns 0 bytes immediately.
-        TEST_METHOD(EmptyFileIsNotCorrupted)
-        {
-            TempDir dir;
-            dir.WriteFile(L"empty.json", "");
-
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"empty.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: file containing embedded null bytes returns true.
-        // Covers: configBackup.h IsJsonFileCorrupted — null byte detection within buffer.
-        TEST_METHOD(FileWithNullBytesIsCorrupted)
-        {
-            TempDir dir;
-            std::vector<char> corrupted = { '{', '"', 'a', '"', ':', '\0', '\0', '\0', '}' };
-            dir.WriteFileBytes(L"corrupted.json", corrupted);
-
-            Assert::IsTrue(updating::IsJsonFileCorrupted(dir.path() / L"corrupted.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: file entirely filled with 0x00 bytes returns true.
-        // Reproduces the exact bug from #46179 where installer zeroed out JSON files.
-        // Covers: configBackup.h IsJsonFileCorrupted — first byte is null.
-        TEST_METHOD(FileFilledWithNullBytesIsCorrupted)
-        {
-            TempDir dir;
-            std::vector<char> allNulls(1024, '\0');
-            dir.WriteFileBytes(L"workspaces.json", allNulls);
-
-            Assert::IsTrue(updating::IsJsonFileCorrupted(dir.path() / L"workspaces.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: path that does not exist returns false.
-        // Covers: configBackup.h IsJsonFileCorrupted — file.is_open() check.
-        TEST_METHOD(NonExistentFileIsNotCorrupted)
-        {
-            TempDir dir;
-
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"missing.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: file larger than the 4096-byte read chunk
-        // with no null bytes returns false.
-        // Covers: configBackup.h IsJsonFileCorrupted — multi-chunk while loop.
-        TEST_METHOD(LargeCleanFileIsNotCorrupted)
-        {
-            TempDir dir;
-            std::string largeContent(8192, 'x');
-            dir.WriteFile(L"large.json", largeContent);
-
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"large.json"));
-        }
-
-        // Tests IsJsonFileCorrupted: null byte placed after the first 4096-byte
-        // chunk boundary is still detected.
-        // Covers: configBackup.h IsJsonFileCorrupted — second chunk scan.
-        TEST_METHOD(NullByteAtEndOfLargeFileIsDetected)
-        {
-            TempDir dir;
-            std::string content(5000, 'x');
-            content[4999] = '\0';
-            std::vector<char> bytes(content.begin(), content.end());
-            dir.WriteFileBytes(L"sneaky.json", bytes);
-
-            Assert::IsTrue(updating::IsJsonFileCorrupted(dir.path() / L"sneaky.json"));
-        }
-    };
-
-    TEST_CLASS(BackupConfigFilesTests)
-    {
-    public:
-        // Tests BackupConfigFiles: root-level .json files are copied to ConfigBackup.
-        // Covers: configBackup.h BackupConfigFiles — root directory_iterator,
-        //         is_regular_file && extension == ".json" branch.
-        // Setup: Two root-level JSON files.
-        TEST_METHOD(BackupCopiesRootJsonFiles)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-            dir.WriteFile(L"UpdateState.json", R"({"state":0})");
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\settings.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\UpdateState.json"));
-            Assert::AreEqual(std::string(R"({"theme":"dark"})"), dir.ReadFile(L"ConfigBackup\\settings.json"));
-        }
-
-        // Tests BackupConfigFiles: .json files inside module subdirectories are
-        // copied to ConfigBackup/<module>/.
-        // Covers: configBackup.h BackupConfigFiles — is_directory branch,
-        //         module directory_iterator with extension filter.
-        // Setup: Root JSON + two module directories with JSON files.
-        TEST_METHOD(BackupCopiesModuleJsonFiles)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-            dir.WriteFile(L"FancyZones\\settings.json", R"({"zones":[]})");
-            dir.WriteFile(L"Workspaces\\workspaces.json", R"({"workspaces":[]})");
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\FancyZones\\settings.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\Workspaces\\workspaces.json"));
-            Assert::AreEqual(std::string(R"({"zones":[]})"),
-                dir.ReadFile(L"ConfigBackup\\FancyZones\\settings.json"));
-        }
-
-        // Tests BackupConfigFiles: non-.json files at root level are not copied.
-        // Covers: configBackup.h BackupConfigFiles — extension filter excludes .log.
-        // Setup: One JSON file + one .log file at root.
-        TEST_METHOD(BackupSkipsNonJsonFiles)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-            dir.WriteFile(L"debug.log", "log data");
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\settings.json"));
-            Assert::IsFalse(dir.FileExists(L"ConfigBackup\\debug.log"));
-        }
-
-        // Tests BackupConfigFiles: the "Updates" directory is explicitly skipped.
-        // Covers: configBackup.h BackupConfigFiles — dirName == L"Updates" continue.
-        // Setup: Root JSON + Updates directory containing a file.
-        TEST_METHOD(BackupSkipsUpdatesDirectory)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-            dir.WriteFile(L"Updates\\installer.exe", "fake exe");
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsFalse(dir.FileExists(L"ConfigBackup\\Updates"));
-        }
-
-        // Tests BackupConfigFiles: running backup twice overwrites the previous
-        // backup with current file content.
-        // Covers: configBackup.h BackupConfigFiles — fs::remove_all(backupDir) +
-        //         copy_options::overwrite_existing.
-        // Setup: Backup, modify original, backup again.
-        TEST_METHOD(BackupOverwritesPreviousBackup)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"version":1})");
-            updating::BackupConfigFiles(dir.path());
-
-            // Update the original
-            dir.WriteFile(L"settings.json", R"({"version":2})");
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::AreEqual(std::string(R"({"version":2})"), dir.ReadFile(L"ConfigBackup\\settings.json"));
-        }
-
-        // Tests BackupConfigFiles: non-.json files inside module subdirectories
-        // (e.g., FancyZones/zones.dat) should NOT be backed up.
-        // Covers: configBackup.h BackupConfigFiles — extension filter in module loop.
-        TEST_METHOD(BackupSkipsNonJsonFilesInModuleDirs)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({})");
-            dir.WriteFile(L"FancyZones\\settings.json", R"({"zones":[]})");
-            dir.WriteFile(L"FancyZones\\zones.dat", "binary data");
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\FancyZones\\settings.json"));
-            Assert::IsFalse(dir.FileExists(L"ConfigBackup\\FancyZones\\zones.dat"));
-        }
-
-        // Tests BackupConfigFiles: empty root directory with no files produces
-        // an empty ConfigBackup dir without errors.
-        // Covers: configBackup.h BackupConfigFiles — empty directory_iterator.
-        TEST_METHOD(BackupEmptyRootDirSucceeds)
-        {
-            TempDir dir;
-            // Root dir exists but has no files
-
-            updating::BackupConfigFiles(dir.path());
-
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup"));
-        }
-    };
-
-    TEST_CLASS(RestoreCorruptedConfigsTests)
-    {
-    public:
-        // Tests RestoreCorruptedConfigs: corrupted root-level JSON file is restored
-        // from the good backup copy.
-        // Covers: configBackup.h RestoreCorruptedConfigs — root file restore branch,
-        //         fs::exists + IsJsonFileCorrupted + backup integrity check.
-        // Setup: Good file -> backup -> corrupt original -> restore.
-        TEST_METHOD(RestoreFixesCorruptedRootFile)
-        {
-            TempDir dir;
-            const std::string goodContent = R"({"theme":"dark"})";
-            dir.WriteFile(L"settings.json", goodContent);
-
-            // Backup
-            updating::BackupConfigFiles(dir.path());
-
-            // Corrupt the original
-            std::vector<char> corrupted(goodContent.size(), '\0');
-            dir.WriteFileBytes(L"settings.json", corrupted);
-            Assert::IsTrue(updating::IsJsonFileCorrupted(dir.path() / L"settings.json"));
-
-            // Restore
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"settings.json"));
-            Assert::AreEqual(goodContent, dir.ReadFile(L"settings.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: corrupted module-level JSON file is restored
-        // from the good backup copy.
-        // Covers: configBackup.h RestoreCorruptedConfigs — module directory branch,
-        //         moduleBackupEntry restore with integrity check.
-        // Setup: Module file + root file -> backup -> corrupt module file -> restore.
-        TEST_METHOD(RestoreFixesCorruptedModuleFile)
-        {
-            TempDir dir;
-            const std::string goodContent = R"({"workspaces":[]})";
-            dir.WriteFile(L"Workspaces\\workspaces.json", goodContent);
-            dir.WriteFile(L"settings.json", R"({})");
-
-            updating::BackupConfigFiles(dir.path());
-
-            // Corrupt the module file
-            std::vector<char> corrupted(goodContent.size(), '\0');
-            dir.WriteFileBytes(L"Workspaces\\workspaces.json", corrupted);
-
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            Assert::AreEqual(goodContent, dir.ReadFile(L"Workspaces\\workspaces.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: clean (non-corrupted) files are NOT
-        // overwritten by backup — preserves user changes made after backup.
-        // Covers: configBackup.h RestoreCorruptedConfigs — IsJsonFileCorrupted
-        //         returns false, copy_file is skipped.
-        // Setup: File -> backup -> modify (but keep valid) -> restore.
-        TEST_METHOD(RestoreLeavesCleanFilesUntouched)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"version":1})");
-
-            updating::BackupConfigFiles(dir.path());
-
-            // Modify original (but keep it clean JSON)
-            dir.WriteFile(L"settings.json", R"({"version":2})");
-
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // Should NOT have been restored since it's not corrupted
-            Assert::AreEqual(std::string(R"({"version":2})"), dir.ReadFile(L"settings.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: when no ConfigBackup directory exists,
-        // restore silently does nothing (no crash, no data loss).
-        // Covers: configBackup.h RestoreCorruptedConfigs — !fs::exists(backupDir)
-        //         early return.
-        // Setup: File with no prior backup.
-        TEST_METHOD(RestoreHandlesMissingBackupDirectory)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-
-            // No backup was created - restore should silently do nothing
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            Assert::AreEqual(std::string(R"({"theme":"dark"})"), dir.ReadFile(L"settings.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: end-to-end scenario with multiple modules,
-        // some corrupted and some clean, verifying selective restore.
-        // Covers: configBackup.h RestoreCorruptedConfigs — both root and module
-        //         branches, selective restore based on corruption status.
-        // Setup: 4 modules -> backup -> corrupt 2 -> restore -> verify all 4.
-        TEST_METHOD(FullBackupAndRestoreRoundTrip)
-        {
-            TempDir dir;
-
-            // Set up a realistic config structure
-            dir.WriteFile(L"settings.json", R"({"startup":true,"theme":"dark"})");
-            dir.WriteFile(L"FancyZones\\settings.json", R"({"zones":[{"id":1}]})");
-            dir.WriteFile(L"Workspaces\\workspaces.json", R"({"workspaces":[{"name":"dev"}]})");
-            dir.WriteFile(L"KeyboardManager\\default.json", R"({"remaps":[]})");
-
-            // Backup
-            updating::BackupConfigFiles(dir.path());
-
-            // Corrupt some files (simulating #46179 scenario)
-            dir.WriteFileBytes(L"Workspaces\\workspaces.json", std::vector<char>(100, '\0'));
-            dir.WriteFileBytes(L"settings.json", std::vector<char>(50, '\0'));
-            // Leave FancyZones and KBM clean
-
-            // Restore
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // Corrupted files should be restored
-            Assert::AreEqual(std::string(R"({"startup":true,"theme":"dark"})"), dir.ReadFile(L"settings.json"));
-            Assert::AreEqual(std::string(R"({"workspaces":[{"name":"dev"}]})"), dir.ReadFile(L"Workspaces\\workspaces.json"));
-
-            // Clean files should be unchanged
-            Assert::AreEqual(std::string(R"({"zones":[{"id":1}]})"), dir.ReadFile(L"FancyZones\\settings.json"));
-            Assert::AreEqual(std::string(R"({"remaps":[]})"), dir.ReadFile(L"KeyboardManager\\default.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: when the original file has been deleted
-        // (not corrupted), restore should NOT recreate it from backup. The installer
-        // may have intentionally removed obsolete config files.
-        // Covers: configBackup.h RestoreCorruptedConfigs — fs::exists guard.
-        TEST_METHOD(RestoreSkipsDeletedOriginals)
-        {
-            TempDir dir;
-            dir.WriteFile(L"obsolete.json", R"({"old":true})");
-            updating::BackupConfigFiles(dir.path());
-
-            // Installer deletes the file
-            std::error_code ec;
-            fs::remove(dir.path() / L"obsolete.json", ec);
-
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // Should NOT be recreated
-            Assert::IsFalse(dir.FileExists(L"obsolete.json"));
-        }
-
-        // Tests RestoreCorruptedConfigs: when the backup file itself is corrupted
-        // (e.g., disk error during backup), restore should NOT copy corrupted
-        // backup over the original — that would make things worse.
-        // Covers: configBackup.h RestoreCorruptedConfigs — backup integrity check (B2 fix).
-        TEST_METHOD(RestoreSkipsCorruptedBackup)
-        {
-            TempDir dir;
-            dir.WriteFile(L"settings.json", R"({"theme":"dark"})");
-            updating::BackupConfigFiles(dir.path());
-
-            // Corrupt BOTH the original AND the backup
-            std::vector<char> nulls(50, '\0');
-            dir.WriteFileBytes(L"settings.json", nulls);
-            dir.WriteFileBytes(L"ConfigBackup\\settings.json", nulls);
-
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // Original should still be corrupted — we don't restore from bad backup
-            Assert::IsTrue(updating::IsJsonFileCorrupted(dir.path() / L"settings.json"));
-        }
-    };
-
-    // Simulates what actually happens during a PowerToys upgrade:
-    // 1. User has settings from normal use
-    // 2. Updater backs up before install (Stage 1)
-    // 3. Installer runs and corrupts some files (simulated)
-    // 4. Updater restores corrupted files (Stage 2)
-    // 5. PT relaunches and finds working configs
-    TEST_CLASS(UpgradeSimulationTests)
-    {
-    public:
-        // Tests full upgrade simulation: backup -> installer corrupts files -> restore.
-        // Verifies that corrupted files are restored and clean files are untouched.
-        // Covers: configBackup.h BackupConfigFiles + RestoreCorruptedConfigs —
-        //         end-to-end with 5 modules, 2 corrupted, 3 clean.
-        // Setup: Realistic config structure with multiple modules.
-        TEST_METHOD(SimulateUpgradeWithCorruption)
-        {
-            TempDir dir;
-
-            // === User's real config state before upgrade ===
-            dir.WriteFile(L"settings.json",
-                R"({"startup":true,"theme":"dark","run_elevated":false,"download_updates_automatically":true})");
-            dir.WriteFile(L"FancyZones\\settings.json",
-                R"({"zones":[{"id":1,"rect":{"x":0,"y":0,"w":960,"h":1080}}]})");
-            dir.WriteFile(L"Workspaces\\workspaces.json",
-                R"({"workspaces":[{"name":"dev","apps":["code","terminal"]}]})");
-            dir.WriteFile(L"KeyboardManager\\default.json",
-                R"({"remapKeys":{"inProcess":[{"original":"0x41","new":"0x42"}]}})");
-            dir.WriteFile(L"MouseWithoutBorders\\settings.json",
-                R"({"machineKey":"abc123","connectToAll":true})");
-
-            // Non-JSON files that should be left alone
-            dir.WriteFile(L"update.log", "2026-04-11 update started");
-
-            // === Stage 1: Backup before killing PT ===
-            updating::BackupConfigFiles(dir.path());
-
-            // Verify backup was created correctly
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\settings.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\FancyZones\\settings.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\Workspaces\\workspaces.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\KeyboardManager\\default.json"));
-            Assert::IsTrue(dir.FileExists(L"ConfigBackup\\MouseWithoutBorders\\settings.json"));
-            Assert::IsFalse(dir.FileExists(L"ConfigBackup\\update.log"));
-
-            // === Installer runs: some files get corrupted (the #46179 scenario) ===
-            // Workspaces JSON filled with null bytes
-            dir.WriteFileBytes(L"Workspaces\\workspaces.json", std::vector<char>(512, '\0'));
-            // Main settings partially corrupted (null bytes injected)
-            std::vector<char> partialCorrupt = { '{', '"', 's', '\0', '\0', '\0', '\0', '}' };
-            dir.WriteFileBytes(L"settings.json", partialCorrupt);
-
-            // FancyZones, KBM, and MWB survive the install fine
-            // (this is realistic - not all files get corrupted)
-
-            // === Stage 2: Restore after install completes ===
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // === Verify: PT relaunches and finds working configs ===
-
-            // Corrupted files should be restored from backup
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"settings.json"));
-            Assert::IsFalse(updating::IsJsonFileCorrupted(dir.path() / L"Workspaces\\workspaces.json"));
-            Assert::AreEqual(
-                std::string(R"({"startup":true,"theme":"dark","run_elevated":false,"download_updates_automatically":true})"),
-                dir.ReadFile(L"settings.json"));
-            Assert::AreEqual(
-                std::string(R"({"workspaces":[{"name":"dev","apps":["code","terminal"]}]})"),
-                dir.ReadFile(L"Workspaces\\workspaces.json"));
-
-            // Clean files should be untouched (not overwritten with backup)
-            Assert::AreEqual(
-                std::string(R"({"zones":[{"id":1,"rect":{"x":0,"y":0,"w":960,"h":1080}}]})"),
-                dir.ReadFile(L"FancyZones\\settings.json"));
-            Assert::AreEqual(
-                std::string(R"({"remapKeys":{"inProcess":[{"original":"0x41","new":"0x42"}]}})"),
-                dir.ReadFile(L"KeyboardManager\\default.json"));
-            Assert::AreEqual(
-                std::string(R"({"machineKey":"abc123","connectToAll":true})"),
-                dir.ReadFile(L"MouseWithoutBorders\\settings.json"));
-        }
-
-        // Tests upgrade from an old version that has fewer modules than the new version.
-        // Verifies that new module configs (created by the installer) are not touched
-        // by restore, while corrupted old configs are restored.
-        // Covers: configBackup.h RestoreCorruptedConfigs — module dir in root that
-        //         has no corresponding backup entry.
-        // Setup: Old version with 1 module -> backup -> new installer adds module -> corrupt old -> restore.
-        TEST_METHOD(SimulateUpgradeFromVeryOldVersion)
-        {
-            TempDir dir;
-
-            // Old version had fewer modules - only settings.json
-            dir.WriteFile(L"settings.json", R"({"theme":"dark","powertoys_version":"v0.60.0"})");
-
-            // Backup
-            updating::BackupConfigFiles(dir.path());
-
-            // New installer creates new module dirs that didn't exist before
-            dir.WriteFile(L"NewModule\\settings.json", R"({"enabled":true})");
-
-            // Old settings get corrupted during upgrade
-            dir.WriteFileBytes(L"settings.json", std::vector<char>(100, '\0'));
-
-            // Restore
-            updating::RestoreCorruptedConfigs(dir.path());
-
-            // Old settings restored
-            Assert::AreEqual(
-                std::string(R"({"theme":"dark","powertoys_version":"v0.60.0"})"),
-                dir.ReadFile(L"settings.json"));
-
-            // New module settings untouched (no backup existed for them)
-            Assert::AreEqual(
-                std::string(R"({"enabled":true})"),
-                dir.ReadFile(L"NewModule\\settings.json"));
-        }
-    };
-
-    // Tests for the update lifecycle: argument passing between Stage 1 and Stage 2,
-    // relaunch path construction, and the handoff that was broken in #42004/#43011/#44071.
-    TEST_CLASS(UpdateLifecycleTests)
-    {
-    public:
-        // Tests BuildStage2Arguments: output contains the stage 2 flag, installer path,
-        // and install directory — all three components needed for Stage 2.
-        // Covers: updateLifecycle.h BuildStage2Arguments — concatenation logic.
-        // Setup: Typical paths with spaces (Program Files).
-        TEST_METHOD(BuildStage2ArgumentsContainsInstallerAndInstallDir)
-        {
-            const auto args = updating::BuildStage2Arguments(
-                L"-update_now_stage_2",
-                L"C:\\Users\\test\\AppData\\Local\\PowerToys\\Updates\\powertoyssetup-x64.exe",
-                L"C:\\Program Files\\PowerToys");
-
-            // Must contain the stage 2 flag
-            Assert::IsTrue(args.find(L"-update_now_stage_2") != std::wstring::npos);
-            // Must contain the installer path (quoted)
-            Assert::IsTrue(args.find(L"powertoyssetup-x64.exe") != std::wstring::npos);
-            // Must contain the install directory (quoted) — this was MISSING before our fix
-            Assert::IsTrue(args.find(L"C:\\Program Files\\PowerToys") != std::wstring::npos);
-        }
-
-        // Tests BuildStage2Arguments: both paths are wrapped in double quotes to
-        // survive CommandLineToArgvW parsing when paths contain spaces.
-        // Covers: updateLifecycle.h BuildStage2Arguments — quote wrapping.
-        // Setup: Installer path with spaces.
-        TEST_METHOD(BuildStage2ArgumentsQuotesBothPaths)
-        {
-            const auto args = updating::BuildStage2Arguments(
-                L"-update_now_stage_2",
-                L"C:\\path with spaces\\installer.exe",
-                L"C:\\Program Files\\PowerToys");
-
-            // Count quotes — should have 4 (open/close for each path)
-            size_t quoteCount = std::count(args.begin(), args.end(), L'"');
-            Assert::AreEqual(size_t{ 4 }, quoteCount);
-        }
-
-        // Tests BuildPowerToysExePath: appends "PowerToys.exe" to the install dir.
-        // Covers: updateLifecycle.h BuildPowerToysExePath — fs::path / operator.
-        // Setup: Standard install path without trailing backslash.
-        TEST_METHOD(BuildPowerToysExePathAppendsExeName)
-        {
-            const auto path = updating::BuildPowerToysExePath(L"C:\\Program Files\\PowerToys");
-            Assert::AreEqual(std::wstring(L"C:\\Program Files\\PowerToys\\PowerToys.exe"), path);
-        }
-
-        // Tests BuildPowerToysExePath: trailing backslash does not produce double
-        // backslash (e.g., "...PowerToys\\PowerToys.exe").
-        // Covers: updateLifecycle.h BuildPowerToysExePath — fs::path normalizes separators.
-        // Setup: Install path with trailing backslash.
-        TEST_METHOD(BuildPowerToysExePathHandlesTrailingBackslash)
-        {
-            const auto path = updating::BuildPowerToysExePath(L"C:\\Program Files\\PowerToys\\");
-            Assert::AreEqual(std::wstring(L"C:\\Program Files\\PowerToys\\PowerToys.exe"), path);
-        }
-
-        // Tests BuildPowerToysExePath: empty string produces just "PowerToys.exe".
-        // Covers: updateLifecycle.h BuildPowerToysExePath — fs::path with empty input.
-        // Setup: Empty install directory string.
-        TEST_METHOD(BuildPowerToysExePathHandlesEmptyString)
-        {
-            const auto path = updating::BuildPowerToysExePath(L"");
-            Assert::AreEqual(std::wstring(L"PowerToys.exe"), path);
-        }
-
-        // Tests CanRelaunchAfterUpdate: returns true when Stage 2 receives
-        // the install directory (argCount >= 4), false otherwise.
-        // This is the gate that prevents relaunch when using an old Stage 1
-        // that didn't pass the install dir (#42004/#43011/#44071).
-        // Covers: updateLifecycle.h CanRelaunchAfterUpdate.
-        TEST_METHOD(CanRelaunchReflectsArgCount)
-        {
-            // Old Stage 1 (pre-fix): only passed action + installer = 3 args
-            Assert::IsFalse(updating::CanRelaunchAfterUpdate(0));
-            Assert::IsFalse(updating::CanRelaunchAfterUpdate(1));
-            Assert::IsFalse(updating::CanRelaunchAfterUpdate(2));
-            Assert::IsFalse(updating::CanRelaunchAfterUpdate(3));
-
-            // New Stage 1 (post-fix): passes action + installer + installDir = 4 args
-            Assert::IsTrue(updating::CanRelaunchAfterUpdate(4));
-            Assert::IsTrue(updating::CanRelaunchAfterUpdate(5));
-        }
-
-        // Tests BuildStage2Arguments + CommandLineToArgvW round-trip: the exact
-        // scenario where Stage 1 builds args and Windows parses them in Stage 2.
-        // Verifies quoting is correct so paths with spaces survive the round trip.
-        // Covers: updateLifecycle.h BuildStage2Arguments — quote correctness.
-        // Setup: Realistic paths with spaces and version numbers.
-        TEST_METHOD(Stage2ArgumentsCanBeRoundTrippedThroughCommandLineToArgvW)
-        {
-            const std::wstring installerPath = L"C:\\Users\\test user\\AppData\\Local\\PowerToys\\Updates\\powertoyssetup-0.86.0-x64.exe";
-            const std::wstring installDir = L"C:\\Program Files\\PowerToys";
-
-            const auto args = updating::BuildStage2Arguments(L"-update_now_stage_2", installerPath, installDir);
-
-            // Simulate what Windows does: prepend a fake exe name and parse
-            std::wstring commandLine = L"PowerToys.Update.exe " + args;
-
-            int argc = 0;
-            LPWSTR* argv = CommandLineToArgvW(commandLine.c_str(), &argc);
-            Assert::IsNotNull(argv);
-            Assert::AreEqual(4, argc);
-            Assert::AreEqual(std::wstring(L"-update_now_stage_2"), std::wstring(argv[1]));
-            Assert::AreEqual(installerPath, std::wstring(argv[2]));
-            Assert::AreEqual(installDir, std::wstring(argv[3]));
-
-            LocalFree(argv);
-        }
-    };
-}

src/common/updating/UnitTests/UpdatingUnitTests.vcxproj

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>UpdatingUnitTests</RootNamespace>
-    <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-    <ProjectName>Updating.UnitTests</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\tests\UpdatingUnitTests\</OutDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="UpdatingTests.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>

src/common/updating/UnitTests/pch.cpp

@@ -1,5 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#include "pch.h"

src/common/updating/UnitTests/pch.h

@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#ifndef PCH_H
-#define PCH_H
-
-#include <atomic>
-#include <Windows.h>
-
-// Suppressing 26466 - Don't use static_cast downcasts - in CppUnitTest.h
-#pragma warning(push)
-#pragma warning(disable : 26466)
-#include "CppUnitTest.h"
-#pragma warning(pop)
-
-#endif //PCH_H

src/common/updating/configBackup.h

@@ -1,228 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#pragma once
-
-#include <filesystem>
-#include <fstream>
-#include <string>
-
-namespace updating
-{
-    namespace fs = std::filesystem;
-
-    struct BackupResult
-    {
-        int filesBackedUp{ 0 };
-        int errors{ 0 };
-    };
-
-    struct RestoreResult
-    {
-        int filesRestored{ 0 };
-        int filesChecked{ 0 };
-        int errors{ 0 };
-    };
-
-    // Check if a JSON file is corrupted (contains null bytes, as seen in #46179)
-    inline bool IsJsonFileCorrupted(const fs::path& filePath)
-    {
-        try
-        {
-            std::ifstream file(filePath, std::ios::binary);
-            if (!file.is_open())
-            {
-                return false;
-            }
-
-            constexpr size_t c_readChunkSize{ 4096 };
-            char buffer[c_readChunkSize];
-            while (file.read(buffer, c_readChunkSize) || file.gcount() > 0)
-            {
-                const auto bytesRead = file.gcount();
-                for (std::streamsize i = 0; i < bytesRead; ++i)
-                {
-                    if (buffer[i] == '\0')
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-        catch (...)
-        {
-            return true;
-        }
-    }
-
-    // Backup all JSON config files before update to protect against corruption (#46179)
-    inline BackupResult BackupConfigFiles(const fs::path& rootPath)
-    {
-        BackupResult result{};
-        try
-        {
-            const fs::path backupDir = rootPath / L"ConfigBackup";
-
-            std::error_code ec;
-            fs::remove_all(backupDir, ec);
-            fs::create_directories(backupDir, ec);
-            if (ec)
-            {
-                result.errors++;
-                return result;
-            }
-
-            for (const auto& entry : fs::directory_iterator(rootPath, ec))
-            {
-                if (ec)
-                {
-                    result.errors++;
-                    break;
-                }
-
-                if (entry.is_regular_file() && entry.path().extension() == L".json")
-                {
-                    std::error_code copyEc;
-                    fs::copy_file(entry.path(), backupDir / entry.path().filename(), fs::copy_options::overwrite_existing, copyEc);
-                    if (copyEc)
-                    {
-                        result.errors++;
-                    }
-                    else
-                    {
-                        result.filesBackedUp++;
-                    }
-                }
-                else if (entry.is_directory())
-                {
-                    const auto dirName = entry.path().filename().wstring();
-                    if (dirName == L"ConfigBackup" || dirName == L"Updates")
-                    {
-                        continue;
-                    }
-
-                    const auto moduleBackup = backupDir / entry.path().filename();
-                    fs::create_directories(moduleBackup, ec);
-
-                    std::error_code moduleEc;
-                    for (const auto& moduleEntry : fs::directory_iterator(entry.path(), moduleEc))
-                    {
-                        if (moduleEc)
-                        {
-                            result.errors++;
-                            break;
-                        }
-
-                        if (moduleEntry.is_regular_file() && moduleEntry.path().extension() == L".json")
-                        {
-                            std::error_code copyEc;
-                            fs::copy_file(moduleEntry.path(), moduleBackup / moduleEntry.path().filename(), fs::copy_options::overwrite_existing, copyEc);
-                            if (copyEc)
-                            {
-                                result.errors++;
-                            }
-                            else
-                            {
-                                result.filesBackedUp++;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        catch (...)
-        {
-            result.errors++;
-        }
-        return result;
-    }
-
-    // Restore JSON configs from backup if corruption is detected after update.
-    // Cleans up the backup directory afterward.
-    inline RestoreResult RestoreCorruptedConfigs(const fs::path& rootPath)
-    {
-        RestoreResult result{};
-        try
-        {
-            const fs::path backupDir = rootPath / L"ConfigBackup";
-
-            if (!fs::exists(backupDir))
-            {
-                return result;
-            }
-
-            std::error_code ec;
-            for (const auto& backupEntry : fs::directory_iterator(backupDir, ec))
-            {
-                if (ec)
-                {
-                    result.errors++;
-                    break;
-                }
-
-                if (backupEntry.is_regular_file() && backupEntry.path().extension() == L".json")
-                {
-                    const auto originalPath = rootPath / backupEntry.path().filename();
-                    result.filesChecked++;
-                    if (fs::exists(originalPath) && IsJsonFileCorrupted(originalPath) && !IsJsonFileCorrupted(backupEntry.path()))
-                    {
-                        std::error_code copyEc;
-                        fs::copy_file(backupEntry.path(), originalPath, fs::copy_options::overwrite_existing, copyEc);
-                        if (copyEc)
-                        {
-                            result.errors++;
-                        }
-                        else
-                        {
-                            result.filesRestored++;
-                        }
-                    }
-                }
-                else if (backupEntry.is_directory())
-                {
-                    const auto moduleDir = rootPath / backupEntry.path().filename();
-
-                    std::error_code moduleEc;
-                    for (const auto& moduleBackupEntry : fs::directory_iterator(backupEntry.path(), moduleEc))
-                    {
-                        if (moduleEc)
-                        {
-                            result.errors++;
-                            break;
-                        }
-
-                        if (moduleBackupEntry.is_regular_file() && moduleBackupEntry.path().extension() == L".json")
-                        {
-                            const auto originalModulePath = moduleDir / moduleBackupEntry.path().filename();
-                            result.filesChecked++;
-                            if (fs::exists(originalModulePath) && IsJsonFileCorrupted(originalModulePath) && !IsJsonFileCorrupted(moduleBackupEntry.path()))
-                            {
-                                std::error_code copyEc;
-                                fs::copy_file(moduleBackupEntry.path(), originalModulePath, fs::copy_options::overwrite_existing, copyEc);
-                                if (copyEc)
-                                {
-                                    result.errors++;
-                                }
-                                else
-                                {
-                                    result.filesRestored++;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Clean up backup directory after restore check
-            fs::remove_all(backupDir, ec);
-        }
-        catch (...)
-        {
-            result.errors++;
-        }
-        return result;
-    }
-}

src/common/updating/pch.h

@@ -24,6 +24,8 @@
 #include <regex>
 #include <charconv>
 
+#include <expected.hpp>
+
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.ApplicationModel.h>

src/common/updating/updateLifecycle.h

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#pragma once
-
-#include <filesystem>
-#include <string>
-
-namespace updating
-{
-    namespace fs = std::filesystem;
-
-    // Build the command-line arguments for Stage 2.
-    // Stage 1 passes the installer path and the PT install directory
-    // so Stage 2 can run the installer and relaunch PowerToys afterward.
-    // Note: paths containing embedded double-quote characters are not supported.
-    // This is safe because install paths come from get_module_folderpath().
-    inline std::wstring BuildStage2Arguments(
-        const std::wstring& stage2Flag,
-        const fs::path& installerPath,
-        const fs::path& installDir)
-    {
-        std::wstring arguments{ stage2Flag };
-        arguments += L" \"";
-        arguments += installerPath.c_str();
-        arguments += L"\" \"";
-        arguments += installDir.c_str();
-        arguments += L"\"";
-        return arguments;
-    }
-
-    // Build the full path to PowerToys.exe from the install directory.
-    // Used by Stage 2 to relaunch PT after a successful update.
-    inline std::wstring BuildPowerToysExePath(const std::wstring& installDir)
-    {
-        return (std::filesystem::path(installDir) / L"PowerToys.exe").wstring();
-    }
-
-    // Determine whether Stage 2 has enough information to relaunch PT.
-    // Returns true if the install directory argument was provided.
-    inline bool CanRelaunchAfterUpdate(int argCount)
-    {
-        // args[0]=exe, args[1]=action, args[2]=installer, args[3]=installDir
-        return argCount >= 4;
-    }
-}

src/common/updating/updating.cpp

@@ -87,7 +87,11 @@ namespace updating
         // If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates.
         if constexpr (VERSION_MAJOR == 0 && VERSION_MINOR == 0)
         {
+#if USE_STD_EXPECTED
             co_return std::unexpected(LOCAL_BUILD_ERROR);
+#else
+            co_return nonstd::make_unexpected(LOCAL_BUILD_ERROR);
+#endif
         }
 
         try
@@ -139,7 +143,11 @@ namespace updating
         catch (...)
         {
         }
+#if USE_STD_EXPECTED
         co_return std::unexpected(NETWORK_ERROR);
+#else
+        co_return nonstd::make_unexpected(NETWORK_ERROR);
+#endif
     }
 #pragma warning(pop)
 

src/common/updating/updating.h

@@ -5,7 +5,14 @@
 #include <filesystem>
 #include <variant>
 #include <winrt/Windows.Foundation.h>
+//#if __MSVC_VERSION__ >= 1933 // MSVC begin to support std::unexpected in 19.33
+#if __has_include(<expected> ) // use the same way with excepted-lite to detect std::unexcepted, as using it as backup
 #include <expected>
+#define USE_STD_EXPECTED 1
+#else
+#include <expected.hpp>
+#define USE_STD_EXPECTED 0
+#endif
 
 #include <common/version/helper.h>
 #include <wil/coroutine.h>
@@ -24,7 +31,12 @@ namespace updating
         std::wstring installer_filename;
     };
     using github_version_info = std::variant<new_version_download_info, version_up_to_date>;
+
+#if USE_STD_EXPECTED
     using github_version_result = std::expected<github_version_info, std::wstring>;
+#else
+    using github_version_result = nonstd::expected<github_version_info, std::wstring>;
+#endif
 
     wil::task<github_version_result> get_github_version_info_async(bool prerelease = false);
     wil::task<std::optional<std::filesystem::path>> download_new_version_async(new_version_download_info new_version);

src/common/updating/updating.vcxproj

@@ -9,6 +9,7 @@
     <ProjectName>ApplicationUpdate</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\..\deps\expected.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>