for demo

Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,13 +7,6 @@ body:
 - type: markdown
   attributes:
     value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
-- type: markdown
-  attributes:
-    value: |
-      We are aware of the following high-volume issues and are actively working on them. Please check if your issue is one of these before filing a new bug report:
-      * **PowerToys Run crash related to "Desktop composition is disabled"**: This may appear as `COMException: 0x80263001`. For more details, see issue [#31226](https://github.com/microsoft/PowerToys/issues/31226).
-      * **PowerToys Run crash with `COMException (0xD0000701)`**: For more details, see issue [#30769](https://github.com/microsoft/PowerToys/issues/30769).
-      * **PowerToys Run crash with a "Cyclic reference" error**: This `System.InvalidOperationException` is detailed in issue [#36451](https://github.com/microsoft/PowerToys/issues/36451).
 - id: version
   type: input
   attributes:

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

@@ -95,7 +95,6 @@ OTP
 Yubi
 Yubico
 Perplexity
-Groq
 svgl
 
 # KEYS
@@ -322,20 +321,3 @@ REGSTR
 
 # Misc Win32 APIs and PInvokes
 INVOKEIDLIST
-
-# PowerRename metadata pattern abbreviations (used in tests and regex patterns)
-DDDD
-FFF
-HHH
-riday
-YYY
-
-# GitHub issue/PR commands
-azp
-feedbackhub
-needinfo
-reportbug
-
-#ffmpeg
-crf
-nostdin

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

@@ -105,7 +105,6 @@
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
-^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$

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

@@ -2,8 +2,8 @@ AAAAs
 abcdefghjkmnpqrstuvxyz
 abgr
 ABlocked
-ABORTIFHUNG
 ABOUTBOX
+ABORTIFHUNG
 Abug
 Acceleratorkeys
 ACCEPTFILES
@@ -22,7 +22,6 @@ ADate
 ADDSTRING
 ADDUNDORECORD
 ADifferent
-adjacents
 ADMINS
 adml
 admx
@@ -35,7 +34,6 @@ AFX
 AGGREGATABLE
 AHK
 AHybrid
-AIUI
 akv
 ALarger
 ALIGNRIGHT
@@ -56,7 +54,6 @@ ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
 AOklab
-aot
 APARTMENTTHREADED
 APeriod
 apicontract
@@ -66,7 +63,6 @@ APIIs
 Apm
 APPBARDATA
 APPEXECLINK
-appext
 APPLICATIONFRAMEHOST
 appmanifest
 APPMODEL
@@ -99,9 +95,8 @@ ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
 ATRIOX
-ATX
 aumid
-authenticode
+Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
 AUTOHIDE
@@ -115,10 +110,6 @@ AValid
 AWAYMODE
 azcliversion
 azman
-azureaiinference
-azureinference
-azureopenai
-backticks
 bbwe
 BCIE
 bck
@@ -141,11 +132,8 @@ BITSPIXEL
 bla
 BLACKFRAME
 BLENDFUNCTION
-blittable
 Blockquotes
-blt
-bluelightreduction
-bluelightreductionstate
+Blt
 BLURBEHIND
 BLURREGION
 bmi
@@ -153,7 +141,6 @@ BNumber
 BODGY
 BOklab
 BOOTSTRAPPERINSTALLFOLDER
-Bootstrappers
 BOTTOMALIGN
 boxmodel
 BPBF
@@ -187,10 +174,7 @@ Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
-Carlseibert
 CAtl
-caub
-CBN
 cch
 CCHDEVICENAME
 CCHFORMNAME
@@ -209,6 +193,7 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
+CIBUILD
 cidl
 CIELCh
 cim
@@ -224,7 +209,6 @@ clientside
 CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
-CLITo
 closesocket
 clp
 CLSCTX
@@ -245,7 +229,6 @@ CODENAME
 codereview
 Codespaces
 Coen
-cognitiveservices
 COINIT
 colid
 colorconv
@@ -253,7 +236,6 @@ colorformat
 colorhistory
 colorhistorylimit
 COLORKEY
-colorref
 comctl
 comdlg
 comexp
@@ -261,12 +243,12 @@ cominterop
 commandnotfound
 commandpalette
 compmgmt
-COMPOSITIONDISABLED
 COMPOSITIONFULL
 CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+coreclr
 constexpr
 contentdialog
 contentfiles
@@ -278,7 +260,6 @@ copiedcolorrepresentation
 coppied
 copyable
 COPYPEN
-coreclr
 COREWINDOW
 Corpor
 cotaskmem
@@ -289,7 +270,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
@@ -298,7 +278,6 @@ CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
 CREATEWINDOWFAILED
-creativecommons
 CRECT
 CRH
 critsec
@@ -318,7 +297,6 @@ CURRENTDIR
 CURSORINFO
 cursorpos
 CURSORSHOWING
-CURSORWRAP
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -334,6 +312,7 @@ CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
 Czechia
+cziplib
 Dac
 dacl
 DAffine
@@ -358,6 +337,7 @@ debugbreak
 decryptor
 Dedup
 Deduplicator
+Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
@@ -404,6 +384,7 @@ DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
 divyan
+djwsxzxb
 Dlg
 DLGFRAME
 DLGMODALFRAME
@@ -414,8 +395,6 @@ DNLEN
 DONOTROUND
 DONTVALIDATEPATH
 dotnet
-downsampled
-downsampling
 downscale
 DPICHANGED
 DPIs
@@ -431,7 +410,7 @@ DROPFILES
 DSTINVERT
 DString
 DSVG
-dto
+DTo
 DUMMYUNIONNAME
 dutil
 DVASPECT
@@ -465,6 +444,7 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 EFile
+ekus
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -533,7 +513,6 @@ FARPROC
 fdx
 fesf
 FFFF
-Figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -561,7 +540,6 @@ flac
 flyouts
 FMask
 fmtid
-FNumber
 FOF
 FOFX
 FOLDERID
@@ -572,7 +550,6 @@ FORCEMINIMIZE
 FORMATDLGORD
 formatetc
 FORPARSING
-foundrylocal
 FRAMECHANGED
 frm
 FROMTOUCH
@@ -591,16 +568,15 @@ gdi
 gdiplus
 GDIPVER
 GDISCALED
-geolocator
 GETCLIENTAREAANIMATION
 GETCURSEL
 GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
 getfilesiginforedist
+geolocator
 GETHOTKEY
 GETICON
-GETLBTEXT
 GETMINMAXINFO
 GETNONCLIENTMETRICS
 GETPROPERTYSTOREFLAGS
@@ -608,19 +584,16 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
-GHND
 gitmodules
+GHND
 GMEM
 GNumber
-googleai
-googlegemini
 gpedit
 gpo
 GPOCA
 gpp
 gpu
 gradians
-grctlext
 Gridcustomlayout
 GSM
 gtm
@@ -718,7 +691,6 @@ HTCLIENT
 hthumbnail
 HTOUCHINPUT
 HTTRANSPARENT
-hutchinsoniana
 HVal
 HValue
 Hvci
@@ -733,9 +705,9 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
-icf
 IDCANCEL
 IDD
 idk
@@ -749,11 +721,9 @@ ietf
 IEXPLORE
 IFACEMETHOD
 IFACEMETHODIMP
-ifd
 IGNOREUNKNOWN
 IGo
 iid
-IIM
 Iindex
 Ijwhost
 ILD
@@ -777,8 +747,7 @@ INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
-inlines
-Inno
+Inlines
 INPC
 inproc
 INPUTHARDWARE
@@ -795,6 +764,7 @@ INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
 INSTALLLOCATION
 INSTALLMESSAGE
 INSTALLPROPERTY
+installscopeperuser
 INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
@@ -807,7 +777,6 @@ invokecommand
 ipcmanager
 IPREVIEW
 ipreviewhandlervisualssetfont
-IPTC
 irow
 irprops
 isbi
@@ -851,14 +820,15 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
+ksa
 kvp
 Kybd
 LARGEICON
 lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
-lbl
 LCh
+lbl
 lcid
 LCIDTo
 lcl
@@ -874,10 +844,10 @@ LExit
 lhwnd
 LIBFUZZER
 LIBID
-lightswitch
 LIMITSIZE
 LIMITTEXT
 lindex
+lightswitch
 linkid
 LINKOVERLAY
 LINQTo
@@ -888,7 +858,6 @@ LLKH
 llkhf
 LMEM
 LMENU
-lng
 LOADFROMFILE
 LOBYTE
 localappdata
@@ -898,14 +867,16 @@ LOCATIONCHANGE
 LOCKTYPE
 LOGFONT
 LOGFONTW
-LOGMSG
 logon
+LOGMSG
 LOGPIXELSX
 LOGPIXELSY
+lng
 lon
 longdate
 LONGNAMES
 lowlevel
+lquadrant
 LOWORD
 lparam
 LPBITMAPINFOHEADER
@@ -939,7 +910,6 @@ lpv
 LPW
 lpwcx
 lpwndpl
-lquadrant
 LReader
 LRESULT
 LSTATUS
@@ -966,7 +936,6 @@ MAKELONG
 MAKELPARAM
 makepri
 MAKEWPARAM
-Malware
 manifestdependency
 MAPPEDTOSAMEKEY
 MAPTOSAMESHORTCUT
@@ -978,6 +947,7 @@ maxversiontested
 mber
 MBM
 MBR
+mcp
 MDICHILD
 MDL
 mdtext
@@ -989,7 +959,6 @@ MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
-metadatamatters
 Metadatas
 metafile
 mfc
@@ -1036,6 +1005,9 @@ mousepointer
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
+muxx
+muxxc
+muxxh
 MRM
 MRT
 mru
@@ -1055,7 +1027,6 @@ msiexec
 MSIFASTINSTALL
 MSIHANDLE
 MSIRESTARTMANAGERCONTROL
-MSIs
 msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
@@ -1064,21 +1035,16 @@ msrc
 msstore
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
 muxc
-muxx
-muxxc
-muxxh
 MVPs
 mvvm
 MVVMTK
 MWBEx
 MYICON
 NAMECHANGE
-Notavailable
 namespaceanddescendants
 nao
 NCACTIVATE
@@ -1117,7 +1083,6 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
-nightlight
 NLog
 NLSTEXT
 NMAKE
@@ -1184,7 +1149,6 @@ nowarn
 NOZORDER
 NPH
 npmjs
-NPU
 NResize
 NTAPI
 ntdll
@@ -1192,8 +1156,8 @@ ntfs
 NTSTATUS
 NTSYSAPI
 NULLCURSOR
-nullonfailure
 nullref
+nullonfailure
 numberbox
 nwc
 ocr
@@ -1209,18 +1173,13 @@ oldpath
 oldtheme
 oleaut
 OLECHAR
-ollama
 onebranch
-onnx
 OOBEUI
 openas
 opencode
 OPENFILENAME
-openrdp
 opensource
 openxmlformats
-ollama
-onnx
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1293,7 +1252,6 @@ pguid
 phbm
 phbmp
 phicon
-Photoshop
 phwnd
 pici
 pidl
@@ -1412,7 +1370,6 @@ QDC
 qit
 QITAB
 QITABENT
-QNN
 qoi
 Quarternary
 QUERYENDSESSION
@@ -1422,8 +1379,8 @@ quickaccent
 QUNS
 RAII
 RAlt
-randi
 RAquadrant
+randi
 rasterization
 Rasterize
 RAWINPUTDEVICE
@@ -1433,8 +1390,6 @@ RAWPATH
 rbhid
 rclsid
 RCZOOMIT
-remotedesktop
-rdp
 RDW
 READMODE
 READOBJECTS
@@ -1452,7 +1407,9 @@ regfile
 REGISTERCLASSFAILED
 REGISTRYHEADER
 REGISTRYPREVIEWEXT
+registryroot
 regkey
+regroot
 regsvr
 REINSTALLMODE
 releaseblog
@@ -1488,7 +1445,6 @@ rgh
 rgn
 rgs
 rguid
-rhk
 RIDEV
 RIGHTSCROLLBAR
 riid
@@ -1506,6 +1462,7 @@ rstringalpha
 rstringdigit
 rtb
 RTLREADING
+rtm
 runas
 rundll
 rungameid
@@ -1519,7 +1476,6 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
-samsung
 sancov
 SAVEFAILED
 scanled
@@ -1562,8 +1518,8 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
-SETTINGCHANGE
 settingscard
+SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
 settingshotkeycontrol
@@ -1594,7 +1550,6 @@ SHGDNF
 SHGFI
 SHIL
 shinfo
-shk
 shlwapi
 shobjidl
 SHORTCUTATLEAST
@@ -1639,7 +1594,6 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
-slnx
 SMALLICON
 smartphone
 smileys
@@ -1710,7 +1664,6 @@ stringtable
 stringval
 Strm
 strret
-STRSAFE
 stscanf
 sttngs
 Stubless
@@ -1722,6 +1675,7 @@ sublang
 SUBMODULEUPDATE
 subresource
 Superbar
+suntimes
 sut
 svchost
 SVGIn
@@ -1755,6 +1709,7 @@ SYSTEMMODAL
 SYSTEMTIME
 TARG
 TARGETAPPHEADER
+TARGETDIR
 targetentrypoint
 TARGETHEADER
 targetver
@@ -1784,10 +1739,10 @@ textextractor
 TEXTINCLUDE
 tfopen
 tgz
-THEMECHANGED
 themeresources
 THH
 THICKFRAME
+THEMECHANGED
 THISCOMPONENT
 throughs
 TILEDWINDOW
@@ -1805,7 +1760,6 @@ tlbimp
 tlc
 tmain
 TNP
-toolgood
 Toolhelp
 toolwindow
 TOPDOWNDIB
@@ -1854,23 +1808,18 @@ uitests
 UITo
 ULONGLONG
 ums
-UMax
-UMin
 uncompilable
 UNCPRIORITY
 UNDNAME
 UNICODETEXT
 unins
-Uninstaller
 uninstalls
 Uniquifies
 unitconverter
 unittests
 UNLEN
-Uninitializes
 UNORM
 unremapped
-Unsubscribes
 unvirtualized
 unwide
 unzoom
@@ -1880,7 +1829,6 @@ UPDATENOW
 UPDATEREGISTRY
 updown
 UPGRADINGPRODUCTCODE
-upscaling
 Uptool
 urld
 Usb
@@ -1962,7 +1910,6 @@ Wca
 WCE
 wcex
 WClass
-WCRAPI
 wcsicmp
 wcsncpy
 wcsnicmp
@@ -1980,7 +1927,6 @@ wgpocpl
 WHEREID
 wic
 wifi
-wikimedia
 wikipedia
 WIL
 winapi
@@ -1994,7 +1940,6 @@ WINDOWPLACEMENT
 WINDOWPOSCHANGED
 WINDOWPOSCHANGING
 WINDOWSBUILDNUMBER
-windowsml
 windowssearch
 windowssettings
 WINDOWSTYLES
@@ -2010,7 +1955,6 @@ Winhook
 WINL
 winlogon
 winmd
-winml
 WINNT
 winres
 winrt
@@ -2073,21 +2017,18 @@ WTSAT
 Wubi
 WUX
 Wwanpp
-xap
 XAxis
 XButton
 xclip
 xcopy
 XDeployment
 xdf
-XDimension
 XDocument
 XElement
 xfd
 XFile
 XIncrement
 XLoc
-xmp
 XNamespace
 Xoshiro
 XPels
@@ -2104,7 +2045,6 @@ XVIRTUALSCREEN
 xxxxxx
 YAxis
 ycombinator
-YDimension
 YIncrement
 yinle
 yinyue
@@ -2112,8 +2052,8 @@ YPels
 YPos
 YResolution
 YSpeed
-YStr
 YTimer
+YStr
 YVIRTUALSCREEN
 ZEROINIT
 zonability

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

@@ -253,7 +253,7 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 
 # hit-count: 1 file-count: 1
 # Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)[^"'\s]+
 
 # hit-count: 3 file-count: 3
 # imgur

.github/copilot-instructions.md

@@ -1,59 +1,43 @@
----
-description: PowerToys AI contributor guidance.
-applyTo: pullRequests
----
-
-# PowerToys - Copilot guide (concise)
+# PowerToys – Copilot guide (concise)
 
 This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
 
-# Repo map (1-line per area)
+Repo map (1‑line per area)
 - Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
 - Shared libs: `src/common/**`
 - Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
 - Build tools/docs: `tools/**`, `doc/devdocs/**`
 
-# Build and test (defaults)
+Build and test (defaults)
 - Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
 - Build discipline:
-  - One terminal per operation (build -> test). Do not switch or open new ones mid-flow.
+  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
   - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use scripts to build, synchronously block and wait in foreground for completion: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages).
-  - Treat build exit code 0 as success; any non-zero exit code is a failure. Read the errors log in the build folder (such as `build.*.*.errors.log`) and surface problems.
-  - Do not start tests or launch Runner until the previous step succeeded.
-- Tests (fast and targeted):
-  - Find the test project by product code prefix (for example FancyZones, AdvancedPaste). Look for a sibling folder or one to two levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for exit, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add or adjust tests when changing behavior; if skipped, state why (for example comment-only or string rename).
+  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
+  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
+  - Don’t start tests or launch Runner until the previous step succeeded.
+- Tests (fast + targeted):
+  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
+  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
+  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
 
-# Pull requests (expectations)
-- Atomic: one logical change; no drive-by refactors.
-- Describe: problem, approach, risk, test evidence.
+Pull requests (expectations)
+- Atomic: one logical change; no drive‑by refactors.
+- Describe: problem / approach / risk / test evidence.
 - List: touched paths if not obvious.
 
-# When to ask for clarification
+When to ask for clarification
 - Ambiguous spec after scanning relevant docs (see below).
-- Cross-module impact (shared enum or struct) not clear.
-- Security, elevation, or installer changes.
+- Cross-module impact (shared enum/struct) not clear.
+- Security / elevation / installer changes.
 
-# Logging (use existing stacks)
-- C++ logging lives in `src/common/logger/**` (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`). Keep hot paths quiet (hooks, tight loops).
-- C# logging goes through `ManagedCommon.Logger` (`LogInfo`, `LogWarning`, `LogError`, `LogDebug`, `LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
+Logging (use existing stacks)
+- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
+- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
 
-# Docs to consult
+Docs to consult
 - `tools/build/BUILD-GUIDELINES.md`
-- `doc/devdocs/core/architecture.md`
-- `doc/devdocs/core/runner.md`
-- `doc/devdocs/core/settings/readme.md`
-- `doc/devdocs/modules/readme.md`
+- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
 
-# Language style rules
-- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
-- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
-- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
-- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
-- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
-- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
-
-# Done checklist (self review before finishing)
-- Build clean? Tests updated or passed? No unintended formatting? Any new dependency? Documented skips?
+Done checklist (self review before finishing)
+- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?

.github/prompts/create-commit-title.prompt.md

@@ -1,16 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Generate an 80-character git commit title for the local diff.'
----
-
-**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
-
-**Workflow:**
-1. Run a single command to view the local diff since the last commit:
-   ```@terminal
-   git diff HEAD
-   ```
-2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
-3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
-4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.

.github/prompts/create-pr-summary.prompt.md

@@ -1,22 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Generate a PowerToys-ready pull request description from the local diff.'
----
-
-**Goal:** Produce a ready-to-paste PR title and description that follows PowerToys conventions by comparing the current branch against a user-selected target branch.
-
-**Repo guardrails:**
-- Treat `.github/pull_request_template.md` as the single source of truth; load it at runtime instead of embedding hardcoded content in this prompt.
-- Preserve section order from the template but only surface checklist lines that are relevant for the detected changes, filling them with `[x]`/`[ ]` as appropriate.
-- Cite touched paths with inline backticks, matching the guidance in `.github/copilot-instructions.md`.
-- Call out test coverage explicitly: list automated tests run (unit/UI) or state why they are not applicable.
-
-**Workflow:**
-1. Determine the target branch from user context; default to `main` when no branch is supplied.
-2. Run `git status --short` once to surface uncommitted files that may influence the summary.
-3. Run `git diff <target-branch>...HEAD` a single time to review the detailed changes. Only when confidence stays low dig deeper with focused calls such as `git diff <target-branch>...HEAD -- <path>`.
-4. From the diff, capture impacted areas, key file changes, behavioral risks, migrations, and noteworthy edge cases.
-5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
-6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
-7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.

.github/prompts/fix-spelling.prompt.md

@@ -1,22 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Resolve Code scanning / check-spelling comments on the active PR.'
----
-
-**Goal:** Clear every outstanding GitHub pull request comment created by the `Code scanning / check-spelling` workflow by explicitly allowing intentional terms.
-
-**Guardrails:**
-- Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
-- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
-- Leave all other files and topics untouched.
-
-**Prerequisites:**
-- Install GitHub CLI if it is not present: `winget install GitHub.cli`.
-- Run `gh auth login` once before the first CLI use.
-
-**Workflow:**
-1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
-2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
-3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
-4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.

.github/pull_request_template.md

@@ -5,7 +5,6 @@
 ## PR Checklist
 
 - [ ] Closes: #xxx
-<!--  - [ ] Closes: #yyy (add separate lines for additional resolved issues) -->
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized

.github/workflows/dependency-review.yml

@@ -21,6 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/manual-batch-issue-deduplication.yml

@@ -27,7 +27,7 @@ jobs:
         issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
 
       - name: Run GenAI Issue Deduplicator
         uses: pelikhan/action-genai-issue-dedup@v0

.github/workflows/msstore-submissions.yml

@@ -40,7 +40,7 @@ jobs:
           echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT
 
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.0.x'
 

.gitignore

@@ -349,7 +349,10 @@ src/common/Telemetry/*.etl
 /src/modules/powerrename/ui/RCb24464
 
 # Generated installer file for Monaco source files.
+/installer/PowerToysSetup/MonacoSRC.wxs
+/installer/PowerToysSetup/DscResources.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
+/installer/PowerToysSetupVNext/DscResources.wxs
 
 # MSBuildCache
 /MSBuildCacheLogs/

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "deps/expected-lite"]
 	path = deps/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git
+[submodule "deps/cziplib"]
+	path = deps/cziplib
+	url = https://github.com/kuba--/zip.git

.pipelines/ESRPSigning_core.json

@@ -5,6 +5,7 @@
         {
           "MatchedPath": [
             "*.resources.dll",
+
             "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",
 
             "PowerToys.ActionRunner.exe",
@@ -26,7 +27,6 @@
             "PowerToys.GPOWrapper.dll",
             "PowerToys.GPOWrapperProjection.dll",
             "PowerToys.AllExperiments.dll",
-            "LanguageModelProvider.dll",
 
             "Common.Search.dll",
 
@@ -60,8 +60,6 @@
             "PowerToys.FancyZonesEditorCommon.dll",
             "PowerToys.FancyZonesModuleInterface.dll",
             "PowerToys.FancyZones.exe",
-            "FancyZonesCLI.exe",
-            "FancyZonesCLI.dll",
 
             "PowerToys.GcodePreviewHandler.dll",
             "PowerToys.GcodePreviewHandler.exe",
@@ -131,8 +129,6 @@
 
             "PowerToys.ImageResizer.exe",
             "PowerToys.ImageResizer.dll",
-            "WinUI3Apps\\PowerToys.ImageResizerCLI.exe",
-            "WinUI3Apps\\PowerToys.ImageResizerCLI.dll",
             "PowerToys.ImageResizerExt.dll",
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
@@ -185,7 +181,6 @@
             "PowerToys.MousePointerCrosshairs.dll",
             "PowerToys.MouseJumpUI.dll",
             "PowerToys.MouseJumpUI.exe",
-            "PowerToys.CursorWrap.dll",
 
             "PowerToys.MouseWithoutBorders.dll",
             "PowerToys.MouseWithoutBorders.exe",
@@ -242,7 +237,9 @@
             "PowerToys.DSC.dll",
             "PowerToys.DSC.exe",
 
-            "PowerToysSparse.msix"
+            "PowerToysSparse.msix",
+            "PowerToys.McpServer.dll",
+            "PowerToys.McpServer.exe"
           ],
             "SigningInfo": {
                 "Operations": [
@@ -295,7 +292,6 @@
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
                 "CommunityToolkit.WinUI.Controls.TitleBar.dll",
-                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.dll",
@@ -352,13 +348,6 @@
                 "Testably.Abstractions.FileSystem.Interface.dll",
                 "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                 "ColorCode.Core.dll", 
-                "Microsoft.SemanticKernel.Connectors.Ollama.dll",
-                "OllamaSharp.dll",
-
-                "boost_regex-vc143-mt-gd-x32-1_87.dll",
-                "boost_regex-vc143-mt-gd-x64-1_87.dll",
-                "boost_regex-vc143-mt-x32-1_87.dll",
-                "boost_regex-vc143-mt-x64-1_87.dll",
 
                 "UnitsNet.dll",
                 "UtfUnknown.dll",

.pipelines/ESRPSigning_installer.json

@@ -0,0 +1,53 @@
+{
+    "Version": "1.0.0",
+    "UseMinimatch": false,
+    "SignBatches": [
+        {
+            "MatchedPath": [
+                "PowerToysSetupCustomActionsVNext.dll",
+                "SilentFilesInUseBAFunction.dll",
+                "PowerToys*Setup-*.exe",
+                "PowerToys*Setup-*.msi"
+            ],
+            "SigningInfo": {
+                "Operations": [
+                    {
+                        "KeyCode": "CP-230012",
+                        "OperationSetCode": "SigntoolSign",
+                        "Parameters": [
+                            {
+                                "parameterName": "OpusName",
+                                "parameterValue": "Microsoft"
+                            },
+                            {
+                                "parameterName": "OpusInfo",
+                                "parameterValue": "http://www.microsoft.com"
+                            },
+                            {
+                                "parameterName": "FileDigest",
+                                "parameterValue": "/fd \"SHA256\""
+                            },
+                            {
+                                "parameterName": "PageHash",
+                                "parameterValue": "/NPH"
+                            },
+                            {
+                                "parameterName": "TimeStamp",
+                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                            }
+                        ],
+                        "ToolName": "sign",
+                        "ToolVersion": "1.0"
+                    },
+                    {
+                        "KeyCode": "CP-230012",
+                        "OperationSetCode": "SigntoolVerify",
+                        "Parameters": [],
+                        "ToolName": "sign",
+                        "ToolVersion": "1.0"
+                    }
+                ]
+            }
+        }
+    ]
+}

.pipelines/generateDscManifests.ps1

@@ -65,28 +65,21 @@ if (-not (Test-Path $outputDir)) {
     New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
 }
 
-# DSC v3 manifests go to DSCModules subfolder
-$dscOutputDir = Join-Path $outputDir 'DSCModules'
-if (-not (Test-Path $dscOutputDir)) {
-    Write-Host "Creating DSCModules subfolder at '$dscOutputDir'."
-    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
-}
+Write-Host "DSC manifests will be generated to: '$outputDir'"
 
-Write-Host "DSC manifests will be generated to: '$dscOutputDir'"
+Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
+Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
 
-Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
-Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
-
-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
 Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
 & $exePath @arguments
 if ($LASTEXITCODE -ne 0) {
     throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
 }
 
-$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
 if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$dscOutputDir'."
+    throw "No DSC manifest files were generated in '$outputDir'."
 }
 
 Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"

.pipelines/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.4" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0.3" />
 </packages>

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"

.pipelines/v2/release.yml

@@ -52,6 +52,8 @@ extends:
       name: SHINE-INT-S
       ${{ if eq(parameters.useVSPreview, true) }}:
         demands: ImageOverride -equals SHINE-VS17-Preview
+      ${{ else }}:
+        image: SHINE-VS17-Latest
       os: windows
     sdl:
       tsa:
@@ -71,10 +73,10 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                demands:
-                  # Our INT agents have a large disk mounted at P:\
-                  - ${{ if eq(parameters.useVSPreview, true) }}:
-                    - ImageOverride -equals SHINE-VS17-Preview
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+                ${{ else }}:
+                  image: SHINE-VS17-Latest
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
@@ -123,6 +125,7 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
+                image: SHINE-VS17-Latest
                 os: windows
               official: true
               codeSign: true

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

@@ -111,7 +111,6 @@ jobs:
             ${{ else }}:
               OutputBuildPlatform: ${{ platform }}
   variables:
-    NUGET_PACKAGES: 'C:\NuGetPackages' # Some of our build steps cache these here... and it was apparently part of the global environment
     MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
     # Azure DevOps abhors a vacuum
     # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
@@ -140,10 +139,6 @@ jobs:
     - output: pipelineArtifact
       artifactName: $(JobOutputArtifactName)
       targetPath: $(Build.ArtifactStagingDirectory)
-    - output: pipelineArtifact
-      artifactName: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
-      targetPath: $(LogOutputDirectory)
-      condition: or(failed(), canceled())
   steps:
   - checkout: self
     clean: true
@@ -192,14 +187,14 @@ jobs:
     displayName: Verify XAML formatting
 
   - pwsh: |-
-      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
-    displayName: Verify Nuget package versions for PowerToys.slnx
+      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+    displayName: Verify Nuget package versions for PowerToys.sln
 
   - pwsh: |-
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
     displayName: Verify ARM64 configurations
 
   - ${{ if eq(parameters.enablePackageCaching, true) }}:
@@ -252,7 +247,7 @@ jobs:
     ${{ else }}:
       displayName: Build PowerToys main project
     inputs:
-      solution: 'PowerToys.slnx'
+      solution: 'PowerToys.sln'
       vsVersion: 17.0
       msbuildArgs: >-
         -restore -graph
@@ -271,26 +266,6 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  - task: VSBuild@1
-    displayName: Generate DSC artifacts for ARM64
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
-    inputs:
-      solution: PowerToys.slnx
-      vsVersion: 17.0
-      msbuildArgs: >-
-        -restore
-        /p:Configuration=$(BuildConfiguration)
-        /p:Platform=x64
-        /t:DSC\PowerToys_Settings_DSC_Schema_Generator
-        /bl:$(LogOutputDirectory)\build-dsc-generator.binlog
-        ${{ parameters.additionalBuildOptions }}
-        $(MSBuildCacheParameters)
-        $(RestoreAdditionalProjectSourcesArg)
-      platform: x64
-      configuration: $(BuildConfiguration)
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
   # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
   - task: VSBuild@1
     displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
@@ -400,7 +375,7 @@ jobs:
   ### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
   - task: CopyFiles@2
     displayName: HACK Copy core WebView2 ARM64 dll to output directory
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
+    condition: eq(variables['BuildPlatform'],'arm64')
     inputs:
       contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
       targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
@@ -439,11 +414,11 @@ jobs:
       inputs:
         testResultsFormat: VSTest
         testResultsFiles: '**/*.trx'
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
+      condition: ne(variables['BuildPlatform'],'arm64')
 
     # Native dlls
     - task: VSTest@2
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64')) # No arm64 agents to run the tests.
+      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
       displayName: 'Native Tests'
       inputs:
         platform: '$(BuildPlatform)'
@@ -537,6 +512,14 @@ jobs:
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
 
+  - template: steps-build-installer-vnext.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
+
   # This saves ~1GiB per architecture. We won't need these later.
   # Removes:
   # - All .pdb files from any static libs .libs (which were only used during linking)

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

@@ -74,7 +74,7 @@ jobs:
       command: restore
       feedsToUse: config
       configPath: nuget.config
-      restoreSolution: PowerToys.slnx
+      restoreSolution: PowerToys.sln
       restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
   # Build all UI test projects if no specific modules are specified
@@ -129,4 +129,4 @@ jobs:
   - publish: $(JobOutputDirectory)
     artifact: $(JobOutputArtifactName)
     displayName: Publish UI Test artifacts
-    condition: always()
+    condition: always()

.pipelines/v2/templates/steps-build-installer-vnext.yml

@@ -2,6 +2,9 @@ parameters:
   - name: versionNumber
     type: string
     default: "0.0.1"
+  - name: buildUserInstaller
+    type: boolean
+    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -22,26 +25,43 @@ steps:
       arguments: 'install --global wix --version 5.0.2'
 
   - pwsh: |-
-      Write-Host "##vso[task.setvariable variable=InstallerMachineRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\MachineSetup"
-      Write-Host "##vso[task.setvariable variable=InstallerUserRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\UserSetup"
-      Write-Host "##vso[task.setvariable variable=InstallerMachineBasename]PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
-      Write-Host "##vso[task.setvariable variable=InstallerUserBasename]PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
-    displayName: Prepare Installer variables
+      & git clean -xfd -e *exe -- .\installer\
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
+
+  - pwsh: |-
+      # Determine whether this is a per-user build
+      $IsPerUser = $${{ parameters.buildUserInstaller }}
+
+      # Build slug used to locate the artifacts
+      $InstallerBuildSlug = if ($IsPerUser) { 'UserSetup' } else { 'MachineSetup' }
+
+      # VNext bundle folder; base name intentionally omits the VNext suffix
+      $InstallerFolder = 'PowerToysSetupVNext'
+      if ($IsPerUser) {
+        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      }
+      else {
+        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      }
+
+      # Export variables for downstream steps
+      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
+      Write-Host "##vso[task.setvariable variable=InstallerFolder]$InstallerFolder"
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
 
   # This dll needs to be built and signed before building the MSI.
-  # The Custom Actions project contains a pre-build event that prepares the .wxs files
-  # by filling them out with all our components. We pass RunBuildEvents=true to force
-  # that logic to run.
   - task: VSBuild@1
-    displayName: Build Shared Support DLLs
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActionsVNext
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
-        /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
-        /p:RunBuildEvents=true;RestorePackagesConfig=true;CIBuild=true
+        /t:PowerToysSetupCustomActionsVNext
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
         -restore -graph
-        /bl:$(LogOutputDirectory)\installer-actions.binlog
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -50,53 +70,28 @@ steps:
       maximumCpuCount: true
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-sign-files-authenticode.yml
+    - template: steps-esrp-signing.yml
       parameters:
-        displayName: Sign Shared Support DLLs
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActionsVNext
         signingIdentity: ${{ parameters.signingIdentity }}
-        folder: 'installer'
-        pattern: |-
-          **/PowerToysSetupCustomActionsVNext.dll
-          **/SilentFilesInUseBAFunction.dll
+        inputs:
+          FolderPath: 'installer/PowerToysSetupCustomActionsVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   ## INSTALLER START
   #### MSI BUILDING AND SIGNING
-  #
-  # The MSI build contains code that reverts the .wxs files to their in-tree versions.
-  # This is only supposed to happen during local builds. Since this build system is
-  # supposed to run side by side--machine and then user--we do NOT want to destroy
-  # the .wxs files. Therefore, we pass RunBuildEvents=false to suppress all of that
-  # logic.
-  #
-  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
-  # We only pass -restore on the first one because the second run should already have all
-  # of the dependencies.
   - task: VSBuild@1
-    displayName: 💻 Build VNext MSI
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysInstallerVNext
-        /p:RunBuildEvents=false;PerUser=false;BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-machine-msi.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the CustomActions dll
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - task: VSBuild@1
-    displayName: 👤 Build VNext MSI
-    inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysInstallerVNext
-        /p:RunBuildEvents=false;PerUser=true;BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-user-msi.binlog
+        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -105,66 +100,77 @@ steps:
       maximumCpuCount: true
 
   - script: |-
-      wix msi decompile $(InstallerMachineRoot)\$(InstallerMachineBasename).msi -x $(build.sourcesdirectory)\extractedMachineMsi
-      wix msi decompile $(InstallerUserRoot)\$(InstallerUserBasename).msi -x $(build.sourcesdirectory)\extractedUserMsi
-      dir $(build.sourcesdirectory)\extractedMachineMsi
-      dir $(build.sourcesdirectory)\extractedUserMsi
-    displayName: "WiX5: Extract and verify MSIs"
+      wix msi decompile installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
+      dir $(build.sourcesdirectory)\extractedMsi
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"
 
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
-      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
-      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
-    displayName: Audit deps.json in MSI extracted files
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
 
   - ${{ if eq(parameters.codeSign, true) }}:
     - pwsh: |-
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\Binary'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\Binary'
-        git clean -xfd ./extractedMachineMsi ./extractedUserMsi
-      displayName: Verify all binaries are signed and versioned
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+        git clean -xfd ./extractedMsi
+      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
 
-    - template: steps-esrp-sign-files-authenticode.yml
+    - template: steps-esrp-signing.yml
       parameters:
-        displayName: Sign VNext MSIs
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
         signingIdentity: ${{ parameters.signingIdentity }}
-        folder: 'installer'
-        pattern: '**/PowerToys*Setup-*.msi'
+        inputs:
+          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   #### END MSI
   
-  #### BOOTSTRAP BUILDING AND SIGNING
-  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
-  # We only pass -restore on the first one because the second run should already have all
-  # of the dependencies.
+  #### BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
   - task: VSBuild@1
-    displayName: 💻 Build VNext Bootstrapper
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build SilentFilesInUseBAFunction
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:SilentFilesInUseBAFunction
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        -restore -graph
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-SilentFilesInUseBAFunction.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the msi
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign SilentFilesInUseBAFunction
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/$(BuildPlatform)/$(BuildConfiguration)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  #### END BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
+  
+  #### BOOTSTRAP BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysBootstrapperVNext
-        /p:PerUser=false;BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-machine-bootstrapper.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI nor SilentFilesInUseBAFunction
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - task: VSBuild@1
-    displayName: 👤 Build VNext Bootstrapper
-    inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysBootstrapperVNext
-        /p:PerUser=true;BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-user-bootstrapper.binlog
+        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
+        -restore -graph
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -175,41 +181,54 @@ steps:
   # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
   - ${{ if eq(parameters.codeSign, true) }}:
     - script: |-
-        wix burn detach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe
-        wix burn detach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe
-      displayName: "WiX5: Extract Engines from Bundles"
+        wix burn detach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"
 
-    - template: steps-esrp-sign-files-authenticode.yml
+    - template: steps-esrp-signing.yml
       parameters:
-        displayName: Sign WiX Engines
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
         signingIdentity: ${{ parameters.signingIdentity }}
-        folder: "installer"
-        pattern: '*-engine.exe'
+        inputs:
+          FolderPath: "installer"
+          Pattern: engine.exe
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolSign",
+                    "Parameters": {
+                        "OpusName": "Microsoft",
+                        "OpusInfo": "http://www.microsoft.com",
+                        "FileDigest": "/fd \"SHA256\"",
+                        "PageHash": "/NPH",
+                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    },
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
 
     - script: |-
-        wix burn reattach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe -o $(InstallerMachineRoot)\$(InstallerMachineBasename).exe
-        wix burn reattach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe -o $(InstallerUserRoot)\$(InstallerUserBasename).exe
-      displayName: "WiX5: Reattach Engines to Bundles"
+        wix burn reattach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Reattach Engine to Bundle"
 
-    - pwsh: |-
-        & wix burn extract -oba installer\ba\m "$(InstallerMachineRoot)\$(InstallerMachineBasename).exe"
-        & wix burn extract -oba installer\ba\u "$(InstallerUserRoot)\$(InstallerUserBasename).exe"
-        Get-ChildItem installer\ba -Recurse -Include *.exe,*.dll | Get-AuthenticodeSignature | ForEach-Object {
-          If ($_.Status -Ne "Valid") {
-            Write-Error $_.StatusMessage
-          } Else {
-            Write-Host $_.StatusMessage
-          }
-        }
-        & git clean -fdx installer\ba
-      displayName: "WiX5: Verify Bootstrapper content is signed"
-
-    - template: steps-esrp-sign-files-authenticode.yml
+    - template: steps-esrp-signing.yml
       parameters:
-        displayName: Sign Final Bootstrappers
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
         signingIdentity: ${{ parameters.signingIdentity }}
-        folder: 'installer'
-        pattern: '**/PowerToys*Setup-*.exe'
+        inputs:
+          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   #### END BOOTSTRAP
   ## END INSTALLER

.pipelines/v2/templates/steps-esrp-sign-files-authenticode.yml

@@ -1,45 +0,0 @@
-parameters:
-  - name: displayName
-    type: string
-    default: Sign Specific Files
-  - name: folder
-    type: string
-  - name: pattern
-    type: string
-  - name: signingIdentity
-    type: object
-    default: {}
-
-steps:
-  - template: steps-esrp-signing.yml
-    parameters:
-      displayName: ${{ parameters.displayName }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      inputs:
-        FolderPath: ${{ parameters.folder }}
-        Pattern: ${{ parameters.pattern }}
-        UseMinimatch: true
-        signConfigType: inlineSignParams
-        inlineOperation: |-
-          [
-              {
-                  "KeyCode": "CP-230012",
-                  "OperationCode": "SigntoolSign",
-                  "Parameters": {
-                      "OpusName": "Microsoft",
-                      "OpusInfo": "http://www.microsoft.com",
-                      "FileDigest": "/fd \"SHA256\"",
-                      "PageHash": "/NPH",
-                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  },
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              },
-              {
-                  "KeyCode": "CP-230012",
-                  "OperationCode": "SigntoolVerify",
-                  "Parameters": {},
-                  "ToolName": "sign",
-                  "ToolVersion": "1.0"
-              }
-          ]

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

@@ -54,13 +54,4 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     restoreSolution: '$(build.sourcesdirectory)\**\*.sln'
-    includeNuGetOrg: false
-
-- task: NuGetCommand@2
-  displayName: 'Restore NuGet packages (slnx)'
-  inputs:
-    command: 'restore'
-    feedsToUse: 'config'
-    nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-    restoreSolution: '$(build.sourcesdirectory)\**\*.slnx'
-    includeNuGetOrg: false
+    includeNuGetOrg: false

.pipelines/versionAndSignCheck.ps1

@@ -27,8 +27,7 @@ $versionExceptions = @(
     "WyHash.dll",
     "Microsoft.Recognizers.Text.DataTypes.TimexExpression.dll",
     "ObjectModelCsProjection.dll",
-    "RendererCsProjection.dll",
-    "Microsoft.ML.OnnxRuntime.dll") -join '|';
+    "RendererCsProjection.dll") -join '|';
 $nullVersionExceptions = @(
     "SkiaSharp.Views.WinUI.Native.dll",
     "libSkiaSharp.dll",
@@ -53,12 +52,7 @@ $nullVersionExceptions = @(
     "System.Diagnostics.EventLog.Messages.dll",
     "Microsoft.Windows.Widgets.dll",
     "AdaptiveCards.ObjectModel.WinUI3.dll",
-    "AdaptiveCards.Rendering.WinUI3.dll",
-    "boost_regex_vc143_mt_gd_x32_1_87.dll",
-    "boost_regex_vc143_mt_gd_x64_1_87.dll",
-    "boost_regex_vc143_mt_x32_1_87.dll",
-    "boost_regex_vc143_mt_x64_1_87.dll"
-    ) -join '|';
+    "AdaptiveCards.Rendering.WinUI3.dll") -join '|';
 $totalFailure = 0;
 
 Write-Host $DirPath;

.vscode/launch.json

@@ -38,17 +38,6 @@
             "env": {},
             "console": "internalConsole",
             "stopAtEntry": false
-        },
-        {
-            "name": "Run AdvancedPaste (managed, no build, ARCH configurable)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.AdvancedPaste.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        },
+        }
     ]
 }

COMMUNITY.md

@@ -121,9 +121,6 @@ PowerToys Awake is a tool to keep your computer awake.
 
 Randy contributed Registry Preview and some very early conversations about keyboard remapping.
 
-### [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon
-Kayla was a former lead for PowerToys and helped create multiple utilities, maintained the GitHub repo, and collaborated with the community to improve the overall product
-
 ### [@oldnewthing](https://github.com/oldnewthing) - Raymond Chen
 
 Find My Mouse is based on Raymond Chen's SuperSonar.
@@ -183,6 +180,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 
 ## PowerToys core team
 
+- [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
 - [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev Lead
@@ -211,7 +209,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 ## Former PowerToys core team members
 
 - [@indierawk2k2](https://github.com/indierawk2k2) - Mike Harsh - Product Manager
-- [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Product Manager
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
 - [@plante-msft](https://github.com/plante-msft) - Connor Plante - Product Manager
 - [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie - Product Manager

Cpp.Build.props

@@ -26,7 +26,6 @@
   <PropertyGroup Condition="'$(SkipCppCodeAnalysis)' == ''">
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>$(MsbuildThisFileDirectory)\CppRuleSet.ruleset</CodeAnalysisRuleSet>
-    <CAExcludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)</CAExcludePath>
   </PropertyGroup>
 
   <!-- C++ source compile-specific things for all configurations -->
@@ -35,7 +34,7 @@
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
     <VcpkgEnabled>false</VcpkgEnabled>
     <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
-    <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
     <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
     <LinkControlFlowGuard>Guard</LinkControlFlowGuard>

DATA_AND_PRIVACY.md

@@ -147,18 +147,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelFormatEvent</td>
     <td>Triggered when Advanced Paste leverages the Semantic Kernel.</td>
   </tr> 
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelErrorEvent</td>
-    <td>Occurs when the Semantic Kernel workflow encounters an error.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteEndpointUsageEvent</td>
-    <td>Logs the AI provider, model, and processing duration for each endpoint call.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteCustomActionErrorEvent</td>
-    <td>Records provider, model, and status details when a custom action fails.</td>
-  </tr>
 </table>
 
 ### Always on Top
@@ -243,10 +231,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Event Name</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdNotFound_EnableCmdNotFound</td>
-    <td>Triggered when Command Not Found is enabled or disabled.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.CmdNotFoundInstallEvent</td>
     <td>Triggered when a Command Not Found is installed.</td>
@@ -261,62 +245,6 @@ _If you want to find diagnostic data events in the source code, these two links
   </tr>  
 </table>
 
-### Command Palette
-<table style="width:100%">
-  <tr>
-    <th>Event Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_BeginInvoke</td>
-    <td>Triggered when the Command Palette is launched by the user.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_ColdLaunch</td>
-    <td>Occurs when Command Palette starts for the first time (cold start).</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_OpenPage</td>
-    <td>Triggered when a page is opened within the Command Palette, tracking navigation depth.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_OpenUri</td>
-    <td>Occurs when a URI is opened through the Command Palette, including whether it's a web URL.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_ReactivateInstance</td>
-    <td>Triggered when an existing Command Palette instance is reactivated.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_RunCommand</td>
-    <td>Logs when a command is executed through the Command Palette, including admin elevation status.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_RunQuery</td>
-    <td>Triggered when a search query is performed, including result count and duration.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalDismissedOnEsc</td>
-    <td>Occurs when the Command Palette is dismissed by pressing the Escape key.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalDismissedOnLostFocus</td>
-    <td>Triggered when the Command Palette is dismissed due to losing focus.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalHotkeySummoned</td>
-    <td>Logs when the Command Palette is summoned via hotkey, distinguishing between global and context-specific hotkeys.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalInvokeResult</td>
-    <td>Records the result type of a Command Palette invocation.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalProcessStarted</td>
-    <td>Triggered when the Command Palette process is started.</td>
-  </tr>
-</table>
-
 ### Crop And Lock
 <table style="width:100%">
   <tr>
@@ -795,10 +723,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Event Name</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.NewPlus_ChangedTemplateLocation</td>
-    <td>Triggered when the template folder location is changed.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.NewPlus_EventCopyTemplate</td>
     <td>Triggered when an item from New+ is created (copied to the current directory).</td>
@@ -807,10 +731,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.NewPlus_EventCopyTemplateResult</td>
     <td>Logs the success of item creation (copying).</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.NewPlus_EventOpenTemplates</td>
-    <td>Triggered when the templates folder is opened.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.NewPlus_EventShowTemplateItems</td>
     <td>Triggered when the New+ context menu flyout is displayed.</td>
@@ -996,8 +916,12 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Description</th>
   </tr>
   <tr>
-    <td>Microsoft.PowerToys.ShortcutGuide_GuideSession</td>
-    <td>Logs a Shortcut Guide session including duration and how it was closed.</td>
+    <td>Microsoft.PowerToys.ShortcutGuide_EnableGuide</td>
+    <td>Triggered when Shortcut Guide is enabled.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ShortcutGuide_HideGuide</td>
+    <td>Occurs when Shortcut Guide is hidden from view.</td>
   </tr>
   <tr>
     <td>Microsoft.PowerToys.ShortcutGuide_Settings</td>

Directory.Packages.props

@@ -7,7 +7,6 @@
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
     <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
@@ -35,34 +34,32 @@
     <!-- 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="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
     <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.Extensions.DependencyInjection" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Amazon" Version="1.66.0-alpha" />
     <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.HuggingFace" Version="1.66.0-preview" />
     <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.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="9.0.10" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
     <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. -->
     <!-- 
@@ -70,12 +67,13 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.2" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
@@ -95,31 +93,30 @@
     <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="9.0.10" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.8" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <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" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
     <!-- 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="9.0.10" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
     <!-- 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="9.0.10" />
-    <PackageVersion Include="System.ClientModel" Version="1.7.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.10" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
+  <PackageVersion Include="System.ClientModel" Version="1.7.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.10" />
+    <PackageVersion Include="System.Management" Version="9.0.8" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <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.Runtime.Caching" Version="9.0.8" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
     <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" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
@@ -140,4 +137,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -75,37 +75,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
-### ToolGood.Words.Pinyin
-
-We use the ToolGood.Words.Pinyin NuGet package for converting Chinese characters to pinyin.
-
-**Source**: [https://github.com/toolgood/ToolGood.Words.Pinyin](https://github.com/toolgood/ToolGood.Words.Pinyin)
-
-```
-MIT License
-
-Copyright (c) 2020 ToolGood
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
-
 ## Utility: Command Palette Built-in Extensions
 
 ### Calculator
@@ -1529,7 +1498,6 @@ SOFTWARE.
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
-- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections
@@ -1563,7 +1531,6 @@ SOFTWARE.
 - SkiaSharp.Views.WinUI
 - StreamJsonRpc
 - StyleCop.Analyzers
-- ToolGood.Words.Pinyin
 - UnicodeInformation
 - UnitsNet
 - UTF.Unknown

README.md

@@ -7,23 +7,19 @@
 <h1 align="center">
   <span>Microsoft PowerToys</span>
 </h1>
-<p align="center">
-  <span align="center">Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.</span>
-</p>
+
 <h3 align="center">
   <a href="#-installation">Installation</a>
-  <span> · </span>
+  <span> . </span>
   <a href="https://aka.ms/powertoys-docs">Documentation</a>
-  <span> · </span>
+  <span> . </span>
   <a href="https://aka.ms/powertoys-releaseblog">Blog</a>
-  <span> · </span>
+  <span> . </span>
   <a href="#-whats-new">Release notes</a>
 </h3>
 <br/><br/>
-
-## 🔨 Utilities
-
-PowerToys includes over 25 utilities to help you customize and optimize your Windows experience:
+Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.
+<br/><br/>
 
 |   |   |   |
 |---|---|---|
@@ -41,35 +37,41 @@ PowerToys includes over 25 utilities to help you customize and optimize your Win
 
 ## 📋 Installation
 
-For detailed installation instructions and system requirements, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+For detailed installation instructions, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+
+Before you begin, make sure your device meets the system requirements:
+
+> [!NOTE]
+> - Windows 11 or Windows 10 version 2004 (20H1 / build 19041) or newer
+> - 64-bit processor: x64 or ARM64
+> - Latest stable version of [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) is installed via the bootstrapper during setup
+
+Choose one of the installation methods below:
+
+<details>
+<summary>Download .exe from GitHub</summary>
 
-But to get started quickly, choose one of the installation methods below:
-<br/><br/>
-<details open>
-<summary><strong>Download .exe from GitHub</strong></summary>
-<br/>
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- 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.97%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.96.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.96.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.96.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.96.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.95.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.95.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.95.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.95.0-arm64.exe][ptMachineArm64] |
 
 </details>
 
 <details>
-<summary><strong>Microsoft Store</strong></summary>
-<br/>
+<summary>Microsoft Store</summary>
 You can easily install PowerToys from the Microsoft Store:
 <p>
   <a style="text-decoration:none" href="https://aka.ms/getPowertoys">
@@ -80,9 +82,10 @@ You can easily install PowerToys from the Microsoft Store:
 </p>
 </details>
 
+
 <details>
-<summary><strong>WinGet</strong></summary>
-<br/>
+<summary>WinGet</summary>
+
 Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 *User scope installer [default]*
@@ -97,137 +100,162 @@ winget install --scope machine Microsoft.PowerToys -s winget
 </details>
 
 <details>
-<summary><strong>Other methods</strong></summary>
-<br/>
+<summary>Other methods</summary>
+
 There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
 </details>
 
 ## ✨ What's new
-**Version 0.96 (November 2025)**
+**Version 0.95 (October 2025)**
 
 For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
 
 **✨ Highlights**
- - Advanced Paste now supports multiple online and on-device AI model providers: Azure OpenAI, OpenAI, Google Gemini, Mistral, Foundry Local and Ollama.
- - Command Palette received extensive improvements including file search filters, better clipboard history metadata, context-menu styling, and dozens of bug fixes and enhancements.
- - PowerRename can now extract and use photo metadata (EXIF, XMP) in renaming patterns like `%Camera`, `%Lens`, and `%ExposureTime`.
-
-### Advanced Paste
- - Advanced Paste now lets you connect to multiple AI providers instead of being limited to a single OpenAI provider. See [Advanced Paste documentation](https://learn.microsoft.com/windows/powertoys/advanced-paste) for usage.
-
-### Awake
- - The Awake countdown timer now stays accurate over long periods. Thanks [@daverayment](https://github.com/daverayment)!
- - Fixed Awake context menu positioning. The fix removed the conversion of the mouse cursor from screen to client-window coordinates, instead using the raw screen coordinates returned by GetCursorPos; the context menu now appears at the correct screen position. Thanks [@lzandman](https://github.com/lzandman)!
+ - **NEW:** The **Light Switch** utility in PowerToys allows you to automatically switch between light and dark themes in Windows based on the time of day.
+ - Command Palette delivered major search performance gains (new fuzzy matcher and smarter fallbacks) improving relevance and speed.
+ - Peek can now be activated using just the Spacebar!
+ - Find My Mouse added transparent spotlight with independent backdrop opacity, boosting focus and accessibility.
+ - Settings now lets you delete shortcuts entirely and ignore conflicts.
+ - Mouse Pointer Crosshairs gained orientation options (vertical / horizontal / both) for customizable accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - PowerRename fixed enumeration counter skipping ensuring reliable batch renames. Thanks [@daverayment](https://github.com/daverayment)!
+ - ZoomIt restored legacy draw and snipping behaviors, and fixed recording issues, improving reliability. Thanks [@chakrik73](https://github.com/chakrik73)!
 
 ### Command Palette
- - The search field in context menus now matches the look of the Command Palette, with a smoke backdrop and improved padding.
- - Fallback items such as math calculations or the Run command now appear in results more quickly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the command bar updates correctly after navigating to another page and commands are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - The Command Palette settings page has been reorganized. Activation-key options are grouped under an expander and extension settings are framed for improved readability.
- - When you modify a command, its alias, hotkey, and tags now update in the top-level list, keeping the displayed information in sync. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Press `Ctrl + ,` to open Command Palette settings from anywhere. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - You can use `Page Up` and `Page Down` to navigate the list while focus is in the search box. Thanks [@samrueby](https://github.com/samrueby)!
- - Fixed an issue where the search box could disappear when navigating pages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured search text is selected when *Go home when activated* and *Highlight search on activate* are both enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed an issue where Command Palette window occasionally appeared on the taskbar under certain Windows settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured that labels and icons of list items and menu items update when they change. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed visibility of list filters when navigating to a content page. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
- - Added search to the extension list and a link to extensions on the Microsoft Store. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added options to open the Command Palette window at its last position or re-center it.
- - The Command Palette now remembers its window size after restarting.
- - Added a global error handler that logs fatal errors and provides feedback when unexpected failures force Command Palette to close. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed forms and extension settings not showing on some machines due to a missing VC++ runtime.
- - Restored ranking of fallback commands for built-in extensions (Sleep, Shutdown, Windows settings, Web search, etc.). Thanks [@jiripolasek](https://github.com/jiripolasek).
- - Improved and unified labels and texts across the application!
- - Maintainance: Resolved numerous build warnings in Command Palette projects; no user-visible impact. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Maintainance: Fixed a logging issue so exception messages are properly recorded instead of placeholder text, improving troubleshooting. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Applied conditional margin for icon-only tags to tighten layout. Thanks [@samrueby](https://github.com/samrueby)
+ - Improved the reliability of accessing Command Palette settings through PowerToys Settings and executing other x-cmdpal:// protocol commands. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Enabled AOT by default for improved performance while simplifying publish configs.
+ - Replaced service state color dots with play/pause/stop icons for enhanced accessibility. Thanks [@samrueby](https://github.com/samrueby)
+ - Fixed filter dropdown sync and crash by binding SelectedValue and raising UI-thread notifications. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Ensured long links wrap correctly in details view.
+ - Removed animation and enforced minimum width on filter dropdown for clarity. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Restored focus to More button after ESC closes context menu, improving keyboard flow. Thanks [@chatasweetie](https://github.com/chatasweetie)
+ - Marked main and toast windows as tool windows to keep them out of Alt+Tab while preserving style. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed AOT template and theming issues for filter separators. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Introduced grid layouts (small, medium, gallery) for richer page presentation.
+ - Materialized result lists to avoid rescoring overhead.
+ - Disabled problematic selection TextToSuggest behind environment flag.
+ - Major search performance improvements (new fuzzy matcher, smarter fallbacks, fewer exceptions).
+ - Added context menu "Show Details" command when details pane is hidden.
+ - Reduced window flicker by avoiding unnecessary cloaking. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Restored EmptyContent rendering for blank states. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)
+ - Saved new state even if prior app state file was corrupt (better resilience). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Migrated settings window to WinUI TitleBar control. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Prevented crash on duplicate keybindings and simplified matching. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Hotkeys now always respect the “Ignore shortcut in fullscreen” setting. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Hid search box on content pages, improving focus and accessibility, and added Home title. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Blocked Ctrl+I from inserting stray tabs in search box.
+ - Logged HRESULT codes in error logs for deeper diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Advanced font and emoji icon classification and alignment improvements. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Ensured that fallback command icons are visible on the extension settings page. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed breadcrumb margin misalignment (visual polish). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Truncated overly long command labels with ellipsis to prevent overflow.
+ - Added a setting to configure the page transition animation.
+ - Collection of small improvements and nits for Run Commands.
+ - Improved bookmarks performance and experience. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added Ctrl+O shortcut in Clipboard History to open links directly.
+ - Resolved conflict with external software that blocked Command Palette from hiding.
+ - Updated context menu items to reflect name and icon changes, and ensured application icons are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added Alt+Home shortcut to return immediately to the Command Palette home page. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed a crash when displaying code blocks in markdown on detail or content pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed an issue where the search bar icon and title were not updated when rapidly switching pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Improved the appearance of the search box in the context menu.
+
 
 ### Command Palette Extensions
- - Bookmarks: Added hints about bookmark placeholders to the Add/Edit Bookmark form. — Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Bookmarks: Improved migration of bookmarks from older versions and fixed an issue where aliases or keyboard shortcuts could be lost after restart. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Clipboard history: Items shown in Command Palette’s clipboard history now include helpful metadata. For example, image items show dimensions, text files show names and sizes, web links include page titles, and text entries display word counts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - File search: Added filter buttons to show *all items*, *files only*, or *folders only*. Selecting a filter adds `kind:folders` or `kind:not folders` to narrow results.
- - System commands: Replaced the `:red_circle:` placeholder with an actual red-circle emoji so the correct icon appears in the UI. Thanks [@samrueby](https://github.com/samrueby)!
- - WinGet: Search performance feels more responsive because typed input is now processed via a task queue rather than complex cancellation tokens!
- - Window Walker: UWP apps no longer show a "not responding" label when suspended. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Window Walker: Now displays the actual icon of each window rather than using the process icon, improving recognition of PWAs and Python GUIs. Thanks [@Lee-WonJun](https://github.com/Lee-WonJun)!
-- Windows Terminal profiles: Fixed a rare crash in the Windows Terminal extension when the `LOCALAPPDATA` environment variable was missing. The path is now retrieved via a reliable API. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Replaced localized WebSearch setting keys with stable literals and numeric history count. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enabled advanced markdown tables and emphasis extensions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added setting to choose Clipboard History primary action (Paste vs Copy). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added actionable empty-state hints for File Search (search PC / open indexing settings). Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured all WinGet extension assets copy reliably to output. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved Run command line parsing for paths with spaces; sped up related tests.
+ - Updated WebSearch extension icon set for enhanced clarity and contrast. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Terminal profile sort order setting including MRU tracking. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Uninstall Application command (UWP direct, Win32 via Settings). Thanks [@mKpwnz](https://github.com/mKpwnz)!
+ - Deferred WinGet details loading and added timing logs.
+ - Removed LINQ from All Apps extension for performance.
+ - Added standardized key chord system + shortcuts to File Search commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Terminal channel filter & remembered selection option. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enabled loading local/data/app images in markdown with sizing hints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added external extension reload via x-cmdpal://reload (configurable). Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Instant WebSearch history updates with in-memory store & events. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added keep-after-paste option and safe delete with confirmation for Clipboard History. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+
+### Environment Variables
+ - Replaced custom window chrome with WinUI TitleBar for cleaner, maintainable Environment Variables UI.
+
+### File Locksmith
+ - Adopted WinUI TitleBar to simplify window chrome while preserving appearance.
 
 ### Find My Mouse
- - Activating Find My Mouse no longer makes the cursor change to the busy (hourglass) icon or steals focus from your active application.
+ - Added transparent spotlight support with separate backdrop opacity; migrated to Windows App SDK composition APIs.
 
 ### Hosts File Editor
- - Added customizable backup settings allowing users to configure backup frequency, location, and auto-deletion policies. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Image Resizer
- - Fixed settings consistency during batch resize operations by capturing settings once before processing. Thanks [@daverayment](https://github.com/daverayment)!
+ - Migrated to native WinUI TitleBar for cleaner, maintainable window chrome.
 
 ### Light Switch
-- Introduced new UI to allow users to manually enter their latitude and longitude in Sunrise to Sunset mode.
-- Refactored service with cleaner state management for stability.
-- Removed logs from every tick, only logging key events to largely reduce log size.
+ - Introduced as a brand-new PowerToy module.
+ - Automatically switches between light and dark themes.
+ - Supports time-based scheduling or location-based sunrise/sunset switching.
+ - Supports using a keyboard shortcut to force a change.
+ - Supports filtering changes for Apps and/or System Theme.
 
 ### Mouse Pointer Crosshairs
- - Enabled switching between Mouse Pointer Crosshairs and Gliding Cursor modes. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Added Esc key to cancel active gliding cursor sequence. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Added orientation option (vertical / horizontal / both) for crosshairs customization. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
 
 ### Mouse Without Borders
- - Added horizontal scrolling support. Thanks [@MasonBergstrom](https://github.com/MasonBergstrom)!
+ - Continued Common class refactor (part 5/7) by extracting clipboard and init/cleanup logic into focused classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+
+ - Fix connection failures caused by conflicting MachineId across machines.  Thanks [@noraa-junker](https://github.com/noraa-junker) for troubleshooting!
 
 ### Peek
-- Fixed media files remaining locked after preview window closes. Thanks [@daverayment](https://github.com/daverayment)!
-- Added a command-line interface for file previewing. See the [Peek documentation](https://learn.microsoft.com/windows/powertoys/peek) for usage. Thanks [@prochan2](https://github.com/prochan2)!
+ - Added the option to activate Peek with just the Spacebar.
 
 ### PowerRename
-- PowerRename no longer crashes due to a missing resources file.
-- Added photo metadata extraction support using EXIF and XMP for pattern-based renaming with camera info, GPS coordinates, and date taken. See [PowerRename Documentation](https://learn.microsoft.com/en-us/windows/powertoys/powerrename).
+ - Fixed enumeration counter skipping when regex replacement equals original filename (counters now advance reliably). Thanks [@daverayment](https://github.com/daverayment)!
 
-### PowerToys Run
- - Added retry logic with exponential backoff to handle DWM composition errors during theme changes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Updated OneNote icons to reflect new Microsoft 365 design. Thanks [@trevorNgo](https://github.com/trevorNgo)!
+### Quick Accent
+ - Expanded Welsh layout with acute, grave, and dieresis variants for vowels (consistent ordering). Thanks [@PesBandi](https://github.com/PesBandi)!
 
- ### Quick Accent
- - Added diameter symbol (⌀) for Shift+O in Special Characters mode, thanks to [@anselumjuju](https://github.com/anselumjuju)!
+### Registry Preview
+ - Migrated to native TitleBar and AppWindow APIs for cleaner window chrome.
 
-### Zoomit
- - Smoothed out zoom-animation in ZoomIt by coalescing mouse-move and timer events, thanks to [@foxmsft](https://github.com/foxmsft)!
- - Enabled GIF support for ZoomIt, thanks to [@MarioHewardt](https://github.com/MarioHewardt)!
- - Fixed spelling mistakes, and refactored some literal strings to string constants, thanks to [@lzandman](https://github.com/lzandman)!
- - Fixed inaccurate "actual size" screenshots in ZoomIt and resolves a GDI handle leak, improving capture fidelity and long-session stability. thanks to [@daverayment](https://github.com/daverayment)!
+### Screen Ruler
+ - Fixed ARM64 crash by aligning cursor position structure to 8-byte boundary.
 
 ### Settings
-- Fixed title bar overlapping issue at smaller window sizes.
-- Refined shortcut control visual design with improved consistency and spacing.
-- Added dashboard utilities sorting by name or status.
-- Made update notification InfoBar in flyout clickable for direct navigation to update page.
-- Expanded installation instructions by default in README.
-- Improved accessibility for shortcut conflict button with static resource-based automation properties.
-- Added ScrollViewer to Command Palette page in PowerToys Settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed module list glitches and Sort Status checkmark issue. Thanks [@daverayment](https://github.com/daverayment)!
+ - Added ability to ignore specific hotkey conflicts to reduce noise.
+ - Stopped creating backup directory during dry-run status checks (cleaner first-run). 
+ - Standardized casing and localization for ZoomIt and modules header.
+ - Improved search results page accessibility and conditional module grouping.
 
-### Development
-- Fixed accessibility by associating controls with labels for screen readers.
-- Added accessible name to Shortcut Conflicts button for screen readers.
-- Excluded TitleBars from tab navigation across multiple utilities. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Migrated build infrastructure from Windows Server 2019 to Server 2022 with improved failure logging and predictable NuGet package paths.
-- Configured build agents to use larger P: drive for release builds to address disk space constraints.
-- Enhanced DSC v3 support by organizing resource manifests in a dedicated subfolder with PATH configuration.
-- Reduced installer bundle size by 6-7MB through centralized Hybrid CRT configuration across all C++ projects.
-- Updated .NET packages to version 9.0.10 for security fixes. Thanks [@snickler](https://github.com/snickler)!
-- Fixed spell check dictionary entries for consistency.
-- Restored accidentally deleted NuGet configuration file for Command Palette extensions.
-- Fixed package identity build by updating AppxManifest entry points to use PowerShell Core.
-- Optimized CI pipeline by replacing file copy operations with hard links and moves, reducing build time and disk usage by 10-15GB.
-- Updated Copilot guidance and PR prompt workflow.
-- Included high-volume bugs in issue template header. Thanks [@daverayment](https://github.com/daverayment)!
-- Fixed incorrect HRESULT logging for inner exceptions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Introduced shared sparse package identity for PowerToys Win32 components to enable access to Windows platform APIs.
-- Consolidated installer builds to produce both machine and user installers simultaneously, reducing build time and complexity.
-- Migrated exclusively to WiX v5 installer infrastructure, removing legacy WiX v3 support.
-- Temporarily removed PowerToys installer path from PATH environment variable to prevent application crashes.
-- Added complete OCR UI test coverage with automated tests for activation, settings, language selection, and text extraction.
-- Fixed test input for drive path normalization in bookmark resolver unit tests.
-- Fixed Peek UI tests by restoring Ctrl+Space activation shortcut for test scenarios.
-- Hided apps in PowerToys.SpareApps package from Start Menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+### ZoomIt
+ - Updated resource file to reflect standalone v9.01 and current copyright year. Thanks [@foxmsft](https://github.com/foxmsft)!
+ - Restored legacy draw/snipping behaviors and fixed recording race conditions. Thanks [@chakrik73](https://github.com/chakrik73)!
+ - Added smooth image option for improved zoom quality using GDI+ for static zoom and Magnifier API for live zoom. Thanks [@markrussinovich](https://github.com/markrussinovich)!
+
+ ### Documentation
+ - New Microsoft Learn documentation for the Light Switch module.
+ - New dev docs for the Light Switch module.
+
+### Development (Area-Build & Area-Tests) 
+- Allowed debug launches to continue when modules fail to load, speeding developer iteration. 
+- Fixed spell checker dictionary entry (advapi) to eliminate false error. 
+- Added VS Code development guide and launch configs to streamline cross-editor workflows. 
+- Upgraded Windows App SDK and related dependencies to 1.8 for newer platform features. 
+- Rewrote YAML comment to resolve new spell checker forbidden pattern. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
+- Corrected solution structure by returning misplaced Common project, reducing build confusion. 
+- Modernized build scripts with shared helpers and VS environment autodetection for simpler CLI builds. 
+- Standardized build scripts and platform detection to improve reliability and reuse. 
+- Added missing Command Palette version bump to align module release cadence. 
+- Added EXECUTEDEFAULT term to dictionary to prevent regression build failures. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
+- Introduced nightly pre-warm pipeline and configurable MSBuild cache mode to improve CI performance. 
+- Resolved CI forbidden pattern spelling complaint to keep pipelines green. 
+- Added AI contributor instruction set to clarify code area expectations. 
+- Added accessibility IDs to settings and FancyZones toggles, stabilizing UI tests. 
+- Added automatic log collection on UI test failures to speed root cause analysis. 
+- Stabilized Mouse Utils tests by switching to AccessibilityId selectors. 
+- Added Screen Ruler UI test coverage to validate core measurement workflows. 
 
 ## 🛣️ Roadmap 
 We are planning some nice new features and improvements for the next releases – a revamped Keyboard Manager UI, custom endpoint and local model support for Advanced Paste, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.96][github-next-release-work]!
@@ -253,4 +281,4 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
-[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
+[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs

doc/devdocs/cli-conventions.md

@@ -1,93 +0,0 @@
-# CLI Conventions
-
-This document describes the conventions for implementing command-line interfaces (CLI) in PowerToys modules.
-
-## Library
-
-Use the **System.CommandLine** library for CLI argument parsing. This is already defined in `Directory.Packages.props`:
-
-```xml
-<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-```
-
-Add the reference to your project:
-
-```xml
-<PackageReference Include="System.CommandLine" />
-```
-
-## Option Naming and Definition
-
-- Use `--kebab-case` for long form (e.g., `--shrink-only`).
-- Use single `-x` for short form (e.g., `-s`, `-w`).
-- Define aliases as static readonly arrays: `["--silent", "-s"]`.
-- Create options using `Option<T>` with descriptive help text.
-- Add validators for options that require range or format checking.
-
-## RootCommand Setup
-
-- Create a `RootCommand` with a brief description.
-- Add all options and arguments to the command.
-
-## Parsing
-
-- Use `Parser(rootCommand).Parse(args)` to parse CLI arguments.
-- Extract option values using `parseResult.GetValueForOption()`.
-- Note: Use `Parser` directly; `RootCommand.Parse()` may not be available with the pinned System.CommandLine version.
-
-### Parse/Validation Errors
-
-- On parse/validation errors, print error messages and usage, then exit with non-zero code.
-
-## Examples
-
-Reference implementations:
-- Awake: `src/modules/Awake/Awake/Program.cs`
-- ImageResizer: `src/modules/imageresizer/ui/Cli/`
-
-## Help Output
-
-- Provide a `PrintUsage()` method for custom help formatting if needed.
-
-## Best Practices
-
-1. **Consistency**: Follow existing module patterns.
-2. **Documentation**: Always provide help text for each option.
-3. **Validation**: Validate input and provide clear error messages.
-4. **Atomicity**: Make one logical change per PR; avoid drive-by refactors.
-5. **Build/Test Discipline**: Build and test synchronously, one terminal per operation.
-6. **Style**: Follow repo analyzers (`.editorconfig`, StyleCop) and formatting rules.
-
-## Logging Requirements
-
-- Use `ManagedCommon.Logger` for consistent logging.
-- Initialize logging early in `Main()`.
-- Use dual output (console + log file) for errors and warnings to ensure visibility.
-- Reference: `src/modules/imageresizer/ui/Cli/CliLogger.cs`
-
-## Error Handling
-
-### Exit Codes
-
-- `0`: Success
-- `1`: General error (parsing, validation, runtime)
-- `2`: Invalid arguments (optional)
-
-### Exception Handling
-
-- Always wrap `Main()` in try-catch for unhandled exceptions.
-- Log exceptions before exiting with non-zero code.
-- Display user-friendly error messages to stderr.
-- Preserve detailed stack traces in log files only.
-
-## Testing Requirements
-
-- Include tests for argument parsing, validation, and edge cases.
-- Place CLI tests in module-specific test projects (e.g., `src/modules/[module]/tests/*CliTests.cs`).
-
-## Signing and Deployment
-
-- CLI executables are signed automatically in CI/CD.
-- **New CLI tools**: Add your executable and dll to `.pipelines/ESRPSigning_core.json` in the signing list.
-- CLI executables are deployed alongside their parent module (e.g., `C:\Program Files\PowerToys\modules\[ModuleName]\`).
-- Use self-contained deployment (import `Common.SelfContained.props`).

doc/devdocs/commands.md

@@ -1,34 +0,0 @@
-# Issue/PR commands
-
-The PowerToys repository uses some special keywords to help manage issues and pull requests. Here is a list of the most important commands you can use in issue and PR descriptions or comments.
-
-| Command | Description |
-|---------|-------------|
-| `/azp run` | Triggers the Azure Pipelines CI build for the current PR. Useful if you want to re-run the build without creating a new commit. |
-| `/bugreport` / `/reportbug` | Adds a comment with a manual for the Bug Report Tool, which helps users collect logs and system information for debugging purposes. It requests to upload this file and adds the `Needs-Author-Feedback` label. |
-| `/feedbackhub` | Adds a comment with a link to the Feedback Hub app on Windows, where users can submit feedback about PowerToys. Closes the issue and adds the `Resolution-Please File on Feedback Hub` label. |
-| `/dup #...` / `/duplicate #...` / `/dup https://...` / `/duplicate https://...` | Marks the current issue as a duplicate of another issue. It closes the current issue and applies the `Resolution-Duplicate` label. Replace `#...` with the issue number or a link to the issue. |
-| `/needinfo` | Adds the `Needs-Author-Feedback` label to the issue or PR, indicating that more information is needed from the author. |
-| `/helped` | Closes the issue and adds the `Resolution-Helped User` label. Furthermore a comment is added with a link to the PowerToys user documentation. |
-| `/loc` | Adds a comment informing the user that the issue was forwarded to the localization team and will soon be fixed. It adds the `Loc-Sent To Team` label. |
-
-## Defining new commands
-
-Most of these commands are using the [Microsoft GitHub Policy Service](https://github.com/apps/microsoft-github-policy-service) bot. Its commands are defined in the [PowerToys policy configuration file](/.github/policies/resourceManagement.yml).
-
-## Other automated tasks
-
-### Automatic labeling
-
-The bot can automatically apply the correct `product-...` label for any opened issue.
-
-> [!NOTE]
-> This feature is currently only available for the Workspaces module as a test.
-
-### The `Needs-Author-Feedback` label
-
-If an issue has this label and had no activity for 5 days, the bot will post a comment reminding the author to provide the needed information. It also adds the `Status-No recent activity` label. If no further activity occurs for another 5 days, the bot will close the issue.
-
-### Filtering users that want to contribute
-
-If a user utters their intention to contribute (e.g., by using the phrase "I want to contribute" in an issue or PR), the bot will add a comment with a link to the ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769).

doc/devdocs/core/installer.md

@@ -134,7 +134,7 @@ If you prefer, you can alternatively build prerequisite projects for the install
 
 #### Locally compiling the installer
 
-1. Open `installer\PowerToysSetup.slnx`
+1. Open `installer\PowerToysSetup.sln`
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu choose `Build Solution`.
 
@@ -144,9 +144,9 @@ To build the installer from the command line, run `Developer Command Prompt for
 
 ```
 git clean -xfd  -e *exe -- .\installer\
-MSBuild -t:restore  .\installer\PowerToysSetup.slnx -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
-MSBuild -t:Restore -m .\installer\PowerToysSetup.slnx /t:PowerToysInstallerVNext /p:Configuration=Release /p:Platform="x64"
-MSBuild -t:Restore -m .\installer\PowerToysSetup.slnx /t:PowerToysBootstrapperVNext /p:Configuration=Release /p:Platform="x64" 
+MSBuild -t:restore  .\installer\PowerToysSetup.sln -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
+MSBuild -t:Restore -m .\installer\PowerToysSetup.sln /t:PowerToysInstallerVNext /p:Configuration=Release /p:Platform="x64"
+MSBuild -t:Restore -m .\installer\PowerToysSetup.sln /t:PowerToysBootstrapperVNext /p:Configuration=Release /p:Platform="x64" 
 ```
 
 ### Supported arguments for the .EXE Bootstrapper installer

doc/devdocs/core/settings/settings-implementation.md

@@ -38,7 +38,7 @@ For C# modules, the settings are accessed through the `SettingsUtils` class in t
 using Microsoft.PowerToys.Settings.UI.Library;
 
 // Read settings
-var settings = SettingsUtils.Default.GetSettings<ModuleSettings>("ModuleName");
+var settings = SettingsUtils.GetSettings<ModuleSettings>("ModuleName");
 bool enabled = settings.Enabled;
 ```
 
@@ -49,7 +49,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 
 // Write settings
 settings.Enabled = true;
-SettingsUtils.Default.SaveSettings(settings.ToJsonString(), "ModuleName");
+SettingsUtils.SaveSettings(settings.ToJsonString(), "ModuleName");
 ```
 
 ## Settings Handling in Modules

doc/devdocs/development/debugging.md

@@ -19,7 +19,7 @@ You can build the entire solution from the command line, which is sometimes fast
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
    ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.slnx /tl /p:NuGetInteractive="true"
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
    ```
 4. This process should complete in approximately 13-14 minutes for a full build
 

doc/devdocs/development/dev-with-vscode.md

@@ -42,10 +42,10 @@ Or reach out to "tools\build\BUILD-GUIDELINES.md"
 ### Sample plain msbuild command
 ```powershell
 # Restore:
-msbuild powertoys.slnx -t:restore -p:configuration=debug -p:platform=x64 -m
+msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
 
-# Build powertoys slnx
-msbuild powertoys.slnx -p:configuration=debug -p:platform=x64 -m
+# Build powertoys sln
+msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
 
 # dotnet project
 msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
@@ -122,7 +122,7 @@ Similar for attach to managed code.
 
 | Task | Command / Action | Notes |
 |------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.slnx` | Deep clean removes packages & build outputs |
+| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
 | Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
 | Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |
+| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |

doc/devdocs/development/ui-tests.md

@@ -12,7 +12,7 @@
 
 - Exit PowerToys if it's running.
 
-- Open `PowerToys.slnx` in Visual Studio and build the solution.
+- Open `PowerToys.sln` in Visual Studio and build the solution.
 
 - Run tests in the Test Explorer (`Test > Test Explorer` or `Ctrl+E, T`).
 

doc/devdocs/localization.md

@@ -0,0 +1,165 @@
+# Localization
+
+> **NOTE**: THIS DOCUMENT IS OUTDATED.
+> Follow [issue 15243](https://github.com/microsoft/PowerToys/issues/15243) for updates.
+
+## Table of Contents
+1. [Localization on the pipeline (CDPX)](#localization-on-the-pipeline-cdpx)
+    1. [UWP Special case](#uwp-special-case)
+2. [Enabling localization on a new project](#enabling-localization-on-a-new-project)
+    1. [C++](#c)
+    2. [C#](#c-1)
+    3. [UWP](#uwp)
+3. [Lcl Files](#lcl-files)
+4. [Possible Issues in localization PRs (LEGO)](#possible-issues-in-localization-prs-lego)
+5. [Enabling localized MSI for a new project](#enabling-localized-msi-for-a-new-project)
+
+## Localization on the pipeline (CDPX)
+[The localization step](https://github.com/microsoft/PowerToys/blob/86d77103e9c69686c297490acb04775d43ef8b76/.pipelines/pipeline.user.windows.yml#L45-L52) is run on the pipeline before the solution is built. This step runs the [build-localization](https://github.com/microsoft/PowerToys/blob/main/.pipelines/build-localization.cmd) script, which generates resx files for all the projects with localization enabled using the `Localization.XLoc` package.
+
+The [`Localization.XLoc`](https://github.com/microsoft/PowerToys/blob/86d77103e9c69686c297490acb04775d43ef8b76/.pipelines/build-localization.cmd#L24-L25) tool is run on the repo root, and it checks for all occurrences of `LocProject.json`. Each localized project has a `LocProject.json` file in the project root, which contains the location of the English resx file, list of languages for localization, and the output path where the localized resx files are to be copied to. In addition to this, some other parameters can be set, such as whether the language ID should be added as a folder in the file path or in the file name. When the CDPX pipeline is run, the localization team is notified of changes in the English resx files. For each project with localization enabled, a `loc` folder (see [this](https://github.com/microsoft/PowerToys/tree/main/src/modules/launcher/Microsoft.Launcher/loc) for example) is created in the same directory as the `LocProject.json` file. The folder contains language specific folders which in turn have a nested folder path equivalent to `OutputPath` in the `LocProject.json`. Each of these folders contain one `lcl` file. The `lcl` files contain the English resources along with their translation for that language. These are described in more detail in the [Lcl files section](#lcl-files). Once the `.resx` files are generated, they will be used during the `Build PowerToys` step for localized versions of the modules.
+
+Since the localization script requires certain nuget packages, the [`restore-localization`](https://github.com/microsoft/PowerToys/blob/main/.pipelines/restore-localization.cmd) script is run before running `build-localization` to install all the required packages. This script must [run in the `restore` step](https://github.com/microsoft/PowerToys/blob/86d77103e9c69686c297490acb04775d43ef8b76/.pipelines/pipeline.user.windows.yml#L37-L39) of pipeline because [the host is network isolated](https://onebranch.visualstudio.com/Pipeline/_wiki/wikis/Pipeline.wiki/2066/Consuming-Packages-in-a-CDPx-Pipeline?anchor=overview) at the `build` step. The [Toolset package source](https://github.com/microsoft/PowerToys/blob/86d77103e9c69686c297490acb04775d43ef8b76/.pipelines/pipeline.user.windows.yml#L23) is used for this.
+
+The process and variables that can be tweaked on the pipeline are described in more detail on [onebranch (account required) under Localization](https://onebranch.visualstudio.com/Pipeline/_wiki/wikis/Pipeline.wiki/290/Localization).
+
+The localized resource dlls for C# projects are added to the MSI only for build on the pipeline. This is done by checking if the [`IsPipeline` variable is defined](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/installer/PowerToysSetup/Product.wxs#L804-L805), which gets defined before [building the installer on the pipeline](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/.pipelines/build-installer.cmd#L4). This is done because the localized resx files are only present on the pipeline, and not having this check would result in the installer project failing to build locally.
+
+## Enabling localization on a new project
+To enable localization on a new project, the first step is to create a file `LocProject.json` in the project root.
+
+For example, for a project in the folder `src\path` where the resx file is present in `resources\Resources.resx`, the LocProject.json file will contain the following:
+```
+{
+    "Projects": [
+        {
+            "LanguageSet": "Azure_Languages",
+            "LocItems": [
+                {
+                    "SourceFile": "src\\path\\resources\\Resources.resx",
+                    "CopyOption": "LangIDOnName",
+                    "OutputPath": "src\\path\\resources"
+                }
+            ]
+        }
+    ]
+}
+```
+The rest of the steps depend on the project type and are covered in the sections below. The steps to add the localized files to the MSI can be found in [Enabling localized MSI for a new project](#Enabling-localized-MSI-for-a-new-project).
+
+### C++
+C++ projects do not support `resx` files, and instead use `rc` files along with `resource.h` files. The CDPX pipeline however doesn't support localizing `rc` files and the other alternative they support is directly translating the resources from the binary which makes it harder to maintain resources. To avoid this, a custom script has been added which expects a resx file and converts the entries to an rc file with a string table and adds resource declarations to a resource.h file so that the resources can be compiled with the C++ project.
+
+If you already have a .rc file, copy the string table to a separate txt file and run the [convert-stringtable-to-resx.ps1](https://github.com/microsoft/PowerToys/blob/main/tools/build/convert-stringtable-to-resx.ps1) script on it. This script is not very robust to input, and requires the data in a specific format, where `IDS_ResName L"ResourceValue"` and any number of spaces can be present in between. The script converts this file to the format expected by [`resgen`](https://learn.microsoft.com/dotnet/framework/tools/resgen-exe-resource-file-generator#Convert), which will convert it to resx. The resource names are changed from all uppercase to title case, and the `IDS_` prefix is removed. Escape characters might have to be manually replaced, for example .rc files would have escaped double quotes as `""`, so this should be replaced with just `"` before converting to the resx files.
+
+After generating the resx file, rename the existing rc and h files to ProjName.base.rc and resource.base.h. In the rc file remove the string table which is to be localized and in the .h file remove all `#define`s corresponding to localized resources. In the vcxproj of the C++ project, add the following build event:
+```
+<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h ProjName.base.rc ProjName.rc" />
+</Target>
+```
+
+This event runs a script which generates a resource.h and ProjName.rc in the `Generated Files` folder using the strings in all the resx files along with the existing information in resource.base.h and ProjName.base.rc. The script is [convert-resx-to-rc.ps1](https://github.com/microsoft/PowerToys/blob/main/tools/build/convert-resx-to-rc.ps1). The script uses [`resgen`](https://learn.microsoft.com/dotnet/framework/tools/resgen-exe-resource-file-generator#Convert) to convert the resx file to a string table expected in the .rc file format. When the resources are added to the rc file the `IDS_` prefix is added and resource names are in upper case (as it was originally). Any occurrences of `"` in the string resource is escaped as `""` to prevent build errors. The string tables are added to the rc file in the following format:
+```
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    strings
+END
+
+#endif
+```
+Since there is no API to identify the `AFX_TARG_*`, `LANG_*` or `SUBLANG_*` values from each langId from the pipeline, these are hardcoded in the script (for each language) as done in [lines 50-77 of `convert-resx-to-rc.ps1`](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/tools/build/convert-resx-to-rc.ps1#L50-L77). **If any other languages are added in the future, this script will have to be updated.** In order to determine what are the language codes, you can open the rc file in Resource View, right click the string table and press `Insert Copy` and choose the corresponding language. This autogenerates the required code and can be used to figure out the language codes. The files also add the resource declarations to a resource.h file, starting from 101 by default(this can be changed by an optional argument). Since the output files will be generated in `Generated Files`, any includes in these two files will require an additional `..\` and wherever resource.h is used, it will have to be included as `Generated Files\resource.h`. While adding `resource.base.h` and `ProjName.base.rc` to the vcxproj, these should be modified to not participate in the build to avoid build errors:
+```
+<None Include="Resources.resx" />
+```
+
+Some rc/resource.h files might be used in multiple projects (for example, KBM). To ensure the projects build for these cases, the build event can be added to the entire directory so that the rc files are generated before any project is built. See [Directory.Build.targets](https://github.com/microsoft/PowerToys/blob/main/src/modules/keyboardmanager/Directory.Build.targets) for an example.
+
+Check [this PR](https://github.com/microsoft/PowerToys/pull/6104) for an example for making these changes for a C++ project.
+
+### C#
+Since C# projects natively support `resx` files, the only step required here is to include all the resx files in the build. For .NET Core projects this is done automatically and the .csproj does not need to be modified. For other projects, the following line needs to be added:
+```
+<EmbeddedResource Include="Properties\Resources.*.resx" />
+```
+
+**Note:** Building with localized resources may cause a build warning `Referenced assembly 'mscorlib.dll' targets a different processor` which is a VS bug. More details can be found in [PowerToys issue #7269](https://github.com/microsoft/PowerToys/issues/7269).
+
+**Note:** If a project needs to be migrated from XAML resources to resx, the easiest way to convert the resources would be to change to format to `=` separates resources by either manually (by Ctrl+H on a text editor), or by a script, and then running [`resgen`](https://learn.microsoft.com/dotnet/framework/tools/resgen-exe-resource-file-generator#Convert) on `Developer Command Prompt for VS` to convert it to resx format.
+```
+<system:String x:Key="wox_plugin_calculator_plugin_name">Calculator</system:String>
+<system:String x:Key="wox_plugin_calculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Wox)</system:String>
+<system:String x:Key="wox_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
+```
+to
+```
+wox_plugin_calculator_plugin_name=Calculator
+wox_plugin_calculator_plugin_description=Allows to do mathematical calculations.(Try 5*3-2 in Wox)
+wox_plugin_calculator_not_a_number=Not a number (NaN)
+```
+After adding the resx file to the project along with the resource generator, references to the strings will have to be replaced with `Properties.Resources.resName` rather than the custom APIs. Check [this PR](https://github.com/microsoft/PowerToys/pull/6165) for an example of the changes required.
+
+### UWP
+UWP projects expect `resw` files rather than `resx` (the format is almost the same). Unlike other C# projects, the files are expected in the format `fullLangId\Resources.resw`. To include these files in the build, replace the following line in the csproj:
+```
+<PRIResource Include="Strings\en-us\Resources.resw" />
+```
+to
+```
+<PRIResource Include="Strings\*\Resources.resw" />
+```
+
+## Lcl Files
+Lcl files contain all the resources that are present in the English resx file, along with a translation if it has been added.
+
+For example, an entry for a resource in the lcl file looks like this:
+```
+<Item ItemId=";EditKeyboard_WindowName" ItemType="0;.resx" PsrId="211" Leaf="true">
+    <Str Cat="Text">
+        <Val><![CDATA[Remap keys]]></Val>
+        <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Remapper des touches]]></Val>
+        </Tgt>
+    </Str>
+    <Disp Icon="Str" />
+</Item>
+```
+The `<Tgt>` element would not be present in the initial commits of the lcl files, as only the English version of the string would be present.
+
+**Note:** The CDPX Localization system has a fail-safe check on the lcl files, where if the English string value which is present inside `<Val><![CDATA[*]]></Val>` does not match the value present in the English Resources.resx file then the translated value will not be copied to the localized resx file. This is present so that obsolete translations would not be loaded when the English resource has changed, and the English string will be used rather than the obsolete translation.
+
+## Possible Issues in localization PRs (LEGO)
+Since the LEGO PRs update some of the strings in LCL files at a time, there can be multiple PRs which modify the same files, leading to merge conflicts. In most cases this would show up on GitHub as a merge conflict, but sometimes a bad git merge may occur, and the file could end up with incorrect formatting, such as two `<Tgt>` elements for a single resource. These can be fixed by ensuring the elements follow the format described in [this section](#lcl-files). To catch such errors, the build farm should be run for every LEGO PR and if any error occurs in the localization step, we should check the corresponding resx/lcl files for conflicts.
+
+## Enabling localized MSI for a new project
+For C++ and UWP projects no additional files are generated with localization that need to be added to the MSI. For C++ projects all the resources are added to the dll/exe, while for UWP projects they are added to the `resources.pri` file (which is present even for an unlocalized project). To verify if the localized resources are added to the `resources.pri` file the following steps can be done:
+- Open `Developer Command Prompt for VS`
+- After navigating to the folder containing the pri file, run the following command:
+
+        makepri.exe dump /if .\resources.pri
+- Check the contents of the `resources.pri.xml` file that is generated from the command. The last section of the file will contain the resources with the strings in all the languages:
+```
+<NamedResource name="GeneralSettings_RunningAsAdminText" uri="ms-resource://f4f787a5-f0ae-47a9-be89-5408b1dd2b47/Resources/GeneralSettings_RunningAsAdminText">
+    <Candidate qualifiers="Language-FR" type="String">
+        <Value>Running as administrator</Value>
+    </Candidate>
+    <Candidate qualifiers="Language-EN-US" isDefault="true" type="String">
+        <Value>Running as administrator</Value>
+    </Candidate>
+</NamedResource>
+```
+
+For C# projects, satellite dlls are generated when the project is built. For a project named `ProjName`, files are created in the format `langId\ProjName.resources.dll` where `langId` is in the same format as the lcl files. The satellite dlls need to be included with the MSI, but they must be added only if the solution is built from the build farm, as the localized resx files will not be present on local machines (and that could cause local builds of the installer to fail).
+This can be done by adding the directory name of the project to [Product.wxs near line 806](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/installer/PowerToysSetup/Product.wxs#L806) and a resource component for the project can be created in [Product.wxs near lines 845-847](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/installer/PowerToysSetup/Product.wxs#L845-L847) in this format:
+```
+<Component Id="ProjName_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)ProjNameInstallFolder">
+    <File Id="ProjName_$(var.IdSafeLanguage)_File" Source="$(var.BinX64Dir)modules\ProjName\$(var.Language)\ProjName.resources.dll" />
+</Component>
+```
+
+We should also ensure the new dlls are signed by the pipeline. Currently all dlls of the form [`*.resources.dll` are signed](https://github.com/microsoft/PowerToys/blob/f92bd6ffd38014c228544bb8d68d0937ce4c2b6d/.pipelines/pipeline.user.windows.yml#L68).
+
+**Note:** The resource dlls should be added to the MSI project only after the initial commit with the lcl files has been done by the Localization team. Otherwise, the pipeline will fail as there wouldn't be any resx files to generate the dlls.

doc/devdocs/modules/alwaysontop.md

@@ -86,7 +86,7 @@ The module provides a user interface for configuring settings in the PowerToys S
 ### Building and Testing
 
 1. Clone the repository: `git clone https://github.com/microsoft/PowerToys.git`
-2. Open PowerToys.slnx in Visual Studio
+2. Open PowerToys.sln in Visual Studio
 3. Select the Release configuration and build the solution
 4. Run PowerToys.exe from the output directory to test the module
 

doc/devdocs/modules/fancyzones.md

@@ -161,7 +161,7 @@ FancyZones is divided into several projects:
    ```
    git clone https://github.com/microsoft/PowerToys.git
    ```
-2. Open `PowerToys.slnx` in Visual Studio
+2. Open `PowerToys.sln` in Visual Studio
 3. Select the Release configuration and build the solution
 4. If you encounter build errors, try deleting the x64 output folder and rebuild
 
@@ -244,7 +244,7 @@ UI tests are implemented using [Windows Application Driver](https://github.com/m
   
   - Exit PowerToys if it's running
   - Run WinAppDriver.exe from the installation directory. Skip this step if installed in the default directory (`C:\Program Files (x86)\Windows Application Driver`); in this case, it'll be launched automatically during tests.
-  - Open `PowerToys.slnx` in Visual Studio and build the solution.
+  - Open `PowerToys.sln` in Visual Studio and build the solution.
   - Run tests in the Test Explorer (`Test > Test Explorer` or `Ctrl+E, T`). 
 
 >Note: notifications or other application windows, that are shown above the window under test, can disrupt the testing process.

doc/devdocs/modules/keyboardmanager/debug.md

@@ -11,7 +11,7 @@ Keyboard Manager consists of two main components:
 ## Development Environment Setup
 
 1. Clone the PowerToys repository
-2. Open `PowerToys.slnx` in Visual Studio
+2. Open `PowerToys.sln` in Visual Studio
 3. Ensure all NuGet packages are restored
 4. Build the entire solution in Debug configuration
 
@@ -91,4 +91,4 @@ If you encounter issues with multiple instances, check the mutex logic in `Keybo
 
 To debug both the Editor and Engine:
 1. Launch the Engine first in debug mode
-2. Attach the debugger to the Editor process when it starts
+2. Attach the debugger to the Editor process when it starts

doc/devdocs/modules/lightswitch.md

@@ -33,12 +33,9 @@ The **Light Switch** module lets users automatically transition between light an
 
   > **Note:** Using the shortcut overrides the current schedule until the next transition event.
 
-* **LightSwitchService.cpp**
-  is the heart beat of the module. Controls ticking every minute and depending on user actions (manual override, settings changing, etc) triggers the state manager to perform the corresponding operation.
-  
-* **LightSwitchStateManager.cpp**
-  handles updating the state based on the signals sent by LightSwitchService.
-  
+* **LightSwitchService**
+  Reads settings and applies theming. Runs a check every minute to ensure the state is correct.
+
 * **SettingsXAML/LightSwitch**
   Provides the settings UI for configuring schedules, syncing location, and customizing shortcuts.
 
@@ -92,7 +89,7 @@ The module’s settings are exposed in the PowerToys Settings UI. Options includ
 3. Build the solution:
 
    ```sh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.slnx
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
    ```
 
    > Note: This may take some time.

doc/devdocs/modules/screenruler.md

@@ -53,7 +53,7 @@ The Screen Ruler module consists of several components:
 
 ### Building
 
-1. Open PowerToys.slnx in Visual Studio
+1. Open PowerToys.sln in Visual Studio
 2. In the Solutions Configuration drop-down menu, select Release or Debug
 3. From the Build menu, choose Build Solution
 4. The executable app for Screen Ruler is named PowerToys.MeasureToolUI.exe

doc/devdocs/modules/shortcut_guide.md

@@ -19,7 +19,7 @@ Shortcut Guide is a PowerToy that displays an overlay of available keyboard shor
 ## Build and Debug Instructions
 
 ### Build
-1. Open PowerToys.slnx in Visual Studio
+1. Open PowerToys.sln in Visual Studio
 2. Select Release or Debug in the Solutions Configuration drop-down menu
 3. From the Build menu, choose Build Solution
 4. The executable is named PowerToys.ShortcutGuide.exe

doc/devdocs/readme.md

@@ -38,11 +38,6 @@ Welcome to the PowerToys developer documentation. This documentation provides in
 - [Update Process](processes/update-process.md) - How PowerToys updates work
 - [GPO Implementation](processes/gpo.md) - Group Policy Objects implementation details
 
-## Other Resources
-
-- [aka.ms links](akaLinks.md) - List of short links
-- [Issue/PR commands](commands.md) - Special commands for managing issues and pull requests
-
 ## Fork, Clone, Branch and Create your PR
 
 Once you've discussed your proposed feature/fix/etc. with a team member, and an approach or a spec has been written and approved, it's time to start development:
@@ -85,7 +80,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 
 ### Install Visual Studio dependencies
 
-1. Open the `PowerToys.slnx` file.
+1. Open the `PowerToys.sln` file.
 1. If you see a dialog that says `install extra components` in the solution explorer pane, click `install`
 
 ### Get Submodules to compile
@@ -98,7 +93,7 @@ We have submodules that need to be initialized before you can compile most parts
 
 ### Compiling Source Code
 
-- Open `PowerToys.slnx` in Visual Studio.
+- Open `PowerToys.sln` in Visual Studio.
 - In the `Solutions Configuration` drop-down menu select `Release` or `Debug`.
 - From the `Build` menu choose `Build Solution`, or press <kbd>Control</kbd>+<kbd>Shift</kbd>+<kbd>b</kbd> on your keyboard.
 - The build process may take several minutes depending on your computer's performance. Once it completes, the PowerToys binaries will be in your repo under `x64\Release\`.
@@ -112,10 +107,10 @@ Our installer is two parts, an EXE and an MSI.  The EXE (Bootstrapper) contains
 
 The installer can only be compiled in `Release` mode; steps 1 and 2 must be performed before the MSI can be compiled.
 
-1. Compile `PowerToys.slnx`. Instructions are listed above.
+1. Compile `PowerToys.sln`. Instructions are listed above.
 1. Compile `BugReportTool.sln` tool. Path from root: `tools\BugReportTool\BugReportTool.sln` (details listed below)
 1. Compile `StylesReportTool.sln` tool. Path from root: `tools\StylesReportTool\StylesReportTool.sln` (details listed below)
-1. Compile `PowerToysSetup.slnx` Path from root: `installer\PowerToysSetup.slnx` (details listed below)
+1. Compile `PowerToysSetup.sln` Path from root: `installer\PowerToysSetup.sln` (details listed below)
 
 See [Installer](core/installer.md) for more details on building and debugging the installer.
 

doc/thirdPartyRunPlugins.md

@@ -51,7 +51,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
 | [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |
 | [CheatSheets](https://github.com/ruslanlap/PowerToysRun-CheatSheets) | [ruslanlap](https://github.com/ruslanlap) | 📚 Find cheat sheets and command examples instantly from tldr pages, cheat.sh, and devhints.io. Features include favorites system, categories, offline mode, and smart caching. |
-| [QuickAI](https://github.com/ruslanlap/PowerToysRun-QuickAi) | [ruslanlap](https://github.com/ruslanlap) | AI-powered assistance with instant, smart responses from multiple providers (Groq, Together, Fireworks, OpenRouter, Cohere) |
 
 ## Extending software plugins
 

installer/PowerToysSetup.sln

@@ -0,0 +1,96 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "..\src\common\logger\logger.vcxproj", "{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysInstallerVNext", "PowerToysSetupVNext\PowerToysInstallerVNext.wixproj", "{B6E94700-DF38-41F6-A3FD-18B69674AB1E}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysBootstrapperVNext", "PowerToysSetupVNext\PowerToysBootstrapperVNext.wixproj", "{DA4E9744-80BE-424C-B0F5-AFD8757DB575}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToysSetupCustomActionsVNext", "PowerToysSetupCustomActionsVNext\PowerToysSetupCustomActionsVNext.vcxproj", "{B3A354B0-1E54-4B55-A962-FB5AF9330C19}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SilentFilesInUseBAFunction", "PowerToysSetupVNext\SilentFilesInUseBA\SilentFilesInUseBAFunction.vcxproj", "{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.Build.0 = Release|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.ActiveCfg = Release|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.Build.0 = Release|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.ActiveCfg = Debug|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.Build.0 = Debug|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.ActiveCfg = Release|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.Build.0 = Release|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.ActiveCfg = Debug|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.Build.0 = Debug|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|ARM64.Build.0 = Release|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.ActiveCfg = Release|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.Build.0 = Release|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|x64.ActiveCfg = Debug|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|x64.Build.0 = Debug|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|ARM64.Build.0 = Release|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.ActiveCfg = Release|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.Build.0 = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.ActiveCfg = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.Build.0 = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.Build.0 = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.ActiveCfg = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.Build.0 = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.ActiveCfg = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.Build.0 = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.Build.0 = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.ActiveCfg = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.Build.0 = Release|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|x64.ActiveCfg = Debug|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|x64.Build.0 = Debug|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|ARM64.Build.0 = Release|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|x64.ActiveCfg = Release|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|x64.Build.0 = Release|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|x64.ActiveCfg = Debug|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|x64.Build.0 = Debug|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|ARM64.Build.0 = Release|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|x64.ActiveCfg = Release|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B7A3DA30-D443-40FF-AC51-988AD41E3962}
+	EndGlobalSection
+EndGlobal

installer/PowerToysSetup.slnx

@@ -1,22 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="ARM64" />
-    <Platform Name="x64" />
-  </Configurations>
-  <Project Path="../src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </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>
-  <Project Path="PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/PowerToysInstallerVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj" Id="f8b9f842-f5c3-4a2d-8c85-7f8b9e2b4f1d">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-</Solution>

installer/PowerToysSetup/generateDscResourcesWxs.ps1

@@ -0,0 +1,87 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True)]
+    [string]$dscWxsFile,
+    [Parameter(Mandatory = $True)]
+    [string]$Platform,
+    [Parameter(Mandatory = $True)]
+    [string]$Configuration
+)
+
+$ErrorActionPreference = 'Stop'
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
+
+if (-not (Test-Path $buildOutputDir)) {
+    Write-Error "Build output directory not found: '$buildOutputDir'"
+    exit 1
+}
+
+$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
+
+if (-not $dscFiles) {
+    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
+    $wxsContent = @"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+    Set-Content -Path $dscWxsFile -Value $wxsContent
+    exit 0
+}
+
+Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
+
+$wxsContent = @"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+"@
+
+$componentRefs = @()
+foreach ($file in $dscFiles) {
+    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
+    $fileId = $componentId + "_File"
+    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
+    $componentRefs += $componentId
+    
+    $wxsContent += @"
+
+      <Component Id="$componentId" Guid="{$guid}">
+        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
+      </Component>
+"@
+}
+
+$wxsContent += @"
+
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+"@
+
+foreach ($componentId in $componentRefs) {
+    $wxsContent += @"
+
+      <ComponentRef Id="$componentId"/>
+"@
+}
+
+$wxsContent += @"
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+
+Set-Content -Path $dscWxsFile -Value $wxsContent
+Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -4,7 +4,6 @@
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
 #include <filesystem>
-#include <string_view>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -857,69 +856,14 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)
 
     try
     {
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+        winrt::Windows::Security::Credentials::PasswordCredential cred;
+
         hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
         ExitOnFailure(hr, "Failed to initialize");
 
-        winrt::Windows::Security::Credentials::PasswordVault vault;
-
-        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
-            std::wstring_view prefixView{ prefix };
-            return value.compare(0, prefixView.size(), prefixView) == 0;
-        };
-
-        const wchar_t* resourcePrefixes[] = {
-            L"https://platform.openai.com/api-keys",
-            L"https://azure.microsoft.com/products/ai-services/openai-service",
-            L"https://azure.microsoft.com/products/ai-services/ai-inference",
-            L"https://console.mistral.ai/account/api-keys",
-            L"https://ai.google.dev/",
-        };
-
-        const wchar_t* usernamePrefixes[] = {
-            L"PowerToys_AdvancedPaste_",
-        };
-
-        auto credentials = vault.RetrieveAll();
-        for (auto const& credential : credentials)
-        {
-            bool shouldRemove = false;
-
-            std::wstring resource{ credential.Resource() };
-            for (auto const prefix : resourcePrefixes)
-            {
-                if (hasPrefix(resource, prefix))
-                {
-                    shouldRemove = true;
-                    break;
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                std::wstring username{ credential.UserName() };
-                for (auto const prefix : usernamePrefixes)
-                {
-                    if (hasPrefix(username, prefix))
-                    {
-                        shouldRemove = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                continue;
-            }
-
-            try
-            {
-                vault.Remove(credential);
-            }
-            catch (...)
-            {
-            }
-        }
+        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
+        vault.Remove(cred);
     }
     catch (...)
     {
@@ -1549,11 +1493,12 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 42> processesToTerminate = {
+    std::array<std::wstring_view, 43> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
         L"PowerToys.Awake.exe",
+        L"PowerToys.McpServer.exe",
         L"PowerToys.FancyZones.exe",
         L"PowerToys.FancyZonesEditor.exe",
         L"PowerToys.FileLocksmithUI.exe",

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -34,8 +34,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(Platform)\$(Configuration)\SetupShared\</OutDir>
-    <IntDir>$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\SetupShared\obj\</IntDir>
+    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup\</OutDir>
+    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
+    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
+    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
+    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
+    <NormalizedPerUserValue>false</NormalizedPerUserValue>
+    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <LinkIncremental>true</LinkIncremental>
@@ -54,7 +59,6 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""
@@ -76,7 +80,8 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs.bk""""
-      call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
+      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
+      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
       </Command>
       <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
     </PreBuildEvent>
@@ -176,4 +181,4 @@
     <Error Condition="!Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props'))" />
   </Target>
-</Project>
+</Project>

installer/PowerToysSetupVNext/CmdPal.wxs

@@ -4,13 +4,6 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
       <Directory Id="CmdPalInstallFolder" Name="CmdPal">
-        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
-        <?if $(sys.BUILDARCH) = x64 ?>
-          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
-        <?else?>
-          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
-        <?endif?>
-        </Directory>
       </Directory>
     </DirectoryRef>
     <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
@@ -25,40 +18,14 @@
         <?endif?>
       </Component>
     </DirectoryRef>
-    <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
-      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="Microsoft.VCLibs.x64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?else?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
-      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="Microsoft.VCLibs.ARM64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?endif?>
     <ComponentGroup Id="CmdPalComponentGroup">
       <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall" />
-    <?if $(sys.BUILDARCH) = x64 ?>
-        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall" />
-    <?else?>
-        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall" />
-    <?endif?>
       </Component>
       <ComponentRef Id="Module_CmdPal" />
-      <ComponentRef Id="Module_CmdPal_Deps" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetupVNext/Core.wxs

@@ -15,8 +15,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
         </RegistryKey>
-        <!-- Append DSCModules folder to current user's PATH for DSC v3 usage -->
-        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[DSCModulesReferenceFolder]" />
+        <!-- Append install folder to current user's PATH -->
+        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" />
       </Component>
       <?else?>
       <Component Id="powertoys_env_path_machine" Bitness="always64">
@@ -24,8 +24,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
         </RegistryKey>
-        <!-- Append DSCModules folder to machine PATH for DSC v3 usage -->
-        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[DSCModulesReferenceFolder]" />
+        <!-- Append install folder to machine PATH -->
+        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLFOLDER]" />
       </Component>
       <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
@@ -63,6 +63,16 @@
       </Component>
     </DirectoryRef>
 
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+      </Component>
+    </DirectoryRef>
+
     <?if $(var.PerUser) = "true" ?>
     <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
     <?else?>
@@ -110,6 +120,7 @@
           <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
@@ -117,15 +128,16 @@
       <ComponentRef Id="powertoys_exe" />
       <ComponentRef Id="PowerToysStartMenuShortcut" />
       <ComponentRef Id="powertoys_per_machine_comp" />
+  <?if $(var.PerUser) = "true" ?>
+  <ComponentRef Id="powertoys_env_path_user" />
+  <?else?>
+  <ComponentRef Id="powertoys_env_path_machine" />
+  <?endif?>
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
       <ComponentRef Id="DesktopShortcut" />
-      <?if $(var.PerUser) = "true" ?>
-      <ComponentRef Id="powertoys_env_path_user" />
-      <?else?>
-      <ComponentRef Id="powertoys_env_path_machine" />
-      <?endif?>
+      <ComponentRef Id="PowerToysDSCReference" />
       <?if $(var.PerUser) = "false" ?>
       <ComponentRef Id="PowerToysDSC" />
       <?endif?>

installer/PowerToysSetupVNext/DscResources.wxs

@@ -1,33 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define DscJsonFiles=?>
-  <?define DscJsonFilesPath=$(var.BinDir)\DSCModules?>
-
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder" FileSource="$(var.DscJsonFilesPath)">
-      <!-- DSC v2 PowerShell module files -->
-      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
-      </Component>
-      
-      <!-- DSC v3 JSON manifest files - Generated by generateAllFileComponents.ps1 -->
-      <!--DscJsonFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="DscResourcesComponentGroup">
-      <ComponentRef Id="PowerToysDSCReference" />
-      <Component Id="RemoveDSCModulesFolder" Guid="A3C77D92-4E97-4C1A-9F2E-8B3C5D6E7F80" Directory="DSCModulesReferenceFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveDSCModulesFolder" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -14,6 +14,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -24,6 +25,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -35,7 +37,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
       call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
       call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
-      call move /Y ..\..\..\DscResources.wxs.bk ..\..\..\DscResources.wxs
       call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
       call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
       call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
@@ -59,12 +60,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
     </PostBuildEvent>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
-    <PostBuildEvent></PostBuildEvent>
-    <RunPostBuildEvent></RunPostBuildEvent>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
-  </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
   </PropertyGroup>

installer/PowerToysSetupVNext/Product.wxs

@@ -120,11 +120,11 @@
 
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
-      <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="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed" />
+      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
-      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed AND WINDOWSBUILDNUMBER &gt;= 22000" />
+      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->

installer/PowerToysSetupVNext/Settings.wxs

@@ -14,16 +14,11 @@
   <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
   <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
 
-  <?define SettingsV2IconsModelsFiles=?>
-  <?define SettingsV2IconsModelsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\Models\?>
-
   <Fragment>
     <DirectoryRef Id="WinUI3AppsAssetsFolder">
       <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
         <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts" />
-        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons">
-          <Directory Id="SettingsV2IconsModelsInstallFolder" Name="Models" />
-        </Directory>
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
         <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules">
           <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
         </Directory>
@@ -50,11 +45,6 @@
     <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
     </DirectoryRef>
 
-    <DirectoryRef Id="SettingsV2IconsModelsInstallFolder" FileSource="$(var.SettingsV2IconsModelsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2IconsModelsFiles_Component_Def-->
-    </DirectoryRef>
-
     <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
       <Component Id="CommandNotFound_Scripts" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02" Bitness="always64">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
@@ -77,7 +67,6 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveFolderSettingsV2IconsModelsInstallFolder" Directory="SettingsV2IconsModelsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall" />

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -1,7 +1,9 @@
 [CmdletBinding()]
 Param(
     [Parameter(Mandatory = $True, Position = 1)]
-    [string]$platform
+    [string]$platform,
+    [Parameter(Mandatory = $False, Position = 2)]
+    [string]$installscopeperuser = "false"
 )
 
 Function Generate-FileList() {
@@ -75,7 +77,9 @@ Function Generate-FileComponents() {
         [Parameter(Mandatory = $True, Position = 1)]
         [string]$fileListName,
         [Parameter(Mandatory = $True, Position = 2)]
-        [string]$wxsFilePath
+        [string]$wxsFilePath,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$regroot
     )
 
     $wxsFile = Get-Content $wxsFilePath;
@@ -96,7 +100,7 @@ Function Generate-FileComponents() {
     $componentDefs +=
     @"
             <Component Id="$($componentId)" Guid="$((New-Guid).ToString().ToUpper())">
-              <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
                 <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
               </RegistryKey>`r`n
 "@
@@ -130,194 +134,194 @@ if ($platform -ceq "arm64") {
     $platform = "ARM64"
 }
 
+if ($installscopeperuser -eq "true") {
+    $registryroot = "HKCU"
+} else {
+    $registryroot = "HKLM"
+}
+
 #BaseApplications
 Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
-Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
 
 #WinUI3Applications
 Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
 
 #AdvancedPaste
 Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
-Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
 
 #AwakeFiles
 Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
-Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
 
 #ColorPicker
 Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
-Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
 
 #Environment Variables
 Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
-Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
 
 #FileExplorerAdd-ons
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
-Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
-Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
 
 #FileLocksmith
 Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
-Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
 
 #Hosts
 Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
-Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
 
 #ImageResizer
 Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
-Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
 
 # Light Switch Service
 Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
-Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
+Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs -regroot $registryroot
 
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
-Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
 
 #Peek
 Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
-Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
 
 #PowerRename
 Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
-Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
 
 #RegistryPreview
 Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
-Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
 
 #Run
 Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
-Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins
 ###Calculator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
-Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Folder
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
-Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Program
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
-Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Shell
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
-Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Indexer
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
-Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###UnitConverter
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
-Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WebSearch
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
-Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###History
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
-Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Uri
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
-Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###VSCodeWorkspaces
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
-Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowWalker
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
-Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###OneNote
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
-Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Registry
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
-Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Service
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
-Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###System
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
-Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###TimeDate
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
-Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsSettings
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
-Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsTerminal
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
-Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###PowerToys
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
-Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###ValueGenerator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
-Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
-Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins
 
 #ShortcutGuide
 Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
 
 #Settings
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
-Generate-FileList -fileDepsJson "" -fileListName SettingsV2IconsModelsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\Models\"
-Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
-Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
-Generate-FileComponents -fileListName "SettingsV2IconsModelsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
 
 #Workspaces
 Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
-Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs
-
-#DSC Resources - JSON manifest files in DSCModules subfolder
-Generate-FileList -fileDepsJson "" -fileListName DscJsonFiles -wxsFilePath $PSScriptRoot\DscResources.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\DSCModules\"
-Generate-FileComponents -fileListName "DscJsonFiles" -wxsFilePath $PSScriptRoot\DscResources.wxs
+Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot

installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1

@@ -0,0 +1,102 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True)]
+    [string]$dscWxsFile,
+    [Parameter(Mandatory = $True)]
+    [string]$Platform,
+    [Parameter(Mandatory = $True)]
+    [string]$Configuration
+)
+
+$ErrorActionPreference = 'Stop'
+
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+
+# Find build output directory
+$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
+
+if (-not (Test-Path $buildOutputDir)) {
+    Write-Error "Build output directory not found: '$buildOutputDir'"
+    exit 1
+}
+
+# Find all DSC manifest JSON files
+$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
+
+if (-not $dscFiles) {
+    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
+    # Create empty component group
+    $wxsContent = @"
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+    Set-Content -Path $dscWxsFile -Value $wxsContent
+    exit 0
+}
+
+Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
+
+# Generate WiX fragment
+$wxsContent = @"
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+"@
+
+$componentRefs = @()
+
+foreach ($file in $dscFiles) {
+    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
+    $fileId = $componentId + "_File"
+    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
+    
+    $componentRefs += $componentId
+    
+    $wxsContent += @"
+
+      <Component Id="$componentId" Guid="{$guid}" Directory="DSCModulesReferenceFolder">
+        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
+      </Component>
+"@
+}
+
+$wxsContent += @"
+
+    </DirectoryRef>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+"@
+
+foreach ($componentId in $componentRefs) {
+    $wxsContent += @"
+
+      <ComponentRef Id="$componentId"/>
+"@
+}
+
+$wxsContent += @"
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+
+# Write the WiX file
+Set-Content -Path $dscWxsFile -Value $wxsContent
+
+Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

nuget.config

@@ -2,9 +2,17 @@
 <configuration>
 	<packageSources>
 		<clear />
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
+		<packageSource key="nuget.org">
+            <package pattern="Microsoft.SemanticKernel*" />
+            <package pattern="Microsoft.Extensions.*" />
+            <package pattern="System.*" />
+            <package pattern="OpenAI" />
+            <package pattern="Azure.*" />
+        </packageSource>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>

src/McpServer/PowerToys.McpServer.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\Common.SelfContained.props" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>PowerToys.McpServer</RootNamespace>
+    <AssemblyName>PowerToys.McpServer</AssemblyName>
+    <Nullable>enable</Nullable>
+    <OutputPath>..\..\$(Platform)\$(Configuration)</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ApplicationManifest>PowerToys.McpServer.dev.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(CIBuild)'=='true'">
+    <ApplicationManifest>PowerToys.McpServer.prod.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="ModelContextProtocol" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+    <ProjectReference Include="..\common\ManagedCommon\ManagedCommon.csproj" />
+  </ItemGroup>
+</Project>

src/McpServer/PowerToys.McpServer.dev.manifest

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="PowerToys.McpServer.app" />
+  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
+        publisher="CN=PowerToys Dev, O=PowerToys, L=Redmond, S=Washington, C=US"
+        packageName="Microsoft.PowerToys.SparseApp"
+        applicationId="PowerToys.McpServer" />
+</assembly>

src/McpServer/PowerToys.McpServer.prod.manifest

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="PowerToys.McpServer.app" />
+  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
+        publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+        packageName="Microsoft.PowerToys.SparseApp"
+        applicationId="PowerToys.McpServer" />
+</assembly>

src/McpServer/Program.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using ModelContextProtocol.Server;
+using PowerToys.McpServer.Tools;
+
+namespace PowerToys.McpServer
+{
+    internal sealed class Program
+    {
+        private static async Task<int> Main(string[] args)
+        {
+            // Initialize PowerToys logger
+            // Logger.InitializeLogger expects path relative to Constants.AppDataPath()
+            // which already points to LocalAppData\Microsoft\PowerToys
+            string logPath = Path.Combine("\\McpServer", "Logs");
+            Logger.InitializeLogger(logPath);
+            Logger.LogInfo("Starting PowerToys MCP Server with official SDK");
+
+            try
+            {
+                var builder = Host.CreateApplicationBuilder(args);
+
+                // Configure all logs to go to stderr (required for MCP protocol)
+                builder.Logging.AddConsole(consoleLogOptions =>
+                {
+                    consoleLogOptions.LogToStandardErrorThreshold = LogLevel.Trace;
+                });
+
+                // Register MCP server with stdio transport and tools
+                builder.Services
+                    .AddMcpServer()
+                    .WithStdioServerTransport()
+                    .WithToolsFromAssembly();
+
+                Logger.LogInfo("Building and running MCP host...");
+                await builder.Build().RunAsync();
+                Logger.LogInfo("MCP server shutdown complete");
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Fatal error in MCP server", ex);
+                return 1;
+            }
+        }
+    }
+}

src/McpServer/README.md

@@ -0,0 +1,102 @@
+# PowerToys Model Context Protocol Server
+
+This module hosts a standalone Model Context Protocol (MCP) server that exposes PowerToys functionality to MCP-compliant AI agents. The server is built as a .NET 9 console application that implements the MCP specification using the official ModelContextProtocol SDK.
+
+## Project Structure
+
+- **Program.cs**: Main entry point that configures the MCP server with stdio transport
+- **Tools/AwakeTools.cs**: Implementation of Awake-related MCP tools
+- **PowerToys.McpServer.csproj**: .NET 9 project configuration with MCP dependencies
+
+## Dependencies
+
+- **Microsoft.Extensions.Hosting**: For hosting infrastructure and dependency injection
+- **ModelContextProtocol**: Official MCP SDK for .NET
+- **PowerToys Settings Library**: Integration with PowerToys settings system
+- **ManagedCommon**: PowerToys logging and utilities
+
+## Available Tools
+
+| Tool Name | Description | Parameters | Module |
+|-----------|-------------|------------|--------|
+| `GetAwakeStatus` | Returns the current Awake configuration (mode, timers, display policy) | None | Awake |
+| `SetAwakePassive` | Set Awake to passive mode (allow system to sleep normally) | None | Awake |
+| `SetAwakeIndefinite` | Set Awake to indefinite mode (keep system awake until manually changed) | `keepDisplayOn` (bool), `force` (bool) | Awake |
+| `SetAwakeTimed` | Set Awake to timed mode (keep system awake for a specific duration) | `durationSeconds` (int), `keepDisplayOn` (bool), `force` (bool) | Awake |
+
+## Building and Running
+
+### Prerequisites
+- .NET 9 SDK
+- Visual Studio 2022 (recommended) or VS Code with C# extension
+
+### Build
+```bash
+# From PowerToys root directory
+msbuild src/McpServer/PowerToys.McpServer.csproj /p:Platform=x64 /p:Configuration=Debug
+
+# Or using dotnet CLI
+cd src/McpServer
+dotnet build -c Debug
+```
+
+### Run the Server
+The executable is built to `x64\Debug\PowerToys.McpServer.exe`. The server communicates over standard input/output using MCP framing (`Content-Length` header followed by JSON).
+
+**Example MCP Client Session:**
+1. Client sends `initialize` request with MCP version and capabilities
+2. Client calls `tools/list` to discover available PowerToys tools
+3. Client invokes `tools/call` with the desired tool name and arguments
+4. Server responds with tool execution results or errors
+
+The server will remain active until the process is terminated or a `shutdown` request is received.
+
+### Logging
+- Application logs are written to `%LOCALAPPDATA%\Microsoft\PowerToys\McpServer\Logs\`
+- MCP protocol logs are sent to stderr (required by MCP specification)
+
+## Architecture
+
+The server uses the official ModelContextProtocol .NET SDK and follows these patterns:
+
+- **Tool Discovery**: Tools are automatically discovered using `WithToolsFromAssembly()` 
+- **Tool Attributes**: Methods marked with `[McpServerTool]` and `[Description]` are exposed as MCP tools
+- **Parameter Binding**: Method parameters are automatically bound from MCP tool call arguments
+- **Error Handling**: Exceptions are caught and returned as MCP error responses
+- **Settings Integration**: Uses PowerToys settings system for configuration persistence
+
+## Adding New Module Tools
+
+1. Create a new static class in the `Tools/` directory (e.g., `FancyZonesTools.cs`)
+2. Mark the class with `[McpServerToolType]` attribute
+3. Implement static methods with `[McpServerTool]` and `[Description]` attributes:
+   ```csharp
+   [McpServerToolType]
+   public static class MyModuleTools
+   {
+       [McpServerTool]
+       [Description("Description of what this tool does")]
+       public static JsonObject MyTool(
+           [Description("Parameter description")] string parameter)
+       {
+           // Implementation here
+           return new JsonObject();
+       }
+   }
+   ```
+4. Follow existing patterns in `AwakeTools.cs` for:
+   - Settings integration using `SettingsUtils`
+   - Logging using `Logger.LogInfo/LogError`
+   - Error handling and response formatting
+   - PowerToys process detection and module status checks
+
+## Integration with PowerToys
+
+The MCP server integrates with PowerToys through:
+
+- **Settings System**: Uses the same settings files as the main PowerToys application
+- **Process Management**: Detects and interacts with running PowerToys processes
+- **Module Status**: Checks if specific PowerToys modules are enabled
+- **Logging**: Uses PowerToys logging infrastructure for troubleshooting
+
+Refer to the PowerToys developer documentation for build and packaging instructions.

src/McpServer/Tools/AwakeTools.cs

@@ -0,0 +1,694 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text.Json.Nodes;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using ModelContextProtocol.Server;
+using Lock = System.Threading.Lock;
+
+namespace PowerToys.McpServer.Tools
+{
+    /// <summary>
+    /// MCP tools for PowerToys Awake module.
+    /// </summary>
+    [McpServerToolType]
+    public static class AwakeTools
+    {
+        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
+        private const string PowerToysProcessName = "PowerToys";
+        private const string AwakeExecutableName = "PowerToys.Awake.exe";
+        private static readonly string[] AwakeRelativeSearchPaths =
+        [
+            AwakeExecutableName,
+            Path.Combine("modules", "Awake", AwakeExecutableName),
+        ];
+
+        /// <summary>
+        /// Gets the current Awake mode and configuration.
+        /// </summary>
+        /// <returns>JSON object with current Awake status.</returns>
+        [McpServerTool]
+        [Description("Get the current Awake mode and configuration from the PowerToys settings store.")]
+        public static JsonObject GetAwakeStatus()
+        {
+            try
+            {
+                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
+
+                if (!powerToysRunning || !awakeModuleEnabled)
+                {
+                    if (IsAwakeProcessRunning())
+                    {
+                        // Awake is running via CLI, but we cannot determine its actual configuration
+                        Logger.LogInfo("[MCP] Detected Awake CLI process running while PowerToys is not active or Awake module is disabled.");
+                        return AwakeStatusPayload.CreateUnknownActive().ToJsonObject();
+                    }
+
+                    return AwakeStatusPayload.CreateInactive().ToJsonObject();
+                }
+
+                // PowerToys is running and Awake module is enabled
+                bool awakeProcessRunning = IsAwakeProcessRunning();
+
+                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
+                string summary = FormatAwakeDescription(settings);
+
+                if (awakeProcessRunning)
+                {
+                    summary = $"{summary} An Awake process is already running with the current configuration. To override the active session and apply new settings, use force=true.";
+                }
+
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, summary);
+                Logger.LogInfo("[MCP] Retrieved Awake status via SDK tool.");
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to read Awake status.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        /// <summary>
+        /// Sets the Awake mode to passive (allow system sleep).
+        /// </summary>
+        /// <returns>JSON object with updated Awake status.</returns>
+        [McpServerTool]
+        [Description("Set Awake to passive mode (allow system to sleep normally).")]
+        public static JsonObject SetAwakePassive()
+        {
+            try
+            {
+                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
+
+                if (!powerToysRunning || !awakeModuleEnabled)
+                {
+                    StopAwakeProcesses();
+                    Logger.LogInfo("[MCP] Stopped all Awake processes because PowerToys is not running.");
+                    return AwakeStatusPayload.CreateInactive().ToJsonObject();
+                }
+
+                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
+                settings.Properties.Mode = AwakeMode.PASSIVE;
+                settings.Properties.KeepDisplayOn = false;
+                settings.Properties.IntervalHours = 0;
+                settings.Properties.IntervalMinutes = 0;
+                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
+
+                string confirmation = FormatAwakeDescription(settings);
+                Logger.LogInfo($"[MCP] {confirmation}");
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to set Awake to passive.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        /// <summary>
+        /// Sets the Awake mode to indefinite (keep system awake forever).
+        /// </summary>
+        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
+        /// <returns>JSON object with updated Awake status.</returns>
+        [McpServerTool]
+        [Description("Set Awake to indefinite mode (keep system awake until manually changed).")]
+        public static JsonObject SetAwakeIndefinite(
+            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
+            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
+        {
+            try
+            {
+                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
+
+                if (!powerToysRunning || !awakeModuleEnabled)
+                {
+                    return AwakeStatusPayload.CreateError(
+                        "Indefinite mode requires PowerToys to be running with Awake module enabled. CLI mode does not support indefinite operation.").ToJsonObject();
+                }
+
+                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
+                if (!force && IsAwakeActive(settings))
+                {
+                    return BuildActiveProcessResponse(settings, true, false);
+                }
+
+                settings.Properties.Mode = AwakeMode.INDEFINITE;
+                settings.Properties.KeepDisplayOn = keepDisplayOn;
+                settings.Properties.IntervalHours = 0;
+                settings.Properties.IntervalMinutes = 0;
+                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
+
+                string confirmation = FormatAwakeDescription(settings);
+                Logger.LogInfo($"[MCP] {confirmation}");
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to set Awake to indefinite.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        /// <summary>
+        /// Sets the Awake mode to expire at a specific date and time.
+        /// </summary>
+        /// <param name="expireAt">ISO 8601 date/time when Awake should expire (e.g., "2025-10-22T15:30:00").</param>
+        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
+        /// <returns>JSON object with updated Awake status.</returns>
+        [McpServerTool]
+        [Description("Set Awake to expire at a specific date and time (ISO 8601 format).")]
+        public static JsonObject SetAwakeExpireAt(
+            [Description("ISO 8601 date/time when Awake should expire (e.g., \"2025-10-22T15:30:00\")")] string expireAt,
+            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
+            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
+        {
+            try
+            {
+                if (!DateTimeOffset.TryParse(expireAt, out DateTimeOffset expirationDateTime))
+                {
+                    return AwakeStatusPayload.CreateError($"Invalid date format: '{expireAt}'. Please use ISO 8601 format (e.g., '2025-10-22T15:30:00').").ToJsonObject();
+                }
+
+                if (expirationDateTime <= DateTimeOffset.Now)
+                {
+                    return AwakeStatusPayload.CreateError("Expiration time must be in the future.").ToJsonObject();
+                }
+
+                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
+
+                if (!powerToysRunning || !awakeModuleEnabled)
+                {
+                    TimeSpan duration = expirationDateTime - DateTimeOffset.Now;
+                    uint durationSeconds = (uint)Math.Max(60, duration.TotalSeconds);
+                    return HandleCliScenario(AwakeMode.EXPIRABLE, keepDisplayOn, durationSeconds, force);
+                }
+
+                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
+                if (!force && IsAwakeActive(settings))
+                {
+                    return BuildActiveProcessResponse(settings, true, false);
+                }
+
+                TimeSpan timeSpan = expirationDateTime - DateTimeOffset.Now;
+                uint hours = (uint)timeSpan.TotalHours;
+                uint minutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
+                if (hours == 0 && minutes == 0)
+                {
+                    minutes = 1;
+                }
+
+                settings.Properties.Mode = AwakeMode.EXPIRABLE;
+                settings.Properties.KeepDisplayOn = keepDisplayOn;
+                settings.Properties.IntervalHours = hours;
+                settings.Properties.IntervalMinutes = minutes;
+                settings.Properties.ExpirationDateTime = expirationDateTime;
+                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
+
+                string confirmation = FormatAwakeDescription(settings);
+                Logger.LogInfo($"[MCP] {confirmation}");
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to set Awake expire-at mode.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        /// <summary>
+        /// Sets the Awake mode to timed (keep system awake for a specific duration).
+        /// </summary>
+        /// <param name="durationSeconds">Duration in seconds (minimum 60).</param>
+        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
+        /// <returns>JSON object with updated Awake status.</returns>
+        [McpServerTool]
+        [Description("Set Awake to timed mode (keep system awake for a specific duration).")]
+        public static JsonObject SetAwakeTimed(
+            [Description("Duration in seconds (minimum 60)")] int durationSeconds,
+            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
+            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
+        {
+            try
+            {
+                if (durationSeconds < 60)
+                {
+                    durationSeconds = 60;
+                }
+
+                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
+
+                if (!powerToysRunning || !awakeModuleEnabled)
+                {
+                    return HandleCliScenario(AwakeMode.TIMED, keepDisplayOn, (uint)durationSeconds, force);
+                }
+
+                TimeSpan timeSpan = TimeSpan.FromSeconds(durationSeconds);
+                uint hours = (uint)timeSpan.TotalHours;
+                uint minutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
+                if (hours == 0 && minutes == 0)
+                {
+                    minutes = 1;
+                }
+
+                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
+                if (!force && IsAwakeActive(settings))
+                {
+                    return BuildActiveProcessResponse(settings, true, false);
+                }
+
+                settings.Properties.Mode = AwakeMode.TIMED;
+                settings.Properties.KeepDisplayOn = keepDisplayOn;
+                settings.Properties.IntervalHours = hours;
+                settings.Properties.IntervalMinutes = minutes;
+                settings.Properties.ExpirationDateTime = DateTimeOffset.Now.Add(timeSpan);
+                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
+
+                string confirmation = FormatAwakeDescription(settings);
+                Logger.LogInfo($"[MCP] {confirmation}");
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to set Awake to timed mode.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        private static string FormatAwakeDescription(AwakeSettings settings)
+        {
+            var mode = settings.Properties.Mode.ToString().ToLowerInvariant();
+            var display = settings.Properties.KeepDisplayOn ? "display on" : "display off";
+
+            return settings.Properties.Mode switch
+            {
+                AwakeMode.PASSIVE => "Awake mode: passive (system sleep allowed)",
+                AwakeMode.INDEFINITE => $"Awake mode: indefinite, {display}",
+                AwakeMode.TIMED => $"Awake mode: timed ({settings.Properties.IntervalHours}h {settings.Properties.IntervalMinutes}m), {display}",
+                AwakeMode.EXPIRABLE => $"Awake mode: expirable (until {settings.Properties.ExpirationDateTime:yyyy-MM-dd HH:mm}), {display}",
+                _ => $"Awake mode: {mode}",
+            };
+        }
+
+        private static JsonObject BuildActiveProcessResponse(AwakeSettings settings, bool powerToysRunning, bool launchedViaCli)
+        {
+            return AwakeStatusPayload.CreateError(
+                "Awake is already running. Use force=true to override.",
+                settings).ToJsonObject();
+        }
+
+        private static bool IsPowerToysRunning()
+        {
+            try
+            {
+                return Process.GetProcessesByName(PowerToysProcessName).Length > 0;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning($"[MCP] Unable to determine PowerToys runner status: {ex.Message}");
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether the Awake module is enabled in PowerToys settings.
+        /// </summary>
+        /// <returns>True if Awake module is enabled, false otherwise</returns>
+        private static bool IsAwakeModuleEnabled()
+        {
+            try
+            {
+                var generalSettings = SettingsUtils.GetSettings<GeneralSettings>();
+                return generalSettings?.Enabled?.Awake == true;
+            }
+            catch
+            {
+                // If we can't read settings, assume disabled
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Checks PowerToys and Awake module status.
+        /// </summary>
+        /// <returns>Tuple containing (powerToysRunning, awakeModuleEnabled)</returns>
+        private static (bool PowerToysRunning, bool AwakeModuleEnabled) CheckPowerToysAndAwakeStatus()
+        {
+            bool powerToysRunning = IsPowerToysRunning();
+            bool awakeModuleEnabled = powerToysRunning && IsAwakeModuleEnabled();
+
+            return (powerToysRunning, awakeModuleEnabled);
+        }
+
+        /// <summary>
+        /// Handles CLI scenario when PowerToys is not running or Awake module is disabled.
+        /// </summary>
+        /// <param name="mode">The Awake mode to set</param>
+        /// <param name="keepDisplayOn">Whether to keep display on</param>
+        /// <param name="durationSeconds">Duration in seconds (0 for indefinite)</param>
+        /// <param name="force">Whether to force override existing process</param>
+        /// <returns>JSON response for CLI scenario</returns>
+        private static JsonObject HandleCliScenario(AwakeMode mode, bool keepDisplayOn, uint durationSeconds, bool force)
+        {
+            if (!force && IsAwakeProcessRunning())
+            {
+                return AwakeStatusPayload.CreateError(
+                    "Awake is already running and PowerToys is not active. Use force=true to override.").ToJsonObject();
+            }
+
+            if (IsAwakeProcessRunning())
+            {
+                StopAwakeProcesses();
+            }
+
+            JsonObject cliPayload = StartAwakeCliProcess(mode, keepDisplayOn, durationSeconds);
+            return cliPayload;
+        }
+
+        private static JsonObject StartAwakeCliProcess(AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
+        {
+            try
+            {
+                if (!TryResolveAwakeExecutable(out string executablePath))
+                {
+                    throw new FileNotFoundException("PowerToys.Awake.exe was not found near the MCP server executable.");
+                }
+
+                ProcessStartInfo startInfo = CreateSimpleStartInfo(executablePath, mode, keepDisplayOn, durationSeconds);
+                Process? launchedProcess = Process.Start(startInfo);
+                if (launchedProcess is null)
+                {
+                    throw new InvalidOperationException("Failed to start PowerToys.Awake.exe.");
+                }
+
+                // No tracking, just launch and forget
+                launchedProcess.Dispose();
+
+                AwakeSettings snapshot = BuildAwakeSnapshot(mode, keepDisplayOn, durationSeconds);
+                string confirmation = FormatAwakeDescription(snapshot);
+                Logger.LogInfo($"[MCP] Launched Awake CLI for mode {mode} (PowerToys not running).");
+                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(snapshot, confirmation);
+                return payload.ToJsonObject();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("[MCP] Failed to start Awake CLI.", ex);
+                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
+            }
+        }
+
+        private static ProcessStartInfo CreateSimpleStartInfo(string executablePath, AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
+        {
+            string workingDirectory = Path.GetDirectoryName(executablePath) ?? AppDomain.CurrentDomain.BaseDirectory;
+            var startInfo = new ProcessStartInfo(executablePath)
+            {
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                WorkingDirectory = string.IsNullOrEmpty(workingDirectory) ? AppDomain.CurrentDomain.BaseDirectory : workingDirectory,
+            };
+
+            startInfo.ArgumentList.Add("--display-on");
+            startInfo.ArgumentList.Add(keepDisplayOn ? "true" : "false");
+
+            if (mode == AwakeMode.TIMED && durationSeconds > 0)
+            {
+                startInfo.ArgumentList.Add("--time-limit");
+                startInfo.ArgumentList.Add(durationSeconds.ToString(CultureInfo.InvariantCulture));
+            }
+            else if (mode == AwakeMode.EXPIRABLE && durationSeconds > 0)
+            {
+                // For EXPIRABLE mode, convert duration to expiration datetime
+                DateTimeOffset expirationDateTime = DateTimeOffset.Now.AddSeconds(durationSeconds);
+                startInfo.ArgumentList.Add("--expire-at");
+                startInfo.ArgumentList.Add(expirationDateTime.ToString("O")); // ISO 8601 format
+            }
+
+            return startInfo;
+        }
+
+        private static void StopAwakeProcesses()
+        {
+            string processName = Path.GetFileNameWithoutExtension(AwakeExecutableName);
+            try
+            {
+                Process[] awakeProcesses = Process.GetProcessesByName(processName);
+                foreach (Process process in awakeProcesses)
+                {
+                    try
+                    {
+                        if (!process.HasExited)
+                        {
+                            process.Kill(true);
+                            process.WaitForExit(TimeSpan.FromSeconds(5));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogWarning($"[MCP] Failed to terminate Awake process {process.Id}: {ex.Message}");
+                    }
+                    finally
+                    {
+                        process.Dispose();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning($"[MCP] Failed to enumerate Awake processes: {ex.Message}");
+            }
+        }
+
+        private static AwakeSettings BuildAwakeSnapshot(AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
+        {
+            var snapshot = new AwakeSettings();
+            snapshot.Properties.Mode = mode;
+            snapshot.Properties.KeepDisplayOn = keepDisplayOn;
+
+            if (mode == AwakeMode.TIMED && durationSeconds > 0)
+            {
+                TimeSpan timeSpan = TimeSpan.FromSeconds(durationSeconds);
+                snapshot.Properties.IntervalHours = (uint)timeSpan.TotalHours;
+                snapshot.Properties.IntervalMinutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
+                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now.Add(timeSpan);
+            }
+            else if (mode == AwakeMode.EXPIRABLE && durationSeconds > 0)
+            {
+                snapshot.Properties.IntervalHours = 0;
+                snapshot.Properties.IntervalMinutes = 0;
+                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now.AddSeconds(durationSeconds);
+            }
+            else
+            {
+                snapshot.Properties.IntervalHours = 0;
+                snapshot.Properties.IntervalMinutes = 0;
+                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now;
+            }
+
+            return snapshot;
+        }
+
+        private static bool TryResolveAwakeExecutable(out string executablePath)
+        {
+            string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+            if (TryResolveAwakeExecutableFrom(baseDirectory, out executablePath))
+            {
+                return true;
+            }
+
+            string? parentDirectory = Directory.GetParent(baseDirectory)?.FullName;
+            if (!string.IsNullOrEmpty(parentDirectory) && TryResolveAwakeExecutableFrom(parentDirectory, out executablePath))
+            {
+                return true;
+            }
+
+            executablePath = string.Empty;
+            return false;
+        }
+
+        private static bool TryResolveAwakeExecutableFrom(string rootDirectory, out string executablePath)
+        {
+            foreach (string relativePath in AwakeRelativeSearchPaths)
+            {
+                string candidate = Path.Combine(rootDirectory, relativePath);
+                if (File.Exists(candidate))
+                {
+                    executablePath = candidate;
+                    return true;
+                }
+            }
+
+            executablePath = string.Empty;
+            return false;
+        }
+
+        private static bool IsAwakeProcessRunning()
+        {
+            try
+            {
+                string processName = Path.GetFileNameWithoutExtension(AwakeExecutableName);
+                return Process.GetProcessesByName(processName).Length > 0;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning($"[MCP] Unable to determine Awake process status: {ex.Message}");
+                return false;
+            }
+        }
+
+        private static bool IsAwakeActive(AwakeSettings settings)
+        {
+            // Only check if Awake module is enabled
+            return IsAwakeModuleEnabled();
+        }
+
+        private sealed class AwakeStatusPayload
+        {
+            internal string Mode { get; set; } = "unknown";
+
+            internal bool? KeepDisplayOn { get; set; }
+
+            internal uint? IntervalHours { get; set; }
+
+            internal uint? IntervalMinutes { get; set; }
+
+            internal string? ExpirationDateTime { get; set; }
+
+            internal string Summary { get; set; } = string.Empty;
+
+            internal bool Success { get; set; } = true;
+
+            internal string? ErrorMessage { get; set; }
+
+            internal JsonObject ToJsonObject()
+            {
+                var result = new JsonObject
+                {
+                    ["mode"] = Mode,
+                    ["summary"] = Summary,
+                };
+
+                // Add properties only if they have values
+                if (KeepDisplayOn.HasValue)
+                {
+                    result["keepDisplayOn"] = KeepDisplayOn.Value;
+                }
+
+                if (IntervalHours.HasValue)
+                {
+                    result["intervalHours"] = IntervalHours.Value;
+                }
+
+                if (IntervalMinutes.HasValue)
+                {
+                    result["intervalMinutes"] = IntervalMinutes.Value;
+                }
+
+                if (!string.IsNullOrEmpty(ExpirationDateTime))
+                {
+                    result["expirationDateTime"] = ExpirationDateTime;
+                }
+
+                // Add error handling properties
+                if (!Success)
+                {
+                    result["success"] = false;
+                    if (!string.IsNullOrEmpty(ErrorMessage))
+                    {
+                        result["error"] = ErrorMessage;
+                    }
+                }
+
+                return result;
+            }
+
+            internal static AwakeStatusPayload FromSettings(AwakeSettings settings, string summary)
+            {
+                var payload = new AwakeStatusPayload
+                {
+                    Mode = settings.Properties.Mode.ToString().ToLowerInvariant(),
+                    Summary = summary,
+                };
+
+                // Only include properties relevant to the current mode
+                if (settings.Properties.Mode != AwakeMode.PASSIVE)
+                {
+                    payload.KeepDisplayOn = settings.Properties.KeepDisplayOn;
+                }
+
+                if (settings.Properties.Mode == AwakeMode.TIMED || settings.Properties.Mode == AwakeMode.EXPIRABLE)
+                {
+                    payload.IntervalHours = settings.Properties.IntervalHours;
+                    payload.IntervalMinutes = settings.Properties.IntervalMinutes;
+                    payload.ExpirationDateTime = settings.Properties.ExpirationDateTime.ToString("O");
+                }
+
+                return payload;
+            }
+
+            internal static AwakeStatusPayload CreateInactive()
+            {
+                return new AwakeStatusPayload
+                {
+                    Mode = "inactive",
+                    Summary = "PowerToys Awake is not running because PowerToys is not active.",
+                };
+            }
+
+            internal static AwakeStatusPayload CreateUnknownActive()
+            {
+                return new AwakeStatusPayload
+                {
+                    Mode = "unknown",
+                    Summary = "An Awake process is currently running, but its configuration cannot be determined. To terminate the existing process and start with new settings, use force=true.",
+                };
+            }
+
+            internal static AwakeStatusPayload CreateError(string errorMessage, AwakeSettings? settings = null)
+            {
+                var payload = new AwakeStatusPayload
+                {
+                    Success = false,
+                    ErrorMessage = errorMessage,
+                };
+
+                if (settings != null)
+                {
+                    payload.Mode = settings.Properties.Mode.ToString().ToLowerInvariant();
+
+                    // Only include properties relevant to the current mode
+                    if (settings.Properties.Mode != AwakeMode.PASSIVE)
+                    {
+                        payload.KeepDisplayOn = settings.Properties.KeepDisplayOn;
+                    }
+
+                    if (settings.Properties.Mode == AwakeMode.TIMED || settings.Properties.Mode == AwakeMode.EXPIRABLE)
+                    {
+                        payload.IntervalHours = settings.Properties.IntervalHours;
+                        payload.IntervalMinutes = settings.Properties.IntervalMinutes;
+                        payload.ExpirationDateTime = settings.Properties.ExpirationDateTime.ToString("O");
+                    }
+
+                    payload.Summary = "An Awake session is already active with the current settings. To override and change the configuration, use force=true.";
+                }
+                else
+                {
+                    payload.Mode = "unknown";
+                    payload.Summary = "An Awake process is currently running. To terminate the existing process and start with new settings, use force=true.";
+                }
+
+                return payload;
+            }
+        }
+    }
+}

src/PackageIdentity/AppxManifest.xml

@@ -36,35 +36,55 @@
   </Capabilities>
 
   <Applications>
-    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" EntryPoint="Windows.FullTrustApplication">
+    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
       <uap:VisualElements
         DisplayName="PowerToys.OCR"
         Description="PowerToys OCR Module"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
+    <Application Id="PowerToys.SettingsUI" Executable="PowerToys.Settings.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
       <uap:VisualElements
         DisplayName="PowerToys.SettingsUI"
         Description="PowerToys Settings UI"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
+    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
       <uap:VisualElements
         DisplayName="PowerToys.ImageResizer"
         Description="PowerToys Image Resizer UI"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
+    <Application Id="PowerToys.McpServer" Executable="PowerToys.McpServer.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+      <uap:VisualElements
+        AppListEntry="none"
+        DisplayName="PowerToys.McpServer"
+        Description="PowerToys MCP Server"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+      </uap:VisualElements>
+      <Extensions>
+        <uap3:Extension Category="windows.appExtension">
+          <uap3:AppExtension
+            Name="com.microsoft.windows.ai.mcpServer"
+            Id="PowerToys.McpServer"
+            DisplayName="PowerToys MCP Server"
+            PublicFolder="Assets">
+            <uap3:Properties>
+              <Registration>mcpServerConfig.json</Registration>
+            </uap3:Properties>
+          </uap3:AppExtension>
+        </uap3:Extension>
+      </Extensions>
+    </Application>
   </Applications>
 </Package>

src/PackageIdentity/Assets/mcpServerConfig.json

@@ -0,0 +1,18 @@
+{
+  "manifest_version": "0.1",
+  "name": "PowerToys-McpServer",
+  "version": "1.0.0",
+  "description": "PowerToys McpServer",
+  "author": {
+    "name": "Microsoft"
+  },
+  "server": {
+    "type": "binary",
+    "entry_point": "PowerToys.McpServer.exe",
+    "mcp_config": {
+      "command": "PowerToys.McpServer.exe",
+      "args": [
+      ]
+    }
+  }
+}

src/PackageIdentity/BuildSparsePackage.ps1

@@ -12,8 +12,7 @@ Param(
 
     [switch]$Clean,
     [switch]$ForceCert,
-    [switch]$NoSign,
-    [switch]$CIBuild
+    [switch]$NoSign
 )
 
 # PowerToys sparse packaging helper.
@@ -23,7 +22,7 @@ Param(
 $ErrorActionPreference = 'Stop'
 
 $isCIBuild = $false
-if ($CIBuild.IsPresent) {
+if ($NoSign.IsPresent) {
     $isCIBuild = $true
 } elseif ($env:CIBuild) {
     $isCIBuild = $env:CIBuild -ieq 'true'
@@ -292,6 +291,7 @@ try {
     $essentialFiles = @(
         "AppxManifest.xml"
         "Images\*"
+        "Assets\*"
     )
     
     foreach ($filePattern in $essentialFiles) {
@@ -310,7 +310,11 @@ try {
             $sourceDir = $sourcePath.TrimEnd('\*')
             $targetDir = Join-Path $stagingDir (Split-Path $relativePath.TrimEnd('\*') -Parent)
             if (Test-Path $sourceDir) {
-                Copy-Item -Path "$sourceDir\*" -Destination $targetDir -Force -ErrorAction SilentlyContinue
+                $targetSubDir = Join-Path $stagingDir ($relativePath.TrimEnd('\*'))
+                if (-not (Test-Path $targetSubDir)) {
+                    New-Item -ItemType Directory -Path $targetSubDir -Force | Out-Null
+                }
+                Copy-Item -Path "$sourceDir\*" -Destination $targetSubDir -Force -ErrorAction SilentlyContinue
             }
         } else {
             # Copy single file

src/PackageIdentity/PackageIdentity.vcxproj

@@ -2,22 +2,20 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
   <!-- CI Build Configuration -->
-  <PropertyGroup Condition="'$(CIBuild)'=='true'">
+  <PropertyGroup Condition="'$(CIBuild)'=='true' and '$(ForceSign)' != 'true'">
     <ForceCIPackaging>true</ForceCIPackaging>
-    <NoSignCI>true</NoSignCI>
+    <EffectiveCIBuild>true</EffectiveCIBuild>
   </PropertyGroup>
 
   <!-- Target to generate sparse MSIX package -->
   <Target Name="GenerateSparsePackage" BeforeTargets="PrepareForBuild">
     <!-- Use NoSign only for CI builds to avoid certificate issues on hosted agents -->
     <PropertyGroup>
-      <NoSignParam Condition="'$(NoSignCI)' == 'true'">-NoSign</NoSignParam>
-      <NoSignParam Condition="'$(NoSignCI)' != 'true'"></NoSignParam>
-      <CIBuildParam Condition="'$(CIBuild)' == 'true'">-CIBuild</CIBuildParam>
-      <CIBuildParam Condition="'$(CIBuild)' != 'true'"></CIBuildParam>
+  <NoSignParam Condition="'$(EffectiveCIBuild)' == 'true'">-NoSign</NoSignParam>
+      <NoSignParam Condition="'$(EffectiveCIBuild)' != 'true'"></NoSignParam>
     </PropertyGroup>
     
-  <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam) $(CIBuildParam)" 
+    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam)" 
           ContinueOnError="false"
           WorkingDirectory="$(MSBuildThisFileDirectory)" />
   </Target>
@@ -112,6 +110,12 @@
     </Image>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Assets\mcpServerConfig.json">
+      <Filter>Assets</Filter>
+    </None>
+  </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <ImportGroup Label="ExtensionTargets">

src/PackageIdentity/PackageIdentity.vcxproj.filters

@@ -5,11 +5,18 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>png;jpg;jpeg;gif;bmp;ico</Extensions>
     </Filter>
+    <Filter Include="Assets">
+      <UniqueIdentifier>{B3E94A82-1F2C-4D3E-A5F6-789ABC012DEF}</UniqueIdentifier>
+      <Extensions>json;xml;txt</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="AppxManifest.xml" />
     <None Include="BuildSparsePackage.ps1" />
     <None Include="BuildSparsePackage.cmd" />
+    <None Include="Assets\mcpServerConfig.json">
+      <Filter>Assets</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Images\Square150x150Logo.png">

src/common/GPOWrapper/GPOWrapper.cpp

@@ -112,10 +112,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMousePointerCrosshairsEnabledValue());
     }
-    GpoRuleConfigured GPOWrapper::GetConfiguredCursorWrapEnabledValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCursorWrapEnabledValue());
-    }
     GpoRuleConfigured GPOWrapper::GetConfiguredPowerRenameEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredPowerRenameEnabledValue());
@@ -196,34 +192,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
     }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteOpenAIValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOpenAIValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteAzureOpenAIValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteAzureOpenAIValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteAzureAIInferenceValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteAzureAIInferenceValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteMistralValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteMistralValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteGoogleValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteGoogleValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteOllamaValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOllamaValue());
-    }
-    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteFoundryLocalValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteFoundryLocalValue());
-    }
     GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusEnabledValue());

src/common/GPOWrapper/GPOWrapper.h

@@ -35,7 +35,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredMouseHighlighterEnabledValue();
         static GpoRuleConfigured GetConfiguredMouseJumpEnabledValue();
         static GpoRuleConfigured GetConfiguredMousePointerCrosshairsEnabledValue();
-        static GpoRuleConfigured GetConfiguredCursorWrapEnabledValue();
         static GpoRuleConfigured GetConfiguredPowerRenameEnabledValue();
         static GpoRuleConfigured GetConfiguredPowerLauncherEnabledValue();
         static GpoRuleConfigured GetConfiguredQuickAccentEnabledValue();
@@ -55,13 +54,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
         static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
         static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteOpenAIValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteAzureOpenAIValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteAzureAIInferenceValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteMistralValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteGoogleValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteOllamaValue();
-        static GpoRuleConfigured GetAllowedAdvancedPasteFoundryLocalValue();
         static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
         static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
         static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();

src/common/GPOWrapper/GPOWrapper.idl

@@ -38,7 +38,6 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredMouseHighlighterEnabledValue();
             static GpoRuleConfigured GetConfiguredMouseJumpEnabledValue();
             static GpoRuleConfigured GetConfiguredMousePointerCrosshairsEnabledValue();
-            static GpoRuleConfigured GetConfiguredCursorWrapEnabledValue();
             static GpoRuleConfigured GetConfiguredMouseWithoutBordersEnabledValue();
             static GpoRuleConfigured GetConfiguredPowerRenameEnabledValue();
             static GpoRuleConfigured GetConfiguredPowerLauncherEnabledValue();
@@ -59,13 +58,6 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
             static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
             static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteOpenAIValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteAzureOpenAIValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteAzureAIInferenceValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteMistralValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteGoogleValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteOllamaValue();
-            static GpoRuleConfigured GetAllowedAdvancedPasteFoundryLocalValue();
             static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
             static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
             static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,5 +66,11 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
+
+        public static GpoRuleConfigured GetConfiguredMcpEnabledValue()
+        {
+            // MCP doesn't have GPO support yet, always return NotConfigured
+            return GpoRuleConfigured.NotConfigured;
+        }
     }
 }

src/common/LanguageModelProvider/AppUtils.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace LanguageModelProvider;
+
+internal static class AppUtils
+{
+    public static string GetThemeAssetSuffix()
+    {
+        // Default suffix for assets that are theme-agnostic today.
+        return string.Empty;
+    }
+}

src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs

@@ -2,8 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using ManagedCommon;
-using Microsoft.AI.Foundry.Local;
+using System.Globalization;
+using System.Text;
+using System.Text.Json;
 
 namespace LanguageModelProvider.FoundryLocal;
 
@@ -11,85 +12,53 @@ internal sealed class FoundryClient
 {
     public static async Task<FoundryClient?> CreateAsync()
     {
-        // First attempt with current environment
-        var client = await TryCreateClientAsync().ConfigureAwait(false);
-        if (client != null)
+        var serviceManager = FoundryServiceManager.TryCreate();
+        if (serviceManager is null)
         {
-            return client;
-        }
-
-        // If failed, refresh PATH from registry and retry once
-        // This handles cases where PowerToys was launched by MSI installer.
-        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
-        RefreshEnvironmentPath();
-
-        return await TryCreateClientAsync().ConfigureAwait(false);
-    }
-
-    private static async Task<FoundryClient?> TryCreateClientAsync()
-    {
-        try
-        {
-            Logger.LogInfo("[FoundryClient] Creating Foundry Local client");
-
-            var manager = new FoundryLocalManager();
-
-            // Check if service is already running
-            if (manager.IsServiceRunning)
-            {
-                Logger.LogInfo("[FoundryClient] Foundry service is already running");
-                return new FoundryClient(manager);
-            }
-
-            // Start the service using SDK's method
-            Logger.LogInfo("[FoundryClient] Starting Foundry service using manager.StartServiceAsync()");
-            await manager.StartServiceAsync().ConfigureAwait(false);
-
-            Logger.LogInfo("[FoundryClient] Foundry service started successfully");
-            return new FoundryClient(manager);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] Error creating client: {ex.Message}");
-            if (ex.InnerException != null)
-            {
-                Logger.LogError($"[FoundryClient] Inner exception: {ex.InnerException.Message}");
-            }
-
             return null;
         }
+
+        if (!await serviceManager.IsRunning().ConfigureAwait(false))
+        {
+            if (!await serviceManager.StartService().ConfigureAwait(false))
+            {
+                return null;
+            }
+        }
+
+        var serviceUrl = await serviceManager.GetServiceUrl().ConfigureAwait(false);
+
+        if (string.IsNullOrEmpty(serviceUrl))
+        {
+            return null;
+        }
+
+        var serviceUri = new Uri(serviceUrl, UriKind.Absolute);
+        var baseAddress = serviceUri.AbsoluteUri.EndsWith('/')
+            ? serviceUri
+            : new Uri(serviceUri, "/");
+
+        var httpClient = new HttpClient
+        {
+            BaseAddress = baseAddress,
+            Timeout = TimeSpan.FromHours(2),
+        };
+
+        var assemblyVersion = typeof(FoundryClient).Assembly.GetName().Version?.ToString() ?? "unknown";
+        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd($"foundry-local-cs-sdk/{assemblyVersion}");
+
+        return new FoundryClient(serviceManager, httpClient);
     }
 
-    private readonly FoundryLocalManager _foundryManager;
+    public FoundryServiceManager ServiceManager { get; }
+
+    private readonly HttpClient _httpClient;
     private readonly List<FoundryCatalogModel> _catalogModels = [];
 
-    private FoundryClient(FoundryLocalManager foundryManager)
+    private FoundryClient(FoundryServiceManager serviceManager, HttpClient httpClient)
     {
-        _foundryManager = foundryManager;
-    }
-
-    public Task<string?> GetServiceUrl()
-    {
-        try
-        {
-            return Task.FromResult(_foundryManager.Endpoint?.ToString());
-        }
-        catch
-        {
-            return Task.FromResult<string?>(null);
-        }
-    }
-
-    public Uri? GetServiceUri()
-    {
-        try
-        {
-            return _foundryManager.ServiceUri;
-        }
-        catch
-        {
-            return null;
-        }
+        ServiceManager = serviceManager;
+        _httpClient = httpClient;
     }
 
     public async Task<List<FoundryCatalogModel>> ListCatalogModels()
@@ -101,39 +70,20 @@ internal sealed class FoundryClient
 
         try
         {
-            Logger.LogInfo("[FoundryClient] Listing catalog models");
-            var models = await _foundryManager.ListCatalogModelsAsync().ConfigureAwait(false);
+            var response = await _httpClient.GetAsync("/foundry/list").ConfigureAwait(false);
+            response.EnsureSuccessStatusCode();
 
-            if (models != null)
+            var models = await JsonSerializer.DeserializeAsync(
+                response.Content.ReadAsStream(),
+                FoundryJsonContext.Default.ListFoundryCatalogModel).ConfigureAwait(false);
+
+            if (models is { Count: > 0 })
             {
-                foreach (var model in models)
-                {
-                    _catalogModels.Add(new FoundryCatalogModel
-                    {
-                        Name = model.ModelId ?? string.Empty,
-                        DisplayName = model.DisplayName ?? string.Empty,
-                        ProviderType = model.ProviderType ?? string.Empty,
-                        Uri = model.Uri ?? string.Empty,
-                        Version = model.Version ?? string.Empty,
-                        ModelType = model.ModelType ?? string.Empty,
-                        Publisher = model.Publisher ?? string.Empty,
-                        Task = model.Task ?? string.Empty,
-                        FileSizeMb = model.FileSizeMb,
-                        Alias = model.Alias ?? string.Empty,
-                        License = model.License ?? string.Empty,
-                        LicenseDescription = model.LicenseDescription ?? string.Empty,
-                        ParentModelUri = model.ParentModelUri ?? string.Empty,
-                        SupportsToolCalling = model.SupportsToolCalling,
-                    });
-                }
-
-                Logger.LogInfo($"[FoundryClient] Found {_catalogModels.Count} catalog models");
+                models.ForEach(_catalogModels.Add);
             }
         }
-        catch (Exception ex)
+        catch
         {
-            Logger.LogError($"[FoundryClient] Error listing catalog models: {ex.Message}");
-
             // Surfacing errors here prevents listing other providers; swallow and return cached list instead.
         }
 
@@ -142,138 +92,138 @@ internal sealed class FoundryClient
 
     public async Task<List<FoundryCachedModel>> ListCachedModels()
     {
-        try
+        var response = await _httpClient.GetAsync("/openai/models").ConfigureAwait(false);
+        response.EnsureSuccessStatusCode();
+
+        var catalogModels = await ListCatalogModels().ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        var modelIds = content
+            .Trim('[', ']')
+            .Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+            .Select(id => id.Trim('"'));
+
+        List<FoundryCachedModel> models = [];
+
+        foreach (var id in modelIds)
         {
-            Logger.LogInfo("[FoundryClient] Listing cached models");
-            var cachedModels = await _foundryManager.ListCachedModelsAsync().ConfigureAwait(false);
-            var catalogModels = await ListCatalogModels().ConfigureAwait(false);
+            var model = catalogModels.FirstOrDefault(m => m.Name == id);
+            models.Add(model != null ? new FoundryCachedModel(id, model.Alias) : new FoundryCachedModel(id, null));
+        }
 
-            List<FoundryCachedModel> models = [];
+        return models;
+    }
 
-            foreach (var model in cachedModels)
+    public async Task<FoundryDownloadResult> DownloadModel(FoundryCatalogModel model, IProgress<float>? progress, CancellationToken cancellationToken = default)
+    {
+        var models = await ListCachedModels().ConfigureAwait(false);
+
+        if (models.Any(m => m.Name == model.Name))
+        {
+            return new(true, "Model already downloaded");
+        }
+
+        return await Task.Run(
+            async () =>
             {
-                var catalogModel = catalogModels.FirstOrDefault(m => m.Name == model.ModelId);
-                var alias = catalogModel?.Alias ?? model.Alias;
-                models.Add(new FoundryCachedModel(model.ModelId ?? string.Empty, alias));
-            }
-
-            Logger.LogInfo($"[FoundryClient] Found {models.Count} cached models");
-            return models;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] Error listing cached models: {ex.Message}");
-            return [];
-        }
-    }
-
-    public async Task<bool> IsModelLoaded(string modelId)
-    {
-        try
-        {
-            var loadedModels = await _foundryManager.ListLoadedModelsAsync().ConfigureAwait(false);
-            var isLoaded = loadedModels.Any(m => m.ModelId == modelId);
-            Logger.LogInfo($"[FoundryClient] IsModelLoaded({modelId}): {isLoaded}");
-            Logger.LogInfo($"[FoundryClient] Loaded models: {string.Join(", ", loadedModels.Select(m => m.ModelId))}");
-            return isLoaded;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] IsModelLoaded exception: {ex.Message}");
-            return false;
-        }
-    }
-
-    public async Task<bool> EnsureModelLoaded(string modelId)
-    {
-        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
-
-        // Check if already loaded
-        if (await IsModelLoaded(modelId).ConfigureAwait(false))
-        {
-            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
-            return true;
-        }
-
-        // Load the model
-        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
-        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
-
-        // Verify it's loaded
-        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
-        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
-        return loaded;
-    }
-
-    public async Task EnsureRunning()
-    {
-        if (!_foundryManager.IsServiceRunning)
-        {
-            await _foundryManager.StartServiceAsync();
-        }
-    }
-
-    /// <summary>
-    /// Refreshes the PATH environment variable from the system registry.
-    /// This is necessary when tools are installed while PowerToys is running,
-    /// as the installer updates the system PATH but running processes don't see the change.
-    /// </summary>
-    private static void RefreshEnvironmentPath()
-    {
-        try
-        {
-            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");
-
-            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
-            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
-            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
-
-            var pathsToAdd = new List<string>();
-
-            if (!string.IsNullOrWhiteSpace(currentPath))
-            {
-                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
-            }
-
-            if (!string.IsNullOrWhiteSpace(userPath))
-            {
-                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in userPaths)
+                try
                 {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    var providerType = model.ProviderType.EndsWith("Local", StringComparison.OrdinalIgnoreCase)
+                        ? model.ProviderType
+                        : $"{model.ProviderType}Local";
+
+                    var downloadRequest = new FoundryDownloadBody
                     {
-                        pathsToAdd.Add(path);
+                        Model = new FoundryModelDownload
+                        {
+                            Name = model.Name,
+                            Uri = model.Uri,
+                            Publisher = model.Publisher,
+                            ProviderType = providerType,
+                            PromptTemplate = model.PromptTemplate,
+                        },
+                        Token = string.Empty,
+                        IgnorePipeReport = true,
+                    };
+
+                    var downloadBodyContext = FoundryJsonContext.Default.FoundryDownloadBody;
+                    string body = JsonSerializer.Serialize(downloadRequest, downloadBodyContext);
+
+                    using var request = new HttpRequestMessage(HttpMethod.Post, "/openai/download")
+                    {
+                        Content = new StringContent(body, Encoding.UTF8, "application/json"),
+                    };
+
+                    using var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+
+                    response.EnsureSuccessStatusCode();
+
+                    using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+                    using var reader = new StreamReader(stream);
+
+                    StringBuilder jsonBuilder = new();
+                    var collectingJson = false;
+                    var completed = false;
+
+                    while (!completed && (await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) is string line)
+                    {
+                        if (string.IsNullOrWhiteSpace(line))
+                        {
+                            continue;
+                        }
+
+                        if (line.StartsWith("Total", StringComparison.CurrentCultureIgnoreCase) &&
+                            line.Contains("Downloading", StringComparison.OrdinalIgnoreCase) &&
+                            line.Contains('%'))
+                        {
+                            var percentStr = line.Split('%')[0].Split(' ').Last();
+                            if (double.TryParse(percentStr, NumberStyles.Float, CultureInfo.CurrentCulture, out var percentage))
+                            {
+                                progress?.Report((float)(percentage / 100));
+                            }
+                        }
+                        else if (line.Contains("[DONE]", StringComparison.OrdinalIgnoreCase) ||
+                                 line.Contains("All Completed", StringComparison.OrdinalIgnoreCase))
+                        {
+                            collectingJson = true;
+                        }
+                        else if (collectingJson && line.TrimStart().StartsWith('{'))
+                        {
+                            jsonBuilder.AppendLine(line);
+                        }
+                        else if (collectingJson && jsonBuilder.Length > 0)
+                        {
+                            jsonBuilder.AppendLine(line);
+                            if (line.Trim() == "}")
+                            {
+                                completed = true;
+                            }
+                        }
+                    }
+
+                    var downloadResultContext = FoundryJsonContext.Default.FoundryDownloadResult;
+                    var jsonPayload = jsonBuilder.Length > 0 ? jsonBuilder.ToString() : null;
+
+                    if (jsonPayload is null)
+                    {
+                        return new FoundryDownloadResult(false, "No completion response received from server.");
+                    }
+
+                    try
+                    {
+                        return JsonSerializer.Deserialize(jsonPayload, downloadResultContext)
+                               ?? new FoundryDownloadResult(false, "Failed to parse completion response.");
+                    }
+                    catch (JsonException ex)
+                    {
+                        return new FoundryDownloadResult(false, $"Failed to parse completion response: {ex.Message}");
                     }
                 }
-            }
-
-            if (!string.IsNullOrWhiteSpace(machinePath))
-            {
-                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in machinePaths)
+                catch (Exception e)
                 {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
+                    return new FoundryDownloadResult(false, e.Message);
                 }
-            }
-
-            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
-
-            if (currentPath != newPath)
-            {
-                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
-                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
-            }
-            else
-            {
-                Logger.LogInfo("[FoundryClient] PATH is already up to date");
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
-        }
+            },
+            cancellationToken).ConfigureAwait(false);
     }
 }

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadBody.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed class FoundryDownloadBody
+{
+    [JsonPropertyName("Model")]
+    public required FoundryModelDownload Model { get; init; }
+
+    [JsonPropertyName("token")]
+    public required string Token { get; init; }
+
+    [JsonPropertyName("IgnorePipeReport")]
+    public required bool IgnorePipeReport { get; init; }
+}

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadResult.cs

@@ -2,6 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+namespace LanguageModelProvider.FoundryLocal;
 
-public record ReloadFinishedMessage();
+internal sealed record FoundryDownloadResult(bool Success, string? ErrorMessage);

src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs

@@ -12,6 +12,9 @@ namespace LanguageModelProvider.FoundryLocal;
     WriteIndented = false)]
 [JsonSerializable(typeof(FoundryCatalogModel))]
 [JsonSerializable(typeof(List<FoundryCatalogModel>))]
+[JsonSerializable(typeof(FoundryDownloadResult))]
+[JsonSerializable(typeof(FoundryModelDownload))]
+[JsonSerializable(typeof(FoundryDownloadBody))]
 internal sealed partial class FoundryJsonContext : JsonSerializerContext
 {
 }

src/common/LanguageModelProvider/FoundryLocal/FoundryModelDownload.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed class FoundryModelDownload
+{
+    [JsonPropertyName("Name")]
+    public required string Name { get; init; }
+
+    [JsonPropertyName("Uri")]
+    public required string Uri { get; init; }
+
+    [JsonPropertyName("Publisher")]
+    public required string Publisher { get; init; }
+
+    [JsonPropertyName("ProviderType")]
+    public required string ProviderType { get; init; }
+
+    [JsonPropertyName("PromptTemplate")]
+    public required PromptTemplate? PromptTemplate { get; init; }
+}

src/common/LanguageModelProvider/FoundryLocal/FoundryServiceManager.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed class FoundryServiceManager
+{
+    public static FoundryServiceManager? TryCreate()
+    {
+        return IsAvailable() ? new FoundryServiceManager() : null;
+    }
+
+    private static bool IsAvailable()
+    {
+        using var process = new Process();
+        process.StartInfo.FileName = "where";
+        process.StartInfo.Arguments = "foundry";
+        process.StartInfo.RedirectStandardOutput = true;
+        process.StartInfo.RedirectStandardError = true;
+        process.StartInfo.UseShellExecute = false;
+        process.StartInfo.CreateNoWindow = true;
+        process.Start();
+        process.WaitForExit();
+        return process.ExitCode == 0;
+    }
+
+    private static string? GetUrl(string output)
+    {
+        var match = Regex.Match(output, @"https?:\/\/[^\/]+:\d+");
+        return match.Success ? match.Value : null;
+    }
+
+    public async Task<string?> GetServiceUrl()
+    {
+        var status = await Utils.RunFoundryWithArguments("service status").ConfigureAwait(false);
+
+        if (status.ExitCode != 0 || string.IsNullOrWhiteSpace(status.Output))
+        {
+            return null;
+        }
+
+        return GetUrl(status.Output);
+    }
+
+    public async Task<bool> IsRunning()
+    {
+        var url = await GetServiceUrl().ConfigureAwait(false);
+        return url is not null;
+    }
+
+    public async Task<bool> StartService(int maxWaitSeconds = 30)
+    {
+        if (await IsRunning().ConfigureAwait(false))
+        {
+            return true;
+        }
+
+        // Start foundry service (fire-and-forget, don't wait for the process to exit)
+        _ = Task.Run(() => Utils.RunFoundryWithArguments("service start"));
+
+        // Poll to check if service is running
+        int elapsedSeconds = 0;
+        while (elapsedSeconds < maxWaitSeconds)
+        {
+            await Task.Delay(1000).ConfigureAwait(false);
+            elapsedSeconds++;
+
+            if (await IsRunning().ConfigureAwait(false))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/common/LanguageModelProvider/FoundryLocal/Utils.cs

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal static class Utils
+{
+    public static async Task<(string? Output, string? Error, int ExitCode)> RunFoundryWithArguments(string arguments)
+    {
+        try
+        {
+            using var process = new Process();
+            process.StartInfo.FileName = "foundry";
+            process.StartInfo.Arguments = arguments;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.RedirectStandardError = true;
+            process.StartInfo.UseShellExecute = false;
+            process.StartInfo.CreateNoWindow = true;
+
+            process.Start();
+
+            string? output = await process.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
+            string? error = await process.StandardError.ReadToEndAsync().ConfigureAwait(false);
+
+            await process.WaitForExitAsync().ConfigureAwait(false);
+
+            return (output, error, process.ExitCode);
+        }
+        catch
+        {
+            return (null, null, -1);
+        }
+    }
+}

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -2,9 +2,13 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.ClientModel;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using LanguageModelProvider.FoundryLocal;
-using ManagedCommon;
 using Microsoft.Extensions.AI;
 using OpenAI;
 
@@ -12,59 +16,55 @@ namespace LanguageModelProvider;
 
 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
-    private FoundryClient? _foundryClient;
-    private IEnumerable<FoundryCatalogModel>? _catalogModels;
+    private IEnumerable<ModelDetails>? _downloadedModels;
+    private IEnumerable<ModelDetails>? _catalogModels;
+    private FoundryClient? _foundryManager;
     private string? _serviceUrl;
 
     public static FoundryLocalModelProvider Instance { get; } = new();
 
     public string Name => "FoundryLocal";
 
+    public HardwareAccelerator ModelHardwareAccelerator => HardwareAccelerator.FOUNDRYLOCAL;
+
     public string ProviderDescription => "The model will run locally via Foundry Local";
 
-    public IChatClient? GetIChatClient(string modelId)
-    {
-        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
-        InitializeAsync().GetAwaiter().GetResult();
+    public string UrlPrefix => "fl://";
 
-        if (string.IsNullOrWhiteSpace(modelId))
+    public string Icon => $"fl{AppUtils.GetThemeAssetSuffix()}.svg";
+
+    public string Url => _serviceUrl ?? string.Empty;
+
+    public string GetDetailsUrl(ModelDetails details)
+    {
+        throw new NotImplementedException();
+    }
+
+    public IChatClient? GetIChatClient(string url)
+    {
+        try
+        {
+            InitializeAsync().GetAwaiter().GetResult();
+        }
+        catch
         {
-            Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
             return null;
         }
 
-        // Check if model is in catalog
-        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
-        if (!isInCatalog)
+        if (string.IsNullOrWhiteSpace(_serviceUrl))
         {
-            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
-            Logger.LogError($"[FoundryLocal] {errorMessage}");
-            throw new InvalidOperationException(errorMessage);
+            return null;
         }
 
-        // Ensure the model is loaded before returning chat client
-        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
-        if (!isLoaded)
+        var modelId = url.Split('/').LastOrDefault();
+        if (string.IsNullOrWhiteSpace(modelId))
         {
-            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
-            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
+            return null;
         }
 
-        // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
-        var baseUri = _foundryClient.GetServiceUri();
-        if (baseUri == null)
-        {
-            const string message = "Foundry Local service URL is not available. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
-        }
-
-        var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
-        Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
-
         return new OpenAIClient(
             new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = endpointUri, NetworkTimeout = TimeSpan.FromMinutes(5) })
+            new OpenAIClientOptions { Endpoint = new Uri($"{_serviceUrl}/v1") })
             .GetChatClient(modelId)
             .AsIChatClient();
     }
@@ -90,67 +90,117 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
         return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
     }
 
-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default)
+    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
     {
+        if (ignoreCached)
+        {
+            Reset();
+        }
+
         await InitializeAsync(cancelationToken);
 
-        if (_foundryClient == null)
+        return _downloadedModels ?? [];
+    }
+
+    public IEnumerable<ModelDetails> GetAllModelsInCatalog()
+    {
+        return _catalogModels ?? [];
+    }
+
+    public async Task<bool> DownloadModel(ModelDetails modelDetails, IProgress<float>? progress, CancellationToken cancellationToken = default)
+    {
+        if (_foundryManager == null)
         {
-            return Array.Empty<ModelDetails>();
+            return false;
         }
 
-        var cachedModels = await _foundryClient.ListCachedModels();
-        List<ModelDetails> downloadedModels = [];
-
-        foreach (var model in cachedModels)
+        if (modelDetails.ProviderModelDetails is not FoundryCatalogModel model)
         {
-            Logger.LogInfo($"[FoundryLocal] Adding unmatched cached model: {model.Name}");
-            downloadedModels.Add(new ModelDetails
-            {
-                Id = $"fl-{model.Name}",
-                Name = model.Name,
-                Url = $"fl://{model.Name}",
-                Description = $"{model.Name} running locally with Foundry Local",
-                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-                ProviderModelDetails = model,
-            });
+            return false;
         }
 
-        return downloadedModels;
+        return (await _foundryManager.DownloadModel(model, progress, cancellationToken)).Success;
+    }
+
+    private void Reset()
+    {
+        _downloadedModels = null;
+        _ = InitializeAsync();
     }
 
     private async Task InitializeAsync(CancellationToken cancelationToken = default)
     {
-        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
+        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
         {
-            await _foundryClient.EnsureRunning().ConfigureAwait(false);
             return;
         }
 
-        Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryClient ??= await FoundryClient.CreateAsync();
+        _foundryManager ??= await FoundryClient.CreateAsync();
 
-        if (_foundryClient == null)
+        if (_foundryManager == null)
         {
-            const string message = "Foundry Local client could not be created. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
+            return;
         }
 
-        _serviceUrl ??= await _foundryClient.GetServiceUrl();
-        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
+        _serviceUrl ??= await _foundryManager.ServiceManager.GetServiceUrl();
 
-        var catalogModels = await _foundryClient.ListCatalogModels();
-        Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
-        _catalogModels = catalogModels;
+        if (_catalogModels == null || !_catalogModels.Any())
+        {
+            _catalogModels = (await _foundryManager.ListCatalogModels()).Select(ToModelDetails).ToArray();
+        }
+
+        var cachedModels = await _foundryManager.ListCachedModels();
+
+        List<ModelDetails> downloadedModels = [];
+
+        foreach (var model in _catalogModels)
+        {
+            var cachedModel = cachedModels.FirstOrDefault(m => m.Name == model.Name);
+
+            if (cachedModel != default)
+            {
+                model.Id = $"{UrlPrefix}{cachedModel.Id}";
+                downloadedModels.Add(model);
+                cachedModels.Remove(cachedModel);
+            }
+        }
+
+        foreach (var model in cachedModels)
+        {
+            downloadedModels.Add(new ModelDetails
+            {
+                Id = $"fl-{model.Name}",
+                Name = model.Name,
+                Url = $"{UrlPrefix}{model.Name}",
+                Description = $"{model.Name} running locally with Foundry Local",
+                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+                SupportedOnQualcomm = true,
+                ProviderModelDetails = model,
+            });
+        }
+
+        _downloadedModels = downloadedModels;
+    }
+
+    private ModelDetails ToModelDetails(FoundryCatalogModel model)
+    {
+        return new ModelDetails
+        {
+            Id = $"fl-{model.Name}",
+            Name = model.Name,
+            Url = $"{UrlPrefix}{model.Name}",
+            Description = $"{model.Alias} running locally with Foundry Local",
+            HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+            Size = model.FileSizeMb * 1024 * 1024,
+            SupportedOnQualcomm = true,
+            License = model.License?.ToLowerInvariant() ?? string.Empty,
+            ProviderModelDetails = model,
+        };
     }
 
     public async Task<bool> IsAvailable()
     {
-        Logger.LogInfo("[FoundryLocal] Checking availability");
         await InitializeAsync();
-        var available = _foundryClient != null;
-        Logger.LogInfo($"[FoundryLocal] Available: {available}");
-        return available;
+        return _foundryManager != null;
     }
 }

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -10,11 +10,21 @@ public interface ILanguageModelProvider
 {
     string Name { get; }
 
+    string UrlPrefix { get; }
+
+    string Icon { get; }
+
+    HardwareAccelerator ModelHardwareAccelerator { get; }
+
     string ProviderDescription { get; }
 
-    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
 
-    IChatClient? GetIChatClient(string modelId);
+    IChatClient? GetIChatClient(string url);
 
     string GetIChatClientString(string url);
+
+    string GetDetailsUrl(ModelDetails details);
+
+    string Url { get; }
 }

src/common/LanguageModelProvider/LanguageModelProvider.csproj

@@ -10,11 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.AI" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-    <PackageReference Include="Microsoft.AI.Foundry.Local" />
     <PackageReference Include="OpenAI" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
 </Project>

src/common/LanguageModelProvider/LanguageModelService.cs

@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Concurrent;
+using Microsoft.Extensions.AI;
+
+namespace LanguageModelProvider;
+
+public sealed class LanguageModelService
+{
+    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
+
+    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
+    {
+        ArgumentNullException.ThrowIfNull(providers);
+
+        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var provider in providers)
+        {
+            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
+            {
+                _providersByPrefix[provider.UrlPrefix] = provider;
+            }
+        }
+    }
+
+    public static LanguageModelService CreateDefault()
+    {
+        return new LanguageModelService(new[]
+        {
+            FoundryLocalModelProvider.Instance,
+        });
+    }
+
+    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
+
+    public bool RegisterProvider(ILanguageModelProvider provider)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+
+        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
+        {
+            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
+        }
+
+        _providersByPrefix[provider.UrlPrefix] = provider;
+        return true;
+    }
+
+    public ILanguageModelProvider? GetProviderFor(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return provider;
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
+    {
+        List<ModelDetails> models = [];
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
+            models.AddRange(providerModels);
+        }
+
+        return models;
+    }
+
+    public IChatClient? GetClient(ModelDetails model)
+    {
+        if (model is null)
+        {
+            return null;
+        }
+
+        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
+        return GetClient(reference);
+    }
+
+    public IChatClient? GetClient(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        var provider = GetProviderFor(modelReference);
+
+        return provider?.GetIChatClient(modelReference);
+    }
+}