Address review: fix SA1310, add wrapped exception tests, log inner HResult

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

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

@@ -51,7 +51,6 @@ resw
 resx
 srt
 Stereolithography
-taskmgr
 terabyte
 UYVY
 xbf
@@ -187,12 +186,6 @@ xmlutil
 # Prefix
 pcs
 
-# EXPRTK / C++ MATH
-
-ifunction
-isinf
-isnan
-
 # User32.SYSTEM_METRICS_INDEX.cs
 
 CLEANBOOT
@@ -308,11 +301,8 @@ pwa
 
 AOT
 Aot
-cswinrt
 ify
-rsp
 TFM
-RTIID
 
 # YML
 onefuzz
@@ -320,7 +310,6 @@ onefuzz
 # NameInCode
 leilzh
 mengyuanchen
-contoso
 
 # DllName
 testhost
@@ -340,10 +329,6 @@ MRUCMPPROC
 MRUINFO
 REGSTR
 
-#Xaml
-NVI
-Storyboards
-
 # Misc Win32 APIs and PInvokes
 DEFAULTTONEAREST
 INVOKEIDLIST
@@ -361,17 +346,6 @@ WINDOWPOS
 WINEVENTPROC
 WORKERW
 FULLSCREENAPP
-ACLO
-CACLI
-DOENVSUBST
-FILESYSONLY
-URLIS
-WAITTIMEOUT
-DEFAULTTONEAREST
-DWRITE
-LWIN
-VCENTER
-VREDRAW
 
 # COM/WinRT interface prefixes and type fragments
 BAlt
@@ -406,12 +380,6 @@ YYY
 # Unicode
 precomposed
 
-# names of characters
-zwsp
-
-# mermaid
-autonumber
-
 # GitHub issue/PR commands
 azp
 feedbackhub

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

@@ -209,7 +209,6 @@ Bilibili
 BVID
 capturevideosample
 cmdow
-contoso
 Contoso
 Controlz
 cortana

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

@@ -7,9 +7,7 @@ AUDCLNT
 axisdefer
 axisflip
 axisstart
-BGRX
 bitmaps
-blits
 BREAKSCR
 BUFFERFLAGS
 Cands
@@ -19,7 +17,6 @@ CLASSW
 coeffs
 coprime
 CREATEDIBSECTION
-CREATESTRUCTW
 crossfades
 Ctl
 CTLCOLOR
@@ -28,10 +25,7 @@ CTLCOLORDLG
 CTLCOLOREDIT
 CTLCOLORLISTBOX
 CTrim
-DBuffer
-ddx
 ddy
-DEVSOURCE
 DFCS
 dlg
 dlu
@@ -47,14 +41,11 @@ dupsegments
 DWLP
 EDITCONTROL
 ENABLEHOOK
-ENDOFSTREAM
 expectedlock
-fabsf
 fastscroll
 FDE
 GETCHANNELRECT
 GETCHECK
-GETCOUNT
 GETSCREENSAVEACTIVE
 GETSCREENSAVETIMEOUT
 GETTHUMBRECT
@@ -66,7 +57,6 @@ HTHEME
 htol
 ICONINFORMATION
 ICONWARNING
-igc
 Inj
 jumprecover
 KSDATAFORMAT
@@ -88,11 +78,9 @@ manualdrop
 maskcache
 maxstep
 MENUINFO
-MFSTARTUP
-mfxhw
 mic
 middledrop
-MJPEG
+middledrop
 MMRESULT
 momentumreversal
 mrate
@@ -104,7 +92,6 @@ nduplicates
 niterations
 nmonitor
 NONCLIENTMETRICS
-NONOTIFY
 nonvle
 nredraw
 nstop
@@ -115,22 +102,16 @@ osc
 OWNERDRAW
 PBGRA
 periodictrap
-pillarbox
 pfdc
 playhead
 pointerreuse
-PSWA
 pwfx
-qpc
 Qpc
 quantums
 RCZOOMITSCR
-readback
-READERF
 realcapture
 REFKNOWNFOLDERID
 reposted
-RETURNCMD
 SCREENSAVE
 SCRNSAVE
 SCRNSAVECONFIGURE
@@ -150,7 +131,6 @@ shortlist
 slowthenfast
 smallstart
 SNIPOCR
-sqrtf
 ssi
 startuprecovery
 stf
@@ -159,7 +139,6 @@ STREAMFLAGS
 submix
 sxx
 sxy
-synthesising
 syy
 tallportal
 tci
@@ -175,7 +154,6 @@ vaddvq
 vandq
 vcgeq
 vdup
-VIDCAP
 vld
 vle
 Vle
@@ -191,9 +169,6 @@ vsync
 WASAPI
 WAVEFORMATEX
 WAVEFORMATEXTENSIBLE
-webcam
-Webcam
-webcams
 wfopen
 wideportal
 wil

.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$
 ^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$
@@ -143,4 +143,3 @@ ignore$
 src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
 ^src/modules/powerrename/unittests/testdata/avif_test\.avif$
 ^src/modules/powerrename/unittests/testdata/heif_test\.heic$
-^deps/spdlog-msvc-fix/

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

@@ -1,7 +1,6 @@
 AAAAs
 abcdefghjkmnpqrstuvxyz
 abgr
-ABlocked
 ABORTIFHUNG
 ABOUTBOX
 Abug
@@ -11,18 +10,14 @@ ACCESSDENIED
 ACCESSTOKEN
 acfs
 ACIE
-AClient
-AColumn
 ACR
 acrt
 ACTIVATEAPP
 ACTIVATEOPTIONS
 activationaction
 adaptivecards
-ADate
 ADDSTRING
 ADDUNDORECORD
-ADifferent
 ADMINS
 adml
 admx
@@ -31,15 +26,12 @@ advapi
 advfirewall
 AFeature
 affordances
-afterfx
 AFX
 agentskills
 AGGREGATABLE
 AHK
-AHybrid
 AIUI
 akv
-ALarger
 ALIGNRIGHT
 ALLAPPS
 ALLCHILDREN
@@ -51,17 +43,13 @@ ALLOWUNDO
 ALLVIEW
 ALPHATYPE
 altkey
-AModifier
 amr
 ANDSCANS
 animatedvisuals
 Animnate
-ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
-AOklab
 aot
-APeriod
 apicontract
 apidl
 APIENTRY
@@ -87,20 +75,16 @@ appxpackage
 APSTUDIO
 AQS
 Aquadrant
-ARandom
 ARCHITEW
-ARemapped
 ARPINSTALLLOCATION
 ARPPRODUCTICON
 ARRAYSIZE
 ARROWKEYS
 arrowshape
-artboard
 ARTIFACTSTAGINGDIRECTORY
 asf
 Ashcraft
 AShortcut
-ASingle
 ASSOCCHANGED
 ASSOCF
 ASSOCSTR
@@ -162,9 +146,7 @@ bluelightreductionstate
 BLURBEHIND
 BLURREGION
 bmi
-BNumber
 BODGY
-BOklab
 BOOTSTRAPPERINSTALLFOLDER
 Bootstrappers
 BOTTOMALIGN
@@ -176,7 +158,6 @@ breadcrumb
 Browsable
 BROWSEINFO
 bsd
-BSOD
 bthprops
 bti
 BTNFACE
@@ -187,8 +168,6 @@ BUILDNUMBER
 buildtransitive
 builttoroam
 BUNDLEINFO
-BVal
-BValue
 byapp
 BYCOMMAND
 BYPOSITION
@@ -204,18 +183,13 @@ CAPTURECHANGED
 CARETBLINKING
 carlos
 Carlseibert
-CAtl
 caub
 CBN
 cch
 CCHDEVICENAME
 CCHFORMNAME
-CCom
-CContext
-CDeclaration
 CDPX
 Cds
-CElems
 CENTERALIGN
 cer
 certlm
@@ -228,13 +202,11 @@ checkmarks
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
-chu
 Chunghwa
 CIBUILD
 cidl
 CIELCh
 cim
-CImage
 cla
 CLASSDC
 classguid
@@ -246,14 +218,12 @@ clickable
 clickonce
 clientedge
 clientside
-cliextensions
 CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
 clp
 CLSCTX
-CLSIDs
 clsids
 Clusion
 cmder
@@ -263,7 +233,6 @@ CMIC
 CMINVOKECOMMANDINFO
 CMINVOKECOMMANDINFOEX
 CMN
-CMock
 CMONITORS
 cmph
 CNF
@@ -320,7 +289,6 @@ Cowait
 cpcontrols
 cph
 cplusplus
-CPower
 cpptools
 cppvsdbg
 cppwinrt
@@ -339,14 +307,10 @@ CROPTOSQUARE
 Crossdevice
 crt
 csdevkit
-CSearch
-CSettings
 cso
 CSOT
 CSRW
-CStyle
 cswin
-CTest
 CTEXT
 CTLCOLORSTATIC
 CURRENTDIR
@@ -357,9 +321,7 @@ cursorwrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
-CVal
 cvd
-CVirtual
 CWMO
 CXSCREEN
 CXSMICON
@@ -372,9 +334,7 @@ Dac
 dacl
 DAffine
 DAFFINETRANSFORM
-DArchitectures
 datareader
-Datasheet
 datatracker
 Dayof
 dbcc
@@ -388,7 +348,6 @@ DBT
 DCapabilities
 DCBA
 DCOM
-DComposition
 DCR
 ddc
 DDEIf
@@ -406,14 +365,13 @@ defaultlib
 DEFAULTONLY
 DEFAULTSIZE
 defaulttonearest
+DEFAULTTONEAREST
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
 DEFPUSHBUTTON
 deinitialization
 DELA
-DELD
-deld
 DELETEDKEYIMAGE
 DELETESCANS
 DEMOTYPE
@@ -453,8 +411,6 @@ DISPLAYFLAGS
 DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
-DISPLAYPORT
-diu
 divyan
 DLGFRAME
 dlgmodalframe
@@ -487,7 +443,6 @@ DString
 DSVG
 dto
 DUMMYUNIONNAME
-dumpbin
 dutil
 DVASPECT
 DVASPECTINFO
@@ -510,12 +465,10 @@ DWMWINDOWATTRIBUTE
 DWMWINDOWMAXIMIZEDCHANGE
 DWORDLONG
 dworigin
-dwrite
 DWRITE
 dxgi
 Dxva
 eab
-EAccess
 easeofaccess
 ecount
 edid
@@ -523,8 +476,6 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 eep
-EFile
-EInvalid
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -534,21 +485,18 @@ ENABLETEMPLATE
 encodedlaunch
 encryptor
 ENDSESSION
-ENot
 ENSUREVISIBLE
 ENTERSIZEMOVE
 ENTRYW
 ENU
 environmentvariables
 EPO
-EProvider
 epu
 ERASEBKGND
 EREOF
 EResize
 ERRORIMAGE
 ERRORTITLE
-ESettings
 esrp
 etd
 ETDT
@@ -591,13 +539,11 @@ FANCYZONESEDITOR
 FARPROC
 fdw
 fdx
-FErase
 fesf
 FFFF
 fffffffzzz
 FFh
 Figma
-figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -618,16 +564,13 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
-FInc
 findfast
 findmymouse
 FIXEDFILEINFO
 FIXEDSYS
 flac
 flyouts
-FMask
 fmtid
-FNumber
 FOF
 FOFX
 FOLDERID
@@ -640,7 +583,6 @@ formatetc
 FORPARSING
 foundrylocal
 framechanged
-FRestore
 frm
 FROMTOUCH
 fsanitize
@@ -680,7 +622,6 @@ gfx
 GHND
 gitmodules
 GMEM
-GNumber
 googleai
 googlegemini
 Gotchas
@@ -692,16 +633,13 @@ gpu
 grabandmove
 GRABANDMOVEMODULEINTERFACE
 gradians
-GRC
 grctlext
 GRGX
 Gridcustomlayout
-gridlines
 GSM
 gtm
 guiddata
 GUITHREADINFO
-GValue
 gwl
 GWLP
 GWLSTYLE
@@ -739,7 +677,6 @@ hgdiobj
 HGFE
 hglobal
 hhk
-HHmmssfff
 hhx
 Hiber
 Hiberboot
@@ -777,9 +714,7 @@ HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
-hostfxr
 hostsfileeditor
-Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
@@ -787,8 +722,6 @@ hotkeys
 hotlight
 hotspot
 HPAINTBUFFER
-HPhysical
-HPS
 HRAWINPUT
 HREDRAW
 hres
@@ -798,15 +731,11 @@ HROW
 hsb
 HSCROLL
 hsi
-HSpeed
-HSync
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
 HTTRANSPARENT
 hutchinsoniana
-HVal
-HValue
 Hvci
 hwb
 HWHEEL
@@ -857,7 +786,6 @@ imgflip
 inapp
 inbox
 INCONTACT
-indesign
 Indo
 inetcpl
 Infobar
@@ -868,7 +796,6 @@ INITDIALOG
 INITGUID
 initialfile
 INITTOLOGFONTSTRUCT
-inkscape
 INLINEPREFIX
 inlines
 Inno
@@ -899,7 +826,6 @@ INVALIDARG
 invalidoperatioexception
 invokecommand
 ipcmanager
-IPREVIEW
 ipreviewhandlervisualssetfont
 IPTC
 irow
@@ -913,9 +839,7 @@ issecret
 ISSEPARATOR
 issuecomment
 istep
-Italicise
 ith
-ITHUMBNAIL
 IUI
 IUWP
 IVO
@@ -923,20 +847,16 @@ IWIC
 jeli
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
-JIDEA
 jjw
 jobject
 JOBOBJECT
 jpe
-JPN
 jpnime
 jrsoftware
 Jsons
 jsonval
 jxr
 Kantai
-KBSC
-kdc
 keybd
 KEYBDDATA
 KEYBDINPUT
@@ -954,7 +874,6 @@ keynum
 keyremaps
 keyring
 keyvault
-kfull
 KILLFOCUS
 killrunner
 kmph
@@ -981,7 +900,6 @@ LEFTTEXT
 Lenovo
 LError
 LEVELID
-LExit
 LFU
 LGD
 lhwnd
@@ -1021,7 +939,6 @@ lowlevel
 LOWORD
 lparam
 LPBITMAPINFOHEADER
-LPCFHOOKPROC
 lpch
 LPCITEMIDLIST
 LPCLSID
@@ -1040,7 +957,6 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
-LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -1054,7 +970,6 @@ LPW
 lpwcx
 lpwndpl
 lquadrant
-LReader
 LRESULT
 LSTATUS
 lstrcmp
@@ -1062,15 +977,10 @@ lstrcmpi
 lstrcpyn
 lstrlen
 LTEXT
-LTM
 LTRREADING
 luid
-LUMA
 lusrmgr
-LVal
-LVDS
 LWA
-lwin
 LWIN
 LZero
 MAGTRANSFORM
@@ -1116,12 +1026,10 @@ Metadatas
 metafile
 metapackage
 mfc
-mfcm
 Mgmt
 Microwaved
 middleclickaction
 midl
-midtones
 mii
 MIIM
 mikeclayton
@@ -1135,12 +1043,10 @@ MINMAXINFO
 minwindef
 Mip
 Miracast
-miracast
 mkdn
 mlcfg
 mmc
 mmcexe
-MMdd
 mmi
 mmsys
 mobileredirect
@@ -1166,9 +1072,7 @@ mouseutils
 MOVESIZEEND
 MOVESIZESTART
 MRM
-MRT
 mru
-msaccess
 MSAL
 msc
 mscorlib
@@ -1188,16 +1092,13 @@ msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
 Mso
-mspub
 msrc
 msstore
 mstsc
 msvcp
 mswhql
-MT
 MTND
 multimonitor
-Multiplayer
 MULTIPLEUSE
 multizone
 muxc
@@ -1254,7 +1155,6 @@ newrow
 nicksnettravels
 NIF
 nightlight
-NLog
 NLSTEXT
 NMAKE
 NNN
@@ -1303,7 +1203,6 @@ NORMALDISPLAY
 NORMALUSER
 NOSEARCH
 NOSENDCHANGING
-NOSIZE
 nosize
 notdefault
 NOTHOUSANDS
@@ -1318,6 +1217,7 @@ NOTSRCCOPY
 NOTSRCERASE
 Notupdated
 notwindows
+NOTXORPEN
 nowarn
 NOZORDER
 NPH
@@ -1375,7 +1275,6 @@ OUTOFCONTEXT
 Outptr
 outputtype
 outsettings
-outsourced
 OVERLAPPEDWINDOW
 Oversampling
 OVERWRITEPROMPT
@@ -1402,7 +1301,6 @@ PATINVERT
 PATPAINT
 pbc
 pbi
-PBlob
 PBP
 pbrush
 pcb
@@ -1424,7 +1322,6 @@ pdto
 pdtobj
 pdw
 Peb
-PElems
 Pels
 PELSHEIGHT
 PELSWIDTH
@@ -1443,13 +1340,11 @@ phbmp
 phicon
 PHL
 Photoshop
-photoshop
 phwnd
 pici
 pidl
 PIDLIST
 pii
-pinboard
 pinfo
 pinvoke
 pipename
@@ -1472,6 +1367,7 @@ POINTERID
 POINTERUPDATE
 Pokedex
 Pomodoro
+Popups
 popups
 POPUPWINDOW
 POSITIONITEM
@@ -1479,7 +1375,6 @@ POWERBROADCAST
 powerdisplay
 POWERDISPLAYMODULEINTERFACE
 powerocr
-powerpnt
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1535,7 +1430,6 @@ projectname
 PROPERTYKEY
 PROPVARIANT
 prot
-Prt
 PRTL
 prvpane
 psapi
@@ -1550,7 +1444,6 @@ psrm
 psrree
 pstatstg
 pstm
-PStr
 pstream
 pstrm
 PSYSTEM
@@ -1561,9 +1454,7 @@ PTCHAR
 ptcontrols
 ptd
 PTOKEN
-PToy
 ptstr
-ptsym
 pui
 pvct
 PWAs
@@ -1584,12 +1475,9 @@ QUERYOPEN
 QUEUESYNC
 quickaccent
 quicklinks
-quickmask
 QUNS
 RAII
-RAlt
 randi
-RAquadrant
 rasterization
 Rasterize
 rasterizing
@@ -1652,7 +1540,6 @@ resmimetype
 RESOURCEID
 RESTORETOMAXIMIZED
 RETURNONLYFSDIRS
-Revalidates
 RGBQUAD
 rgbs
 rgelt
@@ -1666,8 +1553,6 @@ RIDEV
 RIGHTBUTTON
 RIGHTSCROLLBAR
 riid
-RKey
-RNumber
 rollups
 rop
 ROUNDSMALL
@@ -1705,7 +1590,6 @@ SCREENFONTS
 screenruler
 screensaver
 screenshots
-Scrollback
 scrollviewer
 sddl
 SDKDDK
@@ -1905,7 +1789,6 @@ sublang
 SUBMODULEUPDATE
 subresource
 sug
-suntimes
 Superbar
 SUPPRESSMSGBOXES
 sut
@@ -1913,7 +1796,6 @@ svchost
 SVGIn
 SVGIO
 svgz
-SVIDEO
 SVSI
 SWFO
 swp
@@ -1979,7 +1861,6 @@ themeresources
 THH
 thickframe
 THISCOMPONENT
-threadpool
 throughs
 Tianma
 TILEDWINDOW
@@ -2019,7 +1900,6 @@ trx
 tsa
 tskill
 tstoi
-tsv
 tweakable
 TWF
 tymed
@@ -2031,31 +1911,22 @@ UACUI
 UAL
 uap
 UBR
-UBreak
 ubrk
-UCallback
 ucrt
 ucrtd
 uefi
-UError
 uesc
-UFlags
-UHash
 UIA
-UIDs
 UIEx
 uild
 uitests
 UITo
 ULONGLONG
 Ultrawide
-UMax
-UMin
 ums
 uncompilable
 UNCPRIORITY
 UNDNAME
-ungroup
 UNICODETEXT
 unins
 uninsdeletekey
@@ -2066,15 +1937,11 @@ unitconverter
 unittests
 UNLEN
 UNORM
-unparsable
 unremapped
-Unsend
 unsubscribes
-untriaged
 unvirtualized
 unwide
 unzoom
-UOffset
 UOI
 UPDATENOW
 updown
@@ -2090,7 +1957,6 @@ USEINSTALLERFORTEST
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
-UType
 uuidv
 uwp
 uxt
@@ -2099,9 +1965,7 @@ vabdq
 validmodulename
 valuegenerator
 VARTYPE
-vbcscompiler
 vcamp
-vcenter
 VCENTER
 vcgtq
 VCINSTALLDIR
@@ -2111,7 +1975,6 @@ vcpname
 VCRT
 vcruntime
 vcvars
-VDesktop
 vdupq
 VERBSONLY
 VERBW
@@ -2130,7 +1993,6 @@ VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
 visiblecolorformats
-visio
 visualeffects
 vkey
 vmovl
@@ -2140,7 +2002,6 @@ vorrq
 VOS
 vpaddlq
 vqsubq
-vredraw
 VREDRAW
 vreinterpretq
 VSC
@@ -2153,24 +2014,20 @@ 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
@@ -2220,16 +2077,13 @@ winlogon
 winmd
 winml
 WINNT
-winproj
 winres
 winrt
 winsdk
 winsta
 WINTHRESHOLD
 WINVER
-winword
 winxamlmanager
-wireframes
 withinrafael
 Withscript
 wixproj
@@ -2253,7 +2107,6 @@ WNDCLASSW
 wndproc
 wnode
 wom
-workerw
 WORKSPACESEDITOR
 WORKSPACESLAUNCHER
 WORKSPACESSNAPSHOTTOOL
@@ -2268,7 +2121,6 @@ wpr
 wprp
 wql
 wregex
-WReserved
 WResize
 WRITEOBJECTS
 Wrk
@@ -2286,52 +2138,24 @@ 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
 ZEROINIT
 zonability
 zonable

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

@@ -18,13 +18,6 @@ MIcrosoftEdgeLauncherCsharp
 # marker for ignoring a comment to the end of the line
 // #no-spell-check.*$
 
-# JavaScript regex literals that start with \b can be reported as "b..." words.
-# Example: /\bclass\s+.../
-^\s*/\\[b].{3,}?/[gim]*\s*(?:\)(?:;|$)|,$)
-
-# GitHub API header token used in code (not natural language).
-\bx-ratelimit-reset\b
-
 # Gaelic
 Gàidhlig
 

.github/policies/resourceManagement.yml

@@ -266,5 +266,16 @@ configuration:
       - addReply:
           reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
       description:
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Opened
+      - bodyContains:
+          pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
+          isRegex: True
+      then:
+      - addLabel:
+          label: Product-Workspaces
+      description: 
 onFailure: 
 onSuccess: 

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

@@ -1,324 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Detects telemetry-event additions/modifications in a pull request and
- * posts (or updates) a PR comment when telemetry-related changes are found.
- *
- * This script is executed by .github/workflows/telemetry-pr-check.yml.
- * Keep both files aligned when changing trigger behavior, env usage, or messaging.
- */
-
-const fs = require('node:fs');
-
-const COMMENT_MARKER = '<!-- telemetry-event-check -->';
-const COMMENT_BODY_WITH_PRIVACY_UPDATE = `${COMMENT_MARKER}
-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.
-
-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}
-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.
-
-1. Make sure to add your telemetry events to DATA_AND_PRIVACY.md.
-
-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,
-  /(^|\/)telemetry\//i,
-  /(^|\/)events\/.+event\.cs$/i,
-  /^src\/common\/Telemetry\//i,
-  /^src\/common\/ManagedTelemetry\//i,
-  /^src\/runner\/trace\.(h|cpp)$/i,
-  /^src\/settings-ui\/.+\/Telemetry\//i,
-];
-
-const TELEMETRY_LINE_PATTERNS = [
-  /TraceLoggingWriteWrapper\s*\(/,
-  /\bTraceLoggingWrite\s*\(/,
-  /\bTRACELOGGING_DEFINE_PROVIDER\b/,
-  /\bTraceLoggingOptionProjectTelemetry\b/,
-  /\bProjectTelemetryPrivacyDataTag\b/,
-  /\bPROJECT_KEYWORD_MEASURE\b/,
-  /\bRegisterProvider\s*\(/,
-  /\bUnregisterProvider\s*\(/,
-  /\bPowerToysTelemetry\.Log\.WriteEvent\s*\(/,
-  /\bclass\s+\w+\s*:\s*EventBase\s*,\s*IEvent\b/,
-  /\bclass\s+\w+\s*:\s*TelemetryBase\b/,
-  /\bPartA_PrivTags\b/,
-  /\[EventData\]/,
-  /\bEventName\b/,
-];
-
-function requireEnv(name) {
-  const value = process.env[name];
-  if (!value) {
-    throw new Error(`Missing required environment variable: ${name}`);
-  }
-  return value;
-}
-
-function validateRepository(repository) {
-  if (!/^[^/]+\/[^/]+$/.test(repository)) {
-    throw new Error(
-      `GITHUB_REPOSITORY must be in owner/repo format, received: ${JSON.stringify(repository)}`
-    );
-  }
-}
-
-function readEventPayload(eventPath) {
-  let raw;
-  try {
-    raw = fs.readFileSync(eventPath, 'utf8');
-  } catch (error) {
-    throw new Error(`Failed to read event payload at ${eventPath}: ${error.message}`);
-  }
-
-  try {
-    return JSON.parse(raw);
-  } catch (error) {
-    throw new Error(`Failed to parse JSON from ${eventPath}: ${error.message}`);
-  }
-}
-
-function resolvePullNumber(event) {
-  const fromPullRequest = event?.pull_request?.number;
-  const fromWorkflowDispatch = event?.inputs?.pr_number;
-  const rawPullNumber = fromPullRequest ?? fromWorkflowDispatch;
-
-  if (rawPullNumber === undefined || rawPullNumber === null || rawPullNumber === '') {
-    throw new Error(
-      'Unable to determine pull request number from event payload. Expected pull_request.number or inputs.pr_number.'
-    );
-  }
-
-  const pullNumber = Number.parseInt(String(rawPullNumber), 10);
-  if (!Number.isInteger(pullNumber) || pullNumber <= 0) {
-    throw new Error(`Invalid pull request number: ${JSON.stringify(rawPullNumber)}`);
-  }
-
-  return pullNumber;
-}
-
-function isTelemetryPath(filePath) {
-  return TELEMETRY_PATH_PATTERNS.some((pattern) => pattern.test(filePath));
-}
-
-function changedLinesFromPatch(patch) {
-  if (!patch) {
-    return [];
-  }
-
-  return patch
-    .split('\n')
-    .filter((line) => {
-      if (line.startsWith('+++') || line.startsWith('---')) {
-        return false;
-      }
-      return line.startsWith('+') || line.startsWith('-');
-    })
-    .map((line) => line.slice(1));
-}
-
-function hasTelemetryLineSignal(lines) {
-  return lines.some((line) => TELEMETRY_LINE_PATTERNS.some((pattern) => pattern.test(line)));
-}
-
-async function apiRequest(url, method = 'GET', body) {
-  const token = requireEnv('GITHUB_TOKEN');
-  let response;
-  try {
-    response = await fetch(url, {
-      method,
-      headers: {
-        Authorization: `Bearer ${token}`,
-        Accept: 'application/vnd.github+json',
-        'Content-Type': 'application/json',
-      },
-      body: body ? JSON.stringify(body) : undefined,
-    });
-  } catch (error) {
-    throw new Error(`Network error during ${method} ${url}: ${error.message}`);
-  }
-
-  if (!response.ok) {
-    const text = await response.text();
-    const rateLimitReset = response.headers.get('x-ratelimit-reset');
-    const rateLimitHint =
-      response.status === 403 && rateLimitReset
-        ? ` (rate limit reset at epoch ${rateLimitReset})`
-        : '';
-    throw new Error(`${method} ${url} failed (${response.status})${rateLimitHint}: ${text}`);
-  }
-
-  if (response.status === 204) {
-    return null;
-  }
-
-  try {
-    return await response.json();
-  } catch (error) {
-    throw new Error(`Failed to parse JSON response for ${method} ${url}: ${error.message}`);
-  }
-}
-
-async function getAllPullFiles(apiBaseUrl, repository, pullNumber) {
-  const files = [];
-  let page = 1;
-
-  while (true) {
-    const url = `${apiBaseUrl}/repos/${repository}/pulls/${pullNumber}/files?per_page=100&page=${page}`;
-    const batch = await apiRequest(url);
-    if (!Array.isArray(batch)) {
-      throw new Error(`Unexpected response while listing PR files on page ${page}.`);
-    }
-
-    if (batch.length === 0) {
-      break;
-    }
-
-    files.push(...batch);
-
-    if (batch.length < 100) {
-      break;
-    }
-
-    page += 1;
-  }
-
-  return files;
-}
-
-async function findExistingTelemetryComment(apiBaseUrl, repository, pullNumber) {
-  let page = 1;
-
-  while (true) {
-    const commentsUrl = `${apiBaseUrl}/repos/${repository}/issues/${pullNumber}/comments?per_page=100&page=${page}`;
-    const comments = await apiRequest(commentsUrl);
-
-    if (!Array.isArray(comments)) {
-      throw new Error(`Unexpected response while listing issue comments on page ${page}.`);
-    }
-
-    const existing = comments.find(
-      (comment) => typeof comment.body === 'string' && comment.body.includes(COMMENT_MARKER)
-    );
-    if (existing) {
-      return existing;
-    }
-
-    if (comments.length < 100) {
-      return null;
-    }
-
-    page += 1;
-  }
-}
-
-function detectTelemetryChanges(files) {
-  const matches = [];
-
-  for (const file of files) {
-    const filename = file.filename || '';
-    const telemetryPath = isTelemetryPath(filename);
-    const changedLines = changedLinesFromPatch(file.patch);
-    const telemetryLineSignal = hasTelemetryLineSignal(changedLines);
-
-    // Some large diffs omit patch content. If the file path is telemetry-centric,
-    // treat it as a telemetry modification to avoid false negatives.
-    const patchUnavailable = !file.patch && telemetryPath;
-
-    if (telemetryPath || telemetryLineSignal || patchUnavailable) {
-      matches.push({
-        filename,
-        telemetryPath,
-        telemetryLineSignal,
-        patchUnavailable,
-      });
-    }
-  }
-
-  return matches;
-}
-
-function hasDataAndPrivacyChange(files) {
-  return files.some((file) => {
-    const filename = (file.filename || '').toLowerCase();
-    return filename === 'data_and_privacy.md';
-  });
-}
-
-async function upsertPrComment(apiBaseUrl, repository, pullNumber, body) {
-  const existing = await findExistingTelemetryComment(apiBaseUrl, repository, pullNumber);
-
-  if (existing) {
-    const updateUrl = `${apiBaseUrl}/repos/${repository}/issues/comments/${existing.id}`;
-    await apiRequest(updateUrl, 'PATCH', { body });
-    console.log(`Updated existing telemetry comment (id: ${existing.id}).`);
-    return;
-  }
-
-  const createUrl = `${apiBaseUrl}/repos/${repository}/issues/${pullNumber}/comments`;
-  await apiRequest(createUrl, 'POST', { body });
-  console.log('Created telemetry comment on PR.');
-}
-
-async function main() {
-  const eventPath = requireEnv('GITHUB_EVENT_PATH');
-  const repository = requireEnv('GITHUB_REPOSITORY');
-  const apiBaseUrl = process.env.GITHUB_API_URL || 'https://api.github.com';
-  validateRepository(repository);
-
-  let parsedApiBaseUrl;
-  try {
-    parsedApiBaseUrl = new URL(apiBaseUrl);
-  } catch {
-    throw new Error(`Invalid GITHUB_API_URL: ${JSON.stringify(apiBaseUrl)}`);
-  }
-
-  const event = readEventPayload(eventPath);
-  const pullNumber = resolvePullNumber(event);
-
-  console.log(`Event name: ${process.env.GITHUB_EVENT_NAME || 'unknown'}`);
-  console.log(`Repository: ${repository}`);
-  console.log(`PR number: ${pullNumber}`);
-
-  const files = await getAllPullFiles(parsedApiBaseUrl.origin, repository, pullNumber);
-
-  if (files.length === 0) {
-    console.log('No changed files found for PR; skipping telemetry comment update.');
-    return;
-  }
-
-  const matches = detectTelemetryChanges(files);
-  const dataAndPrivacyChanged = hasDataAndPrivacyChange(files);
-
-  console.log(`Scanned ${files.length} changed files.`);
-  console.log(`Telemetry matches found: ${matches.length}.`);
-  console.log(`DATA_AND_PRIVACY.md changed: ${dataAndPrivacyChanged}.`);
-
-  if (matches.length === 0) {
-    console.log('No telemetry-related additions/modifications detected.');
-    return;
-  }
-
-  for (const match of matches) {
-    console.log(
-      `- ${match.filename} (telemetryPath=${match.telemetryPath}, telemetryLineSignal=${match.telemetryLineSignal}, patchUnavailable=${match.patchUnavailable})`
-    );
-  }
-
-  const commentBody = dataAndPrivacyChanged
-    ? COMMENT_BODY_WITH_PRIVACY_UPDATE
-    : COMMENT_BODY_WITHOUT_PRIVACY_UPDATE;
-
-  await upsertPrComment(apiBaseUrl, repository, pullNumber, commentBody);
-}
-
-main().catch((error) => {
-  console.error('Telemetry PR check failed.');
-  console.error(error instanceof Error ? error.stack || error.message : error);
-  process.exit(1);
-});

.github/skills/release-note-generation/SKILL.md

@@ -1,12 +1,12 @@
 ---
 name: release-note-generation
-description: Toolkit for generating PowerToys release notes from GitHub milestone PRs or commit ranges. Use when asked to create release notes, summarize milestone PRs, generate changelog, prepare release documentation, generate PR review summaries locally for release notes, update README for a new release, manage PR milestones, collect PRs between commits/tags, or prepare release assets (download installers and compute installer hashes).
+description: Toolkit for generating PowerToys release notes from GitHub milestone PRs or commit ranges. Use when asked to create release notes, summarize milestone PRs, generate changelog, prepare release documentation, request Copilot reviews for PRs, update README for a new release, manage PR milestones, or collect PRs between commits/tags. Supports PR collection by milestone or commit range, milestone assignment, grouping by label, summarization with external contributor attribution, and README version bumping.
 license: Complete terms in LICENSE.txt
 ---
 
 # Release Note Generation Skill
 
-Generate professional release notes for PowerToys milestones by collecting merged PRs, summarizing each PR with the local CLI agent, grouping by label, and producing user-facing summaries.
+Generate professional release notes for PowerToys milestones by collecting merged PRs, requesting Copilot code reviews, grouping by label, and producing user-facing summaries.
 
 ## Output Directory
 
@@ -26,17 +26,16 @@ Generated Files/ReleaseNotes/
 
 - Generate release notes for a milestone
 - Summarize PRs merged in a release
-- Generate per-PR review summaries locally for release-notes copy
+- Request Copilot reviews for milestone PRs
 - Assign milestones to PRs missing them
 - Collect PRs between two commits/tags
 - Update README.md for a new version
-- Prepare GitHub release assets (download installers/symbols + compute hashes)
 
 ## Prerequisites
 
 - **GitHub CLI (`gh`) installed and authenticated** — The collection script uses `gh pr view` and `gh api graphql` to fetch PR metadata and co-author information. Run `gh auth status` to verify; if not logged in, run `gh auth login` first. See [Step 1.0.0](./references/step1-collection.md) for details.
-- MCP Server: github-mcp-server installed (used to fetch PR diffs/files for the local-agent review step)
-- For [prepare-release-assets.ps1](./scripts/prepare-release-assets.ps1) only: **Azure CLI** authenticated against the Microsoft tenant (`az login`) with the `azure-devops` extension; access to the `microsoft/Dart` ADO project
+- MCP Server: github-mcp-server installed
+- GitHub Copilot code review enabled for the org/repo
 
 ## Required Variables
 
@@ -66,12 +65,12 @@ Generated Files/ReleaseNotes/
 └────────────────────────────────┘
               ↓
 ┌────────────────────────────────┐
-│ 3.1 Local-agent PR summaries    │
-│ (writes CopilotSummary)         │
+│ 3.1 Request Reviews (Copilot)  │
 └────────────────────────────────┘
               ↓
 ┌────────────────────────────────┐
-│ 3.2 (Optional) Refresh PR data  │
+│ 3.2 Refresh PR data             │
+│ (CopilotSummary)                │
 └────────────────────────────────┘
               ↓
 ┌────────────────────────────────┐
@@ -94,7 +93,7 @@ Generated Files/ReleaseNotes/
 | 1.1 | Collect PRs | From previous release tag on `stable` branch → `sorted_prs.csv` |
 | 1.2 | Assign Milestones | Ensure all PRs have correct milestone |
 | 2.1–2.4 | Label PRs | Auto-suggest + human label low-confidence |
-| 3.1–3.3 | Reviews & Grouping | Local agent summarizes each PR diff into `CopilotSummary` → (optional refresh) → group by label |
+| 3.1–3.3 | Reviews & Grouping | Request Copilot reviews → refresh → group by label |
 | 4.1–4.2 | Summaries & Final | Generate grouped summaries, then consolidate |
 
 ## Detailed workflow docs
@@ -115,7 +114,6 @@ Do not read all steps at once—only read the step you are executing.
 | [group-prs-by-label.ps1](./scripts/group-prs-by-label.ps1) | Group PRs into CSVs |
 | [collect-or-apply-milestones.ps1](./scripts/collect-or-apply-milestones.ps1) | Assign milestones |
 | [diff_prs.ps1](./scripts/diff_prs.ps1) | Incremental PR diff |
-| [prepare-release-assets.ps1](./scripts/prepare-release-assets.ps1) | Download installers + symbols from an ADO build, compute SHA256, emit the "Installer Hashes" markdown table for the GitHub release page |
 
 ## References
 
@@ -135,6 +133,5 @@ Do not read all steps at once—only read the step you are executing.
 |-------|----------|
 | `gh` command not found | Install GitHub CLI and add to PATH |
 | No PRs returned | Verify milestone title matches exactly |
-| Empty `CopilotSummary` for many PRs | Run Step 3.1 (local-agent summaries). Do **not** use `mcp_github_request_copilot_review` from a CLI/coding agent — the GitHub API rejects bot-initiated review requests, so the column will stay empty. |
+| Empty CopilotSummary | Request Copilot reviews first, then re-run dump |
 | Many unlabeled PRs | Return to labeling step before grouping |
-| `prepare-release-assets.ps1` fails with "Failed to acquire ADO access token" | Run `az login` and ensure you have access to the `microsoft/Dart` ADO project |

.github/skills/release-note-generation/references/step3-review-grouping.md

@@ -1,40 +1,22 @@
-# Step 3: Local Agent Reviews and Grouping
+# Step 3: Copilot Reviews and Grouping
 
 ## 3.0 To-do
-- 3.1 Generate PR Summaries with the Local Agent
-- 3.2 (Optional) Refresh PR Data
+- 3.1 Request Copilot Reviews (Agent Mode)
+- 3.2 Refresh PR Data
 - 3.3 Group PRs by Label
 
-## 3.1 Generate PR Summaries with the Local Agent
+## 3.1 Request Copilot Reviews (Agent Mode)
 
-> ⚠️ **Do not use `mcp_github_request_copilot_review` (or any "request Copilot review" tool that calls the GitHub API).**
-> When this skill is driven from a CLI / coding agent, the request is made from a bot identity and the GitHub API rejects it ("Bot reviewers cannot be requested"). The PR ends up with no Copilot review and `CopilotSummary` stays empty.
->
-> Instead, **the local agent that is running this skill performs the review itself** and writes the summary directly into `sorted_prs.csv`.
+Use MCP tools to request Copilot reviews for all PRs in `Generated Files/ReleaseNotes/sorted_prs.csv`:
 
-For every PR listed in `Generated Files/ReleaseNotes/sorted_prs.csv` whose `CopilotSummary` is empty:
-
-1. Fetch the PR diff using a tool that does **not** post anything back to GitHub. Any of these works:
-    - `mcp_github_pull_request_read` with `method: get_diff`
-    - `mcp_github_pull_request_read` with `method: get_files` (when the diff is large)
-    - `gh pr diff <PR_NUMBER> --repo microsoft/PowerToys`
-2. Read the PR title, body, and diff. Produce a 1–3 sentence, user-facing summary in the same style as a Copilot PR review (focus on observable behavior change, not implementation details).
-3. Write the summary into the `CopilotSummary` column for that PR row in `Generated Files/ReleaseNotes/sorted_prs.csv`. Preserve all other columns and the existing row order.
-
-**Batching guidance**
-
-- Process PRs in the order they appear in `sorted_prs.csv`.
-- Generate summaries for **all** PRs in one pass before continuing to Step 3.3, so the human reviewer can validate them together.
-- For very large diffs, summarize from `get_files` (filenames + per-file patches) rather than the full diff.
-- Skip PRs that already have a non-empty `CopilotSummary` (e.g. PRs where a human reviewer already pasted one). Do not overwrite existing summaries.
-
-**Why not post the summary back to the PR?** Posting a comment from the agent's identity would not be picked up by `dump-prs-since-commit.ps1` (which only matches Copilot bot authors), and it adds noise to the PR. Writing straight into the CSV keeps the artifact self-contained.
+- Use `mcp_github_request_copilot_review` for each PR ID
+- Do NOT generate or run scripts for this step
 
 ---
 
-## 3.2 (Optional) Refresh PR Data
+## 3.2 Refresh PR Data
 
-Only re-run the collection script if PR metadata on GitHub has changed (new labels, retitled PRs, etc.) since Step 1.1. **Skip this step if you only want to preserve the locally generated `CopilotSummary` values from Step 3.1**, because re-running the dump will overwrite the CSV.
+Re-run the collection script to capture Copilot review summaries into the `CopilotSummary` column:
 
 ```powershell
 pwsh ./.github/skills/release-note-generation/scripts/dump-prs-since-commit.ps1 `
@@ -42,8 +24,6 @@ pwsh ./.github/skills/release-note-generation/scripts/dump-prs-since-commit.ps1
     -OutputDir 'Generated Files/ReleaseNotes'
 ```
 
-If you do refresh, redo Step 3.1 afterwards to repopulate `CopilotSummary`.
-
 ---
 
 ## 3.3 Group PRs by Label
@@ -55,4 +35,3 @@ pwsh ./.github/skills/release-note-generation/scripts/group-prs-by-label.ps1 -Cs
 Creates `Generated Files/ReleaseNotes/grouped_csv/` with one CSV per label combination.
 
 **Validation:** The `Unlabeled.csv` file should be minimal (ideally empty). If many PRs remain unlabeled, return to Step 2 (see [step2-labeling.md](./step2-labeling.md)).
-

.github/skills/release-note-generation/scripts/prepare-release-assets.ps1

@@ -1,334 +0,0 @@
-<#
-.SYNOPSIS
-    Prepares the binary assets for a PowerToys GitHub release: downloads the
-    four installers (per-user/per-machine x x64/arm64) and the symbol archives
-    from an ADO pipeline build, computes SHA256 hashes, and emits the
-    "Installer Hashes" markdown table.
-
-.DESCRIPTION
-    Given an ADO Dart pipeline build id (e.g. from
-    https://microsoft.visualstudio.com/Dart/_build/results?buildId=NNN),
-    downloads the four installer EXEs and the per-arch symbol zips into a
-    single per-version folder, then writes a hashes.md alongside them with a
-    markdown table ready to paste into the GitHub release notes.
-
-    Requires: az login (Azure CLI authenticated), az devops extension.
-
-.EXAMPLE
-    .\prepare-release-assets.ps1 -BuildId 145505247
-    .\prepare-release-assets.ps1 -BuildId 145505247 -OutputFolder D:\Releases
-#>
-param(
-    [Parameter(Mandatory = $true)]
-    [int]$BuildId,
-
-    [string]$OutputFolder = "$env:USERPROFILE\Downloads",
-
-    [string]$Organization = "https://dev.azure.com/microsoft",
-    [string]$Project = "Dart",
-
-    [string]$GitHubRepo = "microsoft/PowerToys"
-)
-
-$ErrorActionPreference = "Stop"
-$env:AZURE_CORE_NO_PROMPT = "true"
-
-# --- Helpers -----------------------------------------------------------------
-
-# Invoke an `az` CLI command and capture stderr in $script:LastAzError so
-# callers can surface the underlying message (expired login, blocked extension,
-# tenant policy, ...) instead of swallowing it with `2>$null`.
-function Invoke-Az {
-    $tmpErr = [System.IO.Path]::GetTempFileName()
-    try {
-        $output = & az @args 2>$tmpErr
-        # Get-Content -Raw returns $null for an empty file, and calling .Trim()
-        # on $null throws under $ErrorActionPreference = 'Stop' -- which would
-        # turn every successful (no-stderr) az call into a fatal error. Guard
-        # explicitly so $script:LastAzError is always a (possibly empty) string.
-        $rawErr = Get-Content $tmpErr -Raw -ErrorAction SilentlyContinue
-        $script:LastAzError = if ($null -eq $rawErr) { '' } else { $rawErr.Trim() }
-        return $output
-    }
-    finally {
-        Remove-Item $tmpErr -Force -ErrorAction SilentlyContinue
-    }
-}
-
-# Build an ADO artifact download URL from scratch instead of regex-replacing
-# the URL returned by `az pipelines runs artifact list`. Preserves any other
-# query parameters and only swaps `format` and `subPath`, so we don't break if
-# the upstream URL shape ever changes.
-function Get-ArtifactDownloadUrl {
-    param(
-        [Parameter(Mandatory)][string]$BaseUrl,
-        [Parameter(Mandatory)][string]$SubPath,
-        [Parameter(Mandatory)][ValidateSet('file', 'zip')][string]$Format
-    )
-    $encodedSubPath = [Uri]::EscapeDataString($SubPath)
-    $idx = $BaseUrl.IndexOf('?')
-    if ($idx -lt 0) {
-        return "${BaseUrl}?format=${Format}&subPath=${encodedSubPath}"
-    }
-    $base = $BaseUrl.Substring(0, $idx)
-    $kept = $BaseUrl.Substring($idx + 1) -split '&' | Where-Object {
-        $_ -and -not ($_ -match '^(format|subPath)=')
-    }
-    $kept = @($kept) + @("format=$Format", "subPath=$encodedSubPath")
-    return "${base}?$($kept -join '&')"
-}
-
-# Download a single ADO artifact file with bearer auth and a small retry/backoff
-# loop. A transient network blip on a ~200 MB installer or symbol zip otherwise
-# aborts the entire release-prep run.
-function Invoke-AdoDownload {
-    param(
-        [Parameter(Mandatory)][string]$Url,
-        [Parameter(Mandatory)][string]$DestPath,
-        [Parameter(Mandatory)][string]$Token,
-        [int]$MaxAttempts = 3
-    )
-    $lastError = $null
-    for ($attempt = 1; $attempt -le $MaxAttempts; $attempt++) {
-        $webClient = New-Object System.Net.WebClient
-        $webClient.Headers.Add("Authorization", "Bearer $Token")
-        try {
-            $webClient.DownloadFile($Url, $DestPath)
-            return
-        }
-        catch {
-            $lastError = $_
-            if (Test-Path $DestPath) {
-                Remove-Item $DestPath -Force -ErrorAction SilentlyContinue
-            }
-            if ($attempt -lt $MaxAttempts) {
-                $backoffSec = [int][Math]::Pow(2, $attempt)  # 2, 4, 8 ...
-                Write-Host "  Attempt $attempt failed: $($_.Exception.Message). Retrying in ${backoffSec}s..." -ForegroundColor Yellow
-                Start-Sleep -Seconds $backoffSec
-            }
-        }
-        finally {
-            $webClient.Dispose()
-        }
-    }
-    throw "Download failed after $MaxAttempts attempts. Last error: $($lastError.Exception.Message)`nURL: $Url"
-}
-
-# -----------------------------------------------------------------------------
-
-# Work around broken az extensions: if the default extension dir has
-# inaccessible files, redirect to a clean directory.
-$defaultExtDir = "$env:USERPROFILE\.azure\cliextensions"
-if (-not $env:AZURE_EXTENSION_DIR -and (Test-Path $defaultExtDir)) {
-    $broken = Get-ChildItem "$defaultExtDir\*\*.dist-info" -Directory -ErrorAction SilentlyContinue | Where-Object {
-        try { [System.IO.Directory]::GetFiles($_.FullName) | Out-Null; $false } catch { $true }
-    }
-    if ($broken) {
-        $cleanDir = "$env:USERPROFILE\.azure\cliextensions_clean"
-        Write-Host "  Detected broken az extension, redirecting to $cleanDir" -ForegroundColor Yellow
-        $env:AZURE_EXTENSION_DIR = $cleanDir
-        if (-not (Test-Path $cleanDir)) { New-Item -ItemType Directory -Path $cleanDir -Force | Out-Null }
-    }
-}
-
-# Ensure azure-devops extension is installed
-$ext = Invoke-Az extension list --query "[?name=='azure-devops']" -o tsv
-if (-not $ext) {
-    Write-Host "Installing azure-devops extension..." -ForegroundColor Yellow
-    Invoke-Az extension add --name azure-devops --yes | Out-Null
-    if ($LASTEXITCODE -ne 0) {
-        Write-Error "Failed to install azure-devops extension. (az: $script:LastAzError)"
-        exit 1
-    }
-}
-
-# Configure az devops defaults
-Invoke-Az devops configure --defaults organization=$Organization project=$Project | Out-Null
-if ($LASTEXITCODE -ne 0) {
-    Write-Error "Failed to configure az devops defaults. (az: $script:LastAzError)"
-    exit 1
-}
-
-# --- Step 1: Get build info to determine version ---
-Write-Host "Fetching build $BuildId info..." -ForegroundColor Cyan
-$buildJson = Invoke-Az pipelines build show --id $BuildId --output json
-if (-not $buildJson) {
-    Write-Error "Could not fetch build $BuildId. Are you logged in (az login)? (az: $script:LastAzError)"
-    exit 1
-}
-$build = $buildJson | ConvertFrom-Json
-
-$versionParam = $build.templateParameters.VersionNumber
-if (-not $versionParam) {
-    Write-Error "Could not determine version from build $BuildId"
-    exit 1
-}
-Write-Host "  Version: $versionParam" -ForegroundColor DarkGray
-
-# --- Step 2: Get artifact metadata once ---
-Write-Host "Fetching artifact metadata..." -ForegroundColor Cyan
-$artifactsJson = Invoke-Az pipelines runs artifact list --run-id $BuildId --output json
-if (-not $artifactsJson) {
-    Write-Error "Could not list artifacts for build $BuildId. (az: $script:LastAzError)"
-    exit 1
-}
-$artifacts = $artifactsJson | ConvertFrom-Json
-
-# --- Step 3: Prepare destination folder ---
-$destFolder = Join-Path $OutputFolder "PowerToys-v$versionParam"
-if (-not (Test-Path $destFolder)) {
-    New-Item -ItemType Directory -Path $destFolder -Force | Out-Null
-}
-Write-Host "  Destination: $destFolder" -ForegroundColor DarkGray
-
-# --- Step 4: Get an ADO access token once ---
-$token = Invoke-Az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query accessToken -o tsv
-if (-not $token) {
-    Write-Error "Failed to acquire ADO access token. Run 'az login' first. (az: $script:LastAzError)"
-    exit 1
-}
-
-# --- Step 5: Define the four installers to download ---
-$targets = @(
-    [pscustomobject]@{ Description = "Per user - x64";       Scope = "perUser";    Arch = "x64";   Artifact = "build-x64-Release";   FileName = "PowerToysUserSetup-$versionParam-x64.exe" }
-    [pscustomobject]@{ Description = "Per user - ARM64";     Scope = "perUser";    Arch = "arm64"; Artifact = "build-arm64-Release"; FileName = "PowerToysUserSetup-$versionParam-arm64.exe" }
-    [pscustomobject]@{ Description = "Machine wide - x64";   Scope = "perMachine"; Arch = "x64";   Artifact = "build-x64-Release";   FileName = "PowerToysSetup-$versionParam-x64.exe" }
-    [pscustomobject]@{ Description = "Machine wide - ARM64"; Scope = "perMachine"; Arch = "arm64"; Artifact = "build-arm64-Release"; FileName = "PowerToysSetup-$versionParam-arm64.exe" }
-)
-
-# --- Step 6: Download each installer (skip if already present) ---
-foreach ($t in $targets) {
-    $destPath = Join-Path $destFolder $t.FileName
-
-    if (Test-Path $destPath) {
-        $sizeMB = [math]::Round((Get-Item $destPath).Length / 1MB, 1)
-        Write-Host "[skip] $($t.FileName) already exists ($sizeMB MB)" -ForegroundColor DarkGray
-        continue
-    }
-
-    $artifact = $artifacts | Where-Object { $_.name -eq $t.Artifact }
-    if (-not $artifact) {
-        Write-Error "Artifact '$($t.Artifact)' not found in build $BuildId. Available: $(($artifacts | ForEach-Object name) -join ', ')"
-        exit 1
-    }
-
-    $fileUrl = Get-ArtifactDownloadUrl -BaseUrl $artifact.resource.downloadUrl -SubPath "/$($t.FileName)" -Format file
-
-    Write-Host "Downloading $($t.FileName) ..." -ForegroundColor Cyan
-    try {
-        Invoke-AdoDownload -Url $fileUrl -DestPath $destPath -Token $token
-    }
-    catch {
-        Write-Error "Download failed for $($t.FileName): $_"
-        exit 1
-    }
-
-    $sizeMB = [math]::Round((Get-Item $destPath).Length / 1MB, 1)
-    Write-Host "  Saved ($sizeMB MB)" -ForegroundColor Green
-}
-
-# --- Step 6b: Download symbols (one zip per arch) ---
-$symbolTargets = @(
-    [pscustomobject]@{ Arch = "x64";   Artifact = "build-x64-Release";   SubPath = "/symbols-x64" }
-    [pscustomobject]@{ Arch = "arm64"; Artifact = "build-arm64-Release"; SubPath = "/symbols-arm64" }
-)
-
-foreach ($s in $symbolTargets) {
-    $finalZip = Join-Path $destFolder "symbols-$($s.Arch).zip"
-    if (Test-Path $finalZip) {
-        $sizeMB = [math]::Round((Get-Item $finalZip).Length / 1MB, 1)
-        Write-Host "[skip] symbols-$($s.Arch).zip already exists ($sizeMB MB)" -ForegroundColor DarkGray
-        continue
-    }
-
-    $artifact = $artifacts | Where-Object { $_.name -eq $s.Artifact }
-    if (-not $artifact) {
-        Write-Error "Artifact '$($s.Artifact)' not found in build $BuildId."
-        exit 1
-    }
-
-    # Symbols are downloaded as a folder => keep format=zip and append subPath
-    $symbolsUrl = Get-ArtifactDownloadUrl -BaseUrl $artifact.resource.downloadUrl -SubPath $s.SubPath -Format zip
-
-    $tmpZip = Join-Path ([System.IO.Path]::GetTempPath()) ("ptsym-$($s.Arch)-$([Guid]::NewGuid().ToString('N')).zip")
-    $tmpExtract = Join-Path ([System.IO.Path]::GetTempPath()) ("ptsym-$($s.Arch)-$([Guid]::NewGuid().ToString('N'))")
-    $stageRoot = Join-Path ([System.IO.Path]::GetTempPath()) ("ptsym-stage-$([Guid]::NewGuid().ToString('N'))")
-
-    try {
-        Write-Host "Downloading symbols-$($s.Arch).zip ..." -ForegroundColor Cyan
-        try {
-            Invoke-AdoDownload -Url $symbolsUrl -DestPath $tmpZip -Token $token
-        }
-        catch {
-            Write-Error "Symbols download failed for $($s.Arch): $_"
-            exit 1
-        }
-
-        Write-Host "  Extracting..." -ForegroundColor DarkGray
-        Expand-Archive -Path $tmpZip -DestinationPath $tmpExtract -Force
-
-        # Walk down while the current dir holds exactly one subfolder and no files.
-        $current = Get-Item $tmpExtract
-        while ($true) {
-            $children = Get-ChildItem -LiteralPath $current.FullName -Force
-            $subDirs = @($children | Where-Object { $_.PSIsContainer })
-            $files = @($children | Where-Object { -not $_.PSIsContainer })
-            if ($subDirs.Count -eq 1 -and $files.Count -eq 0) {
-                $current = $subDirs[0]
-            }
-            else {
-                break
-            }
-        }
-
-        # Stage to a folder named symbols-<arch> so the zip extracts to that name.
-        $stageInner = Join-Path $stageRoot "symbols-$($s.Arch)"
-        New-Item -ItemType Directory -Path $stageInner -Force | Out-Null
-        Get-ChildItem -LiteralPath $current.FullName -Force | ForEach-Object {
-            Copy-Item -LiteralPath $_.FullName -Destination $stageInner -Recurse -Force
-        }
-
-        Write-Host "  Repacking to $finalZip ..." -ForegroundColor DarkGray
-        if (Test-Path $finalZip) { Remove-Item $finalZip -Force }
-        Compress-Archive -Path "$stageInner\*" -DestinationPath $finalZip -CompressionLevel Optimal
-
-        $sizeMB = [math]::Round((Get-Item $finalZip).Length / 1MB, 1)
-        Write-Host "  Saved symbols-$($s.Arch).zip ($sizeMB MB)" -ForegroundColor Green
-    }
-    catch {
-        # Don't leave a half-built zip behind if anything in the pipeline blew up.
-        if (Test-Path $finalZip) { Remove-Item $finalZip -Force -ErrorAction SilentlyContinue }
-        throw
-    }
-    finally {
-        Remove-Item $tmpZip -Force -ErrorAction SilentlyContinue
-        Remove-Item $tmpExtract -Recurse -Force -ErrorAction SilentlyContinue
-        Remove-Item $stageRoot -Recurse -Force -ErrorAction SilentlyContinue
-    }
-}
-
-# --- Step 7: Compute SHA256 and build markdown ---
-Write-Host "`nComputing SHA256 hashes..." -ForegroundColor Cyan
-
-$sb = [System.Text.StringBuilder]::new()
-[void]$sb.AppendLine("## Installer Hashes")
-[void]$sb.AppendLine("")
-[void]$sb.AppendLine("| Description | Filename | sha256 hash |")
-[void]$sb.AppendLine("| --- | --- | --- |")
-
-foreach ($t in $targets) {
-    $destPath = Join-Path $destFolder $t.FileName
-    $hash = (Get-FileHash -Path $destPath -Algorithm SHA256).Hash.ToUpper()
-    [void]$sb.AppendLine("| $($t.Description) | $($t.FileName) | $hash |")
-    Write-Host "  $($t.FileName)  $hash" -ForegroundColor DarkGray
-}
-
-$markdown = $sb.ToString()
-$mdPath = Join-Path $destFolder "hashes.md"
-Set-Content -Path $mdPath -Value $markdown -Encoding UTF8
-
-Write-Host "`nMarkdown written to: $mdPath" -ForegroundColor Green
-Write-Host "`n----- Installer Hashes -----`n" -ForegroundColor Yellow
-Write-Host $markdown
-
-Write-Host "Draft a new GitHub release at: https://github.com/$GitHubRepo/releases/new?tag=v$versionParam" -ForegroundColor Green

.github/workflows/auto-label-issues.yml

@@ -1,213 +0,0 @@
-name: Automatic Triaging on Issue Creation
-
-on:
-  issues:
-    types: [opened, reopened]
-  # Manual trigger: go to Actions → "Automatic Triaging on Issue Creation" → Run workflow.
-  # Enter one or more comma-separated issue numbers (e.g. "1234" or "1234,1235,1236")
-  # to apply AI-generated area labels to existing untriaged issues.
-  workflow_dispatch:
-    inputs:
-      issue_numbers:
-        description: 'Comma-separated issue number(s) to label (e.g. 1234 or 1234,1235)'
-        required: true
-
-permissions:
-  models: read
-  issues: write
-
-concurrency:
-  # Each workflow run gets its own concurrency group.
-  # For issue events, group by issue number so a rapid close+reopen only runs once.
-  # For manual dispatch (which may cover multiple issues), use the unique run ID.
-  group: ${{ github.event_name == 'issues' && format('{0}-issue-{1}', github.workflow, github.event.issue.number) || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Apply area labels with AI
-        uses: actions/github-script@v7
-        env:
-          # actions/github-script does not propagate `github-token` to
-          # process.env. Expose it explicitly so the inline script can
-          # authenticate against the GitHub Models inference endpoint.
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            // When triggered manually, process each supplied issue number in turn.
-            // When triggered by an issue event, use the event's issue number.
-            let issueNumbers;
-            if (context.eventName === 'workflow_dispatch') {
-              issueNumbers = String(context.payload.inputs.issue_numbers)
-                .split(',')
-                .map(s => parseInt(s.trim(), 10))
-                .filter(n => Number.isFinite(n) && n > 0);
-            } else {
-              issueNumbers = [context.issue.number];
-            }
-
-            if (issueNumbers.length === 0) {
-              console.log('No valid issue numbers to process; skipping.');
-              return;
-            }
-
-            for (const issueNumber of issueNumbers) {
-              console.log(`\n--- Processing issue #${issueNumber} ---`);
-              await labelIssue(issueNumber);
-            }
-
-            async function labelIssue(issueNumber) {
-              // Fetch the issue so both the automatic and manual paths have the same data.
-              const { data: issue } = await github.rest.issues.get({
-                owner: context.repo.owner,
-                repo:  context.repo.repo,
-                issue_number: issueNumber,
-              });
-
-              const title = issue.title ?? '';
-              const body  = issue.body  ?? '';
-
-              if (!title && !body) {
-                console.log(`Issue #${issueNumber} has no title or body; skipping.`);
-                return;
-              }
-
-              // Truncation limit for issue body sent to the model. Keeps the
-              // prompt within the model's context window and avoids high token usage.
-              const MAX_BODY_LENGTH = 4000;
-
-              // Upper bound on model response tokens. A JSON array of label strings
-              // is compact; 200 tokens is more than enough for any realistic response.
-              const MAX_TOKENS = 200;
-
-              // All valid Product-* and Area-* labels the agent may choose from.
-              const VALID_LABELS = [
-                'Product-Advanced Paste',
-                'Product-Always On Top',
-                'Product-Awake',
-                'Product-Color Picker',
-                'Product-CommandNotFound',
-                'Product-Command Palette',
-                'Product-CropAndLock',
-                'Product-Environment Variables',
-                'Product-FancyZones',
-                'Product-File Explorer',
-                'Product-File Locksmith',
-                'Product-Find My Mouse',
-                'Product-Grab And Move',
-                'Product-Hosts File Editor',
-                'Product-Image Resizer',
-                'Product-Keyboard Manager',
-                'Product-LightSwitch',
-                'Product-Mouse Highlighter',
-                'Product-Mouse Jump',
-                'Product-Mouse Pointer Crosshairs',
-                'Product-Mouse Utilities',
-                'Product-Mouse Without Borders',
-                'Product-New+',
-                'Product-Peek',
-                'Product-PowerDisplay',
-                'Product-PowerRename',
-                'Product-PowerToys Run',
-                'Product-Quick Accent',
-                'Product-Registry Preview',
-                'Product-Screen Ruler',
-                'Product-Settings',
-                'Product-Shortcut Guide',
-                'Product-Text Extractor',
-                'Product-Workspaces',
-                'Product-ZoomIt',
-                'Area-Setup/Install',
-                'Area-Localization',
-              ];
-
-              const systemPrompt = `You are a GitHub issue triage assistant for the microsoft/PowerToys repository.
-              Your job is to classify issues by assigning the correct area label(s).
-
-              Rules:
-              - Only return labels from the following list, exactly as written:
-              ${VALID_LABELS.map(l => `  • ${l}`).join('\n')}
-              - Choose only the labels that clearly match the issue content.
-              - If the issue mentions multiple areas, include a label for each one.
-              - If no label fits, return an empty array.
-              - Respond with ONLY a JSON array of label strings, no explanation.
-                Example: ["Product-FancyZones","Product-Settings"]`;
-
-              const userPrompt = `Issue title: ${title}
-
-              Issue body:
-              ${body.slice(0, MAX_BODY_LENGTH)}`;
-
-              // Validate that the token is available before making the API call.
-              const token = process.env.GITHUB_TOKEN;
-              if (!token) {
-                console.log('GITHUB_TOKEN is not set; skipping.');
-                return;
-              }
-
-              // Call the GitHub Models inference endpoint (OpenAI-compatible).
-              const response = await fetch(
-                'https://models.inference.ai.azure.com/chat/completions',
-                {
-                  method: 'POST',
-                  headers: {
-                    'Authorization': `Bearer ${token}`,
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
-                    model: 'gpt-4o-mini',
-                    messages: [
-                      { role: 'system', content: systemPrompt },
-                      { role: 'user',   content: userPrompt   },
-                    ],
-                    max_tokens: MAX_TOKENS,
-                    // temperature: 0 ensures deterministic, consistent label
-                    // classification across similar issues.
-                    temperature: 0,
-                  }),
-                }
-              );
-
-              if (!response.ok) {
-                const errorBody = await response.text();
-                console.log(`GitHub Models API error: ${response.status} ${response.statusText} — ${errorBody}`);
-                return;
-              }
-
-              const data = await response.json();
-              const text = data.choices?.[0]?.message?.content?.trim() ?? '';
-              console.log(`Model response: ${text}`);
-
-              let suggested;
-              try {
-                suggested = JSON.parse(text);
-              } catch {
-                console.log('Could not parse model response as JSON; skipping.');
-                return;
-              }
-
-              if (!Array.isArray(suggested) || suggested.length === 0) {
-                console.log('No labels suggested by the model.');
-                return;
-              }
-
-              // Only apply labels that are in the allow-list.
-              const validSet = new Set(VALID_LABELS);
-              const toApply  = [...new Set(suggested.filter(l => validSet.has(l)))];
-
-              if (toApply.length === 0) {
-                console.log('Model returned no valid labels.');
-                return;
-              }
-
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo:  context.repo.repo,
-                issue_number: issueNumber,
-                labels: toApply,
-              });
-              console.log(`Issue #${issueNumber}: added labels: ${toApply.join(', ')}`);
-            }

.github/workflows/telemetry-pr-check.yml

@@ -1,35 +0,0 @@
-# NOTE: This workflow depends on .github/scripts/telemetry-pr-check.js for telemetry detection and PR comments.
-# Keep this workflow and script behavior in sync when making changes.
-name: Telemetry PR Check
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize, ready_for_review]
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "Pull Request Number to test against"
-        required: true
-        type: string
-
-permissions:
-  contents: read
-  pull-requests: write
-
-concurrency:
-  group: telemetry-pr-check-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  detect-telemetry-events:
-    if: ${{ github.event.pull_request.draft == false }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Detect telemetry event changes and comment PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: node .github/scripts/telemetry-pr-check.js

.pipelines/ESRPSigning_core.json

@@ -243,12 +243,8 @@
             "WinUI3Apps\\PowerToys.RegistryPreview.dll",
             "WinUI3Apps\\PowerToys.RegistryPreview.exe",
 
-            "WinUI3Apps\\PowerToys.ShortcutGuide.exe",
-            "WinUI3Apps\\PowerToys.ShortcutGuide.dll",
-            "WinUI3Apps\\PowerToys.ShortcutGuideModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.ShortcutGuide.IndexYmlGenerator.dll",
-            "WinUI3Apps\\PowerToys.ShortcutGuide.IndexYmlGenerator.exe",
-            "WinUI3Apps\\ShortcutGuide.CPPProject.dll",
+            "PowerToys.ShortcutGuide.exe",
+            "PowerToys.ShortcutGuideModuleInterface.dll",
 
             "PowerToys.ZoomIt.exe",
             "PowerToys.ZoomItModuleInterface.dll",
@@ -387,11 +383,6 @@
                 "ColorCode.Core.dll", 
                 "Microsoft.SemanticKernel.Connectors.Ollama.dll",
                 "OllamaSharp.dll",
-                "WinUI3Apps\\Google.Apis.dll",
-                "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/ci.yml

@@ -16,7 +16,6 @@ pr:
     include:
       - main
       - stable
-  drafts: false
 #  paths:
 #    exclude:
 #      - '**.md'

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

@@ -70,7 +70,7 @@ parameters:
     default: false
   - name: winAppSDKVersionNumber
     type: string
-    default: '2.0'
+    default: 1.6
   - name: useExperimentalVersion
     type: boolean
     default: false
@@ -200,7 +200,7 @@ jobs:
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
-      version: '10.0'
+      version: '9.0'
 
   - ${{ if eq(parameters.runTests, true) }}:
     - task: VisualStudioTestPlatformInstaller@1
@@ -418,7 +418,7 @@ jobs:
           /p:VCRTForwarders-IncludeDebugCRT=false
           /p:PowerToysRoot=$(Build.SourcesDirectory)
           /p:PublishProfile=InstallationPublishProfile.pubxml
-          /p:TargetFramework=net10.0-windows10.0.26100.0
+          /p:TargetFramework=net9.0-windows10.0.26100.0
           /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
           $(RestoreAdditionalProjectSourcesArg)
         platform: $(BuildPlatform)

.pipelines/v2/templates/job-build-ui-tests.yml

@@ -64,7 +64,7 @@ jobs:
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
-      version: '10.0'
+      version: '9.0'
 
   - template: .\steps-restore-nuget.yml
 

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -30,7 +30,7 @@ parameters:
     default: false
   - name: winAppSDKVersionNumber
     type: string
-    default: '2.0'
+    default: 1.6
   - name: useExperimentalVersion
     type: boolean
     default: false

.pipelines/v2/templates/pipeline-ui-tests-official-build.yml

@@ -27,7 +27,6 @@ stages:
               name: SHINE-INT-L
             ${{ else }}:
               name: SHINE-OSS-L
-            demands: ImageOverride -equals SHINE-VS18-Latest
           buildPlatforms:
             - ${{ parameters.platform }}
           uiTestModules: ${{ parameters.uiTestModules }}

.pipelines/v2/templates/steps-ensure-dotnet-version.yml

@@ -1,7 +1,7 @@
 parameters:
 - name: version
   type: string
-  default: "10.0"
+  default: "9.0"
 - name: sdk
   type: boolean
   default: false

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: versionNumber
     type: string
-    default: '2.0'
+    default: 1.6
   - name: useExperimentalVersion
     type: boolean
     default: false

.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'."

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -22,7 +22,7 @@ $totalList = $projFiles | ForEach-Object -Parallel {
     #Workaround for preventing exit code from dotnet process from reflecting exit code in PowerShell
     $procInfo = New-Object System.Diagnostics.ProcessStartInfo -Property @{ 
         FileName               = "dotnet.exe"; 
-        Arguments              = "list $csproj package --no-restore"; 
+        Arguments              = "list $csproj package"; 
         RedirectStandardOutput = $true; 
         RedirectStandardError  = $true; 
     }

DATA_AND_PRIVACY.md

@@ -242,13 +242,6 @@ Thank you for using PowerToys!
 | Microsoft.PowerToys.FindMyMouse_EnableFindMyMouse | Triggered when Find My Mouse is enabled. |
 | Microsoft.PowerToys.FindMyMouse_MousePointerFocused | Occurs when the mouse pointer is focused using Find My Mouse, including the activation method (double-tap left/right Ctrl, shake mouse, or shortcut). |
 
-### Grab And Move
-
-| Event Name | Description |
-| --- | --- |
-| Microsoft.PowerToys.GrabAndMove_EnableGrabAndMove | Triggered when Grab And Move is enabled or disabled. |
-| Microsoft.PowerToys.GrabAndMove_ShortcutUse | Logs an attempt to move or resize a window via the Alt+Drag shortcut, including whether it succeeded, the action type (move or resize), and the reason (e.g., started, blocked by game mode). |
-
 ### Hosts File Editor
 
 | Event Name | Description |
@@ -369,15 +362,6 @@ Thank you for using PowerToys!
 | Microsoft.PowerToys.Peek_Settings | Triggered when the settings for Peek are modified. |
 | Microsoft.PowerToys.Peek_SpaceModeEnabled | Triggered when the Space key activation mode is enabled or disabled in Peek. |
 
-### Power Display
-
-| Event Name | Description |
-| --- | --- |
-| Microsoft.PowerToys.PowerDisplay_EnablePowerDisplay | Triggered when Power Display is enabled or disabled. |
-| Microsoft.PowerToys.PowerDisplay_Activate | Triggered when Power Display is activated via hotkey or tray toggle. |
-| Microsoft.PowerToys.PowerDisplay_Start | Triggered when the Power Display application process starts. |
-| Microsoft.PowerToys.PowerDisplay_Settings | Periodic snapshot of Power Display settings, including whether the hotkey and tray icon are enabled, the number of detected monitors, and the number of saved profiles. |
-
 ### PowerRename
 
 | Event Name | Description |

Directory.Build.props

@@ -171,12 +171,6 @@
       $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
     </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
 
-    <!-- dotnet.exe seems to access files after builds. Temporarily putting in this entry for testing if we get further. This looks to be related to a .NET Roslyn Analyzer in .NET 10-->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns);
-      \**\dotnet\dotnet.exe;
-      \**\vbcscompiler.exe;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns>
     <!-- 
       This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
       the cache to use copies instead of hardlinks when pulling from cache.

Directory.Build.targets

@@ -65,20 +65,4 @@
   <!-- Note: For C++ skipped test projects, build is effectively skipped by removing all compile items above.
        We don't define empty Build/Rebuild/Clean targets here because MSBuild Target definitions with Condition
        on the Target element still override the default targets even when condition is false. -->
-
-  <!-- Clean up unused VC++ runtime DLLs that CopyCppRuntimeToOutputDir copies from the full
-       VCRedist tree (MFC, C++ AMP, OpenMP). No PowerToys binary links against these — verified
-       with dumpbin /dependents across all installed binaries. -->
-  <Target Name="RemoveUnusedVCRuntimeDlls"
-          AfterTargets="Build"
-          Condition="'$(CopyCppRuntimeToOutputDir)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">
-    <ItemGroup>
-      <_UnusedVCRuntimeDlls Include="$(OutDir)mfc140*.dll" />
-      <_UnusedVCRuntimeDlls Include="$(OutDir)mfcm140*.dll" />
-      <_UnusedVCRuntimeDlls Include="$(OutDir)vcamp140*.dll" />
-      <_UnusedVCRuntimeDlls Include="$(OutDir)vcomp140*.dll" />
-    </ItemGroup>
-    <Delete Files="@(_UnusedVCRuntimeDlls)" Condition="'@(_UnusedVCRuntimeDlls)' != ''" />
-    <Message Importance="normal" Text="Cleaned up unused VC runtime DLLs: @(_UnusedVCRuntimeDlls)" Condition="'@(_UnusedVCRuntimeDlls)' != ''" />
-  </Target>
 </Project>

Directory.Packages.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -39,37 +39,36 @@
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <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.7" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
     <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.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.Extensions.AI" Version="9.9.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.10" />
     <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" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" Version="1.71.0-beta" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.71.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.71.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.71.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" Version="1.66.0-beta" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.66.0-alpha" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3719.77" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- 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.7" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.10" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.269" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- 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. -->
     <!-- 
       TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
@@ -78,10 +77,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.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.WindowsAppSDK" Version="1.8.260209005" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.260203002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.47" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.260209005" />
     <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" />
@@ -90,11 +89,11 @@
     <PackageVersion Include="MSTest" Version="$(MSTestVersion)" />
     <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
     <PackageVersion Include="NJsonSchema" Version="11.4.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
-    <PackageVersion Include="OpenAI" Version="2.7.0" />
+    <PackageVersion Include="OpenAI" Version="2.5.0" />
     <PackageVersion Include="Polly.Core" Version="8.6.5" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
@@ -106,28 +105,31 @@
     <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.7" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.10" />
+    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <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" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.10" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.10" />
+    <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
+    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- 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.7" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.10" />
     <!-- 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.7" />
-    <PackageVersion Include="System.ClientModel" Version="1.8.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="10.0.7" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.10" />
+    <PackageVersion Include="System.ClientModel" Version="1.7.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.10" />
     <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.7" />
+    <PackageVersion Include="System.Management" Version="9.0.10" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Numerics.Tensors" Version="10.0.2" />
+    <PackageVersion Include="System.Numerics.Tensors" Version="9.0.11" />
     <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.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.Runtime.Caching" Version="9.0.10" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <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" />
@@ -135,8 +137,8 @@
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
     <PackageVersion Include="WinUIEx" Version="2.8.0" />
     <PackageVersion Include="WmiLight" Version="6.14.0" />
+    <PackageVersion Include="WPF-UI" Version="3.0.5" />
     <PackageVersion Include="WyHash" Version="1.0.5" />
-    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
     <PackageVersion Include="WixToolset.Firewall.wixext" Version="5.0.2" />
     <PackageVersion Include="WixToolset.Util.wixext" Version="5.0.2" />

NOTICE.md

@@ -1587,6 +1587,7 @@ SOFTWARE.
 - NLog.Extensions.Logging
 - NLog.Schema
 - OpenAI
+- Polly.Core
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
@@ -1600,5 +1601,5 @@ SOFTWARE.
 - UTF.Unknown
 - WinUIEx
 - WmiLight
+- WPF-UI
 - WyHash
-- YamlDotNet

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/">
@@ -207,10 +206,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Actions/Microsoft.CmdPal.Ext.Actions.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Microsoft.CmdPal.Ext.Bookmarks.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -802,14 +797,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" />
@@ -998,16 +985,9 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
   </Folder>
-  <Folder Name="/modules/ShortcutGuide/">
-    <Project Path="src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/ShortcutGuide.IndexYmlGenerator.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/ShortcutGuide/ShortcutGuide.Ui/ShortcutGuide.Ui.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj" Id="e487304a-b1fb-4e6b-8e70-014051af5b99" />
+  <Folder Name="/modules/shortcutguide/">
+    <Project Path="src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj" Id="2edb3eb4-fa92-4bff-b2d8-566584837231" />
+    <Project Path="src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj" Id="2d604c07-51fc-46bb-9eb7-75aecc7f5e81" />
   </Folder>
   <Folder Name="/modules/Workspaces/">
     <Project Path="src/modules/Workspaces/Workspaces.ModuleServices/Workspaces.ModuleServices.csproj">
@@ -1142,5 +1122,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>
-
-

README.md

@@ -47,7 +47,21 @@ But to get started quickly, choose one of the installation methods below:
 <summary><strong>Download the .exe file from GitHub</strong></summary>
 <br/>
 
-Go to the [PowerToys GitHub releases](https://aka.ms/installPowerToys), scroll down and select **Assets** to reveal the installation files, and choose the one that matches your architecture and install scope. For most devices, that would be _x64 per-user_.
+Go to the [PowerToys GitHub releases](https://aka.ms/installPowerToys), select **Assets** to reveal the installation files, and choose the one that matches your architecture and install scope. For most devices, that would be _x64 per-user_.
+
+<!-- items that need to be updated release to release -->
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.100%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysUserSetup-0.99.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysUserSetup-0.99.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysSetup-0.99.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysSetup-0.99.0-arm64.exe
+
+| Description | Filename |
+| --- | --- |
+| Per user - x64       | [PowerToysUserSetup-0.99.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.99.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.99.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.99.0-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -92,7 +106,7 @@ There are [community driven install methods](https://learn.microsoft.com/windows
 
 [![What's new image](doc/images/readme/Release-Banner.png)](https://github.com/microsoft/PowerToys/releases)
 
-To see what's new, check out the [release notes](https://github.com/microsoft/PowerToys/releases/).
+To see what's new, check out the [release notes](https://github.com/microsoft/PowerToys/releases/tag/v0.99.0).
 
 ## 🛣️ Roadmap
 
@@ -117,4 +131,3 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md
 [community-link]: COMMUNITY.md
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.100%22

auto-cherry-pick.ps1

@@ -1,54 +0,0 @@
-# Auto-resolve cherry-pick conflicts
-param([int]$MaxAttempts = 100)
-
-$attempts = 0
-while ($attempts -lt $MaxAttempts) {
-    $attempts++
-    
-    # Check if cherry-pick is in progress
-    $status = git status --porcelain
-    if (-not $status) {
-        Write-Host "Cherry-pick complete!" -ForegroundColor Green
-        break
-    }
-    
-    # Get conflicted files
-    $conflicts = git diff --name-only --diff-filter=U
-    
-    if ($conflicts) {
-        Write-Host "Attempt $attempts`: Resolving conflicts..." -ForegroundColor Yellow
-        
-        foreach ($file in $conflicts) {
-            Write-Host "  Resolving: $file"
-            git checkout --ours $file 2>$null
-        }
-        
-        # Handle deleted files
-        git status --short | Where-Object { $_ -match '^DU' } | ForEach-Object {
-            $file = ($_ -split '\s+', 2)[1]
-            Write-Host "  Removing deleted: $file"
-            git rm $file 2>$null
-        }
-        
-        git add . 2>$null
-    }
-    
-    # Try to continue
-    $result = git cherry-pick --continue 2>&1
-    
-    if ($LASTEXITCODE -eq 0) {
-        Write-Host "  Continued successfully" -ForegroundColor Green
-    }
-    elseif ($result -match 'empty') {
-        Write-Host "  Skipping empty commit" -ForegroundColor Cyan
-        git cherry-pick --skip 2>&1 | Out-Null
-    }
-    else {
-        Write-Host "  Error: $result" -ForegroundColor Red
-        Start-Sleep -Seconds 1
-    }
-}
-
-if ($attempts -ge $MaxAttempts) {
-    Write-Host "Max attempts reached. Check status manually." -ForegroundColor Red
-}

deps/spdlog.props

@@ -2,7 +2,7 @@
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)spdlog\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;FMT_UNICODE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ClCompile>
 	</ItemDefinitionGroup>
 </Project>

doc/devdocs/modules/cmdpal/command-pal-anatomy/command-palette-anatomy.md

@@ -60,7 +60,7 @@ A markdown page is a page inside of command palette that displays markdown conte
 
 ```csharp
  interface IMarkdownPage requires IPage {
-     String[] Bodies(); 
+     String[] Bodies(); // TODO! should this be an IBody, so we can make it observable?
      IDetails Details();
      IContextItem[] Commands { get; };
  }

doc/devdocs/modules/cmdpal/extension-gallery.md

@@ -1,167 +0,0 @@
-# Command Palette Extension Gallery
-
-This document describes how Command Palette (CmdPal) discovers extensions for
-the in-app **Extension gallery** page.
-
-## At a glance
-
-- The gallery loads a single JSON feed called `extensions.json` from a remote
-  HTTPS URL, parses it, and renders the entries.
-- The default feed lives in the external repo
-  **`microsoft/CmdPal-Extensions`** at
-  `https://aka.ms/CmdPal-ExtensionsJson`.
-- Feed content + icon images are cached on disk so the page works offline and
-  survives short network hiccups.
-- There is no WinGet discovery, no per-extension `manifest.json` fetch, and no
-  other network call for rendering the list.
-
-## Implementation pointers
-
-| Concern | File |
-| --- | --- |
-| Fetching, parsing, caching, pruning | `Microsoft.CmdPal.Common/ExtensionGallery/Services/ExtensionGalleryService.cs` |
-| Resolving which URL to fetch | `Microsoft.CmdPal.Common/ExtensionGallery/Services/GalleryFeedUrlProvider.cs` + `Microsoft.CmdPal.UI/Helpers/GalleryServiceRegistration.cs` |
-| HTTP + on-disk cache | `Microsoft.CmdPal.Common/ExtensionGallery/Services/ExtensionGalleryHttpClient.cs` (wraps `Microsoft.CmdPal.Common/Services/HttpCaching/HttpCachingClient`) |
-| Feed + entry models | `Microsoft.CmdPal.Common/ExtensionGallery/Models/` |
-
-## Feed URL resolution
-
-`ExtensionGalleryService.GetFeedUrl()` returns, in order:
-
-1. The user-configured URL from CmdPal settings (`SettingsModel.GalleryFeedUrl`,
-   exposed via the hidden `InternalPage` settings page). Any non-empty value
-   wins. Mostly used for local testing against a custom feed.
-2. Otherwise, the built-in default
-   `https://aka.ms/CmdPal-ExtensionsJson`.
-
-Local `file://` URIs are allowed too — `FetchFeedDocumentAsync` reads the file
-directly and bypasses the HTTP cache.
-
-## Feed format
-
-The feed is a single wrapped JSON document with inline entries:
-
-```json
-{
-  "$schema": "https://raw.githubusercontent.com/microsoft/CmdPal-Extensions/main/.github/schemas/gallery.schema.json",
-  "extensions": [
-    {
-      "id": "sample-extension",
-      "title": "Sample Extension",
-      "description": "A sample extension demonstrating the gallery feed format.",
-      "author": { "name": "Microsoft", "url": "https://github.com/microsoft" },
-      "homepage": "https://github.com/microsoft/CmdPal-Extensions",
-      "iconUrl": "https://.../icon.png",
-      "screenshotUrls": ["https://.../screenshot-1.png"],
-      "tags": ["sample"],
-      "installSources": [
-        { "type": "winget",  "id":  "Contoso.SampleExtension" },
-        { "type": "msstore", "id":  "9P…" },
-        { "type": "url",     "uri": "https://github.com/contoso/sample/releases/latest" }
-      ],
-      "detection": { "packageFamilyName": "Contoso.SampleExtension_1234567890abc" }
-    }
-  ]
-}
-```
-
-Only the `extensions` array is read at runtime. The authoritative JSON
-schema for an entry lives in the upstream feed repo
-([`microsoft/CmdPal-Extensions`](https://github.com/microsoft/CmdPal-Extensions));
-don't duplicate it here — it drifts.
-
-### Required + optional entry fields
-
-| Field | Required | Notes |
-| --- | --- | --- |
-| `id` | yes | Lowercase stable identifier; entries with empty id are dropped. |
-| `title` | yes | Display name. |
-| `description` | yes | Shown in list and detail views. |
-| `author.name` | yes | `author.url` optional. |
-| `installSources` | yes | At least one entry; see [Install sources](#install-sources). |
-| `homepage`, `iconUrl`, `screenshotUrls`, `tags`, `detection.packageFamilyName` | no | All optional. |
-
-Relative `iconUrl` / `screenshotUrls` are resolved against the feed URL's
-directory (useful only for local / `file://` feeds during development).
-
-## Install sources
-
-Each entry's `installSources` is consumed by
-`ExtensionGalleryItemViewModel` to decide which install affordances to show.
-
-| `type` | Required field | Behaviour |
-| --- | --- | --- |
-| `winget` | `id` | Enables the "Install via WinGet" button (uses the shared WinGet service), and joins in-flight install progress + installed/update status. |
-| `msstore` | `id` | Opens `ms-windows-store://pdp/?ProductId={id}`. |
-| `url` | `uri` | Shown as a "GitHub" or "Website" link depending on host. |
-
-An entry can declare any combination. Sources the runtime does not recognise
-are surfaced as an "unknown source" indicator.
-
-## Fetching and caching
-
-`ExtensionGalleryService` uses `ExtensionGalleryHttpClient`, which wraps
-`HttpCachingClient` over a file-system cache. Both the feed JSON and any
-cacheable icon URLs are cached.
-
-| Setting | Value | Defined in |
-| --- | --- | --- |
-| Cache root | `{AppCache}\GalleryCache\` | `ExtensionGalleryHttpClient.CacheDirectoryName` |
-| Feed TTL | 4 hours | `ExtensionGalleryHttpClient.DefaultTimeToLive` |
-| Icon TTL | 24 hours | `ExtensionGalleryService.IconCacheTtl` |
-| HTTP timeout | 15 s | `ExtensionGalleryHttpClient` |
-| `User-Agent` | `PowerToys-CmdPal/1.0` | `ExtensionGalleryHttpClient` |
-
-`{AppCache}` resolves to `ApplicationData.Current.LocalCacheFolder` when
-CmdPal runs packaged, and to
-`%LOCALAPPDATA%\Microsoft\PowerToys\Microsoft.CmdPal\Cache\` when unpackaged
-(see `ApplicationInfoService.DetermineCacheDirectory`).
-
-### Fetch flow
-
-`GetExtensionsAsync` (normal load) and `RefreshAsync` (user-initiated
-refresh, `forceRefresh: true`) both go through `FetchWrappedFeedAsync`:
-
-1. Resolve the feed URL (see above).
-2. If the URL is local, read it from disk. Otherwise, hand it to
-   `HttpCachingClient.GetResourceAsync` which:
-   - Serves a fresh cached copy if one exists and TTL has not elapsed.
-   - Otherwise issues a conditional GET (ETag / `If-None-Match`). On `304
-     Not Modified` it refreshes the cache metadata and returns the cached
-     body.
-   - On network failure it returns the last-known cached body with
-     `UsedFallbackCache = true`, so the UI can show a "stale data" banner.
-3. Parse the JSON with the source-generated `GallerySerializationContext`
-   (strongly-typed `GalleryRemoteIndex` — no reflection, AOT-friendly).
-4. Drop entries with missing `id`, normalize relative `iconUrl` and
-   `screenshotUrls`, and resolve remote icon URIs through the same HTTP
-   cache so the UI binds to local `file://` URIs.
-5. On a successful forced refresh, `PruneCachedResources` deletes cache
-   entries that are no longer referenced by the current feed (old feed URL
-   and icon URLs that dropped out of the feed).
-
-### Fetch result flags
-
-`GetExtensionsAsync` returns a `GalleryFetchResult` that the view model uses
-for UI hints:
-
-| Flag | Meaning |
-| --- | --- |
-| `FromCache` | The feed came from cache without hitting the network (TTL still valid). |
-| `UsedFallbackCache` | A network request was attempted and failed, and the cached copy was served as fallback. The UI shows a stale-data info bar. |
-| `RateLimited` | The origin returned `429 Too Many Requests` and no fallback was available. The UI shows a rate-limit error. |
-
-## Authoring
-
-- Entries for the production gallery are added to the feed repo
-  `microsoft/CmdPal-Extensions`.
-- For editor validation of an entry, reference the schema published in the
-  upstream repo via the entry's `$schema` field.
-- Keep `id` stable once an extension is published — users may have it
-  installed and the gallery keys install status by id.
-- Prefer providing a `winget` source when the extension ships through App
-  Installer; the gallery uses it both for status ("Installed" / "Update
-  available") and for the in-app install button.
-- `detection.packageFamilyName` lets the gallery recognise an
-  already-installed packaged extension before WinGet metadata resolves.
-

doc/devdocs/modules/cmdpal/initial-sdk-spec/initial-sdk-spec.md

@@ -76,13 +76,6 @@ functionality.
     - [Status messages](#status-messages)
     - [Rendering of ICommandItems in Lists and Menus](#rendering-of-icommanditems-in-lists-and-menus)
   - [Addenda I: API additions (ICommandProvider2)](#addenda-i-api-additions-icommandprovider2)
-  - [Addenda II: Commands with Parameters](#addenda-ii-commands-with-parameters)
-    - [String parameters](#string-parameters)
-    - [Command parameters - Invokable Commands](#command-parameters---invokable-commands)
-    - [Command parameters - List Commands](#command-parameters---list-commands)
-    - [Examples](#examples)
-  - [Addenda III: Rich Search (DRAFT)](#addenda-iii-rich-search-draft)
-    - [Nov 2025 status](#nov-2025-status)
   - [Addenda IV: Dock bands](#addenda-iv-dock-bands)
     - [Pinning nested commands to the dock (and top level)](#pinning-nested-commands-to-the-dock-and-top-level)
   - [Class diagram](#class-diagram)
@@ -2055,183 +2048,6 @@ Fortunately, we can put all of that (`GetApiExtensionStubs`,
 developers won't have to do anything. The toolkit will just do the right thing
 for them.
 
-## Addenda II: Commands with Parameters
-
-Extensions will often want to provide commands that accept parameters from the
-user.
-
-To support this, we're adding a new page type. The `IParametersPage` is a page
-that allows an extension to define a set of parameters that the user can fill.
-These parameters can be of different types, such as:
-* Labels: static text that provides context or instructions.
-* String parameters: text input fields where the user can type a string.
-* Command parameters: interactive fields that allow the user to select from a
-  list of predefined commands, or just press a button to select an input.
-
-Interleaving labels with parameters allows extensions to create rich, guided
-input forms for their commands. These are a more lightweight solution than the
-current adaptive card content. 
-
-```csharp
-[uuid("a2590cc9-510c-4af7-b562-a6b56fe37f55")]
-interface IParameterRun requires INotifyPropChanged
-{
-};
-
-interface ILabelRun requires IParameterRun
-{
-    String Text{ get; };
-};
-
-interface IParameterValueRun requires IParameterRun
-{
-    String PlaceholderText{ get; };
-    Boolean NeedsValue{ get; }; // TODO! name is weird
-};
-
-interface IStringParameterRun requires IParameterValueRun
-{
-    String Text{ get; set; };
-
-    // TODO! do we need a way to validate string inputs?
-};
-
-interface ICommandParameterRun requires IParameterValueRun
-{
-    String DisplayText{ get; };
-    ICommand GetSelectValueCommand(UInt64 hostHwnd);
-    IIconInfo Icon{ get; }; // ? maybe
-
-};
-
-interface IParametersPage requires IPage
-{
-    IParameterRun[] Parameters{ get; };
-    IListItem Command{ get; };
-};
-```
-
-When we open a `IParametersPage`, we will render the `Parameters` in the search
-box. We'll move focus to the first `IParameterRun` that is not a `ILabelRun`.
-What those interactions looks like depends on the type of `IParameterRun`. 
-
-There are three basic types of inputs: strings, invokable commands, and lists.
-Strings are a special case that doesn't require a command to set the value.
-Lists and invokable commands are picked based on the type of the
-`SelectValueCommand`. Each of these are detailed below. 
-
-When all the parameters have `NeedsValue` set to `false`, we will display a
-single item to the user - the `Command` item. 
-
-### String parameters
-
-These are rendered as a text box within the search box. The user can type into
-it. Focus is moved to the next parameter when the user presses Enter or tab. 
-
-### Command parameters - Invokable Commands
-
-These are used when the `SelectValueCommand` is an `IInvokableCommand`.
-
-These are rendered as a button within the search box. The button text is
-`DisplayText` if it is set. If it is not, we will display the
-`PlaceholderText`. If the user clicks the button, we invoke the
-`SelectValueCommand` (and ignore the `CommandResult`).
-
-This is good for file pickers, date pickers, color pickers, etc. Anything that
-requires a custom UI to pick a value.
-
-When the extension has picked a value, it should set the `NeedsValue` to false. 
-The extension can also set the `DisplayText` and `Icon` to reflect the chosen value.
-
-When the user presses enter with the button focused, we will also invoke the
-`SelectValueCommand`.
-
-When the user presses tab, we will move focus to the next parameter.
-
-If the `NeedsValue` property is changed to `false` while it's focused, we will
-move focus to the next parameter.
-
-### Command parameters - List Commands
-
-These are used when the `SelectValueCommand` is an `IListPage` - both static and
-dynamic lists work similarly.
-
-These are rendered as a text box within the search box. When the user focuses
-the text box, we will display the items from the `IListPage` in the body of
-CmdPal. The user can then type to filter the list. This filtering will work the
-same way as any other list page in CmdPal - CmdPal will filter static lists, or
-pass the query to a dynamic list.
-
-The items in this list should all be `IListItem` objects with
-`IInvokableCommands`. Putting a `IPage` into one of these items will cause the
-user to navigate away from the parameters page, which would probably be
-unexpected.
-
-When the user picks an item from the list, the extension should handle that
-command by bubbling an event up to the `CommandRun`, and setting the `Value`,
-`DisplayText`, and `Icon` properties, and setting `NeedsValue` to false.
-
-When the user presses enter with the text box focused, we will invoke the
-command of the selected item in the list. 
-
-When the user presses tab, we will move focus to the next parameter.
-
-If the `NeedsValue` property is changed to `false` while it's focused, we will
-move focus to the next parameter.
-
-### Examples
-
-Lets say you had a command like "Create a note \${title} in \${folder}".
-`title` is a string input, and `folder` is a static list of folders. 
-
-The extension author can then define a `IParametersPage` with four runs in it:
-* A `ILabelRun` for "Create a note"
-* A `IStringParameterRun` for the `title`
-* A `ILabelRun` for "in"
-* A `ICommandParameterRun` for the `folder`. The `Command` will be a
-  `IListPage`, where the items are possible folders
-
-In this example, the user can pick the "create note" command, then type the
-title, hit enter/tab, and then pick a folder from the list, then hit enter to
-run the command.
-
-Samples for the parameters page are implemented over in 
-[the sample extension](../../ext/SamplePagesExtension/Pages/ParameterSamples.cs)
-
-
-## Addenda III: Rich Search (DRAFT)
-
-> [!NOTE]
-> _Mike_: Rich search and parameters were prototyped together, but ultimately we used two different solutions. 
->
-> Currently, we have a dummy implementation of draft C (ZWSP tokens), but without full API changes. Detailed [below](#nov-2025-status).
-
-Extensions will often want to provide rich search experiences for their users.
-
-This addenda is broken into multiple draft specs currently. These represent
-different approaches to the same goals. 
-
-* **A**: [Rich Search Box](./drafts/RichSearchBox-draft-A.md)
-* **B**: [Prefix Search](./drafts/PrefixSearch-draft-B.md)
-* **C**: [ZWSP tokens](./drafts/PlainRichSearch-draft-C.md)
-
-### Nov 2025 status
-
-As of Nov 2025, we're implementing a simple version of draft C in the host. 
-
-In this version, if the extension implements `IDynamicListPage`, and also
-implements `IExtendedAttributesProvider`, then they can set the `TokenSearch`
-property. This will enlighten CmdPal to treat ZWSP-separated tokens in the
-search text specially. 
-
-For an example, see 
-[this sample implementation](../../ext/SamplePagesExtension/Pages/SampleSuggestionsPage.cs).
-
-In my head, I am still leaning towards a more full-featured version of draft C,
-but with full CommandItem's in the `ISearchUpdateArgs` instead of just strings.
-We'd almost need a new page type to support that, where the extension can add
-`ICommandItem`s to the search box directly.
-
 ## Addenda IV: Dock bands
 
 The "dock" is another way to surface commands to the user. This is a
@@ -2342,6 +2158,7 @@ because that method is was designed for two main purposes:
 In neither of those scenarios was the full "display" of the item needed. In
 pinning scenarios, however, we need everything that the user would see in the UI
 for that item, which is all in the `ICommandItem`.
+
 ## Class diagram
 
 This is a diagram attempting to show the relationships between the various types we've defined for the SDK. Some elements are omitted for clarity. (Notably, `IconData` and `IPropChanged`, which are used in many places.)

doc/devdocs/modules/launcher/new-plugin-checklist.md

@@ -3,9 +3,9 @@
 - [ ] The plugin is a project under `modules\launcher\Plugins`
 - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}`
 - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}`
-- [ ] The plugin target framework should be `net10.0-windows10.0.22621.0`
+- [ ] The plugin target framework should be `net9.0-windows10.0.22621.0`
 - [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props`
-- [ ] 3rd party dependencies must be compatible with .NET 10
+- [ ] 3rd party dependencies must be compatible with .NET 9
 - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder:
 
 ```json

doc/devdocs/modules/shortcut_guide.md

@@ -9,14 +9,12 @@
 [Pull Requests](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+is%3Aopen+label%3A%22Product-Shortcut+Guide%22+)
 
 ## Overview
-Shortcut Guide is a PowerToy that displays an overlay of available keyboard shortcuts when a user-set keyboard shortcut is pressed. It helps users discover and remember keyboard shortcuts for Windows and apps.
-
-> [!NOTE]
-> The spec for the manifest files is in development and will be linked here once available.
+Shortcut Guide is a PowerToy that displays an overlay of available keyboard shortcuts when the Windows key is pressed and held. It provides a visual reference for Windows key combinations, helping users discover and utilize built-in Windows shortcuts.
 
 ## Usage
-- Press the user-defined hotkey to display the overlay
-- Press the hotkey again or press ESC to dismiss the overlay
+- Press and hold the Windows key to display the overlay of available shortcuts
+- Press the hotkey again to dismiss the overlay
+- The overlay displays Windows shortcuts with their corresponding actions
 
 ## Build and Debug Instructions
 
@@ -27,89 +25,67 @@ Shortcut Guide is a PowerToy that displays an overlay of available keyboard shor
 4. The executable is named PowerToys.ShortcutGuide.exe
 
 ### Debug
-1. Right-click the ShortcutGuide.Ui project and select 'Set as Startup Project'
+1. Right-click the ShortcutGuide project and select 'Set as Startup Project'
 2. Right-click the project again and select 'Debug'
 
-> [!NOTE]
-> When run in debug mode, the window behaves differently than in release mode. It will not automatically close when loosing focus, it will be displayed on top of all other windows, and it is not hidden from the taskbar. 
+## Code Structure
 
-## Project Structure
+![Diagram](../images/shortcutguide/diagram.png)
 
-The Shortcut Guide module consists of the following 4 projects:
+### Core Files
 
-### [`ShortcutGuide.Ui`](/src/modules/ShortcutGuide/ShortcutGuide.Ui/ShortcutGuide.Ui.csproj
+#### [`dllmain.cpp`](/src/modules/shortcut_guide/dllmain.cpp)
+Contains DLL boilerplate code. Implements the PowertoyModuleIface, including enable/disable functionality and GPO policy handling. Captures hotkey events and starts the PowerToys.ShortcutGuide.exe process to display the shortcut guide window.
 
-This is the main UI project for the Shortcut Guide module. Upon startup it does the following tasks:
+#### [`shortcut_guide.cpp`](/src/modules/shortcut_guide/shortcut_guide.cpp)
+Contains the module interface code. It initializes the settings values and the keyboard event listener. Defines the OverlayWindow class, which manages the overall logic and event handling for the PowerToys Shortcut Guide.
 
-1. Copies the built-in manifest files to the users manifest directory (overwriting existing files).
-2. Generate the `index.yml` manifest file.
-3. Populate the PowerToys shortcut manifest with the user-defined shortcuts.
-4. Starts the UI.
+#### [`overlay_window.cpp`](/src/modules/shortcut_guide/overlay_window.cpp)
+Contains the code for loading the SVGs, creating and rendering of the overlay window. Manages and displays overlay windows with SVG graphics through two main classes:
+- D2DOverlaySVG: Handles loading, resizing, and manipulation of SVG graphics
+- D2DOverlayWindow: Manages the display and behavior of the overlay window
 
-### Related files in PowerToys.Interop
+#### [`keyboard_state.cpp`](/src/modules/shortcut_guide/keyboard_state.cpp)
+Contains helper methods for checking the current state of the keyboard.
 
-#### [`excluded_app.cpp`](/src/modules/ShortcutGuide/ShortcutGuide.CPPProject/excluded_app.cpp)
+#### [`target_state.cpp`](/src/modules/shortcut_guide/target_state.cpp)
+State machine that handles the keyboard events. It's responsible for deciding when to show the overlay, when to suppress the Start menu (if the overlay is displayed long enough), etc. Handles state transitions and synchronization to ensure the overlay is shown or hidden appropriately based on user interactions.
 
-This file contains one function with the following signature:
+#### [`trace.cpp`](/src/modules/shortcut_guide/trace.cpp)
+Contains code for telemetry.
 
-```cpp
-__declspec(dllexport) bool IsCurrentWindowExcludedFromShortcutGuide()
-```
+### Supporting Files
 
-This function checks if the current window is excluded from the Shortcut Guide overlay. It returns `true` if the current window is excluded otherwise it returns `false`.
+#### [`animation.cpp`](/src/modules/shortcut_guide/animation.cpp)
+Handles the timing and interpolation of animations. Calculates the current value of an animation based on elapsed time and a specified easing function.
 
-#### [`tasklist_positions.cpp`](/src/modules/ShortcutGuide/ShortcutGuide.CPPProject/tasklist_positions.cpp)
+#### [`d2d_svg.cpp`](/src/modules/shortcut_guide/d2d_svg.cpp)
+Provides functionality for loading, resizing, recoloring, rendering, and manipulating SVG images using Direct2D.
 
-This file contains helper functions to retrieve the positions of the taskbar buttons. It exports the following function:
+#### [`d2d_text.cpp`](/src/modules/shortcut_guide/d2d_text.cpp)
+Handles creation, resizing, alignment, and rendering of text using Direct2D and DirectWrite.
 
-```cpp
-__declspec(dllexport) TasklistButton* get_buttons(HMONITOR monitor, int* size)
-```
+#### [`d2d_window.cpp`](/src/modules/shortcut_guide/d2d_window.cpp)
+Manages a window using Direct2D and Direct3D for rendering. Handles window creation, resizing, rendering, and destruction.
 
-This function retrieves the positions of the taskbar buttons for a given monitor. It returns an array of `TasklistButton` structures (max 10), which contain the position and size of each button.
+#### [`native_event_waiter.cpp`](/src/modules/shortcut_guide/native_event_waiter.cpp)
+Waits for a named event and executes a specified action when the event is triggered. Uses a separate thread to handle event waiting and action execution.
 
-`monitor` must be the monitor handle of the monitor containing the taskbar instance of which the buttons should be retrieved.
+#### [`tasklist_positions.cpp`](/src/modules/shortcut_guide/tasklist_positions.cpp)
+Handles retrieving and updating the positions and information of taskbar buttons in Windows.
 
-`size` will contain the resulting array size.
-
-It determines the positions through Windows `FindWindowEx` function.
-For the primary taskbar it searches for:
-* A window called "Shell_TrayWnd"
-* that contains a window called "ReBarWindow32"
-* that contains a window called "MSTaskSwWClass"
-* that contains a window called "MSTaskListWClass"
-
-For any secondary taskbar it searches for:
-* A window called "Shell_SecondaryTrayWnd"
-* that contains a window called "WorkerW"
-* that contains a window called "MSTaskListWClass"
-
-It then enumerates all the button elements inside "MSTaskListWClass" while skipping such with a same name (which implies the user does not use combining taskbar buttons) 
-
-If this method fails, which it will for newer versions of Windows, it falls back to searching for:
-* A window called "Shell_TrayWnd" or "Shell_SecondaryTrayWnd"
-* that contains a window called "Windows.UI.Composition.DesktopWindowContentBridge"
-* that contains a window called "Windows.UI.Input.InputSite.WindowClass"
-* the first child element
-
-It then enumerates all the button elements inside the selected while skipping such with a same name (which implies the user does not use combining taskbar buttons) and such that do not start with "Appid:" (which are not actual taskbar buttons related to apps, but others like the widgets or the search button).
-
-### [`ShortcutGuide.IndexYmlGenerator`](/src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/)
-
-This application generates the `index.yml` manifest file.
-
-It is a separate project so that its code can be easier ported to WinGet in the future.
-
-### [`ShortcutGuideModuleInterface`](/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj)
-
-The module interface that handles opening and closing the user interface.
+#### [`main.cpp`](/src/modules/shortcut_guide/main.cpp)
+The entry point for the PowerToys Shortcut Guide application. Handles initialization, ensures single instance execution, manages parent process termination, creates and displays the overlay window, and runs the main event loop.
 
 ## Features and Limitations
 
-- Currently the displayed shortcuts (Except the ones from PowerToys) are not localized.
+- The overlay displays Windows shortcuts (Windows key combinations)
+- The module supports localization, but only for the Windows controls on the left side of the overlay
 - It's currently rated as a P3 (lower priority) module
 
 ## Future Development
 
-- Implementing with WinGet to get new shortcut manifest files
-- Adding localization support for the built-in manifest files
+A community-contributed version 2 is in development that will support:
+- Application-specific shortcuts based on the active application
+- Additional shortcuts beyond Windows key combinations
+- PowerToys shortcuts

doc/specs/WinGet Manifest Keyboard Shortcuts schema.md

@@ -1,318 +0,0 @@
-# WinGet Manifest Keyboard Shortcuts schema
-
-## 1 What this spec is about
-
-This spec provides an extension to the existing [WinGet manifest schema](https://github.com/microsoft/winget-pkgs/blob/master/doc/manifest/README.md) in form of an additional yaml file, that describes keyboard shortcuts the application provides.
-
-These yaml files are saved on a per-user base and so called manifest interpreters can then display these manifests in a human-friendly version.
-
-### 1.1 What this spec is not about
-
-This spec does not provide a way to back up or save user-defined keyboard shortcuts.
-
-## 2 Save location of manifests
-
-### 2.1 WinGet 
-
-These files are saved online along with the other manifest files in the [WinGet Package repository](https://github.com/microsoft/winget-pkgs).
-
-### 2.2 Locally
-
-All manifests and one index file are saved locally under `%LocalAppData%/Microsoft/WinGet/KeyboardShortcuts`. All apps are allowed to add their manifest files there. In addition Package Managers (like WinGet) and manifest interpreters (like PowerToys Shortcut Guide) can control and add other manifests themselves.
-
-#### 2.2.1 Downloading manifests
-
-When WinGet or other package managers download a package, they should also download the corresponding keyboard shortcuts manifest file and save it in the local directory, given such a file exists in the WinGet repository.
-
-The downloader is also responsible for updating the local `index.yaml` file, which contains all the information about the different manifest files that are saved in the same directory.
-
-#### 2.2.2 Updating manifests
-
-When a manifest interpreter starts, it should download the latest version of the manifests from the WinGet repository and save them in the local directory. If a manifest interpreter is not able to download the manifests or they do not exist, it should use the locally saved manifests.
-
-The updater is also responsible for updating the local `index.yaml` file, which contains all the information about the different manifest files that are saved in the same directory.
-
-> Note: WinGet must provide a way to update the keyboard shortcuts manifests given a package id.
-
-### 2.3 File names
-
-The file name of a keyboard shortcuts file is the WinGet package identifier, plus the locale of the strings of the file and at last the `.KBSC.yaml` file extension.
-
-For example the package "test.bar" saves its manifest with `en-US` strings in `test.bar.en-US.KBSC.yaml`.
-
-#### 2.3.1 No winget package available
-
-If an application has no corresponding WinGet package its name starts with a plus (`+`) symbol.
-
-### 2.4 Reserved namespaces
-
-Every name starting with `+WindowsNT` is reserved for the Windows OS and its components.
-
-## 3 File syntax
-
-All relevant files are written in [YAML](https://yaml.org/spec).
-
-> Note: A JSON schema will be provided as soon as the spec reaches a further step
-
-### 3.1 Manifest Schema vNext Keyboard Shortcuts File
-
-```
-PackageName:                # The package unique identifier
-WindowFilter:               # The filter of window processes to which the shortcuts apply to
-BackgroundProcess:          # Optionally allows applying WindowFilter to background processes
-Shortcuts:                  # List of sections with keyboard shortcuts
-  - SectionName:            # Name of the category of shortcuts
-    Properties:             # List of shortcuts in the category
-      - Name:               # Name of the shortcut
-        Description:        # Optional description of the shortcut
-        AdditionalInfo:     # Optional additional information about the shortcut
-        Recommended:        # Optionally determines if the shortcut is displayed in a designated recommended area
-        Shortcut:           # An array of shortcuts that need to be pressed
-          - Win:            # Determines if the Windows Key is part of the shortcut
-            Ctrl:           # Determines if the Ctrl Key is part of the shortcut
-            Shift:          # Determines if the Shift Key is part of the shortcut
-            Alt:            # Determines if the Alt Key is part of the shortcut
-            Keys:           # Array of keys that need to be pressed
-```
-
-Per Application/Package one or more Keyboard manifests can be declared. Every manifest must have a different locale and the same `PackageName`, `WindowFilter` and `BackgroundProcess` fields.
-
-<details>
- <summary><b>PackageName</b> - The package unique identifier</summary>
-
- Package identifier (see 2.1 for more information on the package identifier).
-
-</details>
-
-<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 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>
-
-<details>
- <summary><b>BackgroundProcess</b> - Optionally allows applying WindowFilter to background processes.</summary>
-
- **Optional field**
-
- Defaults to `False`. Determines if WindowFilter should apply to background processes as well (Rephrased: When the process is running, the shortcuts will apply).
-
-</details>
-
-<details>
- <summary><b>Shortcuts</b> - List of sections with keyboard shortcuts</summary>
- 
- List of different section (also called categories) of shortcuts.
-</details>
-
-<details>
- <summary><b>SectionName</b> - Name of the category of shortcuts</summary>
-
- Name of the section of shortcuts. 
-
-**Special sections**:
-
-Special sections start with an identifier enclosed between `<` and `>`. This declares the category as a special display. If the interpreter of the manifest file can't understand the content this section should be left out.
-
-</details>
-
-<details>
- <summary><b>Properties</b> - List of shortcuts in the category</summary>
-</details>
-
-<details>
- <summary><b>Name</b> - Name of the shortcut</summary>
-
- Name of the shortcut. This is the name that will be displayed in the interpreter.
-
-</details>
-
-
-<details>
- <summary><b>Description</b> - Optional description of the shortcut</summary>
-
- Optional description of the shortcut. This is the description that will be displayed by the interpreter.
-</details>
-
-<details>
- <summary><b>AdditionalInfo</b> - Optional additional information about the shortcut</summary>
-
- Array of additional information about the shortcut. This is the additional information that will be displayed by the interpreter and are not part of this manifest.
-
- **Example**:
-
- For example, if the shortcut is only available on a certain Windows version, this information could be added here.
- ```yaml
-  AdditionalInfo:
-    - MinWindowsVersion: "10.0.19041.0"
-  ```
-</details>
-
-<details>
- <summary><b>Shortcut</b> - An array of shortcuts that need to be pressed</summary>
-
-  An array of shortcuts that need to be pressed. This allows defining sequential shortcuts that need to be pressed in order to trigger the action.
-
-</details>
-
-<details>
- <summary><b>Win</b> - Determines if the Windows Key is part of the shortcut</summary>
-
- Refers to the left Windows Key on the keyboard.
-</details>
-
-<details>
- <summary><b>Ctrl</b> - Determines if the Ctrl Key is part of the shortcut</summary>
-
- Refers to the left Ctrl Key on the keyboard.
-</details>
-
-<details>
- <summary><b>Shift</b> - Determines if the Shift Key is part of the shortcut</summary>
-
- Refers to the left Shift Key on the keyboard.
-</details>
-
-<details>
- <summary><b>Alt</b> - Determines if the Alt Key is part of the shortcut</summary>
-
-  Refers to the left Alt Key on the keyboard.
-</details>
-
-
-<details>
- <summary><b>Recommended</b> - Optionally determines if the shortcut is displayed in a designated recommended area</summary>
-
- **Optional field**
-
- Defaults to `False`. Determines if the shortcut should be displayed in a designated recommended area. This is a visual hint for the user that this shortcut is important.
-
-</details>
-
-<details>
- <summary><b>Keys</b> - Array of keys that need to be pressed</summary>
-
- A string array of all the keys that need to be pressed. If a number is supplied, it should be read as a [KeyCode](https://learn.microsoft.com/windows/win32/inputdev/virtual-key-codes) and displayed accordingly (based on the Keyboard Layout of the user).
-
-**Special keys**:
-
-Special keys are enclosed between `<` and `>` and correspond to a key that should be displayed in a certain way. If the interpreter of the manifest file can't understand the content, the brackets should be left out.
-
-|Name|Description|
-|----|-----------|
-|`<Office>`| Corresponds to the Office key on some Windows keyboards |
-|`<Copilot>`| Corresponds to the Copilot key on some Windows keyboards |
-|`<Left>`| Corresponds to the left arrow key |
-|`<Right>`| Corresponds to the right arrow key |
-|`<Up>`| Corresponds to the up arrow key |
-|`<Down>`| Corresponds to the down arrow key |
-|`<Enter>`| Corresponds to the Enter key |
-|`<Space>`| Corresponds to the Space key |
-|`<Tab>`| Corresponds to the Tab key |
-|`<Backspace>`| Corresponds to the Backspace key |
-|`<Delete>`| Corresponds to the Delete key |
-|`<Insert>`| Corresponds to the Insert key |
-|`<Home>`| Corresponds to the Home key |
-|`<End>`| Corresponds to the End key |
-|`<PrtScr>`| Corresponds to the Print Screen key |
-|`<Pause>`| Corresponds to the pause key |
-|`<PageUp>`| Corresponds to the Page Up key |
-|`<PageDown>`| Corresponds to the Page Down key |
-|`<Escape>`| Corresponds to the Escape key |
-|`<Arrow>`| Corresponds to either the left, right, up or down arrow key |
-|`<ArrowLR>`| Corresponds to either the left or right arrow key |
-|`<ArrowUD>`| Corresponds to either the up or down arrow key |
-|`<Underlined letter>`| Corresponds to any letter that is _underlined_ in the UI |
-
-</details>
-
-#### 3.2.2 Example
-
-```yaml
-PackageName: Microsoft.PowerToys
-WindowFilter: "*"
-BackgroundProcess: True
-Shortcuts:
-  - SectionName: General
-    Properties:
-      - Name: Advanced Paste
-        Shortcut:
-          - Win: True
-            Ctrl: False
-            Alt: False
-            Shift: False
-            Keys:
-              - 86
-        Description: Open Advanced Paste window
-      - Name: Advanced Paste
-        Shortcut:
-          - Win: True
-            Ctrl: True
-            Alt: True
-            Shift: False
-            Keys:
-              - 86
-        Description: Paste as plain text directly
-
-```
-
-
-### 3.2 `index.yaml` file
-
-The `index.yaml` file is a file that contains all the information about the different manifest files that are saved in the same directory. This file is only available locally and is not saved in the WinGet repository as it is specific to the user.
-
-```yaml
-DefaultShellName:           # The package identifier of the default shell used in Windows
-Index:                      # List of all manifest files
-  - WindowFilter:           # The filter of window processes to which the shortcuts apply to
-    BackgroundProcess:      # Optionally allows applying WindowFilter to background processes
-    Apps:                   # List of all manifest files for the filter
-```
-
-<details>
- <summary><b>DefaultShellName</b> - The package identifier of the default shell used in Windows</summary>
-  
- This declares the package identifier of the default shell used in Windows. Most commonly it is `+WindowsNT.Shell`. Although not enforced, only the shell declared in the registry key `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Shell` should be used here.
-
-</details>
-
-<details>
- <summary><b>Index</b> - List of all manifest files</summary>
-</details>
-
-<details>
- <summary><b>WindowFilter</b> - The filter of window processes to which the shortcuts apply to</summary>
-
- See the `WindowFilter` field in the manifest file for more information.
-
-</details>
-
-<details>
- <summary><b>BackgroundProcess</b> - Optionally allows applying WindowFilter to background processes</summary>
- 
- **Optional field**
-
- See the `BackgroundProcess` field in the manifest file for more information.
-
-</details>
-
-<details>
- <summary><b>Apps</b> - List of all the package identifiers applying for the filter</summary>
-</details>
-
-#### 3.2.1 Example
-
-```yaml
-DefaultShellName: "+WindowsNT.Shell"
-Index:
-  - Filter: "*"
-    BackgroundProcess: True
-    Apps: ["+WindowsNT.Shell", "Microsoft.PowerToys"]
-  - Filter: "explorer.exe"
-    Apps: ["+WindowsNT.WindowsExplorer"]
-  - Filter: "taskmgr.exe"
-    Apps: ["+WindowsNT.TaskManager"]
-  - Filter: "msedge.exe"
-    Apps: ["+WindowsNT.Edge"]
-```

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -4,7 +4,6 @@
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
 #include <filesystem>
-#include <fstream>
 #include <string_view>
 
 #include "../../src/common/logger/logger.h"
@@ -1808,223 +1807,6 @@ void initSystemLogger()
             } });
 }
 
-// Naming note: the *Hardlinks* names in this CA, the matching WiX CustomAction Ids
-// in Product.wxs, and the manifest filename "hardlinks.txt" are kept for continuity
-// with the original PR design. The implementation uses fs::copy_file -- not
-// CreateHardLinkW -- because hard-links share an inode (and DACL) between root and
-// WinUI3Apps, which lets MSIX sparse-package registration propagate a rich DACL onto
-// the root copy of files like hostfxr.dll and break LOW-IL prevhost.exe loads,
-// turning the Monaco preview pane blank. Copies create a fresh inode in WinUI3Apps so the root
-// copy keeps its simple DACL. See the in-body comment for the full RCA reference.
-UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "CreateWinAppSDKHardlinks");
-    ExitOnFailure(hr, "Failed to initialize");
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    {
-        namespace fs = std::filesystem;
-        const fs::path installDir(installationFolder);
-        const fs::path winui3Dir = installDir / L"WinUI3Apps";
-        const fs::path manifestPath = winui3Dir / L"hardlinks.txt";
-
-        if (!fs::exists(manifestPath))
-        {
-            WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: No hardlinks.txt manifest found, skipping.");
-            goto LExit;
-        }
-
-        std::ifstream manifestFile(manifestPath);  // Read as bytes, then convert UTF-8 -> wide explicitly.
-        std::string narrowLine;
-        int created = 0;
-        int failed = 0;
-
-        // INSTALLFOLDER from MSI typically arrives with a trailing backslash. lexically_normal
-        // preserves that as an empty trailing path component, which would later make the
-        // per-component std::mismatch containment check below reject every legitimate entry.
-        // Strip any trailing separators before normalizing.
-        auto stripTrailingSep = [](fs::path p) {
-            auto s = p.native();
-            while (s.size() > 1 && (s.back() == L'\\' || s.back() == L'/')) s.pop_back();
-            return fs::path(s);
-        };
-
-        // Normalize once so the per-line containment check below is cheap.
-        const fs::path installDirNorm = stripTrailingSep(installDir).lexically_normal();
-        const fs::path winui3DirNorm  = stripTrailingSep(winui3Dir).lexically_normal();
-
-        while (std::getline(manifestFile, narrowLine))
-        {
-            if (narrowLine.empty())
-            {
-                continue;
-            }
-            // Strip CR if the manifest uses CRLF line endings.
-            if (narrowLine.back() == '\r')
-            {
-                narrowLine.pop_back();
-                if (narrowLine.empty()) continue;
-            }
-
-            // Manifest is written as UTF-8 (no BOM) -- convert to wide string explicitly
-            // rather than relying on the locale-default codecvt of std::wifstream, which is
-            // the ANSI code page on Windows and would silently mangle any non-ASCII path.
-            const int wideLen = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, narrowLine.c_str(), -1, nullptr, 0);
-            if (wideLen <= 0)
-            {
-                WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: Skipping non-UTF-8 entry: %hs", narrowLine.c_str());
-                failed++;
-                continue;
-            }
-            std::wstring fileName(static_cast<size_t>(wideLen) - 1, L'\0');
-            MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, narrowLine.c_str(), -1, fileName.data(), wideLen);
-
-            // Defense-in-depth: reject manifest entries that would escape the install root
-            // via "..", absolute paths, or alternate stream syntax. lexically_normal collapses
-            // any "." / ".." / repeated separators, then std::mismatch verifies the resolved
-            // path is still rooted at installDir / winui3Dir respectively.
-            const fs::path source = (installDir / fileName).lexically_normal();
-            const fs::path target = (winui3Dir  / fileName).lexically_normal();
-            const auto sourceIn = std::mismatch(installDirNorm.begin(), installDirNorm.end(), source.begin(), source.end());
-            const auto targetIn = std::mismatch(winui3DirNorm.begin(),  winui3DirNorm.end(),  target.begin(), target.end());
-            if (sourceIn.first != installDirNorm.end() || targetIn.first != winui3DirNorm.end())
-            {
-                WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: Rejecting entry outside install root: %ls", fileName.c_str());
-                failed++;
-                continue;
-            }
-
-            if (!fs::exists(source))
-            {
-                WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: Source not found: %ls", source.c_str());
-                failed++;
-                continue;
-            }
-
-            // Remove existing file if present (leftover from previous install)
-            std::error_code ec;
-            fs::remove(target, ec);
-
-            // Use a regular file copy (not a hard-link). Hard-links share an
-            // NTFS inode -- and therefore one DACL -- between root and
-            // WinUI3Apps, which lets MSIX sparse-package registration
-            // propagate the WinUI3Apps parent's rich (Capability/Package SID)
-            // DACL onto the root path. That trips a kernel "stricter access
-            // evaluation" path that blocks LOW-IL prevhost.exe from loading
-            // hostfxr.dll, so File Explorer Monaco preview goes blank on
-            // Windows 11 23H2. Copying creates a fresh inode in WinUI3Apps,
-            // so the root copy keeps its simple DACL while the WinUI3Apps
-            // copy inherits the rich DACL from its parent (matches 0.99.1
-            // behaviour). See Documents\PR-47233-Handoff.md for full RCA.
-            fs::copy_file(source, target, fs::copy_options::overwrite_existing, ec);
-            if (ec)
-            {
-                WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: Failed to copy: %ls (%hs)", fileName.c_str(), ec.message().c_str());
-                failed++;
-            }
-            else
-            {
-                created++;
-            }
-        }
-
-        WcaLog(LOGMSG_STANDARD, "CreateWinAppSDKHardlinks: Copied %d files, %d failures", created, failed);
-
-        // Catastrophic-case escalation: if every copy failed, the WinUI3Apps tree is
-        // unusable (Monaco preview / context-menu shells will break). Surface this rather
-        // than reporting install success. Per-file failures remain tolerated.
-        if (created == 0 && failed > 0)
-        {
-            hr = E_FAIL;
-            ExitOnFailure(hr, "All WinAppSDK file copies failed; aborting install.");
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "DeleteWinAppSDKHardlinks");
-    ExitOnFailure(hr, "Failed to initialize");
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    {
-        namespace fs = std::filesystem;
-        const fs::path winui3Dir = fs::path(installationFolder) / L"WinUI3Apps";
-        const fs::path manifestPath = winui3Dir / L"hardlinks.txt";
-
-        if (!fs::exists(manifestPath))
-        {
-            goto LExit;
-        }
-
-        std::ifstream manifestFile(manifestPath);  // Read as bytes; convert UTF-8 -> wide explicitly.
-        std::string narrowLine;
-
-        // INSTALLFOLDER from MSI typically arrives with a trailing backslash; strip it before
-        // normalizing so the per-line containment check doesn't false-reject every entry.
-        auto stripTrailingSep = [](fs::path p) {
-            auto s = p.native();
-            while (s.size() > 1 && (s.back() == L'\\' || s.back() == L'/')) s.pop_back();
-            return fs::path(s);
-        };
-        const fs::path winui3DirNorm = stripTrailingSep(winui3Dir).lexically_normal();
-
-        while (std::getline(manifestFile, narrowLine))
-        {
-            if (narrowLine.empty())
-            {
-                continue;
-            }
-            if (narrowLine.back() == '\r')
-            {
-                narrowLine.pop_back();
-                if (narrowLine.empty()) continue;
-            }
-
-            const int wideLen = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, narrowLine.c_str(), -1, nullptr, 0);
-            if (wideLen <= 0)
-            {
-                WcaLog(LOGMSG_STANDARD, "DeleteWinAppSDKHardlinks: Skipping non-UTF-8 entry: %hs", narrowLine.c_str());
-                continue;
-            }
-            std::wstring fileName(static_cast<size_t>(wideLen) - 1, L'\0');
-            MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, narrowLine.c_str(), -1, fileName.data(), wideLen);
-
-            // Defense-in-depth: reject entries whose resolved target escapes WinUI3Apps.
-            const fs::path target = (winui3Dir / fileName).lexically_normal();
-            const auto inWinui3 = std::mismatch(winui3DirNorm.begin(), winui3DirNorm.end(), target.begin(), target.end());
-            if (inWinui3.first != winui3DirNorm.end())
-            {
-                WcaLog(LOGMSG_STANDARD, "DeleteWinAppSDKHardlinks: Rejecting entry outside WinUI3Apps: %ls", fileName.c_str());
-                continue;
-            }
-
-            std::error_code ec;
-            fs::remove(target, ec);
-        }
-
-        WcaLog(LOGMSG_STANDARD, "DeleteWinAppSDKHardlinks: Cleaned up deduplicated copy files");
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
 // DllMain - Initialize and cleanup WiX custom action utils.
 extern "C" BOOL WINAPI DllMain(__in HINSTANCE hInst, __in ULONG ulReason, __in LPVOID)
 {

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -36,5 +36,3 @@ EXPORTS
 	SetBundleInstallLocationCA
 	InstallPackageIdentityMSIXCA
 	UninstallPackageIdentityMSIXCA
-	CreateWinAppSDKHardlinksCA
-	DeleteWinAppSDKHardlinksCA

installer/PowerToysSetupVNext/Product.wxs

@@ -112,8 +112,6 @@
       <Custom Action="SetInstallCmdPalPackageParam" Before="InstallCmdPalPackage" />
       <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
       <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
-      <Custom Action="SetCreateWinAppSDKHardlinksParam" Before="CreateWinAppSDKHardlinks" />
-      <Custom Action="SetDeleteWinAppSDKHardlinksParam" Before="DeleteWinAppSDKHardlinks" />
       <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
       <Custom Action="SetInstallPackageIdentityMSIXParam" Before="InstallPackageIdentityMSIX" />
 
@@ -126,7 +124,6 @@
       <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
       <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
-      <Custom Action="CreateWinAppSDKHardlinks" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED OR REINSTALL" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed AND WINDOWSBUILDNUMBER &gt;= 22000" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
@@ -140,7 +137,6 @@
         <?endif?>
         <Custom Action="TelemetryLogInstallSuccess" After="InstallFinalize" Condition="NOT Installed" />
       <Custom Action="TelemetryLogUninstallSuccess" After="InstallFinalize" Condition="Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="DeleteWinAppSDKHardlinks" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UnApplyModulesRegistryChangeSets" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="CleanImageResizerRuntimeRegistry" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
@@ -193,10 +189,8 @@
     <CustomAction Id="SetUpgradeCommandNotFoundParam" Property="UpgradeCommandNotFound" Value="[INSTALLFOLDER]" />
 
     <CustomAction Id="SetCreateWinAppSDKHardlinksParam" Property="CreateWinAppSDKHardlinks" Value="[INSTALLFOLDER]" />
-    <CustomAction Id="CreateWinAppSDKHardlinks" Return="check" Impersonate="yes" Execute="deferred" DllEntry="CreateWinAppSDKHardlinksCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="SetDeleteWinAppSDKHardlinksParam" Property="DeleteWinAppSDKHardlinks" Value="[INSTALLFOLDER]" />
-    <CustomAction Id="DeleteWinAppSDKHardlinks" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="DeleteWinAppSDKHardlinksCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="SetCreatePTInteropHardlinksParam" Property="CreatePTInteropHardlinks" Value="[INSTALLFOLDER]" />
 

installer/PowerToysSetupVNext/ShortcutGuide.wxs

@@ -2,25 +2,26 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ShortcutGuideAssetsFiles=?>
-  <?define ShortcutGuideAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ShortcutGuide\?>
+  <?define ShortcutGuideSvgFiles=?>
+  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
 
   <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="ShortcutGuideAssetsFolder" Name="ShortcutGuide" />
+    <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ShortcutGuideSvgsInstallFolder" Name="ShortcutGuide" />
     </DirectoryRef>
-    <DirectoryRef Id="ShortcutGuideAssetsFolder" FileSource="$(var.ShortcutGuideAssetsFilesPath)">
+    <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideSvgFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShortcutGuideAssetsFiles_Component_Def-->
+    <!--ShortcutGuideSvgFiles_Component_Def-->
     </DirectoryRef>
 
     <!-- Shortcut guide -->
-    <ComponentGroup Id="ShortcutGuideComponentGroup" >
-      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideAssetsFolder" >
+    <ComponentGroup Id="ShortcutGuideComponentGroup">
+      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideSvgsInstallFolder">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes"/>
+          <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes" />
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderShortcutGuideAssetsInstallFolder" Directory="ShortcutGuideAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShortcutGuideSvgsInstallFolder" Directory="ShortcutGuideSvgsInstallFolder" On="uninstall" />
       </Component>
     </ComponentGroup>
 

installer/PowerToysSetupVNext/WinUI3Applications.wxs

@@ -7,18 +7,11 @@
 
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <Component Id="WinUI3Apps_Hardlinks_Manifest" Guid="F7A2C3D1-8E4B-4F6A-9D2E-1B3C5A7F8E90" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="WinUI3Apps_Hardlinks_Manifest" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="WinUI3Apps_hardlinks_txt" Source="$(var.BinDir)\WinUI3Apps\hardlinks.txt" />
-      </Component>
     <!-- Generated by generateFileComponents.ps1 -->
     <!--WinUI3ApplicationsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="WinUI3ApplicationsComponentGroup">
-      <ComponentRef Id="WinUI3Apps_Hardlinks_Manifest" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -30,10 +30,6 @@ Function Generate-FileList() {
 
     $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")
-
     $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
 
     if ($fileDepsJson -eq [string]::Empty) {
@@ -89,16 +85,11 @@ Function Generate-FileComponents() {
             [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
             Justification = 'variable is used in another scope')]
 
-            $fileList = $matches[2] -split ';' | Where-Object { $_ -ne '' }
+            $fileList = $matches[2] -split ';'
             return
         }
     }
 
-    if ($null -eq $fileList -or $fileList.Count -eq 0) {
-        # No files to generate components for — leave placeholder intact
-        return
-    }
-
     $componentId = "$($fileListName)_Component"
 
     $componentDefs = "`r`n"
@@ -163,67 +154,6 @@ Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSSc
 
 #WinUI3Applications
 Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-
-# Deduplicate: Remove files from WinUI3Apps that are identical to root (same name + same hash).
-# These will be re-created as plain file copies at install time by CreateWinAppSDKHardlinksCA.
-# (The CA's name is historical: it now uses fs::copy_file rather than CreateHardLinkW to avoid
-# DACL contamination across the shared inode -- see CustomAction.cpp for details.)
-$rootPath = "$PSScriptRoot..\..\..\$platform\Release"
-$winui3Path = "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-$winui3WxsPath = "$PSScriptRoot\WinUI3Applications.wxs"
-$winui3Wxs = Get-Content $winui3WxsPath -Raw
-$manifestPath = Join-Path $winui3Path "hardlinks.txt"
-
-if ($winui3Wxs -match "\<\?define WinUI3ApplicationsFiles=([^?]*)\?\>") {
-    $winui3FileList = $matches[1] -split ';' | Where-Object { $_ -ne '' }
-    $hardlinkFiles = @()
-
-    # Read the BaseApplications WXS file list so we only deduplicate files that the MSI
-    # is actually deploying to the install root. If a file was stripped from BaseApplications
-    # by an earlier step (e.g., the ImageResizer leaked-apphost workaround above), the
-    # install-time CA's source would be missing and both copies would disappear.
-    $baseAppsWxs = Get-Content $baseAppWxsPath -Raw
-    $baseAppsFileList = @()
-    if ($baseAppsWxs -match "\<\?define BaseApplicationsFiles=([^?]*)\?\>") {
-        $baseAppsFileList = $matches[1] -split ';' | Where-Object { $_ -ne '' }
-    }
-
-    foreach ($file in $winui3FileList) {
-        # Skip files that were intentionally not deployed to root by the build
-        if ($baseAppsFileList -notcontains $file) { continue }
-
-        $rootFile = Join-Path $rootPath $file
-        $winui3File = Join-Path $winui3Path $file
-        if ((Test-Path $rootFile) -and (Test-Path $winui3File)) {
-            $rootHash = (Get-FileHash $rootFile -Algorithm SHA256).Hash
-            $winui3Hash = (Get-FileHash $winui3File -Algorithm SHA256).Hash
-            if ($rootHash -eq $winui3Hash) {
-                $hardlinkFiles += $file
-            }
-        }
-    }
-
-    if ($hardlinkFiles.Count -gt 0) {
-        # Remove deduplicated files from WinUI3Apps file list
-        $remainingFiles = $winui3FileList | Where-Object { $_ -notin $hardlinkFiles }
-        if ($remainingFiles.Count -eq 0) {
-            # All files are duplicates — keep at least a dummy entry won't be emitted
-            # Generate-FileComponents handles empty defines by producing no <File> entries
-            $winui3Wxs = $winui3Wxs -replace "\<\?define WinUI3ApplicationsFiles=[^?]*\?\>", "<?define WinUI3ApplicationsFiles=?>"
-        } else {
-            $winui3Wxs = $winui3Wxs -replace "\<\?define WinUI3ApplicationsFiles=[^?]*\?\>", "<?define WinUI3ApplicationsFiles=$($remainingFiles -join ';')?>"
-        }
-        Set-Content -Path $winui3WxsPath -Value $winui3Wxs
-        Write-Host "Deduplicated $($hardlinkFiles.Count) files from WinUI3Apps (will be copied at install time)"
-    }
-
-    # Always write hardlinks.txt (may be empty — CA handles that gracefully)
-    # Write as UTF-8 without BOM so the install-time CA can read it via std::ifstream
-    # + MultiByteToWideChar(CP_UTF8) without dealing with PS-version-dependent default
-    # encodings or a leading BOM.
-    [System.IO.File]::WriteAllLines($manifestPath, [string[]]$hardlinkFiles, (New-Object System.Text.UTF8Encoding($false)))
-}
-
 Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs
 
 #AdvancedPaste
@@ -397,8 +327,8 @@ Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePat
 ## Plugins
 
 #ShortcutGuide
-Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideAssetsFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideAssetsFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
+Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
 
 #Settings
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"

installer/PowerToysSetupVNext/publish.cmd

@@ -8,10 +8,10 @@ SET VCToolsVersion=!VCToolsVersion!
 SET ClearDevCommandPromptEnvVars=false
 
 rem In case of Release we should not use Debug CRT in VCRT forwarders
-msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0

src/ActionRunner/actionRunner.vcxproj

@@ -62,7 +62,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -70,6 +70,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/ActionRunner/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/Common.Dotnet.CsWinRT.props

@@ -4,7 +4,7 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
-    <CoreTargetFramework>net10.0</CoreTargetFramework>
+    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
     <TargetFramework>$(CoreTargetFramework)-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
@@ -12,17 +12,6 @@
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <!--
-    Opt out of CsWinRT 2.2 IIDOptimizer. On .NET 10 / CsWinRT 2.2 the tool exits with code -1
-    after producing "0 IID calculations/fetches patched", which generates a noisy MSB3073
-    warning for every CsWinRT-consuming project. The IIDOptimizer is a runtime-perf optimization
-    that interns GUID lookups; disabling it just means a small first-call cost. This switch
-    causes Microsoft.Windows.CsWinRT.IIDOptimizer.targets to not be imported at all.
-  -->
-  <PropertyGroup>
-    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
-  </PropertyGroup>
-
   <!-- Common from the debug / release items -->
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
@@ -52,54 +41,7 @@
   <!-- this may need to be removed on future CsWinRT upgrades-->
   <Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
     <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
+      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
     </ItemGroup>
   </Target>
-
-  <!--
-    Ensure any referenced C++/WinRT (.vcxproj) projects are fully built BEFORE the CsWinRT
-    source generator runs in this csproj. On a clean machine the SDK-style ProjectReference
-    graph does not guarantee that the producing vcxproj has emitted its .winmd before the
-    consuming C# Compile / source-generator stage starts in a parallel solution build,
-    which manifests as CS0246 on the projected namespace (e.g. 'PowerToys.Interop').
-    Forcing a serialized Build of the .vcxproj references here closes that race.
-
-    We hook BEFORE ResolveProjectReferences so the produced .winmd is visible to
-    CsWinRTRemoveWinMDReferences (which moves it into @(CsWinRTInputs)) and we also
-    delete a possibly stale cswinrt.rsp so CsWinRTGenerateProjection re-invokes
-    cswinrt.exe instead of incrementally skipping.
-  -->
-  <Target Name="EnsureNativeWinMDProjectionInputsBuilt"
-          BeforeTargets="ResolveProjectReferences;ResolveAssemblyReferences;CsWinRTPrepareProjection;CsWinRTGenerateProjection"
-          Condition="'@(ProjectReference)' != '' and '$(DesignTimeBuild)' != 'true' and '$(BuildingProject)' != 'false'">
-    <ItemGroup>
-      <_NativeWinMDProjectionRef Include="@(ProjectReference)" Condition="'%(Extension)' == '.vcxproj'" />
-    </ItemGroup>
-    <MSBuild Projects="@(_NativeWinMDProjectionRef)"
-             Properties="Configuration=$(Configuration);Platform=$(Platform)"
-             Targets="Build"
-             BuildInParallel="false"
-             Condition="'@(_NativeWinMDProjectionRef)' != ''" />
-    <!-- Force CsWinRTGenerateProjection to re-run so stale-rsp incremental skip cannot
-         leave us without generated .cs files when the .winmd has just been (re)produced. -->
-    <Delete Files="$(CsWinRTGeneratedFilesDir)cswinrt.rsp;$(CsWinRTGeneratedFilesDir)cswinrt_internal.rsp"
-            Condition="'@(_NativeWinMDProjectionRef)' != '' and '$(CsWinRTGeneratedFilesDir)' != ''" />
-    <!-- Mark that we need to delete the rsp again once CsWinRTGeneratedFilesDir is fully resolved
-         (some projects set it to $(OutDir) which is not evaluated this early). -->
-    <PropertyGroup>
-      <_DeleteStaleCsWinRTRspPending>true</_DeleteStaleCsWinRTRspPending>
-    </PropertyGroup>
-  </Target>
-
-  <!--
-    Second pass: after CsWinRTPrepareProjection has resolved $(CsWinRTGeneratedFilesDir) to its
-    final value (which may depend on $(OutDir)), delete any stale cswinrt.rsp so the
-    CsWinRTGenerateProjection target's incremental-skip cannot leave us without generated .cs files.
-  -->
-  <Target Name="DeleteStaleCsWinRTRspAfterPrepare"
-          AfterTargets="CsWinRTPrepareProjection"
-          BeforeTargets="CsWinRTGenerateProjection"
-          Condition="'$(_DeleteStaleCsWinRTRspPending)' == 'true' and '$(CsWinRTGeneratedFilesDir)' != ''">
-    <Delete Files="$(CsWinRTGeneratedFilesDir)cswinrt.rsp;$(CsWinRTGeneratedFilesDir)cswinrt_internal.rsp" />
-  </Target>
 </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

@@ -68,7 +68,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -76,6 +76,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/Update/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/COMUtils/COMUtils.vcxproj

@@ -36,12 +36,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -161,7 +161,7 @@
     <ClCompile>
       <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT

src/common/CalculatorEngineCommon/ExprtkEvaluator.cpp

@@ -5,17 +5,11 @@
 #include <sstream>
 #include <cmath>
 #include <limits>
-#include <random>
 
 namespace ExprtkCalculator::internal
 {
     static double factorial(const double n)
     {
-        if (std::isnan(n) || std::isinf(n))
-        {
-            return std::numeric_limits<double>::quiet_NaN();
-        }
-
         // Only allow non-negative integers
         if (n < 0.0 || std::floor(n) != n)
         {
@@ -26,80 +20,13 @@ namespace ExprtkCalculator::internal
 
     static double sign(const double n)
     {
-        // The sign of NaN is undefined.
-        if (std::isnan(n))
-        {
-            return std::numeric_limits<double>::quiet_NaN();
-        }
-
         if (n > 0.0) return 1.0;
         if (n < 0.0) return -1.0;
         return 0.0;
     }
 
-    // rand(): returns a uniformly distributed random double in [0, 1)
-    struct rand_func : public exprtk::ifunction<double>
-    {
-        std::mt19937_64 rng;
-        std::uniform_real_distribution<double> dist;
-
-        rand_func() :
-            exprtk::ifunction<double>(0),
-            rng(std::random_device{}()),
-            dist(0.0, 1.0)
-        {}
-
-        inline double operator()() override
-        {
-            return dist(rng);
-        }
-    };
-
-    // randi(n): returns a uniformly distributed random integer in [0, n-1]
-    struct randi_func : public exprtk::ifunction<double>
-    {
-        std::mt19937_64 rng;
-
-        randi_func() :
-            exprtk::ifunction<double>(1),
-            rng(std::random_device{}())
-        {}
-
-        inline double operator()(const double& n) override
-        {
-            if (std::isnan(n) || std::isinf(n))
-            {
-                return std::numeric_limits<double>::quiet_NaN();
-            }
-
-            constexpr double maxLongLongAsDouble = static_cast<double>(std::numeric_limits<long long>::max());
-            if (n < 1.0 || n >= maxLongLongAsDouble)
-            {
-                return std::numeric_limits<double>::quiet_NaN();
-            }
-
-            if (std::floor(n) != n)
-            {
-                return std::numeric_limits<double>::quiet_NaN();
-            }
-
-            std::uniform_int_distribution<long long> dist(0, static_cast<long long>(n) - 1);
-            return static_cast<double>(dist(rng));
-        }
-    };
-
     std::wstring ToWStringFullPrecision(double value)
     {
-        if (std::isnan(value))
-        {
-            return L"NaN";
-        }
-
-        if (std::isinf(value))
-        {
-            return value > 0 ? L"inf" : L"-inf";
-        }
-
         std::wostringstream oss;
         oss.imbue(std::locale::classic());
         oss << std::fixed << std::setprecision(15) << value;
@@ -120,13 +47,6 @@ namespace ExprtkCalculator::internal
         symbol_table.add_function("factorial", factorial);
         symbol_table.add_function("sign", sign);
 
-        // thread_local ensures each thread has its own RNG instance (seeded once,
-        // state preserved across calls) without requiring locks.
-        static thread_local rand_func rand_fn;
-        static thread_local randi_func randi_fn;
-        symbol_table.add_function("rand", rand_fn);
-        symbol_table.add_function("randi", randi_fn);
-
         exprtk::expression<double> expression;
         expression.register_symbol_table(symbol_table);
 
@@ -145,7 +65,7 @@ namespace ExprtkCalculator::internal
         parser.settings().disable_all_inequality_ops(); // Disable inequality operators like <, >, <=, >=, !=, etc.
 
         if (!parser.compile(expressionText, expression))
-            return L"ParseError";
+            return L"NaN";
 
         return ToWStringFullPrecision(expression.value());
     }

src/common/Common.UI.Controls/Common.UI.Controls.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <RootNamespace>Microsoft.PowerToys.Common.UI.Controls</RootNamespace>
     <AssemblyName>PowerToys.Common.UI.Controls</AssemblyName>
     <UseWinUI>true</UseWinUI>

src/common/FilePreviewCommon/FilePreviewCommon.csproj

@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Markdig.Signed" />
+    <PackageReference Include="System.Text.Encoding.CodePages" />
     <PackageReference Include="UTF.Unknown" />
   </ItemGroup>
 </Project>

src/common/ManagedCommon/IdRecoveryHelper.cs

@@ -2,35 +2,43 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ManagedCommon
 {
     public static class IdRecoveryHelper
     {
         /// <summary>
-        /// Ensures that all items in the provided list have unique IDs. Duplicate IDs are replaced
-        /// with the next available unique ID.
+        /// Fixes invalid IDs in the given list by assigning unique values.
+        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
         /// </summary>
-        /// <param name="items">The list of items that may contain duplicate IDs.</param>
+        /// <param name="items">The list of items that may contain invalid IDs.</param>
         public static void RecoverInvalidIds<T>(IEnumerable<T> items)
             where T : class, IHasId
         {
-            var seenIds = new HashSet<int>();
-            int nextAvailableId = 0;
+            var idSet = new HashSet<int>();
+            int newId = 0;
+            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
 
-            foreach (var item in items)
+            // Iterate through the list and fix invalid IDs
+            foreach (var item in sortedItems)
             {
-                // If this ID is already used, assign a new unique ID.
-                if (!seenIds.Add(item.Id))
+                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
+                if (!idSet.Add(item.Id))
                 {
-                    // Find the next unused ID.
-                    while (!seenIds.Add(nextAvailableId))
+                    // Find the next available unique ID
+                    while (idSet.Contains(newId))
                     {
-                        nextAvailableId++;
+                        newId++;
                     }
 
-                    item.Id = nextAvailableId;
+                    item.Id = newId;
+                    idSet.Add(newId); // Add the newly assigned ID to the set
                 }
             }
         }

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -55,7 +55,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -63,6 +63,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -38,7 +38,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -46,6 +46,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Telemetry/EtwTrace/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/UITestAutomation/UITestAutomation.csproj

@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
@@ -18,6 +18,7 @@
     <!-- Test libraries/utilities should not use the metapackage. -->
     <PackageReference Include="MSTest.TestFramework" />
     <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 

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

@@ -27,9 +27,9 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\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.231216.1\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp23</LanguageStandard>
-      <PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_HEADER_ONLY;FMT_UNICODE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

src/common/interop/Constants.cpp

@@ -259,10 +259,6 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::TERMINATE_POWER_DISPLAY_EVENT;
     }
-    hstring Constants::AutoDisablePowerDisplayEvent()
-    {
-        return CommonSharedConstants::POWER_DISPLAY_AUTO_DISABLE_EVENT;
-    }
     hstring Constants::RefreshPowerDisplayMonitorsEvent()
     {
         return CommonSharedConstants::REFRESH_POWER_DISPLAY_MONITORS_EVENT;
@@ -279,10 +275,6 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::HOTKEY_UPDATED_POWER_DISPLAY_EVENT;
     }
-    hstring Constants::RescanPowerDisplayMonitorsEvent()
-    {
-        return CommonSharedConstants::RESCAN_POWER_DISPLAY_MONITORS_EVENT;
-    }
     hstring Constants::PowerDisplayToggleMessage()
     {
         return CommonSharedConstants::POWER_DISPLAY_TOGGLE_MESSAGE;

src/common/interop/Constants.h

@@ -68,12 +68,10 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring ShowCmdPalEvent();
         static hstring TogglePowerDisplayEvent();
         static hstring TerminatePowerDisplayEvent();
-        static hstring AutoDisablePowerDisplayEvent();
         static hstring RefreshPowerDisplayMonitorsEvent();
         static hstring SettingsUpdatedPowerDisplayEvent();
         static hstring PowerDisplaySendSettingsTelemetryEvent();
         static hstring HotkeyUpdatedPowerDisplayEvent();
-        static hstring RescanPowerDisplayMonitorsEvent();
         static hstring PowerDisplayToggleMessage();
         static hstring PowerDisplayApplyProfileMessage();
         static hstring PowerDisplayTerminateAppMessage();

src/common/interop/Constants.idl

@@ -65,12 +65,10 @@ namespace PowerToys
             static String ShowCmdPalEvent();
             static String TogglePowerDisplayEvent();
             static String TerminatePowerDisplayEvent();
-            static String AutoDisablePowerDisplayEvent();
             static String RefreshPowerDisplayMonitorsEvent();
             static String SettingsUpdatedPowerDisplayEvent();
             static String PowerDisplaySendSettingsTelemetryEvent();
             static String HotkeyUpdatedPowerDisplayEvent();
-            static String RescanPowerDisplayMonitorsEvent();
             static String PowerDisplayToggleMessage();
             static String PowerDisplayApplyProfileMessage();
             static String PowerDisplayTerminateAppMessage();

src/common/interop/PowerToys.Interop.vcxproj

@@ -41,6 +41,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -99,7 +100,6 @@
     <ClInclude Include="Constants.h">
       <DependentUpon>KeyboardListener.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="excluded_app.h" />
     <ClInclude Include="HotkeyManager.h">
       <DependentUpon>HotkeyManager.idl</DependentUpon>
     </ClInclude>
@@ -114,7 +114,6 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="shared_constants.h" />
-    <ClInclude Include="tasklist_positions.h" />
     <ClInclude Include="TwoWayPipeMessageIPCManaged.h">
       <DependentUpon>TwoWayPipeMessageIPCManaged.idl</DependentUpon>
     </ClInclude>
@@ -128,7 +127,6 @@
     <ClCompile Include="Constants.cpp">
       <DependentUpon>KeyboardListener.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="excluded_app.cpp" />
     <ClCompile Include="HotkeyManager.cpp">
       <DependentUpon>HotkeyManager.idl</DependentUpon>
     </ClCompile>
@@ -142,7 +140,6 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="tasklist_positions.cpp" />
     <ClCompile Include="TwoWayPipeMessageIPCManaged.cpp">
       <DependentUpon>TwoWayPipeMessageIPCManaged.idl</DependentUpon>
     </ClCompile>
@@ -168,9 +165,6 @@
     <Midl Include="TwoWayPipeMessageIPCManaged.idl" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\version\version.vcxproj">
       <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
     </ProjectReference>
@@ -178,14 +172,14 @@
   <ImportGroup Label="ExtensionTargets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>

src/common/interop/PowerToys.Interop.vcxproj.filters

@@ -54,12 +54,6 @@
     <ClInclude Include="Constants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="excluded_app.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tasklist_positions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="keyboard_layout.cpp">
@@ -89,12 +83,6 @@
     <ClCompile Include="Constants.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="excluded_app.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tasklist_positions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="interop.rc">

src/common/interop/excluded_app.cpp

@@ -1,41 +0,0 @@
-#include "pch.h"
-#include "excluded_app.h"
-#include <../utils/string_utils.h>
-
-extern "C"
-{
-    __declspec(dllexport) bool IsCurrentWindowExcludedFromShortcutGuide()
-    {
-        PowerToysSettings::PowerToyValues settings = PowerToysSettings::PowerToyValues::load_from_settings_file(L"Shortcut Guide");
-        auto settingsObject = settings.get_raw_json();
-        std::wstring apps = settingsObject.GetNamedObject(L"properties").GetNamedObject(L"disabled_apps").GetNamedString(L"value").c_str();
-        auto excludedUppercase = apps;
-        CharUpperBuffW(excludedUppercase.data(), static_cast<DWORD>(excludedUppercase.length()));
-        std::wstring_view view(excludedUppercase);
-        view = left_trim<wchar_t>(trim<wchar_t>(view));
-
-        m_excludedApps.clear();
-
-        while (!view.empty())
-        {
-            auto pos = (std::min)(view.find_first_of(L"\r\n"), view.length());
-            m_excludedApps.emplace_back(view.substr(0, pos));
-            view.remove_prefix(pos);
-            view = left_trim<wchar_t>(trim<wchar_t>(view));
-        }
-
-        if (m_excludedApps.empty())
-        {
-            return false;
-        }
-
-        if (HWND foregroundApp{ GetForegroundWindow() })
-        {
-            auto processPath = get_process_path(foregroundApp);
-            CharUpperBuffW(processPath.data(), static_cast<DWORD>(processPath.length()));
-
-            return check_excluded_app(foregroundApp, processPath, m_excludedApps);
-        }
-        return false;
-    }
-}

src/common/interop/excluded_app.h

@@ -1,7 +0,0 @@
-#pragma once
-
-extern "C"
-{
-    std::vector<std::wstring> m_excludedApps;
-    __declspec(dllexport) bool IsCurrentWindowExcludedFromShortcutGuide();
-}

src/common/interop/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/interop/pch.h

@@ -12,29 +12,3 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <Windows.h>
 #include <Endpointvolume.h>
-#include <vector>
-#include <UIAutomation.h>
-#include <dxgi1_3.h>
-#include <d3d11_2.h>
-#include <d2d1_3.h>
-#include <d2d1_3helper.h>
-#include <d2d1helper.h>
-#include <dwrite.h>
-#include <dcomp.h>
-#include <dwmapi.h>
-#include <Shobjidl.h>
-#include <Shlwapi.h>
-#include <string>
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <thread>
-#include <functional>
-#include <condition_variable>
-#include <stdexcept>
-#include <tuple>
-#include <unordered_set>
-#include <filesystem>
-#include <common/utils/excluded_apps.h>
-#include <common/utils/process_path.h>
-#include <../SettingsAPI/settings_objects.h>

src/common/interop/shared_constants.h

@@ -165,8 +165,6 @@ namespace CommonSharedConstants
     const wchar_t SETTINGS_UPDATED_POWER_DISPLAY_EVENT[] = L"Local\\PowerToysPowerDisplay-SettingsUpdatedEvent-2e4d6f8a-1c3b-5e7f-9a1d-4c6e8f0b2d3e";
     const wchar_t POWER_DISPLAY_SEND_SETTINGS_TELEMETRY_EVENT[] = L"Local\\PowerToysPowerDisplay-SettingsTelemetryEvent-8c4f2a1d-5e3b-7f9c-1a6d-3b8e5f2c9a7d";
     const wchar_t HOTKEY_UPDATED_POWER_DISPLAY_EVENT[] = L"Local\\PowerToysPowerDisplay-HotkeyUpdatedEvent-9d5f3a2b-7e1c-4b8a-6f3d-2a9e5c7b1d4f";
-    const wchar_t POWER_DISPLAY_AUTO_DISABLE_EVENT[] = L"Local\\PowerToysPowerDisplay-AutoDisableEvent-1a7bd9af-d2e0-4e57-8879-0e1c353994d0";
-    const wchar_t RESCAN_POWER_DISPLAY_MONITORS_EVENT[] = L"Local\\PowerToysPowerDisplay-RescanMonitorsEvent-7f3e8c5a-1d4b-4a9e-bc6f-5d8a2b9e3c4f";
 
     // IPC Messages used in PowerDisplay (Named Pipe communication)
     const wchar_t POWER_DISPLAY_TOGGLE_MESSAGE[] = L"Toggle";

src/common/interop/tasklist_positions.cpp

@@ -1,246 +0,0 @@
-#include "pch.h"
-#include "tasklist_positions.h"
-
-// Tried my hardest adapting this to C#, but FindWindowW didn't work properly in C#. ~Noraa Junker
-
-static winrt::com_ptr<IUIAutomation> automation;
-static winrt::com_ptr<IUIAutomationElement> element;
-static winrt::com_ptr<IUIAutomationCondition> true_condition;
-
-extern "C"
-{
-    HWND GetTaskbarHwndForCursorMonitor(HMONITOR monitor)
-    {
-        POINT pt;
-        if (!GetCursorPos(&pt))
-            return nullptr;
-
-        // Find the primary taskbar
-        HWND primaryTaskbar = FindWindowW(L"Shell_TrayWnd", nullptr);
-        if (primaryTaskbar)
-        {
-            MONITORINFO mi = { sizeof(mi) };
-            if (GetWindowRect(primaryTaskbar, &mi.rcMonitor))
-            {
-                HMONITOR primaryMonitor = MonitorFromRect(&mi.rcMonitor, MONITOR_DEFAULTTONEAREST);
-                if (primaryMonitor == monitor)
-                    return primaryTaskbar;
-            }
-        }
-
-        // Find the secondary taskbar(s)
-        HWND secondaryTaskbar = nullptr;
-        while ((secondaryTaskbar = FindWindowExW(nullptr, secondaryTaskbar, L"Shell_SecondaryTrayWnd", nullptr)) != nullptr)
-        {
-            MONITORINFO mi = { sizeof(mi) };
-            RECT rc;
-            if (GetWindowRect(secondaryTaskbar, &rc))
-            {
-                HMONITOR taskbarMonitor = MonitorFromRect(&rc, MONITOR_DEFAULTTONEAREST);
-                if (monitor == taskbarMonitor)
-                    return secondaryTaskbar;
-            }
-        }
-
-        return nullptr;
-    }
-
-    void update(HMONITOR monitor)
-    {
-        // Get HWND of the tasklist for the monitor under the cursor
-        auto taskbar_hwnd = GetTaskbarHwndForCursorMonitor(monitor);
-        if (!taskbar_hwnd)
-            return;
-
-        wchar_t class_name[64] = {};
-        GetClassNameW(taskbar_hwnd, class_name, 64);
-
-        HWND tasklist_hwnd = nullptr;
-
-        if (wcscmp(class_name, L"Shell_TrayWnd") == 0)
-        {
-            // Primary taskbar structure
-            tasklist_hwnd = FindWindowExW(taskbar_hwnd, 0, L"ReBarWindow32", nullptr);
-            if (!tasklist_hwnd)
-                return;
-            tasklist_hwnd = FindWindowExW(tasklist_hwnd, 0, L"MSTaskSwWClass", nullptr);
-            if (!tasklist_hwnd)
-                return;
-            tasklist_hwnd = FindWindowExW(tasklist_hwnd, 0, L"MSTaskListWClass", nullptr);
-            if (!tasklist_hwnd)
-                return;
-        }
-        else if (wcscmp(class_name, L"Shell_SecondaryTrayWnd") == 0)
-        {
-            // Secondary taskbar structure
-            HWND worker_hwnd = FindWindowExW(taskbar_hwnd, 0, L"WorkerW", nullptr);
-            if (!worker_hwnd)
-                return;
-            tasklist_hwnd = FindWindowExW(worker_hwnd, 0, L"MSTaskListWClass", nullptr);
-            if (!tasklist_hwnd)
-                return;
-        }
-        else
-        {
-            // Unknown taskbar type
-            return;
-        }
-
-        if (!automation)
-        {
-            winrt::check_hresult(CoCreateInstance(CLSID_CUIAutomation,
-                                                  nullptr,
-                                                  CLSCTX_INPROC_SERVER,
-                                                  IID_IUIAutomation,
-                                                  automation.put_void()));
-            winrt::check_hresult(automation->CreateTrueCondition(true_condition.put()));
-        }
-        element = nullptr;
-        winrt::check_hresult(automation->ElementFromHandle(tasklist_hwnd, element.put()));
-    }
-
-    void update_new(HMONITOR monitor)
-    {
-        // Get HWND of the tasklist for the monitor under the cursor
-        auto taskbar_hwnd = GetTaskbarHwndForCursorMonitor(monitor);
-        if (!taskbar_hwnd)
-            return;
-
-        wchar_t class_name[64] = {};
-        GetClassNameW(taskbar_hwnd, class_name, 64);
-
-        HWND tasklist_hwnd = nullptr;
-
-        if (wcscmp(class_name, L"Shell_TrayWnd") == 0 || wcscmp(class_name, L"Shell_SecondaryTrayWnd") == 0)
-        {
-            // Primary taskbar structure
-            tasklist_hwnd = FindWindowExW(taskbar_hwnd, 0, L"Windows.UI.Composition.DesktopWindowContentBridge", nullptr);
-            if (!tasklist_hwnd)
-                return;
-            tasklist_hwnd = FindWindowExW(tasklist_hwnd, 0, L"Windows.UI.Input.InputSite.WindowClass", nullptr);
-            if (!tasklist_hwnd)
-                return;
-        }
-        else
-        {
-            // Unknown taskbar type
-            return;
-        }
-
-        if (!automation)
-        {
-            winrt::check_hresult(CoCreateInstance(CLSID_CUIAutomation,
-                                                  nullptr,
-                                                  CLSCTX_INPROC_SERVER,
-                                                  IID_IUIAutomation,
-                                                  automation.put_void()));
-            winrt::check_hresult(automation->CreateTrueCondition(true_condition.put()));
-        }
-
-        winrt::com_ptr<IUIAutomationElement> tempElement;
-        element = nullptr;
-        winrt::check_hresult(automation->ElementFromHandle(tasklist_hwnd, tempElement.put()));
-
-        winrt::check_hresult(
-            tempElement->FindFirst(TreeScope_Children, true_condition.get(), element.put()));
-    }
-
-    bool update_buttons(std::vector<TasklistButton>& buttons)
-    {
-        if (!automation || !element)
-        {
-            return false;
-        }
-        winrt::com_ptr<IUIAutomationElementArray> elements;
-        if (element->FindAll(TreeScope_Children, true_condition.get(), elements.put()) < 0)
-            return false;
-        if (!elements)
-            return false;
-        int count;
-        if (elements->get_Length(&count) < 0)
-            return false;
-        winrt::com_ptr<IUIAutomationElement> child;
-        std::vector<TasklistButton> found_buttons;
-        found_buttons.reserve(count);
-        for (int i = 0; i < count; ++i)
-        {
-            child = nullptr;
-            if (elements->GetElement(i, child.put()) < 0)
-                return false;
-            TasklistButton button = {};
-            if (VARIANT var_rect; child->GetCurrentPropertyValue(UIA_BoundingRectanglePropertyId, &var_rect) >= 0)
-            {
-                if (var_rect.vt == (VT_R8 | VT_ARRAY))
-                {
-                    LONG pos;
-                    double value;
-                    pos = 0;
-                    SafeArrayGetElement(var_rect.parray, &pos, &value);
-                    button.x = static_cast<long>(value);
-                    pos = 1;
-                    SafeArrayGetElement(var_rect.parray, &pos, &value);
-                    button.y = static_cast<long>(value);
-                    pos = 2;
-                    SafeArrayGetElement(var_rect.parray, &pos, &value);
-                    button.width = static_cast<long>(value);
-                    pos = 3;
-                    SafeArrayGetElement(var_rect.parray, &pos, &value);
-                    button.height = static_cast<long>(value);
-                }
-                VariantClear(&var_rect);
-            }
-            else
-            {
-                return false;
-            }
-            if (BSTR automation_id; child->get_CurrentAutomationId(&automation_id) >= 0)
-            {
-                wcsncpy_s(button.name, automation_id, _countof(button.name));
-                SysFreeString(automation_id);
-                if (wcsncmp(button.name, L"Appid:", wcslen(L"Appid:")) != 0)
-                {
-                    continue;
-                }
-            }
-            found_buttons.push_back(button);
-        }
-        // assign keynums
-        buttons.clear();
-        for (auto& button : found_buttons)
-        {
-            if (buttons.empty())
-            {
-                button.keynum = 1;
-                buttons.push_back(std::move(button));
-            }
-            else
-            {
-                if (button.x < buttons.back().x || button.y < buttons.back().y) // skip 2nd row
-                    break;
-                if (wcsncmp(button.name, buttons.back().name, _countof(button.name)) == 0)
-                    continue; // skip buttons from the same app
-                button.keynum = buttons.back().keynum + 1;
-                buttons.push_back(std::move(button));
-                if (buttons.back().keynum == 10)
-                    break; // no more than 10 buttons
-            }
-        }
-        return true;
-    }
-
-    __declspec(dllexport) TasklistButton* get_buttons(HMONITOR monitor, int* size)
-    {
-        update(monitor);
-        static std::vector<TasklistButton> buttons;
-        update_buttons(buttons);
-        *size = static_cast<int>(buttons.size());
-        if (*size == 0)
-        {
-            // After a certain Windows update, the old method stopped working, try the new one
-            update_new(monitor);
-            update_buttons(buttons);
-            *size = static_cast<int>(buttons.size());
-        }
-        return buttons.data();
-    }
-}

src/common/interop/tasklist_positions.h

@@ -1,19 +0,0 @@
-#pragma once
-
-struct TasklistButton
-{
-    wchar_t name[256];
-    int x;
-    int y;
-    int width;
-    int height;
-    int keynum;
-};
-
-extern "C"
-{
-    // Helper to get the taskbar HWND for the monitor under the cursor
-    HWND GetTaskbarHwndForCursorMonitor(HMONITOR monitor);
-    bool update_buttons(std::vector<TasklistButton>& buttons);
-    __declspec(dllexport) TasklistButton* get_buttons(HMONITOR monitor, int* size);
-}

src/common/logger/logger.h

@@ -1,27 +1,7 @@
 #pragma once
 #include <spdlog/spdlog.h>
-#include <type_traits>
 #include "logger_settings.h"
 
-// fmt 9+ no longer auto-formats enums. Provide a generic formatter that
-// converts any scoped or unscoped enum to its underlying integer type so
-// existing Logger::xxx(L"... {} ...", someEnum) call sites keep working
-// after the spdlog 1.17 / fmt 12 upgrade.
-namespace fmt
-{
-    template <typename E, typename Char>
-    struct formatter<E, Char, std::enable_if_t<std::is_enum_v<E>>>
-        : formatter<std::underlying_type_t<E>, Char>
-    {
-        template <typename FormatContext>
-        auto format(E value, FormatContext& ctx) const
-        {
-            return formatter<std::underlying_type_t<E>, Char>::format(
-                static_cast<std::underlying_type_t<E>>(value), ctx);
-        }
-    };
-}
-
 class Logger
 {
 private:
@@ -37,44 +17,44 @@ public:
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void trace(const FormatString& formatString, const Args&... args)
+    static void trace(const FormatString& fmt, const Args&... args)
     {
-        logger->trace(fmt::runtime(formatString), args...);
+        logger->trace(fmt, args...);
     }
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void debug(const FormatString& formatString, const Args&... args)
+    static void debug(const FormatString& fmt, const Args&... args)
     {
-        logger->debug(fmt::runtime(formatString), args...);
+        logger->debug(fmt, args...);
     }
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void info(const FormatString& formatString, const Args&... args)
+    static void info(const FormatString& fmt, const Args&... args)
     {
-        logger->info(fmt::runtime(formatString), args...);
+        logger->info(fmt, args...);
     }
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void warn(const FormatString& formatString, const Args&... args)
+    static void warn(const FormatString& fmt, const Args&... args)
     {
-        logger->warn(fmt::runtime(formatString), args...);
+        logger->warn(fmt, args...);
     }
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void error(const FormatString& formatString, const Args&... args)
+    static void error(const FormatString& fmt, const Args&... args)
     {
-        logger->error(fmt::runtime(formatString), args...);
+        logger->error(fmt, args...);
     }
 
     // log message should not be localized
     template<typename FormatString, typename... Args>
-    static void critical(const FormatString& formatString, const Args&... args)
+    static void critical(const FormatString& fmt, const Args&... args)
     {
-        logger->critical(fmt::runtime(formatString), args...);
+        logger->critical(fmt, args...);
     }
 
     static void flush()

src/common/notifications/notifications.vcxproj

@@ -46,7 +46,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -54,6 +54,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/notifications/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

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/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

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.vcxproj

@@ -58,7 +58,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -66,6 +66,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/gpo/assets/en-US/PowerToys.adml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.20" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>

src/logging/logging.vcxproj

@@ -55,7 +55,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;SPDLOG_WCHAR_TO_UTF8_SUPPORT;FMT_UNICODE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -71,7 +71,7 @@
     <ClCompile Include="$(RepoRoot)deps\spdlog\src\file_sinks.cpp" />
     <ClCompile Include="$(RepoRoot)deps\spdlog\src\async.cpp" />
     <ClCompile Include="$(RepoRoot)deps\spdlog\src\cfg.cpp" />
-    <ClCompile Include="$(RepoRoot)deps\spdlog\src\bundled_fmtlib_format.cpp" />
+    <ClCompile Include="$(RepoRoot)deps\spdlog\src\fmt.cpp" />
     <ClInclude Include="$(RepoRoot)deps\spdlog\include\spdlog\async.h" />
     <ClInclude Include="$(RepoRoot)deps\spdlog\include\spdlog\async_logger-inl.h" />
     <ClInclude Include="$(RepoRoot)deps\spdlog\include\spdlog\async_logger.h" />

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj

@@ -74,6 +74,8 @@
     <PackageReference Include="ReverseMarkdown" />
     <PackageReference Include="StreamJsonRpc" />
     <PackageReference Include="WinUIEx" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj

@@ -20,6 +20,9 @@
 	<ItemGroup>
 		<PackageReference Include="Appium.WebDriver" />
 		<PackageReference Include="MSTest" />
+		<PackageReference Include="System.Net.Http" />
+		<PackageReference Include="System.Private.Uri" />
+		<PackageReference Include="System.Text.RegularExpressions" />
 	</ItemGroup>
 
 	<ItemGroup>

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -161,7 +161,7 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets" Condition="Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -170,6 +170,6 @@
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/modules/CropAndLock/CropAndLock/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="robmikh.common" version="0.0.23-beta" targetFramework="native" />
 </packages>

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj

@@ -103,7 +103,7 @@
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets" Condition="Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -113,6 +113,6 @@
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/modules/CropAndLock/CropAndLockModuleInterface/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj

@@ -65,6 +65,8 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="WinUIEx" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -49,6 +49,8 @@
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" />
     <PackageReference Include="System.IO.Abstractions" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj

@@ -144,14 +144,14 @@ MakeAppx.exe pack /d . /p $(OutDir)FileLocksmithContextMenuPackage.msix /nv</Com
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>

src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj

@@ -61,6 +61,7 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="System.Drawing.Common" />
     <PackageReference Include="WinUIEx" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />