Address review: use prefix constants instead of magic numbers, normalize paths at source

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
@@ -317,7 +310,6 @@ onefuzz
 # NameInCode
 leilzh
 mengyuanchen
-contoso
 
 # DllName
 testhost
@@ -337,10 +329,6 @@ MRUCMPPROC
 MRUINFO
 REGSTR
 
-#Xaml
-NVI
-Storyboards
-
 # Misc Win32 APIs and PInvokes
 DEFAULTTONEAREST
 INVOKEIDLIST
@@ -358,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
@@ -403,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

@@ -107,13 +107,11 @@
 ^src/common/sysinternals/Eula/
 ^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherComparisonTests.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherDiacriticsTests.cs$
-^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
+^doc/devdocs/modules/cmdpal/initial-sdk-spec/list-elements-mock-002\.pdn$
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/.*\.TestData\.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/Text/.*\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherComparisonTests.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherDiacriticsTests.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
@@ -145,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

@@ -10,6 +10,7 @@ ACCESSDENIED
 ACCESSTOKEN
 acfs
 ACIE
+ACR
 acrt
 ACTIVATEAPP
 ACTIVATEOPTIONS
@@ -25,7 +26,6 @@ advapi
 advfirewall
 AFeature
 affordances
-afterfx
 AFX
 agentskills
 AGGREGATABLE
@@ -63,7 +63,6 @@ APPEXECLINK
 appext
 apphost
 APPLICATIONFRAMEHOST
-Applocal
 appmanifest
 APPMODEL
 APPNAME
@@ -82,7 +81,6 @@ ARPPRODUCTICON
 ARRAYSIZE
 ARROWKEYS
 arrowshape
-artboard
 ARTIFACTSTAGINGDIRECTORY
 asf
 Ashcraft
@@ -90,6 +88,7 @@ AShortcut
 ASSOCCHANGED
 ASSOCF
 ASSOCSTR
+ASUS
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
@@ -120,6 +119,7 @@ Badmode
 Badparam
 bbwe
 BCIE
+bck
 BESTEFFORT
 bezelled
 bhid
@@ -158,7 +158,6 @@ breadcrumb
 Browsable
 BROWSEINFO
 bsd
-BSOD
 bthprops
 bti
 BTNFACE
@@ -166,7 +165,6 @@ bugreport
 bugreportfile
 BUILDARCH
 BUILDNUMBER
-buildsystems
 buildtransitive
 builttoroam
 BUNDLEINFO
@@ -204,7 +202,7 @@ checkmarks
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
-chu
+Chunghwa
 CIBUILD
 cidl
 CIELCh
@@ -220,14 +218,12 @@ clickable
 clickonce
 clientedge
 clientside
-cliextensions
 CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
 clp
 CLSCTX
-CLSIDs
 clsids
 Clusion
 cmder
@@ -312,6 +308,7 @@ Crossdevice
 crt
 csdevkit
 cso
+CSOT
 CSRW
 cswin
 CTEXT
@@ -338,7 +335,6 @@ dacl
 DAffine
 DAFFINETRANSFORM
 datareader
-Datasheet
 datatracker
 Dayof
 dbcc
@@ -368,14 +364,14 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTSIZE
+defaulttonearest
+DEFAULTTONEAREST
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
 DEFPUSHBUTTON
 deinitialization
 DELA
-DELD
-deld
 DELETEDKEYIMAGE
 DELETESCANS
 DEMOTYPE
@@ -400,7 +396,6 @@ DEVMODE
 DEVMODEW
 DEVNODES
 devpal
-devpackages
 DEVTYP
 dfx
 DIALOGEX
@@ -443,12 +438,11 @@ drawingcolor
 dreamsofameaningfullife
 drivedetectionwarning
 DROPFILES
-DSPDLOG
 DSTINVERT
 DString
+DSVG
 dto
 DUMMYUNIONNAME
-dumpbin
 dutil
 DVASPECT
 DVASPECTINFO
@@ -509,6 +503,7 @@ ETDT
 etl
 etw
 eula
+eurochange
 eventvwr
 evt
 EWXFORCE
@@ -549,7 +544,6 @@ FFFF
 fffffffzzz
 FFh
 Figma
-figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -639,11 +633,9 @@ gpu
 grabandmove
 GRABANDMOVEMODULEINTERFACE
 gradians
-GRC
 grctlext
 GRGX
 Gridcustomlayout
-gridlines
 GSM
 gtm
 guiddata
@@ -652,6 +644,7 @@ gwl
 GWLP
 GWLSTYLE
 hangeul
+Hann
 Hantai
 Hanzi
 Hardlines
@@ -721,7 +714,6 @@ HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
-hostfxr
 hostsfileeditor
 hotfixes
 hotkeycontrol
@@ -730,7 +722,6 @@ hotkeys
 hotlight
 hotspot
 HPAINTBUFFER
-HPS
 HRAWINPUT
 HREDRAW
 hres
@@ -755,6 +746,7 @@ HWNDLAST
 HWNDNEXT
 HWNDPARENT
 HWNDPREV
+HWP
 hyjiacan
 IAI
 icf
@@ -794,7 +786,6 @@ imgflip
 inapp
 inbox
 INCONTACT
-indesign
 Indo
 inetcpl
 Infobar
@@ -805,7 +796,6 @@ INITDIALOG
 INITGUID
 initialfile
 INITTOLOGFONTSTRUCT
-inkscape
 INLINEPREFIX
 inlines
 Inno
@@ -849,15 +839,14 @@ issecret
 ISSEPARATOR
 issuecomment
 istep
-Italicise
 ith
 IUI
 IUWP
+IVO
 IWIC
 jeli
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
-JIDEA
 jjw
 jobject
 JOBOBJECT
@@ -868,7 +857,6 @@ Jsons
 jsonval
 jxr
 Kantai
-KBSC
 keybd
 KEYBDDATA
 KEYBDINPUT
@@ -886,7 +874,6 @@ keynum
 keyremaps
 keyring
 keyvault
-kfull
 KILLFOCUS
 killrunner
 kmph
@@ -990,7 +977,6 @@ lstrcmpi
 lstrcpyn
 lstrlen
 LTEXT
-LTM
 LTRREADING
 luid
 lusrmgr
@@ -1040,12 +1026,10 @@ Metadatas
 metafile
 metapackage
 mfc
-mfcm
 Mgmt
 Microwaved
 middleclickaction
 midl
-midtones
 mii
 MIIM
 mikeclayton
@@ -1058,6 +1042,7 @@ MINIMIZESTART
 MINMAXINFO
 minwindef
 Mip
+Miracast
 mkdn
 mlcfg
 mmc
@@ -1088,7 +1073,6 @@ MOVESIZEEND
 MOVESIZESTART
 MRM
 mru
-msaccess
 MSAL
 msc
 mscorlib
@@ -1097,6 +1081,8 @@ msdata
 msdia
 MSDL
 MSGFLT
+MSHCTX
+MSHLFLAGS
 msiexec
 MSIFASTINSTALL
 MSIHANDLE
@@ -1106,16 +1092,13 @@ msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
 Mso
-mspub
 msrc
 msstore
 mstsc
 msvcp
 mswhql
-MT
 MTND
 multimonitor
-Multiplayer
 MULTIPLEUSE
 multizone
 muxc
@@ -1133,6 +1116,7 @@ myorg
 myrepo
 NAMECHANGE
 namespaceanddescendants
+Nanjing
 nao
 NCACTIVATE
 ncc
@@ -1158,6 +1142,7 @@ netcpl
 netframework
 netsetup
 netsh
+newcolor
 NEWDIALOGSTYLE
 NEWFILE
 NEWFILEHEADER
@@ -1218,7 +1203,6 @@ NORMALDISPLAY
 NORMALUSER
 NOSEARCH
 NOSENDCHANGING
-NOSIZE
 nosize
 notdefault
 NOTHOUSANDS
@@ -1233,6 +1217,7 @@ NOTSRCCOPY
 NOTSRCERASE
 Notupdated
 notwindows
+NOTXORPEN
 nowarn
 NOZORDER
 NPH
@@ -1259,6 +1244,7 @@ OFN
 ofs
 OICI
 OICIIO
+oldcolor
 olditem
 oldpath
 oldtheme
@@ -1325,7 +1311,6 @@ pchast
 PCIDLIST
 PCTSTR
 PCWSTR
-pdbs
 PDBs
 PDEVMODE
 PDFs
@@ -1353,8 +1338,8 @@ pguid
 phbm
 phbmp
 phicon
+PHL
 Photoshop
-photoshop
 phwnd
 pici
 pidl
@@ -1382,16 +1367,14 @@ POINTERID
 POINTERUPDATE
 Pokedex
 Pomodoro
+Popups
 popups
 POPUPWINDOW
-portfile
 POSITIONITEM
-Postbot
 POWERBROADCAST
 powerdisplay
 POWERDISPLAYMODULEINTERFACE
 powerocr
-powerpnt
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1447,7 +1430,6 @@ projectname
 PROPERTYKEY
 PROPVARIANT
 prot
-Prt
 PRTL
 prvpane
 psapi
@@ -1473,7 +1455,6 @@ ptcontrols
 ptd
 PTOKEN
 ptstr
-ptsym
 pui
 pvct
 PWAs
@@ -1482,6 +1463,7 @@ PWSTR
 pwsz
 pwtd
 qdc
+QDS
 qit
 QITAB
 QITABENT
@@ -1493,7 +1475,6 @@ QUERYOPEN
 QUEUESYNC
 quickaccent
 quicklinks
-quickmask
 QUNS
 RAII
 randi
@@ -1514,6 +1495,7 @@ READMODE
 READOBJECTS
 recents
 RECTDESTINATION
+rectp
 RECTSOURCE
 recursesubdirs
 recyclebin
@@ -1558,7 +1540,6 @@ resmimetype
 RESOURCEID
 RESTORETOMAXIMIZED
 RETURNONLYFSDIRS
-Revalidates
 RGBQUAD
 rgbs
 rgelt
@@ -1601,15 +1582,14 @@ SAMESHORTCUTPREVIOUSLYMAPPED
 samsung
 sancov
 SAVEFAILED
+scanled
 schedtasks
 SCID
-SCL
 Scode
 SCREENFONTS
 screenruler
 screensaver
 screenshots
-Scrollback
 scrollviewer
 sddl
 SDKDDK
@@ -1779,7 +1759,6 @@ STDAPI
 stdc
 stdcpp
 stdcpplatest
-stdext
 STDMETHODCALLTYPE
 STDMETHODIMP
 steamapps
@@ -1882,8 +1861,8 @@ themeresources
 THH
 thickframe
 THISCOMPONENT
-threadpool
 throughs
+Tianma
 TILEDWINDOW
 TILLSON
 timedate
@@ -1901,7 +1880,6 @@ TNP
 Toggleable
 tontrager
 Toolhelp
-toolsets
 toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
@@ -1922,7 +1900,6 @@ trx
 tsa
 tskill
 tstoi
-tsv
 tweakable
 TWF
 tymed
@@ -1940,7 +1917,6 @@ ucrtd
 uefi
 uesc
 UIA
-UIDs
 UIEx
 uild
 uitests
@@ -1951,7 +1927,6 @@ ums
 uncompilable
 UNCPRIORITY
 UNDNAME
-ungroup
 UNICODETEXT
 unins
 uninsdeletekey
@@ -1962,11 +1937,8 @@ unitconverter
 unittests
 UNLEN
 UNORM
-unparsable
 unremapped
-Unsend
-Unsubscribes
-untriaged
+unsubscribes
 unvirtualized
 unwide
 unzoom
@@ -1993,14 +1965,12 @@ vabdq
 validmodulename
 valuegenerator
 VARTYPE
-vbcscompiler
 vcamp
 VCENTER
 vcgtq
 VCINSTALLDIR
 vcp
 Vcpkg
-vcpkg
 vcpname
 VCRT
 vcruntime
@@ -2023,7 +1993,6 @@ VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
 visiblecolorformats
-visio
 visualeffects
 vkey
 vmovl
@@ -2108,16 +2077,13 @@ winlogon
 winmd
 winml
 WINNT
-winproj
 winres
 winrt
 winsdk
 winsta
 WINTHRESHOLD
 WINVER
-winword
 winxamlmanager
-wireframes
 withinrafael
 Withscript
 wixproj
@@ -2188,10 +2154,8 @@ xxxxxx
 ycombinator
 yinle
 yinyue
-yoko
 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

@@ -163,7 +163,7 @@ configuration:
             association: Collaborator
       then:
       - addReply:
-          reply: We've identified this issue as a duplicate of an existing one and are closing this thread so discussion stays in one place.<br/><br/>Please see the comment above for the link to the original tracking issue, and feel free to subscribe there for updates.
+          reply: Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!
       - closeIssue
       - removeLabel:
           label: Needs-Triage
@@ -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,377 +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 REVIEWER_LOGIN = 'chatasweetie';
-const REVIEWER_MENTION = `@${REVIEWER_LOGIN}`;
-
-const COMMENT_MARKER = '<!-- telemetry-event-check -->';
-const COMMENT_BODY_WITH_PRIVACY_UPDATE = `${COMMENT_MARKER}
-Thank you for contributing to PowerToys. We've detected that this PR might include a new or modified telemetry event. After this PR is merged, please follow these next steps:
-
-- [ ] Reach out to Jessica (${REVIEWER_MENTION}) to follow up on the next steps: https://aka.ms/pt-telemetry-process
-`;
-
-const COMMENT_BODY_WITHOUT_PRIVACY_UPDATE = `${COMMENT_MARKER}
-Thank you for contributing to PowerToys. We've detected that this PR might include a new or modified telemetry event. Please ensure the following before merging:
-
-- [ ] Add your telemetry events to [DATA_AND_PRIVACY](https://github.com/microsoft/PowerToys/blob/main/DATA_AND_PRIVACY.md).md within this PR.
-
-- [ ] Reach out to Jessica (${REVIEWER_MENTION}) to follow up on the next steps: https://aka.ms/pt-telemetry-process`;
-
-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 getPullRequest(apiBaseUrl, repository, pullNumber) {
-  const url = `${apiBaseUrl}/repos/${repository}/pulls/${pullNumber}`;
-  const pullRequest = await apiRequest(url);
-  if (!pullRequest || typeof pullRequest !== 'object') {
-    throw new Error('Unexpected response while fetching pull request details.');
-  }
-  return pullRequest;
-}
-
-async function ensureReviewerRequested(apiBaseUrl, repository, pullNumber, pullRequest) {
-  const authorLogin = String(pullRequest?.user?.login || '').toLowerCase();
-  const targetReviewer = REVIEWER_LOGIN.toLowerCase();
-
-  if (authorLogin === targetReviewer) {
-    console.log(`Skipping reviewer request: ${REVIEWER_LOGIN} is the PR author.`);
-    return;
-  }
-
-  const requestedReviewers = Array.isArray(pullRequest?.requested_reviewers)
-    ? pullRequest.requested_reviewers
-    : [];
-  const alreadyRequested = requestedReviewers.some(
-    (reviewer) => String(reviewer?.login || '').toLowerCase() === targetReviewer
-  );
-
-  if (alreadyRequested) {
-    console.log(`Reviewer ${REVIEWER_LOGIN} is already requested.`);
-    return;
-  }
-
-  const url = `${apiBaseUrl}/repos/${repository}/pulls/${pullNumber}/requested_reviewers`;
-  try {
-    await apiRequest(url, 'POST', { reviewers: [REVIEWER_LOGIN] });
-    console.log(`Requested reviewer ${REVIEWER_LOGIN}.`);
-  } catch (error) {
-    // Reviewer request should not fail the telemetry guidance workflow.
-    console.warn(
-      `Unable to request reviewer ${REVIEWER_LOGIN}: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
-async function findExistingTelemetryComment(apiBaseUrl, repository, pullNumber) {
-  let page = 1;
-
-  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})`
-    );
-  }
-
-  try {
-    const pullRequest = await getPullRequest(parsedApiBaseUrl.origin, repository, pullNumber);
-    await ensureReviewerRequested(parsedApiBaseUrl.origin, repository, pullNumber, pullRequest);
-  } catch (error) {
-    console.warn(
-      'Failed to fetch PR details or request reviewer; continuing to post telemetry guidance comment.'
-    );
-    console.warn(error instanceof Error ? error.stack || error.message : error);
-  }
-
-  const commentBody = dataAndPrivacyChanged
-    ? COMMENT_BODY_WITH_PRIVACY_UPDATE
-    : COMMENT_BODY_WITHOUT_PRIVACY_UPDATE;
-
-  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

.gitignore

@@ -370,8 +370,3 @@ installer/*/*.wxs.bk
 .squad-workstream
 .github/agents/**squad**.md
 .github/workflows/**squad**.yml
-
-# vcpkg manifest mode installed packages
-vcpkg_installed/
-
-deps/vcpkg/

.gitmodules

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

.pipelines/ESRPSigning_core.json

@@ -212,7 +212,6 @@
             "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
 
             "PowerAccent.Core.dll",
-            "PowerAccent.Common.dll",
             "PowerToys.PowerAccent.dll",
             "PowerToys.PowerAccent.exe",
             "PowerToys.PowerAccentModuleInterface.dll",
@@ -244,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",
@@ -388,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/release.yml

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

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

@@ -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
@@ -270,34 +270,6 @@ jobs:
       parameters:
         directory: $(build.sourcesdirectory)\src\modules\cmdpal
 
-  # --- vcpkg detection + binary cache --------------------------------------
-  # PowerToys consumes spdlog (and, over time, other native deps) via vcpkg in
-  # manifest mode. steps-install-vcpkg.yml prefers the vcpkg shipped with
-  # Visual Studio (Microsoft.VisualStudio.Component.Vcpkg) and falls back to a
-  # fresh clone of microsoft/vcpkg into deps/vcpkg if VS doesn't have it.
-  # Either way it sets the VCPKG_ROOT pipeline variable; MSBuild integration
-  # is wired globally from Cpp.Build.props (with vcpkg.targets in
-  # Cpp.Build.targets) using the three-tier VcpkgRoot fallback
-  # (env var > VS-shipped > deps/vcpkg runtime clone).
-  #
-  # Vcpkg's MSBuild integration runs `vcpkg install` once per project, so the
-  # binary cache below saves ~3-5 minutes per triplet on cache hits.
-  - template: .\steps-install-vcpkg.yml
-    parameters:
-      useVSPreview: ${{ parameters.useVSPreview }}
-
-  - ${{ if eq(parameters.enablePackageCaching, true) }}:
-    - task: Cache@2
-      displayName: 'Cache vcpkg binary archives'
-      inputs:
-        # Key on the inputs vcpkg uses to compute its package ABI: the manifest,
-        # configuration, every overlay-port file, and the agent OS.
-        key: '"vcpkg" | "$(Agent.OS)" | vcpkg.json | vcpkg-configuration.json | deps/vcpkg-overlays/**'
-        restoreKeys: |
-           "vcpkg" | "$(Agent.OS)"
-           "vcpkg"
-        path: $(LOCALAPPDATA)\vcpkg\archives
-
 
 
   - ${{ parameters.beforeBuildSteps }}
@@ -446,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-sdk.yml

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

.pipelines/v2/templates/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-install-terrapin.yml

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

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

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

.pipelines/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; 
     }

.vsconfig

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

Cpp.Build.props

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

Cpp.Build.targets

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

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.8" />
+    <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.8" />
+    <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.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.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.8" />
+    <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.8" />
-    <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.8" />
+    <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.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="10.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="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.8" />
+    <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.8" />
-    <PackageVersion Include="System.ClientModel" Version="1.8.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="10.0.8" />
+    <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.8" />
+    <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.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="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/">
@@ -68,7 +67,10 @@
     <Project Path="src/common/interop/PowerToys.Interop.vcxproj" Id="f055103b-f80b-4d0c-bf48-057c55620033" />
   </Folder>
   <Folder Name="/common/log/">
-    <Project Path="src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd" />
+    <Project Path="src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd">
+      <BuildDependency Project="src/logging/logging.vcxproj" />
+    </Project>
+    <Project Path="src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f" />
   </Folder>
   <Folder Name="/common/notifications/">
     <Project Path="src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj" Id="0b593a6c-4143-4337-860e-db5710fb87db" />
@@ -204,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" />
@@ -799,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" />
@@ -995,20 +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/ShortcutGuide.UnitTests/ShortcutGuide.UnitTests.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">
@@ -1143,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/expected.props

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

deps/spdlog.props

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

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

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

deps/vcpkg-overlays/spdlog/portfile.cmake

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

deps/vcpkg-overlays/spdlog/vcpkg.json

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

doc/devdocs/development/debugging.md

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

doc/devdocs/modules/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/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,326 +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 shown (To rephrase: For which processes the shortcut will have an effect if pressed). The value can be either an exact process executable name, for example `explorer.exe` or `chrome.exe`, or a single asterisk (`*`) to apply to any process. No other wildcard patterns are supported by this specification.
-
-</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).
-
-**Literal digit keys**:
-
-Because a bare number is interpreted as a virtual-key code, a literal digit key must be authored using the `<N>` notation (the digit enclosed between `<` and `>`), where `N` is `0`–`9`. For example, `<9>` represents the literal `9` key (as in the "switch to the last tab" shortcut), not the virtual-key code `9` (which is `Tab`). The interpreter strips the brackets and displays just the digit.
-
-This applies only to a single literal digit. A range such as `1 - 8` is a free-form label, not a key, and is supplied verbatim (the brackets would only be trimmed from the ends, so `<1> - <8>` would not render as intended).
-
-**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.
-
-By convention these tokens are written as double-quoted strings in the YAML (for example `"<Enter>"` and `"<9>"`), matching the quoting used for punctuation key values. YAML treats the quoted and unquoted forms identically, so quoting is for consistency rather than a strict requirement for bracketed tokens.
-
-|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"]
-```

doc/thirdPartyRunPlugins.md

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

installer/PowerToysSetup.slnx

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

installer/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,39 +2,26 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ShortcutGuideAssetsFiles=?>
-  <?define ShortcutGuideAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ShortcutGuide\?>
-  <?define ShortcutGuideManifestsFiles=?>
-  <?define ShortcutGuideManifestsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ShortcutGuide\Manifests\?>
+  <?define ShortcutGuideSvgFiles=?>
+  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
 
   <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="ShortcutGuideAssetsFolder" Name="ShortcutGuide">
-        <Directory Id="ShortcutGuideManifestsFolder" Name="Manifests" />
-      </Directory>
+    <!-- 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-->
-    </DirectoryRef>
-    <DirectoryRef Id="ShortcutGuideManifestsFolder" FileSource="$(var.ShortcutGuideManifestsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShortcutGuideManifestsFiles_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"/>
-      </Component>
-      <Component Id="RemoveShortcutGuideManifestsFolder" Guid="F47E2C3A-8D91-4B6F-A2E5-9C8D7F6A1B3E" Directory="ShortcutGuideManifestsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveShortcutGuideManifestsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderShortcutGuideManifestsInstallFolder" Directory="ShortcutGuideManifestsFolder" On="uninstall"/>
+        <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>