[FancyZones Editor] Fix layout selection after deleting custom (#28219)

* Adding missing resource string

* Modify value

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -50,6 +50,7 @@ body:
       - Always on Top
       - Awake
       - ColorPicker
+      - Crop and Lock
       - FancyZones
       - FancyZones Editor 
       - File Locksmith 

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -24,6 +24,7 @@ body:
     - Always on Top
     - Awake
     - ColorPicker
+    - Crop and Lock
     - FancyZones
     - FancyZones Editor
     - File Locksmith

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

@@ -15,6 +15,8 @@ edwinzap
 Essey
 Garside
 Gershaft
+Gokce
+Guo
 hallatore
 Harmath
 Hemmerlein
@@ -22,10 +24,13 @@ Huynh
 Jaswal
 jefflord
 Kamra
+Kantarci
 Karthick
+kevinguo
 Krigun
 Luecking
 Mahalingam
+Mikhayelyan
 mshtang
 Myrvold
 naveensrinivasan
@@ -33,6 +38,7 @@ nVidia
 Ponten
 Pooja
 robmen
+robmikh
 Schoen
 skycommand
 snickler

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

@@ -3,11 +3,11 @@
 (?:^|/)(?i)LICEN[CS]E
 (?:^|/)3rdparty/
 (?:^|/)go\.sum$
-(?:^|/)FilePreviewCommon/customLanguages/
-(?:^|/)FilePreviewCommon/generateLanguagesJson.html
-(?:^|/)FilePreviewCommon/index.html
-(?:^|/)FilePreviewCommon/monaco_languages.json
-(?:^|/)FilePreviewCommon/monacoSpecialLanguages.js
+(?:^|/)FilePreviewCommon/Assets/Monaco/customLanguages/
+(?:^|/)FilePreviewCommon/Assets/Monaco/generateLanguagesJson.html
+(?:^|/)FilePreviewCommon/Assets/Monaco/index.html
+(?:^|/)FilePreviewCommon/Assets/Monaco/monaco_languages.json
+(?:^|/)FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js
 (?:^|/)monacoSRC/
 (?:^|/)package(?:-lock|)\.json$
 (?:^|/)timezones\.json$
@@ -98,7 +98,7 @@
 ^src/common/logger/logger\.vcxproj\.filters$
 ^src/common/notifications/BackgroundActivatorDLL/BackgroundActivator\.vcxproj\.filters$
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
-^src/modules/colorPicker/ColorPickerUI/Resources/colorPicker\.cur$
+^src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker\.cur$
 ^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$
 ^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$
 ^src/modules/imageresizer/dll/ImageResizerExt\.rgs$

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

@@ -1,28 +1,15 @@
 aaaa
-AAAAEF
-AAB
-AABAD
-AACB
-AACD
-AAD
-AADF
-abap
 abcdefghjkmnpqrstuvxyz
-ABE
 abgr
 abi
 ABlocked
 ABOUTBOX
 Abug
-ACA
 accctrl
 Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 accessibilityinsights
-ACDB
-ACFC
-ACFF
 Acl
 aclapi
 AClient
@@ -40,18 +27,7 @@ adml
 admx
 advapi
 advfirewall
-AEAA
-AEAD
-AECC
-AED
-AEE
-AEEB
-AFAE
-AFAEFC
-AFDA
-AFE
 AFeature
-AFFE
 AFFINETRANSFORM
 AFX
 AGGREGATABLE
@@ -77,7 +53,6 @@ ansicolor
 ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
-AOT
 APARTMENTTHREADED
 APeriod
 apidl
@@ -87,7 +62,6 @@ Apm
 APPBARDATA
 appdata
 APPEXECLINK
-APPIDS
 appium
 Applets
 Applicationcan
@@ -144,36 +118,14 @@ AValid
 awakeness
 AWAYMODE
 AYUV
-azcli
 azman
-azor
 backtracer
-BAF
 bak
-BBE
 bbwe
-BCA
-BCB
-BCCE
-BCCEA
 bck
-BDB
-BDBAD
-BDCC
-BDDF
-BDFB
-BEAA
-BEB
-BEEAADF
-BEEC
-BEFA
+BESTEFFORT
 betadele
 betsegaw
-BFC
-BFDE
-BFEB
-BFF
-BFFA
 BGR
 bgra
 bhid
@@ -203,6 +155,7 @@ BOKMAL
 bootstrapper
 BOOTSTRAPPERINSTALLFOLDER
 Bopomofo
+bostrot
 BOTTOMALIGN
 BPBF
 bpmf
@@ -228,48 +181,28 @@ BValue
 byapp
 BYPOSITION
 bytearray
-CABD
 CALG
 callbackptr
 calpwstr
-cameligo
 Cangjie
 CANRENAME
 CAPTUREBLT
 CAPTURECHANGED
 CAtl
-CBA
-CBB
-CBF
-CCCCDE
 cch
 CCHDEVICENAME
 CCHFORMNAME
 CCom
 CContext
-CDAC
-CDBF
-CDCE
-CDD
-CDE
 cdecl
 CDeclaration
 CDEF
 cdpx
-CEAF
-CEBAC
-CEBD
-CECB
 CElems
 CENTERALIGN
 ceq
 certlm
 certmgr
-CFAADB
-CFBBF
-CFEE
-CFFEE
-CFFF
 cguid
 CHANGECBCHAIN
 changecursor
@@ -347,7 +280,6 @@ comsupp
 comsuppw
 comsuppwd
 comutil
-concrt
 CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
@@ -415,44 +347,31 @@ CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
 cziplib
-DAA
 Dac
 dacl
-DAF
 damienleroy
 DARKPURPLE
 DARKTEAL
 DARKYELLOW
 datareader
+datatracker
 Datavalue
 dataversion
 DATAW
 davidegiacometti
 Dayof
-DBAE
-DBB
-DBBDA
-DBDE
 Dbg
 Dbghelp
 DBLCLKS
 DBLEPSILON
-DCAB
 DCapture
 DCBA
-DCBC
-DCCB
-DCEFCB
-DCF
 DCOM
 dcommon
 dcomp
-dcompi
 DComposition
 dcr
 dcs
-DDCDD
-DDCE
 DDEIf
 DDevice
 ddf
@@ -463,7 +382,6 @@ debugbreak
 DECLAR
 declspec
 decryptor
-DED
 Dedup
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -485,7 +403,6 @@ DENORMAL
 Deondre
 depersist
 deprioritized
-depsfileslistspath
 deref
 DESKTOPABSOLUTEEDITING
 DESKTOPABSOLUTEPARSING
@@ -500,9 +417,6 @@ DEVMODEW
 DEVMON
 devpkey
 DEVSOURCE
-DFAB
-DFB
-DFBEA
 DIIRFLAG
 dimm
 directshow
@@ -520,7 +434,7 @@ dllexport
 dllhost
 dllmain
 DNLEN
-Dns
+dns
 DONOTROUND
 DONTVALIDATEPATH
 dotnet
@@ -549,13 +463,11 @@ dvr
 DVSD
 DVSL
 DVTARGETDEVICE
-DWINRT
 dwl
 dwm
 dwmapi
 DWMCOLORIZATIONCOLORCHANGED
 DWMCOMPOSITIONCHANGED
-dwmcorei
 DWMNCRENDERINGCHANGED
 Dwmp
 DWMSENDICONICLIVEPREVIEWBITMAP
@@ -571,41 +483,13 @@ dxgi
 dxgidebug
 dxgiformat
 dxguid
-EAAFE
-EABF
-EAC
-EADC
-EAF
-EBCF
-EBD
-EBE
-ecl
 ecount
 EData
-EDB
-EDCCC
-EDFAE
 Edid
-edis
 EDITKEYBOARD
 editkeyboardwindow
 EDITSHORTCUTS
 editshortcutswindow
-edshift
-EEA
-EEB
-EEBBE
-EEBD
-EED
-EEDA
-EEEE
-EEF
-EEFA
-EFB
-EFC
-EFDD
-EFE
-EFFEFC
 EFile
 eip
 ekus
@@ -634,7 +518,6 @@ ERRORTITLE
 ESettings
 esize
 esrp
-estructuredtext
 etl
 etstat
 etw
@@ -672,46 +555,14 @@ EXTENDEDKEY
 EXTENDEDVERBS
 EXTRINSICPROPERTIES
 eyetracker
-FABC
-fabricbot
-FAEDDA
-FAF
-FAFD
 fancymouse
 fancyzone
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 Farbraum
 FARPROC
-FBB
-FBC
-FBDE
-FBF
-FCAE
-FCB
-FCCFF
-FCD
-FCDB
-FCDD
-FCE
-FDB
-FDBF
-FDC
-FDCD
-FDE
-FDEF
-FDF
 fdw
-FECF
-FEDF
-FEEF
 feimage
-FFB
-FFBCF
-FFBE
-FFDDD
-FFEB
-FFEBEF
 fff
 fileapi
 FILEEXPLORER
@@ -755,6 +606,7 @@ FZE
 gabime
 GAC
 gacutil
+Galaxi
 Gaeilge
 Gaidhlig
 GBarm
@@ -767,6 +619,7 @@ gcode
 gdi
 gdiplus
 GDISCALED
+GEmoji
 GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
@@ -788,11 +641,12 @@ GPOCA
 gpp
 GPT
 gpu
-graphql
 GSM
 gtm
 gui
+guiddata
 guiddef
+guidgenerator
 GUITHREADINFO
 GValue
 gwl
@@ -800,7 +654,6 @@ GWLP
 HACCEL
 handlekeyboardhookevent
 hangeul
-Hankaku
 hanselman
 Hanzi
 Hardlines
@@ -821,6 +674,7 @@ hcblack
 HCERTSTORE
 HCRYPTHASH
 HCRYPTPROV
+hcursor
 hcwhite
 hdc
 hdrop
@@ -855,6 +709,7 @@ HKL
 HKLM
 HKPD
 HKU
+hlaueriksson
 HLOCAL
 HMD
 hmenu
@@ -865,6 +720,7 @@ HOLDESC
 HOMEPATH
 homljgmgpmcbpjbnjpfijnhipfkiclkd
 HOOKPROC
+Horvalds
 Hostbackdropbrush
 hotkeycontrol
 hotkeys
@@ -887,7 +743,7 @@ hstring
 hsv
 htcfreek
 HTCLIENT
-HTHUMBNAIL
+hthumbnail
 HTOUCHINPUT
 HTTRANSPARENT
 HVal
@@ -919,6 +775,7 @@ IDR
 idx
 IDXGI
 IEnum
+ietf
 IExec
 IEXPLORE
 Iface
@@ -959,6 +816,7 @@ INPUTHARDWARE
 INPUTKEYBOARD
 INPUTLANGCHANGED
 INPUTMOUSE
+inputparser
 INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
@@ -1018,7 +876,6 @@ JPN
 jpnime
 Jsons
 jsonval
-julia
 junja
 jxr
 jyuwono
@@ -1043,11 +900,9 @@ keynum
 keyremaps
 Keytool
 keyup
-Kfiles
 KILLFOCUS
 killrunner
 Knownfolders
-kotlin
 KSPROPERTY
 Kybd
 LAlt
@@ -1075,11 +930,11 @@ LEFTSCROLLBAR
 LEFTUP
 lego
 len
+lepo
 LError
 Lessthan
 LEVELID
 LExit
-lexon
 lhs
 lhwnd
 LIBID
@@ -1271,6 +1126,7 @@ MOVESIZESTART
 mozilla
 mpmc
 MRM
+MRT
 mru
 mrw
 msbuild
@@ -1278,7 +1134,6 @@ msc
 msclr
 mscorlib
 msdata
-msdax
 msedge
 MSGFLT
 MSIFASTINSTALL
@@ -1295,7 +1150,6 @@ msrc
 msstore
 mst
 msvc
-msvcp
 MTND
 Mul
 MULTIPLEUSE
@@ -1305,7 +1159,6 @@ mwb
 MWBEx
 myfile
 MYICON
-mysql
 NAMECHANGE
 nameof
 namespaceanddescendants
@@ -1355,7 +1208,6 @@ NIF
 nint
 NLD
 NLog
-nls
 NLSTEXT
 NNN
 NOACTIVATE
@@ -1431,6 +1283,7 @@ odbccp
 Oem
 officehubintl
 ofs
+oid
 oldcolor
 olditem
 oldnewthing
@@ -1484,7 +1337,6 @@ PARENTRELATIVEPARSING
 PArgb
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pascaligo
 pasteplain
 PATCOPY
 pathcch
@@ -1526,7 +1378,6 @@ pfn
 pfo
 pft
 pgp
-pgsql
 pguid
 PHANDLE
 phbm
@@ -1554,12 +1405,10 @@ Pnp
 Popups
 POPUPWINDOW
 posix
-postiats
 poweraccent
 powerlauncher
 POWEROCR
 powerpreview
-powerquery
 powerrename
 POWERRENAMECONTEXTMENU
 powerrenameinput
@@ -1601,9 +1450,9 @@ printmanagement
 prm
 proactively
 PROCESSKEY
+processthreadsapi
 PRODEXT
 PRODUCTVERSION
-productwxspath
 Progman
 programdata
 PROGRAMFILES
@@ -1631,6 +1480,7 @@ ptc
 ptd
 PTOKEN
 PToy
+ptrun
 ptstr
 pui
 PULONG
@@ -1675,12 +1525,13 @@ RCtrl
 READMODE
 READOBJECTS
 READWRITE
+recents
 RECTDESTINATION
 RECTL
 rectp
 rects
+RECTSOURCE
 redirectedfrom
-redis
 Redist
 redistributable
 reencode
@@ -1713,11 +1564,13 @@ REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
 remoteip
-Removedir
 Removelnk
 renamable
 RENAMEONCOLLISION
 Renamer
+reparent
+reparented
+reparenting
 reparse
 reportbug
 requery
@@ -1763,6 +1616,7 @@ roslyn
 roundf
 ROUNDSMALL
 Rpc
+rpcrt
 RRF
 rrr
 RSAT
@@ -1779,7 +1633,6 @@ rungameid
 RUNLEVEL
 runsettings
 runtimeclass
-runtimedepsjsonpath
 runtimeobject
 runtimepack
 runtimes
@@ -1887,6 +1740,7 @@ SHOWNOACTIVATE
 SHOWNORMAL
 SHOWWINDOW
 shtypes
+sia
 SIATTRIBFLAGS
 SICHINT
 sid
@@ -1906,6 +1760,7 @@ SIZENWSE
 sizeread
 SIZEWE
 SKIPOWNPROCESS
+skttl
 sku
 SLGP
 sln
@@ -2021,7 +1876,6 @@ SYSMENU
 SYSTEMAPPS
 systemroot
 SYSTEMTIME
-systemverilog
 sysvol
 Tadele
 talynone
@@ -2040,8 +1894,8 @@ taskbar
 taskkill
 tasklist
 taskschd
+TBM
 tchar
-tcl
 Tcollab
 tcp
 tcs
@@ -2064,7 +1918,6 @@ textblock
 TEXTEXTRACTOR
 TEXTINCLUDE
 tgz
-themeresources
 THH
 THICKFRAME
 THISCOMPONENT
@@ -2115,9 +1968,7 @@ TYPESHORTCUT
 UAC
 UAL
 uap
-uby
 udit
-Udk
 Udp
 uefi
 UHash
@@ -2152,6 +2003,7 @@ unregistering
 unremapped
 unsubscribe
 unvirtualized
+unwide
 UOffset
 UOI
 Updatelayout
@@ -2162,6 +2014,7 @@ USEDEFAULT
 USEFILEATTRIBUTES
 USERDATA
 USERDOMAIN
+Userenv
 userprofile
 USESHOWWINDOW
 USESTDHANDLES
@@ -2175,18 +2028,16 @@ uxtheme
 UYVY
 vabdq
 validmodulename
+valuegenerator
 Vanara
 variantassignment
 vcamp
-vccorlib
 vcdl
 vcgtq
 VCINSTALLDIR
 vcm
-vcomp
 Vcpkg
 VCRT
-vcruntime
 vcvars
 VDesktop
 vdi
@@ -2299,7 +2150,7 @@ WINL
 winlogon
 winmd
 winmm
-WINNT
+winnt
 winres
 winrt
 winsdk
@@ -2344,8 +2195,8 @@ workspaces
 wox
 wparam
 wpf
-wpfdepsjsonpath
 wpftmp
+wpfui
 wpr
 wprp
 wql
@@ -2371,18 +2222,17 @@ WTS
 wtsapi
 WTSAT
 Wubi
-wuceffectsi
 WVC
 Wwan
 Wwanpp
 XAttribute
 XAxis
+xbf
 Xbox
 XBUTTON
 XBUTTONDBLCLK
 XBUTTONDOWN
 XBUTTONUP
-xcopy
 XDocument
 XDOWN
 XElement
@@ -2400,14 +2250,15 @@ XStr
 XUP
 XVIRTUALSCREEN
 YAxis
+ycv
 Yeet
 YIncrement
 yinle
 yinwang
 yinyue
 YOffset
+Youdao
 YPels
-ypescript
 YResolution
 YStr
 YUY

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

@@ -115,12 +115,14 @@ TestCase\("[^"]+"
 \\Registry
 \\registry
 \\reinstall
+\\release
 \\Resize
 \\resource
 \\Resources
 \\restart
 \\restore
 \\result
+\\robmikh
 \\rotating
 \\runner
 \\runtimes

.github/policies/resourceManagement.yml

@@ -192,6 +192,29 @@ configuration:
       - addLabel:
           label: Needs-Author-Feedback
       description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/helped'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Member
+        - activitySenderHasAssociation:
+            association: Collaborator
+      then:
+      - removeLabel:
+          label: Needs-Triage
+      - removeLabel:
+          label: Needs-Team-Response
+      - addLabel:
+          label: Resolution-Helped User
+      - addReply:
+          reply: This issue is now marked as resolved. If you have any follow-up questions, please don't hesitate to ask. You can find out more about PowerToys functionalities in our [end-user documentation](https://aka.ms/powertoy-docs].
+      - closeIssue
+      description: 
     - if:
       - payloadType: Issue_Comment
       - commentContains:

.gitignore

@@ -345,3 +345,6 @@ src/common/Telemetry/*.etl
 /src/modules/previewpane/SvgThumbnailProvider/$(SolutionDir)$(Platform)/$(Configuration)/modules/FileExplorerPreview/SvgThumbnailProvider.xml
 /src/modules/powerrename/ui/RCa24464
 /src/modules/powerrename/ui/RCb24464
+
+# Generated installer file for Monaco source files.
+/installer/PowerToysSetup/MonacoSRC.wxs

.pipelines/ESRPSigning_core.json

@@ -26,157 +26,161 @@
                 "PowerToys.GPOWrapperProjection.dll",
                 "PowerToys.AllExperiments.dll",
 
-                "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTop.exe",
-                "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTopModuleInterface.dll",
+                "PowerToys.AlwaysOnTop.exe",
+                "PowerToys.AlwaysOnTopModuleInterface.dll",
                 
-                "modules\\ColorPicker\\PowerToys.ColorPicker.dll",
-                "modules\\ColorPicker\\PowerToys.ColorPickerUI.dll",
-                "modules\\ColorPicker\\PowerToys.ColorPickerUI.exe",
+                "PowerToys.ColorPicker.dll",
+                "PowerToys.ColorPickerUI.dll",
+                "PowerToys.ColorPickerUI.exe",
 
-                "modules\\PowerOCR\\PowerToys.PowerOCRModuleInterface.dll",
-                "modules\\PowerOCR\\PowerToys.PowerOCR.dll",
-                "modules\\PowerOCR\\PowerToys.PowerOCR.exe",
+                "PowerToys.CropAndLockModuleInterface.dll",
+                "PowerToys.CropAndLock.exe",
 
-                "modules\\PastePlain\\PowerToys.PastePlainModuleInterface.dll",
+                "PowerToys.PowerOCRModuleInterface.dll",
+                "PowerToys.PowerOCR.dll",
+                "PowerToys.PowerOCR.exe",
 
-                "modules\\Awake\\PowerToys.AwakeModuleInterface.dll",
-                "modules\\Awake\\PowerToys.Awake.exe",
-                "modules\\Awake\\PowerToys.Awake.dll",
+                "PowerToys.PastePlainModuleInterface.dll",
 
-                "modules\\FancyZones\\fancyzones.dll",
-                "modules\\FancyZones\\PowerToys.FancyZonesEditor.exe",
-                "modules\\FancyZones\\PowerToys.FancyZonesEditor.dll",
-                "modules\\FancyZones\\PowerToys.FancyZonesModuleInterface.dll",
-                "modules\\FancyZones\\PowerToys.FancyZones.exe",
+                "PowerToys.AwakeModuleInterface.dll",
+                "PowerToys.Awake.exe",
+                "PowerToys.Awake.dll",
 
-                "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandler.dll",
-                "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandler.exe",
-                "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandlerCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProvider.dll",
-                "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProvider.exe",
-                "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProviderCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.ManagedTelemetry.dll",
-                "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandler.dll",
-                "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandler.exe",
-                "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandlerCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandler.dll",
-                "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandler.exe",
-                "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandlerCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandler.dll",
-                "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandler.exe",
-                "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandlerCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProvider.dll",
-                "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProvider.exe",
-                "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProviderCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.powerpreview.dll",
-                "modules\\FileExplorerPreview\\PowerToys.PreviewHandlerCommon.dll",
-                "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProvider.dll",
-                "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProvider.exe",
-                "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProviderCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandler.dll",
-                "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandler.exe",
-                "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandlerCpp.dll",
-                "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProvider.dll",
-                "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProvider.exe",
-                "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProviderCpp.dll",
+                "fancyzones.dll",
+                "PowerToys.FancyZonesEditor.exe",
+                "PowerToys.FancyZonesEditor.dll",
+                "PowerToys.FancyZonesModuleInterface.dll",
+                "PowerToys.FancyZones.exe",
 
-                "modules\\Hosts\\PowerToys.HostsModuleInterface.dll",
-                "modules\\Hosts\\PowerToys.Hosts.dll",
-                "modules\\Hosts\\PowerToys.Hosts.exe",
+                "PowerToys.GcodePreviewHandler.dll",
+                "PowerToys.GcodePreviewHandler.exe",
+                "PowerToys.GcodePreviewHandlerCpp.dll",
+                "PowerToys.GcodeThumbnailProvider.dll",
+                "PowerToys.GcodeThumbnailProvider.exe",
+                "PowerToys.GcodeThumbnailProviderCpp.dll",
+                "PowerToys.ManagedTelemetry.dll",
+                "PowerToys.MarkdownPreviewHandler.dll",
+                "PowerToys.MarkdownPreviewHandler.exe",
+                "PowerToys.MarkdownPreviewHandlerCpp.dll",
+                "PowerToys.MonacoPreviewHandler.dll",
+                "PowerToys.MonacoPreviewHandler.exe",
+                "PowerToys.MonacoPreviewHandlerCpp.dll",
+                "PowerToys.PdfPreviewHandler.dll",
+                "PowerToys.PdfPreviewHandler.exe",
+                "PowerToys.PdfPreviewHandlerCpp.dll",
+                "PowerToys.PdfThumbnailProvider.dll",
+                "PowerToys.PdfThumbnailProvider.exe",
+                "PowerToys.PdfThumbnailProviderCpp.dll",
+                "PowerToys.powerpreview.dll",
+                "PowerToys.PreviewHandlerCommon.dll",
+                "PowerToys.StlThumbnailProvider.dll",
+                "PowerToys.StlThumbnailProvider.exe",
+                "PowerToys.StlThumbnailProviderCpp.dll",
+                "PowerToys.SvgPreviewHandler.dll",
+                "PowerToys.SvgPreviewHandler.exe",
+                "PowerToys.SvgPreviewHandlerCpp.dll",
+                "PowerToys.SvgThumbnailProvider.dll",
+                "PowerToys.SvgThumbnailProvider.exe",
+                "PowerToys.SvgThumbnailProviderCpp.dll",
 
-                "modules\\FileLocksmith\\PowerToys.FileLocksmithLib.Interop.dll",
-                "modules\\FileLocksmith\\PowerToys.FileLocksmithExt.dll",
-                "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.exe",
-                "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.dll",
+                "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.Hosts.dll",
+                "WinUI3Apps\\PowerToys.Hosts.exe",
 
-                "modules\\Peek\\Peek.Common.dll",
-                "modules\\Peek\\Peek.FilePreviewer.dll",
-                "modules\\Peek\\Powertoys.Peek.UI.dll",
-                "modules\\Peek\\Powertoys.Peek.UI.exe",
-                "modules\\Peek\\Powertoys.Peek.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithExt.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.exe",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
 
-                "modules\\ImageResizer\\PowerToys.ImageResizer.exe",
-                "modules\\ImageResizer\\PowerToys.ImageResizer.dll",
-                "modules\\ImageResizer\\PowerToys.ImageResizerExt.dll",
-                "modules\\ImageResizer\\PowerToys.ImageResizerContextMenu.dll",
-                "modules\\ImageResizer\\ImageResizerContextMenuPackage.msix",
+                "WinUI3Apps\\Peek.Common.dll",
+                "WinUI3Apps\\Peek.FilePreviewer.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.exe",
+                "WinUI3Apps\\Powertoys.Peek.dll",
 
-                "modules\\KeyboardManager\\PowerToys.KeyboardManager.dll",
-                "modules\\KeyboardManager\\KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
-                "modules\\KeyboardManager\\KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+                "PowerToys.ImageResizer.exe",
+                "PowerToys.ImageResizer.dll",
+                "PowerToys.ImageResizerExt.dll",
+                "PowerToys.ImageResizerContextMenu.dll",
+                "ImageResizerContextMenuPackage.msix",
 
-                "modules\\launcher\\PowerToys.Launcher.dll",
-                "modules\\launcher\\PowerToys.PowerLauncher.dll",
-                "modules\\launcher\\PowerToys.PowerLauncher.exe",
-                "modules\\launcher\\PowerToys.PowerLauncher.Telemetry.dll",
-                "modules\\launcher\\Wox.dll",
-                "modules\\launcher\\Wox.Infrastructure.dll",
-                "modules\\launcher\\Wox.Plugin.dll",
-                "modules\\launcher\\Plugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
-                "modules\\launcher\\Plugins\\Folder\\Microsoft.Plugin.Folder.dll",
-                "modules\\launcher\\Plugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
-                "modules\\launcher\\Plugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
-                "modules\\launcher\\Plugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
-                "modules\\launcher\\Plugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
-                "modules\\launcher\\Plugins\\Program\\Microsoft.Plugin.Program.dll",
-                "modules\\launcher\\Plugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
-                "modules\\launcher\\Plugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
-                "modules\\launcher\\Plugins\\Shell\\Microsoft.Plugin.Shell.dll",
-                "modules\\launcher\\Plugins\\Uri\\Microsoft.Plugin.Uri.dll",
-                "modules\\launcher\\Plugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
-                "modules\\launcher\\Plugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
-                "modules\\launcher\\Plugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
-                "modules\\launcher\\Plugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
-                "modules\\launcher\\Plugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
-                "modules\\launcher\\Plugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
-                "modules\\launcher\\Plugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
-                "modules\\launcher\\Plugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
+                "PowerToys.KeyboardManager.dll",
+                "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
+                "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+
+                "PowerToys.Launcher.dll",
+                "PowerToys.PowerLauncher.dll",
+                "PowerToys.PowerLauncher.exe",
+                "PowerToys.PowerLauncher.Telemetry.dll",
+                "Wox.dll",
+                "Wox.Infrastructure.dll",
+                "Wox.Plugin.dll",
+                "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
+                "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll",
+                "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
+                "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
+                "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
+                "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
+                "RunPlugins\\Program\\Microsoft.Plugin.Program.dll",
+                "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
+                "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
+                "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll",
+                "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll",
+                "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
+                "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
+                "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
+                "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
+                "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
+                "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
+                "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll",
+                "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
+                "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
                 
-                "modules\\MeasureTool\\PowerToys.MeasureToolModuleInterface.dll",
-                "modules\\MeasureTool\\PowerToys.MeasureToolCore.dll",
-                "modules\\MeasureTool\\PowerToys.MeasureToolUI.dll",
-                "modules\\MeasureTool\\PowerToys.MeasureToolUI.exe",
+                "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.exe",
 
-                "modules\\MouseUtils\\PowerToys.FindMyMouse.dll",
-                "modules\\MouseUtils\\PowerToys.MouseHighlighter.dll",
-                "modules\\MouseUtils\\PowerToys.MouseJump.dll",
-                "modules\\MouseUtils\\PowerToys.MousePointerCrosshairs.dll",
-                "modules\\MouseUtils\\MouseJumpUI\\PowerToys.MouseJumpUI.dll",
-                "modules\\MouseUtils\\MouseJumpUI\\PowerToys.MouseJumpUI.exe",
+                "PowerToys.FindMyMouse.dll",
+                "PowerToys.MouseHighlighter.dll",
+                "PowerToys.MouseJump.dll",
+                "PowerToys.MousePointerCrosshairs.dll",
+                "PowerToys.MouseJumpUI.dll",
+                "PowerToys.MouseJumpUI.exe",
 
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.dll",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.exe",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersModuleInterface.dll",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersService.dll",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersService.exe",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersHelper.dll",
-                "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersHelper.exe",
+                "PowerToys.MouseWithoutBorders.dll",
+                "PowerToys.MouseWithoutBorders.exe",
+                "PowerToys.MouseWithoutBordersModuleInterface.dll",
+                "PowerToys.MouseWithoutBordersService.dll",
+                "PowerToys.MouseWithoutBordersService.exe",
+                "PowerToys.MouseWithoutBordersHelper.dll",
+                "PowerToys.MouseWithoutBordersHelper.exe",
 
-                "modules\\PowerAccent\\PowerAccent.Core.dll",
-                "modules\\PowerAccent\\PowerToys.PowerAccent.dll",
-                "modules\\PowerAccent\\PowerToys.PowerAccent.exe",
-                "modules\\PowerAccent\\PowerToys.PowerAccentModuleInterface.dll",
-                "modules\\PowerAccent\\PowerToys.PowerAccentKeyboardService.dll",
+                "PowerAccent.Core.dll",
+                "PowerToys.PowerAccent.dll",
+                "PowerToys.PowerAccent.exe",
+                "PowerToys.PowerAccentModuleInterface.dll",
+                "PowerToys.PowerAccentKeyboardService.dll",
 
-                "modules\\PowerRename\\PowerToys.PowerRenameExt.dll",
-                "modules\\PowerRename\\PowerToys.PowerRename.exe",
-                "modules\\PowerRename\\PowerToys.PowerRenameContextMenu.dll",
-                "modules\\PowerRename\\PowerRenameContextMenuPackage.msix",
+                "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
+                "WinUI3Apps\\PowerToys.PowerRename.exe",
+                "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
+                "WinUI3Apps\\PowerRenameContextMenuPackage.msix",
 
-                "modules\\RegistryPreview\\PowerToys.RegistryPreviewExt.dll",
-                "modules\\RegistryPreview\\PowerToys.RegistryPreview.dll",
-                "modules\\RegistryPreview\\PowerToys.RegistryPreview.exe",
+                "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.exe",
 
-                "modules\\ShortcutGuide\\ShortcutGuide\\PowerToys.ShortcutGuide.exe",
-                "modules\\ShortcutGuide\\ShortcutGuideModuleInterface\\PowerToys.ShortcutGuideModuleInterface.dll",
+                "PowerToys.ShortcutGuide.exe",
+                "PowerToys.ShortcutGuideModuleInterface.dll",
 
-                "modules\\VideoConference\\PowerToys.VideoConferenceModule.dll",
-                "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x86.dll",
-                "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x64.dll",
-                "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_arm64.dll",
+                "PowerToys.VideoConferenceModule.dll",
+                "PowerToys.VideoConferenceProxyFilter_x86.dll",
+                "PowerToys.VideoConferenceProxyFilter_x64.dll",
+                "PowerToys.VideoConferenceProxyFilter_arm64.dll",
 
-                "Settings\\PowerToys.Settings.dll",
-                "Settings\\PowerToys.Settings.exe"
+                "WinUI3Apps\\PowerToys.Settings.dll",
+                "WinUI3Apps\\PowerToys.Settings.exe"
             ],
             "SigningInfo": {
                 "Operations": [
@@ -236,7 +240,7 @@
                 "HelixToolkit.Core.Wpf.dll",
                 "Mages.Core.dll",
                 "JetBrains.Annotations.dll",
-                "NLog.Extensions.Logging.dll", 
+                "NLog.Extensions.Logging.dll",
                 "concrt140_app.dll",
                 "msvcp140_1_app.dll",
                 "msvcp140_2_app.dll",
@@ -246,49 +250,42 @@
                 "vcomp140_app.dll",
                 "vcruntime140_1_app.dll",
                 "vcruntime140_app.dll",
-                "modules\\FileLocksmith\\CommunityToolkit.Labs.WinUI.SettingsControls.dll",
-                "modules\\PowerAccent\\UnicodeInformation.dll",
-                "modules\\PowerAccent\\Vanara.Core.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.ComCtl32.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Cryptography.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Gdi32.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Kernel32.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Ole.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Rpc.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Security.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Shared.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.Shell32.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.ShlwApi.dll",
-                "modules\\PowerAccent\\Vanara.PInvoke.User32.dll",
-                "modules\\RegistryPreview\\clrcompression.dll",
-                "modules\\RegistryPreview\\Microsoft.Graphics.Canvas.Interop.dll",
-                "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Core.dll",
-                "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.WinForms.dll",
-                "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Wpf.dll",
-                "modules\\FileExplorerPreview\\WebView2Loader.dll",
-                "modules\\Hosts\\Microsoft.Graphics.Canvas.Interop.dll",
-                "modules\\Hosts\\clrcompression.dll",
-                "modules\\launcher\\e_sqlite3.dll",
-                "modules\\launcher\\LazyCache.dll",
-                "modules\\launcher\\SQLitePCLRaw.batteries_v2.dll",
-                "modules\\launcher\\SQLitePCLRaw.core.dll",
-                "modules\\launcher\\SQLitePCLRaw.provider.e_sqlite3.dll",
-                "modules\\launcher\\ScipBe.Common.Office.OneNote.dll",
-                "modules\\launcher\\Interop.Microsoft.Office.Interop.OneNote.dll",
-                "modules\\launcher\\hyjiacan.py4n.dll",
-                "modules\\MouseWithoutBorders\\MessagePack.Annotations.dll",
-                "modules\\MouseWithoutBorders\\MessagePack.dll",
-                "modules\\MouseWithoutBorders\\Nerdbank.Streams.dll",
-                "modules\\Peek\\SharpCompress.dll",
-                "Settings\\Microsoft.Graphics.Canvas.Interop.dll",
-                "Settings\\clrcompression.dll",
-                "Settings\\CommunityToolkit.Labs.WinUI.SettingsControls.dll",
-                "Settings\\MessagePack.Annotations.dll",
-                "Settings\\MessagePack.dll",
-                "Settings\\Nerdbank.Streams.dll",
+                "WinUI3Apps\\CommunityToolkit.Labs.WinUI.SettingsControls.dll",
+                "UnicodeInformation.dll",
+                "Vanara.Core.dll",
+                "Vanara.PInvoke.ComCtl32.dll",
+                "Vanara.PInvoke.Cryptography.dll",
+                "Vanara.PInvoke.Gdi32.dll",
+                "Vanara.PInvoke.Kernel32.dll",
+                "Vanara.PInvoke.Ole.dll",
+                "Vanara.PInvoke.Rpc.dll",
+                "Vanara.PInvoke.Security.dll",
+                "Vanara.PInvoke.Shared.dll",
+                "Vanara.PInvoke.Shell32.dll",
+                "Vanara.PInvoke.ShlwApi.dll",
+                "Vanara.PInvoke.User32.dll",
+                "WinUI3Apps\\clrcompression.dll",
+                "WinUI3Apps\\Microsoft.Graphics.Canvas.Interop.dll",
+                "Microsoft.Web.WebView2.Core.dll",
+                "Microsoft.Web.WebView2.WinForms.dll",
+                "Microsoft.Web.WebView2.Wpf.dll",
+                "WebView2Loader.dll",
+                "e_sqlite3.dll",
+                "LazyCache.dll",
+                "SQLitePCLRaw.batteries_v2.dll",
+                "SQLitePCLRaw.core.dll",
+                "SQLitePCLRaw.provider.e_sqlite3.dll",
+                "ScipBe.Common.Office.OneNote.dll",
+                "Interop.Microsoft.Office.Interop.OneNote.dll",
+                "hyjiacan.py4n.dll",
+                "MessagePack.Annotations.dll",
+                "MessagePack.dll",
+                "Nerdbank.Streams.dll",
+                "WinUI3Apps\\SharpCompress.dll",
                 "ColorCode.Core.dll", 
                 "ColorCode.UWP.dll",
-                "UnitsNet.dll"
+                "UnitsNet.dll",
+                "Wpf.Ui.dll"
             ],
             "SigningInfo": {
                 "Operations": [

.pipelines/ESRPSigning_vcm.json

@@ -4,7 +4,7 @@
     "SignBatches": [
         {
             "MatchedPath": [
-                "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x86.dll"
+                "PowerToys.VideoConferenceProxyFilter_x86.dll"
             ],
             "SigningInfo": {
                 "Operations": [

.pipelines/ci/templates/build-powertoys-ci.yml

@@ -1,7 +1,7 @@
 parameters:
   configuration: 'Release'
   platform: ''
-  additionalBuildArguments: '-m'
+  additionalBuildArguments: '/p:RestorePackagesConfig=true -m'
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}

.pipelines/ci/templates/build-powertoys-installer.yml

@@ -1,7 +1,7 @@
 parameters:
   configuration: 'Release'
   platform: ''
-  additionalBuildArguments: '-m'
+  additionalBuildArguments: '/p:RestorePackagesConfig=true -m'
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}

.pipelines/ci/templates/build-powertoys-steps.yml

@@ -55,21 +55,9 @@ steps:
     packageType: sdk
     version: '7.x'
 
-- task: NuGetToolInstaller@1
-  displayName: Ensure NuGet Installer
-
 - task: VisualStudioTestPlatformInstaller@1
   displayName: Ensure VSTest Platform
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for PowerToys.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: PowerToys.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\packages'
-
 - task: VSBuild@1
   displayName: 'Build PowerToys.sln'
   inputs:
@@ -77,18 +65,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for BugReportTool.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: tools\BugReportTool\BugReportTool.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\tools\BugReportTool\packages'
-
 - task: VSBuild@1
   displayName: 'Build BugReportTool.sln'
   inputs:
@@ -96,18 +75,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for WebcamReportTool.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: tools\WebcamReportTool\WebcamReportTool.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\tools\WebcamReportTool\packages'
-
 - task: VSBuild@1
   displayName: 'Build WebcamReportTool.sln'
   inputs:
@@ -115,18 +85,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for StylesReportTool.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: tools\StylesReportTool\StylesReportTool.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\tools\StylesReportTool\packages'
-
 - task: VSBuild@1
   displayName: 'Build StylesReportTool.sln'
   inputs:
@@ -134,18 +95,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for PowerToysSetup.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: installer\PowerToysSetup.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\installer\packages'
-
 - task: PowerShell@2
   displayName: Download and install WiX 3.14 development build
   inputs:
@@ -159,7 +111,7 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -180,15 +132,6 @@ steps:
     script: git clean -xfd  -e *exe -- .\installer\
     pwsh: true
 
-- task: NuGetCommand@2
-  displayName: Restore NuGet packages for PowerToysSetup.sln
-  inputs:
-    command: restore
-    feedsToUse: config
-    configPath: NuGet.config
-    restoreSolution: installer\PowerToysSetup.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\installer\packages'
-
 - task: VSBuild@1
   displayName: 'Build PowerToys per-user MSI'
   inputs:
@@ -196,7 +139,7 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller ${{ parameters.additionalBuildArguments }} /p:PerUser=true
+    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -210,6 +153,29 @@ steps:
     clean: false
     maximumCpuCount: true
 
+# Check if deps.json files don't reference different dll versions.
+- task: PowerShell@2
+  displayName: Audit deps.json files for all applications
+  inputs:
+    filePath: '$(build.sourcesdirectory)\.pipelines\verifyDepsJsonLibraryVersions.ps1'
+    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    pwsh: true
+
+# Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
+- task: PowerShell@2
+  displayName: Audit base applications path asset conflicts
+  inputs:
+    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
+    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    pwsh: true
+
+- task: PowerShell@2
+  displayName: Audit WinAppSDK applications path asset conflicts
+  inputs:
+    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
+    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
+    pwsh: true
+
 # directly not doing WinAppDriver testing
 - task: VSTest@2
   displayName: 'MS Tests'
@@ -231,6 +197,7 @@ steps:
       **\Microsoft.Interop.Tests.dll
       **\ImageResizer.Test.dll
       **\Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.dll
+      **\Community.PowerToys.Run.Plugin.ValueGenerator.UnitTests.dll
       **\Microsoft.Plugin.Folder.UnitTests.dll
       **\Microsoft.Plugin.Program.UnitTests.dll
       **\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.dll

.pipelines/installer-steps.yml

@@ -18,7 +18,7 @@ steps:
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysSetupCustomActions /p:RunBuildEvents=true /p:PerUser=${{parameters.perUserArg}}
+      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysSetupCustomActions /p:RunBuildEvents=true /p:PerUser=${{parameters.perUserArg}}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       clean: true
@@ -53,6 +53,14 @@ steps:
         "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).msi
         dir $(build.sourcesdirectory)\extractedMsi
 
+  # Check if deps.json files don't reference different dll versions.
+  - task: PowerShell@2
+    displayName: Audit deps.json in MSI extracted files
+    inputs:
+      filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
+      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+      pwsh: true
+
   # Did we sign all files
   - task: PowerShell@1
     displayName: Verifying entire build is signed and version set

.pipelines/release.yml

@@ -71,7 +71,7 @@ jobs:
       packageType: sdk
       version: '7.x'
 
-  - task: NuGetAuthenticate@0
+  - task: NuGetAuthenticate@1
       
   - task: NuGetToolInstaller@1
     displayName: Use NuGet Installer latest
@@ -82,14 +82,6 @@ jobs:
 # - Webcam report tool
 # - Installer
 # - Bootstrapper Installer
-  - task: NuGetCommand@2
-    displayName: NuGet restore solutions dependencies
-    inputs:
-      command: restore
-      restoreSolution: '**/*.sln'
-      selectOrConfig: config
-      nugetConfigPath: .pipelines/release-nuget.config
-
   - task: PowerShell@2
     displayName: Download and install WiX 3.14 development build
     inputs:
@@ -136,7 +128,7 @@ jobs:
     inputs:
       solution: '**\PowerToys.sln'
       vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
+      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       clean: true
@@ -147,7 +139,7 @@ jobs:
     inputs:
       solution: '**/tools/BugReportTool/BugReportTool.sln'
       vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
+      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       clean: true
@@ -158,7 +150,7 @@ jobs:
     inputs:
       solution: '**/tools/WebcamReportTool/WebcamReportTool.sln'
       vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
+      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       clean: true
@@ -169,7 +161,7 @@ jobs:
     inputs:
       solution: '**/tools/StylesReportTool/StylesReportTool.sln'
       vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
+      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       clean: true
@@ -270,22 +262,6 @@ jobs:
       configuration: $(BuildConfiguration)
       maximumCpuCount: true
 
-  - task: VSBuild@1
-    displayName: Publish Measure Tool UI for Packaging
-    inputs:
-      solution: 'src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj'
-      vsVersion: 17.0
-      # The arguments should be the same as the ones for Settings; make sure they are.
-      msbuildArgs: >-
-        /target:Publish
-        /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-        /p:VCRTForwarders-IncludeDebugCRT=false
-        /p:PowerToysRoot=$(Build.SourcesDirectory)
-        /p:PublishProfile=InstallationPublishProfile.pubxml
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-
   - task: VSBuild@1
     displayName: Publish File Locksmith UI for Packaging
     inputs:
@@ -302,6 +278,29 @@ jobs:
       configuration: $(BuildConfiguration)
       maximumCpuCount: true
 
+  # Check if deps.json files don't reference different dll versions.
+  - task: PowerShell@2
+    displayName: Audit deps.json files for all applications
+    inputs:
+      filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
+      arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+      pwsh: true
+
+  # Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
+  - task: PowerShell@2
+    displayName: Audit base applications path asset conflicts
+    inputs:
+      filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
+      arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+      pwsh: true
+
+  - task: PowerShell@2
+    displayName: Audit WinAppSDK applications path asset conflicts
+    inputs:
+      filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
+      arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
+      pwsh: true
+
 #### MAIN SIGNING AREA
 # reference https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/ESRPSigning.json&version=GBarm64-netcore&_a=contents for winappdriver
 # https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/CIPolicy.xml&version=GBarm64-netcore&_a=contents
@@ -390,14 +389,6 @@ jobs:
       script: git clean -xfd  -e *exe -- .\installer\
       pwsh: true
 
-  - task: NuGetCommand@2
-    displayName: NuGet restore solutions dependencies
-    inputs:
-      command: restore
-      restoreSolution: 'installer/*.sln'
-      selectOrConfig: config
-      nugetConfigPath: .pipelines/release-nuget.config
-
   - template: installer-steps.yml
     parameters:
       versionNumber: ${{ parameters.versionNumber }}

.pipelines/verifyDepsJsonLibraryVersions.ps1

@@ -0,0 +1,82 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$targetDir
+)
+
+# This script will check every deps.json file in the target directory to see if for each dll mentioned,
+#all the deps.json files that mention it will mention the same version.
+# The main goal is to catch when different versions for the same module might be copied to the same directory
+#at build time and might create flaky builds that get the wrong version of the dll sometimes.
+
+# A dictionary of dictionaries of lists to save which files reference each version of each dll.
+# Logic is DllName > fileVersion > list with deps.json files that reference it.
+# If for a specific dll there's more than one referenced file version, we have build collisions.
+$referencedFileVersionsPerDll = @{}
+$totalFailures = 0
+
+Get-ChildItem $targetDir -Recurse -Filter *.deps.json | ForEach-Object {
+    $depsJsonFullFileName = $_.FullName
+    $depsJsonFileName = $_.Name
+    $depsJson = Get-Content $depsJsonFullFileName | ConvertFrom-Json
+
+    # We're doing a breadth first search to look for every runtime object.
+    $iterateThroughEveryField = New-Object System.Collections.Generic.Queue[System.Object]
+    $iterateThroughEveryField.Enqueue($depsJson)
+
+    while($iterateThroughEveryField.Count -gt 0)
+    {
+        $currentObject = $iterateThroughEveryField.Dequeue();
+        $currentObject.PSObject.Properties | ForEach-Object {
+            if($_.Name -ne 'SyncRoot') {
+                # Skip SyncRoot to avoid looping in array objects.
+                # Care only about objects, not value types.
+                $iterateThroughEveryField.Enqueue($_.Value)
+                if($_.Name -eq 'runtime')
+                {
+                    # Cycle through each dll.
+                    $_.Value.PSObject.Properties | ForEach-Object {
+                        if($_.Name.EndsWith('.dll')) {
+                            $dllName = Split-Path $_.Name -leaf
+                            if([bool]($_.Value.PSObject.Properties.name -match 'fileVersion')) {
+                                $dllFileVersion = $_.Value.fileVersion
+                                
+                                # Add the entry to the dictionary of dictionary of lists
+                                if(-Not $referencedFileVersionsPerDll.ContainsKey($dllName)) {
+                                    $referencedFileVersionsPerDll[$dllName] = @{ $dllFileVersion = New-Object System.Collections.Generic.List[System.String] }
+                                } elseif(-Not $referencedFileVersionsPerDll[$dllName].ContainsKey($dllFileVersion)) {
+                                    $referencedFileVersionsPerDll[$dllName][$dllFileVersion] = New-Object System.Collections.Generic.List[System.String]
+                                }
+                                $referencedFileVersionsPerDll[$dllName][$dllFileVersion].Add($depsJsonFileName)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+# Report on the files that are referenced for more than one version.
+$referencedFileVersionsPerDll.keys | ForEach-Object {
+    if($referencedFileVersionsPerDll[$_].Count -gt 1) {
+        $dllName = $_
+        Write-Host $dllName
+        $referencedFileVersionsPerDll[$dllName].keys | ForEach-Object {
+            Write-Host "`t" $_ 
+            $referencedFileVersionsPerDll[$dllName][$_] | ForEach-Object {
+                Write-Host "`t`t" $_
+            }
+        }
+        $totalFailures++;
+    }
+}
+
+if ($totalFailures -gt 0) {
+    Write-Host -ForegroundColor Red "Detected " $totalFailures " libraries that are mentioned with different version across the dependencies.`r`n"
+    exit 1
+}
+
+Write-Host -ForegroundColor Green "All " $referencedFileVersionsPerDll.keys.Count " libraries are mentioned with the same version across the dependencies.`r`n"
+exit 0
+

.pipelines/verifyPossibleAssetConflicts.ps1

@@ -0,0 +1,52 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$targetDir
+)
+
+# This script runs some simple checks to avoid conflicts between assets from different applications during build time.
+$totalFailures = 0
+
+# Verify if the Assets folder contains only sub-folders.
+# The purpose is to avoid applications having assets files that might conflict with other applications.
+# Applications should be setting their own directory for assets.
+
+$targetAssetsDir = $targetDir + "/Assets"
+
+$nonDirectoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes !Directory
+$directoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes Directory
+
+if ($directoryAssetsItems.Count -le 0) {
+    Write-Host -ForegroundColor Red "No directories detected in " $nonDirectoryAssetsItems ". Are you sure this is the right path?`r`n"
+    $totalFailures++;
+} elseif ($nonDirectoryAssetsItems.Count -gt 0) {
+    Write-Host -ForegroundColor Red "Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir "`r`n"
+    $totalFailures++;
+} else {
+    Write-Host -ForegroundColor Green "Only directories detected in " $targetAssetsDir "`r`n"
+}
+
+# Make sure there's no resources.pri file. Each application should use a different name for their own resources file path.
+$resourcesPriFiles = Get-ChildItem $targetDir -Filter resources.pri
+if ($resourcesPriFiles.Count -gt 0) {
+    Write-Host -ForegroundColor Red "Detected a resources.pri file in " $targetDir "`r`n"
+    $totalFailures++;
+} else {
+    Write-Host -ForegroundColor Green "No resources.pri file detected in " $targetDir "`r`n"
+}
+
+# Each application should have their XAML files in their own paths to avoid these conflicts.
+$resourcesPriFiles = Get-ChildItem $targetDir -Filter *.xbf
+if ($resourcesPriFiles.Count -gt 0) {
+    Write-Host -ForegroundColor Red "Detected a .xbf file in " $targetDir "`r`n"
+    $totalFailures++;
+} else {
+    Write-Host -ForegroundColor Green "No .xbf files detected in " $targetDir "`r`n"
+}
+
+if ($totalFailures -gt 0) {
+    Write-Host -ForegroundColor Red "Found some errors when verifying " $targetDir "`r`n"
+    exit 1
+}
+
+exit 0

COMMUNITY.md

@@ -107,6 +107,10 @@ Randy contributed Registry Preview and some very early conversations about keybo
 
 Find My Mouse is based on Raymond Chen's SuperSonar.
 
+### [@robmikh](https://github.com/robmikh) - Robert Mikhayelyan
+
+Crop And Lock is based on the original work of Robert Mikhayelyan, with Program Manager support from [@kevinguo305](https://github.com/kevinguo305) - Kevin Guo.
+
 ### Microsoft InVEST team
 
 This amazing team helped PowerToys develop PowerToys Run and Keyboard manager as well as update our Settings to v2.  @alekhyareddy28, @arjunbalgovind, @jyuwono @laviusmotileng-ms, @ryanbodrug-microsoft, @saahmedm, @somil55, @traies, @udit3333
@@ -152,8 +156,7 @@ Other contributors:
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Product Manager
 - [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev lead
 - [@donlaci](https://github.com/donlaci) - Laszlo Nemeth - Dev
+- [@gokcekantarci](https://github.com/gokcekantarci) - Gokce Kantarci - Dev
 - [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
-- [@sosssego](https://github.com/sosssego) - Frederico Moron - Dev
 - [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
-- [@taras-janea](https://github.com/taras-janea) - Taras Sich - Dev
 - [@yuyoyuppe](https://github.com/yuyoyuppe) - Andrey Nekrasov - Dev

Cpp.Build.props

@@ -96,14 +96,14 @@
   <!-- Global props -->
   <PropertyGroup Label="Globals"
     Condition="'$(OverrideWindowsTargetPlatformVersion)'!='True'">
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <PlatformToolset Condition="'$(OverridePlatformToolset)'!='True'">v143</PlatformToolset>
-    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
   </PropertyGroup>

Directory.Packages.props

@@ -9,7 +9,7 @@
     <PackageVersion Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageVersion Include="ControlzEx" Version="5.0.1" />
+    <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="coverlet.collector" Version="1.3.0" />
     <PackageVersion Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
     <PackageVersion Include="HelixToolkit" Version="2.20.2" />
@@ -26,20 +26,22 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1722.45" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.2" />
+    <!-- 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. -->
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.3" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
-    <PackageVersion Include="Moq" Version="4.18.3" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.0.1" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.0.1" />
+    <PackageVersion Include="Moq" Version="4.18.4" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.0.4" />
@@ -47,7 +49,7 @@
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.33.0" />
     <PackageVersion Include="StreamJsonRpc" Version="2.14.24" />
-    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.ComponentModel.Composition" Version="7.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
@@ -58,16 +60,17 @@
     <PackageVersion Include="System.Management" Version="7.0.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.0-preview.9" />
     <PackageVersion Include="System.Runtime.Caching" Version="7.0.0" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="7.0.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="4.145.0" />
     <PackageVersion Include="Vanara.PInvoke.User32" Version="3.4.11" />
     <PackageVersion Include="Vanara.PInvoke.Shell32" Version="3.4.11" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
+    <PackageVersion Include="WPF-UI" Version="3.0.0-preview.4" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
     <!-- Additional dependencies used by experimentation -->
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -286,7 +286,7 @@ SOFTWARE.
 - CommunityToolkit.WinUI.UI 7.1.2
 - CommunityToolkit.WinUI.UI.Animations 7.1.2
 - CommunityToolkit.WinUI.UI.Controls 7.1.2
-- ControlzEx 5.0.1
+- ControlzEx 6.0.0
 - HelixToolkit 2.20.2
 - HelixToolkit.Core.Wpf 2.20.2
 - hyjiacan.pinyin4net 4.1.1
@@ -296,31 +296,31 @@ SOFTWARE.
 - Markdig.Signed 0.27.0
 - Microsoft.CodeAnalysis.NetAnalyzers 7.0.3
 - Microsoft.Data.Sqlite 7.0.0
-- Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers 0.4.336902
 - Microsoft.Extensions.DependencyInjection 7.0.0
 - Microsoft.Extensions.Hosting 7.0.1
 - Microsoft.Extensions.Hosting.WindowsServices 7.0.0
 - Microsoft.Extensions.Logging 7.0.0
-- Microsoft.NET.Test.Sdk 17.4.1
+- Microsoft.NET.Test.Sdk 17.6.3
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.1722.45
 - Microsoft.Windows.Compatibility 7.0.3
 - Microsoft.Windows.CsWin32 0.2.46-beta
-- Microsoft.Windows.CsWinRT 2.0.2
+- Microsoft.Windows.CsWinRT 2.0.3
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.755
+- Microsoft.Windows.SDK.Contracts 10.0.19041.1
 - Microsoft.WindowsAppSDK 1.3.230502000
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
-- Moq 4.18.3
-- MSTest.TestAdapter 3.0.1
-- MSTest.TestFramework 3.0.1
+- Moq 4.18.4
+- MSTest.TestAdapter 3.1.1
+- MSTest.TestFramework 3.1.1
 - NLog.Extensions.Logging 5.0.4
 - NLog.Schema 5.0.4
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.33.0
 - StreamJsonRpc 2.14.24
-- StyleCop.Analyzers 1.2.0-beta.435
+- StyleCop.Analyzers 1.2.0-beta.507
 - System.CommandLine 2.0.0-beta4.22272.1
 - System.ComponentModel.Composition 7.0.0
 - System.Configuration.ConfigurationManager 6.0.0
@@ -331,10 +331,11 @@ SOFTWARE.
 - System.Management 7.0.2
 - System.Reactive 6.0.0-preview.9
 - System.Runtime.Caching 7.0.0
-- System.ServiceProcess.ServiceController 7.0.0
+- System.ServiceProcess.ServiceController 7.0.1
 - UnicodeInformation 2.6.0
 - UnitsNet 4.145.0
 - Vanara.PInvoke.Shell32 3.4.11
 - Vanara.PInvoke.User32 3.4.11
 - WinUIEx 2.2.0
+- WPF-UI 3.0.0-preview.4
 

PowerToys.sln

@@ -140,6 +140,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher", "src\module
 		{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85} = {A2D583F0-B70C-4462-B1F0-8E81AFB7BA85}
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4} = {BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}
 		{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}
+		{D095BE44-1F2E-463E-A494-121892A75EA2} = {D095BE44-1F2E-463E-A494-121892A75EA2}
 		{F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {F8B870EB-D5F5-45BA-9CF7-A5C459818820}
 		{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B} = {FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}
 		{FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {FDB3555B-58EF-4AE6-B5F1-904719637AB4}
@@ -525,6 +526,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilePreviewCommon", "src\co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.PowerToys", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.csproj", "{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.ValueGenerator", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.csproj", "{D095BE44-1F2E-463E-A494-121892A75EA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.ValueGenerator.UnitTests", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.ValueGenerator.UnitTests\Community.PowerToys.Run.Plugin.ValueGenerator.UnitTests.csproj", "{90F9FA90-2C20-4004-96E6-F3B78151F5A5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CropAndLock", "CropAndLock", "{3B227528-4BA6-4CAF-B44A-A10C78A64849}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLock", "src\modules\CropAndLock\CropAndLock\CropAndLock.vcxproj", "{F5E1146E-B7B3-4E11-85FD-270A500BD78C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLockModuleInterface", "src\modules\CropAndLock\CropAndLockModuleInterface\CropAndLockModuleInterface.vcxproj", "{3157FA75-86CF-4EE2-8F62-C43F776493C6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2247,6 +2258,54 @@ Global
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|x64.Build.0 = Release|x64
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|x86.ActiveCfg = Release|x64
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|x86.Build.0 = Release|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|x64.ActiveCfg = Debug|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|x64.Build.0 = Debug|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|x86.ActiveCfg = Debug|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Debug|x86.Build.0 = Debug|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|ARM64.Build.0 = Release|ARM64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|x64.ActiveCfg = Release|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|x64.Build.0 = Release|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|x86.ActiveCfg = Release|x64
+		{D095BE44-1F2E-463E-A494-121892A75EA2}.Release|x86.Build.0 = Release|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|x64.ActiveCfg = Debug|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|x64.Build.0 = Debug|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|x86.ActiveCfg = Debug|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Debug|x86.Build.0 = Debug|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|ARM64.Build.0 = Release|ARM64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|x64.ActiveCfg = Release|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|x64.Build.0 = Release|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|x86.ActiveCfg = Release|x64
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5}.Release|x86.Build.0 = Release|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|x64.ActiveCfg = Debug|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|x64.Build.0 = Debug|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|x86.ActiveCfg = Debug|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Debug|x86.Build.0 = Debug|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|ARM64.Build.0 = Release|ARM64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|x64.ActiveCfg = Release|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|x64.Build.0 = Release|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|x86.ActiveCfg = Release|x64
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C}.Release|x86.Build.0 = Release|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|x64.ActiveCfg = Debug|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|x64.Build.0 = Debug|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|x86.ActiveCfg = Debug|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Debug|x86.Build.0 = Debug|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|ARM64.Build.0 = Release|ARM64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.ActiveCfg = Release|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.Build.0 = Release|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x86.ActiveCfg = Release|x64
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2436,6 +2495,11 @@ Global
 		{929C1324-22E8-4412-A9A8-80E85F3985A5} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{9EBAA524-0EDA-470B-95D4-39383285CBB2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{D095BE44-1F2E-463E-A494-121892A75EA2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{3B227528-4BA6-4CAF-B44A-A10C78A64849} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{F5E1146E-B7B3-4E11-85FD-270A500BD78C} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
+		{3157FA75-86CF-4EE2-8F62-C43F776493C6} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -18,12 +18,13 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 |              | Current utilities: |              |
 |--------------|--------------------|--------------|
 | [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) |
-| [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) |
-| [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) |
-| [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [Peek](https://aka.ms/PowerToysOverview_Peek) |
-| [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
-| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
-| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
+| [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) |
+| [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) |
+| [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) |
+| [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) |
+| [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) |
+| [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) |
+| [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
 
 ## Installing and running Microsoft PowerToys
 
@@ -37,18 +38,20 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 Go to [Microsoft PowerToys GitHub releases page][github-release-link], click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=issue+project%3Amicrosoft%2FPowerToys%2F43
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.70.1/PowerToysUserSetup-0.70.1-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.70.1/PowerToysUserSetup-0.70.1-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.70.1/PowerToysSetup-0.70.1-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.70.1/PowerToysSetup-0.70.1-arm64.exe
+<!-- items that need to be updated release to release -->
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F46
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F45
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.72.0/PowerToysUserSetup-0.72.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.72.0/PowerToysUserSetup-0.72.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.72.0/PowerToysSetup-0.72.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.72.0/PowerToysSetup-0.72.0-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.70.1-x64.exe][ptUserX64] | B8FD209310B9847DA3AC35C2C5A89F99CE5EA91F456D9D3595DD2840D62A1AC1 | 
-| Per user - ARM64     | [PowerToysUserSetup-0.70.1-arm64.exe][ptUserArm64] | 5155EA186230876EF1DA6F49DC33E40D552B2BFFA0E03F66FBA71FBEB8713594 | 
-| Machine wide - x64   | [PowerToysSetup-0.70.1-x64.exe][ptMachineX64] | 1BE4760558765EF363E12126282F1E3340A8ADFF657C5C51714F7E096F86EE50 | 
-| Machine wide - ARM64 | [PowerToysSetup-0.70.1-arm64.exe][ptMachineArm64] | 9F267B7AD91E5FAE86ED5050A08A24756CE3EA9875FFCFDE195F1F4F299F0933 |
+| Per user - x64       | [PowerToysUserSetup-0.72.0-x64.exe][ptUserX64] | 9925894D797458C78A8C3DF6FE4BD748580638B01BB43680477763662915109A |
+| Per user - ARM64     | [PowerToysUserSetup-0.72.0-arm64.exe][ptUserArm64] | 2E68139C22C56648E64514E4E8E0A0D12882F6CF30B48EB20ECC66B4CCDD5909 |
+| Machine wide - x64   | [PowerToysSetup-0.72.0-x64.exe][ptMachineX64] | 788EE4D828169F092737A739030B218CEFEC79583E42858BB8F9F036B701BE6F |
+| Machine wide - ARM64 | [PowerToysSetup-0.72.0-arm64.exe][ptMachineArm64] | 39C1D430A538B0F3D7869D39DF7F636A64AAFAD8DFB3C82059A97F4EBD3369C4 |
 
 This is our preferred method.
 
@@ -74,6 +77,10 @@ winget install --scope machine Microsoft.PowerToys -s winget
 
 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.
 
+## Third-Party Run Plugins
+
+Collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) created by the community that aren't distributed with PowerToys.
+
 ## Contributing
 
 This project welcomes contributions of all types. Help spec'ing, design, documentation, finding bugs are ways everyone can help on top of coding features / bug fixes. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
@@ -90,117 +97,130 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.70 - May 2023 Update
+### 0.72 - July 2023 Update
 
-In this release, we focused on releasing new features, stability and improvements.
+In this release, we focused on stability and improvements.
 
 **Highlights**
 
-- New utility: Mouse Without Borders enables you to interact with other computers from the same keyboard and mouse and share clipboard and files between the machines. We’ve upgraded it to .NET 7 and made a few small adjustments to fit inside the PowerToys model. Thanks [@truong2d](https://github.com/truong2d) and the rest of the contributors from the Microsoft Garage!
-- New utility: Peek is a utility that shows a quick preview of files selected in File Explorer when you press a shortcut (`Ctrl`+`Space` by default). Thanks [@SamChaps](https://github.com/SamChaps)!
-- Registry preview Quality of Life improvements. Thanks [@randyrants](https://github.com/randyrants)!
-- Awake Quality of Life improvements. Thanks [@dend](https://github.com/dend)!
-- Mouse Jump Quality of Life improvements. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+ - Greatly reduced the PowerToys installed space by having utilities share the same installed path. When compared to 0.71, the 0.72 x64 machine installed version of PowerToys reduces the size reported in the Installed Apps screen from 1.15GB to 785 MB and the size in File Explorer properties for the installation folder from 3.10GB to 554 MB.
+ - Value Generator - A new PowerToys Run plugin that generates hashes and GUID values. Thanks [@IHorvalds](https://github.com/IHorvalds)!
+ - Mouse Highlighter has a new feature to have a highlight always follow the mouse pointer. Thanks [@hayatogh](https://github.com/hayatogh)!
+ - PowerRename was reworked to support a bigger number of files without crashing.
+
+### Known issues
+
+ - Due to changing paths in the installation folder, the Mouse Without Borders service might be pointing to the wrong place. Users not running as admin will have to enable service mode again after install. A toast notification will appear if Mouse Without Borders is unable to start the service correctly.
+ - File Explorer extensions changed paths might not be loaded correctly until File Explorer and Preview Host processes are restarted, so we advise restarting the computer when possible after updating PowerToys.
 
 ### General
 
-- New utility: Mouse Without Borders. Thanks [@truong2d](https://github.com/truong2d) and [other original contributors](https://github.com/microsoft/PowerToys/blob/main/COMMUNITY.md#mouse-without-borders-original-contributors)!
-- New utility: Peek. Thanks [@SamChaps](https://github.com/SamChaps)!
-- Fixed a bug causing saved settings to clear sometimes when upgrading PowerToys.
-- Font, icon and corner radius adjustments in the UI across utilities. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)!
-
-### Awake
-
-- Update to command line output to match the arguments. Thanks [@rpr69](https://github.com/rpr69) for creating a PR to help fix this.
-- Fix crash happening when setting an expiration date on time zones with a negative offset relative to UTC (This was a hotfix for 0.69).
-- Fix missing logging file when installing (This was a hotfix for 0.69).
-- Upgraded Awake to a new version, with Quality of Life improvements and fixing many issues regarding Awake not resetting or not keeping the computer awake when expected. Thanks [@dend](https://github.com/dend)!
+ - Shared dependencies between applications in order to greatly reduce the installed size.
+ - Added missing icons and icon sizes. Thanks [@niels9001](https://github.com/niels9001)!
 
 ### FancyZones
 
-- Fixed accessibility issues on the Editor.
+ - Fixed an issue where FancyZones wouldn't register a change to the "Switch between windows in the current zone" setting.
+ - Added a Setting to enable the behavior of clicking the middle mouse button to toggle multiple zone spanning.
 
 ### File Locksmith
 
-- Fixed tooltips having a transparent background (This was a hotfix for 0.69).
+ - Fixed a File Explorer crash when deleting a file, updating PowerToys and then trying to right-click the background of a folder in File Explorer.
+ - UI tweaks. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)!
 
 ### File Explorer add-ons
 
-- Add a Setting to select a background for the SVG Preview. Thanks [@zanseb](https://github.com/zanseb)!
+ - Updated the Monaco dependency for Developer Files Preview, supporting new file extensions and fixing issues. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)!
+
+### Hosts File Editor
+
+ - Consolidated the way the Hosts application is launched. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - UI tweaks. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)!
 
 ### Installer
 
-- Added more utilities to terminate when installing to help prevent files that sometimes are leftover from uninstall.
+ - Refactored the Monaco dependency inclusion. What to install is now being generated automatically.
+ - Removed hardlinks and simplified the installer files, now that many utilities use the same paths.
 
-### Keyboard Manager
+### Mouse Highlighter
 
-- Fixed an issue causing mapping to media keys to type additional characters.
+ - Added a feature so that a highlight follows the mouse even if no mouse button is being pressed. Thanks [@hayatogh](https://github.com/hayatogh)!
 
-### Measure Tool
+### Mouse Pointer Crosshairs
 
-- Created a setting to specify the default measure tool. Thanks [@zanseb](https://github.com/zanseb)!
+ - Added a setting to hide the crosshairs when the mouse pointer is also hidden. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added a setting to select a fixed length for the crosshairs, which also spans across screens. Thanks [@Epp-code](https://github.com/Epp-code)! 
 
-### Mouse Jump
+### Mouse Without Borders
 
-- Reduced dependency on WinForms utility classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-- Improved popup responsiveness. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-- Added a setting to set a custom sized window. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-- Added some shortcuts for screen navigation. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+ - Switched to a UWP mouse input API to fix mouse pointer lag issues that were reported.
+ - A toast notification will appear when the service can't be started and Mouse Without Borders will try to start in non-service mode instead.
+ - Fixed a bug where the service path wouldn't update to the new binary path when trying to re-enable service mode.
+ - Fixed some grammar errors in the Mouse Without Borders user facing strings. Thanks [@KhurramJalil](https://github.com/KhurramJalil)!
+ - Allow changing the shortcuts in the same way as other utilities and changed them to better defaults to avoid conflicting with Alt Gr+letter combos on international layouts.
 
 ### Peek
-- New utility: Peek. Thanks [@SamChaps](https://github.com/SamChaps), who drove the effort! Many thanks for all the contributors who made it possible: [@danielchau](https://github.com/danielchau), [@estebanm123](https://github.com/estebanm123), [@Joanna-Zhou](https://github.com/Joanna-Zhou), [@jth-ms](https://github.com/jth-ms), [@miksalmon](https://github.com/miksalmon), [@niels9001](https://github.com/niels9001), [@RobsonPontin](https://github.com/RobsonPontin), [@sujessie](https://github.com/sujessie), and [@Sytta](https://github.com/Sytta)!
+
+ - Also benefits from the Monaco dependency update when peeking into files supported by the Developer Files Preview. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)!
+ - Fixed a flash on PowerToys starting due to the Peek window activating and hiding right away. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Updated icon design. Thanks [@niels9001](https://github.com/niels9001)!
+ - Fixed flipped content issues on systems with RTL languages.
+
+### PowerRename
+
+ - Reworked the UI and resource consumption to fix crashes and hangs when trying to rename a huge number of files.
+ - Added the Mica background material and some UI tweaks. Thanks [@niels9001](https://github.com/niels9001)!
 
 ### PowerToys Run
 
-- Add a plugin to start other PowerToys. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-- Added code to the Shell plugin to use Windows Terminal. Currently accessible only through manipulating the settings file directly. Thanks [@phoenix172](https://github.com/phoenix172)!
+ - New plugin: Value Generator - generates values like hashes and GUIDs. Thanks [@IHorvalds](https://github.com/IHorvalds)!
+ - The default input smoothing values were changed to the recommended values. Thanks [@SamMercer172](https://github.com/SamMercer172)!
+ - Fixed tab navigation issues when using Shift+Tab to go backwards. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed a crash caused by images not being found in the image cache due to racing conditions.
+ - Fixed synchronization issues in the WindowWalker plugin. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed a synchronization crash when getting localized system paths.
+ - The PowerToys plugin is now activated by default. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 
 ### Quick Accent
-- Added a missing character to the Welsh language.
+ - Added the ("ḍ", U+1E0D) unicode character. Thanks [@SamMercer172](https://github.com/SamMercer172)!
+ - Fixed an issue causing the left and right keys being discarded even when Quick Accent didn't activate.
 
 ### Registry Preview
 
-- Specify minimum size / position values for the UI (This was a hotfix for 0.69). Thanks [@randyrants](https://github.com/randyrants)!
-- Fixes in the UI command bar (This was a hotfix for 0.69). Thanks [@randyrants](https://github.com/randyrants)!
-- Fix crash on opening a file picker when running elevated (This was a hotfix for 0.69). Thanks [@randyrants](https://github.com/randyrants)!
-- Fixed tooltips having a transparent background (This was a hotfix for 0.69).
-- Fixed a file size limit typo. Thanks [@idma88](https://github.com/idma88)!
-- Improve hexadecimal value parsing. Thanks [@randyrants](https://github.com/randyrants)!
-- Added a button to open the Registry Editor at a selected key. Thanks [@randyrants](https://github.com/randyrants)!
-- Improve key and value parsing. Thanks [@randyrants](https://github.com/randyrants)!
-- Better theme support for caption bar. Thanks [@randyrants](https://github.com/randyrants)!
-- Fix an issue handling empty DWORD and QWORD values. Thanks [@randyrants](https://github.com/randyrants)!
+ - Fixed a bug causing DWORD values to not be shown correctly. Thanks [@randyrants](https://github.com/randyrants)!
+ - UI tweaks. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)!
+
+### Runner
+
+ - Show a warning asking the user to restart the computer after updating the PowerToys version.
+
+### Screen Ruler
+
+ - UI tweaks. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)!
 
 ### Settings
 
-- Update the What's New screen to hide the installer hashes in the new format (This was a hotfix for 0.69).
-- Fix crashes happening when using the Shortcut Control (This was a hotfix for 0.69).
-- The Settings window now has a minimum width. Thanks [@niels9001](https://github.com/niels9001)!
-- Prevent a second Settings instance from being opened on upgrade.
-- Fix accessibility issues on many pages. Thanks [@niels9001](https://github.com/niels9001)!
-
-### Documentation
-
-- Fix a dead link in documentation that was pointing to the wrong settings specification. Thanks [@zanseb](https://github.com/zanseb)!
-- Added some missing contributors to COMMUNITY.md
+ - Fix an unused Expander in the File Locksmith settings page.
+ - Added an info box to better explain what the extended context menu is.
 
 ### Development
 
-- Fixed the CI release pipelines hash generation (This was a hotfix for 0.69).
-- Added per-user installers to the winget package submission script.
-- Upgraded the Community Toolkit Labs dependency. Thanks [@niels9001](https://github.com/niels9001)!
-- Fixed building with Visual Studio 17.6. Thanks [@snickler](https://github.com/snickler)!
-- Upgraded the WebView 2 dependency.
-- Upgraded the WinAppSDK dependency to 1.3.1.
-- Fixed a typo preventing the clean up script to run. Thanks [@Sajad-Lx](https://github.com/Sajad-Lx)!
-- Fixed encoding on a test file to fix running tests in some configurations. Thanks [@VisualBasist](https://github.com/VisualBasist)!
-- Made the GPO release assets come named with a version in the build CI output.
+ - Projects were restructured to allow sharing the same folder and dependencies and to avoid resource name conflicts.
+ - Added scripts to CI to guard against applications having conflicting resources.
+ - Added scripts to CI to guard against depending on different versions of the same dependency.
+ - Test projects now build to a separate path.
+ - Dependencies updated across the solution to ensure every project is using the same dependencies.
 
-#### What is being planned for version 0.71
+#### What is being planned for version 0.73
 
-For [v0.71][github-next-release-work], we'll work on below:
+For [v0.73][github-next-release-work], we'll work on below:
 
-- Adjustments on feedback / stability / bug fixes
+ - New utility: Crop and Lock
+ - Language selection
+ - PowerRename enumeration keywords
+ - Modernize and refresh UX of PowerToys based on WPF
+ - Stability / bug fixes
+- Peek: UI improvements
 
 ## PowerToys Community
 
@@ -225,7 +245,3 @@ The application logs basic telemetry. Our Telemetry Data page (Coming Soon) has
 [vidConfOverview]: https://aka.ms/PowerToysOverview_VideoConference
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title=
 [usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
-
-<!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F44
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F43

doc/devdocs/modules/keyboardmanager/keyboardmanagerui.md

@@ -1,12 +1,12 @@
 # Keyboard Manager UI
 
 ## Table of Contents:
-1. [C++ XAML Islands](#c---xaml-islands)
+1. [C++ XAML Islands](#c-xaml-islands)
     1. [Debugging exceptions in XAML Islands](#debugging-exceptions-in-xaml-islands)
     2. [Build times](#build-times)
     3. [Setting custom backgrounds for Xaml Controls using brushes](#setting-custom-backgrounds-for-xaml-controls-using-brushes)
 2. [UI Structure](#ui-structure)
-3. [EditKeyboardWindow/EditShortcutsWindow](#editkeyboardwindow-editshortcutswindow)
+3. [EditKeyboardWindow / EditShortcutsWindow](#editkeyboardwindow--editshortcutswindow)
     1. [OK and Cancel button](#ok-and-cancel-button)
     2. [Delete button](#delete-button)
     3. [Handling common modifiers in EditKeyboardWindow](#handling-common-modifiers-in-editkeyboardwindow)
@@ -51,7 +51,7 @@ Since ComboBoxes are added dynamically, handlers have been added which [update t
 
 When the `EditKeyboardWindow`/`EditShortcutsWindow` is created, [we iterate through the remappings](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L254-L262) stored in `KeyboardManagerState` and add rows to the UI Grid. For both the windows we have `static` buffers [`singleKeyRemapBuffer`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.h#L39-L40) and [`shortcutRemapBuffer`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.h#L42-L43) which store the corresponding key/shortcuts as per the selections in the UI if they are valid with no warnings.
 
-## EditKeyboardWindow/EditShortcutsWindow 
+## EditKeyboardWindow / EditShortcutsWindow
 
 ### OK and Cancel button
 [On pressing the OK button](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L66-L89) in `EditKeyboardWindow`, first the [`CheckIfRemappingsAreValid` method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L10-L44) is executed which performs basic validity checks on the current remappings in the remap buffer (`static SingleKeyRemapControl::singleKeyRemapBuffer`), such as if there are no NULL columns and none of the source keys are repeated. All other validity checks are assumed to happen while the user adds the remapping. If this is found to be invalid a ContentDialog is displayed which shows that some remappings are invalid and if the user proceeds only the valid ones will be applied. If it is valid [`GetOrphanedKeys`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L46-L75) is executed which checks if any keys are orphaned (i.e. the key has been remapped and no other key has been remapped to it, so there is no way to send that key code), and a dialog is shown for notifying the user with a list of orphaned keys. After this the settings are [applied by adding it to the `KeyboardManagerState.singleKeyReMap` member](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L102-L164) and they are saved to the JSON file. `EditShortcutsWindow` differs slightly from this, as there is no orphaned keys check, and [on pressing OK](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp#L32-L47) both the global and app-specific shortcuts are validated and [updated](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L166-L223).

doc/devdocs/modules/launcher/plugins/community.valuegenerator.md

@@ -0,0 +1,56 @@
+# Value Generator Plugin
+
+The Value Generator plugin is used to generate hashes for strings, to calculate base64 encodings and to generate GUIDs versions 1, 3, 4 and 5.
+
+![Image of Value Generator plugin](/doc/images/launcher/plugin/community.valuegenerator.png)
+
+### [`IComputeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/IComputeRequest.cs)
+- Interface for a request for computation
+- the `bool Compute()` method must populate the `IsSuccessful` and one of the `Result` and `ErrorMessage` fields
+- The result of `string ResultToString()` will be used for the Result's title
+- The `Description` field will be used for the Result's subtitle
+
+### [`HashRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Hashing/HashRequest.cs)
+- Implements IComputeRequest
+- Supports the hashing algorithms from System.Security.Cryptography:
+  - MD5
+  - SHA1
+  - SHA256
+  - SHA384
+  - SHA512
+- If other algorithms are added to System.Security.Cryptography, they can be added to the `_algorithms` dictionary. [`InputParser.ParseInput()`](#inputparser) will need to return a `HashRequest` for the algorithm in the query
+
+### [`Base64Request`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Base64/Base64Request.cs)
+- Implements IComputeRequest
+- `Compute()` will populate `Result` with the base64 encoding of the byte array passed in the constructor
+
+### [`Base64DecodeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Base64/Base64DecodeRequest.cs)
+- Implements IComputeRequest
+- `Compute()` will populate `Result` with the decoded byte array of the base64 string passed in the constructor
+
+### [`GUIDRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/GUID/GUIDRequest.cs)
+- Implements IComputeRequest
+- Uses the [`GUIDGenerator`](#guidgenerator) class to generate or compute the requested GUID
+
+### [`GUIDGenerator`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/GUID/GUIDGenerator.cs)
+- Utility class for generating or calculating GUIDs
+- Generating GUID versions 1 and 4 is done using builtin APIs. [`UuidCreateSequential`](https://learn.microsoft.com/en-us/windows/win32/api/rpcdce/nf-rpcdce-uuidcreatesequential) for version 1 and `System.Guid.NewGuid()` for version 4
+- Versions 3 and 5 take two parameters, a namespace and a name
+- The namespace must be a valid GUID or one of the [predefined ones](https://datatracker.ietf.org/doc/html/rfc4122#appendix-C)
+- The `PredefinedNamespaces` dictionary contains aliases for the predefined namespaces
+- The name can be any string
+
+### [`InputParser`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/InputParser.cs)
+- It is responsible only for parsing the query from the user
+- Based on the user query, the `ParseInput()` method must return an object that implements the `IComputeRequest` interface or it must throw one of `FormatException` or `ArgumentException`
+- Throwing an `ArgumentException` should signal the fact the query contains a mistake that the user can fix (eg. an unsupported hash function, an invalid GUID version, an invalid namespace, etc)
+> The error message will be shown to the user and no log message will be created
+- Throwing a `FormatException` should signal either:
+  - that the query may become valid, and so it does not make sense to show an error just yet (eg. the query does not contain a request yet, a hash request without a string to hash)
+  - that the query is completely invalid
+> The error message will not be shown to the user but a log message will be created
+
+### Adding a new value generator
+1. To add a new value generator, create a folder under `/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/` and inside it add a class that implements `IComputeRequest`.
+2. Add any utility classes that are specific to the new generator inside the same folder to keep them separated from the other generators.
+3. Modify the `InputParser.ParseInput()` to handle a request for the new generator and return an instance of the class you created in step 1

doc/devdocs/settingsv2/ui-architecture.md

@@ -1,7 +1,7 @@
 # UI Architecture
 
- The UI code is distributed between two projects: [`PowerToys.Settings`](/src/settings-ui/Settings.UI) and [`Settings.UI`](/src/settings-ui/Settings.UI.Library). [`PowerToys.Settings`](/src/settings-ui/Settings.UI) is a Windows App Sdk .net Unpackaged application. It contains the views for base navigation and modules. Parent display window and corresponding code is present in [`MainWindow.xaml.`](/src/settings-ui/Settings.UI/MainWindow.xaml). Fig 1 provides a description of the UI controls hierarchy and each of the controls have been summarized below : 
-- [`ShellPage.xaml`](/src/settings-ui/Settings.UI/Views/ShellPage.xaml) is a WinUI control, consisting of a side navigation panel with an icon for each module. Clicking on a module icon loads the corresponding `setting.json` file and displays the data in the UI.
+ The UI code is distributed between two projects: [`PowerToys.Settings`](/src/settings-ui/Settings.UI) and [`Settings.UI`](/src/settings-ui/Settings.UI.Library). [`PowerToys.Settings`](/src/settings-ui/Settings.UI) is a Windows App Sdk .net Unpackaged application. It contains the views for base navigation and modules. Parent display window and corresponding code is present in [`MainWindow.xaml`](/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml). Fig 1 provides a description of the UI controls hierarchy and each of the controls have been summarized below : 
+- [`ShellPage.xaml`](/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml) is a WinUI control, consisting of a side navigation panel with an icon for each module. Clicking on a module icon loads the corresponding `setting.json` file and displays the data in the UI.
 
 ![Settings UI architecture](/doc/images/settingsv2/ui-architecture.png)
 **Fig 1: UI Architecture for settingsv2**

doc/thirdPartyRunPlugins.md

@@ -0,0 +1,35 @@
+# Third-Party plugins for PowerToy Run
+
+This is a collection of third-party plugins for PowerToys Run created by the community.
+
+## Installing and upgrading third-party PowerToys Run plugins
+
+The recommended path for the plugins is `%LOCALAPPDATA%\Microsoft\PowerToys\PowerToys Run\Plugins`.
+
+1. Close PowerToys.
+1. Copy the plugin folder to `%LOCALAPPDATA%\Microsoft\PowerToys\PowerToys Run\Plugins`.
+1. If you're upgrading a plugin, delete the previous version.
+1. Open PowerToys.
+
+Refer to plugin instruction for more details.
+
+## Disclaimer
+
+The following plugins are created and maintained by third-party and not officially supported or recognized by Microsoft.  
+Users install and use these plugins at their own risk, and Microsoft takes no responsibility for their functionality or any potential issues they may cause.  
+Contact the developers of a plugin directly for assistance with a specific plugin.
+
+## Plugins
+
+| Plugin | Author | Description |
+| ------ | ------ | ----------- |
+| [BrowserSearch](https://github.com/TBM13/BrowserSearch) | [TBM13](https://github.com/TBM13) | Search your browser history |
+| [Edge Favorite](https://github.com/davidegiacometti/PowerToys-Run-EdgeFavorite) | [davidegiacometti](https://github.com/davidegiacometti) | Open Microsoft Edge favorites |
+| [Everything](https://github.com/lin-ycv/EverythingPowerToys) | [Yu Chieh (Victor) Lin](https://github.com/Lin-ycv) | Get search results from Everything |
+| [GitHub Emoji](https://github.com/hlaueriksson/GEmojiSharp) | [hlaueriksson](https://github.com/hlaueriksson) | Search GitHub Emoji |
+| [GitKraken](https://github.com/davidegiacometti/PowerToys-Run-GitKraken) | [davidegiacometti](https://github.com/davidegiacometti) | Open GitKraken repositories |
+| [Guid](https://github.com/skttl/ptrun-guid) | [skttl](https://github.com/skttl) | Guid generator |
+| [PowerTranslator](https://github.com/N0I0C0K/PowerTranslator) | [N0I0C0K](https://github.com/N0I0C0K) | Text translator based on Youdao |
+| [Quick Lookup](https://github.com/GTGalaxi/quick-lookup-ptrun) | [gtgalaxi](https://github.com/GTGalaxi) | Search across multiple cyber security tools |
+| [Visual Studio](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents |
+| [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet |

installer/PowerToysSetup/AlwaysOnTop.wxs

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define AlwaysOnTopFiles=?>
-  <?define AlwaysOnTopFilesPath=$(var.BinDir)modules\$(var.AlwaysOnTopProjectName)\?>
-
-  <Fragment>
-    <DirectoryRef Id="AlwaysOnTopInstallFolder" FileSource="$(var.BinDir)modules\$(var.AlwaysOnTopProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--AlwaysOnTopFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="AlwaysOnTopComponentGroup">
-      <Component Id="RemoveAOTFolder" Guid="9966E305-C8B9-43D8-9F4A-30CD0E3746A5" Directory="AlwaysOnTopInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveAOTFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderAOTFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/Awake.wxs

@@ -4,29 +4,26 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define AwakeFiles=?>
-  <?define AwakeFilesPath=$(var.BinDir)modules\$(var.AwakeProjectName)\?>
   <?define AwakeImagesFiles=?>
-  <?define AwakeImagesFilesPath=$(var.BinDir)modules\$(var.AwakeProjectName)\Images?>
+  <?define AwakeImagesFilesPath=$(var.BinDir)\Assets\Awake\?>
 
   <Fragment>
-    <DirectoryRef Id="AwakeInstallFolder" FileSource="$(var.BinDir)modules\$(var.AwakeProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--AwakeFiles_Component_Def-->
+    <!-- Awake images -->
+
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="AwakeImagesFolder" Name="Awake" />
     </DirectoryRef>
 
-    <!-- Awake images -->
-    <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.BinDir)modules\$(var.AwakeProjectName)\Images">
+    <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.AwakeImagesFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--AwakeImagesFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="AwakeComponentGroup">
-      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="AwakeInstallFolder" >
+      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveAwakeFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderAwakeFolder" Directory="AwakeInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderAwakeImagesFolder" Directory="AwakeImagesFolder" On="uninstall"/>
       </Component>
     </ComponentGroup>

installer/PowerToysSetup/BaseApplications.wxs

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define BaseApplicationsFiles=?>
+  <?define BaseApplicationsFilesPath=$(var.BinDir)\?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--BaseApplicationsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="BaseApplicationsComponentGroup">
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetup/ColorPicker.wxs

@@ -4,30 +4,26 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ColorPickerFiles=?>
-  <?define ColorPickerFilesPath=$(var.BinDir)modules\$(var.ColorPickerProjectName)\?>
-  <?define ColorPickerResourcesFiles=?>
-  <?define ColorPickerResourcesFilesPath=$(var.BinDir)modules\$(var.ColorPickerProjectName)\Resources\?>
+  <?define ColorPickerAssetsFiles=?>
+  <?define ColorPickerAssetsFilesPath=$(var.BinDir)Assets\ColorPicker\?>
 
   <Fragment>
-    <DirectoryRef Id="ColorPickerInstallFolder" FileSource="$(var.ColorPickerFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ColorPickerFiles_Component_Def-->
+  <!-- Color Picker -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ColorPickerAssetsFolder" Name="ColorPicker" />
     </DirectoryRef>
-
     <!-- Color Picker Resources -->
-    <DirectoryRef Id="ColorPickerResourcesFolder" FileSource="$(var.ColorPickerResourcesFilesPath)">
+    <DirectoryRef Id="ColorPickerAssetsFolder" FileSource="$(var.ColorPickerAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--ColorPickerResourcesFiles_Component_Def-->
+    <!--ColorPickerAssetsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="ColorPickerComponentGroup">
-      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="ColorPickerInstallFolder" >
+      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveColorPickerFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderColorPickerFolder" Directory="ColorPickerInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderColorPickerResourcesFolder" Directory="ColorPickerResourcesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderColorPickerAssetsFolder" Directory="ColorPickerAssetsFolder" On="uninstall"/>
       </Component>
     </ComponentGroup>
 

installer/PowerToysSetup/Core.wxs

@@ -4,12 +4,6 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerToysInteropFiles=concrt140.dll;msvcp140.dll;msvcp140_1.dll;msvcp140_2.dll;msvcp140_atomic_wait.dll;msvcp140_codecvt_ids.dll;PowerToys.Interop.dll;vcamp140.dll;vccorlib140.dll;vcomp140.dll;vcruntime140.dll;vcruntime140_1.dll?>
-
-  <?define DotnetRuntimeFiles=?>
-
-  <?define DotnetRuntimeWPFFiles=?>
-
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
       <Component Id="powertoys_per_machine_comp" Win64="yes">
@@ -38,24 +32,6 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-      <Component Id="BackgroundActivator_dll" Win64="yes" Guid="A75E2882-7A8D-4332-89DD-831FFD6E0DD7">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="BackgroundActivator_dll" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PowerToys.BackgroundActivatorDLL.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PowerToys_ActionRunner_exe" Win64="yes" Guid="4AD4C092-1CE0-45F1-8A01-4D1C76A5D69E">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PowerToys_ActionRunner_exe" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PowerToys.ActionRunner.exe" Checksum="yes" />
-      </Component>
-      <Component Id="PowerToys_Update_exe" Win64="yes" Guid="A0BEAE0A-577A-40AC-8005-93BFF2ECE66C">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PowerToys_Update_exe" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PowerToys.Update.exe" Checksum="yes" />
-      </Component>
       <Component Id="License_rtf" Win64="yes" Guid="632C60DF-0DDC-4F14-8F2B-A28136CD9E63">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="License_rtf" Value="" KeyPath="yes"/>
@@ -87,32 +63,6 @@
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="DotnetDlls">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Dlls_DotnetFiles_Component" Guid="19488F16-3399-40AB-B7C4-CE3F27C1B294" Win64="yes">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Dlls_DotnetFiles_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <?foreach File in $(var.DotnetRuntimeFiles)?>
-          <File Source="$(var.BinDir)Settings\$(var.File)" />
-        <?endforeach?>
-        <?foreach File in $(var.DotnetRuntimeWPFFiles)?>
-          <File Source="$(var.BinDir)\modules\\ColorPicker\$(var.File)" />
-        <?endforeach?>
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="PowerToysInteropDlls">
-      <Component Id="Dlls_PowerToysInteropFiles_Component" Win64="yes" Guid="9ED70966-805B-4E7E-AFB0-879D4DE23818">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Dlls_PowerToysInteropFiles_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <?foreach File in $(var.PowerToysInteropFiles)?>
-          <File Id="Dlls_PowerToysInterop_File_$(var.File)" Source="$(var.BinDir)\$(var.File)" />
-        <?endforeach?>
-      </Component>
-    </DirectoryRef>
-
     <DirectoryRef Id="DesktopFolder">
       <Component Id="DesktopShortcut" >
         <Condition>INSTALLDESKTOPSHORTCUT</Condition>
@@ -139,25 +89,18 @@
           <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
             <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes"/>
           </RegistryKey>
-          <RemoveFolder Id="RemoveDotnetDlls" Directory="DotnetDlls" On="uninstall"/>
-          <RemoveFolder Id="RemovePowerToysInteropDlls" Directory="PowerToysInteropDlls" On="uninstall"/>
-          <RemoveFolder Id="RemoveModulesInstallFolder" Directory="ModulesInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveDllsFolder" Directory="DllsFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall"/>
         </Component>
         <ComponentRef Id="powertoys_exe" />
         <ComponentRef Id="PowerToysStartMenuShortcut"/>
-        <ComponentRef Id="BackgroundActivator_dll" />
-        <ComponentRef Id="PowerToys_ActionRunner_exe" />
-        <ComponentRef Id="PowerToys_Update_exe" />
         <ComponentRef Id="powertoys_per_machine_comp" />
         <ComponentRef Id="powertoys_toast_clsid" />
         <ComponentRef Id="License_rtf" />
         <ComponentRef Id="Notice_md" />
         <ComponentRef Id="DesktopShortcut" />
-
-        <ComponentRef Id="Dlls_DotnetFiles_Component" />
-        <ComponentRef Id="Dlls_PowerToysInteropFiles_Component" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/FancyZones.wxs

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define FancyZonesFiles=?>
-  <?define FancyZonesFilesPath=$(var.BinDir)modules\$(var.FancyZonesProjectName)\?>
-
-  <Fragment>
-    <DirectoryRef Id="FancyZonesInstallFolder" FileSource="$(var.BinDir)modules\">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--FancyZonesFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="FancyZonesComponentGroup">
-      <Component Id="RemoveFancyZonesFolder" Guid="A04620E9-2C1F-4986-99FA-B1545C7AC4D0" Directory="FancyZonesInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveFancyZonesFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderFancyZonesFolder" Directory="FancyZonesInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>

installer/PowerToysSetup/FileExplorerPreview.wxs

@@ -4,15 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerPreviewFiles=?>
-  <?define PowerPreviewFilesPath=$(var.BinDir)modules\FileExplorerPreview\?>
+  <?define MonacoPreviewHandlerMonacoAssetsFiles=?>
+  <?define MonacoPreviewHandlerMonacoAssetsFilesPath=$(var.BinDir)Assets\Monaco\?>
   <?define MonacoPreviewHandlerCustomLanguagesFiles=?>
-  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)modules\FileExplorerPreview\customLanguages\?>
+  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)Assets\Monaco\customLanguages\?>
 
   <Fragment>
-    <DirectoryRef Id="FileExplorerPreviewInstallFolder" FileSource="$(var.PowerPreviewFilesPath)">
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="MonacoAssetsFolder" Name="Monaco">
+        <Directory Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" Name="customLanguages" />
+        <Directory Id="MonacoPreviewHandlerMonacoSRCFolder" Name="monacoSRC" />
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="MonacoAssetsFolder" FileSource="$(var.MonacoPreviewHandlerMonacoAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerPreviewFiles_Component_Def-->
+    <!--MonacoPreviewHandlerMonacoAssetsFiles_Component_Def-->
     </DirectoryRef>
 
     <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.MonacoPreviewHandlerCustomLanguagesFilesPath)">
@@ -21,11 +28,11 @@
     </DirectoryRef>
 
     <ComponentGroup Id="FileExplorerPreviewComponentGroup">
-      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="FileExplorerPreviewInstallFolder" >
+      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="MonacoAssetsFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveFileExplorerPreviewFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderFileExplorerPreviewFolder" Directory="FileExplorerPreviewInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveMonacoAssetsFolder" Directory="MonacoAssetsFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerCustomLanguagesFolder" Directory="MonacoPreviewHandlerMonacoCustomLanguagesFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerMonacoSRCFolder" Directory="MonacoPreviewHandlerMonacoSRCFolder" On="uninstall"/>
       </Component>

installer/PowerToysSetup/FileLocksmith.wxs

@@ -4,21 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define FileLocksmithFiles=?>
-  <?define FileLocksmithFilesPath=$(var.BinDir)modules\$(var.FileLocksmithProjectName)\?>
   <?define FileLocksmithAssetsFiles=?>
-  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\?>
+  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\FileLocksmith\?>
 
   <Fragment>
-    <DirectoryRef Id="FileLocksmithInstallFolder" FileSource="$(var.FileLocksmithFilesPath)">
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="FileLocksmithAssetsInstallFolder" Name="FileLocksmith" />
+    </DirectoryRef>
+    <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--FileLocksmithFiles_Component_Def-->
+    <!--FileLocksmithAssetsFiles_Component_Def-->
       <!-- !Warning! Make sure to change Component Guid if you update something here -->
       <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Win64="yes">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
           <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
           <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
-          <RegistryValue Type="string" Key="InprocServer32" Value="[FileLocksmithInstallFolder]PowerToys.FileLocksmithExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.FileLocksmithExt.dll" />
           <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
         </RegistryKey>
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
@@ -27,38 +28,17 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
           <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
         </RegistryKey>
-		<RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\FileLocksmithExt">
-          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
-        </RegistryKey>
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--FileLocksmithAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="FileLocksmithMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="FileLocksmithMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="39889494-838A-4B9A-BD0A-105A1F0161BF">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="FileLocksmithMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="FileLocksmithMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
       </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="FileLocksmithComponentGroup">
-      <Component Id="RemoveFileLocksmithFolder" Guid="1DAC9A3F-D89C-4730-BF57-1778E011709B" Directory="FileLocksmithInstallFolder" >
+      <Component Id="RemoveFileLocksmithFolder" Guid="1DAC9A3F-D89C-4730-BF57-1778E011709B" Directory="FileLocksmithAssetsInstallFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveFileLocksmithFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderFileLocksmithFolder" Directory="FileLocksmithInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderFileLocksmithMicrosoftUIXamlInstallFolder" Directory="FileLocksmithMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderFileLocksmithMicrosoftUIXamlAssetsInstallFolder" Directory="FileLocksmithMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
       <ComponentRef Id="Module_FileLocksmith" />
-      <ComponentRef Id="FileLocksmithMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/Hosts.wxs

@@ -4,42 +4,25 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define HostsFiles=?>
-  <?define HostsFilesPath=$(var.BinDir)modules\$(var.HostsProjectName)\?>
   <?define HostsAssetsFiles=?>
-  <?define HostsAssetsFilesPath=$(var.BinDir)modules\$(var.HostsProjectName)\Assets\?>
+  <?define HostsAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Hosts\?>
 
   <Fragment>
-    <DirectoryRef Id="HostsInstallFolder" FileSource="$(var.HostsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--HostsFiles_Component_Def-->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="HostsAssetsFolder" Name="Hosts" />
     </DirectoryRef>
-
-    <DirectoryRef Id="HostsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.HostsProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="HostsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Win64="yes" Guid="6E1EE639-B06A-41C5-9B3E-23B570FF8F1B">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="HostsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="HostsMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
     <DirectoryRef Id="HostsAssetsFolder" FileSource="$(var.HostsAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--HostsAssetsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="HostsComponentGroup">
-      <Component Id="RemoveHostsFolder" Guid="7FF19EBB-041D-4498-9826-C9AECEBE86E1" Directory="HostsInstallFolder" >
+      <Component Id="RemoveHostsFolder" Guid="7FF19EBB-041D-4498-9826-C9AECEBE86E1" Directory="HostsAssetsFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveHostsFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderHostsFolder" Directory="HostsInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderHostsAssetsFolder" Directory="HostsAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderHostsMicrosoftUIXamlFolder" Directory="HostsMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderHostsMicrosoftUIXamlAssetsFolder" Directory="HostsMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="HostsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/ImageResizer.wxs

@@ -4,19 +4,21 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ImageResizerFiles=?>
-  <?define ImageResizerFilesPath=$(var.BinDir)modules\$(var.ImageResizerProjectName)\?>
   <?define ImageResizerAssetsFiles=?>
-  <?define ImageResizerAssetsFilesPath=$(var.BinDir)modules\$(var.ImageResizerProjectName)\Assets\?>
+  <?define ImageResizerAssetsFilesPath=$(var.BinDir)Assets\ImageResizer\?>
 
   <Fragment>
-    <DirectoryRef Id="ImageResizerInstallFolder" FileSource="$(var.ImageResizerFilesPath)">
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ImageResizerAssetsFolder" Name="ImageResizer" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--ImageResizerFiles_Component_Def-->
+    <!--ImageResizerAssetsFiles_Component_Def-->
 
       <Component Id="Module_ImageResizer_Registry" Win64="yes">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
-          <RegistryValue Value="[ImageResizerInstallFolder]PowerToys.ImageResizerExt.dll" Type="string" />
+          <RegistryValue Value="[INSTALLFOLDER]PowerToys.ImageResizerExt.dll" Type="string" />
           <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
         </RegistryKey>
 
@@ -81,17 +83,11 @@
 
     </DirectoryRef>
 
-    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ImageResizerAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
     <ComponentGroup Id="ImageResizerComponentGroup">
-      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerInstallFolder" >
+      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerAssetsFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveImageResizerFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderImageResizerFolder" Directory="ImageResizerInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall"/>
       </Component>
       <ComponentRef Id="Module_ImageResizer_Registry" />

installer/PowerToysSetup/KeyboardManager.wxs

@@ -5,46 +5,39 @@
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
   <Fragment>
-    <!-- KBM -->
-    <DirectoryRef Id="KeyboardManagerInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\">
-      <Component Id="Module_KeyboardManager" Win64="yes" Guid="88F5D745-025A-4A0D-85CC-EFC8FF348C88">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_KeyboardManager" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\PowerToys.KeyboardManager.dll" />
-      </Component>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
+      <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
     </DirectoryRef>
 
     <!-- KBM Editor -->
-    <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEditor">
+    <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEditor">
       <Component Id="Module_KeyboardManager_Editor" Win64="yes" Guid="E9C74E78-970F-4DF5-9CC0-FFD3CCF285B4">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_KeyboardManager_Editor" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEditor\PowerToys.KeyboardManagerEditor.exe" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\PowerToys.KeyboardManagerEditor.exe" />
       </Component>
     </DirectoryRef>
 
     <!-- KBM Engine -->
-    <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEngine">
+    <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEngine">
       <Component Id="Module_KeyboardManager_Engine" Win64="yes" Guid="3F58FCE3-B44D-4676-94E9-C59F1FE42FFD">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_KeyboardManager_Engine" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe" />
+        <File Source="$(var.BinDir)KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe" />
       </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="KeyboardManagerComponentGroup">
-      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="KeyboardManagerInstallFolder" >
+      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveKeyboardManagerFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderKeyboardManagerFolder" Directory="KeyboardManagerInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="Module_KeyboardManager" />
       <ComponentRef Id="Module_KeyboardManager_Editor" />
       <ComponentRef Id="Module_KeyboardManager_Engine" />
     </ComponentGroup>

installer/PowerToysSetup/MeasureTool.wxs

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define MeasureToolFiles=?>
-  <?define MeasureToolFilesPath=$(var.BinDir)modules\$(var.MeasureToolProjectName)\?>
-
-  <Fragment>
-    <DirectoryRef Id="MeasureToolInstallFolder" FileSource="$(var.BinDir)modules\$(var.MeasureToolProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MeasureToolFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="MeasureToolMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.MeasureToolProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="MeasureToolMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Win64="yes" Guid="B6DFD9D3-D66C-472F-B0AB-E1F9BBB7CFE9">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="MeasureToolMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="MeasureToolMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG" Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
-
-    <ComponentGroup Id="MeasureToolComponentGroup">
-      <Component Id="RemoveMeasureToolFolder" Guid="319A3AB5-A340-4662-98E0-3B5A41EA50F4" Directory="MeasureToolInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveMeasureToolFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderMeasureToolFolder" Directory="MeasureToolInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderMeasureToolMicrosoftUIXamlFolder" Directory="MeasureToolMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderMeasureToolMicrosoftUIXamlAssetsFolder" Directory="MeasureToolMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="MeasureToolMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/MouseUtils.wxs

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define MouseUtilsFiles=?>
-  <?define MouseUtilsFilesPath=$(var.BinDir)modules\$(var.MouseUtilsProjectName)\?>
-
-  <?define MouseJumpUIFiles=?>
-  <?define MouseJumpUIFilesPath=$(var.BinDir)modules\$(var.MouseUtilsProjectName)\MouseJumpUI\?>
-
-  <Fragment>
-    <DirectoryRef Id="MouseUtilsInstallFolder" FileSource="$(var.MouseUtilsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MouseUtilsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="MouseJumpUIFolder" FileSource="$(var.MouseJumpUIFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MouseJumpUIFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="MouseUtilsComponentGroup">
-      <Component Id="RemoveMouseUtilsFolder" Guid="4F535EA2-0879-4243-A35C-C4DBFCA50B1A" Directory="MouseUtilsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveMouseUtilsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderMouseUtilsFolder" Directory="MouseUtilsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderMouseJumpUIFolder" Directory="MouseJumpUIFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/MouseWithoutBorders.wxs

@@ -5,28 +5,14 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define MouseWithoutBordersFiles=?>
-  <?define MouseWithoutBordersFilesPath=$(var.BinDir)modules\$(var.MouseWithoutBordersProjectName)\?>
-
   <Fragment>
-    <DirectoryRef Id="MouseWithoutBordersInstallFolder" FileSource="$(var.BinDir)modules\$(var.MouseWithoutBordersProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MouseWithoutBordersFiles_Component_Def-->
-    </DirectoryRef>
-
     <ComponentGroup Id="MouseWithoutBordersComponentGroup">
-      <Component Id="RemoveMouseWithoutBordersFolder" Guid="303F02A7-7E90-486F-8558-BB1A1BEC39E1" Directory="MouseWithoutBordersInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveMouseWithoutBordersFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderMouseWithoutBordersFolder" Directory="MouseWithoutBordersInstallFolder" On="uninstall"/>
-      </Component>
-      <Component Id="MouseWithoutBordersFirewallComponent" Directory="MouseWithoutBordersInstallFolder" Guid="FEA59459-EC0E-4636-8E76-4C168235982B">
+      <Component Id="MouseWithoutBordersFirewallComponent" Directory="INSTALLFOLDER" Guid="FEA59459-EC0E-4636-8E76-4C168235982B">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="MouseWithoutBordersFirewall_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
         <!-- The program name used here will be generated by generateFileComponents.ps1 -->
-        <Fire:FirewallException Id="MouseWithoutBordersFirewallException1" Name="PowerToys.MouseWithoutBorders" Scope="localSubnet" IgnoreFailure="yes" Program="[#MouseWithoutBordersFiles_File_PowerToys.MouseWithoutBorders.exe]" />
+        <Fire:FirewallException Id="MouseWithoutBordersFirewallException1" Name="PowerToys.MouseWithoutBorders" Scope="localSubnet" IgnoreFailure="yes" Program="[#BaseApplicationsFiles_File_PowerToys.MouseWithoutBorders.exe]" />
       </Component>
     </ComponentGroup>
 

installer/PowerToysSetup/PastePlain.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="PastePlainInstallFolder" FileSource="$(var.BinDir)modules\$(var.PastePlainProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_PastePlain" Win64="yes" Guid="80F648F2-29F6-4685-AED4-04DC1B6EE176">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_PastePlain" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.PastePlainProjectName)\PowerToys.PastePlainModuleInterface.dll" />
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="PastePlainComponentGroup">
-      <Component Id="RemovePastePlainFolder" Guid="118DC166-23CF-4EF7-B510-2ED79A2A78AD" Directory="PastePlainInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePastePlainFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPastePlainInstallFolder" Directory="PastePlainInstallFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="Module_PastePlain" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/Peek.wxs

@@ -4,42 +4,25 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PeekFiles=?>
-  <?define PeekFilesPath=$(var.BinDir)modules\$(var.PeekProjectName)\?>
   <?define PeekAssetsFiles=?>
-  <?define PeekAssetsFilesPath=$(var.BinDir)modules\$(var.PeekProjectName)\Assets\?>
+  <?define PeekAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Peek\?>
 
   <Fragment>
-    <DirectoryRef Id="PeekInstallFolder" FileSource="$(var.PeekFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PeekFiles_Component_Def-->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PeekAssetsFolder" Name="Peek" />
     </DirectoryRef>
-
-    <DirectoryRef Id="PeekMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.PeekProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="PeekMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Win64="yes" Guid="754276D6-F258-4161-8DED-9A6CBB168305">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PeekMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PeekMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG" Source="$(var.BinDir)modules\$(var.PeekProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
     <DirectoryRef Id="PeekAssetsFolder" FileSource="$(var.PeekAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--PeekAssetsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="PeekComponentGroup">
-      <Component Id="RemovePeekFolder" Guid="EF9422D7-FF0A-4887-968A-E61B53ACD23A" Directory="PeekInstallFolder" >
+      <Component Id="RemovePeekFolder" Guid="EF9422D7-FF0A-4887-968A-E61B53ACD23A" Directory="PeekAssetsFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemovePeekFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPeekFolder" Directory="PeekInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderPeekAssetsFolder" Directory="PeekAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPeekMicrosoftUIXamlFolder" Directory="PeekMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPeekMicrosoftUIXamlAssetsFolder" Directory="PeekMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="PeekMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/PowerAccent.wxs

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define PowerAccentFiles=?>
-  <?define PowerAccentFilesPath=$(var.BinDir)modules\$(var.PowerAccentProjectName)\?>
-
-  <Fragment>
-    <DirectoryRef Id="PowerAccentInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerAccentProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerAccentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="PowerAccentComponentGroup">
-      <Component Id="RemovePowerAccentFolder" Guid="D6796C0F-AD6E-4A78-B321-E968A08AC93B" Directory="PowerAccentInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePowerAccentFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerAccentFolder" Directory="PowerAccentInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/PowerRename.wxs

@@ -4,21 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerRenameFiles=?>
-  <?define PowerRenameFilesPath=$(var.BinDir)modules\$(var.PowerRenameProjectName)\?>
   <?define PowerRenameAssetsFiles=?>
-  <?define PowerRenameAssetsFilesPath=$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\?>
+  <?define PowerRenameAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerRename\?>
 
   <Fragment>
-    <DirectoryRef Id="PowerRenameInstallFolder" FileSource="$(var.PowerRenameFilesPath)">
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PowerRenameAssetsFolder" Name="PowerRename" />
+    </DirectoryRef>
+    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerRenameFiles_Component_Def-->
+    <!--PowerRenameAssetsFiles_Component_Def-->
       <!-- !Warning! Make sure to change Component Guid if you update something here -->
       <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Win64="yes">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
           <RegistryValue Type="string" Value="PowerRename Shell Extension" />
           <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
-          <RegistryValue Type="string" Key="InprocServer32" Value="[PowerRenameInstallFolder]PowerToys.PowerRenameExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.PowerRenameExt.dll" />
           <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
         </RegistryKey>
         <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
@@ -31,32 +32,14 @@
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="PowerRenameMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="PowerRenameMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="793472B1-4481-4A7A-AA76-9E1E54FAB9DB">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PowerRenameMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PowerRenameMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerRenameAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
     <ComponentGroup Id="PowerRenameComponentGroup">
-      <Component Id="RemovePowerRenameFolder" Guid="2028549B-02E3-4D80-BC3F-59AEA37AC73D" Directory="PowerRenameInstallFolder" >
+      <Component Id="RemovePowerRenameFolder" Guid="2028549B-02E3-4D80-BC3F-59AEA37AC73D" Directory="PowerRenameAssetsFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemovePowerRenameFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerRenameFolder" Directory="PowerRenameInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPowerRenameMicrosoftUIXamlInstallFolder" Directory="PowerRenameMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPowerRenameMicrosoftUIXamlAssetsInstallFolder" Directory="PowerRenameMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
       <ComponentRef Id="Module_PowerRename" />
-	    <ComponentRef Id="PowerRenameMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -4,44 +4,44 @@
   <Import Project="..\..\src\Version.props" />
 
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\modules\FileExplorerPreview\monacoSRC</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication
     using a specific profile. If you're doing local installer builds, this will
     simulate the build pipeline doing that for you. -->
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0
-SET PTRoot=..\..\..\..\..
+SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
-)</PreBuildEvent>
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+</PreBuildEvent>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\modules\FileExplorerPreview\monacoSRC</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0
-SET PTRoot=..\..\..\..\..
+SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
-)</PreBuildEvent>
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
     <PostBuildEvent>
-    call move /Y ..\..\..\AlwaysOnTop.wxs.bk ..\..\..\AlwaysOnTop.wxs
     call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
+    call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
     call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
     call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
-    call move /Y ..\..\..\FancyZones.wxs.bk ..\..\..\FancyZones.wxs
     call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
     call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
     call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
     call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
     call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
-    call move /Y ..\..\..\MeasureTool.wxs.bk ..\..\..\MeasureTool.wxs
-    call move /Y ..\..\..\MouseUtils.wxs.bk ..\..\..\MouseUtils.wxs
     call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
     call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
-    call move /Y ..\..\..\PowerAccent.wxs.bk ..\..\..\PowerAccent.wxs
     call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
     call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
     call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
@@ -49,11 +49,10 @@ call "..\..\..\publish.cmd" arm64
     call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
     call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
     call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
-    call move /Y ..\..\..\TextExtractor.wxs.bk ..\..\..\TextExtractor.wxs
     call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
     call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
     call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
-    call move /Y ..\..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h.bk ..\..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h
+    call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
     </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -102,29 +101,24 @@ call "..\..\..\publish.cmd" arm64
     <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
     <Compile Include="Product.wxs" />
 
-    <Compile Include="AlwaysOnTop.wxs" />
     <Compile Include="Awake.wxs" />
+    <Compile Include="BaseApplications.wxs" />
     <Compile Include="ColorPicker.wxs" />
-    <Compile Include="FancyZones.wxs" />
     <Compile Include="FileExplorerPreview.wxs" />
     <Compile Include="FileLocksmith.wxs" />
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
     <Compile Include="KeyboardManager.wxs" />
-    <Compile Include="MeasureTool.wxs" />
-    <Compile Include="MouseUtils.wxs" />
-    <Compile Include="PastePlain.wxs" />
     <Compile Include="Peek.wxs" />
-    <Compile Include="PowerAccent.wxs" />
     <Compile Include="PowerRename.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />
     <Compile Include="Settings.wxs" />
     <Compile Include="ShortcutGuide.wxs" />
-    <Compile Include="TextExtractor.wxs" />
     <Compile Include="Tools.wxs" />
     <Compile Include="VideoConference.wxs" />
     <Compile Include="MouseWithoutBorders.wxs" />
+    <Compile Include="WinUI3Applications.wxs" />
 
     <Compile Include="MonacoSRC.wxs" />
 
@@ -183,9 +177,9 @@ call "..\..\..\publish.cmd" arm64
 	<Target Name="BeforeBuild">
 	</Target>
 	<Target Name="AfterBuild">
-	</Target>
+	</Target> -->
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\modules\FileExplorerPreview\monacoSRC"
+    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC"
       PreprocessorVariable="var.MonacoSRCHarvestPath"
       OutputFile="MonacoSRC.wxs"
       ComponentGroupName="MonacoSRCHeatGenerated"
@@ -197,6 +191,6 @@ call "..\..\..\publish.cmd" arm64
       SuppressFragments="false"
       SuppressRegistry="false"
       SuppressRootDirectory="true"/>
-  </Target>	-->
+  </Target>
 
 </Project>

installer/PowerToysSetup/Product.wxs

@@ -54,27 +54,21 @@
     <Feature Id="CoreFeature" Title="PowerToys" AllowAdvertise="no" Absent="disallow" TypicalDefault="install"
              Description="Contains all PowerToys features.">
       <ComponentGroupRef Id="CoreComponents" />
-
-      <ComponentGroupRef Id="AlwaysOnTopComponentGroup" />
+      <ComponentGroupRef Id="BaseApplicationsComponentGroup" />
+      <ComponentGroupRef Id="WinUI3ApplicationsComponentGroup" />
       <ComponentGroupRef Id="AwakeComponentGroup" />
       <ComponentGroupRef Id="ColorPickerComponentGroup" />
-      <ComponentGroupRef Id="FancyZonesComponentGroup" />
       <ComponentGroupRef Id="FileExplorerPreviewComponentGroup" />
       <ComponentGroupRef Id="FileLocksmithComponentGroup" />
       <ComponentGroupRef Id="HostsComponentGroup" />
       <ComponentGroupRef Id="ImageResizerComponentGroup" />
       <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
-      <ComponentGroupRef Id="MeasureToolComponentGroup" />
-      <ComponentGroupRef Id="MouseUtilsComponentGroup" />
-      <ComponentGroupRef Id="PastePlainComponentGroup" />
       <ComponentGroupRef Id="PeekComponentGroup" />
-      <ComponentGroupRef Id="PowerAccentComponentGroup" />
       <ComponentGroupRef Id="PowerRenameComponentGroup" />
       <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
       <ComponentGroupRef Id="RunComponentGroup" />
       <ComponentGroupRef Id="SettingsComponentGroup" />
       <ComponentGroupRef Id="ShortcutGuideComponentGroup" />
-      <ComponentGroupRef Id="TextExtractorComponentGroup" />
       <ComponentGroupRef Id="VideoConferenceComponentGroup" />
       <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
         
@@ -118,7 +112,6 @@
     <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Images\dialog.png" />
     <WixVariable Id="WixUILicenseRtf" Value="$(var.RepoDir)\installer\License.rtf" />
     <Property Id="INSTALLSTARTMENUSHORTCUT" Value="1"/>
-    <Property Id="CREATESCHEDULEDTASK" Value="1"/>
     <Property Id="WixShellExecTarget" Value="[#PowerToys_ActionRunner.exe]" />
 
     <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[$(var.DefaultInstallDir)]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute"></SetProperty>
@@ -138,33 +131,15 @@
     <SetProperty Id="InstallScope" Value="$(var.InstallScope)" Before="DetectPrevInstallPath" Sequence="execute"></SetProperty>
     <InstallExecuteSequence>
       <Custom Action="DetectPrevInstallPath" After="AppSearch" />
-      <Custom Action="SetRegisterPowerToysSchTaskParam" Before="RegisterPowerToysSchTask" />
+      <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
       <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
-      <Custom Action="SetCreateWinAppSDKHardlinksParam" Before="CreateWinAppSDKHardlinks" />
-      <Custom Action="SetDeleteWinAppSDKHardlinksParam" Before="DeleteWinAppSDKHardlinks" />
-      <Custom Action="SetCreatePTInteropHardlinksParam" Before="CreatePTInteropHardlinks" />
-      <Custom Action="SetDeletePTInteropHardlinksParam" Before="DeletePTInteropHardlinks" />
-      <Custom Action="SetCreateDotnetRuntimeHardlinksParam" Before="CreateDotnetRuntimeHardlinks" />
-      <Custom Action="SetDeleteDotnetRuntimeHardlinksParam" Before="DeleteDotnetRuntimeHardlinks" />
-      <Custom Action="RegisterPowerToysSchTask" After="InstallFiles">
-        NOT Installed and CREATESCHEDULEDTASK = 1
-      </Custom>
       <Custom Action="CheckGPO" After="InstallInitialize">
         NOT Installed
       </Custom>
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
         NOT Installed
       </Custom>
-      <Custom Action="CreateWinAppSDKHardlinks" After="InstallFiles">
-        NOT Installed
-      </Custom>
-      <Custom Action="CreatePTInteropHardlinks" After="InstallFiles">
-        NOT Installed
-      </Custom>
-      <Custom Action="CreateDotnetRuntimeHardlinks" After="InstallFiles">
-        NOT Installed
-      </Custom>
       <Custom Action="WixCloseApplications" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->
@@ -183,16 +158,6 @@
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="DeleteWinAppSDKHardlinks" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-
-      <Custom Action="DeletePTInteropHardlinks" After="InstallInitialize" />
-
-      <Custom Action="DeleteDotnetRuntimeHardlinks" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-
       <Custom Action="UninstallServicesTask" After="InstallFinalize">
           Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
       </Custom>
@@ -202,17 +167,22 @@
       </Custom>-->
       <Custom Action="TerminateProcesses" Before="InstallValidate" />
 
-      <Custom Action="LaunchPowerToys" After="InstallFinalize">NOT Installed</Custom>
+      <Custom Action="LaunchPowerToys" Before="InstallFinalize">NOT Installed</Custom>
 
     </InstallExecuteSequence>
 
+    <CustomAction Id="SetLaunchPowerToysParam"
+                    Property="LaunchPowerToys"
+                    Value="[INSTALLFOLDER]" />
+
     <CustomAction
       Id="LaunchPowerToys"
-      Execute="immediate"
+      Return="ignore"
       Impersonate="yes"
-      Return="asyncNoWait"
-      FileKey="PowerToys.exe"
-      ExeCommand="--dont-elevate" />
+      Execute="deferred"
+      BinaryKey="PTCustomActions"
+      DllEntry="LaunchPowerToysCA"
+      />
 
     <CustomAction
       Id="TerminateProcesses"
@@ -221,10 +191,6 @@
       BinaryKey="PTCustomActions"
       DllEntry="TerminateProcessesCA" />
 
-    <CustomAction Id="SetRegisterPowerToysSchTaskParam"
-                  Property="RegisterPowerToysSchTask"
-                  Value="[INSTALLFOLDER]PowerToys.exe" />
-
     <CustomAction Id="SetApplyModulesRegistryChangeSetsParam"
                     Property="ApplyModulesRegistryChangeSets"
                     Value="[INSTALLFOLDER]" />
@@ -257,61 +223,6 @@
                     Property="DeleteDotnetRuntimeHardlinks"
                     Value="[INSTALLFOLDER]" />
 
-    <!-- Needs to Impersonate="no" and Execute="deferred" in order to run elevated. -->
-    <CustomAction Id="RegisterPowerToysSchTask"
-                  Return="ignore"
-                  Impersonate="no"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CreateScheduledTaskCA"
-                   />
-
-    <CustomAction Id="DeleteWinAppSDKHardlinks"
-                      Return="ignore"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="DeleteWinAppSDKHardlinksCA"
-                  />
-
-    <CustomAction Id="CreateWinAppSDKHardlinks"
-                      Return="ignore"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="CreateWinAppSDKHardlinksCA"
-                  />
-
-    <CustomAction Id="DeletePTInteropHardlinks"
-                      Return="ignore"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="DeletePTInteropHardlinksCA"
-                  />
-
-    <CustomAction Id="CreatePTInteropHardlinks"
-                      Return="ignore"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="CreatePTInteropHardlinksCA"
-                  />
-
-    <CustomAction Id="DeleteDotnetRuntimeHardlinks"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="DeleteDotnetRuntimeHardlinksCA"
-                  />
-
-    <CustomAction Id="CreateDotnetRuntimeHardlinks"
-                Impersonate="no"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="CreateDotnetRuntimeHardlinksCA"
-                  />
-
     <CustomAction Id="RemovePowerToysSchTasks"
                   Return="ignore"
                   Impersonate="no"
@@ -450,187 +361,16 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.DefaultInstallDir)">
         <Directory Id="INSTALLFOLDER" Name="PowerToys">
-          <Directory Id="DllsFolder" Name="dll">
-            <Directory Id="DotnetDlls" Name="dotnet" />
-            <Directory Id="WinAppSDKDlls" Name="WinAppSDK" />
-            <Directory Id="PowerToysInteropDlls" Name="Interop" />
+          <Directory Id="BaseApplicationsAssetsFolder" Name="Assets">
+          </Directory>
+          <Directory Id="WinUI3AppsInstallFolder" Name="WinUI3Apps">
+              <Directory Id="WinUI3AppsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
+                <Directory Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
+              </Directory>
+            <Directory Id="WinUI3AppsAssetsFolder" Name="Assets">
+            </Directory>
           </Directory>
           <Directory Id="ToolsFolder" Name="Tools"/>
-          <Directory Id="ModulesInstallFolder" Name="modules">
-            <Directory Id="ImageResizerInstallFolder" Name="$(var.ImageResizerProjectName)">
-              <Directory Id="ImageResizerAssetsFolder" Name="Assets" />
-            </Directory>
-            <Directory Id="PowerAccentInstallFolder" Name="$(var.PowerAccentProjectName)">
-            </Directory>
-            <Directory Id="FileLocksmithInstallFolder" Name="$(var.FileLocksmithProjectName)">
-              <Directory Id="FileLocksmithAssetsInstallFolder" Name="Assets" />
-              <Directory Id="FileLocksmithMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                <Directory Id="FileLocksmithMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            </Directory>
-            <Directory Id="PowerRenameInstallFolder" Name="$(var.PowerRenameProjectName)">
-              <Directory Id="PowerRenameAssetsFolder" Name="Assets" />
-							<Directory Id="PowerRenameMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                <Directory Id="PowerRenameMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            </Directory>
-            <Directory Id="ShortcutGuideInstallFolder" Name="ShortcutGuide">
-              <Directory Id="ShortcutGuideExecutableInstallFolder" Name="ShortcutGuide">
-                <Directory Id="ShortcutGuideSvgsInstallFolder" Name="svgs"/>
-              </Directory>
-              <Directory Id="ShortcutGuideModuleInterfaceInstallFolder" Name="ShortcutGuideModuleInterface"/>
-            </Directory>
-            <Directory Id="VideoConferenceInstallFolder" Name="$(var.VideoConferenceProjectName)">
-              <Directory Id="VideoConferenceIconsFolder" Name="Icons" />
-            </Directory>
-            <Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview">
-              <Directory Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" Name="customLanguages" />
-              <Directory Id="MonacoPreviewHandlerMonacoSRCFolder" Name="monacoSRC" />
-            </Directory>
-            <Directory Id="FancyZonesInstallFolder" Name="$(var.FancyZonesProjectName)" />
-            <Directory Id="PowerOCRInstallFolder" Name="$(var.PowerOCRProjectName)" />
-            <Directory Id="AwakeInstallFolder" Name="$(var.AwakeProjectName)">
-              <Directory Id="AwakeImagesFolder" Name="Images" />
-            </Directory>
-
-            <!-- KBM -->
-            <Directory Id="KeyboardManagerInstallFolder" Name="$(var.KeyboardManagerProjectName)">
-              <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
-              <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
-            </Directory>
-
-            <!-- Color Picker -->
-            <Directory Id="ColorPickerInstallFolder" Name="$(var.ColorPickerProjectName)">
-              <Directory Id="ColorPickerResourcesFolder" Name="Resources"/>
-            </Directory>
-
-            <!-- Mouse Utils -->
-            <Directory Id="MouseUtilsInstallFolder" Name="$(var.MouseUtilsProjectName)">
-              <Directory Id="MouseJumpUIFolder" Name="MouseJumpUI" />
-            </Directory>
-
-            <!-- PastePlain -->
-            <Directory Id="PastePlainInstallFolder" Name="$(var.PastePlainProjectName)">
-            </Directory>
-
-            <!-- RegistryPreview -->
-            <Directory Id="RegistryPreviewInstallFolder" Name="$(var.RegistryPreviewProjectName)">
-              <Directory Id="RegistryPreviewAssetsInstallFolder" Name="Assets" />
-              <Directory Id="RegistryPreviewMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                <Directory Id="RegistryPreviewMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            </Directory>
-
-            <!-- AlwaysOnTop -->
-            <Directory Id="AlwaysOnTopInstallFolder" Name="$(var.AlwaysOnTopProjectName)">
-            </Directory>
-
-            <!-- MeasureTool -->
-            <Directory Id="MeasureToolInstallFolder" Name="$(var.MeasureToolProjectName)">
-                <Directory Id="MeasureToolMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                  <Directory Id="MeasureToolMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-                </Directory>
-            </Directory>
-            
-            <!-- Hosts -->
-            <Directory Id="HostsInstallFolder" Name="$(var.HostsProjectName)">
-              <Directory Id="HostsAssetsFolder" Name="Assets" />
-              <Directory Id="HostsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                <Directory Id="HostsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            </Directory>
-
-            <!-- MouseWithoutBorders -->
-            <Directory Id="MouseWithoutBordersInstallFolder" Name="$(var.MouseWithoutBordersProjectName)">
-            </Directory>
-
-            <!-- Peek -->
-            <Directory Id="PeekInstallFolder" Name="$(var.PeekProjectName)">
-              <Directory Id="PeekAssetsFolder" Name="Assets" />
-              <Directory Id="PeekMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                  <Directory Id="PeekMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            </Directory>
-
-            <!-- Launcher -->
-            <Directory Id="LauncherInstallFolder" Name="launcher">
-              <Directory Id="LauncherImagesFolder" Name="Images" />
-
-              <!-- Plugins -->
-              <Directory Id="LauncherPluginsFolder" Name="Plugins">
-                <Directory Id="WebSearchPluginFolder" Name="WebSearch">
-                  <Directory Id="WebSearchImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="CalculatorPluginFolder" Name="Calculator">
-                  <Directory Id="CalculatorImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="FolderPluginFolder" Name="Folder">
-                  <Directory Id="FolderPluginImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="ProgramPluginFolder" Name="Program">
-                  <Directory Id="ProgramImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="ShellPluginFolder" Name="Shell">
-                  <Directory Id="ShellImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="IndexerPluginFolder" Name="Indexer">
-                  <Directory Id="IndexerImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="UriPluginFolder" Name="Uri">
-                  <Directory Id="UriImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="HistoryPluginFolder" Name="History">
-                  <Directory Id="HistoryImagesFolder" Name="Images" />
-                </Directory>								
-                <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
-                  <Directory Id="UnitConverterImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspace">
-                  <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
-                  <Directory Id="WindowWalkerImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="OneNotePluginFolder" Name="OneNote">
-                  <Directory Id="OneNoteImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="PowerToysPluginFolder" Name="PowerToys">
-                  <Directory Id="PowerToysImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="RegistryPluginFolder" Name="Registry">
-                  <Directory Id="RegistryImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="ServicePluginFolder" Name="Service">
-                  <Directory Id="ServiceImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
-                  <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="SystemPluginFolder" Name="System">
-                  <Directory Id="SystemImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="TimeDatePluginFolder" Name="TimeDate">
-                  <Directory Id="TimeDateImagesFolder" Name="Images" />
-                </Directory>
-                <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
-                  <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-
-          <!-- Settings -->
-          <Directory Id="SettingsV2InstallFolder" Name="Settings">
-            <Directory Id="SettingsV2AssetsInstallFolder" Name="Assets">
-              <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="FluentIcons" />
-              <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
-                <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
-              </Directory>
-            </Directory>
-            <Directory Id="SettingsV2MicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-              <Directory Id="SettingsV2MicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-            </Directory>
-          </Directory>
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder">

installer/PowerToysSetup/RegistryPreview.wxs

@@ -4,44 +4,26 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define RegistryPreviewFiles=?>
-  <?define RegistryPreviewFilesPath=$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\?>
-
   <?define RegistryPreviewAssetsFiles=?>
-  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\Assets?>
+  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\RegistryPreview?>
 
   <Fragment>
     <!-- Registry Preview -->
-    <DirectoryRef Id="RegistryPreviewInstallFolder" FileSource="$(var.RegistryPreviewFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--RegistryPreviewFiles_Component_Def-->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="RegistryPreviewAssetsInstallFolder" Name="RegistryPreview" />
     </DirectoryRef>
-
     <DirectoryRef Id="RegistryPreviewAssetsInstallFolder" FileSource="$(var.RegistryPreviewAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--RegistryPreviewAssetsFiles_Component_Def-->
     </DirectoryRef>
 
-    <DirectoryRef Id="RegistryPreviewMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\Microsoft.UI.Xaml\Assets">
-      <Component Id="RegistryPreviewMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="CBE56377-8E9F-4C4E-85B5-514916FCE818">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RegistryPreviewMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="RegistryPreviewMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
     <ComponentGroup Id="RegistryPreviewComponentGroup">
-      <Component Id="RemoveRegistryPreviewFolder" Guid="D3DBC395-FAC5-44B1-BE44-3FE2B6E0F391" Directory="RegistryPreviewInstallFolder" >
+      <Component Id="RemoveRegistryPreviewFolder" Guid="D3DBC395-FAC5-44B1-BE44-3FE2B6E0F391" Directory="RegistryPreviewAssetsInstallFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveRegistryPreviewFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderRegistryPreviewFolder" Directory="RegistryPreviewInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderRegistryPreviewAssetsFolder" Directory="RegistryPreviewAssetsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderRegistryPreviewMicrosoftUIXamlInstallFolder" Directory="RegistryPreviewMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderRegistryPreviewMicrosoftUIXamlAssetsInstallFolder" Directory="RegistryPreviewMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="RegistryPreviewMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/Resources.wxs

@@ -11,7 +11,7 @@
   <Fragment>
     <!-- Resource directories should be added only if the installer is built on the build farm -->
     <?ifdef env.IsPipeline?>
-      <?foreach ParentDirectory in LauncherInstallFolder;FancyZonesInstallFolder;ImageResizerInstallFolder;ColorPickerInstallFolder;FileExplorerPreviewInstallFolder;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
         <DirectoryRef Id="$(var.ParentDirectory)">
           <!-- Resource file directories -->
           <?foreach Language in $(var.LocLanguageList)?>
@@ -143,75 +143,75 @@
       <?endif?>
       <Component
           Id="Launcher_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)LauncherInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)00">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\$(var.Language)\PowerToys.PowerLauncher.resources.dll" />
+        <File Id="Launcher_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerLauncher.resources.dll" />
       </Component>
       <Component
           Id="FancyZonesEditor_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FancyZonesInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)01">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="FancyZonesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\$(var.FancyZonesProjectName)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
+        <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
       </Component>
       <Component
           Id="ImageResizer_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)ImageResizerInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)02">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="ImageResizer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\$(var.ImageResizerProjectName)\$(var.Language)\PowerToys.ImageResizer.resources.dll" />
+        <File Id="ImageResizer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ImageResizer.resources.dll" />
       </Component>
       <Component
           Id="ColorPicker_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)ColorPickerInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)03">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="ColorPicker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="ColorPicker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\$(var.ColorPickerProjectName)\$(var.Language)\PowerToys.ColorPickerUI.resources.dll" />
+        <File Id="ColorPicker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ColorPickerUI.resources.dll" />
       </Component>
       <Component
           Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)04">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.Language)\PowerToys.MarkdownPreviewHandler.resources.dll" />
+        <File Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)$(var.Language)\PowerToys.MarkdownPreviewHandler.resources.dll" />
       </Component>
       <Component
           Id="SVGPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)05">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="SVGPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="SVGPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.Language)\PowerToys.SvgPreviewHandler.resources.dll" />
+        <File Id="SVGPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.SvgPreviewHandler.resources.dll" />
       </Component>
       <Component
           Id="PDFPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)06">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="PDFPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="PDFPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.Language)\PowerToys.PdfPreviewHandler.resources.dll" />
+        <File Id="PDFPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PdfPreviewHandler.resources.dll" />
       </Component>
       <Component
           Id="GcodePreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)07">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="GcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="GcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.Language)\PowerToys.GcodePreviewHandler.resources.dll" />
+        <File Id="GcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.GcodePreviewHandler.resources.dll" />
       </Component>
       <!-- PowerToys Run aka Launcher plugin resources -->
       <Component
@@ -221,7 +221,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Calculator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Calculator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Calculator\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Calculator.resources.dll" />
+        <File Id="Launcher_Calculator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Calculator\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Calculator.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Folder_$(var.IdSafeLanguage)_Component"
@@ -230,7 +230,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Folder_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Folder_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Folder\$(var.Language)\Microsoft.Plugin.Folder.resources.dll" />
+        <File Id="Launcher_Folder_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Folder\$(var.Language)\Microsoft.Plugin.Folder.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Program_$(var.IdSafeLanguage)_Component"
@@ -239,7 +239,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Program_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Program_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Program\$(var.Language)\Microsoft.Plugin.Program.resources.dll" />
+        <File Id="Launcher_Program_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Program\$(var.Language)\Microsoft.Plugin.Program.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Shell_$(var.IdSafeLanguage)_Component"
@@ -248,7 +248,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Shell_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Shell_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Shell\$(var.Language)\Microsoft.Plugin.Shell.resources.dll" />
+        <File Id="Launcher_Shell_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Shell\$(var.Language)\Microsoft.Plugin.Shell.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Indexer_$(var.IdSafeLanguage)_Component"
@@ -257,7 +257,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Indexer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Indexer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Indexer\$(var.Language)\Microsoft.Plugin.Indexer.resources.dll" />
+        <File Id="Launcher_Indexer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Indexer\$(var.Language)\Microsoft.Plugin.Indexer.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Uri_$(var.IdSafeLanguage)_Component"
@@ -266,7 +266,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Uri_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Uri_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Uri\$(var.Language)\Microsoft.Plugin.Uri.resources.dll" />
+        <File Id="Launcher_Uri_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Uri\$(var.Language)\Microsoft.Plugin.Uri.resources.dll" />
       </Component>
       <Component
           Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component"
@@ -275,7 +275,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\$(var.Language)\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.resources.dll" />
+        <File Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\VSCodeWorkspaces\$(var.Language)\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.resources.dll" />
       </Component>
       <Component Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component"
                  Guid="$(var.CompGUIDPrefix)0F"
@@ -283,7 +283,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\WindowWalker\$(var.Language)\Microsoft.Plugin.WindowWalker.resources.dll" />
+        <File Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowWalker\$(var.Language)\Microsoft.Plugin.WindowWalker.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Registry_$(var.IdSafeLanguage)_Component"
@@ -292,7 +292,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Registry_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Registry_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Registry\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Registry.resources.dll" />
+        <File Id="Launcher_Registry_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Registry\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Registry.resources.dll" />
       </Component>
       <Component
           Id="Launcher_Service_$(var.IdSafeLanguage)_Component"
@@ -301,7 +301,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_Service_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_Service_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\Service\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Service.resources.dll" />
+        <File Id="Launcher_Service_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Service\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Service.resources.dll" />
       </Component>
       <Component
           Id="Launcher_System_$(var.IdSafeLanguage)_Component"
@@ -310,7 +310,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_System_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_System_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\System\$(var.Language)\Microsoft.PowerToys.Run.Plugin.System.resources.dll" />
+        <File Id="Launcher_System_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\System\$(var.Language)\Microsoft.PowerToys.Run.Plugin.System.resources.dll" />
       </Component>
       <Component
           Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component"
@@ -319,7 +319,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\WindowsSettings\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsSettings.resources.dll" />
+        <File Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsSettings\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsSettings.resources.dll" />
       </Component>
       <Component
           Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component"
@@ -328,7 +328,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.resources.dll" />
+        <File Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsTerminal\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.resources.dll" />
       </Component>
       <Component
           Id="Launcher_WebSearch_$(var.IdSafeLanguage)_Component"
@@ -337,7 +337,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_WebSearch_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_WebSearch_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\WebSearch\$(var.Language)\Community.PowerToys.Run.Plugin.WebSearch.resources.dll" />
+        <File Id="Launcher_WebSearch_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WebSearch\$(var.Language)\Community.PowerToys.Run.Plugin.WebSearch.resources.dll" />
       </Component>
       <Component
           Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component"
@@ -346,7 +346,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\UnitConverter\$(var.Language)\Community.PowerToys.Run.Plugin.UnitConverter.resources.dll" />
+        <File Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\UnitConverter\$(var.Language)\Community.PowerToys.Run.Plugin.UnitConverter.resources.dll" />
       </Component>
       <Component
                 Id="Launcher_TimeDate_$(var.IdSafeLanguage)_Component"
@@ -355,7 +355,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_TimeDate_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_TimeDate_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\TimeDate\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeDate.resources.dll" />
+        <File Id="Launcher_TimeDate_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\TimeDate\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeDate.resources.dll" />
       </Component>
       <Component
           Id="Launcher_OneNote_$(var.IdSafeLanguage)_Component"
@@ -364,16 +364,16 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Resource$(var.IdSafeLanguage)OneNotePluginFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_OneNote_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\OneNote\$(var.Language)\Microsoft.PowerToys.Run.Plugin.OneNote.resources.dll" />
+        <File Id="Launcher_OneNote_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\OneNote\$(var.Language)\Microsoft.PowerToys.Run.Plugin.OneNote.resources.dll" />
       </Component>
       <Component
           Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)1A">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.Language)\PowerToys.MonacoPreviewHandler.resources.dll" />
+        <File Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.MonacoPreviewHandler.resources.dll" />
       </Component>
       <Component
           Id="Launcher_History_$(var.IdSafeLanguage)_Component"
@@ -382,7 +382,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_History_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
+        <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
       </Component>
       <Component
           Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
@@ -391,7 +391,16 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Launcher_PowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
+        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
+      </Component>
+      <Component
+         Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component"
+         Guid="$(var.CompGUIDPrefix)1D"
+         Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\ValueGenerator\$(var.Language)\Community.PowerToys.Run.Plugin.ValueGenerator.resources.dll" />
       </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
@@ -399,7 +408,7 @@
       <?endif?>
 
     <?ifdef env.IsPipeline?>
-      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="WinAppSDKDlls" >
+      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveResourcesFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
@@ -450,11 +459,7 @@
       <?else?>
       <?define IdSafeLanguage = $(var.Language)?>
       <?endif?>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)LauncherInstallFolder" Directory="Resource$(var.IdSafeLanguage)LauncherInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FancyZonesInstallFolder" Directory="Resource$(var.IdSafeLanguage)FancyZonesInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ImageResizerInstallFolder" Directory="Resource$(var.IdSafeLanguage)ImageResizerInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ColorPickerInstallFolder" Directory="Resource$(var.IdSafeLanguage)ColorPickerInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder" Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)INSTALLFOLDER" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)CalculatorPluginFolder" Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FolderPluginFolder" Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ProgramPluginFolder" Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder" On="uninstall"/>
@@ -474,6 +479,7 @@
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)OneNotePluginFolder" Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
       <?undef IdSafeLanguage?>
         <?endforeach?>
       </Component>

installer/PowerToysSetup/Run.wxs

@@ -4,113 +4,179 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define launcherFiles=?>
-  <?define launcherFilesPath=$(var.BinDir)modules\launcher\?>
-
   <?define launcherImagesComponentFiles=?>
-  <?define launcherImagesComponentFilesPath=$(var.BinDir)modules\launcher\Images\?>
+  <?define launcherImagesComponentFilesPath=$(var.BinDir)Assets\PowerLauncher\?>
 
   <?define calcComponentFiles=?>
-  <?define calcComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Calculator\?>
+  <?define calcComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\?>
   <?define calcImagesComponentFiles=?>
-  <?define calcImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Calculator\Images\?>
+  <?define calcImagesComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\Images\?>
 
   <?define FolderComponentFiles=?>
-  <?define FolderComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Folder\?>
+  <?define FolderComponentFilesPath=$(var.BinDir)RunPlugins\Folder\?>
   <?define FolderImagesComponentFiles=?>
-  <?define FolderImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Folder\Images?>
+  <?define FolderImagesComponentFilesPath=$(var.BinDir)RunPlugins\Folder\Images?>
 
   <?define ProgramComponentFiles=?>
-  <?define ProgramComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Program\?>
+  <?define ProgramComponentFilesPath=$(var.BinDir)RunPlugins\Program\?>
   <?define ProgramImagesComponentFiles=?>
-  <?define ProgramImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Program\Images\?>
+  <?define ProgramImagesComponentFilesPath=$(var.BinDir)RunPlugins\Program\Images\?>
 
   <?define ShellComponentFiles=?>
-  <?define ShellComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Shell\?>
+  <?define ShellComponentFilesPath=$(var.BinDir)RunPlugins\Shell\?>
   <?define ShellImagesComponentFiles=?>
-  <?define ShellImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Shell\Images\?>
+  <?define ShellImagesComponentFilesPath=$(var.BinDir)RunPlugins\Shell\Images\?>
 
   <?define IndexerComponentFiles=?>
-  <?define IndexerComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Indexer\?>
+  <?define IndexerComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\?>
   <?define IndexerImagesComponentFiles=?>
-  <?define IndexerImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Indexer\Images\?>
+  <?define IndexerImagesComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\Images\?>
 
   <?define UnitConvCompFiles=?>
-  <?define UnitConvCompFilesPath=$(var.BinDir)modules\launcher\Plugins\UnitConverter\?>
+  <?define UnitConvCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\?>
   <?define UnitConvImagesCompFiles=?>
-  <?define UnitConvImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\UnitConverter\Images\?>
+  <?define UnitConvImagesCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\Images\?>
 
   <?define WebSrchCompFiles=?>
-  <?define WebSrchCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WebSearch\?>
+  <?define WebSrchCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\?>
   <?define WebSrchImagesCompFiles=?>
-  <?define WebSrchImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WebSearch\Images\?>
+  <?define WebSrchImagesCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\Images\?>
 
   <?define HistoryPluginComponentFiles=?>
-  <?define HistoryPluginComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\History\?>
+  <?define HistoryPluginComponentFilesPath=$(var.BinDir)RunPlugins\History\?>
   <?define HistoryPluginImagesComponentFiles=?>
-  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\History\Images\?>
+  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)RunPlugins\History\Images\?>
 
   <?define UriComponentFiles=?>
-  <?define UriComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Uri\?>
+  <?define UriComponentFilesPath=$(var.BinDir)RunPlugins\Uri\?>
   <?define UriImagesComponentFiles=?>
-  <?define UriImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Uri\Images\?>
+  <?define UriImagesComponentFilesPath=$(var.BinDir)RunPlugins\Uri\Images\?>
 
   <?define VSCWrkCompFiles=?>
-  <?define VSCWrkCompFilesPath=$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\?>
+  <?define VSCWrkCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\?>
   <?define VSCWrkImagesCompFiles=?>
-  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\?>
+  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\Images\?>
 
   <?define WindowWlkrCompFiles=?>
-  <?define WindowWlkrCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowWalker\?>
+  <?define WindowWlkrCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\?>
   <?define WindowWlkrImagesCompFiles=?>
-  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowWalker\Images\?>
+  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\Images\?>
 
   <?define OneNoteComponentFiles=?>
-  <?define OneNoteComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\OneNote\?>
+  <?define OneNoteComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\?>
   <?define OneNoteImagesComponentFiles=?>
-  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\OneNote\Images\?>
+  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\Images\?>
 
   <?define RegistryComponentFiles=?>
-  <?define RegistryComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Registry\?>
+  <?define RegistryComponentFilesPath=$(var.BinDir)RunPlugins\Registry\?>
   <?define RegistryImagesComponentFiles=?>
-  <?define RegistryImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Registry\Images\?>
+  <?define RegistryImagesComponentFilesPath=$(var.BinDir)RunPlugins\Registry\Images\?>
 
   <?define ServiceComponentFiles=?>
-  <?define ServiceComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Service\?>
+  <?define ServiceComponentFilesPath=$(var.BinDir)RunPlugins\Service\?>
   <?define ServiceImagesComponentFiles=?>
-  <?define ServiceImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Service\Images\?>
+  <?define ServiceImagesComponentFilesPath=$(var.BinDir)RunPlugins\Service\Images\?>
 
   <?define SystemComponentFiles=?>
-  <?define SystemComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\System\?>
+  <?define SystemComponentFilesPath=$(var.BinDir)RunPlugins\System\?>
   <?define SystemImagesComponentFiles=?>
-  <?define SystemImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\System\Images\?>
+  <?define SystemImagesComponentFilesPath=$(var.BinDir)RunPlugins\System\Images\?>
 
   <?define TimeDateComponentFiles=?>
-  <?define TimeDateComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\TimeDate\?>
+  <?define TimeDateComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\?>
   <?define TimeDateImagesComponentFiles=?>
-  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\TimeDate\Images\?>
+  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\Images\?>
 
   <?define WinSetCmpFiles=?>
-  <?define WinSetCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsSettings\?>
+  <?define WinSetCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\?>
   <?define WinSetImagesCmpFiles=?>
-  <?define WinSetImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsSettings\Images\?>
+  <?define WinSetImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\Images\?>
 
   <?define WinTermCmpFiles=?>
-  <?define WinTermCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\?>
+  <?define WinTermCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\?>
   <?define WinTermImagesCmpFiles=?>
-  <?define WinTermImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\Images\?>
+  <?define WinTermImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\Images\?>
 
   <?define PowerToysCmpFiles=?>
-  <?define PowerToysCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\?>
+  <?define PowerToysCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\?>
   <?define PowerToysImagesCmpFiles=?>
-  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\Images\?>
+  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\Images\?>
+
+  <?define ValueGeneratorCmpFiles=?>
+  <?define ValueGeneratorCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\?>
+  <?define ValueGeneratorImagesCmpFiles=?>
+  <?define ValueGeneratorImagesCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\Images\?>
 
   <Fragment>
-    <DirectoryRef Id="LauncherInstallFolder" FileSource="$(var.launcherFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--launcherFiles_Component_Def-->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="LauncherImagesFolder" Name="PowerLauncher" />
     </DirectoryRef>
 
+    <DirectoryRef Id="INSTALLFOLDER">
+      <!-- Plugins -->
+      <Directory Id="LauncherPluginsFolder" Name="RunPlugins">
+        <Directory Id="WebSearchPluginFolder" Name="WebSearch">
+          <Directory Id="WebSearchImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="CalculatorPluginFolder" Name="Calculator">
+          <Directory Id="CalculatorImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="FolderPluginFolder" Name="Folder">
+          <Directory Id="FolderPluginImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ProgramPluginFolder" Name="Program">
+          <Directory Id="ProgramImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ShellPluginFolder" Name="Shell">
+          <Directory Id="ShellImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="IndexerPluginFolder" Name="Indexer">
+          <Directory Id="IndexerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UriPluginFolder" Name="Uri">
+          <Directory Id="UriImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="HistoryPluginFolder" Name="History">
+          <Directory Id="HistoryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
+          <Directory Id="UnitConverterImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspace">
+          <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
+          <Directory Id="WindowWalkerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="OneNotePluginFolder" Name="OneNote">
+          <Directory Id="OneNoteImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="PowerToysPluginFolder" Name="PowerToys">
+          <Directory Id="PowerToysImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="RegistryPluginFolder" Name="Registry">
+          <Directory Id="RegistryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ServicePluginFolder" Name="Service">
+          <Directory Id="ServiceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
+          <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="SystemPluginFolder" Name="System">
+          <Directory Id="SystemImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="TimeDatePluginFolder" Name="TimeDate">
+          <Directory Id="TimeDateImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
+          <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ValueGeneratorPluginFolder" Name="ValueGenerator">
+          <Directory Id="ValueGeneratorImagesFolder" Name="Images" />
+        </Directory>
+      </Directory>
+    </DirectoryRef>
 
     <DirectoryRef Id="LauncherImagesFolder" FileSource="$(var.launcherImagesComponentFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
@@ -319,12 +385,21 @@
       <!--PowerToysImagesCmpFiles_Component_Def-->
     </DirectoryRef>
 
+    <DirectoryRef Id="ValueGeneratorPluginFolder" FileSource="$(var.ValueGeneratorCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ValueGeneratorImagesFolder" FileSource="$(var.ValueGeneratorImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
     <ComponentGroup Id="RunComponentGroup">
-      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="LauncherInstallFolder" >
+      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveLauncherFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderLauncherFolder" Directory="LauncherInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderLauncherImagesFolder" Directory="LauncherImagesFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderLauncherPluginsFolder" Directory="LauncherPluginsFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderCalculatorPluginFolder" Directory="CalculatorPluginFolder" On="uninstall"/>
@@ -365,6 +440,8 @@
         <RemoveFolder Id="RemoveFolderWindowsTerminalImagesFolder" Directory="WindowsTerminalImagesFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorPluginFolder" Directory="ValueGeneratorPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorImagesFolder" Directory="ValueGeneratorImagesFolder" On="uninstall"/>
       </Component>
     </ComponentGroup>
   </Fragment>

installer/PowerToysSetup/Settings.wxs

@@ -4,27 +4,27 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define SettingsV2Files=?>
-  <?define SettingsV2FilesPath=$(var.BinDir)Settings\?>
-
   <?define SettingsV2AssetsFiles=?>
-  <?define SettingsV2AssetsFilesPath=$(var.BinDir)Settings\Assets\?>
+  <?define SettingsV2AssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\?>
 
   <?define SettingsV2AssetsModulesFiles=?>
-  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)Settings\Assets\Modules\?>
+  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\?>
 
   <?define SettingsV2OOBEAssetsModulesFiles=?>
-  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)Settings\Assets\Modules\OOBE\?>
+  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\OOBE\?>
 
   <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
-  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)Settings\Assets\FluentIcons\?>
+  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\FluentIcons\?>
 
   <Fragment>
-    <DirectoryRef Id="SettingsV2InstallFolder" FileSource="$(var.SettingsV2FilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2Files_Component_Def-->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="FluentIcons" />
+        <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
+          <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
+        </Directory>
+      </Directory>
     </DirectoryRef>
-
     <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--SettingsV2AssetsFiles_Component_Def-->
@@ -45,30 +45,17 @@
     <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
     </DirectoryRef>
 
-    <DirectoryRef Id="SettingsV2MicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)Settings\Microsoft.UI.Xaml\Assets">
-      <Component Id="SettingsV2MicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="8F33803D-E220-4D7E-9FFA-761FD4679517">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="SettingsV2MicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="SettingsV2MicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)Settings\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-    </DirectoryRef>
-
     <ComponentGroup Id="SettingsComponentGroup">
 
-      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2InstallFolder" >
+      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2AssetsInstallFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveSettingsFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderSettingsV2InstallFolder" Directory="SettingsV2InstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsV2MicrosoftUIXamlInstallFolder" Directory="SettingsV2MicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsV2MicrosoftUIXamlAssetsInstallFolder" Directory="SettingsV2MicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="SettingsV2MicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/ShortcutGuide.wxs

@@ -5,49 +5,26 @@
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
   <?define ShortcutGuideSvgFiles=?>
-  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\modules\ShortcutGuide\ShortcutGuide\svgs\?>
-
-  <?define ShortcutGuideExecutable=$(var.BinDir)\modules\ShortcutGuide\ShortcutGuide?>
-  <?define ShortcutGuideModuleInterface=$(var.BinDir)\modules\ShortcutGuide\ShortcutGuideModuleInterface?>
+  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
 
   <Fragment>
     <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ShortcutGuideSvgsInstallFolder" Name="ShortcutGuide" />
+    </DirectoryRef>
     <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideSvgFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--ShortcutGuideSvgFiles_Component_Def-->
     </DirectoryRef>
 
     <!-- Shortcut guide -->
-    <DirectoryRef Id="ShortcutGuideModuleInterfaceInstallFolder" FileSource="$(var.ShortcutGuideModuleInterface)">
-      <Component Id="Module_ShortcutGuideModuleInterface" Win64="yes" Guid="FE659C42-9738-4B2E-836A-D08903E2B7EE">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_ShortcutGuideModuleInterface" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.ShortcutGuideModuleInterface)\PowerToys.ShortcutGuideModuleInterface.dll" />
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="ShortcutGuideExecutableInstallFolder" FileSource="$(var.ShortcutGuideExecutable)">
-      <Component Id="Module_ShortcutGuideExecutable" Win64="yes" Guid="0A4AFD4F-9498-4F50-B2F5-CA3C786EBBE8">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_ShortcutGuideExecutable" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.ShortcutGuideExecutable)\PowerToys.ShortcutGuide.exe" />
-      </Component>
-    </DirectoryRef>
-
     <ComponentGroup Id="ShortcutGuideComponentGroup" >
-      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideInstallFolder" >
+      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideSvgsInstallFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderShortcutGuideInstallFolder" Directory="ShortcutGuideInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderShortcutGuideExecutableInstallFolder" Directory="ShortcutGuideExecutableInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderShortcutGuideSvgsInstallFolder" Directory="ShortcutGuideSvgsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderShortcutGuideModuleInterfaceInstallFolder" Directory="ShortcutGuideModuleInterfaceInstallFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="Module_ShortcutGuideModuleInterface" />
-      <ComponentRef Id="Module_ShortcutGuideExecutable" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/TextExtractor.wxs

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define TextExtractorFiles=?>
-  <?define TextExtractorFilesPath=$(var.BinDir)modules\$(var.PowerOCRProjectName)\?>
-
-  <Fragment>
-    <DirectoryRef Id="PowerOCRInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerOCRProjectName)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--TextExtractorFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="TextExtractorComponentGroup">
-      <Component Id="RemoveTextExtractorFolder" Guid="0F988887-25BE-43D1-A983-78A79EC2CE41" Directory="PowerOCRInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveTextExtractorFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerOCRInstallFolder" Directory="PowerOCRInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>

installer/PowerToysSetup/VideoConference.wxs

@@ -5,56 +5,51 @@
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
   <Fragment>
-    <DirectoryRef Id="VideoConferenceInstallFolder" FileSource="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\">
+    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
       <!-- !Warning! Make sure to change Component Guid if you update the file list -->
       <Component Id="Module_VideoConference" Guid="CCE30DCC-AC6B-4A2D-9BD8-2E9598E5B785" Win64="yes">
         <Condition>WINDOWSBUILDNUMBER >= 19041</Condition>
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_VideoConference" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceModule.dll" />
-        <File Source="$(var.BinX32Dir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_x86.dll" />
-        <?if $(var.Platform) = x64?>
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_x64.dll" />
-        <?else?>
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_ARM64.dll" />
-        <?endif?>
-
+        <File Source="$(var.BinX32Dir)PowerToys.VideoConferenceProxyFilter_x86.dll" />
       </Component>
     </DirectoryRef>
-    <DirectoryRef Id="VideoConferenceIconsFolder" FileSource="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons">
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="VideoConferenceAssetsFolder" Name="VCM"/>
+    </DirectoryRef>
+    <DirectoryRef Id="VideoConferenceAssetsFolder" FileSource="$(var.BinDir)\Assets\VCM">
       <!-- !Warning! Make sure to change Component Guid if you update the file list -->
       <Component Id="Module_VideoConferenceIcons" Guid="E78339BF-58D8-48F2-A1C3-E1C3DC72DCAE" Win64="yes">
         <Condition>WINDOWSBUILDNUMBER >= 19041</Condition>
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_VideoConferenceIcons" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-NotInUse Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-NotInUse Light.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-Off Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-Off Light.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-On Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\Off-On Light.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-NotInUse Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-NotInUse Light.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-Off Light.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-Off Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Dark.png" />
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-NotInUse Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-NotInUse Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-Off Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-Off Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-On Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\Off-On Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-NotInUse Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-NotInUse Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-Off Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-Off Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-On Dark.png" />
+        <File Source="$(var.BinDir)Assets\VCM\On-On Light.png" />
+        <File Source="$(var.BinDir)Assets\VCM\black.bmp" />
       </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="VideoConferenceComponentGroup">
-      <Component Id="RemoveVideoConferenceFolder" Guid="C6F2BE3D-FDE3-4CDB-BB51-A43E1B7B1606" Directory="VideoConferenceInstallFolder" >
+      <Component Id="RemoveVideoConferenceFolder" Guid="C6F2BE3D-FDE3-4CDB-BB51-A43E1B7B1606" Directory="INSTALLFOLDER" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveVideoConferenceFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderVideoConferenceInstallFolder" Directory="VideoConferenceInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderVideoConferenceIconsFolder" Directory="VideoConferenceIconsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVideoConferenceAssetsFolder" Directory="VideoConferenceAssetsFolder" On="uninstall"/>
       </Component>
       <ComponentRef Id="Module_VideoConference" />
       <ComponentRef Id="Module_VideoConferenceIcons" />
-
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/WinAppSDK.wxs

@@ -4,141 +4,140 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define WinAppSDKFiles=CoreMessagingXP.dll;DWriteCore.dll;DwmSceneI.dll;MRM.dll;Microsoft.DirectManipulation.dll;Microsoft.InputStateManager.dll;Microsoft.Internal.FrameworkUdk.dll;Microsoft.UI.Composition.OSSupport.dll;Microsoft.UI.Input.dll;Microsoft.UI.Windowing.Core.dll;Microsoft.UI.Windowing.dll;Microsoft.UI.Xaml.Controls.dll;Microsoft.UI.Xaml.Controls.pri;Microsoft.UI.Xaml.Internal.dll;Microsoft.UI.Xaml.Phone.dll;Microsoft.Web.WebView2.Core.dll;Microsoft.Windows.AppNotifications.Projection.dll;Microsoft.Windows.ApplicationModel.Resources.dll;Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.Windows.PushNotifications.Projection.dll;Microsoft.Windows.System.Projection.dll;Microsoft.WindowsAppRuntime.Insights.Resource.dll;Microsoft.WindowsAppRuntime.Release.Net.dll;Microsoft.WindowsAppRuntime.dll;Microsoft.ui.xaml.dll;Microsoft.ui.xaml.resources.19h1.dll;Microsoft.ui.xaml.resources.common.dll;PushNotificationsLongRunningTask.ProxyStub.dll;WinUIEdit.dll;WindowsAppRuntime.png;WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll;WindowsAppSdk.AppxDeploymentExtensions.Desktop-EventLog-Instrumentation.dll;dcompi.dll;dwmcorei.dll;marshal.dll;wuceffectsi.dll?>
-  <?define WinAppSDKFilesPath=$(var.BinDir)Settings\?>
-
   <!-- Localization languages shipped with WinAppSDK. We should ship these as well. -->
   <?define WinAppSDKLocLanguageList = af-ZA;ar-SA;az-Latn-AZ;bg-BG;bs-Latn-BA;ca-ES;cs-CZ;cy-GB;da-DK;de-DE;el-GR;en-GB;en-us;es-ES;es-MX;et-EE;eu-ES;fa-IR;fi-FI;fr-CA;fr-FR;gl-ES;he-IL;hi-IN;hr-HR;hu-HU;id-ID;is-IS;it-IT;ja-JP;ka-GE;kk-KZ;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;nn-NO;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sl-SI;sq-AL;sr-Cyrl-RS;sr-Latn-RS;sv-SE;th-TH;tr-TR;uk-UA;vi-VN;zh-CN;zh-TW?>
 
   <Fragment>
-    <DirectoryRef Id="WinAppSDKDlls">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinAppSDKFiles_Component_Def-->
+    <DirectoryRef Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets">
+      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="39889494-838A-4B9A-BD0A-105A1F0161BF">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
+      </Component>
     </DirectoryRef>
 
-    <?foreach ParentDirectory in SettingsV2InstallFolder;PowerRenameInstallFolder;MeasureToolInstallFolder;HostsInstallFolder;FileLocksmithInstallFolder;RegistryPreviewInstallFolder;PeekInstallFolder?>
-      <DirectoryRef Id="$(var.ParentDirectory)">
-        <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
-        <?if $(var.Language) = af-ZA?>
-        <?define IdSafeLanguage = af_ZA?>
-        <?elseif $(var.Language) = ar-SA?>
-        <?define IdSafeLanguage = ar_SA?>
-        <?elseif $(var.Language) = az-Latn-AZ?>
-        <?define IdSafeLanguage = az_Latn_AZ?>
-        <?elseif $(var.Language) = bg-BG?>
-        <?define IdSafeLanguage = bg_BG?>
-        <?elseif $(var.Language) = bs-Latn-BA?>
-        <?define IdSafeLanguage = bs_Latn_BA?>
-        <?elseif $(var.Language) = ca-ES?>
-        <?define IdSafeLanguage = ca_ES?>
-        <?elseif $(var.Language) = cs-CZ?>
-        <?define IdSafeLanguage = cs_CZ?>
-        <?elseif $(var.Language) = cy-GB?>
-        <?define IdSafeLanguage = cy_GB?>
-        <?elseif $(var.Language) = da-DK?>
-        <?define IdSafeLanguage = da_DK?>
-        <?elseif $(var.Language) = de-DE?>
-        <?define IdSafeLanguage = de_DE?>
-        <?elseif $(var.Language) = el-GR?>
-        <?define IdSafeLanguage = el_GR?>
-        <?elseif $(var.Language) = en-GB?>
-        <?define IdSafeLanguage = en_GB?>
-        <?elseif $(var.Language) = en-us?>
-        <?define IdSafeLanguage = en_us?>
-        <?elseif $(var.Language) = es-ES?>
-        <?define IdSafeLanguage = es_ES?>
-        <?elseif $(var.Language) = es-MX?>
-        <?define IdSafeLanguage = es_MX?>
-        <?elseif $(var.Language) = et-EE?>
-        <?define IdSafeLanguage = et_EE?>
-        <?elseif $(var.Language) = eu-ES?>
-        <?define IdSafeLanguage = eu_ES?>
-        <?elseif $(var.Language) = fa-IR?>
-        <?define IdSafeLanguage = fa_IR?>
-        <?elseif $(var.Language) = fi-FI?>
-        <?define IdSafeLanguage = fi_FI?>
-        <?elseif $(var.Language) = fr-CA?>
-        <?define IdSafeLanguage = fr_CA?>
-        <?elseif $(var.Language) = fr-FR?>
-        <?define IdSafeLanguage = fr_FR?>
-        <?elseif $(var.Language) = gl-ES?>
-        <?define IdSafeLanguage = gl_ES?>
-        <?elseif $(var.Language) = he-IL?>
-        <?define IdSafeLanguage = he_IL?>
-        <?elseif $(var.Language) = hi-IN?>
-        <?define IdSafeLanguage = hi_IN?>
-        <?elseif $(var.Language) = hr-HR?>
-        <?define IdSafeLanguage = hr_HR?>
-        <?elseif $(var.Language) = hu-HU?>
-        <?define IdSafeLanguage = hu_HU?>
-        <?elseif $(var.Language) = id-ID?>
-        <?define IdSafeLanguage = id_ID?>
-        <?elseif $(var.Language) = is-IS?>
-        <?define IdSafeLanguage = is_IS?>
-        <?elseif $(var.Language) = it-IT?>
-        <?define IdSafeLanguage = it_IT?>
-        <?elseif $(var.Language) = ja-JP?>
-        <?define IdSafeLanguage = ja_JP?>
-        <?elseif $(var.Language) = ka-GE?>
-        <?define IdSafeLanguage = ka_GE?>
-        <?elseif $(var.Language) = kk-KZ?>
-        <?define IdSafeLanguage = kk_KZ?>
-        <?elseif $(var.Language) = ko-KR?>
-        <?define IdSafeLanguage = ko_KR?>
-        <?elseif $(var.Language) = lt-LT?>
-        <?define IdSafeLanguage = lt_LT?>
-        <?elseif $(var.Language) = lv-LV?>
-        <?define IdSafeLanguage = lv_LV?>
-        <?elseif $(var.Language) = ms-MY?>
-        <?define IdSafeLanguage = ms_MY?>
-        <?elseif $(var.Language) = nb-NO?>
-        <?define IdSafeLanguage = nb_NO?>
-        <?elseif $(var.Language) = nl-NL?>
-        <?define IdSafeLanguage = nl_NL?>
-        <?elseif $(var.Language) = nn-NO?>
-        <?define IdSafeLanguage = nn_NO?>
-        <?elseif $(var.Language) = pl-PL?>
-        <?define IdSafeLanguage = pl_PL?>
-        <?elseif $(var.Language) = pt-BR?>
-        <?define IdSafeLanguage = pt_BR?>
-        <?elseif $(var.Language) = pt-PT?>
-        <?define IdSafeLanguage = pt_PT?>
-        <?elseif $(var.Language) = ro-RO?>
-        <?define IdSafeLanguage = ro_RO?>
-        <?elseif $(var.Language) = ru-RU?>
-        <?define IdSafeLanguage = ru_RU?>
-        <?elseif $(var.Language) = sk-SK?>
-        <?define IdSafeLanguage = sk_SK?>
-        <?elseif $(var.Language) = sl-SI?>
-        <?define IdSafeLanguage = sl_SI?>
-        <?elseif $(var.Language) = sq-AL?>
-        <?define IdSafeLanguage = sq_AL?>
-        <?elseif $(var.Language) = sr-Cyrl-RS?>
-        <?define IdSafeLanguage = sr_Cyrl_RS?>
-        <?elseif $(var.Language) = sr-Latn-RS?>
-        <?define IdSafeLanguage = sr_Latn_RS?>
-        <?elseif $(var.Language) = sv-SE?>
-        <?define IdSafeLanguage = sv_SE?>
-        <?elseif $(var.Language) = th-TH?>
-        <?define IdSafeLanguage = th_TH?>
-        <?elseif $(var.Language) = tr-TR?>
-        <?define IdSafeLanguage = tr_TR?>
-        <?elseif $(var.Language) = uk-UA?>
-        <?define IdSafeLanguage = uk_UA?>
-        <?elseif $(var.Language) = vi-VN?>
-        <?define IdSafeLanguage = vi_VN?>
-        <?elseif $(var.Language) = zh-CN?>
-        <?define IdSafeLanguage = zh_CN?>
-        <?elseif $(var.Language) = zh-TW?>
-        <?define IdSafeLanguage = zh_TW?>
-        <?else?>
-        <?define IdSafeLanguage = $(var.Language)?>
-        <?endif?>
-        <Directory Id="WinAppSDKLoc$(var.IdSafeLanguage)$(var.ParentDirectory)" Name="$(var.Language)" />
-        <?undef IdSafeLanguage?>
-        <?endforeach?>
-      </DirectoryRef>
-    <?endforeach?>
+    <DirectoryRef Id="WinUI3AppsInstallFolder">
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+      <Directory Id="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Name="$(var.Language)" />
+      <?undef IdSafeLanguage?>
+      <?endforeach?>
+    </DirectoryRef>
 
     <ComponentGroup Id="WindowsAppSDKComponentGroup">
       <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
@@ -315,84 +314,23 @@
       <?define CompGUIDPrefix = 51B656B3-2D45-49D8-9871-F0A1C8BEEE?>
       <?endif?>
       <Component
-          Id="SettingsV2_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)SettingsV2InstallFolder"
+          Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
+          Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
           Guid="$(var.CompGUIDPrefix)01">
           <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="SettingsV2_WinAppSDKLoc_$(var.IdSafeLanguage)_Component.png" Value="" KeyPath="yes"/>
+            <RegistryValue Type="string" Name="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
           </RegistryKey>
-          <File Id="SettingsV2_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)Settings\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="SettingsV2_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)Settings\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="PowerRename_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)PowerRenameInstallFolder"
-          Guid="$(var.CompGUIDPrefix)02">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="PowerRename_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-          <File Id="PowerRename_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="PowerRename_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="MeasureTool_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)MeasureToolInstallFolder"
-          Guid="$(var.CompGUIDPrefix)03">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="MeasureTool_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-          <File Id="MeasureTool_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="MeasureTool_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="Hosts_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)HostsInstallFolder"
-          Guid="$(var.CompGUIDPrefix)04">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="Hosts_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-          <File Id="Hosts_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.HostsProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="Hosts_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.HostsProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="FileLocksmith_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)FileLocksmithInstallFolder"
-          Guid="$(var.CompGUIDPrefix)05">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="FileLocksmith_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-          <File Id="FileLocksmith_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="FileLocksmith_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="RegistryPreview_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)RegistryPreviewInstallFolder"
-          Guid="$(var.CompGUIDPrefix)06">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="RegistryPreview_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-      <File Id="RegistryPreview_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-      <File Id="RegistryPreview_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <Component
-          Id="Peek_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)PeekInstallFolder"
-          Guid="$(var.CompGUIDPrefix)07">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="Peek_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-      <File Id="Peek_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)modules\$(var.PeekProjectName)\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-      <File Id="Peek_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)modules\$(var.PeekProjectName)\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
       </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>
-      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinAppSDKDlls" >
+      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinUI3AppsInstallFolder" >
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveWinAppSDKFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <RemoveFolder Id="RemoveFolderWinAppSDKDlls" Directory="WinAppSDKDlls" On="uninstall"/>
-        <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
       <?if $(var.Language) = af-ZA?>
       <?define IdSafeLanguage = af_ZA?>
       <?elseif $(var.Language) = ar-SA?>
@@ -508,17 +446,13 @@
       <?else?>
       <?define IdSafeLanguage = $(var.Language)?>
       <?endif?>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)SettingsV2InstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)SettingsV2InstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)PowerRenameInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)PowerRenameInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)MeasureToolInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)MeasureToolInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)HostsInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)HostsInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)FileLocksmithInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)FileLocksmithInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)RegistryPreviewInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)RegistryPreviewInstallFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)PeekInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)PeekInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
       <?undef IdSafeLanguage?>
-        <?endforeach?>
+      <?endforeach?>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
       </Component>
-
+      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/WinUI3Applications.wxs

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define WinUI3ApplicationsFiles=?>
+  <?define WinUI3ApplicationsFilesPath=$(var.BinDir)\WinUI3Apps\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsInstallFolder">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinUI3ApplicationsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="WinUI3ApplicationsComponentGroup">
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetup/generateAllFileComponents.ps1

@@ -16,214 +16,168 @@ if ($installscopeperuser -eq "true") {
     $registryroot = "HKLM"
 }
 
-#AlwaysOnTop
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AlwaysOnTopFiles -wxsFilePath $PSScriptRoot\AlwaysOnTop.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\AlwaysOnTop"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AlwaysOnTopFiles"" -wxsFilePath $PSScriptRoot\AlwaysOnTop.wxs -regroot $registryroot"
+#BaseApplications
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""BaseApplicationsFiles"" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot"
+
+#WinUI3Applications
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinUI3ApplicationsFiles"" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot"
 
 #AwakeFiles
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Awake\PowerToys.Awake.deps.json"" -fileListName AwakeFiles -wxsFilePath $PSScriptRoot\Awake.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Awake\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeImagesFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot"
 
 #ColorPicker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json"" -fileListName ColorPickerFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerResourcesFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\Resources"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerResourcesFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
-
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json"" -fileListName ColorPickerFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
-
-#FancyZones
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FancyZones\PowerToys.FancyZonesEditor.deps.json"" -fileListName FancyZonesFiles -wxsFilePath $PSScriptRoot\FancyZones.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FancyZonesFiles"" -wxsFilePath $PSScriptRoot\FancyZones.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerAssetsFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
 
 #FileExplorerAdd-ons
-#TODO: There are multiple .deps.json files, make sure it works as expected
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FileExplorerPreview\PowerToys.SvgThumbnailProvider.deps.json"" -fileListName PowerPreviewFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\FileExplorerPreview\customLanguages"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerPreviewFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerMonacoAssetsFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerCustomLanguagesFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
 
 #FileLocksmith
-#TODO: There are multiple .deps.json files, make sure it works as expected
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FileLocksmith\PowerToys.FileLocksmithUI.deps.json"" -fileListName FileLocksmithFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -isWinAppSdkProj 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\FileLocksmith\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithAssetsFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot"
 
 #Hosts
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Hosts\PowerToys.Hosts.deps.json"" -fileListName HostsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -isWinAppSdkProj 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Hosts\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsAssetsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot"
 
 #ImageResizer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ImageResizer\PowerToys.ImageResizer.deps.json"" -fileListName ImageResizerFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ImageResizer\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot"
 
-#MouseUtils
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MouseUtilsFiles -wxsFilePath $PSScriptRoot\MouseUtils.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseUtils\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseUtilsFiles"" -wxsFilePath $PSScriptRoot\MouseUtils.wxs -regroot $registryroot"
-#MouseJumpUI
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseUtils\MouseJumpUI\PowerToys.MouseJumpUI.deps.json"" -fileListName MouseJumpUIFiles -wxsFilePath $PSScriptRoot\MouseUtils.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseJumpUIFiles"" -wxsFilePath $PSScriptRoot\MouseUtils.wxs -regroot $registryroot"
-
-#MouseWithoutBorders
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBorders.deps.json;$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBordersHelper.deps.json;$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBordersService.deps.json"" -fileListName MouseWithoutBordersFiles -wxsFilePath $PSScriptRoot\MouseWithoutBorders.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseWithoutBordersFiles"" -wxsFilePath $PSScriptRoot\MouseWithoutBorders.wxs -regroot $registryroot"
-
-#MeasureTool
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MeasureTool\PowerToys.MeasureToolUI.deps.json"" -fileListName MeasureToolFiles -wxsFilePath $PSScriptRoot\MeasureTool.wxs -isWinAppSdkProj 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MeasureToolFiles"" -wxsFilePath $PSScriptRoot\MeasureTool.wxs -regroot $registryroot"
-
 #Peek
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Peek\PowerToys.Peek.UI.deps.json"" -fileListName PeekFiles -wxsFilePath $PSScriptRoot\Peek.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Peek\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot"
 
-#PowerAccent
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerAccent\PowerToys.PowerAccent.deps.json"" -fileListName PowerAccentFiles -wxsFilePath $PSScriptRoot\PowerAccent.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerAccentFiles"" -wxsFilePath $PSScriptRoot\PowerAccent.wxs -regroot $registryroot"
-
 #PowerRename
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerRename\"" -isWinAppSdkProj 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerRename\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameAssetsFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot"
 
 #RegistryPreview
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\RegistryPreview\PowerToys.RegistryPreview.deps.json"" -fileListName RegistryPreviewFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\RegistryPreview\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewAssetsFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot"
 
 #Run
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\PowerToys.PowerLauncher.deps.json"" -fileListName launcherFiles -wxsFilePath $PSScriptRoot\Run.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ## Plugins
 ###Calculator
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Calculator\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Folder
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Folder\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Program
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Program\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Shell
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Shell\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Indexer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Indexer\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###UnitConverter
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\UnitConverter\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###WebSearch
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WebSearch\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###History
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\History\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Uri
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Uri\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###VSCodeWorkspaces
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\VSCodeWorkspaces\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###WindowWalker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowWalker\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###OneNote
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\OneNote\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Registry
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Registry\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###Service
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Service\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###System
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\System\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###TimeDate
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\TimeDate\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###WindowsSettings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsSettings\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###WindowsTerminal
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsTerminal\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ###PowerToys
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+###ValueGenerator
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json"" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ## Plugins
 
 #ShortcutGuide
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ShortcutGuide\ShortcutGuide\svgs\"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShortcutGuideSvgFiles"" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot"
 
-#TextExtractor
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerOCR\PowerToys.PowerOCR.deps.json"" -fileListName TextExtractorFiles -wxsFilePath $PSScriptRoot\TextExtractor.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TextExtractorFiles"" -wxsFilePath $PSScriptRoot\TextExtractor.wxs -regroot $registryroot"
-
 #Settings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\Settings\PowerToys.Settings.deps.json"" -fileListName SettingsV2Files -wxsFilePath $PSScriptRoot\Settings.wxs"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\Modules\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\Modules\OOBE\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\FluentIcons\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2Files"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\FluentIcons\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsFluentIconsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-
-#WinAppSdk
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinAppSDKFiles"" -wxsFilePath $PSScriptRoot\WinAppSDK.wxs -regroot $registryroot"

installer/PowerToysSetup/generateFileList.ps1

@@ -14,43 +14,14 @@ Param(
     # launcher plugins are being loaded into launcher process,
     # so there are some additional dependencies to skip
     [Parameter(Mandatory = $False, Position = 5)]
-    [bool]$isLauncherPlugin,
-    # Skip winAppSDK dlls as those are hard-linked
-    [Parameter(Mandatory = $False, Position = 6)]
-    [bool]$isWinAppSdkProj
+    [bool]$isLauncherPlugin
 )
 
 $fileWxs = Get-Content $wxsFilePath;
 
-#Skip PowerToysInterop files
-$coreWxs = Get-Content $PSScriptRoot/"Core.wxs"
-$coreWxs | ForEach-Object {
-    if ($_ -match "(<?define PowerToysInteropFiles=)(.*)\?>") {
-        [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
-        Justification = 'variable is used in another scope')]
+$fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
 
-        $interopFilesList = $matches[2] -split ';'
-        return
-    }
-}
-
-#Skip WinAppSdk files
-if ($isWinAppSdkProj -eq $True) {
-    $winAppSDKWxs = Get-Content $PSScriptRoot/"WinAppSDK.wxs"
-    $winAppSDKWxs | ForEach-Object {
-        if ($_ -match "(<?define WinAppSDKFiles=)(.*)\?>") {
-            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
-            Justification = 'variable is used in another scope')]
-
-            $winAppSDKfilesList = $matches[2] -split ';'
-            return
-        }
-    }
-}
-
-$fileExclusionList = @("*Test*", "*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe") + $interopFilesList + $winAppSDKfilesList
-
-$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*png", "*gif", "*ico", "*cur", "*svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "resources.pri")
+$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "*.pri")
 
 $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
 

installer/PowerToysSetup/generateMonacoWxs.ps1

@@ -0,0 +1,70 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$monacoWxsFile
+)
+
+$fileWxs = Get-Content $monacoWxsFile;
+
+$fileWxs = $fileWxs -replace " KeyPath=`"yes`" ", " "
+
+$newFileContent = ""
+
+$componentId = "error"
+$directories = @()
+
+$fileWxs | ForEach-Object {
+    $line = $_;
+    if ($line -match "<Wix xmlns=`".*`">") {
+        $line +=
+@"
+`r`n
+    <?include `$(sys.CURRENTDIR)\Common.wxi?>`r`n
+"@
+    }
+    if ($line -match "<Component Id=`"(.*)`" Directory") {
+        $componentId = $matches[1]
+    }
+    if ($line -match "<Directory Id=`"(.*)`" Name=`".*`" />") {
+        $directories += $matches[1]
+    }
+    if ($line -match "</Component>") {
+        $line =
+@"
+                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                    <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+                </RegistryKey>
+            </Component>
+"@
+    }
+
+    $newFileContent += $line + "`r`n";
+}
+
+$removeFolderEntries =
+@"
+`r`n            <Component Id="RemoveMonacoSRCFolders" Guid="$((New-Guid).ToString().ToUpper())" Directory="MonacoPreviewHandlerMonacoSRCFolder" >
+                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                    <RegistryValue Type="string" Name="RemoveMonacoSRCFolders" Value="" KeyPath="yes"/>
+                </RegistryKey>`r`n
+"@
+
+$directories | ForEach-Object {
+
+    $removeFolderEntries +=
+@"
+                <RemoveFolder Id="Remove$($_)" Directory="$($_)" On="uninstall"/>
+
+"@
+}
+
+$removeFolderEntries +=
+@"
+            </Component>
+"@
+
+
+
+$newFileContent = $newFileContent -replace "\s+(</ComponentGroup>)", "$removeFolderEntries`r`n        </ComponentGroup>"
+
+Set-Content -Path $monacoWxsFile -Value $newFileContent

installer/PowerToysSetup/publish.cmd

@@ -19,8 +19,4 @@ msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csp
 
 msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
 
-msbuild !PTRoot!\src\modules\MeasureTool\MeasureToolUI\MeasureToolUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
-
 msbuild !PTRoot!\src\modules\FileLocksmith\FileLocksmithUI\FileLocksmithUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
-
-msbuild !PTRoot!\src\modules\registrypreview\RegistryPreviewUI\RegistryPreviewUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -2,7 +2,6 @@
 #include "resource.h"
 #include "RcResource.h"
 #include <ProjectTelemetry.h>
-
 #include <spdlog/sinks/base_sink.h>
 
 #include "../../src/common/logger/logger.h"
@@ -16,7 +15,10 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Management.Deployment.h>
 
-#include "DepsFilesLists.h"
+#include <wtsapi32.h>
+#include <processthreadsapi.h>
+#include <UserEnv.h>
+#include <winnt.h>
 
 using namespace std;
 
@@ -52,6 +54,188 @@ LExit:
     return hr;
 }
 
+BOOL IsLocalSystem()
+{
+    HANDLE hToken;
+    UCHAR bTokenUser[sizeof(TOKEN_USER) + 8 + 4 * SID_MAX_SUB_AUTHORITIES];
+    PTOKEN_USER pTokenUser = (PTOKEN_USER)bTokenUser;
+    ULONG cbTokenUser;
+    SID_IDENTIFIER_AUTHORITY siaNT = SECURITY_NT_AUTHORITY;
+    PSID pSystemSid;
+    BOOL bSystem;
+
+    // open process token
+    if (!OpenProcessToken(GetCurrentProcess(),
+        TOKEN_QUERY,
+        &hToken))
+        return FALSE;
+
+    // retrieve user SID
+    if (!GetTokenInformation(hToken, TokenUser, pTokenUser,
+        sizeof(bTokenUser), &cbTokenUser))
+    {
+        CloseHandle(hToken);
+        return FALSE;
+    }
+
+    CloseHandle(hToken);
+
+    // allocate LocalSystem well-known SID
+    if (!AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SYSTEM_RID,
+        0, 0, 0, 0, 0, 0, 0, &pSystemSid))
+        return FALSE;
+
+    // compare the user SID from the token with the LocalSystem SID
+    bSystem = EqualSid(pTokenUser->User.Sid, pSystemSid);
+
+    FreeSid(pSystemSid);
+
+    return bSystem;
+}
+
+BOOL ImpersonateLoggedInUserAndDoSomething(std::function<bool(HANDLE userToken)> action)
+{
+    HRESULT hr = S_OK;
+    HANDLE hUserToken = NULL;
+    DWORD dwSessionId;
+    ProcessIdToSessionId(GetCurrentProcessId(), &dwSessionId);
+    auto rv = WTSQueryUserToken(dwSessionId, &hUserToken);
+
+    if (rv == 0)
+    {
+        hr = E_ABORT;
+        ExitOnFailure(hr, "Failed to query user token");
+    }
+
+    HANDLE hUserTokenDup;
+    if (DuplicateTokenEx(hUserToken, TOKEN_ALL_ACCESS, NULL, SECURITY_IMPERSONATION_LEVEL::SecurityImpersonation, TOKEN_TYPE::TokenPrimary, &hUserTokenDup) == 0)
+    {
+        CloseHandle(hUserToken);
+        CloseHandle(hUserTokenDup);
+        hr = E_ABORT;
+        ExitOnFailure(hr, "Failed to duplicate user token");
+    }
+
+    if (ImpersonateLoggedOnUser(hUserTokenDup))
+    {
+        if (!action(hUserTokenDup))
+        {
+            hr = E_ABORT;
+            ExitOnFailure(hr, "Failed to execute action");
+        }
+
+        RevertToSelf();
+        CloseHandle(hUserToken);
+        CloseHandle(hUserTokenDup);
+    }
+    else
+    {
+        hr = E_ABORT;
+        ExitOnFailure(hr, "Failed to duplicate user token");
+    }
+
+LExit:
+    return SUCCEEDED(hr);
+}
+
+UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    std::wstring installationFolder, path, args;
+    std::wstring commandLine;
+
+    hr = WcaInitialize(hInstall, "LaunchPowerToys");
+    ExitOnFailure(hr, "Failed to initialize");
+    hr = getInstallFolder(hInstall, installationFolder);
+    ExitOnFailure(hr, "Failed to get installFolder.");
+
+    path = installationFolder;
+    path += L"\\PowerToys.exe";
+
+    args = L"--dont-elevate";
+
+    commandLine = L"\"" + path + L"\" ";
+    commandLine += args;
+
+    BOOL isSystemUser = IsLocalSystem();
+
+    if (isSystemUser) {
+    
+        auto action = [&commandLine](HANDLE userToken) {
+            STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };
+            PROCESS_INFORMATION processInformation;
+
+            PVOID lpEnvironment = NULL;
+            CreateEnvironmentBlock(&lpEnvironment, userToken, FALSE);
+
+            CreateProcessAsUser(
+                userToken,
+                NULL,
+                commandLine.data(),
+                NULL,
+                NULL,
+                FALSE,
+                CREATE_DEFAULT_ERROR_MODE | CREATE_UNICODE_ENVIRONMENT,
+                lpEnvironment,
+                NULL,
+                &startupInfo,
+                &processInformation);
+
+            if (!CloseHandle(processInformation.hProcess))
+            {
+                return false;
+            }
+            if (!CloseHandle(processInformation.hThread))
+            {
+                return false;
+            }
+
+            return true;
+        };
+
+        if (!ImpersonateLoggedInUserAndDoSomething(action))
+        {
+            hr = E_ABORT;
+            ExitOnFailure(hr, "ImpersonateLoggedInUserAndDoSomething failed");
+        }
+    }
+    else
+    {
+        STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };
+
+        PROCESS_INFORMATION processInformation;
+
+        // Start the resizer
+        CreateProcess(
+            NULL,
+            commandLine.data(),
+            NULL,
+            NULL,
+            TRUE,
+            0,
+            NULL,
+            NULL,
+            &startupInfo,
+            &processInformation);
+
+        if (!CloseHandle(processInformation.hProcess))
+        {
+            hr = E_ABORT;
+            ExitOnFailure(hr, "Failed to close process handle");
+        }
+        if (!CloseHandle(processInformation.hThread))
+        {
+            hr = E_ABORT;
+            ExitOnFailure(hr, "Failed to close thread handle");
+        }
+    }
+
+LExit:
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 UINT __stdcall CheckGPOCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -255,7 +439,7 @@ UINT __stdcall UninstallServicesCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
     UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CreateScheduledTaskCA");
+    hr = WcaInitialize(hInstall, "UninstallServicesCA");
 
     ExitOnFailure(hr, "Failed to initialize");
 
@@ -266,278 +450,6 @@ LExit:
     return WcaFinalize(er);
 }
 
-
-// Creates a Scheduled Task to run at logon for the current user.
-// The path of the executable to run should be passed as the CustomActionData (Value).
-// Based on the Task Scheduler Logon Trigger Example:
-// https://learn.microsoft.com/windows/win32/taskschd/logon-trigger-example--c---/
-UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    TCHAR username_domain[USERNAME_DOMAIN_LEN];
-    TCHAR username[USERNAME_LEN];
-
-    std::wstring wstrTaskName;
-
-    ITaskService* pService = nullptr;
-    ITaskFolder* pTaskFolder = nullptr;
-    ITaskDefinition* pTask = nullptr;
-    IRegistrationInfo* pRegInfo = nullptr;
-    ITaskSettings* pSettings = nullptr;
-    ITriggerCollection* pTriggerCollection = nullptr;
-    IRegisteredTask* pRegisteredTask = nullptr;
-    IPrincipal* pPrincipal = nullptr;
-    ITrigger* pTrigger = nullptr;
-    ILogonTrigger* pLogonTrigger = nullptr;
-    IAction* pAction = nullptr;
-    IActionCollection* pActionCollection = nullptr;
-    IExecAction* pExecAction = nullptr;
-
-    LPWSTR wszExecutablePath = nullptr;
-
-    hr = WcaInitialize(hInstall, "CreateScheduledTaskCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    Logger::info(L"CreateScheduledTaskCA Initialized.");
-
-    // ------------------------------------------------------
-    // Get the Domain/Username for the trigger.
-    //
-    // This action needs to run as the system to get elevated privileges from the installation,
-    // so GetUserNameEx can't be used to get the current user details.
-    // The USERNAME and USERDOMAIN environment variables are used instead.
-    if (!GetEnvironmentVariable(L"USERNAME", username, USERNAME_LEN))
-    {
-        ExitWithLastError(hr, "Getting username failed: %x", hr);
-    }
-    if (!GetEnvironmentVariable(L"USERDOMAIN", username_domain, USERNAME_DOMAIN_LEN))
-    {
-        ExitWithLastError(hr, "Getting the user's domain failed: %x", hr);
-    }
-    wcscat_s(username_domain, L"\\");
-    wcscat_s(username_domain, username);
-
-    Logger::info(L"Current user detected: {}", username_domain);
-
-    // Task Name.
-    wstrTaskName = L"Autorun for ";
-    wstrTaskName += username;
-
-    // Get the executable path passed to the custom action.
-    hr = WcaGetProperty(L"CustomActionData", &wszExecutablePath);
-    ExitOnFailure(hr, "Failed to get the executable path from CustomActionData.");
-
-    // COM and Security Initialization is expected to have been done by the MSI.
-    // It couldn't be done in the DLL, anyway.
-    // ------------------------------------------------------
-    // Create an instance of the Task Service.
-    hr = CoCreateInstance(CLSID_TaskScheduler,
-        nullptr,
-        CLSCTX_INPROC_SERVER,
-        IID_ITaskService,
-        reinterpret_cast<void**>(&pService));
-    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
-
-    // Connect to the task service.
-    hr = pService->Connect(_variant_t(), _variant_t(), _variant_t(), _variant_t());
-    ExitOnFailure(hr, "ITaskService::Connect failed: %x", hr);
-
-    // ------------------------------------------------------
-    // Get the PowerToys task folder. Creates it if it doesn't exist.
-    hr = pService->GetFolder(_bstr_t(L"\\PowerToys"), &pTaskFolder);
-    if (FAILED(hr))
-    {
-        // Folder doesn't exist. Get the Root folder and create the PowerToys subfolder.
-        ITaskFolder* pRootFolder = nullptr;
-        hr = pService->GetFolder(_bstr_t(L"\\"), &pRootFolder);
-        ExitOnFailure(hr, "Cannot get Root Folder pointer: %x", hr);
-        hr = pRootFolder->CreateFolder(_bstr_t(L"\\PowerToys"), _variant_t(L""), &pTaskFolder);
-        if (FAILED(hr))
-        {
-            pRootFolder->Release();
-            ExitOnFailure(hr, "Cannot create PowerToys task folder: %x", hr);
-        }
-        Logger::info(L"PowerToys task folder created.");
-    }
-
-    // If the same task exists, remove it.
-    pTaskFolder->DeleteTask(_bstr_t(wstrTaskName.c_str()), 0);
-
-    // Create the task builder object to create the task.
-    hr = pService->NewTask(0, &pTask);
-    ExitOnFailure(hr, "Failed to create a task definition: %x", hr);
-
-    // ------------------------------------------------------
-    // Get the registration info for setting the identification.
-    hr = pTask->get_RegistrationInfo(&pRegInfo);
-    ExitOnFailure(hr, "Cannot get identification pointer: %x", hr);
-    hr = pRegInfo->put_Author(_bstr_t(username_domain));
-    ExitOnFailure(hr, "Cannot put identification info: %x", hr);
-
-    // ------------------------------------------------------
-    // Create the settings for the task
-    hr = pTask->get_Settings(&pSettings);
-    ExitOnFailure(hr, "Cannot get settings pointer: %x", hr);
-
-    hr = pSettings->put_StartWhenAvailable(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_StartWhenAvailable setting info: %x", hr);
-    hr = pSettings->put_StopIfGoingOnBatteries(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_StopIfGoingOnBatteries setting info: %x", hr);
-    hr = pSettings->put_ExecutionTimeLimit(_bstr_t(L"PT0S")); //Unlimited
-    ExitOnFailure(hr, "Cannot put_ExecutionTimeLimit setting info: %x", hr);
-    hr = pSettings->put_DisallowStartIfOnBatteries(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_DisallowStartIfOnBatteries setting info: %x", hr);
-    hr = pSettings->put_Priority(4);
-    ExitOnFailure(hr, "Cannot put_Priority setting info : %x", hr);
-
-    // ------------------------------------------------------
-    // Get the trigger collection to insert the logon trigger.
-    hr = pTask->get_Triggers(&pTriggerCollection);
-    ExitOnFailure(hr, "Cannot get trigger collection: %x", hr);
-
-    // Add the logon trigger to the task.
-    hr = pTriggerCollection->Create(TASK_TRIGGER_LOGON, &pTrigger);
-    ExitOnFailure(hr, "Cannot create the trigger: %x", hr);
-
-    hr = pTrigger->QueryInterface(
-        IID_ILogonTrigger, (void**)&pLogonTrigger);
-    pTrigger->Release();
-    ExitOnFailure(hr, "QueryInterface call failed for ILogonTrigger: %x", hr);
-
-    hr = pLogonTrigger->put_Id(_bstr_t(L"Trigger1"));
-    if (FAILED(hr))
-    {
-        Logger::error(L"Cannot put the trigger ID: {}", hr);
-    }
-
-    // Timing issues may make explorer not be started when the task runs.
-    // Add a little delay to mitigate this.
-    hr = pLogonTrigger->put_Delay(_bstr_t(L"PT03S"));
-    if (FAILED(hr))
-    {
-        Logger::error(L"Cannot put the trigger delay: {}", hr);
-    }
-
-    // Define the user. The task will execute when the user logs on.
-    // The specified user must be a user on this computer.
-    hr = pLogonTrigger->put_UserId(_bstr_t(username_domain));
-    pLogonTrigger->Release();
-    ExitOnFailure(hr, "Cannot add user ID to logon trigger: %x", hr);
-
-    // ------------------------------------------------------
-    // Add an Action to the task. This task will execute the path passed to this custom action.
-
-    // Get the task action collection pointer.
-    hr = pTask->get_Actions(&pActionCollection);
-    ExitOnFailure(hr, "Cannot get Task collection pointer: %x", hr);
-
-    // Create the action, specifying that it is an executable action.
-    hr = pActionCollection->Create(TASK_ACTION_EXEC, &pAction);
-    pActionCollection->Release();
-    ExitOnFailure(hr, "Cannot create the action: %x", hr);
-
-    // QI for the executable task pointer.
-    hr = pAction->QueryInterface(
-        IID_IExecAction, (void**)&pExecAction);
-    pAction->Release();
-    ExitOnFailure(hr, "QueryInterface call failed for IExecAction: %x", hr);
-
-    // Set the path of the executable to PowerToys (passed as CustomActionData).
-    hr = pExecAction->put_Path(_bstr_t(wszExecutablePath));
-    pExecAction->Release();
-    ExitOnFailure(hr, "Cannot set path of executable: %x", hr);
-
-    // ------------------------------------------------------
-    // Create the principal for the task
-    hr = pTask->get_Principal(&pPrincipal);
-    ExitOnFailure(hr, "Cannot get principal pointer: %x", hr);
-
-    // Set up principal information:
-    hr = pPrincipal->put_Id(_bstr_t(L"Principal1"));
-    if (FAILED(hr))
-    {
-        Logger::error(L"Cannot put the principal ID: {}", hr);
-    }
-
-    hr = pPrincipal->put_UserId(_bstr_t(username_domain));
-    if (FAILED(hr))
-    {
-        Logger::error(L"Cannot put principal user Id: {}", hr);
-    }
-
-    hr = pPrincipal->put_LogonType(TASK_LOGON_INTERACTIVE_TOKEN);
-    if (FAILED(hr))
-    {
-        Logger::error(L"Cannot put principal logon type: {}", hr);
-    }
-
-    // Run the task with the highest available privileges.
-    hr = pPrincipal->put_RunLevel(TASK_RUNLEVEL_LUA);
-    pPrincipal->Release();
-    ExitOnFailure(hr, "Cannot put principal run level: %x", hr);
-
-    // ------------------------------------------------------
-    //  Save the task in the PowerToys folder.
-    {
-        _variant_t SDDL_FULL_ACCESS_FOR_EVERYONE = L"D:(A;;FA;;;WD)";
-        hr = pTaskFolder->RegisterTaskDefinition(
-            _bstr_t(wstrTaskName.c_str()),
-            pTask,
-            TASK_CREATE_OR_UPDATE,
-            _variant_t(username_domain),
-            _variant_t(),
-            TASK_LOGON_INTERACTIVE_TOKEN,
-            SDDL_FULL_ACCESS_FOR_EVERYONE,
-            &pRegisteredTask);
-        ExitOnFailure(hr, "Error saving the Task : %x", hr);
-    }
-
-    Logger::info(L"Scheduled task created for the current user.");
-
-LExit:
-    ReleaseStr(wszExecutablePath);
-    if (pService)
-    {
-        pService->Release();
-    }
-    if (pTaskFolder)
-    {
-        pTaskFolder->Release();
-    }
-    if (pTask)
-    {
-        pTask->Release();
-    }
-    if (pRegInfo)
-    {
-        pRegInfo->Release();
-    }
-    if (pSettings)
-    {
-        pSettings->Release();
-    }
-    if (pTriggerCollection)
-    {
-        pTriggerCollection->Release();
-    }
-    if (pRegisteredTask)
-    {
-        pRegisteredTask->Release();
-    }
-
-    if (!SUCCEEDED(hr))
-    {
-        PMSIHANDLE hRecord = MsiCreateRecord(0);
-        MsiRecordSetString(hRecord, 0, TEXT("Failed to create a scheduled task to start PowerToys at user login. You can re-try to create the scheduled task using the PowerToys settings."));
-        MsiProcessMessage(hInstall, static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_WARNING + MB_OK), hRecord);
-    }
-
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
 // Removes all Scheduled Tasks in the PowerToys folder and deletes the folder afterwards.
 // Based on the Task Scheduler Displaying Task Names and State example:
 // https://learn.microsoft.com/windows/desktop/TaskSchd/displaying-task-names-and-state--c---/
@@ -1076,359 +988,6 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-const std::wstring WinAppSDKConsumers[] =
-{
-    L"Settings",
-    L"modules\\PowerRename",
-    L"modules\\MeasureTool",
-    L"modules\\FileLocksmith",
-    L"modules\\Hosts",
-    L"modules\\RegistryPreview",
-    L"modules\\Peek",
-};
-
-UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, winAppSDKFilesSrcDir;
-
-    hr = WcaInitialize(hInstall, "CreateWinAppSDKHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    winAppSDKFilesSrcDir = installationFolder + L"dll\\WinAppSDK\\";
-
-    for (auto file : winAppSdkFiles)
-    {
-        for (auto consumer : WinAppSDKConsumers)
-        {
-            std::error_code ec;
-            std::filesystem::create_hard_link((winAppSDKFilesSrcDir + file).c_str(), (installationFolder + consumer + L"\\" + file).c_str(), ec);
-
-            if (ec.value() != S_OK)
-            {
-                std::wstring errorMessage{ L"Error creating hard link for: " };
-                errorMessage += file;
-                errorMessage += L", error code: " + std::to_wstring(ec.value());
-                Logger::error(errorMessage);
-            }
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-const std::wstring PTInteropConsumers[] =
-{
-    L"modules\\ColorPicker",
-    L"modules\\PowerOCR",
-    L"modules\\launcher",
-    L"modules\\FancyZones",
-    L"modules\\ImageResizer",
-    L"Settings",
-    L"modules\\Awake",
-    L"modules\\MeasureTool",
-    L"modules\\PowerAccent",
-    L"modules\\FileLocksmith",
-    L"modules\\Hosts",
-    L"modules\\Peek",
-    L"modules\\FileExplorerPreview",
-    L"modules\\MouseWithoutBorders",
-    L"modules\\MouseUtils\\MouseJumpUI",
-    L"modules\\RegistryPreview",
-};
-
-UINT __stdcall CreatePTInteropHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, interopFilesSrcDir;
-
-    hr = WcaInitialize(hInstall, "CreatePTInteropHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    interopFilesSrcDir = installationFolder + L"dll\\Interop\\";
-
-    for (auto file : powerToysInteropFiles)
-    {
-        for (auto consumer : PTInteropConsumers)
-        {
-            std::error_code ec;
-            std::filesystem::create_hard_link((interopFilesSrcDir + file).c_str(), (installationFolder + consumer + L"\\" + file).c_str(), ec);
-
-            if (ec.value() != S_OK)
-            {
-                std::wstring errorMessage{ L"Error creating hard link for: " };
-                errorMessage += file;
-                errorMessage += L", error code: " + std::to_wstring(ec.value());
-                Logger::error(errorMessage);
-            }
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CreateDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, dotnetRuntimeFilesSrcDir, colorPickerDir, powerOCRDir, launcherDir, fancyZonesDir,
-        imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir, hostsDir, fileLocksmithDir,
-        mouseJumpDir, registryPreviewDir, peekDir, mwbDir;
-
-    hr = WcaInitialize(hInstall, "CreateDotnetRuntimeHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    dotnetRuntimeFilesSrcDir = installationFolder + L"dll\\dotnet\\";
-    colorPickerDir = installationFolder + L"modules\\ColorPicker\\";
-    powerOCRDir = installationFolder + L"modules\\PowerOCR\\";
-    launcherDir = installationFolder + L"modules\\launcher\\";
-    fancyZonesDir = installationFolder + L"modules\\FancyZones\\";
-    imageResizerDir = installationFolder + L"modules\\ImageResizer\\";
-    settingsDir = installationFolder + L"Settings\\";
-    awakeDir = installationFolder + L"modules\\Awake\\";
-    measureToolDir = installationFolder + L"modules\\MeasureTool\\";
-    powerAccentDir = installationFolder + L"modules\\PowerAccent\\";
-    fileExplorerAddOnsDir = installationFolder + L"modules\\FileExplorerPreview\\";
-    hostsDir = installationFolder + L"modules\\Hosts\\";
-    fileLocksmithDir = installationFolder + L"modules\\FileLocksmith\\";
-    mwbDir = installationFolder + L"modules\\MouseWithoutBorders\\";
-    mouseJumpDir = installationFolder + L"modules\\MouseUtils\\MouseJumpUI\\";
-    registryPreviewDir = installationFolder + L"modules\\RegistryPreview\\";
-    peekDir = installationFolder + L"modules\\Peek\\";
-
-    for (auto file : dotnetRuntimeFiles)
-    {
-        std::error_code ec;
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (colorPickerDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerOCRDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (launcherDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fancyZonesDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (imageResizerDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (settingsDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (awakeDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (measureToolDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerAccentDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileExplorerAddOnsDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (hostsDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileLocksmithDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mwbDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mouseJumpDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (registryPreviewDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (peekDir + file).c_str(), ec);
-
-        if (ec.value() != S_OK)
-        {
-            std::wstring errorMessage{ L"Error creating hard link for: " };
-            errorMessage += file;
-            errorMessage += L", error code: " + std::to_wstring(ec.value());
-            Logger::error(errorMessage);
-            er = ERROR_INSTALL_FAILURE;
-        }
-    }
-
-    for (auto file : dotnetRuntimeWPFFiles)
-    {
-        std::error_code ec;
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (awakeDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (colorPickerDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerOCRDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (launcherDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fancyZonesDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (imageResizerDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerAccentDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileExplorerAddOnsDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (hostsDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mouseJumpDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (registryPreviewDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (peekDir + file).c_str(), ec);
-        std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mwbDir + file).c_str(), ec);
-
-        if (ec.value() != S_OK)
-        {
-            std::wstring errorMessage{ L"Error creating hard link for: " };
-            errorMessage += file;
-            errorMessage += L", error code: " + std::to_wstring(ec.value());
-            Logger::error(errorMessage);
-            er = ERROR_INSTALL_FAILURE;
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "DeleteWinAppSDKHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    try
-    {
-        for (auto file : winAppSdkFiles)
-        {
-            for (auto consumer : WinAppSDKConsumers)
-            {
-                DeleteFile((installationFolder + consumer + L"\\" + file).c_str());
-            }
-        }
-    }
-    catch (std::exception e)
-    {
-        std::string errorMessage{ "Exception thrown while trying to delete WAS hardlinks: " };
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall DeletePTInteropHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, interopFilesSrcDir;
-
-    hr = WcaInitialize(hInstall, "DeletePTInteropHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    try
-    {
-        for (auto file : powerToysInteropFiles)
-        {
-            for (auto consumer : PTInteropConsumers)
-            {
-                DeleteFile((installationFolder + consumer + L"\\" + file).c_str());
-            }
-        }
-    }
-    catch (std::exception e)
-    {
-        std::string errorMessage{ "Exception thrown while trying to delete PowerToys Interop and VC Redist hardlinks: " };
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall DeleteDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, colorPickerDir, powerOCRDir, launcherDir, fancyZonesDir,
-      imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir,
-      hostsDir, fileLocksmithDir, mouseJumpDir, registryPreviewDir, peekDir, mwbDir;
-
-    hr = WcaInitialize(hInstall, "DeleteDotnetRuntimeHardlinksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installation folder");
-
-    colorPickerDir = installationFolder + L"modules\\ColorPicker\\";
-    powerOCRDir = installationFolder + L"modules\\PowerOCR\\";
-    launcherDir = installationFolder + L"modules\\launcher\\";
-    fancyZonesDir = installationFolder + L"modules\\FancyZones\\";
-    imageResizerDir = installationFolder + L"modules\\ImageResizer\\";
-    settingsDir = installationFolder + L"Settings\\";
-    awakeDir = installationFolder + L"modules\\Awake\\";
-    measureToolDir = installationFolder + L"modules\\MeasureTool\\";
-    powerAccentDir = installationFolder + L"modules\\PowerAccent\\";
-    fileExplorerAddOnsDir = installationFolder + L"modules\\FileExplorerPreview\\";
-    hostsDir = installationFolder + L"modules\\Hosts\\";
-    fileLocksmithDir = installationFolder + L"modules\\FileLocksmith\\";
-    mwbDir = installationFolder + L"modules\\MouseWithoutBorders\\";
-    mouseJumpDir = installationFolder + L"modules\\MouseUtils\\MouseJumpUI\\";
-    registryPreviewDir = installationFolder + L"modules\\RegistryPreview\\";
-    peekDir = installationFolder + L"modules\\Peek\\";
-
-    try
-    {
-        for (auto file : dotnetRuntimeFiles)
-        {
-            DeleteFile((colorPickerDir + file).c_str());
-            DeleteFile((powerOCRDir + file).c_str());
-            DeleteFile((launcherDir + file).c_str());
-            DeleteFile((fancyZonesDir + file).c_str());
-            DeleteFile((imageResizerDir + file).c_str());
-            DeleteFile((settingsDir + file).c_str());
-            DeleteFile((awakeDir + file).c_str());
-            DeleteFile((measureToolDir + file).c_str());
-            DeleteFile((powerAccentDir + file).c_str());
-            DeleteFile((fileExplorerAddOnsDir + file).c_str());
-            DeleteFile((hostsDir + file).c_str());
-            DeleteFile((fileLocksmithDir + file).c_str());
-            DeleteFile((mouseJumpDir + file).c_str());
-            DeleteFile((registryPreviewDir + file).c_str());
-            DeleteFile((peekDir + file).c_str());
-            DeleteFile((mwbDir + file).c_str());
-        }
-
-        for (auto file : dotnetRuntimeWPFFiles)
-        {
-            DeleteFile((awakeDir + file).c_str());
-            DeleteFile((colorPickerDir + file).c_str());
-            DeleteFile((powerOCRDir + file).c_str());
-            DeleteFile((launcherDir + file).c_str());
-            DeleteFile((fancyZonesDir + file).c_str());
-            DeleteFile((imageResizerDir + file).c_str());
-            DeleteFile((powerAccentDir + file).c_str());
-            DeleteFile((fileExplorerAddOnsDir + file).c_str());
-            DeleteFile((hostsDir + file).c_str());
-            DeleteFile((mouseJumpDir + file).c_str());
-            DeleteFile((registryPreviewDir + file).c_str());
-            DeleteFile((peekDir + file).c_str());
-            DeleteFile((mwbDir + file).c_str());
-        }
-    }
-    catch (std::exception e)
-    {
-        std::string errorMessage{ "Exception thrown while trying to delete dotnet runtime hardlinks: " };
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
 UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -1446,7 +1005,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 27> processesToTerminate = {
+    std::array<std::wstring_view, 28> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.Awake.exe",
@@ -1473,6 +1032,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.MouseWithoutBorders.exe",
         L"PowerToys.MouseWithoutBordersHelper.exe",
         L"PowerToys.MouseWithoutBordersService.exe",
+        L"PowerToys.CropAndLock.exe",
         L"PowerToys.exe",
     };
 

installer/PowerToysSetupCustomActions/CustomAction.def

@@ -1,15 +1,9 @@
 LIBRARY "PowerToysSetupCustomActions"
 
 EXPORTS
+	LaunchPowerToysCA
 	CheckGPOCA
 	ApplyModulesRegistryChangeSetsCA
-	CreateScheduledTaskCA
-	CreateWinAppSDKHardlinksCA
-	DeleteWinAppSDKHardlinksCA
-	CreatePTInteropHardlinksCA
-	DeletePTInteropHardlinksCA
-	CreateDotnetRuntimeHardlinksCA
-	DeleteDotnetRuntimeHardlinksCA
 	DetectPrevInstallPathCA
 	RemoveScheduledTasksCA
 	TelemetryLogInstallSuccessCA

installer/PowerToysSetupCustomActions/DepsFilesLists.h

@@ -1,62 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-
-inline const std::vector<std::wstring> winAppSdkFiles = {
-    L"CoreMessagingXP.dll",
-    L"DWriteCore.dll",
-    L"DwmSceneI.dll",
-    L"MRM.dll",
-    L"Microsoft.DirectManipulation.dll",
-    L"Microsoft.InputStateManager.dll",
-    L"Microsoft.Internal.FrameworkUdk.dll",
-    L"Microsoft.UI.Composition.OSSupport.dll",
-    L"Microsoft.UI.Input.dll",
-    L"Microsoft.UI.Windowing.Core.dll",
-    L"Microsoft.UI.Windowing.dll",
-    L"Microsoft.UI.Xaml.Controls.dll",
-    L"Microsoft.UI.Xaml.Controls.pri",
-    L"Microsoft.UI.Xaml.Internal.dll",
-    L"Microsoft.UI.Xaml.Phone.dll",
-    L"Microsoft.Web.WebView2.Core.dll",
-    L"Microsoft.Windows.AppNotifications.Projection.dll",
-    L"Microsoft.Windows.ApplicationModel.Resources.dll",
-    L"Microsoft.WindowsAppRuntime.Bootstrap.dll",
-    L"Microsoft.Windows.PushNotifications.Projection.dll",
-    L"Microsoft.Windows.System.Projection.dll",
-    L"Microsoft.WindowsAppRuntime.Insights.Resource.dll",
-    L"Microsoft.WindowsAppRuntime.Release.Net.dll",
-    L"Microsoft.WindowsAppRuntime.dll",
-    L"Microsoft.ui.xaml.dll",
-    L"Microsoft.ui.xaml.resources.19h1.dll",
-    L"Microsoft.ui.xaml.resources.common.dll",
-    L"PushNotificationsLongRunningTask.ProxyStub.dll",
-    L"WinUIEdit.dll",
-    L"WindowsAppRuntime.png",
-    L"WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll",
-    L"WindowsAppSdk.AppxDeploymentExtensions.Desktop-EventLog-Instrumentation.dll",
-    L"dcompi.dll",
-    L"dwmcorei.dll",
-    L"marshal.dll",
-    L"wuceffectsi.dll"
-};
-
-inline const std::vector<std::wstring> powerToysInteropFiles = {
-    L"concrt140.dll",
-    L"msvcp140.dll",
-    L"msvcp140_1.dll",
-    L"msvcp140_2.dll",
-    L"msvcp140_atomic_wait.dll",
-    L"msvcp140_codecvt_ids.dll",
-    L"PowerToys.Interop.dll",
-    L"vcamp140.dll",
-    L"vccorlib140.dll",
-    L"vcomp140.dll",
-    L"vcruntime140.dll",
-    L"vcruntime140_1.dll"
-};
-
-inline const std::vector<std::wstring> dotnetRuntimeFiles = { };
-
-inline const std::vector<std::wstring> dotnetRuntimeWPFFiles = { };

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -6,7 +6,6 @@
     <ProjectGuid>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>PowerToysSetupCustomActions</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <ProjectName>PowerToysSetupCustomActions</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -49,21 +48,17 @@
     <PreBuildEvent>
       <Command>
       call cmd /C "copy ""$(ProjectDir)DepsFilesLists.h"" ""$(ProjectDir)DepsFilesLists.h.bk"""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\AlwaysOnTop.wxs"" ""$(ProjectDir)..\PowerToysSetup\AlwaysOnTop.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FancyZones.wxs"" ""$(ProjectDir)..\PowerToysSetup\FancyZones.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MeasureTool.wxs"" ""$(ProjectDir)..\PowerToysSetup\MeasureTool.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseUtils.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseUtils.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerAccent.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerAccent.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs.bk""""
@@ -71,11 +66,10 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Run.wxs"" ""$(ProjectDir)..\PowerToysSetup\Run.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetup\Settings.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\TextExtractor.wxs"" ""$(ProjectDir)..\PowerToysSetup\TextExtractor.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetup\Tools.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs"" ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk""""
-      call powershell.exe -NonInteractive -executionpolicy Unrestricted -File parseRuntimes.ps1 -runtimedepsjsonpath "$(ProjectDir)..\..\$(Platform)\$(Configuration)\Settings\PowerToys.Settings.deps.json" -wpfdepsjsonpath "$(ProjectDir)..\..\$(Platform)\$(Configuration)\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json" -depsfileslistspath "$(ProjectDir)DepsFilesLists.h" -productwxspath "$(ProjectDir)..\PowerToysSetup\Core.wxs"
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk""""
       if not "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
       if "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(PerUser)
       </Command>
@@ -94,7 +88,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>WindowsApp.lib;Newdev.lib;Crypt32.lib;msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Userenv.lib;Wtsapi32.lib;WindowsApp.lib;Newdev.lib;Crypt32.lib;msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>

installer/PowerToysSetupCustomActions/parseRuntimes.ps1

@@ -1,85 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$runtimedepsjsonpath,
-    [Parameter(Mandatory = $True, Position = 2)]
-    [string]$wpfdepsjsonpath,
-    [Parameter(Mandatory = $True, Position = 3)]
-    [string]$depsfileslistspath,
-    [Parameter(Mandatory = $True, Position = 4)]
-    [string]$productwxspath
-)
-
-function Get-RuntimePack ($depsJsonFile, $runtimeName) {
-    Write-Host "Parsing $runtimeName Runtime"
-    $runtimePackList = ([array]$depsJsonFile.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object { $_.Name -match "runtimepack.$runtimeName" };
-    
-    if ($runtimePackList.Length -eq 0) {
-        Write-Host -ForegroundColor Red "$runtimeName has not been found"
-        exit 1
-    }
-
-    # Enumerate through array of custom objects and parse the names of the property values into a HashTable
-    $runtimePackList | ForEach-Object { 
-        $runtimes += @{"$($_.Name -replace "runtimepack\.(\S+)\.\S+/\S+",'$1')" = $_.Value.PSObject.Properties.Value | ForEach-Object {
-                $_.PSObject.Properties.Name 
-            }
-        } 
-    }
-    Write-Output $runtimes;
-}
-
-function Update-RuntimeHashTable () {
-    $runtimes = Get-RuntimePack $runtimeFile "Microsoft.NETCore.App.Runtime"
-    $runtimes = Get-RuntimePack $wpfRuntimeFile "Microsoft.WindowsDesktop.App.Runtime"
-
-    # Find the dlls that exist in both the .NET Runtime and WPF Runtime deps list and filter out of WPF
-    $runtimeFileComparison = Compare-Object -ReferenceObject $runtimes["Microsoft.NETCore.App.Runtime"] -DifferenceObject $runtimes["Microsoft.WindowsDesktop.App.Runtime"] -IncludeEqual -ExcludeDifferent
-
-    $runtimes["Microsoft.WindowsDesktop.App.Runtime"] = $runtimes["Microsoft.WindowsDesktop.App.Runtime"] | Where-Object { $_ -notin $runtimeFileComparison.InputObject }
-
-    Write-Output $runtimes;
-}
-
-function Update-RuntimeFileList($runtimeToken, $runtimeKey) {
-    $depsFilesLists -replace "($runtimeToken = )(.*);", "`$1 {`r`n$(($runtimes[$runtimeKey] | ForEach-Object {'    L"'+$_+'"'} | Sort-Object) -join ",`r`n") };"        
-}
-
-function Update-ProductWxsRuntimeFileList($runtimeToken, $runtimeKey) {
-    $productWxs -replace "(define $runtimeToken=)(.*)?>", "`$1$($runtimes[$runtimeKey] -join ';')?>"
-}
-
-function Update-DotnetFilesComponentGuid() {
-    $productWxs -replace "Dlls_DotnetFiles_Component"" Guid=""([{]?[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[}]?)""", "Dlls_DotnetFiles_Component"" Guid=""$((New-Guid).ToString().ToUpper())"""
-}
-
-# Read the DepsFilesLists.h file
-$depsFilesLists = Get-Content $depsfileslistspath;
-
-# Read Product.wxs file
-$productWxs = Get-Content $productwxspath;
-
-# Read the deps.json file and convert it to a JSON object
-$runtimeFile = Get-Content $runtimedepsjsonpath | ConvertFrom-Json;
-$wpfRuntimeFile = Get-Content $wpfdepsjsonpath | ConvertFrom-Json;
-
-$runtimes = @{}
-
-$runtimes = Update-RuntimeHashTable
-
-Write-Host "Writing Microsoft.NETCore.App.Runtime files"
-$depsFilesLists = Update-RuntimeFileList "dotnetRuntimeFiles" "Microsoft.NETCore.App.Runtime"
-$productWxs = Update-ProductWxsRuntimeFileList "DotnetRuntimeFiles" "Microsoft.NETCore.App.Runtime"
-
-Write-Host "Writing Microsoft.WindowsDesktop.App.Runtime files"
-$depsFilesLists = Update-RuntimeFileList "dotnetRuntimeWPFFiles" "Microsoft.WindowsDesktop.App.Runtime"
-$productWxs = Update-ProductWxsRuntimeFileList "DotnetRuntimeWPFFiles" "Microsoft.WindowsDesktop.App.Runtime"
-
-Write-Host "Update DotnetFiles Component GUID"
-$productWxs = Update-DotnetFilesComponentGuid
-
-Write-Host "Updating $depsfileslistspath"
-Set-Content -Path $depsfileslistspath -Value $depsFilesLists
-
-Write-Host "Updating $productwxspath"
-Set-Content -Path $productwxspath -Value $productWxs

src/Update/PowerToys.Update.cpp

@@ -73,6 +73,9 @@ std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
             return std::nullopt;
         }
 
+        // Cleanup old updates before downloading the latest
+        updating::cleanup_updates();
+
         auto downloaded_installer = download_new_version(std::get<new_version_download_info>(*new_version_info)).get();
         if (!downloaded_installer)
         {

src/common/AllExperiments/AllExperiments.csproj

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.20348.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TargetName>PowerToys.AllExperiments</TargetName>

src/common/Common.UI/SettingsDeepLink.cs

@@ -27,6 +27,7 @@ namespace Common.UI
             MeasureTool,
             PowerOCR,
             RegistryPreview,
+            CropAndLock,
         }
 
         private static string SettingsWindowNameToString(SettingsWindow value)
@@ -65,6 +66,8 @@ namespace Common.UI
                     return "PowerOCR";
                 case SettingsWindow.RegistryPreview:
                     return "RegistryPreview";
+                case SettingsWindow.CropAndLock:
+                    return "CropAndLock";
                 default:
                     {
                         return string.Empty;
@@ -72,13 +75,24 @@ namespace Common.UI
             }
         }
 
-        public static void OpenSettings(SettingsWindow window)
+        public static void OpenSettings(SettingsWindow window, bool mainExecutableIsOnTheParentFolder)
         {
             try
             {
                 var assemblyPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-                var fullPath = Directory.GetParent(assemblyPath).FullName;
-                Process.Start(new ProcessStartInfo(fullPath + "\\..\\PowerToys.exe") { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
+                var fullPath = new DirectoryInfo(assemblyPath).FullName;
+                if (mainExecutableIsOnTheParentFolder)
+                {
+                    // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application.
+                    fullPath = fullPath + "\\..\\PowerToys.exe";
+                }
+                else
+                {
+                    // PowerToys.exe is in the same path as the application.
+                    fullPath = fullPath + "\\PowerToys.exe";
+                }
+
+                Process.Start(new ProcessStartInfo(fullPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
             }
             catch
             {

src/common/FilePreviewCommon/Assets/Monaco/index.html

@@ -0,0 +1,139 @@
+<!doctype HTML>
+<html>
+<head>
+    <script>
+        // Set variables
+
+        // Get URL parameters:
+        // `code` contains the code of the file in base64 encoded
+        // `theme` can be "light" or "dark"
+        // `lang` is the language of the file
+        // `wrap` if the editor is wrapping or not
+        
+        var theme = ("[[PT_THEME]]" == "dark") ? "vs-dark" : "vs";
+        var lang = "[[PT_LANG]]";
+        var wrap = ([[PT_WRAP]] == 1) ? true : false;
+
+        var base64code = "[[PT_CODE]]";
+        
+        // Code taken from https://stackoverflow.com/a/30106551/14774889
+        var code = decodeURIComponent(atob(base64code).split('').map(function(c) {
+            return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+        }).join(''));
+    </script>
+    <!-- Set browser to Edge-->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <!-- Set charset -->
+    <meta charset="utf-8" />
+    <!-- Title (normally not displayed)-->
+    <title>Previewer for developer Files</title>
+    <style>
+        /* Fits content to window size */
+        html, body{
+            padding:0;
+        }
+        #container,.monaco-editor {
+            position:fixed;
+            height:100%;
+            left:0;
+            top:0;
+            right:0;
+            bottom:0;
+        }
+        .overflowingContentWidgets{
+            /*Hides alert box */
+            display:none!important
+        } 
+    </style>
+</head>
+
+<body oncontextmenu="onContextMenu()">
+    <!-- Container for the editor -->
+    <div id="container"></div>
+    <!-- Script -->
+    <script src="http://[[PT_URL]]/monacoSRC/min/vs/loader.js"></script>
+    <script src="http://[[PT_URL]]/monacoSpecialLanguages.js" type="module"></script>
+<script type="module">
+        var editor;
+        import { registerAdditionalLanguages } from "http://[[PT_URL]]/monacoSpecialLanguages.js"
+        require.config({ paths: { vs: 'http://[[PT_URL]]/monacoSRC/min/vs' } });
+        require(['vs/editor/editor.main'], async function () {
+            await registerAdditionalLanguages(monaco)
+            // Creates the editor
+            // For all parameters: https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.istandaloneeditorconstructionoptions.html
+            editor = monaco.editor.create(document.getElementById('container'), {
+                value: code, // Sets content of the editor
+                language: lang, // Sets language fof the code
+                readOnly: true, // Sets to readonly
+                theme: theme, // Sets editor theme
+                minimap: {enabled: false}, // Disables minimap
+                lineNumbersMinChars: "3", //Width of the line numbers
+                scrollbar: {
+                    // Deactivate shadows
+                    shadows: false,
+
+                    // Render scrollbar automatically
+                    vertical: 'auto',
+                    horizontal: 'auto',
+
+                },
+                wordWrap: (wrap?"on":"off") // Word wraps
+            });
+            window.onresize = function (){
+                editor.layout();
+            };
+
+            // Add switch wrap button to context menu
+            editor.addAction({
+                id: 'text-wrap',
+
+                label: 'Toggle text wrapping',
+
+                // A precondition for this action.
+                precondition: null,
+
+                // A rule to evaluate on top of the precondition in order to dispatch the keybindings.
+                keybindingContext: null,
+
+			contextMenuGroupId: 'cutcopypaste',
+
+			contextMenuOrder: 100,
+
+                // Method that will be executed when the action is triggered.
+                // @param editor The editor instance is passed in as a convenience
+                run: function (ed) {
+                    if(wrap){
+                        editor.updateOptions({ wordWrap: "off" })
+                    }else{
+                        editor.updateOptions({ wordWrap: "on" })
+                    }
+                    wrap = !wrap;
+                }
+            });
+
+            onContextMenu();
+        });
+
+        function onContextMenu(){
+            // Hide context menu items
+            // Code modified from https://stackoverflow.com/questions/48745208/disable-cut-and-copy-in-context-menu-in-monaco-editor/65413517#65413517
+            let menus = require('vs/platform/actions/common/actions').MenuRegistry._menuItems
+            let contextMenuEntry = [...menus].find(entry => entry[0].id == "EditorContext")
+            let contextMenuLinks = contextMenuEntry[1]
+
+            let removableIds = ['editor.action.clipboardCutAction', 'editor.action.formatDocument', 'editor.action.formatSelection', 'editor.action.quickCommand', 'editor.action.quickOutline', 'editor.action.refactor', 'editor.action.sourceAction', 'editor.action.rename', undefined, 'editor.action.revealDefinition', 'editor.action.revealDeclaration', 'editor.action.goToTypeDefinition', 'editor.action.goToImplementation', 'editor.action.goToReferences', 'editor.action.changeAll']
+
+            let removeById = (list, ids) => {
+                let node = list._first
+                do {
+                    if (node.element == undefined) break;
+                    let shouldRemove = ids.includes(node.element?.command?.id)
+                    if (shouldRemove) { list._remove(node) }
+                } while ((node = node.next))
+            }
+
+            removeById(contextMenuLinks, removableIds)
+        }
+    </script>
+</body>
+</html>

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.de.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.de",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.de.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.es.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.es",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.es.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.fr.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.fr",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.fr.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.it.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.it",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.it.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ja.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.ja",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.ja.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ko.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.ko",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.ko.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ru.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.ru",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.ru.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-cn.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.zh-cn",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.zh-cn.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-tw.js

@@ -0,0 +1,8 @@
+/*!-----------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
+ *-----------------------------------------------------------*/define("vs/base/common/worker/simpleWorker.nls.zh-tw",{"vs/base/common/platform":["_"]});
+
+//# sourceMappingURL=../../../../../min-maps/vs/base/common/worker/simpleWorker.nls.zh-tw.js.map

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/apex/apex.js

@@ -0,0 +1,10 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/apex/apex", ["require","require"],(require)=>{
+var moduleExports=(()=>{var i=Object.defineProperty;var r=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var d=(e,t)=>{for(var s in t)i(e,s,{get:t[s],enumerable:!0})},g=(e,t,s,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of c(t))!l.call(e,o)&&o!==s&&i(e,o,{get:()=>t[o],enumerable:!(a=r(t,o))||a.enumerable});return e};var p=e=>g(i({},"__esModule",{value:!0}),e);var h={};d(h,{conf:()=>m,language:()=>b});var m={wordPattern:/(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"},{open:"<",close:">"}],folding:{markers:{start:new RegExp("^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))"),end:new RegExp("^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))")}}},u=["abstract","activate","and","any","array","as","asc","assert","autonomous","begin","bigdecimal","blob","boolean","break","bulk","by","case","cast","catch","char","class","collect","commit","const","continue","convertcurrency","decimal","default","delete","desc","do","double","else","end","enum","exception","exit","export","extends","false","final","finally","float","for","from","future","get","global","goto","group","having","hint","if","implements","import","in","inner","insert","instanceof","int","interface","into","join","last_90_days","last_month","last_n_days","last_week","like","limit","list","long","loop","map","merge","native","new","next_90_days","next_month","next_n_days","next_week","not","null","nulls","number","object","of","on","or","outer","override","package","parallel","pragma","private","protected","public","retrieve","return","returning","rollback","savepoint","search","select","set","short","sort","stat","static","strictfp","super","switch","synchronized","system","testmethod","then","this","this_month","this_week","throw","throws","today","tolabel","tomorrow","transaction","transient","trigger","true","try","type","undelete","update","upsert","using","virtual","void","volatile","webservice","when","where","while","yesterday"],f=e=>e.charAt(0).toUpperCase()+e.substr(1),n=[];u.forEach(e=>{n.push(e),n.push(e.toUpperCase()),n.push(f(e))});var b={defaultToken:"",tokenPostfix:".apex",keywords:n,operators:["=",">","<","!","~","?",":","==","<=",">=","!=","&&","||","++","--","+","-","*","/","&","|","^","%","<<",">>",">>>","+=","-=","*=","/=","&=","|=","^=","%=","<<=",">>=",">>>="],symbols:/[=><!~?:&|+\-*\/\^%]+/,escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,digits:/\d+(_+\d+)*/,octaldigits:/[0-7]+(_+[0-7]+)*/,binarydigits:/[0-1]+(_+[0-1]+)*/,hexdigits:/[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,tokenizer:{root:[[/[a-z_$][\w$]*/,{cases:{"@keywords":{token:"keyword.$0"},"@default":"identifier"}}],[/[A-Z][\w\$]*/,{cases:{"@keywords":{token:"keyword.$0"},"@default":"type.identifier"}}],{include:"@whitespace"},[/[{}()\[\]]/,"@brackets"],[/[<>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/@\s*[a-zA-Z_\$][\w\$]*/,"annotation"],[/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/,"number.float"],[/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/,"number.float"],[/(@digits)[fFdD]/,"number.float"],[/(@digits)[lL]?/,"number"],[/[;,.]/,"delimiter"],[/"([^"\\]|\\.)*$/,"string.invalid"],[/'([^'\\]|\\.)*$/,"string.invalid"],[/"/,"string",'@string."'],[/'/,"string","@string.'"],[/'[^\\']'/,"string"],[/(')(@escapes)(')/,["string","string.escape","string"]],[/'/,"string.invalid"]],whitespace:[[/[ \t\r\n]+/,""],[/\/\*\*(?!\/)/,"comment.doc","@apexdoc"],[/\/\*/,"comment","@comment"],[/\/\/.*$/,"comment"]],comment:[[/[^\/*]+/,"comment"],[/\*\//,"comment","@pop"],[/[\/*]/,"comment"]],apexdoc:[[/[^\/*]+/,"comment.doc"],[/\*\//,"comment.doc","@pop"],[/[\/*]/,"comment.doc"]],string:[[/[^\\"']+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}]]}};return p(h);})();
+return moduleExports;
+});

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/azcli/azcli.js

@@ -0,0 +1,10 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/azcli/azcli", ["require","require"],(require)=>{
+var moduleExports=(()=>{var s=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var r=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var c=(t,e)=>{for(var o in e)s(t,o,{get:e[o],enumerable:!0})},k=(t,e,o,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of r(e))!l.call(t,n)&&n!==o&&s(t,n,{get:()=>e[n],enumerable:!(a=i(e,n))||a.enumerable});return t};var p=t=>k(s({},"__esModule",{value:!0}),t);var d={};c(d,{conf:()=>f,language:()=>g});var f={comments:{lineComment:"#"}},g={defaultToken:"keyword",ignoreCase:!0,tokenPostfix:".azcli",str:/[^#\s]/,tokenizer:{root:[{include:"@comment"},[/\s-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}],[/^-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}]],type:[{include:"@comment"},[/-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":"key.identifier"}}],[/@str+\s*/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}]],comment:[[/#.*$/,{cases:{"@eos":{token:"comment",next:"@popall"}}}]]}};return p(d);})();
+return moduleExports;
+});

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bat/bat.js

@@ -0,0 +1,10 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/bat/bat", ["require","require"],(require)=>{
+var moduleExports=(()=>{var n=Object.defineProperty;var r=Object.getOwnPropertyDescriptor;var l=Object.getOwnPropertyNames;var i=Object.prototype.hasOwnProperty;var g=(o,e)=>{for(var t in e)n(o,t,{get:e[t],enumerable:!0})},c=(o,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of l(e))!i.call(o,s)&&s!==t&&n(o,s,{get:()=>e[s],enumerable:!(a=r(e,s))||a.enumerable});return o};var p=o=>c(n({},"__esModule",{value:!0}),o);var k={};g(k,{conf:()=>d,language:()=>m});var d={comments:{lineComment:"REM"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],surroundingPairs:[{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],folding:{markers:{start:new RegExp("^\\s*(::\\s*|REM\\s+)#region"),end:new RegExp("^\\s*(::\\s*|REM\\s+)#endregion")}}},m={defaultToken:"",ignoreCase:!0,tokenPostfix:".bat",brackets:[{token:"delimiter.bracket",open:"{",close:"}"},{token:"delimiter.parenthesis",open:"(",close:")"},{token:"delimiter.square",open:"[",close:"]"}],keywords:/call|defined|echo|errorlevel|exist|for|goto|if|pause|set|shift|start|title|not|pushd|popd/,symbols:/[=><!~?&|+\-*\/\^;\.,]+/,escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[[/^(\s*)(rem(?:\s.*|))$/,["","comment"]],[/(\@?)(@keywords)(?!\w)/,[{token:"keyword"},{token:"keyword.$2"}]],[/[ \t\r\n]+/,""],[/setlocal(?!\w)/,"keyword.tag-setlocal"],[/endlocal(?!\w)/,"keyword.tag-setlocal"],[/[a-zA-Z_]\w*/,""],[/:\w*/,"metatag"],[/%[^%]+%/,"variable"],[/%%[\w]+(?!\w)/,"variable"],[/[{}()\[\]]/,"@brackets"],[/@symbols/,"delimiter"],[/\d*\.\d+([eE][\-+]?\d+)?/,"number.float"],[/0[xX][0-9a-fA-F_]*[0-9a-fA-F]/,"number.hex"],[/\d+/,"number"],[/[;,.]/,"delimiter"],[/"/,"string",'@string."'],[/'/,"string","@string.'"]],string:[[/[^\\"'%]+/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/%[\w ]+%/,"variable"],[/%%[\w]+(?!\w)/,"variable"],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}],[/$/,"string","@popall"]]}};return p(k);})();
+return moduleExports;
+});

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bicep/bicep.js

@@ -0,0 +1,11 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/bicep/bicep", ["require","require"],(require)=>{
+var moduleExports=(()=>{var r=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var a=Object.prototype.hasOwnProperty;var g=(e,n)=>{for(var o in n)r(e,o,{get:n[o],enumerable:!0})},l=(e,n,o,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let t of c(n))!a.call(e,t)&&t!==o&&r(e,t,{get:()=>n[t],enumerable:!(i=s(n,t))||i.enumerable});return e};var m=e=>l(r({},"__esModule",{value:!0}),e);var y={};g(y,{conf:()=>$,language:()=>w});var p=e=>`\\b${e}\\b`,k="[_a-zA-Z]",x="[_a-zA-Z0-9]",u=p(`${k}${x}*`),d=["targetScope","resource","module","param","var","output","for","in","if","existing"],b=["true","false","null"],f="[ \\t\\r\\n]",C="[0-9]+",$={comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"'",close:"'"},{open:"'''",close:"'''"}],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"'",close:"'",notIn:["string","comment"]},{open:"'''",close:"'''",notIn:["string","comment"]}],autoCloseBefore:`:.,=}])' 
+	`,indentationRules:{increaseIndentPattern:new RegExp("^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$"),decreaseIndentPattern:new RegExp("^((?!.*?\\/\\*).*\\*/)?\\s*[\\}\\]].*$")}},w={defaultToken:"",tokenPostfix:".bicep",brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"}],symbols:/[=><!~?:&|+\-*/^%]+/,keywords:d,namedLiterals:b,escapes:"\\\\(u{[0-9A-Fa-f]+}|n|r|t|\\\\|'|\\${)",tokenizer:{root:[{include:"@expression"},{include:"@whitespace"}],stringVerbatim:[{regex:"(|'|'')[^']",action:{token:"string"}},{regex:"'''",action:{token:"string.quote",next:"@pop"}}],stringLiteral:[{regex:"\\${",action:{token:"delimiter.bracket",next:"@bracketCounting"}},{regex:"[^\\\\'$]+",action:{token:"string"}},{regex:"@escapes",action:{token:"string.escape"}},{regex:"\\\\.",action:{token:"string.escape.invalid"}},{regex:"'",action:{token:"string",next:"@pop"}}],bracketCounting:[{regex:"{",action:{token:"delimiter.bracket",next:"@bracketCounting"}},{regex:"}",action:{token:"delimiter.bracket",next:"@pop"}},{include:"expression"}],comment:[{regex:"[^\\*]+",action:{token:"comment"}},{regex:"\\*\\/",action:{token:"comment",next:"@pop"}},{regex:"[\\/*]",action:{token:"comment"}}],whitespace:[{regex:f},{regex:"\\/\\*",action:{token:"comment",next:"@comment"}},{regex:"\\/\\/.*$",action:{token:"comment"}}],expression:[{regex:"'''",action:{token:"string.quote",next:"@stringVerbatim"}},{regex:"'",action:{token:"string.quote",next:"@stringLiteral"}},{regex:C,action:{token:"number"}},{regex:u,action:{cases:{"@keywords":{token:"keyword"},"@namedLiterals":{token:"keyword"},"@default":{token:"identifier"}}}}]}};return m(y);})();
+return moduleExports;
+});

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cameligo/cameligo.js

@@ -0,0 +1,10 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/cameligo/cameligo", ["require","require"],(require)=>{
+var moduleExports=(()=>{var s=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var c=(o,e)=>{for(var n in e)s(o,n,{get:e[n],enumerable:!0})},m=(o,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of a(e))!l.call(o,t)&&t!==n&&s(o,t,{get:()=>e[t],enumerable:!(r=i(e,t))||r.enumerable});return o};var p=o=>m(s({},"__esModule",{value:!0}),o);var u={};c(u,{conf:()=>d,language:()=>g});var d={comments:{lineComment:"//",blockComment:["(*","*)"]},brackets:[["{","}"],["[","]"],["(",")"],["<",">"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'},{open:"(*",close:"*)"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'},{open:"(*",close:"*)"}]},g={defaultToken:"",tokenPostfix:".cameligo",ignoreCase:!0,brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"},{open:"<",close:">",token:"delimiter.angle"}],keywords:["abs","assert","block","Bytes","case","Crypto","Current","else","failwith","false","for","fun","if","in","let","let%entry","let%init","List","list","Map","map","match","match%nat","mod","not","operation","Operation","of","record","Set","set","sender","skip","source","String","then","to","true","type","with"],typeKeywords:["int","unit","string","tz","nat","bool"],operators:["=",">","<","<=",">=","<>",":",":=","and","mod","or","+","-","*","/","@","&","^","%","->","<-","&&","||"],symbols:/[=><:@\^&|+\-*\/\^%]+/,tokenizer:{root:[[/[a-zA-Z_][\w]*/,{cases:{"@keywords":{token:"keyword.$0"},"@default":"identifier"}}],{include:"@whitespace"},[/[{}()\[\]]/,"@brackets"],[/[<>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/\d*\.\d+([eE][\-+]?\d+)?/,"number.float"],[/\$[0-9a-fA-F]{1,16}/,"number.hex"],[/\d+/,"number"],[/[;,.]/,"delimiter"],[/'([^'\\]|\\.)*$/,"string.invalid"],[/'/,"string","@string"],[/'[^\\']'/,"string"],[/'/,"string.invalid"],[/\#\d+/,"string"]],comment:[[/[^\(\*]+/,"comment"],[/\*\)/,"comment","@pop"],[/\(\*/,"comment"]],string:[[/[^\\']+/,"string"],[/\\./,"string.escape.invalid"],[/'/,{token:"string.quote",bracket:"@close",next:"@pop"}]],whitespace:[[/[ \t\r\n]+/,"white"],[/\(\*/,"comment","@comment"],[/\/\/.*$/,"comment"]]}};return p(u);})();
+return moduleExports;
+});

src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/coffee/coffee.js

@@ -0,0 +1,10 @@
+"use strict";/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Version: 0.38.0(0e330ae453813de4e6cf272460fb79c7117073d0)
+ * Released under the MIT license
+ * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/coffee/coffee", ["require","require"],(require)=>{
+var moduleExports=(()=>{var s=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var a=Object.prototype.hasOwnProperty;var l=(n,e)=>{for(var t in e)s(n,t,{get:e[t],enumerable:!0})},p=(n,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of g(e))!a.call(n,r)&&r!==t&&s(n,r,{get:()=>e[r],enumerable:!(o=i(e,r))||o.enumerable});return n};var c=n=>p(s({},"__esModule",{value:!0}),n);var m={};l(m,{conf:()=>d,language:()=>x});var d={wordPattern:/(-?\d*\.\d\w*)|([^\`\~\!\@\#%\^\&\*\(\)\=\$\-\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,comments:{blockComment:["###","###"],lineComment:"#"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],folding:{markers:{start:new RegExp("^\\s*#region\\b"),end:new RegExp("^\\s*#endregion\\b")}}},x={defaultToken:"",ignoreCase:!0,tokenPostfix:".coffee",brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"}],regEx:/\/(?!\/\/)(?:[^\/\\]|\\.)*\/[igm]*/,keywords:["and","or","is","isnt","not","on","yes","@","no","off","true","false","null","this","new","delete","typeof","in","instanceof","return","throw","break","continue","debugger","if","else","switch","for","while","do","try","catch","finally","class","extends","super","undefined","then","unless","until","loop","of","by","when"],symbols:/[=><!~?&%|+\-*\/\^\.,\:]+/,escapes:/\\(?:[abfnrtv\\"'$]|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[[/\@[a-zA-Z_]\w*/,"variable.predefined"],[/[a-zA-Z_]\w*/,{cases:{this:"variable.predefined","@keywords":{token:"keyword.$0"},"@default":""}}],[/[ \t\r\n]+/,""],[/###/,"comment","@comment"],[/#.*$/,"comment"],["///",{token:"regexp",next:"@hereregexp"}],[/^(\s*)(@regEx)/,["","regexp"]],[/(\()(\s*)(@regEx)/,["@brackets","","regexp"]],[/(\,)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\=)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\:)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\[)(\s*)(@regEx)/,["@brackets","","regexp"]],[/(\!)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\&)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\|)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\?)(\s*)(@regEx)/,["delimiter","","regexp"]],[/(\{)(\s*)(@regEx)/,["@brackets","","regexp"]],[/(\;)(\s*)(@regEx)/,["","","regexp"]],[/}/,{cases:{"$S2==interpolatedstring":{token:"string",next:"@pop"},"@default":"@brackets"}}],[/[{}()\[\]]/,"@brackets"],[/@symbols/,"delimiter"],[/\d+[eE]([\-+]?\d+)?/,"number.float"],[/\d+\.\d+([eE][\-+]?\d+)?/,"number.float"],[/0[xX][0-9a-fA-F]+/,"number.hex"],[/0[0-7]+(?!\d)/,"number.octal"],[/\d+/,"number"],[/[,.]/,"delimiter"],[/"""/,"string",'@herestring."""'],[/'''/,"string","@herestring.'''"],[/"/,{cases:{"@eos":"string","@default":{token:"string",next:'@string."'}}}],[/'/,{cases:{"@eos":"string","@default":{token:"string",next:"@string.'"}}}]],string:[[/[^"'\#\\]+/,"string"],[/@escapes/,"string.escape"],[/\./,"string.escape.invalid"],[/\./,"string.escape.invalid"],[/#{/,{cases:{'$S2=="':{token:"string",next:"root.interpolatedstring"},"@default":"string"}}],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}],[/#/,"string"]],herestring:[[/("""|''')/,{cases:{"$1==$S2":{token:"string",next:"@pop"},"@default":"string"}}],[/[^#\\'"]+/,"string"],[/['"]+/,"string"],[/@escapes/,"string.escape"],[/\./,"string.escape.invalid"],[/#{/,{token:"string.quote",next:"root.interpolatedstring"}],[/#/,"string"]],comment:[[/[^#]+/,"comment"],[/###/,"comment","@pop"],[/#/,"comment"]],hereregexp:[[/[^\\\/#]+/,"regexp"],[/\\./,"regexp"],[/#.*$/,"comment"],["///[igm]*",{token:"regexp",next:"@pop"}],[/\//,"regexp"]]}};return c(m);})();
+return moduleExports;
+});