[Registry Preview] Fix the issue of saving files without truncation (#27113)

This reverts commit 217f3f9ff3.

.configurations/configuration.dsc.yaml

@@ -0,0 +1,34 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
+properties:
+  resources:
+    - resource: Microsoft.Windows.Developer/DeveloperMode
+      directives:
+        description: Enable Developer Mode
+        allowPrerelease: true
+      settings:
+        Ensure: Present
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio 2022 (any edition is OK)
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.2022.Community
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.Community
+        channelId: VisualStudio.17.Release
+        vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
+  configurationVersion: 0.2.0
+
+  # Next steps:
+  # Open a terminal
+  # Navigate to the folder you cloned PowerToys to.
+  # Run git submodule update --init --recursive

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,7 +10,7 @@ body:
 - type: input
   attributes:
     label: Microsoft PowerToys version
-    placeholder: 0.63.0
+    placeholder: 0.70.0
     description: Hover over system tray icon or look at Settings
   validations:
     required: true
@@ -60,9 +60,13 @@ body:
       - Installer
       - Keyboard Manager
       - Mouse Utilities
+      - Mouse Without Borders
+      - Paste as Plain Text
+      - Peek
       - PowerRename
       - PowerToys Run
       - Quick Accent
+      - Registry Preview
       - Screen ruler
       - Settings
       - Shortcut Guide

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -12,7 +12,7 @@ body:
 - type: input
   attributes:
     label: Microsoft PowerToys version
-    placeholder: 0.63.0
+    placeholder: 0.70.0
     description: Hover over system tray icon or look at Settings
   validations:
     required: true
@@ -34,9 +34,13 @@ body:
     - Installer
     - Keyboard Manager
     - Mouse Utilities
+    - Mouse Without Borders
+    - Paste as Plain Text
+    - Peek
     - PowerRename
     - PowerToys Run
     - Quick Accent
+    - Registry Preview
     - Screen ruler
     - Settings
     - Shortcut Guide

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

@@ -1,18 +1,49 @@
 ABradley
+Aleks
+Ashish
 azchohfi
+Baltazar
+Bao
 bdoserror
+Chinh
+Coplen
 crutkas
 dependabot
 Deuchert
+ductdo
 edwinzap
+Essey
+Garside
+Gershaft
 hallatore
+Harmath
+Hemmerlein
+Huynh
+Jaswal
 jefflord
+Kamra
+Karthick
+Krigun
+Luecking
+Mahalingam
 mshtang
+Myrvold
 naveensrinivasan
 nVidia
+Ponten
+Pooja
 robmen
+Schoen
 skycommand
 snickler
 sinclairinat
+streamjsonrpc
+tilovell
+TheJoeFin
+Triet
 Vidia
+WEX
+WWL
 yifan
+Yuniardi
+Zoltan

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

@@ -3,11 +3,11 @@
 (?:^|/)(?i)LICEN[CS]E
 (?:^|/)3rdparty/
 (?:^|/)go\.sum$
-(?:^|/)MonacoPreviewHandler/customLanguages/
-(?:^|/)MonacoPreviewHandler/generateLanguagesJson.html
-(?:^|/)MonacoPreviewHandler/index.html
-(?:^|/)MonacoPreviewHandler/monaco_languages.json
-(?:^|/)MonacoPreviewHandler/monacoSpecialLanguages.js
+(?:^|/)FilePreviewCommon/customLanguages/
+(?:^|/)FilePreviewCommon/generateLanguagesJson.html
+(?:^|/)FilePreviewCommon/index.html
+(?:^|/)FilePreviewCommon/monaco_languages.json
+(?:^|/)FilePreviewCommon/monacoSpecialLanguages.js
 (?:^|/)monacoSRC/
 (?:^|/)package(?:-lock|)\.json$
 (?:^|/)timezones\.json$
@@ -77,9 +77,13 @@
 ^\.gitmodules$
 ^\Q.github/workflows/spelling2.yml\E$
 ^\Q.pipelines/ESRPSigning_core.json\E$
-^\Qsrc/modules/colorPicker/ColorPickerUI/Shaders/GridShader.cso\E$
-^\Qsrc/common/ManagedCommon/ColorFormatHelper.cs\E$
 ^\Qinstaller/PowerToysSetup/Settings.wxs\E$
+^\Qsrc/common/ManagedCommon/ColorFormatHelper.cs\E$
+^\Qsrc/modules/colorPicker/ColorPickerUI/Shaders/GridShader.cso\E$
+^\Qsrc/modules/MouseUtils/MouseJumpUI/MainForm.resx\E$
+^\Qsrc/modules/MouseWithoutBorders/App/Form/frmAbout.cs\E$
+^\Qsrc/modules/MouseWithoutBorders/App/Properties/AssemblyInfo.cs\E$
+^\Qsrc/modules/MouseWithoutBorders/ModuleInterface/generateSecurityDescriptor.h\E$
 ^\Qsrc/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/TestFiles/CorruptJson/Microsoft/PowerToys/settings.json\E$
 ^\Qsrc/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/TestFiles/v0.18.2/Microsoft/PowerToys/PowerRename/power-rename-ui-flags\E$
 ^\Qsrc/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/TestFiles/v0.19.2/Microsoft/PowerToys/PowerRename/power-rename-ui-flags\E$
@@ -98,6 +102,12 @@
 ^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$
 ^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$
 ^src/modules/imageresizer/dll/ImageResizerExt\.rgs$
+^src/modules/MouseUtils/MouseJumpUI/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs$
+^src/modules/MouseWithoutBorders/App/Form/.*\.resx$
+^src/modules/MouseWithoutBorders/App/Form/.*\.Designer\.cs$
+^src/modules/MouseWithoutBorders/App/Helper/.*\.resx$
+^src/modules/MouseWithoutBorders/App/.*/NativeMethods\.cs$
+^src/modules/peek/Peek\.Common/NativeMethods\.txt$
 ^src/modules/powerrename/testapp/PowerRenameTest\.vcxproj\.filters$
 ^src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag\.txt$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag.txt$

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

@@ -56,12 +56,16 @@ https?://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
 /gist\.github\.com/[^/]+/[0-9a-f]+
 
 # msdn
-\b(?:download\.visualstudio|docs|msdn)\.microsoft\.com/[-_a-zA-Z0-9()=./]*
+\b(?:download\.visualstudio|docs|msdn|learn)\.microsoft\.com/[-_a-zA-Z0-9()=./]*
+aka\.ms/[a-zA-Z0-9]+
 
 # medium
 link\.medium\.com/[a-zA-Z0-9]+
 \bmedium\.com/\@[^/]+/[-\w]+
 
+# experimentation urls
+https?://default\.exp-tas\.com/[-_a-zA-Z0-9/]*
+
 publicKeyToken=(['"]|)[0-9a-f]+\g{-1}
 \@sha256:[0-9a-f]{64}\b
 

.github/fabricbot.json

@@ -1,929 +0,0 @@
-{
-  "version": "1.0",
-  "tasks": [
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Add needs triage label to new issues",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "opened"
-              }
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isPartOfProject",
-                  "parameters": {}
-                }
-              ]
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAssignedToSomeone",
-                  "parameters": {}
-                }
-              ]
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "eUOhvA_62"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Replace needs author feedback label with needs attention label when the author comments on an issue",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "created"
-              }
-            },
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Needs-Author-Feedback"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Author-Feedback"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs-Team-Response"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "kgfxdBIu_9"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label from issues",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Status-No recent activity"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Status-No recent activity"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "eR-TaGJJzW",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label when an issue is commented on",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Status-No recent activity"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Status-No recent activity"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "tXKeoDht_g",
-      "disabled": false
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close stale issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              1,
-              7,
-              13,
-              19
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Needs-Author-Feedback"
-            }
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Status-No recent activity"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 5
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "8yr-nVZj9k",
-      "disabled": false
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Add no recent activity label to issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              8,
-              14,
-              20
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Needs-Author-Feedback"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 5
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "Status-No recent activity"
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Status-No recent activity"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **5 days**. It will be closed if no further activity occurs **within 5 days of this comment**."
-            }
-          }
-        ]
-      },
-      "id": "DAhxoYjVcq",
-      "disabled": false
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close duplicate issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              3,
-              9,
-              15,
-              21
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Resolution-Duplicate"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 1
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "xGhARy1H0w"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "InPrLabel",
-      "subCapability": "InPrLabel",
-      "version": "1.0",
-      "config": {
-        "taskName": "Add 'In-PR' label on issue when an open pull request is targeting it",
-        "inPrLabelText": "Status: In PR",
-        "fixedLabelText": "Status: Fixed",
-        "fixedLabelEnabled": true,
-        "label_fixed": "Resolution-Fix-Committed",
-        "label_inPr": "In progress"
-      },
-      "id": "Rn1tANe62T"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "EmailCleanser",
-      "subCapability": "EmailCleanser",
-      "version": "1.0",
-      "id": "X0O-6aZ1v3_DAmhUIcNb2",
-      "config": {
-        "taskName": "Clean the email stuff"
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "VyV9JJSA8SbOyeWEwjyfL",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "commentContains",
-              "parameters": {
-                "commentPattern": "\\/(bugreport|reportbug)",
-                "isRegex": true
-              }
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "permissions": "admin",
-                    "association": "MEMBER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "OWNER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "COLLABORATOR"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "taskName": "Ask for bug report zip file",
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs-Author-Feedback"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "Hi there!<br/><br/>We need a bit more information to really debug this issue. Can you add a \"Report Bug\" zip file here?  You right click on our system tray icon and just go to report bug.  Then drag the zipfile from your desktop onto the GitHub comment box in this issue.  Thanks! <br/>![Report Bug](https://user-images.githubusercontent.com/11349917/133042052-4975be21-4699-4363-83c9-a8e1869d079d.png)"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Team-Response"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "bvMkigH2HPgUniYFCNco9",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "commentContains",
-              "parameters": {
-                "isRegex": true,
-                "commentPattern": "\\/feedback[H|h]ub"
-              }
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "OWNER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "MEMBER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "COLLABORATOR"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "taskName": "Helper to mark as feedback hub",
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "Hi! We've identified this issue that best is suited for Windows Feedback Hub. To do this on Windows, WinKey+F will bring it up!"
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Team-Response"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Resolution-Please File on Feedback Hub"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "bvMkigH2HPgUniYFCNco8",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "commentContains",
-              "parameters": {
-                "isRegex": true,
-                "commentPattern": "\\/dup(licate|e)?(\\s+of)?\\s+(#[\\d]+|https)"
-              }
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "OWNER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "MEMBER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "COLLABORATOR"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "taskName": "Helper to mark as duplicate",
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!"
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Team-Response"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Resolution-Duplicate"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "mgZxIoqeF7GWUo7-tZF56",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "commentContains",
-              "parameters": {
-                "commentPattern": "\\/needinfo",
-                "isRegex": true
-              }
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "OWNER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "MEMBER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "COLLABORATOR"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Team-Response"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs-Author-Feedback"
-            }
-          }
-        ],
-        "taskName": "Author Response needed"
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "mgZxIoqeF7GWUo7-t3773",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "commentContains",
-              "parameters": {
-                "commentPattern": "\\/loc\\b",
-                "isRegex": true
-              }
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "OWNER"
-                  }
-                },
-                {
-                  "name": "activitySenderHasAssociation",
-                  "parameters": {
-                    "association": "MEMBER"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Needs-Triage"
-            }
-          },
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Loc-Sent To Team"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "Hi! Thanks for making us aware of the problem. We raised the issue with our internal localization team. This issue should be fixed hopefully in the next version of PowerToys."
-            }
-          }
-        ],
-        "taskName": "Filed ADO item with Localization team"
-      }
-    }
-  ],
-  "userGroups": []
-}

.github/policies/resourceManagement.yml

@@ -0,0 +1,214 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Needs-Author-Feedback
+      - hasLabel:
+          label: Status-No recent activity
+      - noActivitySince:
+          days: 5
+      actions:
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Needs-Author-Feedback
+      - noActivitySince:
+          days: 5
+      - isNotLabeledWith:
+          label: Status-No recent activity
+      actions:
+      - addLabel:
+          label: Status-No recent activity
+      - addReply:
+          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **5 days**. It will be closed if no further activity occurs **within 5 days of this comment**.
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Duplicate
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Needs-Author-Feedback
+      - isOpen
+      then:
+      - addLabel:
+          label: Needs-Triage
+      - removeLabel:
+          label: Needs-Author-Feedback
+      - addLabel:
+          label: Needs-Team-Response
+      description: 
+    - if:
+      - payloadType: Issues
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Status-No recent activity
+      then:
+      - removeLabel:
+          label: Status-No recent activity
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Status-No recent activity
+      then:
+      - removeLabel:
+          label: Status-No recent activity
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      then:
+      - inPrLabel:
+          label: Status-In progress
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      then:
+      - cleanEmailReply
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/(bugreport|reportbug)'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Member
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Collaborator
+      then:
+      - removeLabel:
+          label: Needs-Triage
+      - addLabel:
+          label: Needs-Author-Feedback
+      - addReply:
+          reply: Hi there!<br/><br/>We need a bit more information to really debug this issue. Can you add a "Report Bug" zip file here?  You right click on our system tray icon and just go to report bug.  Then drag the zipfile from your desktop onto the GitHub comment box in this issue.  Thanks! <br/>![Report Bug](https://user-images.githubusercontent.com/11349917/133042052-4975be21-4699-4363-83c9-a8e1869d079d.png)
+      - removeLabel:
+          label: Needs-Team-Response
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/feedback[H|h]ub'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Member
+        - activitySenderHasAssociation:
+            association: Collaborator
+      then:
+      - addReply:
+          reply: Hi! We've identified this issue that best is suited for Windows Feedback Hub. To do this on Windows, WinKey+F will bring it up!
+      - closeIssue
+      - removeLabel:
+          label: Needs-Triage
+      - removeLabel:
+          label: Needs-Team-Response
+      - addLabel:
+          label: Resolution-Please File on Feedback Hub
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/dup(licate|e)?(\s+of)?\s+(\#[\d]+|https)'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Member
+        - activitySenderHasAssociation:
+            association: Collaborator
+      then:
+      - addReply:
+          reply: Hi! We've identified this issue as a duplicate of another one that already exists on this Issue Tracker. This specific instance is being closed in favor of tracking the concern over on the referenced thread. Thanks for your report!
+      - closeIssue
+      - removeLabel:
+          label: Needs-Triage
+      - removeLabel:
+          label: Needs-Team-Response
+      - addLabel:
+          label: Resolution-Duplicate
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/needinfo'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Member
+        - activitySenderHasAssociation:
+            association: Collaborator
+      then:
+      - removeLabel:
+          label: Needs-Triage
+      - removeLabel:
+          label: Needs-Team-Response
+      - addLabel:
+          label: Needs-Author-Feedback
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - commentContains:
+          pattern: '\/loc\b'
+          isRegex: True
+      - or:
+        - activitySenderHasAssociation:
+            association: Owner
+        - activitySenderHasAssociation:
+            association: Member
+      then:
+      - removeLabel:
+          label: Needs-Triage
+      - addLabel:
+          label: Loc-Sent To Team
+      - addReply:
+          reply: Hi! Thanks for making us aware of the problem. We raised the issue with our internal localization team. This issue should be fixed hopefully in the next version of PowerToys.
+      description: 
+onFailure: 
+onSuccess: 

.github/workflows/package-submissions.yml

@@ -1,4 +1,4 @@
-name: Submit Microsoft.PowerToys package to Windows Package Manager Community Repository 
+name: Submit Microsoft.PowerToys package to Windows Package Manager Community Repository
 # based off of https://github.com/nushell/nushell/blob/main/.github/workflows/winget-submission.yml
 
 on:
@@ -7,24 +7,25 @@ on:
     types: [published]
 
 jobs:
-
   winget:
     name: Publish winget package
     runs-on: windows-latest
     steps:
       - name: Submit package to Windows Package Manager Community Repository
         run: |
-          
+
           $wingetPackage = "Microsoft.PowerToys"
           $gitToken = "${{ secrets.PT_WINGET }}"
-          
+
           $github = Invoke-RestMethod -uri "https://api.github.com/repos/Microsoft/PowerToys/releases" 
-          
+
           $targetRelease = $github | Where-Object -Property name -match 'Release'| Select -First 1
-          $installerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url
-          $installerUrlArm = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*arm64' | Select -ExpandProperty browser_download_url
+          $installerUserX64Url = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysUserSetup.*x64' | Select -ExpandProperty browser_download_url
+          $installerMachineX64Url = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url
+          $installerUserArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysUserSetup.*arm64' | Select -ExpandProperty browser_download_url
+          $installerMachineArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*arm64' | Select -ExpandProperty browser_download_url
           $ver = $targetRelease.tag_name.Trim("v")
-          
+
           # getting latest wingetcreate file
           iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          .\wingetcreate.exe update $wingetPackage -s -v $ver -u $installerUrl $installerUrlArm -t $gitToken
+          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$installerUserX64Url|user" "$installerMachineX64Url|machine" "$installerUserArmUrl|user" "$installerMachineArmUrl|machine" -t $gitToken

.gitignore

@@ -345,6 +345,3 @@ 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

@@ -12,6 +12,7 @@
                 "Notifications.dll",
                 "os-detection.dll",
                 "PowerToys.exe",
+                "PowerToys.FilePreviewCommon.dll",
                 "PowerToys.Interop.dll",
                 "BugReportTool\\PowerToys.BugReportTool.exe",
                 "WebcamReportTool\\PowerToys.WebcamReportTool.exe",
@@ -23,6 +24,7 @@
                 "PowerToys.Settings.UI.Lib.dll",
                 "PowerToys.GPOWrapper.dll",
                 "PowerToys.GPOWrapperProjection.dll",
+                "PowerToys.AllExperiments.dll",
 
                 "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTop.exe",
                 "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTopModuleInterface.dll",
@@ -35,6 +37,8 @@
                 "modules\\PowerOCR\\PowerToys.PowerOCR.dll",
                 "modules\\PowerOCR\\PowerToys.PowerOCR.exe",
 
+                "modules\\PastePlain\\PowerToys.PastePlainModuleInterface.dll",
+
                 "modules\\Awake\\PowerToys.AwakeModuleInterface.dll",
                 "modules\\Awake\\PowerToys.Awake.exe",
                 "modules\\Awake\\PowerToys.Awake.dll",
@@ -85,6 +89,12 @@
                 "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.exe",
                 "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.dll",
 
+                "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",
+
                 "modules\\ImageResizer\\PowerToys.ImageResizer.exe",
                 "modules\\ImageResizer\\PowerToys.ImageResizer.dll",
                 "modules\\ImageResizer\\PowerToys.ImageResizerExt.dll",
@@ -106,7 +116,8 @@
                 "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\\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",
@@ -118,7 +129,6 @@
                 "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\\TimeZone\\Microsoft.PowerToys.Run.Plugin.TimeZone.dll",
                 "modules\\launcher\\Plugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
                 "modules\\launcher\\Plugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
                 
@@ -129,7 +139,18 @@
 
                 "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",
+
+                "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",
 
                 "modules\\PowerAccent\\PowerAccent.Core.dll",
                 "modules\\PowerAccent\\PowerToys.PowerAccent.dll",
@@ -142,6 +163,10 @@
                 "modules\\PowerRename\\PowerToys.PowerRenameContextMenu.dll",
                 "modules\\PowerRename\\PowerRenameContextMenuPackage.msix",
 
+                "modules\\RegistryPreview\\PowerToys.RegistryPreviewExt.dll",
+                "modules\\RegistryPreview\\PowerToys.RegistryPreview.dll",
+                "modules\\RegistryPreview\\PowerToys.RegistryPreview.exe",
+
                 "modules\\ShortcutGuide\\ShortcutGuide\\PowerToys.ShortcutGuide.exe",
                 "modules\\ShortcutGuide\\ShortcutGuideModuleInterface\\PowerToys.ShortcutGuideModuleInterface.dll",
 
@@ -202,6 +227,8 @@
                 "Mono.Cecil.Mdb.dll",
                 "Mono.Cecil.Pdb.dll",
                 "Mono.Cecil.Rocks.dll",
+                "Newtonsoft.Json.dll",
+                "Newtonsoft.Json.Bson.dll",
                 "NLog.dll",
                 "HtmlAgilityPack.dll",
                 "Markdig.Signed.dll",
@@ -233,11 +260,14 @@
                 "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",
@@ -246,9 +276,16 @@
                 "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",
                 "ColorCode.Core.dll", 
                 "ColorCode.UWP.dll",
                 "UnitsNet.dll"

.pipelines/ESRPSigning_installer.json

@@ -5,8 +5,8 @@
         {
             "MatchedPath": [
                 "PowerToysSetupCustomActions.dll",
-                "PowerToysSetup-*.exe",
-                "PowerToysSetup-*.msi"
+                "PowerToys*Setup-*.exe",
+                "PowerToys*Setup-*.msi"
             ],
             "SigningInfo": {
                 "Operations": [

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

@@ -69,7 +69,7 @@ steps:
     configPath: NuGet.config
     restoreSolution: PowerToys.sln
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
-    
+
 - task: VSBuild@1
   displayName: 'Build PowerToys.sln'
   inputs:
@@ -153,7 +153,7 @@ steps:
     filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
 
 - task: VSBuild@1
-  displayName: 'Build PowerToys MSI'
+  displayName: 'Build PowerToys per-machine MSI'
   inputs:
     solution: '**\installer\PowerToysSetup.sln'
     vsVersion: 17.0
@@ -163,7 +163,7 @@ steps:
     maximumCpuCount: true
 
 - task: VSBuild@1
-  displayName: 'Build PowerToys Bootstrapper'
+  displayName: 'Build PowerToys per-machine Bootstrapper'
   inputs:
     solution: '**\installer\PowerToysSetup.sln'
     vsVersion: 17.0
@@ -173,6 +173,43 @@ steps:
     clean: false
     maximumCpuCount: true
 
+- task: PowerShell@2
+  displayName: Clean installer dir before building per-user installer
+  inputs:
+    targetType: inline
+    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:
+    solution: '**\installer\PowerToysSetup.sln'
+    vsVersion: 17.0
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    msbuildArgs: /t:PowerToysInstaller ${{ parameters.additionalBuildArguments }} /p:PerUser=true
+    maximumCpuCount: true
+
+- task: VSBuild@1
+  displayName: 'Build PowerToys per-user Bootstrapper'
+  inputs:
+    solution: '**\installer\PowerToysSetup.sln'
+    vsVersion: 17.0
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true
+    clean: false
+    maximumCpuCount: true
+
 # directly not doing WinAppDriver testing
 - task: VSTest@2
   displayName: 'MS Tests'
@@ -201,13 +238,13 @@ steps:
       **\Wox.Test.dll
       **\Microsoft.PowerToys.Run.Plugin.System.UnitTests.dll
       **\Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.dll
-      **\Microsoft.PowerToys.Run.Plugin.TimeZone.UnitTests.dll
       **\Microsoft.Plugin.WindowsTerminal.UnitTests.dll
       **\Microsoft.Plugin.WindowWalker.UnitTests.dll
       **\PreviewPaneUnitTests.dll
       **\UnitTests-SvgThumbnailProvider.dll
       **\UnitTests-SvgPreviewHandler.dll
       **\PowerToys.Hosts.Tests.dll
+      **\MouseJumpUI.UnitTests.dll
       !**\obj\**
       !**\ref\**
 
@@ -227,10 +264,17 @@ steps:
       **\powerpreviewTest.dll
       **\UnitTests-FancyZones.dll
       !**\obj\**
-  
+
+- task: PowerShell@2
+  displayName: Trigger dotnet welcome message so that it does not cause errors on other scripts
+  inputs:
+    targetType: 'inline'
+    script: |
+      dotnet list $(build.sourcesdirectory)\src\common\Common.UI\Common.UI.csproj package
+
 - task: PowerShell@2
   displayName: Verifying Notice.md and Nuget packages match
   inputs:
     filePath: '$(build.sourcesdirectory)\.pipelines\verifyNoticeMdAgainstNugetPackages.ps1'
     arguments: -path '$(build.sourcesdirectory)\'
-    pwsh: true
+    pwsh: true

.pipelines/installer-steps.yml

@@ -0,0 +1,141 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
+  - name: perUserArg
+    type: string
+    default: "false"
+  - name: buildSubDir
+    type: string
+    default: "MachineSetup"
+  - name: installerPrefix
+    type: string
+    default: "PowerToysSetup"
+
+steps:
+  - task: VSBuild@1
+    displayName: Build PowerToysSetupCustomActions DLL # This dll needs to be build and signed before building the MSI.
+    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}}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: true
+      maximumCpuCount: true
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: Sign PowerToysSetupCustomActions DLL
+    inputs:
+      ConnectedServiceName: "Terminal/Console/WinAppDriver Team Code Signing Connection"
+      FolderPath: 'installer/PowerToysSetupCustomActions/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
+      signType: batchSigning
+      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  ## INSTALLER START
+  #### MSI BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: Build MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true /target:PowerToysInstaller /bl:$(Build.SourcesDirectory)\msbuild.binlog /p:RunBuildEvents=false /p:PerUser=${{parameters.perUserArg}}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      maximumCpuCount: true
+
+  - task: CmdLine@2
+    displayName: "Extracting MSI to verify contents"
+    inputs:
+      script: |
+        "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
+
+  # Did we sign all files
+  - task: PowerShell@1
+    displayName: Verifying entire build is signed and version set
+    inputs:
+      scriptName: .pipelines/versionAndSignCheck.ps1
+      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+
+  - task: PowerShell@1
+    displayName: Verifying MSI Custom Actions DLL is signed
+    inputs:
+      scriptName: .pipelines/versionAndSignCheck.ps1
+      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: Sign MSI
+    inputs:
+      ConnectedServiceName: "Terminal/Console/WinAppDriver Team Code Signing Connection"
+      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
+      signType: batchSigning
+      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END MSI
+  #### BOOTSTRAP BUILDING AND SIGNING
+
+  - task: VSBuild@1
+    displayName: Build Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysBootstrapper /p:PerUser=${{parameters.perUserArg}}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI
+      maximumCpuCount: true
+
+  - task: CmdLine@2
+    displayName: "Insignia: Extract Engine from Bundle"
+    inputs:
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: "ESRP CodeSigning (Engine)"
+    inputs:
+      ConnectedServiceName: "Terminal/Console/WinAppDriver Team Code Signing Connection"
+      FolderPath: "installer"
+      Pattern: engine.exe
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+            {
+                "KeyCode": "CP-230012",
+                "OperationCode": "SigntoolSign",
+                "Parameters": {
+                    "OpusName": "Microsoft",
+                    "OpusInfo": "http://www.microsoft.com",
+                    "FileDigest": "/fd \"SHA256\"",
+                    "PageHash": "/NPH",
+                    "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                },
+                "ToolName": "sign",
+                "ToolVersion": "1.0"
+            },
+            {
+                "KeyCode": "CP-230012",
+                "OperationCode": "SigntoolVerify",
+                "Parameters": {},
+                "ToolName": "sign",
+                "ToolVersion": "1.0"
+            }
+        ]
+
+  - task: CmdLine@2
+    displayName: "Insignia: Merge Engine into Bundle"
+    inputs:
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: Sign Bootstrapper
+    inputs:
+      ConnectedServiceName: "Terminal/Console/WinAppDriver Team Code Signing Connection"
+      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
+      signType: batchSigning
+      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END BOOTSTRAP
+  ## END INSTALLER

.pipelines/release-nuget.config

@@ -4,6 +4,12 @@
         <clear />
         <add key="PowerToysDependencies" value="https://microsoft.pkgs.visualstudio.com/Dart/_packaging/PowerToysDependencies/nuget/v3/index.json" />
     </packageSources>
+    <packageSourceMapping>
+        <clear />
+        <packageSource key="PowerToysDependencies">
+            <package pattern="*" />
+        </packageSource>
+    </packageSourceMapping>
     <disabledPackageSources>
         <clear />
     </disabledPackageSources>

.pipelines/release.yml

@@ -23,6 +23,7 @@ parameters:
 variables:
   IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
   SkipCppCodeAnalysis: 1 # Skip the code analysis to speed up release CI. It runs on PR CI, anyway
+  IsExperimentationLive: 1 # The build and installer use this to turn on experimentation
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 resources:
@@ -174,17 +175,6 @@ jobs:
       clean: true
       maximumCpuCount: true
 
-  - task: VSBuild@1
-    displayName: Build PowerToysSetupCustomActions
-    inputs:
-      solution: '**/installer/PowerToysSetup.sln'
-      vsVersion: 17.0
-      msbuildArgs: /target:PowerToysSetupCustomActions /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: true
-      maximumCpuCount: true
-
   - task: VSBuild@1
     displayName: Publish Settings for Packaging
     inputs:
@@ -312,29 +302,10 @@ jobs:
       configuration: $(BuildConfiguration)
       maximumCpuCount: true
 
-  - task: VSBuild@1
-    displayName: Build PowerToysSetupCustomActions DLL # This dll needs to be build and signed before building the MSI.
-    inputs:
-      solution: '**/installer/PowerToysSetup.sln'
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysSetupCustomActions /p:RunBuildEvents=true
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: 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
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: Sign PowerToysSetupCustomActions DLL
-    inputs:
-      ConnectedServiceName: 'Terminal/Console/WinAppDriver Team Code Signing Connection'
-      FolderPath: 'installer/PowerToysSetupCustomActions/$(BuildPlatform)\$(BuildConfiguration)'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: Sign Core PT
     inputs:
@@ -355,114 +326,6 @@ jobs:
 #### END SIGNING 
 ## END MAIN
 
-## INSTALLER START
-#### MSI BUILDING AND SIGNING
-  - task: VSBuild@1
-    displayName: Build MSI
-    inputs:
-      solution: '**/installer/PowerToysSetup.sln'
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /target:PowerToysInstaller /bl:$(Build.SourcesDirectory)\msbuild.binlog /p:RunBuildEvents=false
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the CustomActions dll
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: 'Extracting MSI to verify contents'
-    inputs:
-      script: |
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).msi
-        dir $(build.sourcesdirectory)\extractedMsi
-
-# Did we sign all files
-  - task: PowerShell@1
-    displayName: Verifying entire build is signed and version set
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-
-  - task: PowerShell@1
-    displayName: Verifying MSI Custom Actions DLL is signed
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: Sign MSI
-    inputs:
-      ConnectedServiceName: 'Terminal/Console/WinAppDriver Team Code Signing Connection'
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-#### END MSI
-
-#### BOOTSTRAP BUILDING AND SIGNING
-  - task: VSBuild@1
-    displayName: Build Bootstrapper
-    inputs:
-      solution: '**/installer/PowerToysSetup.sln'
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysBootstrapper
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: 'Insignia: Extract Engine from Bundle'
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
-
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: 'ESRP CodeSigning (Engine)'
-    inputs:
-      ConnectedServiceName: 'Terminal/Console/WinAppDriver Team Code Signing Connection'
-      FolderPath: 'installer'
-      Pattern: engine.exe
-      signConfigType: inlineSignParams
-      inlineOperation: |
-       [
-           {
-               "KeyCode": "CP-230012",
-               "OperationCode": "SigntoolSign",
-               "Parameters": {
-                   "OpusName": "Microsoft",
-                   "OpusInfo": "http://www.microsoft.com",
-                   "FileDigest": "/fd \"SHA256\"",
-                   "PageHash": "/NPH",
-                   "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-               },
-               "ToolName": "sign",
-               "ToolVersion": "1.0"
-           },
-           {
-               "KeyCode": "CP-230012",
-               "OperationCode": "SigntoolVerify",
-               "Parameters": {},
-               "ToolName": "sign",
-               "ToolVersion": "1.0"
-           }
-       ]
-
-  - task: CmdLine@2
-    displayName: 'Insignia: Merge Engine into Bundle'
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: Sign Bootstrapper
-    inputs:
-      ConnectedServiceName: 'Terminal/Console/WinAppDriver Team Code Signing Connection'
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-#### END BOOTSTRAP
-## END INSTALLER
-
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: binlog'
     condition: failed()
@@ -513,10 +376,39 @@ jobs:
       SourceFolder: $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/
       RemoveSourceFolder: True
 
+  - template: installer-steps.yml
+    parameters:
+      versionNumber: ${{ parameters.versionNumber }}
+      perUserArg: "false"
+      buildSubDir: "MachineSetup"
+      installerPrefix: "PowerToysSetup"
+
+  - task: PowerShell@2
+    displayName: Clean installer dir before building per-user installer
+    inputs:
+      targetType: inline
+      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 }}
+      perUserArg: "true"
+      buildSubDir: "UserSetup"
+      installerPrefix: "PowerToysUserSetup"
+
   - task: CopyFiles@2
     displayName: Copying setup file over
     inputs:
-      contents: '**/PowerToysSetup-*.exe'
+      contents: "**/PowerToys*Setup-*.exe"
       flattenFolders: True
       targetFolder: $(Build.ArtifactStagingDirectory)
 
@@ -527,29 +419,39 @@ jobs:
       script: |
         $p = "$(System.ArtifactsDirectory)\";
         $staging = "$(Build.ArtifactStagingDirectory)\"
-        $hash = ((get-item $p\*.exe | Get-FileHash).Hash);
-        $plat = "hash_$(BuildPlatform).txt";
-        $combinedPath = $staging + $plat;
+        $userHash = ((get-item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
+        $machineHash = ((get-item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
+        $userPlat = "hash_user_$(BuildPlatform).txt";
+        $machinePlat = "hash_machine_$(BuildPlatform).txt";
+        $combinedUserPath = $staging + $userPlat;
+        $combinedMachinePath = $staging + $machinePlat;
         
-        echo $plat
-        echo $hash
         echo $p
-        echo $combinedPath
+
+        echo $userPlat
+        echo $userHash
+        echo $combinedUserPath
+
+        echo $machinePlat
+        echo $machineHash
+        echo $combinedMachinePath
         
-        $hash | out-file -filepath $combinedPath
+        $userHash | out-file -filepath $combinedUserPath
+        $machineHash | out-file -filepath $combinedMachinePath
       pwsh: true
-      
+
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: PowerToySetup'
+    displayName: "Publish Artifact: PowerToySetup"
     inputs:
       PathtoPublish: $(System.ArtifactsDirectory)
       ArtifactName: setup-$(BuildPlatform)
 
+# Publishing the GPO files with a version number
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: GPO Files'
     inputs:
       PathtoPublish: src\gpo\assets
-      ArtifactName: GroupPolicyObjectsFiles
+      ArtifactName: GroupPolicyObjectsFiles-${{ parameters.versionNumber }}
 
 
 ...

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -38,6 +38,8 @@ $totalList = $projFiles | ForEach-Object -Parallel {
 
     if($nugetTemp -is [array] -and $nugetTemp.count -gt 3)
     {
+        # Need to debug this script? Uncomment this line.
+        # Write-Host $csproj "`r`n" $nugetTemp "`r`n"
         $temp = New-Object System.Collections.ArrayList
         $temp.AddRange($nugetTemp)
         $temp.RemoveRange(0, 3)

.pipelines/versionAndSignCheck.ps1

@@ -1,89 +1,83 @@
 [CmdletBinding()]
 # todo: send in arch / conf, could send in actual path
 Param(
-  [Parameter(Mandatory=$True,Position=1)]
-  [AllowEmptyString()]
-  [string]$targetDir = $PSScriptRoot + '/../extractedMsi/File'
+    [Parameter(Mandatory = $True, Position = 1)]
+    [AllowEmptyString()]
+    [string]$targetDir = $PSScriptRoot + '/../extractedMsi/File'
 )
 
-$DirPath = $targetDir;  #this file is in pipeline, we need root.
-$items = Get-ChildItem -Path $DirPath -File -Include *.exe,*.dll,*.ttf,PTCustomActions -Recurse -Force -ErrorAction SilentlyContinue
+$DirPath = $targetDir; #this file is in pipeline, we need root.
+$items = Get-ChildItem -Path $DirPath -File -Include *.exe, *.dll, *.ttf, PTCustomActions -Recurse -Force -ErrorAction SilentlyContinue
+$versionExceptions = @(
+    "Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll",
+    "Microsoft.Windows.ApplicationModel.Resources.Projection.dll",
+    "Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll",
+    "Microsoft.Windows.AppLifecycle.Projection.dll",
+    "Microsoft.Windows.System.Power.Projection.dll",
+    "Microsoft.WindowsAppRuntime.Bootstrap.Net.dll",
+    "Microsoft.Xaml.Interactions.dll",
+    "Microsoft.Xaml.Interactivity.dll",
+    "hyjiacan.py4n.dll",
+    "Microsoft.WindowsAppRuntime.Release.Net.dll",
+    "Microsoft.Windows.Widgets.Projection.dll") -join '|';
+$nullVersionExceptions = @(
+    "codicon.ttf",
+    "e_sqlite3.dll",
+    "vcamp140_app.dll",
+    "marshal.dll",
+    "Microsoft.UI.Composition.OSSupport.dll",
+    "Microsoft.UI.Windowing.dll",
+    "Microsoft.UI.Xaml.Internal.dll",
+    "Microsoft.Windows.ApplicationModel.Resources.dll",
+    "Microsoft.WindowsAppRuntime.dll",
+    "Microsoft.WindowsAppRuntime.Bootstrap.dll",
+    "MRM.dll",
+    "PushNotificationsLongRunningTask.ProxyStub.dll",
+    "WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll",
+    "System.Diagnostics.EventLog.Messages.dll",
+    "Microsoft.Windows.Widgets.dll") -join '|';
 $totalFailure = 0;
 
 Write-Host $DirPath;
 
-if(-not (Test-Path $DirPath))
-{  
+if (-not (Test-Path $DirPath)) {  
     Write-Host "Folder does not exist!"
 }
 
 Write-Host "Total items: " $items.Count
 
-if($items.Count -eq 0)
-{
-	# no items means something bad happened.  We should fail ASAP
-	exit 1;
+if ($items.Count -eq 0) {
+    # no items means something bad happened.  We should fail ASAP
+    exit 1;
 }
 
 $items | ForEach-Object {
-    if($_.VersionInfo.FileVersion -eq "1.0.0.0" )
-	{
-		# These items are exceptions that actually have the 1.0.0.0 version.
-		if ((-not $_.Name.EndsWith("Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Windows.ApplicationModel.Resources.Projection.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Windows.AppLifecycle.Projection.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Windows.System.Power.Projection.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Bootstrap.Net.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Xaml.Interactions.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Xaml.Interactivity.dll")) -and
-			(-not $_.Name.EndsWith("hyjiacan.py4n.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Release.Net.dll"))
-		)
-		{
-			Write-Host "Version set to 1.0.0.0: " + $_.FullName
-			$totalFailure++;
-		}
-	}
+    if ($_.VersionInfo.FileVersion -eq "1.0.0.0" -and $_.Name -notmatch $versionExceptions) {
+        # These items are exceptions that actually have the 1.0.0.0 version.
+        Write-Host "Version set to 1.0.0.0: " + $_.FullName
+        $totalFailure++;
+    }
+    elseif ($_.VersionInfo.FileVersion -eq $null -and $_.Name -notmatch $nullVersionExceptions) { 
+        # These items are exceptions that actually a version not set.
+        Write-Host "Version not set: " + $_.FullName
+        $totalFailure++;
+    }
+    elseif ($_.VersionInfo.ProductName -contains "PowerToys" -and $_.VersionInfo.LegalCopyright -notmatch "Copyright \(C\) $((Get-Date).Year)") {
+        # PowerToys assemblies that aren't updated to the current year in the copyright
+        Write-Host "Copyright year out of date: " + $_.FullName
+        $totalFailure++;
+    }
+    else {
+        $auth = Get-AuthenticodeSignature $_.FullName
+        if ($auth.SignerCertificate -eq $null) {
+            Write-Host "Not Signed: " + $_.FullName
+            $totalFailure++;
+        }
+    }
 }
 
-$items | ForEach-Object {
-    if($_.VersionInfo.FileVersion -eq $null )
-	{
-		# These items are exceptions that actually a version not set.
-		if ((-not $_.Name.EndsWith("codicon.ttf")) -and
-			(-not $_.Name.EndsWith("e_sqlite3.dll")) -and
-			(-not $_.Name.EndsWith("vcamp140_app.dll")) -and
-			(-not $_.Name.EndsWith("marshal.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.UI.Composition.OSSupport.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.UI.Xaml.Internal.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Windows.ApplicationModel.Resources.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Bootstrap.dll")) -and
-			(-not $_.Name.EndsWith("MRM.dll")) -and
-			(-not $_.Name.EndsWith("PushNotificationsLongRunningTask.ProxyStub.dll")) -and
-			(-not $_.Name.EndsWith("WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll")) -and
-			(-not $_.Name.EndsWith("System.Diagnostics.EventLog.Messages.dll"))
-		)
-		{
-			Write-Host "Version not set: " + $_.FullName
-			$totalFailure++;
-		}
-	}
+if ($totalFailure -gt 0) {
+    exit 1
 }
 
-$items | ForEach-Object { 
-	$auth = Get-AuthenticodeSignature $_.FullName
-	if($auth.SignerCertificate -eq $null)
-	{
-		Write-Host "Not Signed: " + $_.FullName
-		$totalFailure++;
-	}
-}
-
-if($totalFailure -gt 0)
-{
-	exit 1
-}
-
-exit 0
+exit 0

.vsconfig

@@ -14,6 +14,7 @@
     "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre",
     "Microsoft.VisualStudio.Component.VC.ATL.ARM64",
     "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.ATL",
     "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
     "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs"
   ]

COMMUNITY.md

@@ -27,6 +27,9 @@ Heiko has helped triaging, discussing, and creating a substantial number of issu
 ### [@Jay-o-Way](https://github.com/Jay-o-Way) - Jay
 Jay has helped triaging, discussing, creating a substantial number of issues and PRs.
 
+### [@TheJoeFin](https://github.com/TheJoeFin) - [Joe Finney](https://joefinapps.com)
+Joe has helped triaging, discussing, issues as well as fixing bugs and building features for Text Extractor.
+
 ### [@jsoref](https://github.com/jsoref) - [Josh Soref](https://check-spelling.dev/)
 Helping keep our spelling correct :)
 
@@ -34,6 +37,9 @@ Helping keep our spelling correct :)
 
 Color Picker is from Martin.
 
+### [@mikeclayton](https://github.com/mikeclayton) - [Michael Clayton](https://michael-clayton.com)
+Michael contributed the [initial version](https://github.com/microsoft/PowerToys/issues/23216) of the Mouse Jump tool and [a number of updates](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+author%3Amikeclayton) based on his FancyMouse utility.
+
 ### [@riverar](https://github.com/riverar) - [Rafael Rivera](https://withinrafael.com/)
 
 Rafael has helped do the [upgrade from CppWinRT 1.x to 2.0](https://github.com/microsoft/PowerToys/issues/1907).  He directly provided feedback to the CppWinRT team for bugs from this migration as well.
@@ -93,6 +99,10 @@ PowerToys Awake is a tool to keep your computer awake.
 
 Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118).
 
+### [@randyrants](https://github.com/randyrants) - [Randy Santossio](https://www.randyrants.com)
+
+Randy contributed Registry Preview and some very early conversations about keyboard remapping.
+
 ### [@oldnewthing](https://github.com/oldnewthing) - Raymond Chen
 
 Find My Mouse is based on Raymond Chen's SuperSonar.
@@ -101,6 +111,41 @@ Find My Mouse is based on Raymond Chen's SuperSonar.
 
 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
 
+## Mouse Without Borders original contributors
+*Project creator: Truong Do (Đỗ Đức Trường)*
+
+Other contributors:
+  * Microsoft Garage: Quinn Hawkins, Michael Low, Joe Coplen, Nino Yuniardi, Gwyneth Marshall, David Andrews, Karen Luecking
+  * Peter Hauge - Visual Studio
+  * Bruce Dawson - Windows Fundamentals
+  * Alan Myrvold - Office Security
+  * Adrian Garside - WEX
+  * Scott Bradner - Surface
+  * Aleks Gershaft - Windows Azure
+  * Chinh Huynh - Windows Azure
+  * Long Nguyen - Data Center
+  * Triet Le - Cloud Engineering
+  * Luke Schoen - Excel
+  * Bao Nguyen - Bing
+  * Ross Nichols - Windows
+  * Ryan Baltazar - Windows
+  * Ed Essey - The Garage
+  * Mario Madden - The Garage
+  * Karthick Mahalingam - ACE
+  * Pooja Kamra - ACE
+  * Justin White - SA
+  * Chris Ransom - SA
+  * Mike Ricks - Red Team
+  * Randy Santossio - Surface
+  * Ashish Sen Jaswal - Device Health
+  * Zoltan Harmath - Security Tools
+  * Luciano Krigun - Security Products
+  * Jo Hemmerlein - Red Team
+  * Chris Johnson - Surface Hub
+  * Loren Ponten - Surface Hub
+  * Paul Schmitt - WWL
+  * And many other Users!
+
 ## PowerToys core team
 
 - [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Lead

CONTRIBUTING.md

@@ -33,6 +33,10 @@ Upvote the original issue by clicking its [+😊] button and hitting 👍 (+1) i
 
 Please comment on an issue to let us know you're interested in working on something before you start the work. Not only does this avoid multiple people unexpectedly working on the same thing at the same time but it enables us to make sure everyone is clear on what should be done to implement any new functionality. It's less work for everyone, in the long run, to establish this up front.
 
+### Localization issues
+
+Please file localization issues, so our internal localization team can identify and fix them. However we currently don't accept community Pull Requests fixing localization issues. Localization is handled by the internal Microsoft team only.
+
 ### To Spec or not to Spec
 
 A key point is for everyone to understand the approach that will be taken. We want to be sure if anyone does work, we will accept it in. Items that are larger in scope we'll want some type of spec to understand what is being planned and have a discussion. Specs help collaborators discuss different approaches to solve a problem, describe how the feature will behave, how the feature will impact the user, what happens if something goes wrong, etc. Driving towards agreement in a spec, before any code is written, often results in simpler code, and less wasted effort in the long run.
@@ -53,7 +57,7 @@ Follow the [development guidelines](https://github.com/microsoft/PowerToys/blob/
 
 ### Naming of features and functionality
 
-Naming should be descriptive and straight forward.  We want names to be clear about functionality and usefulness moving forward. 
+Naming should be descriptive and straight forward. We want names to be clear about functionality and usefulness moving forward. 
 
 ### How can I become a collaborator on the PowerToys team
 

Cpp.Build.props

@@ -53,6 +53,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+	<BuildStlModules>false</BuildStlModules>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

CppRuleSet.ruleset

@@ -79,12 +79,12 @@
     <Rule Id="C26485" Action="Hidden" />
     <Rule Id="C26490" Action="Hidden" />
     <Rule Id="C26491" Action="Hidden" />
-    <Rule Id="C26492" Action="Hidden" />
-    <Rule Id="C26493" Action="Hidden" />
+    <Rule Id="C26492" Action="Error" />
+    <Rule Id="C26493" Action="Error" />
     <Rule Id="C26494" Action="Hidden" />
     <Rule Id="C26495" Action="Error" />
     <Rule Id="C26496" Action="Hidden" />
-    <Rule Id="C26497" Action="Hidden" />
+    <Rule Id="C26497" Action="Error" />
     <Rule Id="C26498" Action="Error" />
     <Rule Id="C26800" Action="Hidden" />
     <Rule Id="C26810" Action="Error" />

Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <Copyright>Copyright (C) 2022 Microsoft Corporation</Copyright>
+    <Copyright>Copyright (C) 2023 Microsoft Corporation</Copyright>
     <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <AssemblyCopyright>Copyright (C) 2022 Microsoft Corporation</AssemblyCopyright>
+    <AssemblyCopyright>Copyright (C) 2023 Microsoft Corporation</AssemblyCopyright>
     <AssemblyProduct>PowerToys</AssemblyProduct>
     <Company>Microsoft Corporation</Company>
     <NeutralLanguage>en-US</NeutralLanguage>
@@ -11,6 +11,7 @@
     <PackageTags>PowerToys</PackageTags>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>Recommended</AnalysisMode>
+    <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
     <PlatformTarget>$(Platform)</PlatformTarget>
   </PropertyGroup>
 
@@ -29,14 +30,14 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference> 
     <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Directory.Packages.props

@@ -0,0 +1,73 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Appium.WebDriver" Version="4.2.1" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.18" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <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="coverlet.collector" Version="1.3.0" />
+    <PackageVersion Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
+    <PackageVersion Include="HelixToolkit" Version="2.20.2" />
+    <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.20.2" />
+    <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
+    <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
+    <PackageVersion Include="LazyCache" Version="2.4.0" />
+    <PackageVersion Include="Mages" Version="2.0.1" />
+    <PackageVersion Include="Markdig.Signed" Version="0.27.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <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.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" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <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="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="NLog" Version="5.0.4" />
+    <PackageVersion Include="NLog.Extensions.Logging" Version="5.0.4" />
+    <PackageVersion Include="NLog.Schema" Version="5.0.4" />
+    <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="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" />
+    <PackageVersion Include="System.Data.OleDb" Version="7.0.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
+    <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="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" />
+  </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>

NOTICE.md

@@ -1,4 +1,5 @@
 # NOTICES AND INFORMATION
+
 This software incorporates material from third parties.
 
 - Color Picker
@@ -122,7 +123,7 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-###  Beta Tadele's Window Walker License
+### Beta Tadele's Window Walker License
 
 **Source**: https://github.com/betsegaw/windowwalker
 
@@ -167,11 +168,12 @@ SOFTWARE.
 ## PowerToy: Installer/Runner
 
 ### spdlog
+
 **Source**: https://github.com/gabime/spdlog
 
 The MIT License (MIT)
 
-Copyright (c) 2016 Gabi Melman.                                       
+Copyright (c) 2016 Gabi Melman.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -185,7 +187,7 @@ all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -195,8 +197,8 @@ THE SOFTWARE.
 This software depends on the fmt lib (MIT License),
 and users must comply to its license: https://github.com/fmtlib/fmt/blob/master/LICENSE.rst
 
-
 ### expected-lite
+
 **Source**: https://github.com/martinmoene/expected-lite
 
 Boost Software License - Version 1.0 - August 17th, 2003
@@ -224,6 +226,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 ### zip
+
 **Source**: https://github.com/kuba--/zip
 
 This is free and unencumbered software released into the public domain.
@@ -254,6 +257,7 @@ For more information, please refer to <http://unlicense.org/>
 ## Utility: Measure tool
 
 ### sse2neon
+
 We adopted some functions from it.
 
 **Source**: https://github.com/DLTcollab/sse2neon
@@ -277,9 +281,10 @@ SOFTWARE.
 
 ## NuGet Packages used by PowerToys
 
-- CommunityToolkit.Labs.WinUI.SettingsControls 0.0.7
-- CommunityToolkit.Mvvm 8.0.0
+- CommunityToolkit.Labs.WinUI.SettingsControls 0.0.18
+- CommunityToolkit.Mvvm 8.2.0
 - CommunityToolkit.WinUI.UI 7.1.2
+- CommunityToolkit.WinUI.UI.Animations 7.1.2
 - CommunityToolkit.WinUI.UI.Controls 7.1.2
 - ControlzEx 5.0.1
 - HelixToolkit 2.20.2
@@ -289,40 +294,47 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 2.0.1
 - Markdig.Signed 0.27.0
-- Microsoft.CodeAnalysis.NetAnalyzers 7.0.0
+- Microsoft.CodeAnalysis.NetAnalyzers 7.0.3
 - Microsoft.Data.Sqlite 7.0.0
-- Microsoft.Extensions.Hosting 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.Toolkit.Uwp.Notifications 7.1.2
-- Microsoft.Web.WebView2 1.0.1343.22
+- 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.0
+- Microsoft.Windows.CsWinRT 2.0.2
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.755
-- Microsoft.WindowsAppSDK 1.2.221116.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
-- NLog 5.0.4
 - 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
-- System.CommandLine 2.0.0-beta1.20071.2
+- System.CommandLine 2.0.0-beta4.22272.1
 - System.ComponentModel.Composition 7.0.0
 - System.Configuration.ConfigurationManager 6.0.0
 - System.Data.OleDb 7.0.0
 - System.Drawing.Common 7.0.0
 - System.IO.Abstractions 17.2.3
 - System.IO.Abstractions.TestingHelpers 17.2.3
-- System.Management 7.0.0
-- System.Reactive 5.0.0
+- System.Management 7.0.2
+- System.Reactive 6.0.0-preview.9
 - System.Runtime.Caching 7.0.0
 - System.ServiceProcess.ServiceController 7.0.0
 - UnicodeInformation 2.6.0
 - UnitsNet 4.145.0
 - Vanara.PInvoke.Shell32 3.4.11
 - Vanara.PInvoke.User32 3.4.11
-- WinUIEx 1.8.0
+- WinUIEx 2.2.0
+

PowerToys.sln

@@ -129,6 +129,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher", "src\module
 		{0351ADA4-0C32-4652-9BA0-41F7B602372B} = {0351ADA4-0C32-4652-9BA0-41F7B602372B}
 		{4BABF3FE-3451-42FD-873F-3C332E18DCEF} = {4BABF3FE-3451-42FD-873F-3C332E18DCEF}
 		{4D971245-7A70-41D5-BAA0-DDB5684CAF51} = {4D971245-7A70-41D5-BAA0-DDB5684CAF51}
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D} = {500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}
 		{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {5043CECE-E6A7-4867-9CBE-02D27D83747A}
 		{59BD9891-3837-438A-958D-ADC7F91F6F7E} = {59BD9891-3837-438A-958D-ADC7F91F6F7E}
 		{5A1DB2F0-0715-4B3B-98E6-79BC41540045} = {5A1DB2F0-0715-4B3B-98E6-79BC41540045}
@@ -139,7 +140,6 @@ 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}
-		{F44934A8-36F3-49B0-9465-3831BE041CDE} = {F44934A8-36F3-49B0-9465-3831BE041CDE}
 		{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}
@@ -176,6 +176,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		src\.editorconfig = src\.editorconfig
 		.vsconfig = .vsconfig
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		Solution.props = Solution.props
 	EndProjectSection
 EndProject
@@ -395,8 +396,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-StlThumbnailProvi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonacoPreviewHandler", "src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj", "{04B193D7-3E21-46B8-A958-89B63A8A69DE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.TimeZone", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.TimeZone\Microsoft.PowerToys.Run.Plugin.TimeZone.csproj", "{F44934A8-36F3-49B0-9465-3831BE041CDE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.TimeDate", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.csproj", "{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests\Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.csproj", "{FD464B4C-2F68-4D06-91E7-4208146C41F5}"
@@ -409,8 +408,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUI", "src\module
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameContextMenu", "src\modules\powerrename\PowerRenameContextMenu\PowerRenameContextMenu.vcxproj", "{1DBBB112-4BB1-444B-8EBB-E66555C76BA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.TimeZone.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.TimeZone.UnitTests\Microsoft.PowerToys.Run.Plugin.TimeZone.UnitTests.csproj", "{C5D46169-5334-48C3-8C28-644C72832E54}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.OneNote", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.csproj", "{5A1DB2F0-0715-4B3B-98E6-79BC41540045}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerContextMenu", "src\modules\imageresizer\ImageResizerContextMenu\ImageResizerContextMenu.vcxproj", "{93B72A06-C8BD-484F-A6F7-C9F280B150BF}"
@@ -468,6 +465,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPOWrapper", "src\common\GP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GPOWrapperProjection", "src\common\GPOWrapperProjection\GPOWrapperProjection.csproj", "{00EE9BA6-4E8F-43CA-960D-D4882F0FBB97}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Peek", "Peek", "{17B4FA70-001E-4D33-BBBB-0D142DBC2E20}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Peek", "src\modules\peek\peek\peek.vcxproj", "{A1425B53-3D61-4679-8623-E64A0D3D0A48}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.UI", "src\modules\peek\Peek.UI\Peek.UI.csproj", "{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.Common", "src\modules\peek\Peek.Common\Peek.Common.csproj", "{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.FilePreviewer", "src\modules\peek\Peek.FilePreviewer\Peek.FilePreviewer.csproj", "{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MarkdownPreviewHandlerCpp", "src\modules\previewpane\MarkdownPreviewHandlerCpp\MarkdownPreviewHandlerCpp.vcxproj", "{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GcodePreviewHandlerCpp", "src\modules\previewpane\GcodePreviewHandlerCpp\GcodePreviewHandlerCpp.vcxproj", "{5A5DD09D-723A-44D3-8F2B-293584C3D731}"
@@ -486,6 +493,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StlThumbnailProviderCpp", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SvgThumbnailProviderCpp", "src\modules\previewpane\SvgThumbnailProviderCpp\SvgThumbnailProviderCpp.vcxproj", "{2BBC9E33-21EC-401C-84DA-BB6590A9B2AA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MouseWithoutBorders", "MouseWithoutBorders", "{B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseWithoutBordersModuleInterface", "src\modules\MouseWithoutBorders\ModuleInterface\MouseWithoutBordersModuleInterface.vcxproj", "{2833C9C6-AB32-4048-A5C7-A70898337B57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBorders", "src\modules\MouseWithoutBorders\App\MouseWithoutBorders.csproj", "{50B82783-242F-42D2-BC03-B3430BF01354}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBordersService", "src\modules\MouseWithoutBorders\App\Service\MouseWithoutBordersService.csproj", "{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBordersHelper", "src\modules\MouseWithoutBorders\App\Helper\MouseWithoutBordersHelper.csproj", "{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseJump", "src\modules\MouseUtils\MouseJump\MouseJump.vcxproj", "{8A08D663-4995-40E3-B42C-3F910625F284}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJumpUI", "src\modules\MouseUtils\MouseJumpUI\MouseJumpUI.csproj", "{D962A009-834F-4EEC-AABB-430DF8F98E39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJumpUI.UnitTests", "src\modules\MouseUtils\MouseJumpUI.UnitTests\MouseJumpUI.UnitTests.csproj", "{D9C5DE64-6849-4278-91AD-9660AECF2876}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pasteplain", "pasteplain", "{9873BA05-4C41-4819-9283-CF45D795431B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PastePlainModuleInterface", "src\modules\pasteplain\PastePlainModuleInterface\PastePlainModuleInterface.vcxproj", "{FC373B24-3293-453C-AAF5-CF2909DCEE6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AllExperiments", "src\common\AllExperiments\AllExperiments.csproj", "{9CE59ED5-7087-4353-88EB-788038A73CEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegistryPreviewUI", "src\modules\registrypreview\RegistryPreviewUI\RegistryPreviewUI.csproj", "{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RegistryPreviewExt", "src\modules\registrypreview\RegistryPreviewExt\RegistryPreviewExt.vcxproj", "{697C6AF9-0A48-49A9-866C-67DA12384015}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RegistryPreview", "RegistryPreview", "{929C1324-22E8-4412-A9A8-80E85F3985A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilePreviewCommon", "src\common\FilePreviewCommon\FilePreviewCommon.csproj", "{9EBAA524-0EDA-470B-95D4-39383285CBB2}"
+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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -1573,17 +1612,6 @@ Global
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE}.Release|x64.Build.0 = Release|x64
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE}.Release|x86.ActiveCfg = Release|x64
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE}.Release|x86.Build.0 = Release|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Debug|x64.ActiveCfg = Debug|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Debug|x64.Build.0 = Debug|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Debug|x86.ActiveCfg = Debug|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|ARM64.Build.0 = Release|ARM64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|x64.ActiveCfg = Release|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|x64.Build.0 = Release|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|x86.ActiveCfg = Release|x64
-		{F44934A8-36F3-49B0-9465-3831BE041CDE}.Release|x86.Build.0 = Release|x64
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF}.Debug|x64.ActiveCfg = Debug|x64
@@ -1655,18 +1683,6 @@ Global
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6}.Release|x64.Build.0 = Release|x64
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6}.Release|x86.ActiveCfg = Release|x64
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6}.Release|x86.Build.0 = Release|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|x64.ActiveCfg = Debug|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|x64.Build.0 = Debug|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|x86.ActiveCfg = Debug|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Debug|x86.Build.0 = Debug|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|ARM64.Build.0 = Release|ARM64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|x64.ActiveCfg = Release|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|x64.Build.0 = Release|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|x86.ActiveCfg = Release|x64
-		{C5D46169-5334-48C3-8C28-644C72832E54}.Release|x86.Build.0 = Release|x64
 		{5A1DB2F0-0715-4B3B-98E6-79BC41540045}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5A1DB2F0-0715-4B3B-98E6-79BC41540045}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5A1DB2F0-0715-4B3B-98E6-79BC41540045}.Debug|x64.ActiveCfg = Debug|x64
@@ -1913,6 +1929,60 @@ Global
 		{00EE9BA6-4E8F-43CA-960D-D4882F0FBB97}.Release|x64.Build.0 = Release|x64
 		{00EE9BA6-4E8F-43CA-960D-D4882F0FBB97}.Release|x86.ActiveCfg = Release|x64
 		{00EE9BA6-4E8F-43CA-960D-D4882F0FBB97}.Release|x86.Build.0 = Release|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x64.ActiveCfg = Debug|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x64.Build.0 = Debug|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x86.ActiveCfg = Debug|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x86.Build.0 = Debug|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.Build.0 = Release|ARM64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x64.ActiveCfg = Release|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x64.Build.0 = Release|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x86.ActiveCfg = Release|x64
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x86.Build.0 = Release|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x64.ActiveCfg = Debug|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x64.Build.0 = Debug|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x64.Deploy.0 = Debug|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x86.ActiveCfg = Debug|x86
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x86.Build.0 = Debug|x86
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Debug|x86.Deploy.0 = Debug|x86
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|ARM64.Build.0 = Release|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|ARM64.Deploy.0 = Release|ARM64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x64.ActiveCfg = Release|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x64.Build.0 = Release|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x64.Deploy.0 = Release|x64
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x86.ActiveCfg = Release|x86
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x86.Build.0 = Release|x86
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03}.Release|x86.Deploy.0 = Release|x86
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|x64.ActiveCfg = Debug|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|x64.Build.0 = Debug|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|x86.ActiveCfg = Debug|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Debug|x86.Build.0 = Debug|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|ARM64.Build.0 = Release|ARM64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|x64.ActiveCfg = Release|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|x64.Build.0 = Release|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|x86.ActiveCfg = Release|x64
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB}.Release|x86.Build.0 = Release|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|x64.ActiveCfg = Debug|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|x64.Build.0 = Debug|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|x86.ActiveCfg = Debug|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Debug|x86.Build.0 = Debug|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|ARM64.Build.0 = Release|ARM64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.ActiveCfg = Release|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.Build.0 = Release|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x86.ActiveCfg = Release|x64
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x86.Build.0 = Release|x64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|x64.ActiveCfg = Debug|x64
@@ -2021,6 +2091,162 @@ Global
 		{2BBC9E33-21EC-401C-84DA-BB6590A9B2AA}.Release|x64.Build.0 = Release|x64
 		{2BBC9E33-21EC-401C-84DA-BB6590A9B2AA}.Release|x86.ActiveCfg = Release|x64
 		{2BBC9E33-21EC-401C-84DA-BB6590A9B2AA}.Release|x86.Build.0 = Release|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|x64.ActiveCfg = Debug|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|x64.Build.0 = Debug|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|x86.ActiveCfg = Debug|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Debug|x86.Build.0 = Debug|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|ARM64.Build.0 = Release|ARM64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|x64.ActiveCfg = Release|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|x64.Build.0 = Release|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|x86.ActiveCfg = Release|x64
+		{2833C9C6-AB32-4048-A5C7-A70898337B57}.Release|x86.Build.0 = Release|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|ARM64.Build.0 = Debug|ARM64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|x64.ActiveCfg = Debug|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|x64.Build.0 = Debug|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|x86.ActiveCfg = Debug|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Debug|x86.Build.0 = Debug|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|ARM64.ActiveCfg = Release|ARM64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|ARM64.Build.0 = Release|ARM64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|x64.ActiveCfg = Release|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|x64.Build.0 = Release|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|x86.ActiveCfg = Release|x64
+		{50B82783-242F-42D2-BC03-B3430BF01354}.Release|x86.Build.0 = Release|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|x64.ActiveCfg = Debug|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|x64.Build.0 = Debug|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|x86.ActiveCfg = Debug|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Debug|x86.Build.0 = Debug|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|ARM64.Build.0 = Release|ARM64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|x64.ActiveCfg = Release|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|x64.Build.0 = Release|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|x86.ActiveCfg = Release|x64
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2}.Release|x86.Build.0 = Release|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|x64.ActiveCfg = Debug|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|x64.Build.0 = Debug|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|x86.ActiveCfg = Debug|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Debug|x86.Build.0 = Debug|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|ARM64.Build.0 = Release|ARM64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|x64.ActiveCfg = Release|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|x64.Build.0 = Release|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|x86.ActiveCfg = Release|x64
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F}.Release|x86.Build.0 = Release|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|x64.ActiveCfg = Debug|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|x64.Build.0 = Debug|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|x86.ActiveCfg = Debug|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Debug|x86.Build.0 = Debug|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|ARM64.Build.0 = Release|ARM64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|x64.ActiveCfg = Release|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|x64.Build.0 = Release|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|x86.ActiveCfg = Release|x64
+		{8A08D663-4995-40E3-B42C-3F910625F284}.Release|x86.Build.0 = Release|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|x64.ActiveCfg = Debug|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|x64.Build.0 = Debug|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|x86.ActiveCfg = Debug|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Debug|x86.Build.0 = Debug|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|ARM64.Build.0 = Release|ARM64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x64.ActiveCfg = Release|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x64.Build.0 = Release|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x86.ActiveCfg = Release|x64
+		{D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x86.Build.0 = Release|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x64.ActiveCfg = Debug|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x64.Build.0 = Debug|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x86.ActiveCfg = Debug|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x86.Build.0 = Debug|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|ARM64.Build.0 = Release|ARM64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x64.ActiveCfg = Release|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x64.Build.0 = Release|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x86.ActiveCfg = Release|x64
+		{D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x86.Build.0 = Release|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|x64.ActiveCfg = Debug|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|x64.Build.0 = Debug|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|x86.ActiveCfg = Debug|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|x86.Build.0 = Debug|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|ARM64.Build.0 = Release|ARM64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|x64.ActiveCfg = Release|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|x64.Build.0 = Release|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|x86.ActiveCfg = Release|x64
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Release|x86.Build.0 = Release|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|x64.ActiveCfg = Debug|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|x64.Build.0 = Debug|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|x86.ActiveCfg = Debug|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Debug|x86.Build.0 = Debug|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|ARM64.Build.0 = Release|ARM64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|x64.ActiveCfg = Release|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|x64.Build.0 = Release|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|x86.ActiveCfg = Release|x64
+		{9CE59ED5-7087-4353-88EB-788038A73CEC}.Release|x86.Build.0 = Release|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|x64.ActiveCfg = Debug|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|x64.Build.0 = Debug|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|x86.ActiveCfg = Debug|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Debug|x86.Build.0 = Debug|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|ARM64.Build.0 = Release|ARM64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|x64.ActiveCfg = Release|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|x64.Build.0 = Release|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|x86.ActiveCfg = Release|x64
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F}.Release|x86.Build.0 = Release|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|ARM64.Build.0 = Debug|ARM64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|x64.ActiveCfg = Debug|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|x64.Build.0 = Debug|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|x86.ActiveCfg = Debug|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Debug|x86.Build.0 = Debug|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|ARM64.ActiveCfg = Release|ARM64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|ARM64.Build.0 = Release|ARM64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|x64.ActiveCfg = Release|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|x64.Build.0 = Release|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|x86.ActiveCfg = Release|x64
+		{697C6AF9-0A48-49A9-866C-67DA12384015}.Release|x86.Build.0 = Release|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|x64.ActiveCfg = Debug|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|x64.Build.0 = Debug|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|x86.ActiveCfg = Debug|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Debug|x86.Build.0 = Debug|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|ARM64.Build.0 = Release|ARM64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|x64.ActiveCfg = Release|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|x64.Build.0 = Release|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|x86.ActiveCfg = Release|x64
+		{9EBAA524-0EDA-470B-95D4-39383285CBB2}.Release|x86.Build.0 = Release|x64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|x64.ActiveCfg = Debug|x64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|x64.Build.0 = Debug|x64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|x86.ActiveCfg = Debug|x64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Debug|x86.Build.0 = Debug|x64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|ARM64.Build.0 = Release|ARM64
+		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D}.Release|x64.ActiveCfg = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2148,14 +2374,12 @@ Global
 		{F7C8C0F1-5431-4347-89D0-8E5354F93CF2} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{F44934A8-36F3-49B0-9465-3831BE041CDE} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{FD464B4C-2F68-4D06-91E7-4208146C41F5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{8FE5A5EE-1B59-401C-9FB3-B04ECD3E29C1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{020A7474-3601-4160-A159-D7B70B77B15F} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{27718999-C175-450A-861C-89F911E16A88} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{C5D46169-5334-48C3-8C28-644C72832E54} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{5A1DB2F0-0715-4B3B-98E6-79BC41540045} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{93B72A06-C8BD-484F-A6F7-C9F280B150BF} = {6C7F47CC-2151-44A3-A546-41C70025132C}
 		{18B3DB45-4FFE-4D01-97D6-5223FEEE1853} = {6C7F47CC-2151-44A3-A546-41C70025132C}
@@ -2182,6 +2406,11 @@ Global
 		{C604B37E-9D0E-4484-8778-E8B31B0E1B3A} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
 		{E599C30B-9DC8-4E5A-BF27-93D4CCEDE788} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{00EE9BA6-4E8F-43CA-960D-D4882F0FBB97} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{17B4FA70-001E-4D33-BBBB-0D142DBC2E20} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{A1425B53-3D61-4679-8623-E64A0D3D0A48} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
+		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
+		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
+		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5A5DD09D-723A-44D3-8F2B-293584C3D731} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B3E869C4-8210-4EBD-A621-FF4C4AFCBFA9} = {2F305555-C296-497E-AC20-5FA1B237996A}
@@ -2191,6 +2420,22 @@ Global
 		{CA5518ED-0458-4B09-8F53-4122B9888655} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{D6DCC3AE-18C0-488A-B978-BAA9E3CFF09D} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{2BBC9E33-21EC-401C-84DA-BB6590A9B2AA} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{2833C9C6-AB32-4048-A5C7-A70898337B57} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
+		{50B82783-242F-42D2-BC03-B3430BF01354} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
+		{B5EB9FE9-37EF-47C3-B8B8-81AD3C2972C2} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
+		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
+		{8A08D663-4995-40E3-B42C-3F910625F284} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{D962A009-834F-4EEC-AABB-430DF8F98E39} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{D9C5DE64-6849-4278-91AD-9660AECF2876} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{9873BA05-4C41-4819-9283-CF45D795431B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{FC373B24-3293-453C-AAF5-CF2909DCEE6A} = {9873BA05-4C41-4819-9283-CF45D795431B}
+		{9CE59ED5-7087-4353-88EB-788038A73CEC} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{FD86C06A-FB54-4D5E-9831-1CDADF60D45F} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
+		{697C6AF9-0A48-49A9-866C-67DA12384015} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -13,16 +13,17 @@
 
 ## About
 
-Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. For more info on [PowerToys overviews and how to use the utilities][usingPowerToys-docs-link], or any other tools and resources for [Windows development environments](https://learn.microsoft.com/windows/dev-environment/overview), head over to [learn.microsoft.com][usingPowerToys-docs-link]! 
+Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. For more info on [PowerToys overviews and how to use the utilities][usingPowerToys-docs-link], or any other tools and resources for [Windows development environments](https://learn.microsoft.com/windows/dev-environment/overview), head over to [learn.microsoft.com][usingPowerToys-docs-link]!
 
 |              | 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) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
-| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [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) |
+| [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
 
@@ -34,27 +35,44 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 ### Via GitHub with EXE [Recommended]
 
-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 the PowerToys installer that matches your machine's architecture. For most, it is `x64`.
- 
- - **For x64 processors (most common):** [PowerToysSetup-0.66.0-x64.exe](https://github.com/microsoft/PowerToys/releases/download/v0.66.0/PowerToysSetup-0.66.0-x64.exe)
- - **For ARM64 processors:** [PowerToysSetup-0.66.0-arm64.exe](https://github.com/microsoft/PowerToys/releases/download/v0.66.0/PowerToysSetup-0.66.0-arm64.exe)
+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
+
+|  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 |
 
 This is our preferred method.
 
 ### Via Microsoft Store
 
-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which will be available for both Windows 11 and Windows 10.
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which is available for both Windows 11 and Windows 10.
 
-### Via WinGet (Preview)
-Download PowerToys from [WinGet][winget-link]. To install PowerToys, run the following command from the command line / PowerShell:
+### Via WinGet
+Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
+#### User scope installer [default]
 ```powershell
 winget install Microsoft.PowerToys -s winget
 ```
 
+#### Machine-wide scope installer
+
+```powershell
+winget install --scope machine Microsoft.PowerToys -s winget
+```
+
 ### Other install methods
 
-There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, this will have the install instructions.
+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.
 
 ## Contributing
 
@@ -72,103 +90,117 @@ 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.66 - December 2022 Update
+### 0.70 - May 2023 Update
 
-In this release, we focused on stability and improvements.
+In this release, we focused on releasing new features, stability and improvements.
 
 **Highlights**
 
-- PowerToy utilities now ship with self-contained .NET 7, meaning it's not necessary to install .NET as part of the installer and it's easier to keep up to date.
-- It's possible to pick which of the installed OCR languages is used by Text Extractor by selecting it in the right-click context menu.
-- Added a setting to sort the order of the accented characters by usage frequency in Quick Accent.
+- 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)!
 
 ### General
 
-- Reduced resource consumption caused by logging. A thread for each logger was being created even for disabled utilities.
-- The .NET 7 dependency is now shipped self-contained within the utilities, using deep links to reduce storage space usage.
+- 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)!
 
-### Color Picker
+### Awake
 
-- Fixed an issue where the custom color formats were not working when picking colors without using the editor.
-- Fixed a crash when using duplicated names for color formats.
-- Added two decimal formats, to distinguish between RGB and BGR.
-- Fixed color name localization, which was not working correctly on 0.65.
+- 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)!
 
 ### FancyZones
 
-- Fixed an editor crash caused by deleting a zone while trying to move it.
-- Reduce the time it takes the tooltip for layout shortcut setting to appear in the editor.
+- Fixed accessibility issues on the Editor.
 
 ### File Locksmith
 
-- Fixed an issue causing File Locksmith to hang when looking for open handles in some machines.
+- Fixed tooltips having a transparent background (This was a hotfix for 0.69).
 
-### Hosts File Editor
+### File Explorer add-ons
 
-- Added a warning when duplicated entries are detected. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+- Add a Setting to select a background for the SVG Preview. Thanks [@zanseb](https://github.com/zanseb)!
+
+### Installer
+
+- Added more utilities to terminate when installing to help prevent files that sometimes are leftover from uninstall.
+
+### Keyboard Manager
+
+- Fixed an issue causing mapping to media keys to type additional characters.
+
+### Measure Tool
+
+- Created a setting to specify the default measure tool. Thanks [@zanseb](https://github.com/zanseb)!
+
+### Mouse Jump
+
+- 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)!
+
+### 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)!
 
 ### PowerToys Run
 
-- Support drag and dropping for file results. Thanks [@daniel-richter](https://github.com/daniel-richter)!
+- 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)!
 
 ### Quick Accent
+- Added a missing character to the Welsh language.
 
-- Added support for dark theme. Thanks [@niels9001](https://github.com/niels9001)!
-- Increased default input delay to improve out of the box experience.
-- Fixed a bug causing the first character to not be selected when opening the overlay. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-- Fixed the positioning of the overlay when showing near the horizontal edges of the screen.
-- Added additional Pinyin characters. Thanks [@char-46](https://github.com/char-46)!
-- Added Macedonian characters. Thanks [@ad-mca-mk](https://github.com/ad-mca-mk)!
-- Added a setting to sort characters by usage frequency.
-- Added a setting to always start selection in the first character, even when using the arrow keys as the activation method.
+### 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)!
 
 ### Settings
 
-- Fixed an error that hid the option to keep the display on when using the "Indefinitely Awake" mode.
-- Fixed an accessibility issue causing the navigation bar to not work with narrator in scan mode.
-- Fixed an accessibility issue where the name for the shortcut control was not being read correctly.
-- Tweaked the Color Picker custom color format UI. Thanks [@niels9001](https://github.com/niels9001)!
-- Improved the shortcut control visibility and accessibility. Thanks [@niels9001](https://github.com/niels9001)!
-- Fixed an issue causing the Settings to not be saved correctly on scenarios where the admin user would be different then the user running PowerToys.
-- Added a setting to pick which language should be used by default when using Text Extractor.
-
-### Text Extractor
-
-- Improve behavior for CJK languages by not adding spaces for some characters that don't need them. Thanks [@AO2233](https://github.com/AO2233)!
-- OCR language can now be picked in the right-click context menu.
-
-### Video Conference Mute
-
-- Reduced resource consumption by not starting the File Watchers when the utility is disabled.
+- 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
 
-- Updated the development setup documentation.
-- Improved the Markdown documentation lists numbering in many docs. Thanks [@sanidhyas3s](https://github.com/sanidhyas3s)!
+- 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
 
 ### Development
 
-- Turned on C++ code analysis and incrementally fixing warnings.
-- C++ code analysis no longer runs on release CI to speed up building release candidates. It still runs on GitHub CI and when building locally to maintain code quality.
-- Cleaned up "to-do" comments referring to disposing memory on C#. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-- Added a fabric bot rule for localization issues.
-- Fixed a CI build error after a .NET tools update.
-- Update the Windows App SDK dependency version to 1.2.
-- When building for arm64, the arm64 build tools are now preferred when building on an arm64 device. Thanks [@snickler](https://github.com/snickler)!
-- Updated the C# test framework and removed unused Newtonsoft.Json package references.
-- Updated StyleCop and fixed/enabled more warnings. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-- Fixed a language typo in the code. Thanks [@eltociear](https://github.com/eltociear)!
-- Improved code quality around some silent crashes that were being reported to Microsoft servers.
-- Moved the GPO asset files to source instead of docs in the repo.
-- Upgraded the unit test NuGet packages.
+- 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.
 
-#### What is being planned for version 0.67
+#### What is being planned for version 0.71
 
-For [v0.67][github-next-release-work], we'll work on below:
+For [v0.71][github-next-release-work], we'll work on below:
 
-- Allow installing without UAC.
-- Add a flyout menu to the system tray icon for quick access.
-- Stability / bug fixes
+- Adjustments on feedback / stability / bug fixes
 
 ## PowerToys Community
 
@@ -195,5 +227,5 @@ The application logs basic telemetry. Our Telemetry Data page (Coming Soon) has
 [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%2F40
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F39
+[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/logging.md

@@ -1,9 +1,61 @@
-# How to use
+# Logging
 
-We use the awesome [spdlog](https://github.com/gabime/spdlog) library for logging as a git submodule under the `deps` directory. To use it in your project, just include [spdlog.props](../../deps/spdlog.props) in a .vcxproj like this:
+Logging plays an important part in determining bugs in our code. It provides context for the developers about where and when errors occur.
+
+## Where are the logs saved
+
+* Most of the logs are saved under `%LOCALAPPDATA%/Microsoft/PowerToys`.
+* For low-privilege processes (like preview handlers) the logs are saved under `%USERPROFILE%/AppData/LocalLow/Microsoft/PowerToys`.
+
+Logs are normally in a subfolder with the module name as title.
+
+The [BugReportTool](/tools/BugReportTool) will take logs from both locations when executed.
+
+## Using a logger in a project
+
+### Spdlog
+
+In C++ projects we use the awesome [spdlog](https://github.com/gabime/spdlog) library for logging as a git submodule under the `deps` directory. To use it in your project, just include [spdlog.props](/deps/spdlog.props) in a .vcxproj like this:
 
 ```xml
 <Import Project="..\..\..\deps\spdlog.props" />
 ```
 It'll add the required include dirs and link the library binary itself.
 
+### PowerToys Logger in ManagedCommon
+
+For C# projects there is a static logger class in Managed Common called `Logger`.
+
+To use it, add a project reference to `ManagedCommon` and add the following line of code to all the files using the logger:
+
+```Csharp
+using ManagedCommon;
+```
+
+In the `Main` function (or a function with a similar meaning (like `App` in a `App.xaml.cs` file)) you have to call `InitializeLogger` and specify the location where the logs will be saved (always use a path scheme similar to this example):
+
+```Csharp
+Logger.InitializeLogger("\\FancyZones\\Editor\\Logs");
+```
+
+For a low-privilege process you have to set the optional second parameter to `true`:
+
+```Csharp
+Logger.InitializeLogger("\\FileExplorer\\Monaco\\Logs", true);
+```
+
+The `Logger` class contains the following logging functions:
+
+```Csharp
+// Logs an error that the utility encountered
+Logger.LogError(string message);
+Logger.LogError(string message, Exception ex);
+// Logs an error that isn't that grave
+Logger.LogWarning(string message);
+// Logs what the app is doing at the moment
+Logger.LogInfo(string message);
+// Like LogInfo just with infos important for debugging
+Logger.LogDebug(string message);
+// Logs the current state of the utility.
+Logger.LogTrace();
+```

doc/devdocs/modules/launcher/plugins/calculator.md

@@ -21,7 +21,12 @@ The Calculator plugin as the name suggests is used to perform calculations on th
 
 ### [`CalculateHelper`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs)
 - The [`CalculateHelper.cs`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs) class checks to see if the user entered query is a valid input to the calculator and only if the input is valid does it perform the operation.
-- It does so by matching the user query to a valid regex.
+  - It does so by matching the user query to a valid regex.
+- This class also handles some human multiplication expression like `2(1+2)` and `(2+3)(3+4)` in order to be computed by `Mages` lib.
+  - It does so by matching some regex and inserting `'*'` where appropriate, e.g: `2(1+2) -> 2 * (1+2)`
+  - It takes into account the combination of numbers (`num`), constants (`const`), functions (`func`) and expressions in parentheses (`(exp)`).
+  - The blank spaces between them are also considered.
+  - Some combinations were not handled as they are not common such as `'const num'` or `'func const'`
 
 ### [`CalculateEngine`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs)
 - The main computation is done in the [`CalculateEngine.cs`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs) file using the `Mages` library.

doc/devdocs/modules/launcher/plugins/program.md

@@ -41,3 +41,7 @@ There are broadly two different categories of applications:
 
 ### Additional Notes
 - Arguments can be provided to the program plugin by entering them after `--` (a double dash).
+- The localization is done using the `Localization Helper`from `Wox.Plugin.Common` hosted at runtime in a variable of plugin's main class.
+- The `Run commands` differ in two points from the normal `Win32Programs`:
+   - The result title contains the executable type.
+   - The file types `.cpl` and `.msc` are supported too.

doc/devdocs/modules/launcher/plugins/timeZone.md

@@ -1,141 +0,0 @@
-# Time Zone Plugin
-
-The Time Zone plugin allows users to search a time zone.
-
-## Special functions (differ from the regular functions)
-
-* Search for a country, like Kamchatka, Prince Edward Island, France
-* Search for a shortcuts, like WEST, UTC, PST
-* Search for a offset, like -12:00, -7, 5, 9:30
-* Search for a military time zone name (must activate in plugin settings)
-
-## How to add a new time zone  or change one
-
-All time zones are located in `TimeZone.json` in root folder of the project.
-The `TimeZone.json` use a JSON schema file that make it easier to edit it.
-
-| Key                 | Optional | Value type        |
-| ------------------- | -------- | ----------------- |
-| `Offset`            | **No**   | String            |
-| `Name`              | Yes      | String            |
-| `MilitaryName`      | Yes      | String            |
-| `Shortcut`          | Yes      | String            |
-| `TimeNamesStandard` | Yes      | List with strings |
-| `TimeNamesDaylight` | Yes      | List with strings |
-| `ShortcutsStandard` | Yes      | List with strings |
-| `ShortcutsDaylight` | Yes      | List with strings |
-| `CountriesStandard` | Yes      | List with strings |
-| `CountriesDaylight` | Yes      | List with strings |
-
-A minimum entry for the `TimeZone.json` looks like:
-
-```json
-  {
-    "Offset": "11:55",
-    "Name": "My crazy time zone",
-  }
-```
-
-A full entry for the `TimeZone.json` looks like:
-
-```json
-  {
-    "Offset": "11:55",
-    "Name": "My crazy time zone",
-    "Shortcut" : "MYTZ",
-    "MilitaryName" : "Order Time Zone",
-    "TimeNamesStandard": [
-        "My crazy standard time"
-    ],
-    "ShortcutsStandard": [
-        "MCST"
-    ],
-    "TimeNamesDaylight": [
-        "My crazy daylight time"
-    ],
-    "ShortcutsDaylight": [
-        "MCDT"
-    ],
-    "CountriesStandard": [
-      "Crazy Land East"
-    ],
-    "CountriesDaylight": [
-      "Crazy Land West"
-    ]
-  }
-```
-
-### Remarks
-
-* At minimum one of the optional value should be filled.
-
-## Scores
-
-* Scores are not used
-
-## Important for developers
-
-### General
-
-* The assembly name is cached into `_assemblyName` (to avoid to many calls of `Assembly.GetExecutingAssembly()`)
-
-## Microsoft.PowerToys.Run.Plugin.TimeZone project
-
-### Important plugin values (meta-data)
-
-| Name            | Value                                                |
-| --------------- | ---------------------------------------------------- |
-| ActionKeyword   | `&`                                                  |
-| ExecuteFileName | `Microsoft.PowerToys.Run.Plugin.TimeZone.dll`        |
-| ID              | `BADD1B06EF0A4B61AD95395F24241D69`                   |
-
-### Interfaces used by this plugin
-
-The plugin use only these interfaces (all inside the `Main.cs`):
-
-* `Wox.Plugin.IPlugin`
-* `Wox.Plugin.IContextMenu`
-* `Wox.Plugin.IPluginI18n`
-* `Wox.Plugin.ISettingProvider`
-* `IDisposable`
-
-### Program files
-
-| File                                   | Content                                                                 |
-| -------------------------------------- | ----------------------------------------------------------------------- |
-| `Classes\TimeZoneProperties.cs`        | A class that represent one time zone                                    |
-| `Classes\TimeZones.cs`                 | A wrapper class that only contains a list with time zones  (see 1)      |
-| `Classes\TimeZoneSettings.cs`          | A class that contains all settings for the Time Zone plugin             |
-| `Extensions\StringBuilderExtension.cs` | Extension methods for `StringBuilder` Objects                           |
-| `Helper\ContextMenuHelper.cs`          | All functions to build the context menu (for each result entry)         |
-| `Helper\JsonHelper.cs`                 | All functions to load the time zones from a JSON file                   |
-| `Helper\ResultHelper.cs`               | All functions to convert internal results into WOX results              |
-| `Helper\TranslationHelper.cs`          | All functions to translate the result in the surface language           |
-| `Images\timeZone.dark.png`             | Symbol for the results for the dark theme                               |
-| `Images\timeZone.light.png`            | Symbol for the results for the light theme                              |
-| `Properties\Resources.Designer.resx`   | File that contain all translatable keys                                 |
-| `Properties\Resources.resx`            | File that contain all translatable strings in the neutral language      |
-| `Main.cs`                              | Main class, the only place that implement the WOX interfaces            |
-| `plugin.json`                          | All meta-data for this plugin                                           |
-| `timezones.json`                       | File that contains all time zone information                            |
-| `timeZones.schema.json`                | JSON schema for `timezones.json`                                        |
-
-1. We need this extra wrapper class to make it possible that the JSON file can have and use a JSON schema file.
-Because the JSON file must have a object as root type, instead of a array.
-
-### Important project values (*.csproj)
-
-| Name            | Value                                                         |
-| --------------- | ------------------------------------------------------------- |
-| TargetFramework | `net6.0-windows`                                              |
-| Platforms       | `x64`                                                         |
-| Output          | `..\..\..\..\..\x64\Debug\modules\launcher\Plugins\TimeZone\` |
-| RootNamespace   | `Microsoft.PowerToys.Run.Plugin.TimeZone`                     |
-| AssemblyName    | `Microsoft.PowerToys.Run.Plugin.TimeZone`                     |
-
-### Project dependencies
-
-#### Projects
-
-* `Wox.Infrastructure`
-* `Wox.Plugin`

doc/devdocs/modules/launcher/plugins/windowssettings.md

@@ -62,6 +62,7 @@ A full entry for the `WindowsSettings.json` looks like:
 * The strings for `Name`, `AltNames`, `Areas`, `Type` and `Note` must not contain whitespace(s) or special characters (#, €, $, etc.)
 * The strings for `Name`, `AltNames`, `Areas`, `Type` and `Note` are used as ids for the resource file under `Properties\Resources.resx`
 * When you add new strings make sure you have added all translations for it.
+* If a result has `mmc.exe` as command and the note property is filled, the note is shown in the sub title too. (This is for special MMC results where we don't have a .msc file.)
 
 ## Scores
 

doc/devdocs/readme.md

@@ -40,7 +40,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 1. Windows 10 April 2018 Update (version 1803) or newer
 1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer
 1. Git clone PowerToys repository 
-1. Open started the `PowerToys.sln`
+1. Open the `PowerToys.sln` file.
 1. If you see a dialog that says `install extra components` in the solution explorer pane, click `install`
 
 ### Get Submodules to compile
@@ -73,7 +73,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done
 ### Prerequisites for building the MSI installer
 
 1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
-1. Install the [WiX Toolset build tools](https://wixtoolset.org/releases/v3-14-0-6526/).
+1. Install the [WiX Toolset build tools](https://wixtoolset.org/docs/v3/releases/v3-14-0-6526/). (installer [direct link](https://wixtoolset.org/downloads/v3.14.0.6526/wix314.exe))
 1. Download [WiX binaries](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip) and extract `wix.targets` to `C:\Program Files (x86)\WiX Toolset v3.14`.
 
 ### Locally building the installer prerequisite projects all at once from the command-line
@@ -137,7 +137,7 @@ To run and debug PowerToys from Visual Studio when the user is a member of the A
 ## How to create new PowerToys
 
 See the instructions on [how to install the PowerToys Module project template](/tools/project_template). <br />
-Specifications for the [PowerToys settings API](/doc/devdocs/settings.md).
+Specifications for the [PowerToys settings API](settingsv2/readme.md).
 
 ## Implementation details
 

doc/devdocs/tools/bug-report-tool.md

@@ -0,0 +1,31 @@
+# [Bug report tool](/tools/BugReportTool/)
+
+This tool is used to collect logs and system information for bug reports. The bug report is then saved as a zip file on the desktop.
+
+## Launching
+
+It can launch from the PowerToys tray icon by clicking "Report Bug", by clicking the bug report icon in the PowerToys flyout  or by running the executable directly.
+
+## Included files
+
+The bug report includes the following files:
+
+* Settings files of the modules.
+* Logs of the modules and the runner.
+* Update log files.
+* `compatibility-tab-info.txt` - Information about [compatibility settings](https://support.microsoft.com/windows/make-older-apps-or-programs-compatible-with-windows-783d6dd7-b439-bdb0-0490-54eea0f45938) set for certain PowerToys executables both in the user and system scope.
+* `context-menu-packages.txt` - Information about the packages that are registered for the new Windows 11 context menu.
+* `dotnet-installation-info.txt` - Information about the installed .NET versions.
+* `EventViewer-*.xml` - These files contain event logs from the Windows Event Viewer for the executable specified in the file name.
+* `gpo-configuration-info.txt` - Information about the configured [GPO](/doc/gpo/README.md).
+* `installationFolderStructure.txt` - Information about the folder structure of the installation. All lines with files have the following structure: `FileName Version MD5Hash`.
+* `last_version_run.json` - Information about the last version of PowerToys that was run.
+* `log_settings.json` - Information about the log level settings.
+* `monitor-report-info.txt` - Information about the monitors connected to the system. This file is created by the [monitor info report tool](/doc/devdocs/tools/monitor-info-report.md).
+* `oobe_settings.json` - Information about the OOBE settings.
+* `registry-report-info.txt` - Information about the registry keys that are used by PowerToys.
+* `settings_placement.json` - Information about the placement of the settings window.
+* `settings-telemetry.json` - Information about the last time telemetry data was sent.
+* `UpdateState.json` - Information about the last update check and the current status of the update download.
+* `windows-settings.txt` - Information about the Windows language settings.
+* `windows-version.txt` - Information about the Windows version.

doc/devdocs/tools/build-tools.md

@@ -0,0 +1,31 @@
+# [Build tools](/tools/build/)
+
+These build tools help building PowerToys projects.
+
+## [build-essentials.ps1](/tools/build/build-essentials.ps1)
+
+A script that builds certain specified PowerToys projects. You can edit the `$ProjectsToBuild` variable to specify which projects to build.
+
+## [convert-resx-to-rc.ps1](/tools/build/convert-resx-to-rc.ps1)
+
+This script converts a .resx file to a .rc file, so it can be used in a C++ project. More information on localization can be found in the [localization guide](/doc/devdocs/localization.md).
+
+## [convert-stringtable-to-resx.ps1](/tools/build/convert-stringtable-to-resx.ps1)
+
+This script converts a stringtable to a .resx file, so it can be used in a C# project. More information about this script can be found in the [localization guide](/doc/devdocs/localization.md).
+
+## [move-and-rename-resx.ps1](/tools/build/move-and-rename-resx.ps1)
+
+This script is used by the pipeline to move the .resx files to the correct location, so that they can be localized into different languages.
+
+## [move-uwp-resw.ps1](/tools/build/move-uwp-resw.ps1)
+
+This script is used by the pipeline to move the .resw files to the correct location, so that they can be localized into different languages.
+
+## [versionSetting.ps1](/tools/build/versionSetting.ps1)
+
+Sets `version.props` file with the version number.
+
+## [video_conference_make_cab.ps1](/tools/build/video_conference_make_cab.ps1)
+
+This script creates a cab file for the Video Conference Mute driver.

doc/devdocs/tools/clean-up-tool.md

@@ -0,0 +1,5 @@
+# [CleanUp_tool](/tools/CleanUp_tool/) and [CleanUp_tool_powershell_script](/tools/CleanUp_tool_powershell_script/CleanUp_tool.ps1)
+
+This tool, respective this powershell script, is used to clean up the PowerToys installation. It cleans the `AppData` folder and the registry.
+
+This tool is currently very outdated and just cleans up the registry keys of some few modules.

doc/devdocs/tools/fancyzone-hit-test.md

@@ -0,0 +1,5 @@
+# [FancyZone hit test tool](/tools/FancyZone_HitTest/)
+
+![Image of the FancyZones hit test tool](/doc/images/tools/fancyzone-hit-test.png)
+
+This tool tests the FancyZones layout selection logic. It displays a window with 5 zones. By hovering the mouse over the zones, the zone under the mouse cursor is highlighted. The sidebar shows different metrics that are used to determine which zone is under the mouse cursor.

doc/devdocs/tools/fancyzones-draw-layout-test.md

@@ -1,7 +1,7 @@
-## Testing tool for drawing zone layout
+# [FancyZones_DrawLayoutTest](/tools/FancyZones_DrawLayoutTest/)
 
 This test tool is created in order to debug issues related to the drawing of zone layout on screen.
 
 Currently, only column layout is supported with modifiable number of zones. Pressing **w** key toggles zone appearance on primary screen (multi monitor support not yet in place). Pressing **q** key exits application.
 
-Application is DPI unaware which means that application does not scale for DPI changes and it always assumes to have a scale factor of 100% (96 DPI). Scaling will be automatically performed by the system.
+Application is DPI unaware which means that application does not scale for DPI changes and it always assumes to have a scale factor of 100% (96 DPI). Scaling will be automatically performed by the system.

doc/devdocs/tools/fancyzones-zonable-tester.md

@@ -0,0 +1,13 @@
+# [FancyZones_zonable_tester](/tools/FancyZones_zonable_tester/)
+
+![Image of the FancyZones zonable tester](/doc/images/tools/fancyzones-zonable-tester.png)
+
+This command line application tests if the window where the mouse cursor is located is zonable. It also adds additional information about the window to the console output:
+
+* The HWND (window handle) of the window
+* The process ID of the window
+* The HWND of the window in the foreground
+* The style of the window
+* The exStyle of the window
+* The window class
+* The path of the process that created the window

doc/devdocs/tools/monitor-info-report.md

@@ -1,10 +1,8 @@
-# Tools
-
-## [Monitor info report](tools\monitor_info_report)
+# [Monitor info report tool](/tools/MonitorReportTool)
 
 A small diagnostic tool which helps identifying WinAPI bugs related to the physical monitor detection. When launched, it creates a log file like this:
 
-```
+```text
 GetSystemMetrics = 2
 GetMonitorInfo OK
 EnumDisplayDevices OK:
@@ -20,4 +18,5 @@ EnumDisplayDevices OK:
         DeviceString = Generic PnP Monitor
 EnumDisplayMonitors OK
 ```
-and also duplicates the info to `stdout`.
+
+and also duplicates the info to `stdout`.

doc/devdocs/tools/readme.md

@@ -0,0 +1,21 @@
+# PowerToys tools
+
+Tools in PowerToys are standalone apps and scripts that run outside of the PowerToys runner. They help developers and users to debug and test PowerToys features.
+
+The source code of the tools can be found in the [tools folder](/tools). The compiled tools are saved under `{PowerToysInstallPath}\tools`.
+
+## Overview of the tools
+
+Following tools are currently available:
+
+* [BugReportTool](bug-report-tool.md) - A tool to collect logs and system information for bug reports.
+* [Build tools](build-tools.md) - A set of scripts that help building PowerToys.
+* [Clean up tool](clean-up-tool.md) - A tool to clean up the PowerToys installation.
+* [FancyZones hit test](fancyzone-hit-test.md) - A tool to test FancyZones layout selection logic.
+* [FancyZones draw layout test](fancyzones-draw-layout-test.md) - A tool to test FancyZones layout drawing logic.
+* [FancyZones zonable tester](fancyzones-zonable-tester.md) - A tool to test if a window is zonable.
+* [Monitor info report](monitor-info-report.md) - A small diagnostic tool which helps identifying WinAPI bugs related to the physical monitor detection.
+* [project template](/tools/project_template/README.md) - A Visual Studio project template for a new PowerToys project.
+* [StylesReportTool](styles-report-tool.md) - A tool to collect information about an open window.
+* [Verification scripts](verification-scripts.md) - A set of scripts that help verifying the PowerToys installation.
+* [WebcamReportTool](webcam-report-tool.md) - A tool to collect information about the connected webcams.

doc/devdocs/tools/styles-report-tool.md

@@ -0,0 +1,12 @@
+# [Styles Report Tool](/tools/StylesReportTool/)
+
+The Styles Report Tool is a tool to collect information about an open window. Run the tool, bring the window to the foreground and press Ctrl+Alt+S. The tool will create a file on your desktop called `window_styles.txt` with the information about the window.
+
+## Collected information
+
+* Process name
+* Window class
+* Window style parameters
+* Window exStyle parameters
+* DWM attributes
+* Infos about the Virtual Desktop the window is on

doc/devdocs/tools/verification-scripts.md

@@ -0,0 +1,25 @@
+# [Verification Scripts](/tools/Verification%20scripts/)
+
+This folder contains powershell scripts that help verifying the PowerToys installation.
+
+## [Check preview handler registration](/tools/Verification%20scripts/Check%20preview%20handler%20registration.ps1)
+
+This script checks the preview handler registration for the following file types:
+
+* .markdown
+* .mdtext
+* .mdtxt
+* .mdown
+* .mkdn
+* .mdwn
+* .mkd
+* .md
+* .svg
+* .svgz
+* .pdf
+* .gcode
+* .stl
+* .txt
+* .ini
+
+The tool shows the user handler and the machine handler for each file type and displays the App GUID of the corresponding handler.

doc/devdocs/tools/webcam-report-tool.md

@@ -0,0 +1,6 @@
+# [WebcamReportTool](/tools/WebcamReportTool/)
+
+This command line application generates a report about the connected webcams on the desktop called "WebcamReport.txt". The report contains the following information about every webcam:
+
+* Name
+* Supported formats

doc/gpo/README.md

@@ -31,3 +31,52 @@ If you enable this setting, the utility will be always enabled and the user won'
 If you disable this setting, the utility will be always disabled and the user won't be able to enable it.
 
 If you don't configure this setting, users are able to disable or enable the utility.
+
+### Allow experimentation
+
+This policy configures whether PowerToys experimentation is allowed. With experimentation allowed the user sees the new features being experimented if it gets selected as part of the test group. (Experimentation will only happen on Windows Insider builds.)
+
+If this setting is not configured or enabled, the user can control experimentation in the PowerToys settings menu.
+
+If this setting is disabled, experimentation is not allowed.
+
+If this setting is not configured, experimentation is allowed.
+
+### Installer and Updates
+
+#### Disable per-user installation
+
+This policy configures whether PowerToys per-user installation is allowed or not.
+
+If enabled, per-user installation is not allowed.
+
+If disabled or not configured, per-user installation is allowed.
+
+You can set this policy only as Computer policy.
+#### Disable automatic downloads
+
+This policy configures whether automatic downloads of available updates are disabled or not. (On metered connections updates are never downloaded.)
+
+If enabled, automatic downloads are disabled.
+
+If disabled or not configured, the user is in control of automatic downloads setting.
+
+#### Suspend Action Center notification for new updates
+
+This policy configures whether the action center notification for new updates is suspended for 2 minor releases. (Example: if the installed version is v0.60.0, then the next notification is shown for the v0.63.* release.)
+
+If enabled, the notification is suspended.
+
+If disabled or not configured, the notification is shown.
+
+Note: The notification about new major versions is always displayed.
+
+<!-- This policy is implemented for later usage (PT v1.0 and later) and therefore inactive. (To make it working please update `src/runner/UpdateUtils.cpp`)
+#### Disable automatic update checks
+
+This policy allows you to disable automatic update checks running in the background. (The manual check in PT Settings is not affected by this policy.)
+
+If enabled, the automatic update checks are disabled.
+
+If disabled or not configured, the automatic update checks are enabled.
+-->

doc/planning/awake.md

@@ -6,13 +6,23 @@ last-update: 3-20-2022
 
 ## Builds
 
-The build ID can be found in [`NLog.config`](https://github.com/microsoft/PowerToys/blob/2e3a2b3f96f67c7dfc72963e5135662d3230b5fe/src/modules/awake/Awake/NLog.config#L5) - it is a unique identifier for the current builds that allows better diagnostics (we can look up the build ID from the logs) and offers a way to triage Awake-specific issues faster independent of the PowerToys version. The build ID does not carry any significance beyond that within the PowerToys code base.
+The build ID can be found in `Program.cs` in the `BuildId` variable - it is a unique identifier for the current builds that allows better diagnostics (we can look up the build ID from the logs) and offers a way to triage Awake-specific issues faster independent of the PowerToys version. The build ID does not carry any significance beyond that within the PowerToys code base.
+
+The build ID moniker is made up of two components - a reference to a [Halo](https://en.wikipedia.org/wiki/Halo_(franchise)) character, and the date when the work on the specific build started in the format of `MMDDYYYY`.
 
 | Build ID                                                  | Build Date       |
 |:----------------------------------------------------------|:-----------------|
+| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)       | April 13, 2023   |
 | [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022) | March 20, 2022   |
 | `ARBITER_01312022`                                        | January 31, 2022 |
 
+### `ATRIOX_04132023` (April 13, 2023)
+
+- Moves from using `Task.Run` to spin up threads to actually using a blocking queue that properly sets thread parameters on the same thread.
+- Moves back to using native Windows APIs through P/Invoke instead of using a package.
+- Move away from custom logging and to built-in logging that is consistent with the rest of PowerToys.
+- Updates `System.CommandLine` and `System.Reactive` to the latest preview versions of the package.
+
 ### `LIBRARIAN_03202022` (March 20, 2022)
 
 - Changed the tray context menu to be following OS conventions instead of the style offered by Windows Forms. This introduces better support for DPI scaling and theming in the future.

installer/PowerToysSetup/AlwaysOnTop.wxs

@@ -4,21 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <Fragment>
-    <!-- AlwaysOnTop -->
-    <DirectoryRef Id="AlwaysOnTopInstallFolder" FileSource="$(var.BinDir)modules\$(var.AlwaysOnTopProjectName)">
-      <Component Id="Module_AlwaysOnTopInterface" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.AlwaysOnTopProjectName)\PowerToys.AlwaysOnTopModuleInterface.dll" />
-      </Component>
-      <Component Id="Module_AlwaysOnTop" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.AlwaysOnTopProjectName)\PowerToys.AlwaysOnTop.exe" />
-      </Component>
+  <?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" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_AlwaysOnTop"/>
-      <ComponentRef Id="Module_AlwaysOnTopInterface"/>
+    <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>

installer/PowerToysSetup/Awake.wxs

@@ -4,29 +4,31 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define AwakeFiles=PowerToys.AwakeModuleInterface.dll;PowerToys.ManagedCommon.dll;System.Management.dll;System.CodeDom.dll;System.Text.Json.dll;PowerToys.ManagedTelemetry.dll;PowerToys.Settings.UI.Lib.dll;NLog.config;NLog.dll;PowerToys.Awake.deps.json;PowerToys.Awake.dll;PowerToys.Awake.exe;PowerToys.Awake.runtimeconfig.json;System.CommandLine.dll;System.IO.Abstractions.dll;System.Reactive.dll;System.Runtime.Caching.dll;Ijwhost.dll;Microsoft.Windows.SDK.NET.dll;WinRT.Runtime.dll;PowerToys.GPOWrapper.dll;WindowsBase.dll?>
+  <?define AwakeFiles=?>
+  <?define AwakeFilesPath=$(var.BinDir)modules\$(var.AwakeProjectName)\?>
+  <?define AwakeImagesFiles=?>
+  <?define AwakeImagesFilesPath=$(var.BinDir)modules\$(var.AwakeProjectName)\Images?>
 
   <Fragment>
-    <!-- Awake -->
     <DirectoryRef Id="AwakeInstallFolder" FileSource="$(var.BinDir)modules\$(var.AwakeProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_Awake" Guid="0D571D9A-743B-4CC5-9297-F0289FBE3398" Win64="yes">
-        <?foreach File in $(var.AwakeFiles)?>
-          <File Id="AwakeFile_$(var.File)" Source="$(var.BinDir)modules\$(var.AwakeProjectName)\$(var.File)" />
-        <?endforeach?>
-      </Component>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AwakeFiles_Component_Def-->
     </DirectoryRef>
 
     <!-- Awake images -->
     <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.BinDir)modules\$(var.AwakeProjectName)\Images">
-      <Component Id="Module_Awake_Images" >
-        <File Id="Awake_Awake.ico" Source="$(var.BinDir)modules\$(var.AwakeProjectName)\Images\Awake.ico" />
-      </Component>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AwakeImagesFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="AwakeComponentGroup" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_Awake"/>
-      <ComponentRef Id="Module_Awake_Images"/>
+    <ComponentGroup Id="AwakeComponentGroup">
+      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="AwakeInstallFolder" >
+        <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>
 
   </Fragment>

installer/PowerToysSetup/ColorPicker.wxs

@@ -4,33 +4,31 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ColorPickerFiles=PowerToys.ColorPicker.dll;System.IO.Abstractions.dll;System.CodeDom.dll;System.Text.Json.dll;PowerToys.ColorPickerUI.exe;PowerToys.ColorPickerUI.dll;PowerToys.ColorPickerUI.deps.json;PowerToys.ColorPickerUI.runtimeconfig.json;PowerToys.Settings.UI.Lib.dll;PowerToys.ManagedTelemetry.dll;PowerToys.ManagedCommon.dll;System.Management.dll;ControlzEx.dll;Microsoft.Xaml.Behaviors.dll;ModernWpf.Controls.dll;ModernWpf.dll;System.ComponentModel.Composition.dll;PowerToys.Common.UI.dll;WinRT.Runtime.dll;Microsoft.Windows.SDK.NET.dll;Ijwhost.dll;PowerToys.GPOWrapper.dll;PowerToys.GPOWrapperProjection.dll;WindowsBase.dll?>
+  <?define ColorPickerFiles=?>
+  <?define ColorPickerFilesPath=$(var.BinDir)modules\$(var.ColorPickerProjectName)\?>
+  <?define ColorPickerResourcesFiles=?>
+  <?define ColorPickerResourcesFilesPath=$(var.BinDir)modules\$(var.ColorPickerProjectName)\Resources\?>
 
   <Fragment>
-    <!-- Color Picker -->
-    <DirectoryRef Id="ColorPickerInstallFolder" FileSource="$(var.BinDir)modules\$(var.ColorPickerProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_ColorPicker" Guid="963A986E-289D-45CC-BC6B-9A2C9EF3DB33" Win64="yes">
-        <?foreach File in $(var.ColorPickerFiles)?>
-          <File Id="ColorPickerFile_$(var.File)" Source="$(var.BinDir)modules\$(var.ColorPickerProjectName)\$(var.File)" />
-        <?endforeach?>
-      </Component>
+    <DirectoryRef Id="ColorPickerInstallFolder" FileSource="$(var.ColorPickerFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ColorPickerFiles_Component_Def-->
     </DirectoryRef>
 
     <!-- Color Picker Resources -->
-    <DirectoryRef Id="ColorPickerResourcesFolder" FileSource="$(var.BinDir)modules\$(var.ColorPickerProjectName)\Resources">
-      <Component Id="Module_ColorPicker_Cursor">
-        <File Id="ColorPickerFile_colorPicker.cur" Source="$(var.BinDir)modules\$(var.ColorPickerProjectName)\Resources\colorPicker.cur" />
-      </Component>
-      <Component Id="Module_ColorPicker_Icon">
-        <File Id="ColorPickerFile_icon.ico" Source="$(var.BinDir)modules\$(var.ColorPickerProjectName)\Resources\icon.ico" />
-      </Component>
+    <DirectoryRef Id="ColorPickerResourcesFolder" FileSource="$(var.ColorPickerResourcesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ColorPickerResourcesFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="ColorPickerComponentGroup" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_ColorPicker" />
-      <ComponentRef Id="Module_ColorPicker_Icon"/>
-      <ComponentRef Id="Module_ColorPicker_Cursor"/>
+    <ComponentGroup Id="ColorPickerComponentGroup">
+      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="ColorPickerInstallFolder" >
+        <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"/>
+      </Component>
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/Common.wxi

@@ -14,14 +14,45 @@
   <?define AlwaysOnTopProjectName="AlwaysOnTop"?>
   <?define MeasureToolProjectName="MeasureTool"?>
   <?define HostsProjectName="Hosts"?>
-
+  <?define MouseWithoutBordersProjectName="MouseWithoutBorders"?>
+  <?define PastePlainProjectName="PastePlain"?>
+  <?define RegistryPreviewProjectName="RegistryPreview"?>
+  <?define PeekProjectName="Peek"?>
+  
   <?define RepoDir="$(var.ProjectDir)..\..\" ?>
   <?if $(var.Platform) = x64?>
-          <?define PlatformLK="x64" ?>
-  <?define BinDir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
+        <?define PowerToysPlatform="x64"?>
+        <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
+        <?define PlatformLK="x64" ?>
+        <?define BinDir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
   <?else?>
-          <?define PlatformLK="arm64" ?>
-  <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
+        <!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
+        <?define PowerToysPlatform="ARM64"?>
+        <!--TODO: define to ARM64 Program files once it's available-->
+        <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> 
+        <?define PlatformLK="arm64" ?>
+        <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
   <?endif?>
+
+  <?if $(var.PerUser) = "true"?>
+        <?define PerMachineYesNo="no"?>
+        <?define MSIPath="UserSetup"?>
+        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="LocalAppDataFolder" ?>
+        <?define RegistryScope="HKCU" ?>
+        <?define InstallScope="perUser" ?>
+        <?define InstallPrivileges="limited" ?>
+        <?define UpgradeCodeGUID="D8B559DB-4C98-487A-A33F-50A8EEE42726" ?>
+   <?else?>
+        <?define PerMachineYesNo="yes"?>
+        <?define MSIPath="MachineSetup"?>
+        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
+        <?define RegistryScope="HKLM" ?>
+        <?define InstallScope="perMachine" ?>
+        <?define InstallPrivileges="elevated" ?>
+        <?define UpgradeCodeGUID="42B84BF7-5FBF-473B-9C8B-049DC16F7708" ?>
+  <?endif?>
+
   <?define BinX32Dir="$(var.RepoDir)x86\$(var.Configuration)\" ?>
 </Include>

installer/PowerToysSetup/Core.wxs

@@ -6,15 +6,20 @@
 
   <?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 DotnetRuntimeFiles=?>
 
-  <?define DotnetRuntimeWPFFiles= ?>
+  <?define DotnetRuntimeWPFFiles=?>
 
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
+      <Component Id="powertoys_per_machine_comp" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
+            <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
+        </RegistryKey>
+      </Component>
       <Component Id="powertoys_toast_clsid" Win64="yes">
         <RemoveFolder Id='Remove_powertoys_toast_clsid' On='uninstall' />
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
           <RegistryValue Type="string" Value="PowerToys Toast Notifications Background Activator" />
           <RegistryValue Type="string" Key="LocalServer32" Value="[INSTALLFOLDER]PowerToys.exe -ToastActivated" />
           <RegistryValue Type="string" Key="LocalServer32" Name="ThreadingModel" Value="Apartment" />
@@ -22,7 +27,7 @@
       </Component>
       <Component Id="powertoys_exe" Win64="yes" Guid="30261594-41A6-4509-AD09-FBC4E692F441">
         <File Id="PowerToys.exe" Checksum="yes" />
-        <RegistryKey Root="HKCU" Key="Software\Classes\powertoys">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
           <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes"/>
           <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
           <RegistryKey Key="DefaultIcon">
@@ -33,20 +38,35 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-      <Component Id="BackgroundActivator_dll" Win64="yes">
-        <File Id="PowerToys.BackgroundActivatorDLL.dll" KeyPath="yes" Checksum="yes" />
+      <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">
-        <File Id="PowerToys.ActionRunner.exe" KeyPath="yes" Checksum="yes" />
+      <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">
-        <File Id="PowerToys.Update.exe" KeyPath="yes" Checksum="yes" />
+      <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">
-        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" KeyPath="yes" />
+      <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"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" />
       </Component>
-      <Component Id="Notice_md" Win64="yes">
-        <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" KeyPath="yes" />
+      <Component Id="Notice_md" Win64="yes" Guid="1671B5F5-1260-42CF-83A8-9B3430DFF8C5">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Notice_md" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
       </Component>
     </DirectoryRef>
 
@@ -70,33 +90,26 @@
     <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">
-      <?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?>
+        <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">
-      <?foreach File in $(var.PowerToysInteropFiles)?>
-      <Component Id="Dlls_PowerToysInteropFiles_$(var.File)" Win64="yes">
-        <File Id="Dlls_PowerToysInterop_File_$(var.File)" Source="$(var.BinDir)\$(var.File)" />
-      </Component>
-      <?endforeach?>
-    </DirectoryRef>
-
-    <DirectoryRef Id="ModulesInstallFolder" FileSource="$(var.BinDir)modules\">
-      <Component Id="Module_PowerPreview_Registry" Win64="yes">
-        <!-- Update Key to use IE11 for prevhost.exe -->
-        <RegistryKey Root="HKCU" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
-          <RegistryValue Type="integer" Name="prevhost.exe" Value="11000" />
-        </RegistryKey>
-        <!-- Update Key to use IE11 for dllhost.exe -->
-        <RegistryKey Root="HKCU" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
-          <RegistryValue Type="integer" Name="dllhost.exe" Value="11000" />
+      <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>
 
@@ -121,22 +134,30 @@
     </DirectoryRef>
   </Fragment>
   <Fragment>
-    <ComponentGroup Id="CoreComponents" Directory="INSTALLFOLDER">
+    <ComponentGroup Id="CoreComponents">
+        <Component Id="RemoveCoreFolder" Guid="9330BD69-2D12-4D98-B0C7-66C99564D619" Directory="INSTALLFOLDER" >
+          <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="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="Module_PowerPreview_Registry" />
 
         <ComponentRef Id="Dlls_DotnetFiles_Component" />
-        <?foreach File in $(var.PowerToysInteropFiles)?>
-        <ComponentRef Id="Dlls_PowerToysInteropFiles_$(var.File)" />
-        <?endforeach?>
+        <ComponentRef Id="Dlls_PowerToysInteropFiles_Component" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/FancyZones.wxs

@@ -4,22 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define FancyZonesFiles=PowerToys.FancyZonesModuleInterface.dll;PowerToys.FancyZonesEditor.dll;PowerToys.FancyZonesEditor.runtimeconfig.json;PowerToys.FancyZonesEditor.deps.json;PowerToys.FancyZonesEditor.exe;PowerToys.FancyZones.exe;ControlzEx.dll;Microsoft.Xaml.Behaviors.dll;ModernWpf.dll;ModernWpf.Controls.dll;PowerToys.ManagedCommon.dll;System.Management.dll;PowerToys.Common.UI.dll;PowerToys.ManagedTelemetry.dll;System.IO.Abstractions.dll;Microsoft.Windows.SDK.NET.dll;WinRT.Runtime.dll;Ijwhost.dll;PowerToys.GPOWrapper.dll;PowerToys.GPOWrapperProjection.dll;System.CodeDom.dll;System.Text.Json.dll;WindowsBase.dll?>
+  <?define FancyZonesFiles=?>
+  <?define FancyZonesFilesPath=$(var.BinDir)modules\$(var.FancyZonesProjectName)\?>
 
   <Fragment>
-    <!-- FancyZone -->
     <DirectoryRef Id="FancyZonesInstallFolder" FileSource="$(var.BinDir)modules\">
-      <?foreach File in $(var.FancyZonesFiles)?>
-        <Component Id="Module_FancyZones_$(var.File)" Win64="yes">
-          <File Id="Module_FancyZones_File_$(var.File)" Source="$(var.BinDir)modules\$(var.FancyZonesProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FancyZonesFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="FancyZonesComponentGroup" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.FancyZonesFiles)?>
-        <ComponentRef Id="Module_FancyZones_$(var.File)" />
-      <?endforeach?>
+    <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,32 +4,31 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?if $(var.Platform) = x64?>
-    <?define PowerPreviewFiles=System.CodeDom.dll;System.Text.Json.dll;WindowsBase.dll;mfc140.dll;mfc140chs.dll;mfc140cht.dll;mfc140deu.dll;mfc140enu.dll;mfc140esn.dll;mfc140fra.dll;mfc140ita.dll;mfc140jpn.dll;mfc140kor.dll;mfc140rus.dll;mfc140u.dll;mfcm140.dll;mfcm140u.dll;PowerToys.MarkdownPreviewHandlerCpp.dll;PowerToys.powerpreview.dll;PowerToys.PreviewHandlerCommon.dll;PowerToys.PreviewHandlerCommon.deps.json;PowerToys.ManagedCommon.dll;System.Management.dll;PowerToys.ManagedTelemetry.dll;PowerToys.SvgPreviewHandlerCpp.dll;PowerToys.SvgPreviewHandler.dll;PowerToys.SvgPreviewHandler.exe;PowerToys.SvgPreviewHandler.runtimeconfig.json;PowerToys.SvgPreviewHandler.deps.json;PowerToys.SvgThumbnailProvider.exe;PowerToys.SvgThumbnailProvider.dll;PowerToys.SvgThumbnailProviderCpp.dll;PowerToys.SvgThumbnailProvider.runtimeconfig.json;PowerToys.SvgThumbnailProvider.deps.json;PowerToys.MarkdownPreviewHandler.dll;PowerToys.MarkdownPreviewHandler.exe;PowerToys.MarkdownPreviewHandler.runtimeconfig.json;PowerToys.MarkdownPreviewHandler.deps.json;Markdig.Signed.dll;System.IO.Abstractions.dll;monaco_languages.json;monacoSpecialLanguages.js;PowerToys.Common.UI.dll;PowerToys.Settings.UI.Lib.dll;PowerToys.MonacoPreviewHandlerCpp.dll;PowerToys.MonacoPreviewHandler.dll;PowerToys.MonacoPreviewHandler.exe;PowerToys.MonacoPreviewHandler.runtimeconfig.json;PowerToys.MonacoPreviewHandler.deps.json;ControlzEx.dll;Microsoft.Web.WebView2.Core.dll;Microsoft.Web.WebView2.WinForms.dll;Microsoft.Web.WebView2.Wpf.dll;WebView2Loader.dll;index.html;PowerToys.PdfPreviewHandlerCpp.dll;PowerToys.PdfPreviewHandler.dll;PowerToys.PdfPreviewHandler.exe;PowerToys.PdfPreviewHandler.runtimeconfig.json;PowerToys.PdfPreviewHandler.deps.json;Microsoft.Windows.SDK.NET.dll;WinRT.Runtime.dll;PowerToys.PdfThumbnailProvider.exe;PowerToys.PdfThumbnailProvider.dll;PowerToys.PdfThumbnailProviderCpp.dll;PowerToys.PdfThumbnailProvider.runtimeconfig.json;PowerToys.PdfThumbnailProvider.deps.json;PowerToys.GcodePreviewHandler.dll;PowerToys.GcodePreviewHandlerCpp.dll;PowerToys.GcodePreviewHandler.exe;PowerToys.GcodePreviewHandler.runtimeconfig.json;PowerToys.GcodePreviewHandler.deps.json;PowerToys.GcodeThumbnailProvider.dll;PowerToys.GcodeThumbnailProvider.exe;PowerToys.GcodeThumbnailProviderCpp.dll;PowerToys.GcodeThumbnailProvider.runtimeconfig.json;PowerToys.GcodeThumbnailProvider.deps.json;PowerToys.StlThumbnailProvider.exe;PowerToys.StlThumbnailProvider.dll;PowerToys.StlThumbnailProviderCpp.dll;PowerToys.StlThumbnailProvider.runtimeconfig.json;PowerToys.StlThumbnailProvider.deps.json;HelixToolkit.dll;HelixToolkit.Core.Wpf.dll;Ijwhost.dll;Microsoft.Xaml.Behaviors.dll;PowerToys.GPOWrapper.dll?>
-  <?else?>
-    <?define PowerPreviewFiles=System.CodeDom.dll;System.Text.Json.dll;WindowsBase.dll;PowerToys.MarkdownPreviewHandlerCpp.dll;PowerToys.powerpreview.dll;PowerToys.PreviewHandlerCommon.dll;PowerToys.PreviewHandlerCommon.deps.json;PowerToys.ManagedCommon.dll;System.Management.dll;PowerToys.ManagedTelemetry.dll;PowerToys.SvgPreviewHandlerCpp.dll;PowerToys.SvgPreviewHandler.dll;PowerToys.SvgPreviewHandler.exe;PowerToys.SvgPreviewHandler.runtimeconfig.json;PowerToys.SvgPreviewHandler.deps.json;PowerToys.SvgThumbnailProvider.exe;PowerToys.SvgThumbnailProvider.dll;PowerToys.SvgThumbnailProviderCpp.dll;PowerToys.SvgThumbnailProvider.runtimeconfig.json;PowerToys.SvgThumbnailProvider.deps.json;PowerToys.MarkdownPreviewHandler.dll;PowerToys.MarkdownPreviewHandler.exe;PowerToys.MarkdownPreviewHandler.runtimeconfig.json;PowerToys.MarkdownPreviewHandler.deps.json;Markdig.Signed.dll;System.IO.Abstractions.dll;monaco_languages.json;monacoSpecialLanguages.js;PowerToys.Common.UI.dll;PowerToys.Settings.UI.Lib.dll;PowerToys.MonacoPreviewHandlerCpp.dll;PowerToys.MonacoPreviewHandler.dll;PowerToys.MonacoPreviewHandler.exe;PowerToys.MonacoPreviewHandler.runtimeconfig.json;PowerToys.MonacoPreviewHandler.deps.json;ControlzEx.dll;Microsoft.Web.WebView2.Core.dll;Microsoft.Web.WebView2.WinForms.dll;Microsoft.Web.WebView2.Wpf.dll;WebView2Loader.dll;index.html;PowerToys.PdfPreviewHandlerCpp.dll;PowerToys.PdfPreviewHandler.dll;PowerToys.PdfPreviewHandler.exe;PowerToys.PdfPreviewHandler.runtimeconfig.json;PowerToys.PdfPreviewHandler.deps.json;Microsoft.Windows.SDK.NET.dll;WinRT.Runtime.dll;PowerToys.PdfThumbnailProvider.exe;PowerToys.PdfThumbnailProvider.dll;PowerToys.PdfThumbnailProviderCpp.dll;PowerToys.PdfThumbnailProvider.runtimeconfig.json;PowerToys.PdfThumbnailProvider.deps.json;PowerToys.GcodePreviewHandler.dll;PowerToys.GcodePreviewHandlerCpp.dll;PowerToys.GcodePreviewHandler.exe;PowerToys.GcodePreviewHandler.runtimeconfig.json;PowerToys.GcodePreviewHandler.deps.json;PowerToys.GcodeThumbnailProvider.dll;PowerToys.GcodeThumbnailProvider.exe;PowerToys.GcodeThumbnailProviderCpp.dll;PowerToys.GcodeThumbnailProvider.runtimeconfig.json;PowerToys.GcodeThumbnailProvider.deps.json;PowerToys.StlThumbnailProvider.exe;PowerToys.StlThumbnailProvider.dll;PowerToys.StlThumbnailProviderCpp.dll;PowerToys.StlThumbnailProvider.runtimeconfig.json;PowerToys.StlThumbnailProvider.deps.json;HelixToolkit.dll;HelixToolkit.Core.Wpf.dll;Ijwhost.dll;Microsoft.Xaml.Behaviors.dll;PowerToys.GPOWrapper.dll?>
-  <?endif?>
+  <?define PowerPreviewFiles=?>
+  <?define PowerPreviewFilesPath=$(var.BinDir)modules\FileExplorerPreview\?>
+  <?define MonacoPreviewHandlerCustomLanguagesFiles=?>
+  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)modules\FileExplorerPreview\customLanguages\?>
 
   <Fragment>
-    <DirectoryRef Id="FileExplorerPreviewInstallFolder" FileSource="$(var.RepoDir)\modules\FileExplorerPreview\">
-      <?foreach File in $(var.PowerPreviewFiles)?>
-        <Component Id="Module_PowerPreview_$(var.File)" Win64="yes">
-          <File Id="Module_PowerPreview_$(var.File)" Source="$(var.BinDir)modules\FileExplorerPreview\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="FileExplorerPreviewInstallFolder" FileSource="$(var.PowerPreviewFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PowerPreviewFiles_Component_Def-->
     </DirectoryRef>
 
-    <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.BinDir)modules\FileExplorerPreview\customLanguages">
-      <Component Id="MonacoPreviewHandlerMonacoCustomLanguagesRegJS" Win64="yes">
-        <File Id="MonacoPreviewHandler_MonacoCustomLanguagesRegJS" Source="$(var.BinDir)modules\FileExplorerPreview\customLanguages\reg.js" />
+    <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.MonacoPreviewHandlerCustomLanguagesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MonacoPreviewHandlerCustomLanguagesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="FileExplorerPreviewComponentGroup">
+      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="FileExplorerPreviewInstallFolder" >
+        <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="RemoveFolderMonacoPreviewHandlerCustomLanguagesFolder" Directory="MonacoPreviewHandlerMonacoCustomLanguagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerMonacoSRCFolder" Directory="MonacoPreviewHandlerMonacoSRCFolder" On="uninstall"/>
       </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="FileExplorerPreviewComponentGroup" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.PowerPreviewFiles)?>
-        <ComponentRef Id="Module_PowerPreview_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="MonacoPreviewHandlerMonacoCustomLanguagesRegJS" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/FileLocksmith.wxs

@@ -4,70 +4,61 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define FileLocksmithFiles=Microsoft.Win32.SystemEvents.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;CommunityToolkit.WinUI.dll;CommunityToolkit.WinUI.UI.dll;CommunityToolkit.Common.dll;CommunityToolkit.Mvvm.dll;CommunityToolkit.Labs.WinUI.SettingsControls.dll;Ijwhost.dll;Microsoft.InteractiveExperiences.Projection.dll;Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll;Microsoft.Windows.ApplicationModel.Resources.Projection.dll;Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll;Microsoft.Windows.AppLifecycle.Projection.dll;Microsoft.Windows.SDK.NET.dll;Microsoft.Windows.System.Power.Projection.dll;Microsoft.WindowsAppRuntime.Bootstrap.Net.dll;Microsoft.WinUI.dll;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;PowerToys.FileLocksmithExt.dll;PowerToys.FileLocksmithLib.Interop.dll;PowerToys.FileLocksmithUI.exe;PowerToys.FileLocksmithUI.dll;PowerToys.FileLocksmithUI.deps.json;PowerToys.FileLocksmithUI.runtimeconfig.json;System.CodeDom.dll;System.Drawing.Common.dll;System.Management.dll;WinRT.Runtime.dll;WinUIEx.dll;resources.pri;PowerToys.GPOWrapper.dll;WindowsBase.dll;System.Text.Json.dll?>
-  <?define FileLocksmithAssetsFiles=Icon.ico?>
+  <?define FileLocksmithFiles=?>
+  <?define FileLocksmithFilesPath=$(var.BinDir)modules\$(var.FileLocksmithProjectName)\?>
+  <?define FileLocksmithAssetsFiles=?>
+  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\?>
 
   <Fragment>
-    <!-- FileLocksmith -->
-    <DirectoryRef Id="FileLocksmithInstallFolder" FileSource="$(var.BinDir)modules\$(var.FileLocksmithProjectName)">
-      <?foreach File in $(var.FileLocksmithFiles)?>
-        <Component Id="FileLocksmith_$(var.File)" Win64="yes">
-          <File Id="FileLocksmithFile_$(var.File)" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="FileLocksmithInstallFolder" FileSource="$(var.FileLocksmithFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FileLocksmithFiles_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="HKCU" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+        <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" Name="ThreadingModel" Value="Apartment" />
         </RegistryKey>
-        <RegistryKey Root="HKCU" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
           <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
         </RegistryKey>
-        <RegistryKey Root="HKCU" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+        <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.BinDir)modules\$(var.FileLocksmithProjectName)\Assets">
-      <?foreach File in $(var.FileLocksmithAssetsFiles)?>
-        <Component Id="FileLocksmith_Assets_$(var.File)" Win64="yes">
-          <File Id="FileLocksmithAssetsFile_$(var.File)" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\$(var.File)" />
-        </Component>
-      <?endforeach?>
-      <Component Id="FileLocksmith_Assets_Applist_Scale100" Win64="yes">
-        <File Id="FL_AppList_Scale100" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\AppList.scale-100.png" />
-      </Component>
-      <Component Id="FileLocksmith_Assets_Applist_Scale125" Win64="yes">
-        <File Id="FL_AppList_Scale125" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\AppList.scale-125.png" />
-      </Component>
-      <Component Id="FileLocksmith_Assets_Applist_Scale150" Win64="yes">
-        <File Id="FL_AppList_Scale150" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\AppList.scale-150.png" />
-      </Component>
-      <Component Id="FileLocksmith_Assets_Applist_Scale200" Win64="yes">
-        <File Id="FL_AppList_Scale200" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\AppList.scale-200.png" />
-      </Component>
-      <Component Id="FileLocksmith_Assets_Applist_Scale400" Win64="yes">
-        <File Id="FL_AppList_Scale400" Source="$(var.BinDir)modules\$(var.FileLocksmithProjectName)\Assets\AppList.scale-400.png" />
       </Component>
     </DirectoryRef>
 
-    <ComponentGroup Id="FileLocksmithComponentGroup" Directory="INSTALLFOLDER">
+    <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" >
+        <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" />
-      <?foreach File in $(var.FileLocksmithFiles)?>
-        <ComponentRef Id="FileLocksmith_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.FileLocksmithAssetsFiles)?>
-        <ComponentRef Id="FileLocksmith_Assets_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="FileLocksmith_Assets_Applist_Scale100" />
-      <ComponentRef Id="FileLocksmith_Assets_Applist_Scale125" />
-      <ComponentRef Id="FileLocksmith_Assets_Applist_Scale150" />
-      <ComponentRef Id="FileLocksmith_Assets_Applist_Scale200" />
-      <ComponentRef Id="FileLocksmith_Assets_Applist_Scale400" />
-
+      <ComponentRef Id="FileLocksmithMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/Hosts.wxs

@@ -4,67 +4,42 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define HostsFiles=Accessibility.dll;ColorCode.Core.dll;ColorCode.WinUI.dll;CommunityToolkit.Common.dll;CommunityToolkit.Mvvm.dll;CommunityToolkit.WinUI.dll;CommunityToolkit.WinUI.UI.Controls.Core.dll;CommunityToolkit.WinUI.UI.Controls.DataGrid.dll;CommunityToolkit.WinUI.UI.Controls.Input.dll;CommunityToolkit.WinUI.UI.Controls.Layout.dll;CommunityToolkit.WinUI.UI.Controls.Markdown.dll;CommunityToolkit.WinUI.UI.Controls.Media.dll;CommunityToolkit.WinUI.UI.Controls.Primitives.dll;CommunityToolkit.WinUI.UI.dll;ControlzEx.dll;Ijwhost.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.CommandLine.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.Configuration.EnvironmentVariables.dll;Microsoft.Extensions.Configuration.FileExtensions.dll;Microsoft.Extensions.Configuration.Json.dll;Microsoft.Extensions.Configuration.UserSecrets.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.FileProviders.Abstractions.dll;Microsoft.Extensions.FileProviders.Physical.dll;Microsoft.Extensions.FileSystemGlobbing.dll;Microsoft.Extensions.Hosting.Abstractions.dll;Microsoft.Extensions.Hosting.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.Configuration.dll;Microsoft.Extensions.Logging.Console.dll;Microsoft.Extensions.Logging.Debug.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Logging.EventLog.dll;Microsoft.Extensions.Logging.EventSource.dll;Microsoft.Extensions.Options.ConfigurationExtensions.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;Microsoft.Graphics.Canvas.Interop.dll;Microsoft.InteractiveExperiences.Projection.dll;Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll;Microsoft.Windows.ApplicationModel.Resources.Projection.dll;Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll;Microsoft.Windows.AppLifecycle.Projection.dll;Microsoft.Windows.SDK.NET.dll;Microsoft.Windows.System.Power.Projection.dll;Microsoft.WindowsAppRuntime.Bootstrap.Net.dll;Microsoft.WinUI.dll;Microsoft.Xaml.Behaviors.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;PowerToys.Common.UI.dll;PowerToys.Hosts.deps.json;PowerToys.Hosts.dll;PowerToys.Hosts.exe;PowerToys.Hosts.runtimeconfig.json;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;PowerToys.Settings.UI.Lib.dll;resources.pri;System.IO.Abstractions.dll;System.Management.dll;WinRT.Runtime.dll;WinUIEx.dll;PowerToys.GPOWrapper.dll;WindowsBase.dll;System.Text.Json.dll?>
-  <?define HostsMicrosoftUIXamlAssetsInstallFiles=NoiseAsset_256x256_PNG.png?>
+  <?define HostsFiles=?>
+  <?define HostsFilesPath=$(var.BinDir)modules\$(var.HostsProjectName)\?>
+  <?define HostsAssetsFiles=?>
+  <?define HostsAssetsFilesPath=$(var.BinDir)modules\$(var.HostsProjectName)\Assets\?>
 
   <Fragment>
-    <!-- Hosts -->
-    <DirectoryRef Id="HostsInstallFolder" FileSource="$(var.BinDir)modules\$(var.HostsProjectName)">
-      <Component Id="Module_HostsInterface" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.HostsProjectName)\PowerToys.HostsModuleInterface.dll" />
-      </Component>
-
-      <?foreach File in $(var.HostsFiles)?>
-        <Component Id="H_$(var.File)" Win64="yes">
-          <File Id="H_$(var.File)" Source="$(var.BinDir)modules\$(var.HostsProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="HostsInstallFolder" FileSource="$(var.HostsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HostsFiles_Component_Def-->
     </DirectoryRef>
 
     <DirectoryRef Id="HostsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.HostsProjectName)\Microsoft.UI.Xaml\Assets">
-      <?foreach File in $(var.HostsMicrosoftUIXamlAssetsInstallFiles)?>
-        <Component Id="HostsMicrosoftUIXamlAssets_$(var.File)" Win64="yes">
-          <File Id="HostsMicrosoftUIXamlAssetsFile_$(var.File)" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Microsoft.UI.Xaml\Assets\$(var.File)" />
-        </Component>
-      <?endforeach?>
-    </DirectoryRef>
-
-    <DirectoryRef Id="HostsAssetsFolder" FileSource="$(var.BinDir)modules\$(var.HostsProjectName)\Assets">
-      <Component Id="HostsAssets_AppList_Scale100" Win64="yes">
-        <File Id="HA_AppList_Scale100" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\AppList.scale-100.png" />
-      </Component>
-      <Component Id="HostsAssets_AppList_Scale125" Win64="yes">
-        <File Id="HA_AppList_Scale125" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\AppList.scale-125.png" />
-      </Component>
-      <Component Id="HostsAssets_AppList_Scale150" Win64="yes">
-        <File Id="HA_AppList_Scale150" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\AppList.scale-150.png" />
-      </Component>
-      <Component Id="HostsAssets_AppList_Scale200" Win64="yes">
-        <File Id="HA_AppList_Scale200" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\AppList.scale-200.png" />
-      </Component>
-      <Component Id="HostsAssets_AppList_Scale400" Win64="yes">
-        <File Id="HA_AppList_Scale400" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\AppList.scale-400.png" />
-      </Component>
-      <Component Id="HostsAssets_Hosts" Win64="yes">
-        <File Id="HA_Hosts" Source="$(var.BinDir)modules\$(var.HostsProjectName)\Assets\Hosts.ico" />
+      <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>
 
-    <ComponentGroup Id="HostsComponentGroup" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_HostsInterface"/>
-      <?foreach File in $(var.HostsFiles)?>
-        <ComponentRef Id="H_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.HostsMicrosoftUIXamlAssetsInstallFiles)?>
-        <ComponentRef Id="HostsMicrosoftUIXamlAssets_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="HostsAssets_AppList_Scale100" />
-      <ComponentRef Id="HostsAssets_AppList_Scale125" />
-      <ComponentRef Id="HostsAssets_AppList_Scale150" />
-      <ComponentRef Id="HostsAssets_AppList_Scale200" />
-      <ComponentRef Id="HostsAssets_AppList_Scale400" />
-      <ComponentRef Id="HostsAssets_Hosts" />
+    <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" >
+        <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,105 +4,96 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define ImageResizerFiles=ImageResizer.ico;PowerToys.ImageResizer.exe;PowerToys.ImageResizerExt.dll;PowerToys.ImageResizer.dll;PowerToys.ImageResizer.deps.json;PowerToys.ImageResizer.runtimeconfig.json;PowerToys.ManagedCommon.dll;System.Management.dll;PowerToys.ManagedTelemetry.dll;PowerToys.Common.UI.dll;ControlzEx.dll;ModernWpf.Controls.dll;ModernWpf.dll;Microsoft.Xaml.Behaviors.dll;System.IO.Abstractions.dll;WinRT.Runtime.dll;Microsoft.Windows.SDK.NET.dll;Ijwhost.dll;ImageResizerContextMenuPackage.msix;PowerToys.ImageResizerContextMenu.dll;PowerToys.GPOWrapper.dll;PowerToys.GPOWrapperProjection.dll;System.CodeDom.dll;System.Text.Json.dll;WindowsBase.dll?>
-  <?define ImageResizerSparsePackageAssets=LargeTile.png;SmallTile.png;SplashScreen.png;Square150x150Logo.png;Square44x44Logo.png;storelogo.png;Wide310x150Logo.png?>
+  <?define ImageResizerFiles=?>
+  <?define ImageResizerFilesPath=$(var.BinDir)modules\$(var.ImageResizerProjectName)\?>
+  <?define ImageResizerAssetsFiles=?>
+  <?define ImageResizerAssetsFilesPath=$(var.BinDir)modules\$(var.ImageResizerProjectName)\Assets\?>
 
   <Fragment>
-    <!-- Image Resizer -->
-    <DirectoryRef Id="ImageResizerInstallFolder" FileSource="$(var.BinDir)modules\$(var.ImageResizerProjectName)">
-      <?foreach File in $(var.ImageResizerFiles)?>
-        <Component Id="Module_ImageResizer_$(var.File)" Win64="yes">
-          <File Id="Module_ImageResizer_File_$(var.File)" Source="$(var.BinDir)modules\$(var.ImageResizerProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="ImageResizerInstallFolder" FileSource="$(var.ImageResizerFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ImageResizerFiles_Component_Def-->
 
       <Component Id="Module_ImageResizer_Registry" Win64="yes">
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
           <RegistryValue Value="[ImageResizerInstallFolder]PowerToys.ImageResizerExt.dll" Type="string" />
           <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
         </RegistryKey>
 
-        <!-- Registry Key for the drag and drop handler -->
-        <!-- To use later on when we want to install per user.
-                <RegistryValue Root="HKCU"
-                               Key="Software\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
-                               Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                               Type="string" />
-                               -->
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
         <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
-        <RegistryValue Root="HKCU"
-                         Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
-                         Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                         Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
-                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                       Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                          Key="SOFTWARE\Classes\SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
+                          Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                          Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
       </Component>
+
     </DirectoryRef>
 
-    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.BinDir)modules\$(var.ImageResizerProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="ImageResizer_ImageResizerSparsePackageAssets" Guid="CC1B81A0-7971-4FAA-A3E6-4CE4DD0EC7C1" Win64="yes">
-          <?foreach File in $(var.ImageResizerSparsePackageAssets)?>
-              <File Id="ImageResizerSparsePackageAssets_$(var.File)" Source="$(var.BinDir)modules\$(var.ImageResizerProjectName)\Assets\$(var.File)" />
-          <?endforeach?>
-      </Component>
+    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ImageResizerAssetsFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="ImageResizerComponentGroup" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.ImageResizerFiles)?>
-        <ComponentRef Id="Module_ImageResizer_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="ImageResizer_ImageResizerSparsePackageAssets" />
+    <ComponentGroup Id="ImageResizerComponentGroup">
+      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerInstallFolder" >
+        <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" />
     </ComponentGroup>
   </Fragment>

installer/PowerToysSetup/KeyboardManager.wxs

@@ -7,26 +7,43 @@
   <Fragment>
     <!-- KBM -->
     <DirectoryRef Id="KeyboardManagerInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\">
-      <Component Id="Module_KeyboardManager" Win64="yes">
+      <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>
 
     <!-- KBM Editor -->
     <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEditor">
-      <Component Id="Module_KeyboardManager_Editor" Win64="yes">
+      <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" />
       </Component>
     </DirectoryRef>
 
     <!-- KBM Engine -->
     <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)modules\$(var.KeyboardManagerProjectName)\KeyboardManagerEngine">
-      <Component Id="Module_KeyboardManager_Engine" Win64="yes">
+      <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" />
       </Component>
     </DirectoryRef>
 
-    <ComponentGroup Id="KeyboardManagerComponentGroup" Directory="INSTALLFOLDER">
+    <ComponentGroup Id="KeyboardManagerComponentGroup">
+      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="KeyboardManagerInstallFolder" >
+        <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" />

installer/PowerToysSetup/MeasureTool.wxs

@@ -4,42 +4,35 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define MeasureToolFiles=Ijwhost.dll;Microsoft.InteractiveExperiences.Projection.dll;Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll;Microsoft.Windows.ApplicationModel.Resources.Projection.dll;Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll;Microsoft.Windows.AppLifecycle.Projection.dll;Microsoft.Windows.SDK.NET.dll;Microsoft.Windows.System.Power.Projection.dll;Microsoft.WindowsAppRuntime.Bootstrap.Net.dll;Microsoft.WinUI.dll;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;PowerToys.MeasureToolCore.dll;PowerToys.MeasureToolUI.deps.json;PowerToys.MeasureToolUI.dll;PowerToys.MeasureToolUI.exe;PowerToys.MeasureToolUI.runtimeconfig.json;resources.pri;System.CodeDom.dll;System.Management.dll;System.Text.Json.dll;WinRT.Runtime.dll;WinUIEx.dll;PowerToys.GPOWrapper.dll;WindowsBase.dll?>
-  <?define MeasureToolMicrosoftUIXamlAssetsInstallFiles=NoiseAsset_256x256_PNG.png?>
+  <?define MeasureToolFiles=?>
+  <?define MeasureToolFilesPath=$(var.BinDir)modules\$(var.MeasureToolProjectName)\?>
 
   <Fragment>
-    <!-- Measure Tool -->
     <DirectoryRef Id="MeasureToolInstallFolder" FileSource="$(var.BinDir)modules\$(var.MeasureToolProjectName)">
-      <Component Id="Module_MeasureToolInterface" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\PowerToys.MeasureToolModuleInterface.dll" />
-      </Component>
-
-      <?foreach File in $(var.MeasureToolFiles)?>
-        <Component Id="MT_$(var.File)" Win64="yes">
-          <File Id="MT_$(var.File)" Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
-
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MeasureToolFiles_Component_Def-->
     </DirectoryRef>
 
     <DirectoryRef Id="MeasureToolMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.MeasureToolProjectName)\Microsoft.UI.Xaml\Assets">
-      <?foreach File in $(var.MeasureToolMicrosoftUIXamlAssetsInstallFiles)?>
-        <Component Id="MeasureToolMicrosoftUIXamlAssets_$(var.File)" Win64="yes">
-          <File Id="MeasureToolMicrosoftUIXamlAssetsFile_$(var.File)" Source="$(var.BinDir)modules\$(var.MeasureToolProjectName)\Microsoft.UI.Xaml\Assets\$(var.File)" />
-        </Component>
-      <?endforeach?>
+      <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" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_MeasureToolInterface"/>
-      <?foreach File in $(var.MeasureToolFiles)?>
-        <ComponentRef Id="MT_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.MeasureToolMicrosoftUIXamlAssetsInstallFiles)?>
-        <ComponentRef Id="MeasureToolMicrosoftUIXamlAssets_$(var.File)" />
-      <?endforeach?>
-
+    <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>

installer/PowerToysSetup/MouseUtils.wxs

@@ -4,24 +4,31 @@
 
   <?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>
-    <!-- MouseUtils -->
-    <DirectoryRef Id="MouseUtilsInstallFolder" FileSource="$(var.BinDir)modules\$(var.MouseUtilsProjectName)">
-      <Component Id="Module_FindMyMouse" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.MouseUtilsProjectName)\PowerToys.FindMyMouse.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="Module_MouseHighlighter" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.MouseUtilsProjectName)\PowerToys.MouseHighlighter.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="Module_MousePointerCrosshairs" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.MouseUtilsProjectName)\PowerToys.MousePointerCrosshairs.dll" KeyPath="yes" />
-      </Component>
+    <DirectoryRef Id="MouseUtilsInstallFolder" FileSource="$(var.MouseUtilsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MouseUtilsFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="MouseUtilsComponentGroup" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_FindMyMouse"/>
-      <ComponentRef Id="Module_MouseHighlighter"/>
-      <ComponentRef Id="Module_MousePointerCrosshairs" />
+    <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>

installer/PowerToysSetup/MouseWithoutBorders.wxs

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+  xmlns:Fire="http://schemas.microsoft.com/wix/FirewallExtension"
+  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?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">
+        <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]" />
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetup/PastePlain.wxs

@@ -0,0 +1,29 @@
+<?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

@@ -0,0 +1,46 @@
+<?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 PeekFiles=?>
+  <?define PeekFilesPath=$(var.BinDir)modules\$(var.PeekProjectName)\?>
+  <?define PeekAssetsFiles=?>
+  <?define PeekAssetsFilesPath=$(var.BinDir)modules\$(var.PeekProjectName)\Assets\?>
+
+  <Fragment>
+    <DirectoryRef Id="PeekInstallFolder" FileSource="$(var.PeekFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PeekFiles_Component_Def-->
+    </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" >
+        <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>
+</Wix>

installer/PowerToysSetup/PowerAccent.wxs

@@ -4,22 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerAccentFiles=ControlzEx.dll;Ijwhost.dll;Microsoft.Xaml.Behaviors.dll;PowerAccent.Core.dll;PowerToys.PowerAccentModuleInterface.dll;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;PowerToys.PowerAccent.deps.json;PowerToys.PowerAccent.dll;PowerToys.PowerAccent.exe;PowerToys.PowerAccent.runtimeconfig.json;PowerToys.Common.UI.dll;PowerToys.Settings.UI.Lib.dll;System.IO.Abstractions.dll;System.Management.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;PowerToys.PowerAccentKeyboardService.dll;Microsoft.Windows.SDK.NET.dll;System.CodeDom.dll;System.Text.Json.dll;WinRT.Runtime.dll;PowerToys.GPOWrapper.dll;WindowsBase.dll;UnicodeInformation.dll;ModernWpf.dll;ModernWpf.Controls.dll?>
+  <?define PowerAccentFiles=?>
+  <?define PowerAccentFilesPath=$(var.BinDir)modules\$(var.PowerAccentProjectName)\?>
 
   <Fragment>
-    <!-- PowerAccent -->
     <DirectoryRef Id="PowerAccentInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerAccentProjectName)">
-      <?foreach File in $(var.PowerAccentFiles)?>
-        <Component Id="PowerAccent_$(var.File)" Win64="yes">
-          <File Id="PowerAccentFile_$(var.File)" Source="$(var.BinDir)modules\$(var.PowerAccentProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PowerAccentFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="PowerAccentComponentGroup" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.PowerAccentFiles)?>
-        <ComponentRef Id="PowerAccent_$(var.File)" />
-      <?endforeach?>
+    <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>

installer/PowerToysSetup/PowerRename.wxs

@@ -4,28 +4,27 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerRenameFiles=PowerRenameUI.ico;PowerToys.PowerRename.exe;resources.pri;PowerToys.PowerRenameExt.dll;PowerRenameContextMenuPackage.msix;PowerToys.PowerRenameContextMenu.dll?>
-  <?define PowerRenameSparsePackageAssets=LargeTile.png;SmallTile.png;SplashScreen.png;Square150x150Logo.png;Square44x44Logo.png;storelogo.png;Wide310x150Logo.png?>
-  <?define PowerRenameMicrosoftUIXamlAssetsInstallFiles=NoiseAsset_256x256_PNG.png?>
+  <?define PowerRenameFiles=?>
+  <?define PowerRenameFilesPath=$(var.BinDir)modules\$(var.PowerRenameProjectName)\?>
+  <?define PowerRenameAssetsFiles=?>
+  <?define PowerRenameAssetsFilesPath=$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\?>
 
   <Fragment>
-
-    <!-- PowerRename -->
-    <DirectoryRef Id="PowerRenameInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerRenameProjectName)">
-      <?foreach File in $(var.PowerRenameFiles)?>
-        <Component Id="PowerRename_$(var.File)" Win64="yes">
-          <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="PowerRenameInstallFolder" FileSource="$(var.PowerRenameFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PowerRenameFiles_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="HKCU" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+        <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" Name="ThreadingModel" Value="Apartment" />
         </RegistryKey>
-        <RegistryKey Root="HKCU" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\PowerRenameExt">
           <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
         </RegistryKey>
 
@@ -33,38 +32,31 @@
     </DirectoryRef>
 
     <DirectoryRef Id="PowerRenameMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Microsoft.UI.Xaml\Assets">
-      <?foreach File in $(var.PowerRenameMicrosoftUIXamlAssetsInstallFiles)?>
-        <Component Id="PowerRenameMicrosoftUIXamlAssets_$(var.File)" Win64="yes">
-          <File Id="PowerRenameMicrosoftUIXamlAssetsFile_$(var.File)" Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Microsoft.UI.Xaml\Assets\$(var.File)" />
-        </Component>
-      <?endforeach?>
-    </DirectoryRef>
-
-    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.BinDir)modules\$(var.PowerRenameProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_PowerRename_Assets" Guid="BA290033-7861-44B7-8A04-7E4C3CC7F0AE" Win64="yes">
-        <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\file.png" />
-        <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\folder.png" />
-      </Component>
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="PowerRename_PowerRenameSparsePackageAssets" Guid="A32B528D-2771-4853-9775-1791D39DF30E" Win64="yes">
-        <?foreach File in $(var.PowerRenameSparsePackageAssets)?>
-          <File Id="PowerRenameSparsePackageAssets_$(var.File)" Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\$(var.File)" />
-        <?endforeach?>
+      <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>
 
-    <ComponentGroup Id="PowerRenameComponentGroup" Directory="INSTALLFOLDER">
+    <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" >
+        <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" />
-      <?foreach File in $(var.PowerRenameFiles)?>
-       <ComponentRef Id="PowerRename_$(var.File)" />
-      <?endforeach?>
-	  <?foreach File in $(var.PowerRenameMicrosoftUIXamlAssetsInstallFiles)?>
-	    <ComponentRef Id="PowerRenameMicrosoftUIXamlAssets_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="Module_PowerRename_Assets" />
-      <ComponentRef Id="PowerRename_PowerRenameSparsePackageAssets" />
-
+	    <ComponentRef Id="PowerRenameMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/PowerToys.wxs

@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?define UpgradeCode="6341382d-c0a9-4238-9188-be9607e3fab2"?>
-<?define RepoDir="$(var.ProjectDir)..\..\" ?>
-<?if $(var.Platform) = x64?>
-    <?define BinDir="$(var.RepoDir)$(var.Platform)\$(var.Configuration)\" ?>
-    <?define PowerToysPlatform="x64"?>
-
-    <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
-<?else?>
-    <!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
-    <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
-    <?define PowerToysPlatform="ARM64"?>
-
-    <!--TODO: define to ARM64 Program files once it's available-->
-    <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> 
-
-<?endif?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+
+    <?include $(sys.CURRENTDIR)\Common.wxi?>
+
     <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)"
             Version="$(var.Version)"
             Manufacturer="Microsoft Corporation"
@@ -36,17 +24,32 @@
         <util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
         <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
 
-        <Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
+        <?if $(var.PerUser) = "true" ?>
+            <Variable Name="InstallFolder" Type="string" Value="[LocalAppDataFolder]PowerToys" bal:Overridable="yes"/>
+        <?else?>
+            <Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
+        <?endif?>
 
         <Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" /> 
         <Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
 
       <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
       <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
-      <Variable Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
+      <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0"/>
       <Variable Name="TargetPowerToysVersion" Type="version" Value="$(var.Version)"/>
+      <Variable  Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
+      <Variable  Name="DetectedPowerToysUserVersion" Type="version" Value="0.0.0.0"/>
+
       <util:ProductSearch Id="SearchInstalledPowerToysVersion" Variable="DetectedPowerToysVersion" UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708" Result="version" />
-      <bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
+      <util:ProductSearch Id="SearchInstalledPowerToysUserVersion" Variable="DetectedPowerToysUserVersion" UpgradeCode="D8B559DB-4C98-487A-A33F-50A8EEE42726" Result="version" />
+
+      <?if $(var.PerUser) = "true" ?>
+        <bal:Condition Message="PowerToys is already installed on this system for all users. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysVersion</bal:Condition>
+        <bal:Condition Message="The same or later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysUserVersion OR WixBundleInstalled</bal:Condition>
+      <?else?>
+        <bal:Condition Message="PowerToys is already installed on this system for current user. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysUserVersion</bal:Condition>
+        <bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
+      <?endif?>
 
       <Variable Name="DetectedWindowsBuildNumber" Type="version" Value="0"/>
       <util:RegistrySearch Id="SearchWindowsBuildNumber" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" Result="value" Format="raw" Variable="DetectedWindowsBuildNumber" />
@@ -61,7 +64,7 @@
                 Id="TerminatePowerToys"
                 SourceFile="terminate_powertoys.cmd"
                 Permanent="yes"
-                PerMachine="yes"
+                PerMachine="$(var.PerMachineYesNo)"
                 Vital="no">
             </ExePackage>
             <ExePackage
@@ -74,12 +77,12 @@
                 InstallCommand="/silent /install"
                 RepairCommand="/repair /passive"
                 Permanent="yes"
-                PerMachine="yes"
+                PerMachine="$(var.PerMachineYesNo)"
                 UninstallCommand="/silent /uninstall">
             </ExePackage>
             <MsiPackage
                 DisplayName="Installing PowerToys"
-                SourceFile="$(var.PowerToysPlatform)\Release\PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"
+                SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)"
                 Compressed="yes"
                 DisplayInternalUI="no">
                 <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />

installer/PowerToysSetup/PowerToysBootstrapper.wixproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"
   DefaultTargets="Build"
   InitialTargets="EnsureNuGetPackageBuildImports"
@@ -11,6 +11,12 @@
     <Name>PowerToysBootstrapper</Name>
     <ProjectGuid>{31d72625-43c1-41b1-b784-bce4a8dc5543}</ProjectGuid>
   </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
@@ -20,8 +26,10 @@
     <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Bundle</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
-    <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputPath>$(Platform)\$(Configuration)\</OutputPath>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <NuGetPackageImportStamp />
   </PropertyGroup>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -11,8 +11,8 @@
     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=..\..\..\..
-call "..\..\publish.cmd" x64
+SET PTRoot=..\..\..\..\..
+call "..\..\..\publish.cmd" x64
 )</PreBuildEvent>
   </PropertyGroup>
 
@@ -20,20 +20,52 @@ call "..\..\publish.cmd" x64
     <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\modules\FileExplorerPreview\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=..\..\..\..
-call "..\..\publish.cmd" arm64
+SET PTRoot=..\..\..\..\..
+call "..\..\..\publish.cmd" arm64
 )</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
     <PostBuildEvent>
-    call move /Y ..\..\Core.wxs.bk ..\..\Core.wxs
-    call move /Y ..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h.bk ..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h
+    call move /Y ..\..\..\AlwaysOnTop.wxs.bk ..\..\..\AlwaysOnTop.wxs
+    call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.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
+    call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
+    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
     </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <Name>PowerToysInstaller</Name>
   </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- We do not support debug installer builds -->
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> 
@@ -41,15 +73,22 @@ call "..\..\publish.cmd" arm64
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>022a9d30-7c4f-416d-a9df-5ff2661cc0ad</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <!-- 1076 and ICE91 - warning: using this configuration for perMachine install could cause problems. -->
+    <!-- 1026 - warning: file ID is too long -->
+    <SuppressIces>ICE91</SuppressIces>
+    <SuppressSpecificWarnings>1026;1076</SuppressSpecificWarnings>
   </PropertyGroup>
   <PropertyGroup>
-    <OutputPath>$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">obj\$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' == 'true' ">obj\$(Platform)\$(Configuration)\UserSetup</IntermediateOutputPath>
     <SuppressIces>ICE40</SuppressIces>
   </PropertyGroup>
   <PropertyGroup>
@@ -74,14 +113,18 @@ call "..\..\publish.cmd" arm64
     <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="MonacoSRC.wxs" />
 
@@ -90,6 +133,10 @@ call "..\..\publish.cmd" arm64
     <Compile Include="WinAppSDK.wxs" />
   </ItemGroup>
   <ItemGroup>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
     <WixExtension Include="WixUtilExtension">
       <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
       <Name>WixUtilExtension</Name>
@@ -137,18 +184,19 @@ call "..\..\publish.cmd" arm64
 	</Target>
 	<Target Name="AfterBuild">
 	</Target>
-	-->
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\modules\previewpane\MonacoPreviewHandler\monacoSRC"
+    <HeatDirectory Directory="..\..\src\modules\FileExplorerPreview\monacoSRC"
       PreprocessorVariable="var.MonacoSRCHarvestPath"
       OutputFile="MonacoSRC.wxs"
       ComponentGroupName="MonacoSRCHeatGenerated"
       DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder"
-      AutogenerateGuids="true"
+      AutogenerateGuids="false"
+      GenerateGuidsNow="true" 
       ToolPath="$(WixToolPath)"
       RunAsSeparateProcess="true"
-      SuppressFragments="true"
-      SuppressRegistry="true"
-      SuppressRootDirectory="true" />
-  </Target>
+      SuppressFragments="false"
+      SuppressRegistry="false"
+      SuppressRootDirectory="true"/>
+  </Target>	-->
+
 </Project>

installer/PowerToysSetup/Product.wxs

@@ -23,16 +23,17 @@
        Language="1033"
        Version="$(var.Version)"
        Manufacturer="Microsoft Corporation"
-       UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708">
+       UpgradeCode="$(var.UpgradeCodeGUID)">
 
-        <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" Platform="$(var.PlatformLK)" />
+
+      <Package InstallerVersion="500" Compressed="yes" InstallScope="$(var.InstallScope)" InstallPrivileges="$(var.InstallPrivileges)" Platform="$(var.PlatformLK)" />
 
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
 
-    <Upgrade Id="42B84BF7-5FBF-473B-9C8B-049DC16F7708">
+    <Upgrade Id="$(var.UpgradeCodeGUID)">
       <UpgradeVersion
          Minimum="0.0.0" Maximum="$(var.Version)"
-         Property="PREVIOUSVERSIONSINSTALLED"
+         Property="PREVIOUSVERSIONSINSTALLED" 
          IncludeMinimum="yes" IncludeMaximum="no" />
     </Upgrade>
 
@@ -51,7 +52,7 @@
     <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
 
     <Feature Id="CoreFeature" Title="PowerToys" AllowAdvertise="no" Absent="disallow" TypicalDefault="install"
-             Description="Contains the Shortcut Guide and Fancy Zones features.">
+             Description="Contains all PowerToys features.">
       <ComponentGroupRef Id="CoreComponents" />
 
       <ComponentGroupRef Id="AlwaysOnTopComponentGroup" />
@@ -65,14 +66,18 @@
       <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" />
+        
       <ComponentGroupRef Id="ResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
@@ -116,13 +121,13 @@
     <Property Id="CREATESCHEDULEDTASK" Value="1"/>
     <Property Id="WixShellExecTarget" Value="[#PowerToys_ActionRunner.exe]" />
 
-    <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[ProgramFiles64Folder]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute">
-    </SetProperty>
+    <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[$(var.DefaultInstallDir)]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute"></SetProperty>
+
     <!-- In case we didn't receive a value from the bootstrapper. -->
     <SetProperty Action="SetBOOTSTRAPPERINSTALLFOLDER" Id="BOOTSTRAPPERINSTALLFOLDER" Value="[DEFAULTBOOTSTRAPPERINSTALLFOLDER]" Before="DetectPrevInstallPath" Sequence="execute">
       <![CDATA[BOOTSTRAPPERINSTALLFOLDER = ""]]>
     </SetProperty>
-    <!-- Have to compare value sent by bootstrapper to default to avoid using it, as a check to verify it's not default. This hack can be removed if it's possible to set the bootstrapper option to the previous install folder -->
+    <!-- Have to compare value sent by bootstrapper to default to avoid using it, as a check to verify it's not default. This hack can be removed if it's possible to set the bootstrapper option to the previous install folder--> 
     <SetProperty Action="SetINSTALLFOLDERTOPREVIOUSINSTALLFOLDER" Id="INSTALLFOLDER" Value="[PREVIOUSINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
       <![CDATA[BOOTSTRAPPERINSTALLFOLDER = DEFAULTBOOTSTRAPPERINSTALLFOLDER AND PREVIOUSINSTALLFOLDER <> ""]]>
     </SetProperty>
@@ -130,6 +135,7 @@
       <![CDATA[BOOTSTRAPPERINSTALLFOLDER <> DEFAULTBOOTSTRAPPERINSTALLFOLDER OR PREVIOUSINSTALLFOLDER = ""]]>
     </SetProperty>
 
+    <SetProperty Id="InstallScope" Value="$(var.InstallScope)" Before="DetectPrevInstallPath" Sequence="execute"></SetProperty>
     <InstallExecuteSequence>
       <Custom Action="DetectPrevInstallPath" After="AppSearch" />
       <Custom Action="SetRegisterPowerToysSchTaskParam" Before="RegisterPowerToysSchTask" />
@@ -144,6 +150,9 @@
       <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>
@@ -177,15 +186,17 @@
       <Custom Action="DeleteWinAppSDKHardlinks" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="DeletePTInteropHardlinks" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
+
+      <Custom Action="DeletePTInteropHardlinks" After="InstallInitialize" />
 
       <Custom Action="DeleteDotnetRuntimeHardlinks" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
 
-      <!-- TODO: Use to activate embedded MSIX -->
+      <Custom Action="UninstallServicesTask" After="InstallFinalize">
+          Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+        <!-- TODO: Use to activate embedded MSIX -->
       <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
         Installed AND (REMOVE="ALL")
       </Custom>-->
@@ -323,7 +334,14 @@
                   DllEntry="UninstallEmbeddedMSIXCA"
                    />
 
-    <CustomAction Id="TelemetryLogInstallSuccess"
+      <CustomAction Id="UninstallServicesTask"
+                    Return="ignore"
+                    Impersonate="yes"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UninstallServicesCA"
+                   />
+      
+      <CustomAction Id="TelemetryLogInstallSuccess"
               Return="ignore"
               Impersonate="yes"
               BinaryKey="PTCustomActions"
@@ -410,6 +428,13 @@
                 DllEntry="UnRegisterContextMenuPackagesCA"
                   />
 
+    <CustomAction Id="CheckGPO"
+                  Return="check"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="CheckGPOCA"
+                  />
+
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
@@ -423,7 +448,7 @@
   <!-- Installation directory structure -->
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFiles64Folder">
+      <Directory Id="$(var.DefaultInstallDir)">
         <Directory Id="INSTALLFOLDER" Name="PowerToys">
           <Directory Id="DllsFolder" Name="dll">
             <Directory Id="DotnetDlls" Name="dotnet" />
@@ -439,6 +464,9 @@
             </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" />
@@ -478,6 +506,19 @@
 
             <!-- 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 -->
@@ -498,87 +539,81 @@
                 <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" />
-              <Directory Id="LauncherPropertiesFolder" Name="Properties" />
 
               <!-- Plugins -->
               <Directory Id="LauncherPluginsFolder" Name="Plugins">
                 <Directory Id="WebSearchPluginFolder" Name="WebSearch">
                   <Directory Id="WebSearchImagesFolder" Name="Images" />
-                  <Directory Id="WebSearchLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="CalculatorPluginFolder" Name="Calculator">
                   <Directory Id="CalculatorImagesFolder" Name="Images" />
-                  <Directory Id="CalculatorLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="FolderPluginFolder" Name="Folder">
                   <Directory Id="FolderPluginImagesFolder" Name="Images" />
-                  <Directory Id="FolderPluginLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="ProgramPluginFolder" Name="Program">
                   <Directory Id="ProgramImagesFolder" Name="Images" />
-                  <Directory Id="ProgramLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="ShellPluginFolder" Name="Shell">
                   <Directory Id="ShellImagesFolder" Name="Images" />
-                  <Directory Id="ShellLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="IndexerPluginFolder" Name="Indexer">
                   <Directory Id="IndexerImagesFolder" Name="Images" />
-                  <Directory Id="IndexerLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="UriPluginFolder" Name="Uri">
                   <Directory Id="UriImagesFolder" Name="Images" />
-                  <Directory Id="UriLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="HistoryPluginFolder" Name="History">
                   <Directory Id="HistoryImagesFolder" Name="Images" />
-                  <Directory Id="HistoryLanguagesFolder" Name="Languages" />
                 </Directory>								
                 <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
                   <Directory Id="UnitConverterImagesFolder" Name="Images" />
-                  <Directory Id="UnitConverterLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspace">
                   <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
-                  <Directory Id="VSCodeWorkspaceLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
                   <Directory Id="WindowWalkerImagesFolder" Name="Images" />
-                  <Directory Id="WindowWalkerLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="OneNotePluginFolder" Name="OneNote">
                   <Directory Id="OneNoteImagesFolder" Name="Images" />
-                  <Directory Id="OneNoteLanguagesFolder" Name="Languages" />
+                </Directory>
+                <Directory Id="PowerToysPluginFolder" Name="PowerToys">
+                  <Directory Id="PowerToysImagesFolder" Name="Images" />
                 </Directory>
                 <Directory Id="RegistryPluginFolder" Name="Registry">
                   <Directory Id="RegistryImagesFolder" Name="Images" />
-                  <Directory Id="RegistryLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="ServicePluginFolder" Name="Service">
                   <Directory Id="ServiceImagesFolder" Name="Images" />
                 </Directory>
                 <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
                   <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
-                  <Directory Id="WindowsTerminalLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="SystemPluginFolder" Name="System">
                   <Directory Id="SystemImagesFolder" Name="Images" />
                 </Directory>
                 <Directory Id="TimeDatePluginFolder" Name="TimeDate">
                   <Directory Id="TimeDateImagesFolder" Name="Images" />
-                  <Directory Id="TimeDateLanguagesFolder" Name="Languages" />
-                </Directory>
-                <Directory Id="TimeZonePluginFolder" Name="TimeZone">
-                  <Directory Id="TimeZoneImagesFolder" Name="Images" />
-                  <Directory Id="TimeZoneLanguagesFolder" Name="Languages" />
                 </Directory>
                 <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
                   <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
-                  <Directory Id="WindowsSettingsLanguagesFolder" Name="Languages" />
                 </Directory>
               </Directory>
             </Directory>

installer/PowerToysSetup/RegistryPreview.wxs

@@ -0,0 +1,48 @@
+<?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 RegistryPreviewFiles=?>
+  <?define RegistryPreviewFilesPath=$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\?>
+
+  <?define RegistryPreviewAssetsFiles=?>
+  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)modules\$(var.RegistryPreviewProjectName)\Assets?>
+
+  <Fragment>
+    <!-- Registry Preview -->
+    <DirectoryRef Id="RegistryPreviewInstallFolder" FileSource="$(var.RegistryPreviewFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryPreviewFiles_Component_Def-->
+    </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" >
+        <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>
+</Wix>

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;TimeZonePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder?>
+      <?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?>
         <DirectoryRef Id="$(var.ParentDirectory)">
           <!-- Resource file directories -->
           <?foreach Language in $(var.LocLanguageList)?>
@@ -145,48 +145,72 @@
           Id="Launcher_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)LauncherInstallFolder"
           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" />
       </Component>
       <Component
           Id="FancyZonesEditor_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FancyZonesInstallFolder"
           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" />
       </Component>
       <Component
           Id="ImageResizer_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)ImageResizerInstallFolder"
           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" />
       </Component>
       <Component
           Id="ColorPicker_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)ColorPickerInstallFolder"
           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" />
       </Component>
       <Component
           Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
           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" />
       </Component>
       <Component
           Id="SVGPreviewHandler_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
           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" />
       </Component>
       <Component
           Id="PDFPreviewHandler_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
           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" />
       </Component>
       <Component
           Id="GcodePreviewHandler_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
           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" />
       </Component>
       <!-- PowerToys Run aka Launcher plugin resources -->
@@ -194,125 +218,267 @@
           Id="Launcher_Calculator_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder"
           Guid="$(var.CompGUIDPrefix)08">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Folder_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder"
           Guid="$(var.CompGUIDPrefix)09">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Program_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)0A"
           Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Shell_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)0B"
           Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Indexer_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)0C"
           Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Uri_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)0D"
           Directory="Resource$(var.IdSafeLanguage)UriPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)0E"
           Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder">
+        <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" />
       </Component>
       <Component Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component"
                  Guid="$(var.CompGUIDPrefix)0F"
                  Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Registry_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)10"
           Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_Service_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)11"
           Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_System_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)12"
           Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)13"
           Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder">
+        <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" />
       </Component>
-      <Component
-          Id="Launcher_TimeZone_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)14"
-          Directory="Resource$(var.IdSafeLanguage)TimeZonePluginFolder">
-        <File Id="Launcher_TimeZone_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\TimeZone\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeZone.resources.dll" />
-      </Component>
       <Component
           Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)15"
           Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_WebSearch_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)16"
           Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)17"
           Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder">
+        <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" />
       </Component>
       <Component
                 Id="Launcher_TimeDate_$(var.IdSafeLanguage)_Component"
                 Guid="$(var.CompGUIDPrefix)18"
                 Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder">
+        <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" />
       </Component>
       <Component
           Id="Launcher_OneNote_$(var.IdSafeLanguage)_Component"
           Guid="$(var.CompGUIDPrefix)19"
           Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder">
+        <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" />
       </Component>
       <Component
           Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)FileExplorerPreviewInstallFolder"
           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" />
       </Component>
       <Component
           Id="Launcher_History_$(var.IdSafeLanguage)_Component"
           Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder"
           Guid="$(var.CompGUIDPrefix)1B">
+        <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" />
-      </Component>	  
+      </Component>
+      <Component
+          Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1C">
+        <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" />
+      </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>
       <?endif?>
+
+    <?ifdef env.IsPipeline?>
+      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="WinAppSDKDlls" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveResourcesFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+      <?foreach Language in $(var.LocLanguageList)?>
+      <!--NB: Ids can't contain hyphens-->
+      <?if $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?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) = qps-ploc?>
+      <?define IdSafeLanguage = qps_ploc?>
+      <?elseif $(var.Language) = qps-ploca?>
+      <?define IdSafeLanguage = qps_ploca?>
+      <?elseif $(var.Language) = qps-plocm?>
+      <?define IdSafeLanguage = qps_plocm?> 
+      -->
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?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)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"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ShellPluginFolder" Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)IndexerPluginFolder" Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UriPluginFolder" Directory="Resource$(var.IdSafeLanguage)UriPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowWalkerPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)RegistryPluginFolder" Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ServicePluginFolder" Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)SystemPluginFolder" Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WebSearchPluginFolder" Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UnitConverterPluginFolder" Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)TimeDatePluginFolder" Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder" On="uninstall"/>
+          <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"/>
+      <?undef IdSafeLanguage?>
+        <?endforeach?>
+      </Component>
+    <?endif?>
+
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/Run.wxs

@@ -4,308 +4,368 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define launcherImagesComponentFiles=app.dark.png;app.light.png;app_error.dark.png;app_error.light.png;RunAsset.ico?>
-  <?define calcComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.Calculator.deps.json;Microsoft.PowerToys.Run.Plugin.Calculator.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define FolderComponentFiles=plugin.json;Microsoft.Plugin.Folder.deps.json;Microsoft.Plugin.Folder.dll;PowerToys.ManagedTelemetry.dll;Ijwhost.dll?>
-  <?define FolderImagesComponentFiles=copy.dark.png;copy.light.png;delete.dark.png;delete.light.png;file.dark.png;file.light.png;folder.dark.png;folder.light.png;user.dark.png;user.light.png;Warning.dark.png;Warning.light.png?>
-  <?define ProgramComponentFiles=plugin.json;Microsoft.Plugin.Program.deps.json;Microsoft.Plugin.Program.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define ProgramImagesComponentFiles=app.dark.png;app.light.png;disable.light.png;disable.dark.png;folder.light.png;folder.dark.png;shell.light.png;shell.dark.png;user.light.png;user.dark.png?>
-  <?define ShellComponentFiles=plugin.json;Microsoft.Plugin.Shell.deps.json;Microsoft.Plugin.Shell.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define HistoryPluginComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.History.deps.json;Microsoft.PowerToys.Run.Plugin.History.dll?>
-  <?define ShellImagesComponentFiles=shell.light.png;shell.dark.png;user.light.png;user.dark.png?>
-  <?define IndexerComponentFiles=Microsoft.Plugin.Indexer.deps.json;Microsoft.Plugin.Indexer.dll;plugin.json;PowerToys.ManagedTelemetry.dll;Ijwhost.dll?>
-  <?define IndexerImagesComponentFiles=indexer.dark.png;indexer.light.png;Warning.light.png;Warning.dark.png?>
-  <?define UnitConvCompFiles=plugin.json;Community.PowerToys.Run.Plugin.UnitConverter.deps.json;Community.PowerToys.Run.Plugin.UnitConverter.dll?>
-  <?define WebSrchCompFiles=plugin.json;Community.PowerToys.Run.Plugin.WebSearch.deps.json;Community.PowerToys.Run.Plugin.WebSearch.dll?>
-  <?define UriComponentFiles=plugin.json;Microsoft.Plugin.Uri.deps.json;Microsoft.Plugin.Uri.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define VSCWrkCompFiles=plugin.json;Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll?>
-  <?define WindowWlkrCompFiles=plugin.json;Microsoft.Plugin.WindowWalker.deps.json;Microsoft.Plugin.WindowWalker.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define WindowWlkrImagesCompFiles=windowwalker.dark.png;windowwalker.light.png;info.dark.png;info.light.png?>
-  <?define OneNoteComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.OneNote.deps.json;Microsoft.PowerToys.Run.Plugin.OneNote.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define RegistryComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.Registry.deps.json;Microsoft.PowerToys.Run.Plugin.Registry.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define ServiceComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.Service.deps.json;Microsoft.PowerToys.Run.Plugin.Service.dll?>
-  <?define SystemComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.System.deps.json;Microsoft.PowerToys.Run.Plugin.System.dll?>
-  <?define SystemImagesComponentFiles=lock.dark.png;lock.light.png;logoff.dark.png;logoff.light.png;recyclebin.dark.png;recyclebin.light.png;restart.dark.png;restart.light.png;shutdown.dark.png;shutdown.light.png;sleep.dark.png;sleep.light.png;firmwareSettings.dark.png;firmwareSettings.light.png;networkAdapter.dark.png;networkAdapter.light.png?>
-  <?define TimeDateComponentFiles=Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json;Microsoft.PowerToys.Run.Plugin.TimeDate.dll;plugin.json;PowerToys.ManagedTelemetry.dll?>
-  <?define TimeDateImagesComponentFiles=calendar.dark.png;calendar.light.png;time.dark.png;time.light.png;timeDate.dark.png;timeDate.light.png;Warning.dark.png;Warning.light.png?>
-  <?define TimeZoneComponentFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.TimeZone.deps.json;Microsoft.PowerToys.Run.Plugin.TimeZone.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define WinSetCmpFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json;Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll;PowerToys.ManagedTelemetry.dll?>
-  <?define WinTermCmpFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json;Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll;PowerToys.ManagedTelemetry.dll?>
+  <?define launcherFiles=?>
+  <?define launcherFilesPath=$(var.BinDir)modules\launcher\?>
+
+  <?define launcherImagesComponentFiles=?>
+  <?define launcherImagesComponentFilesPath=$(var.BinDir)modules\launcher\Images\?>
+
+  <?define calcComponentFiles=?>
+  <?define calcComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Calculator\?>
+  <?define calcImagesComponentFiles=?>
+  <?define calcImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Calculator\Images\?>
+
+  <?define FolderComponentFiles=?>
+  <?define FolderComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Folder\?>
+  <?define FolderImagesComponentFiles=?>
+  <?define FolderImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Folder\Images?>
+
+  <?define ProgramComponentFiles=?>
+  <?define ProgramComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Program\?>
+  <?define ProgramImagesComponentFiles=?>
+  <?define ProgramImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Program\Images\?>
+
+  <?define ShellComponentFiles=?>
+  <?define ShellComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Shell\?>
+  <?define ShellImagesComponentFiles=?>
+  <?define ShellImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Shell\Images\?>
+
+  <?define IndexerComponentFiles=?>
+  <?define IndexerComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Indexer\?>
+  <?define IndexerImagesComponentFiles=?>
+  <?define IndexerImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Indexer\Images\?>
+
+  <?define UnitConvCompFiles=?>
+  <?define UnitConvCompFilesPath=$(var.BinDir)modules\launcher\Plugins\UnitConverter\?>
+  <?define UnitConvImagesCompFiles=?>
+  <?define UnitConvImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\UnitConverter\Images\?>
+
+  <?define WebSrchCompFiles=?>
+  <?define WebSrchCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WebSearch\?>
+  <?define WebSrchImagesCompFiles=?>
+  <?define WebSrchImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WebSearch\Images\?>
+
+  <?define HistoryPluginComponentFiles=?>
+  <?define HistoryPluginComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\History\?>
+  <?define HistoryPluginImagesComponentFiles=?>
+  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\History\Images\?>
+
+  <?define UriComponentFiles=?>
+  <?define UriComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Uri\?>
+  <?define UriImagesComponentFiles=?>
+  <?define UriImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Uri\Images\?>
+
+  <?define VSCWrkCompFiles=?>
+  <?define VSCWrkCompFilesPath=$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\?>
+  <?define VSCWrkImagesCompFiles=?>
+  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\?>
+
+  <?define WindowWlkrCompFiles=?>
+  <?define WindowWlkrCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowWalker\?>
+  <?define WindowWlkrImagesCompFiles=?>
+  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowWalker\Images\?>
+
+  <?define OneNoteComponentFiles=?>
+  <?define OneNoteComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\OneNote\?>
+  <?define OneNoteImagesComponentFiles=?>
+  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\OneNote\Images\?>
+
+  <?define RegistryComponentFiles=?>
+  <?define RegistryComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Registry\?>
+  <?define RegistryImagesComponentFiles=?>
+  <?define RegistryImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Registry\Images\?>
+
+  <?define ServiceComponentFiles=?>
+  <?define ServiceComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Service\?>
+  <?define ServiceImagesComponentFiles=?>
+  <?define ServiceImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\Service\Images\?>
+
+  <?define SystemComponentFiles=?>
+  <?define SystemComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\System\?>
+  <?define SystemImagesComponentFiles=?>
+  <?define SystemImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\System\Images\?>
+
+  <?define TimeDateComponentFiles=?>
+  <?define TimeDateComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\TimeDate\?>
+  <?define TimeDateImagesComponentFiles=?>
+  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)modules\launcher\Plugins\TimeDate\Images\?>
+
+  <?define WinSetCmpFiles=?>
+  <?define WinSetCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsSettings\?>
+  <?define WinSetImagesCmpFiles=?>
+  <?define WinSetImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsSettings\Images\?>
+
+  <?define WinTermCmpFiles=?>
+  <?define WinTermCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\?>
+  <?define WinTermImagesCmpFiles=?>
+  <?define WinTermImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\Images\?>
+
+  <?define PowerToysCmpFiles=?>
+  <?define PowerToysCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\?>
+  <?define PowerToysImagesCmpFiles=?>
+  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\Images\?>
 
   <Fragment>
+    <DirectoryRef Id="LauncherInstallFolder" FileSource="$(var.launcherFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--launcherFiles_Component_Def-->
+    </DirectoryRef>
+
+
+    <DirectoryRef Id="LauncherImagesFolder" FileSource="$(var.launcherImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--launcherImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Calculator Plugin -->
+    <DirectoryRef Id="CalculatorPluginFolder" FileSource="$(var.calcComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="CalculatorImagesFolder" FileSource="$(var.calcImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Folder Plugin -->
+    <DirectoryRef Id="FolderPluginFolder" FileSource="$(var.FolderComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="FolderPluginImagesFolder" FileSource="$(var.FolderImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Program Plugin -->
+    <DirectoryRef Id="ProgramPluginFolder" FileSource="$(var.ProgramComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ProgramImagesFolder" FileSource="$(var.ProgramImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Shell Plugin -->
+    <DirectoryRef Id="ShellPluginFolder" FileSource="$(var.ShellComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ShellImagesFolder" FileSource="$(var.ShellImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Indexer Plugin -->
+    <DirectoryRef Id="IndexerPluginFolder" FileSource="$(var.IndexerComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="IndexerImagesFolder" FileSource="$(var.IndexerImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- UnitConverter Plugin -->
+    <DirectoryRef Id="UnitConverterPluginFolder" FileSource="$(var.UnitConvCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UnitConverterImagesFolder" FileSource="$(var.UnitConvImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WebSearch Plugin -->
+    <DirectoryRef Id="WebSearchPluginFolder" FileSource="$(var.WebSrchCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WebSearchImagesFolder" FileSource="$(var.WebSrchImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- History Plugin -->
+    <DirectoryRef Id="HistoryPluginFolder" FileSource="$(var.HistoryPluginComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="HistoryImagesFolder" FileSource="$(var.HistoryPluginImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Uri Plugin -->
+    <DirectoryRef Id="UriPluginFolder" FileSource="$(var.UriComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UriImagesFolder" FileSource="$(var.UriImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- VSCodeWorkspaces Plugin -->
+    <DirectoryRef Id="VSCodeWorkspacesPluginFolder" FileSource="$(var.VSCWrkCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="VSCodeWorkspaceImagesFolder" FileSource="$(var.VSCWrkImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowWalker Plugin -->
+    <DirectoryRef Id="WindowWalkerPluginFolder" FileSource="$(var.WindowWlkrCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrCompFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="WindowWalkerImagesFolder" FileSource="$(var.WindowWlkrImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- OneNote Plugin -->
+    <DirectoryRef Id="OneNotePluginFolder" FileSource="$(var.OneNoteComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="OneNoteImagesFolder" FileSource="$(var.OneNoteImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Registry Plugin -->
+    <DirectoryRef Id="RegistryPluginFolder" FileSource="$(var.RegistryComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="RegistryImagesFolder" FileSource="$(var.RegistryImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Service Plugin -->
+    <DirectoryRef Id="ServicePluginFolder" FileSource="$(var.ServiceComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ServiceImagesFolder" FileSource="$(var.ServiceImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- System Plugin -->
+    <DirectoryRef Id="SystemPluginFolder" FileSource="$(var.SystemComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="SystemImagesFolder" FileSource="$(var.SystemImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- TimeDate Plugin -->
+    <DirectoryRef Id="TimeDatePluginFolder" FileSource="$(var.TimeDateComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="TimeDateImagesFolder" FileSource="$(var.TimeDateImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsSettings Plugin -->
+    <DirectoryRef Id="WindowsSettingsPluginFolder" FileSource="$(var.WinSetCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsSettingsImagesFolder" FileSource="$(var.WinSetImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsTerminal Plugin -->
+    <DirectoryRef Id="WindowsTerminalPluginFolder" FileSource="$(var.WinTermCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsTerminalImagesFolder" FileSource="$(var.WinTermImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- PowerToys Plugin -->
+    <DirectoryRef Id="PowerToysPluginFolder" FileSource="$(var.PowerToysCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="PowerToysImagesFolder" FileSource="$(var.PowerToysImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
     <ComponentGroup Id="RunComponentGroup">
-      <Component Id="launcherShortcutComponent" Directory="LauncherInstallFolder" >
-        <!-- Toast Notification AUMID -->
-        <RegistryKey Root="HKCU" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
-          <RegistryValue Type="string" Name="DisplayName" Value="PowerToys Run" />
-          <RegistryValue Type="string" Name="IconUri" Value="[LauncherImagesFolder]RunAsset.ico" />
+      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="LauncherInstallFolder" >
+        <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"/>
+        <RemoveFolder Id="RemoveFolderCalculatorImagesFolder" Directory="CalculatorImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginFolder" Directory="FolderPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginImagesFolder" Directory="FolderPluginImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramPluginFolder" Directory="ProgramPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramImagesFolder" Directory="ProgramImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellPluginFolder" Directory="ShellPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellImagesFolder" Directory="ShellImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerPluginFolder" Directory="IndexerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerImagesFolder" Directory="IndexerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterPluginFolder" Directory="UnitConverterPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterImagesFolder" Directory="UnitConverterImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchPluginFolder" Directory="WebSearchPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchImagesFolder" Directory="WebSearchImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryPluginFolder" Directory="HistoryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryImagesFolder" Directory="HistoryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriPluginFolder" Directory="UriPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriImagesFolder" Directory="UriImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspacesPluginFolder" Directory="VSCodeWorkspacesPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspaceImagesFolder" Directory="VSCodeWorkspaceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerPluginFolder" Directory="WindowWalkerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerImagesFolder" Directory="WindowWalkerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNotePluginFolder" Directory="OneNotePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNoteImagesFolder" Directory="OneNoteImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryPluginFolder" Directory="RegistryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryImagesFolder" Directory="RegistryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServicePluginFolder" Directory="ServicePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServiceImagesFolder" Directory="ServiceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemPluginFolder" Directory="SystemPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemImagesFolder" Directory="SystemImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDatePluginFolder" Directory="TimeDatePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDateImagesFolder" Directory="TimeDateImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsPluginFolder" Directory="WindowsSettingsPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsImagesFolder" Directory="WindowsSettingsImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalPluginFolder" Directory="WindowsTerminalPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalImagesFolder" Directory="WindowsTerminalImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
       </Component>
-
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="launcherInstallComponent" Guid="7362E89D-0FC8-4536-940F-F0FDF5735C39" Directory="LauncherInstallFolder" >
-        <File Source="$(var.BinDir)modules\Launcher\PowerToys.Launcher.dll" />
-        <?foreach File in e_sqlite3.dll;hyjiacan.py4n.dll;Mages.Core.dll;NLog.dll;NLog.Extensions.Logging.dll;PowerToys.PowerLauncher.deps.json;PowerToys.PowerLauncher.dll;PowerToys.PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;PowerToys.PowerLauncher.runtimeconfig.json;System.Data.OleDb.dll;UnitsNet.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToys.ManagedTelemetry.dll;PowerToys.PowerLauncher.Telemetry.dll;Microsoft.Data.Sqlite.dll;SQLitePCLRaw.batteries_v2.dll;SQLitePCLRaw.core.dll;SQLitePCLRaw.provider.e_sqlite3.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;ControlzEx.dll;PowerToys.ManagedCommon.dll;System.Management.dll;System.IO.Abstractions.dll;PowerToys.Common.UI.dll;System.ServiceProcess.ServiceController.dll;Microsoft.Toolkit.Uwp.Notifications.dll;ModernWpf.Controls.dll;ModernWpf.dll;WinRT.Runtime.dll;Microsoft.Windows.SDK.NET.dll;System.Reactive.dll;System.Text.Json.dll;Ijwhost.dll;ScipBe.Common.Office.OneNote.dll;Interop.Microsoft.Office.Interop.OneNote.dll;LazyCache.dll;Microsoft.Extensions.Caching.Abstractions.dll;Microsoft.Extensions.Caching.Memory.dll;PowerToys.GPOWrapper.dll;PowerToys.GPOWrapperProjection.dll;WindowsBase.dll?>
-        <File Id="File_$(var.File)" Source="$(var.BinDir)modules\launcher\$(var.File)" />
-        <?endforeach?>
-        <File Source="$(var.BinDir)Settings\PowerToys.Settings.UI.Lib.dll" />
-      </Component>
-      <?foreach File in $(var.launcherImagesComponentFiles)?>
-      <Component Id="launcherImagesComponent_$(var.File)" Win64="yes" Directory="LauncherImagesFolder">
-        <File Id="launcherImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      
-      <!-- Calculator Plugin -->
-      <?foreach File in $(var.calcComponentFiles)?>
-      <Component Id="calcComponent_$(var.File)" Win64="yes" Directory="CalculatorPluginFolder">
-        <File Id="calcComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Calculator\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="calculatorImagesComponentLight" Directory="CalculatorImagesFolder" >
-        <File Id="calculatorPluginImg_calculator_light" Source="$(var.BinDir)modules\launcher\Plugins\Calculator\Images\calculator.light.png" />
-      </Component>
-      <Component Id="calculatorImagesComponentDark" Directory="CalculatorImagesFolder" >
-        <File Id="calculatorPluginImg_calculator_dark" Source="$(var.BinDir)modules\launcher\Plugins\Calculator\Images\calculator.dark.png" />
-      </Component>
-
-      <!-- Folder Plugin -->
-      <?foreach File in $(var.FolderComponentFiles)?>
-      <Component Id="FolderComponent_$(var.File)" Win64="yes" Directory="FolderPluginFolder">
-        <File Id="FolderComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Folder\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.FolderImagesComponentFiles)?>
-      <Component Id="FolderImagesComponent_$(var.File)" Win64="yes" Directory="FolderPluginImagesFolder">
-        <File Id="FolderImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Folder\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- Program Plugin -->
-      <?foreach File in $(var.ProgramComponentFiles)?>
-      <Component Id="ProgramComponent_$(var.File)" Win64="yes" Directory="ProgramPluginFolder">
-        <File Id="ProgramComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Program\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <?foreach File in $(var.ProgramImagesComponentFiles)?>
-      <Component Id="ProgramImagesComponent_$(var.File)" Win64="yes" Directory="ProgramImagesFolder">
-        <File Id="ProgramImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Program\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- Shell Plugin -->
-      <?foreach File in $(var.ShellComponentFiles)?>
-      <Component Id="ShellComponent_$(var.File)" Win64="yes" Directory="ShellPluginFolder">
-        <File Id="ShellComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Shell\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.ShellImagesComponentFiles)?>
-      <Component Id="ShellImagesComponent_$(var.File)" Win64="yes" Directory="ShellImagesFolder">
-        <File Id="ShellImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Shell\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- Indexer Plugin -->
-      <?foreach File in $(var.IndexerComponentFiles)?>
-      <Component Id="IndexerComponent_$(var.File)" Win64="yes" Directory="IndexerPluginFolder">
-        <File Id="IndexerComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Indexer\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.IndexerImagesComponentFiles)?>
-      <Component Id="IndexerImagesComponent_$(var.File)" Win64="yes" Directory="IndexerImagesFolder">
-        <File Id="IndexerImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Indexer\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- UnitConverter Plugin -->
-      <?foreach File in $(var.UnitConvCompFiles)?>
-      <Component Id="UnitConvComp_$(var.File)" Win64="yes" Directory="UnitConverterPluginFolder">
-        <File Id="UnitConvCompFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\UnitConverter\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="UnitConverterImagesComponentLight" Directory="UnitConverterImagesFolder" >
-        <File Id="UnitConverterLight" Source="$(var.BinDir)modules\launcher\Plugins\UnitConverter\Images\unitconverter.light.png" />
-      </Component>
-      <Component Id="UnitConverterImagesComponentDark" Directory="UnitConverterImagesFolder" >
-        <File Id="UnitConverterDark" Source="$(var.BinDir)modules\launcher\Plugins\UnitConverter\Images\unitconverter.dark.png" />
-      </Component>
-
-      <!-- WebSearch Plugin -->
-      <?foreach File in $(var.WebSrchCompFiles)?>
-      <Component Id="WebSrchComp_$(var.File)" Win64="yes" Directory="WebSearchPluginFolder">
-        <File Id="WebSrchCompFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\WebSearch\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="WebSearchImagesComponentLight" Directory="WebSearchImagesFolder" >
-        <File Id="WebSearchLight" Source="$(var.BinDir)modules\launcher\Plugins\WebSearch\Images\WebSearch.light.png" />
-      </Component>
-      <Component Id="WebSearchImagesComponentDark" Directory="WebSearchImagesFolder" >
-        <File Id="WebSearchDark" Source="$(var.BinDir)modules\launcher\Plugins\WebSearch\Images\WebSearch.dark.png" />
-      </Component>
-
-      <!-- History Plugin -->
-      <?foreach File in $(var.HistoryPluginComponentFiles)?>
-      <Component Id="HistoryComponent_$(var.File)" Win64="yes" Directory="HistoryPluginFolder">
-        <File Id="HistoryComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\History\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="HistoryImagesComponentLight" Directory="HistoryImagesFolder" >
-        <File Id="HistoryLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\History\Images\history.light.png" />
-      </Component>
-      <Component Id="HistoryImagesComponentDark" Directory="HistoryImagesFolder" >
-        <File Id="HistoryDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\History\Images\history.dark.png" />
-      </Component>
-	  
-      <!-- Uri Plugin -->
-      <?foreach File in $(var.UriComponentFiles)?>
-      <Component Id="UriComponent_$(var.File)" Win64="yes" Directory="UriPluginFolder">
-        <File Id="UriComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Uri\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="UriImagesComponentLight" Directory="UriImagesFolder" >
-        <File Id="UriLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\Uri\Images\Uri.light.png" />
-      </Component>
-      <Component Id="UriImagesComponentDark" Directory="UriImagesFolder" >
-        <File Id="UriDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\Uri\Images\Uri.dark.png" />
-      </Component>
-
-      <!-- VSCodeWorkspaces Plugin -->
-      <?foreach File in $(var.VSCWrkCompFiles)?>
-      <Component Id="VSCWrkComp_$(var.File)" Win64="yes" Directory="VSCodeWorkspacesPluginFolder">
-        <File Id="VSCWrkCompFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="VSCodeWorkspacesDepsComponent" Directory="VSCodeWorkspacesPluginFolder">
-        <File Id="VSCodeWorkspaceFolder_deps" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" />
-      </Component>
-      <Component Id="VSCodeWorkspacesImagesComponentLight" Directory="VSCodeWorkspaceImagesFolder" >
-        <File Id="VSCodeWorkspaceCodeLight" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\code-light.png" />
-      </Component>
-      <Component Id="VSCodeWorkspacesImagesComponentDark" Directory="VSCodeWorkspaceImagesFolder" >
-        <File Id="VSCodeWorkspaceCodeDark" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\code-dark.png" />
-      </Component>
-      <Component Id="VSCodeWorkspacesImagesComponentFolder" Directory="VSCodeWorkspaceImagesFolder" >
-        <File Id="VSCodeWorkspaceFolder" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\folder.png" />
-      </Component>
-      <Component Id="VSCodeWorkspacesImagesComponentMonitor" Directory="VSCodeWorkspaceImagesFolder" >
-        <File Id="VSCodeWorkspaceRemote" Source="$(var.BinDir)modules\launcher\Plugins\VSCodeWorkspaces\Images\monitor.png" />
-      </Component>
-
-      <!-- WindowWalker Plugin -->
-      <?foreach File in $(var.WindowWlkrCompFiles)?>
-      <Component Id="WindowWlkrComp_$(var.File)" Win64="yes" Directory="WindowWalkerPluginFolder">
-        <File Id="WindowWlkrCompFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\WindowWalker\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.WindowWlkrImagesCompFiles)?>
-      <Component Id="WindowWalkerImagesComp_$(var.File)" Win64="yes" Directory="WindowWalkerImagesFolder">
-        <File Id="WindowWalkerImagesComp_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\WindowWalker\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- OneNote Plugin -->
-      <?foreach File in $(var.OneNoteComponentFiles)?>
-      <Component Id="OneNoteComp_$(var.File)" Win64="yes" Directory="OneNotePluginFolder">
-        <File Id="OneNoteCompFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\OneNote\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="OneNoteImagesComponentLight" Directory="OneNoteImagesFolder" >
-        <File Id="OneNoteLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\OneNote\Images\oneNote.light.png" />
-      </Component>
-      <Component Id="OneNoteImagesComponentDark" Directory="OneNoteImagesFolder" >
-        <File Id="OneNoteDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\OneNote\Images\oneNote.dark.png" />
-      </Component>
-
-      <!-- Registry Plugin -->
-      <?foreach File in $(var.RegistryComponentFiles)?>
-      <Component Id="RegistryComponent_$(var.File)" Win64="yes" Directory="RegistryPluginFolder">
-        <File Id="RegistryComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Registry\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="RegistryImagesComponentLight" Directory="RegistryImagesFolder" >
-        <File Id="RegistryLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\Registry\Images\reg.light.png" />
-      </Component>
-      <Component Id="RegistryImagesComponentDark" Directory="RegistryImagesFolder" >
-        <File Id="RegistryDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\Registry\Images\reg.dark.png" />
-      </Component>
-
-      <!-- Service Plugin -->
-      <?foreach File in $(var.ServiceComponentFiles)?>
-      <Component Id="ServiceComponent_$(var.File)" Win64="yes" Directory="ServicePluginFolder">
-        <File Id="ServiceComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\Service\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="ServiceImagesComponentLight" Directory="ServiceImagesFolder" >
-        <File Id="ServiceLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\Service\Images\service.light.png" />
-      </Component>
-      <Component Id="ServiceImagesComponentDark" Directory="ServiceImagesFolder" >
-        <File Id="ServiceDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\Service\Images\service.dark.png" />
-      </Component>
-
-      <!-- System Plugin -->
-      <?foreach File in $(var.SystemComponentFiles)?>
-      <Component Id="SystemComponent_$(var.File)" Win64="yes" Directory="SystemPluginFolder">
-        <File Id="SystemComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\System\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.SystemImagesComponentFiles)?>
-      <Component Id="SystemImagesComponent_$(var.File)" Win64="yes" Directory="SystemImagesFolder">
-        <File Id="SystemImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\System\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- TimeDate Plugin -->
-      <?foreach File in $(var.TimeDateComponentFiles)?>
-      <Component Id="TimeDateComponent_$(var.File)" Win64="yes" Directory="TimeDatePluginFolder">
-        <File Id="TimeDateComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\TimeDate\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <?foreach File in $(var.TimeDateImagesComponentFiles)?>
-      <Component Id="TimeDateImagesComponent_$(var.File)" Win64="yes" Directory="TimeDateImagesFolder">
-        <File Id="TimeDateImagesComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\TimeDate\Images\$(var.File)" />
-      </Component>
-      <?endforeach?>
-
-      <!-- TimeZone Plugin -->
-      <?foreach File in $(var.TimeZoneComponentFiles)?>
-      <Component Id="TimeZoneComponent_$(var.File)" Win64="yes" Directory="TimeZonePluginFolder">
-        <File Id="TimeZoneComponentFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\TimeZone\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="TimeZoneImagesComponentLight" Directory="TimeZoneImagesFolder" >
-        <File Id="TimeZoneLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\TimeZone\Images\timeZone.light.png" />
-      </Component>
-      <Component Id="TimeZoneImagesComponentDark" Directory="TimeZoneImagesFolder" >
-        <File Id="TimeZoneDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\TimeZone\Images\timeZone.dark.png" />
-      </Component>
-
-      <!-- WindowsSettings Plugin -->
-      <?foreach File in $(var.WinSetCmpFiles)?>
-      <Component Id="WinSetCmp_$(var.File)" Win64="yes" Directory="WindowsSettingsPluginFolder">
-        <File Id="WinSetCmpFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\WindowsSettings\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="WindowsSettingsImagesComponentLight" Directory="WindowsSettingsImagesFolder" >
-        <File Id="WindowsSettingsLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\WindowsSettings\Images\WindowsSettings.light.png" />
-      </Component>
-      <Component Id="WindowsSettingsImagesComponentDark" Directory="WindowsSettingsImagesFolder" >
-        <File Id="WindowsSettingsDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\WindowsSettings\Images\WindowsSettings.dark.png" />
-      </Component>
-
-      <!-- WindowsTerminal Plugin -->
-      <?foreach File in $(var.WinTermCmpFiles)?>
-      <Component Id="WinTermCmp_$(var.File)" Win64="yes" Directory="WindowsTerminalPluginFolder">
-        <File Id="WinTermCmpFile_$(var.File)" Source="$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\$(var.File)" />
-      </Component>
-      <?endforeach?>
-      <Component Id="WindowsTerminalImagesComponentLight" Directory="WindowsTerminalImagesFolder" >
-        <File Id="WindowsTerminalLightIcon" Source="$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\Images\WindowsTerminal.light.png" />
-      </Component>
-      <Component Id="WindowsTerminalImagesComponentDark" Directory="WindowsTerminalImagesFolder" >
-        <File Id="WindowsTerminalDarkIcon" Source="$(var.BinDir)modules\launcher\Plugins\WindowsTerminal\Images\WindowsTerminal.dark.png" />
-      </Component>
-
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/Settings.wxs

@@ -4,101 +4,71 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define SettingsV2Files=WinUIEx.dll;backup_restore_settings.json;Ijwhost.dll;ColorCode.Core.dll;ColorCode.WinUI.dll;CommunityToolkit.Common.dll;CommunityToolkit.Labs.WinUI.SettingsControls.dll;CommunityToolkit.WinUI.dll;CommunityToolkit.WinUI.UI.Controls.Core.dll;CommunityToolkit.WinUI.UI.Controls.DataGrid.dll;CommunityToolkit.WinUI.UI.Controls.Input.dll;CommunityToolkit.WinUI.UI.Controls.Layout.dll;CommunityToolkit.WinUI.UI.Controls.Markdown.dll;CommunityToolkit.WinUI.UI.Controls.Media.dll;CommunityToolkit.WinUI.UI.Controls.Primitives.dll;CommunityToolkit.WinUI.UI.dll;icon.ico;Microsoft.Graphics.Canvas.Interop.dll;Microsoft.InteractiveExperiences.Projection.dll;Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll;Microsoft.Windows.ApplicationModel.Resources.Projection.dll;Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll;Microsoft.Windows.AppLifecycle.Projection.dll;Microsoft.Windows.SDK.NET.dll;Microsoft.Windows.System.Power.Projection.dll;Microsoft.WindowsAppRuntime.Bootstrap.Net.dll;Microsoft.WinUI.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;PowerToys.Settings.deps.json;PowerToys.Settings.dll;PowerToys.Settings.exe;PowerToys.Settings.runtimeconfig.json;PowerToys.Settings.UI.Lib.dll;resources.pri;System.CodeDom.dll;System.IO.Abstractions.dll;WinRT.Runtime.dll;Microsoft.Graphics.Canvas.dll;System.Management.dll;PowerToys.GPOWrapper.dll;System.Text.Json.dll;WindowsBase.dll?>
-  <?define SettingsV2AssetsModulesFiles=ColorPicker.png;FancyZones.png;FileLocksmith.png;AlwaysOnTop.png;HostsFileEditor.png;Awake.png;ImageResizer.png;KBM.png;MouseUtils.png;PowerAccent.png;PowerOCR.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ScreenRuler.png;ShortcutGuide.png;VideoConference.png?>
-  <?define SettingsV2OOBEAssetsModulesFiles=ColorPicker.gif;AlwaysOnTop.png;HostsFileEditor.png;Awake.png;FancyZones.gif;FileExplorer.png;FileLocksmith.gif;ImageResizer.gif;KBM.gif;MouseUtils.gif;PowerAccent.gif;PowerOCR.gif;PowerRename.gif;Run.gif;ScreenRuler.gif;OOBEShortcutGuide.png;VideoConferenceMute.png;OOBEPTHero.png?>
-  <?define SettingsV2OOBEAssetsFluentIconsFiles=ColorPicker.png;FancyZones.png;FileLocksmith.png;AlwaysOnTop.png;Awake.png;FileExplorerPreview.png;FindMyMouse.png;Hosts.png;ImageResizer.png;KeyboardManager.png;MouseHighlighter.png;MouseCrosshairs.png;MouseUtils.png;PowerAccent.png;PowerOcr.png;PowerRename.png;PowerToys.png;PowerToysRun.png;ScreenRuler.png;Settings.png;ShortcutGuide.png;VideoConferenceMute.png?>
-  <?define SettingsV2MicrosoftUIXamlAssetsInstallFiles=NoiseAsset_256x256_PNG.png?>
+  <?define SettingsV2Files=?>
+  <?define SettingsV2FilesPath=$(var.BinDir)Settings\?>
+
+  <?define SettingsV2AssetsFiles=?>
+  <?define SettingsV2AssetsFilesPath=$(var.BinDir)Settings\Assets\?>
+
+  <?define SettingsV2AssetsModulesFiles=?>
+  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)Settings\Assets\Modules\?>
+
+  <?define SettingsV2OOBEAssetsModulesFiles=?>
+  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)Settings\Assets\Modules\OOBE\?>
+
+  <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
+  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)Settings\Assets\FluentIcons\?>
 
   <Fragment>
-    <!-- SettingsV2 components -->
-    <DirectoryRef Id="SettingsV2InstallFolder" FileSource="$(var.BinDir)Settings\">
-      <?foreach File in $(var.SettingsV2Files)?>
-        <Component Id="SV2C_$(var.File)" Win64="yes">
-          <File Id="SV2_$(var.File)" Source="$(var.BinDir)Settings\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <DirectoryRef Id="SettingsV2InstallFolder" FileSource="$(var.SettingsV2FilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2Files_Component_Def-->
     </DirectoryRef>
-    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.BinDir)Settings\Assets">
-      <Component Id="SettingsV2Assets_LogoScale200" Win64="yes">
-        <File Id="SV2A_LogoScale200" Source="$(var.BinDir)Settings\Assets\Logo.scale-200.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_SplashScreen" Win64="yes">
-        <File Id="SV2A_SplashScreen" Source="$(var.BinDir)Settings\Assets\SplashScreen.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_StoreLogo_Scale100" Win64="yes">
-        <File Id="SV2A_StoreLogoScale100" Source="$(var.BinDir)Settings\Assets\StoreLogo.scale-100.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_StoreLogo" Win64="yes">
-        <File Id="SV2A_StoreLogo" Source="$(var.BinDir)Settings\Assets\StoreLogo.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_Square150x150sc200" Win64="yes">
-        <File Id="SV2A_Square150x150sc200" Source="$(var.BinDir)Settings\Assets\Square150x150Logo.scale-200.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_Square44x44ts24" Win64="yes">
-        <File Id="SV2A_Square44x44ts24" Source="$(var.BinDir)Settings\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_Wide310x150sc200" Win64="yes">
-        <File Id="SV2A_Wide310x150sc200" Source="$(var.BinDir)Settings\Assets\Wide310x150Logo.scale-200.png" />
-      </Component>
-      <Component Id="SettingsV2Assets_Square44x44Logo200" Win64="yes">
-        <File Id="SV2A_Square44x44Logo200" Source="$(var.BinDir)Settings\Assets\Square44x44Logo.scale-200.png" />
-      </Component>
+
+    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsFiles_Component_Def-->
     </DirectoryRef>
-    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.BinDir)Settings\Assets\Modules">
-      <?foreach File in $(var.SettingsV2AssetsModulesFiles)?>
-        <Component Id="SettingsV2AssetsModules_$(var.File)" Win64="yes">
-          <File Id="S2AMF_$(var.File)" Source="$(var.BinDir)Settings\Assets\Modules\$(var.File)" />
-        </Component>
-      <?endforeach?>
+
+    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.SettingsV2AssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsModulesFiles_Component_Def-->
     </DirectoryRef>
-    <DirectoryRef Id="SettingsV2OOBEAssetsModulesInstallFolder" FileSource="$(var.BinDir)Settings\Assets\Modules\OOBE">
-      <?foreach File in $(var.SettingsV2OOBEAssetsModulesFiles)?>
-        <Component Id="SettingsV2OOBEAssetsModules_$(var.File)" Win64="yes">
-          <File Id="SettingsV2OOBEAssetsModules_$(var.File)"  Source="$(var.BinDir)Settings\Assets\Modules\OOBE\$(var.File)" />
-        </Component>
-      <?endforeach?>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsModulesInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsModulesFiles_Component_Def-->
     </DirectoryRef>
-    <DirectoryRef Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" FileSource="$(var.BinDir)Settings\Assets\FluentIcons">
-      <?foreach File in $(var.SettingsV2OOBEAssetsFluentIconsFiles)?>
-        <Component Id="SettingsV2OOBEAssetsFluentIcons_$(var.File)" Win64="yes">
-          <File Id="SettingsV2OOBEAssetsFluentIconsFile_$(var.File)" Source="$(var.BinDir)Settings\Assets\FluentIcons\FluentIcons$(var.File)" />
-        </Component>
-      <?endforeach?>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsFluentIconsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
     </DirectoryRef>
+
     <DirectoryRef Id="SettingsV2MicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)Settings\Microsoft.UI.Xaml\Assets">
-			<?foreach File in $(var.SettingsV2MicrosoftUIXamlAssetsInstallFiles)?>
-			    <Component Id="SettingsV2MicrosoftUIXamlAssets_$(var.File)" Win64="yes">
-				    <File Id="SettingsV2MicrosoftUIXamlAssetsFile_$(var.File)" Source="$(var.BinDir)Settings\Microsoft.UI.Xaml\Assets\$(var.File)" />
-			    </Component>
-			<?endforeach?>
+      <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" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.SettingsV2Files)?>
-        <ComponentRef Id="SV2C_$(var.File)" />
-      <?endforeach?>
-      <ComponentRef Id="SettingsV2Assets_LogoScale200" />
-      <ComponentRef Id="SettingsV2Assets_SplashScreen" />
-      <ComponentRef Id="SettingsV2Assets_StoreLogo_Scale100" />
-      <ComponentRef Id="SettingsV2Assets_StoreLogo" />
-      <ComponentRef Id="SettingsV2Assets_Square150x150sc200" />
-      <ComponentRef Id="SettingsV2Assets_Square44x44ts24" />
-      <ComponentRef Id="SettingsV2Assets_Wide310x150sc200" />
-      <ComponentRef Id="SettingsV2Assets_Square44x44Logo200" />
-      <?foreach File in $(var.SettingsV2AssetsModulesFiles)?>
-        <ComponentRef Id="SettingsV2AssetsModules_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.SettingsV2OOBEAssetsFluentIconsFiles)?>
-        <ComponentRef Id="SettingsV2OOBEAssetsFluentIcons_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.SettingsV2OOBEAssetsModulesFiles)?>
-        <ComponentRef Id="SettingsV2OOBEAssetsModules_$(var.File)" />
-      <?endforeach?>
-      <?foreach File in $(var.SettingsV2MicrosoftUIXamlAssetsInstallFiles)?>
-        <ComponentRef Id="SettingsV2MicrosoftUIXamlAssets_$(var.File)" />
-      <?endforeach?>
+    <ComponentGroup Id="SettingsComponentGroup">
 
+      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2InstallFolder" >
+        <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

@@ -4,37 +4,48 @@
 
   <?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 ShortcutGuideSvgsFiles=0.svg;1.svg;2.svg;3.svg;4.svg;5.svg;6.svg;7.svg;8.svg;9.svg;no_active_window.svg;overlay.svg;overlay_portrait.svg?>
 
   <Fragment>
-      <!-- Shortcut guide files -->
-    <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideExecutable)\svgs\">
-      <?foreach File in $(var.ShortcutGuideSvgsFiles)?>
-        <Component Id="ShortcutGuideSvgs_$(var.File)" Win64="yes">
-          <File Source="$(var.ShortcutGuideExecutable)\svgs\$(var.File)" />
-        </Component>
-      <?endforeach?>
+    <!-- Shortcut guide files -->
+    <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">
-        <File Source="$(var.ShortcutGuideModuleInterface)\PowerToys.ShortcutGuideModuleInterface.dll" KeyPath="yes" />
+      <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">
-        <File Source="$(var.ShortcutGuideExecutable)\PowerToys.ShortcutGuide.exe" KeyPath="yes" />
+      <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" Directory="INSTALLFOLDER">
-      <?foreach File in $(var.ShortcutGuideSvgsFiles)?>
-        <ComponentRef Id="ShortcutGuideSvgs_$(var.File)" />
-      <?endforeach?>
+    <ComponentGroup Id="ShortcutGuideComponentGroup" >
+      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideInstallFolder" >
+        <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>

installer/PowerToysSetup/TextExtractor.wxs

@@ -4,22 +4,22 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define TextExtractorFiles=PowerToys.PowerOCR.dll;ControlzEx.dll;Ijwhost.dll;Microsoft.Windows.SDK.NET.dll;Microsoft.Xaml.Behaviors.dll;PowerToys.Common.UI.dll;PowerToys.ManagedCommon.dll;PowerToys.ManagedTelemetry.dll;System.Text.Json.dll;PowerToys.PowerOCR.deps.json;PowerToys.PowerOCR.exe;PowerToys.PowerOCR.runtimeconfig.json;PowerToys.PowerOCRModuleInterface.dll;PowerToys.Settings.UI.Lib.dll;System.ComponentModel.Composition.dll;System.IO.Abstractions.dll;System.Management.dll;WinRT.Runtime.dll;PowerToys.GPOWrapper.dll;PowerToys.GPOWrapperProjection.dll;WindowsBase.dll?>
+  <?define TextExtractorFiles=?>
+  <?define TextExtractorFilesPath=$(var.BinDir)modules\$(var.PowerOCRProjectName)\?>
 
   <Fragment>
-    <!-- QuickAccent Resources -->
     <DirectoryRef Id="PowerOCRInstallFolder" FileSource="$(var.BinDir)modules\$(var.PowerOCRProjectName)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_PowerOCR" Guid="5640A7E8-E165-4368-8F08-F8E1E9242BDD" Win64="yes">
-        <?foreach File in $(var.TextExtractorFiles)?>
-          <File Id="PowerOCRFile_$(var.File)" Source="$(var.BinDir)modules\$(var.PowerOCRProjectName)\$(var.File)" />
-        <?endforeach?>
-      </Component>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TextExtractorFiles_Component_Def-->
     </DirectoryRef>
 
-    <ComponentGroup Id="TextExtractorComponentGroup" Directory="INSTALLFOLDER">
-      <ComponentRef Id="Module_PowerOCR" />
+    <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/Tools.wxs

@@ -6,18 +6,33 @@
 
   <Fragment>
     <DirectoryRef Id="ToolsFolder">
-      <Component Id="BugReportTool_exe" Win64="yes">
-        <File Source="$(var.BinDir)BugReportTool\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" KeyPath="yes" Checksum="yes" />
+      <Component Id="BugReportTool_exe" Win64="yes" Guid="370D0C28-F423-4A12-9A64-6BAB57C7E5C3">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="BugReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)BugReportTool\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" Checksum="yes" />
       </Component>
-      <Component Id="WebcamReportTool_exe" Win64="yes">
+      <Component Id="WebcamReportTool_exe" Win64="yes" Guid="41D5209F-7A9A-4DF2-A22A-9F0A9CF5AA63">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WebcamReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
         <File Source="$(var.BinDir)WebcamReportTool\PowerToys.WebcamReportTool.exe" Id="WebcamReportTool.exe" Checksum="yes" />
       </Component>
-      <Component Id="StylesReportTool_exe" Win64="yes">
+      <Component Id="StylesReportTool_exe" Win64="yes" Guid="9D348A78-38A0-4FDC-8D16-BDB0178E5F1E">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="StylesReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
         <File Source="$(var.BinDir)StylesReportTool\PowerToys.StylesReportTool.exe" Id="StylesReportTool.exe" Checksum="yes" />
       </Component>
     </DirectoryRef>
 
-    <ComponentGroup Id="ToolComponentGroup" Directory="ToolsFolder">
+    <ComponentGroup Id="ToolComponentGroup">
+      <Component Id="RemoveToolsFolder" Guid="0402A3E8-1B4F-4762-9CCF-2267BCF8B6EE" Directory="ToolsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveToolsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderToolsFolder" Directory="ToolsFolder" On="uninstall"/>
+      </Component>
       <ComponentRef Id="BugReportTool_exe" />
       <ComponentRef Id="WebcamReportTool_exe" />
       <ComponentRef Id="StylesReportTool_exe" />

installer/PowerToysSetup/VideoConference.wxs

@@ -7,22 +7,28 @@
   <Fragment>
     <DirectoryRef Id="VideoConferenceInstallFolder" FileSource="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\">
       <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_VideoConference" Guid="21DA4677-4AE8-4F01-BFC9-448E338DF864" Win64="yes">
+      <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" KeyPath="yes" />
+        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_x64.dll" />
         <?else?>
-        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_ARM64.dll" KeyPath="yes" />
+        <File Source="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\PowerToys.VideoConferenceProxyFilter_ARM64.dll" />
         <?endif?>
 
       </Component>
     </DirectoryRef>
     <DirectoryRef Id="VideoConferenceIconsFolder" FileSource="$(var.BinDir)modules\$(var.VideoConferenceProjectName)\Icons">
       <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_VideoConferenceIcons" Guid="9910F3D9-1BDF-43DB-BA0C-C558B121DF18" Win64="yes">
+      <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" />
@@ -38,7 +44,14 @@
       </Component>
     </DirectoryRef>
 
-    <ComponentGroup Id="VideoConferenceComponentGroup" Directory="INSTALLFOLDER">
+    <ComponentGroup Id="VideoConferenceComponentGroup">
+      <Component Id="RemoveVideoConferenceFolder" Guid="C6F2BE3D-FDE3-4CDB-BB51-A43E1B7B1606" Directory="VideoConferenceInstallFolder" >
+        <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"/>
+      </Component>
       <ComponentRef Id="Module_VideoConference" />
       <ComponentRef Id="Module_VideoConferenceIcons" />
 

installer/PowerToysSetup/WinAppSDK.wxs

@@ -4,21 +4,19 @@
 
   <?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.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;dcompi.dll;dwmcorei.dll;marshal.dll;wuceffectsi.dll?>
+  <?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">
-      <?foreach File in $(var.WinAppSDKFiles)?>
-      <Component Id="Dlls_WinAppSdkFiles_$(var.File)" Win64="yes">
-        <File Id="Dlls_WinAppSdk_File_$(var.File)" Source="$(var.BinDir)Settings\$(var.File)" />
-      </Component>
-      <?endforeach?>
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinAppSDKFiles_Component_Def-->
     </DirectoryRef>
 
-    <?foreach ParentDirectory in SettingsV2InstallFolder;PowerRenameInstallFolder;MeasureToolInstallFolder;HostsInstallFolder;FileLocksmithInstallFolder?>
+    <?foreach ParentDirectory in SettingsV2InstallFolder;PowerRenameInstallFolder;MeasureToolInstallFolder;HostsInstallFolder;FileLocksmithInstallFolder;RegistryPreviewInstallFolder;PeekInstallFolder?>
       <DirectoryRef Id="$(var.ParentDirectory)">
         <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
         <?if $(var.Language) = af-ZA?>
@@ -320,6 +318,9 @@
           Id="SettingsV2_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
           Directory="WinAppSDKLoc$(var.IdSafeLanguage)SettingsV2InstallFolder"
           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"/>
+          </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>
@@ -327,6 +328,9 @@
           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>
@@ -334,6 +338,9 @@
           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>
@@ -341,23 +348,177 @@
           Id="Hosts_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
           Directory="WinAppSDKLoc$(var.IdSafeLanguage)HostsInstallFolder"
           Guid="$(var.CompGUIDPrefix)04">
-      <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" />
+          <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">
-      <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" />
+          <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" />
       </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>
+      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinAppSDKDlls" >
+        <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)?>
+      <?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?>
+          <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"/>
+      <?undef IdSafeLanguage?>
+        <?endforeach?>
+      </Component>
 
-      <?foreach File in $(var.WinAppSDKFiles)?>
-        <ComponentRef Id="Dlls_WinAppSdkFiles_$(var.File)" />
-      <?endforeach?>
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/generateAllFileComponents.ps1

@@ -0,0 +1,229 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$platform,
+    [Parameter(Mandatory = $False, Position = 2)]
+    [string]$installscopeperuser = "false"
+)
+
+if ($platform -ceq "arm64") {
+    $platform = "ARM64"
+}
+
+if ($installscopeperuser -eq "true") {
+    $registryroot = "HKCU"
+} else {
+    $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"
+
+#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\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"
+
+#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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -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\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\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/generateFileComponents.ps1

@@ -0,0 +1,56 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$fileListName,
+    [Parameter(Mandatory = $True, Position = 2)]
+    [string]$wxsFilePath,
+    [Parameter(Mandatory = $True, Position = 3)]
+    [string]$regroot
+)
+
+$wxsFile = Get-Content $wxsFilePath;
+
+$wxsFile | ForEach-Object {
+    if ($_ -match "(<?define $fileListName=)(.*)\?>") {
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
+        Justification = 'variable is used in another scope')]
+
+        $fileList = $matches[2] -split ';'
+        return
+    }
+}
+
+$componentId = "$($fileListName)_Component"
+
+$componentDefs = "`r`n"
+$componentDefs +=
+@"
+        <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
+          <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+            <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+          </RegistryKey>`r`n
+"@
+
+foreach ($file in $fileList) {
+    $fileTmp = $file -replace "-", "_"
+    $componentDefs +=
+@"
+          <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
+"@
+}
+
+$componentDefs +=
+@"
+        </Component>`r`n
+"@
+
+$wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
+
+$componentRef =
+@"
+        <ComponentRef Id="$($componentId)" />
+"@
+
+$wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
+
+Set-Content -Path $wxsFilePath -Value $wxsFile

installer/PowerToysSetup/generateFileList.ps1

@@ -0,0 +1,91 @@
+[CmdletBinding()]
+Param(
+    # Can be multiple files separated by ; as long as they're on the same directory
+    [Parameter(Mandatory = $True, Position = 1)]
+    [AllowEmptyString()]
+    [string]$fileDepsJson,
+    [Parameter(Mandatory = $True, Position = 2)]
+    [string]$fileListName,
+    [Parameter(Mandatory = $True, Position = 3)]
+    [string]$wxsFilePath,
+    # If there is no deps.json file, just pass path to files
+    [Parameter(Mandatory = $False, Position = 4)]
+    [string]$depsPath,
+    # 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
+)
+
+$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')]
+
+        $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")
+
+$dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
+
+if ($fileDepsJson -eq [string]::Empty) {
+    $fileDepsRoot = $depsPath
+} else {
+    $multipleDepsJson = $fileDepsJson.Split(";")
+
+    foreach ( $singleDepsJson in $multipleDepsJson )
+    {
+
+        $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
+        $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
+
+        $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
+            $_.Name -match "runtimepack.*Runtime"
+        };
+
+        $runtimeList | ForEach-Object {
+            $_.Value.PSObject.Properties.Value | ForEach-Object {
+                $fileExclusionList += $_.PSObject.Properties.Name
+            }
+        }
+    }
+}
+
+$fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
+
+if ($isLauncherPlugin -eq $True) {
+    $fileInclusionList += @("*.deps.json")
+    $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
+}
+
+$fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
+
+$fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
+
+Set-Content -Path $wxsFilePath -Value $fileWxs

installer/PowerToysSetup/publish.cmd

@@ -22,3 +22,5 @@ msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvid
 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

@@ -6,6 +6,7 @@
 #include <spdlog/sinks/base_sink.h>
 
 #include "../../src/common/logger/logger.h"
+#include "../../src/common/utils/gpo.h"
 #include "../../src/common/utils/MsiUtils.h"
 #include "../../src/common/utils/modulesRegistry.h"
 #include "../../src/common/updating/installer.h"
@@ -34,24 +35,6 @@ const DWORD USERNAME_LEN = UNLEN + 1; // User Name + '\0'
 static const wchar_t* POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
 static const wchar_t* POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
 
-struct WcaSink : spdlog::sinks::base_sink<std::mutex>
-{
-    virtual void sink_it_(const spdlog::details::log_msg& msg) override
-    {
-        WcaLog(LOGMSG_STANDARD, msg.payload.data());
-    }
-    virtual void flush_() override
-    {
-        // we don't need to flush wca log manually
-    }
-};
-
-void initSystemLogger()
-{
-    static std::once_flag initLoggerFlag;
-    std::call_once(initLoggerFlag, []() { Logger::init(std::vector<spdlog::sink_ptr>{ std::make_shared<WcaSink>() }); });
-}
-
 HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring& installationDir)
 {
     DWORD len = 0;
@@ -68,9 +51,35 @@ HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring& installationDir)
 LExit:
     return hr;
 }
+
+UINT __stdcall CheckGPOCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+
+    hr = WcaInitialize(hInstall, "CheckGPOCA");
+    ExitOnFailure(hr, "Failed to initialize");
+
+    LPWSTR currentScope = nullptr;
+    hr = WcaGetProperty(L"InstallScope", &currentScope);
+
+    if (std::wstring{ currentScope } == L"perUser")
+    {
+        if (powertoys_gpo::getDisablePerUserInstallationValue() == powertoys_gpo::gpo_rule_configured_enabled)
+        {
+            PMSIHANDLE hRecord = MsiCreateRecord(0);
+            MsiRecordSetString(hRecord, 0, TEXT("The system administrator has disabled per-user installation."));
+            MsiProcessMessage(hInstall, static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_ERROR + MB_OK), hRecord);
+            hr = E_ABORT;
+        }
+    }
+
+LExit:
+    UINT er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
 {
-    initSystemLogger();
     HRESULT hr = S_OK;
     UINT er = ERROR_SUCCESS;
     std::wstring installationFolder;
@@ -85,14 +94,14 @@ UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
     {
         if (!changeSet.apply())
         {
-            WcaLog(LOGMSG_STANDARD, "Couldn't apply registry changeSet");
+            Logger::error(L"Couldn't apply registry changeSet");
             failedToApply = true;
         }
     }
 
     if (!failedToApply)
     {
-        WcaLog(LOGMSG_STANDARD, "All registry changeSets applied successfully");
+        Logger::info(L"All registry changeSets applied successfully");
     }
 LExit:
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
@@ -101,7 +110,6 @@ LExit:
 
 UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
 {
-    initSystemLogger();
     HRESULT hr = S_OK;
     UINT er = ERROR_SUCCESS;
     std::wstring installationFolder;
@@ -115,6 +123,8 @@ UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
         changeSet.unApply();
     }
 
+    SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
+
     ExitOnFailure(hr, "Failed to extract msix");
 
 LExit:
@@ -131,14 +141,14 @@ UINT __stdcall InstallEmbeddedMSIXCA(MSIHANDLE hInstall)
 
     if (auto msix = RcResource::create(IDR_BIN_MSIX_HELLO_PACKAGE, L"BIN", DLL_HANDLE))
     {
-        WcaLog(LOGMSG_STANDARD, "Extracted MSIX");
+        Logger::info(L"Extracted MSIX");
         // TODO: Use to activate embedded MSIX
         const auto msix_path = std::filesystem::temp_directory_path() / "hello_package.msix";
         if (!msix->saveAsFile(msix_path))
         {
             ExitOnFailure(hr, "Failed to save msix");
         }
-        WcaLog(LOGMSG_STANDARD, "Saved MSIX");
+        Logger::info(L"Saved MSIX");
         using namespace winrt::Windows::Management::Deployment;
         using namespace winrt::Windows::Foundation;
 
@@ -150,7 +160,7 @@ UINT __stdcall InstallEmbeddedMSIXCA(MSIHANDLE hInstall)
             ExitOnFailure(hr, "Failed to AddPackage");
         }
 
-        WcaLog(LOGMSG_STANDARD, "MSIX[s] were installed!");
+        Logger::info(L"MSIX[s] were installed!");
     }
     else
     {
@@ -181,11 +191,11 @@ UINT __stdcall UninstallEmbeddedMSIXCA(MSIHANDLE hInstall)
         auto result = pm.RemovePackageAsync(p.Id().FullName()).get();
         if (result)
         {
-            WcaLog(LOGMSG_STANDARD, "MSIX was uninstalled!");
+            Logger::info(L"MSIX was uninstalled!");
         }
         else
         {
-            WcaLog(LOGMSG_STANDARD, "Couldn't uninstall MSIX!");
+            Logger::error(L"Couldn't uninstall MSIX!");
         }
     }
 
@@ -194,6 +204,69 @@ LExit:
     return WcaFinalize(er);
 }
 
+UINT __stdcall RemoveWindowsServiceByName(std::wstring serviceName)
+{
+    SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+
+    if (!hSCManager)
+    {
+        return ERROR_INSTALL_FAILURE;
+    }
+
+    SC_HANDLE hService = OpenService(hSCManager, serviceName.c_str(), SERVICE_STOP | DELETE);
+    if (!hService)
+    {
+        CloseServiceHandle(hSCManager);
+        return ERROR_INSTALL_FAILURE;
+    }
+
+    SERVICE_STATUS ss;
+    if (ControlService(hService, SERVICE_CONTROL_STOP, &ss))
+    {
+        Sleep(1000);
+        while (QueryServiceStatus(hService, &ss))
+        {
+            if (ss.dwCurrentState == SERVICE_STOP_PENDING)
+            {
+                Sleep(1000);
+            }
+            else
+            {
+                break;
+            }
+        }
+    }
+
+    BOOL deleteResult = DeleteService(hService);
+    CloseServiceHandle(hService);
+    CloseServiceHandle(hSCManager);
+
+    if (!deleteResult)
+    {
+        return ERROR_INSTALL_FAILURE;
+    }
+
+    return ERROR_SUCCESS;
+}
+
+
+
+UINT __stdcall UninstallServicesCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    hr = WcaInitialize(hInstall, "CreateScheduledTaskCA");
+
+    ExitOnFailure(hr, "Failed to initialize");
+
+    hr = RemoveWindowsServiceByName(L"PowerToys.MWB.Service");
+
+LExit:
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    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:
@@ -227,7 +300,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "CreateScheduledTaskCA");
     ExitOnFailure(hr, "Failed to initialize");
 
-    WcaLog(LOGMSG_STANDARD, "Initialized.");
+    Logger::info(L"CreateScheduledTaskCA Initialized.");
 
     // ------------------------------------------------------
     // Get the Domain/Username for the trigger.
@@ -246,7 +319,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     wcscat_s(username_domain, L"\\");
     wcscat_s(username_domain, username);
 
-    WcaLog(LOGMSG_STANDARD, "Current user detected: %ls", username_domain);
+    Logger::info(L"Current user detected: {}", username_domain);
 
     // Task Name.
     wstrTaskName = L"Autorun for ";
@@ -261,10 +334,10 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     // ------------------------------------------------------
     // Create an instance of the Task Service.
     hr = CoCreateInstance(CLSID_TaskScheduler,
-                          nullptr,
-                          CLSCTX_INPROC_SERVER,
-                          IID_ITaskService,
-                          (void**)&pService);
+        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.
@@ -286,7 +359,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
             pRootFolder->Release();
             ExitOnFailure(hr, "Cannot create PowerToys task folder: %x", hr);
         }
-        WcaLog(LOGMSG_STANDARD, "PowerToys task folder created.");
+        Logger::info(L"PowerToys task folder created.");
     }
 
     // If the same task exists, remove it.
@@ -316,6 +389,8 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     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.
@@ -334,7 +409,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     hr = pLogonTrigger->put_Id(_bstr_t(L"Trigger1"));
     if (FAILED(hr))
     {
-        WcaLogError(hr, "Cannot put the trigger ID: %x", hr);
+        Logger::error(L"Cannot put the trigger ID: {}", hr);
     }
 
     // Timing issues may make explorer not be started when the task runs.
@@ -342,7 +417,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     hr = pLogonTrigger->put_Delay(_bstr_t(L"PT03S"));
     if (FAILED(hr))
     {
-        WcaLogError(hr, "Cannot put the trigger delay: %x", hr);
+        Logger::error(L"Cannot put the trigger delay: {}", hr);
     }
 
     // Define the user. The task will execute when the user logs on.
@@ -383,19 +458,19 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
     hr = pPrincipal->put_Id(_bstr_t(L"Principal1"));
     if (FAILED(hr))
     {
-        WcaLogError(hr, "Cannot put the principal ID: %x", hr);
+        Logger::error(L"Cannot put the principal ID: {}", hr);
     }
 
     hr = pPrincipal->put_UserId(_bstr_t(username_domain));
     if (FAILED(hr))
     {
-        WcaLogError(hr, "Cannot put principal user Id: %x", hr);
+        Logger::error(L"Cannot put principal user Id: {}", hr);
     }
 
     hr = pPrincipal->put_LogonType(TASK_LOGON_INTERACTIVE_TOKEN);
     if (FAILED(hr))
     {
-        WcaLogError(hr, "Cannot put principal logon type: %x", hr);
+        Logger::error(L"Cannot put principal logon type: {}", hr);
     }
 
     // Run the task with the highest available privileges.
@@ -419,7 +494,7 @@ UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall)
         ExitOnFailure(hr, "Error saving the Task : %x", hr);
     }
 
-    WcaLog(LOGMSG_STANDARD, "Scheduled task created for the current user.");
+    Logger::info(L"Scheduled task created for the current user.");
 
 LExit:
     ReleaseStr(wszExecutablePath);
@@ -480,17 +555,17 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "RemoveScheduledTasksCA");
     ExitOnFailure(hr, "Failed to initialize");
 
-    WcaLog(LOGMSG_STANDARD, "Initialized.");
+    Logger::info(L"RemoveScheduledTasksCA Initialized.");
 
     // 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,
-                          (void**)&pService);
+        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.
@@ -503,7 +578,7 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     if (FAILED(hr))
     {
         // Folder doesn't exist. No need to delete anything.
-        WcaLog(LOGMSG_STANDARD, "The PowerToys scheduled task folder wasn't found. Nothing to delete.");
+        Logger::info(L"The PowerToys scheduled task folder wasn't found. Nothing to delete.");
         hr = S_OK;
         ExitFunction();
     }
@@ -529,19 +604,19 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
                 hr = pTaskFolder->DeleteTask(taskName, 0);
                 if (FAILED(hr))
                 {
-                    WcaLogError(hr, "Cannot delete the '%S' task: %x", taskName, hr);
+                    Logger::error(L"Cannot delete the {} task: {}", taskName, hr);
                 }
                 SysFreeString(taskName);
             }
             else
             {
-                WcaLogError(hr, "Cannot get the registered task name: %x", hr);
+                Logger::error(L"Cannot get the registered task name: {}", hr);
             }
             pRegisteredTask->Release();
         }
         else
         {
-            WcaLogError(hr, "Cannot get the registered task item at index=%d: %x", i + 1, hr);
+            Logger::error(L"Cannot get the registered task item at index={}: {}", i + 1, hr);
         }
     }
 
@@ -553,7 +628,7 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     pRootFolder->Release();
     ExitOnFailure(hr, "Cannot delete the PowerToys folder: %x", hr);
 
-    WcaLog(LOGMSG_STANDARD, "Deleted the PowerToys Task Scheduler folder.");
+    Logger::info(L"Deleted the PowerToys Task Scheduler folder.");
 
 LExit:
     if (pService)
@@ -754,9 +829,13 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
     UINT er = ERROR_SUCCESS;
     hr = WcaInitialize(hInstall, "DetectPrevInstallPathCA");
     MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", L"");
+
+    LPWSTR currentScope = nullptr;
+    hr = WcaGetProperty(L"InstallScope", &currentScope);
+
     try
     {
-        if (auto install_path = GetMsiPackageInstalledPath())
+        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{ currentScope } == L"perUser"))
         {
             MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", install_path->data());
         }
@@ -809,7 +888,7 @@ UINT __stdcall CertifyVirtualCameraDriverCA(MSIHANDLE hInstall)
         ExitOnFailure(hr, "Certificate file size not valid", hr);
     }
 
-    pFileContent = (char*)malloc(size);
+    pFileContent = static_cast<char*>(malloc(size));
 
     DWORD sizeread;
     if (!ReadFile(hfile, pFileContent, size, &sizeread, nullptr))
@@ -819,11 +898,11 @@ UINT __stdcall CertifyVirtualCameraDriverCA(MSIHANDLE hInstall)
     }
 
     if (!CertAddEncodedCertificateToStore(hCertStore,
-                                          X509_ASN_ENCODING,
-                                          (const BYTE*)pFileContent,
-                                          size,
-                                          CERT_STORE_ADD_ALWAYS,
-                                          nullptr))
+        X509_ASN_ENCODING,
+        reinterpret_cast<const BYTE*>(pFileContent),
+        size,
+        CERT_STORE_ADD_ALWAYS,
+        nullptr))
     {
         hr = GetLastError();
         ExitOnFailure(hr, "Adding certificate failed", hr);
@@ -1004,6 +1083,8 @@ const std::wstring WinAppSDKConsumers[] =
     L"modules\\MeasureTool",
     L"modules\\FileLocksmith",
     L"modules\\Hosts",
+    L"modules\\RegistryPreview",
+    L"modules\\Peek",
 };
 
 UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall)
@@ -1055,7 +1136,11 @@ const std::wstring PTInteropConsumers[] =
     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)
@@ -1073,12 +1158,12 @@ UINT __stdcall CreatePTInteropHardlinksCA(MSIHANDLE hInstall)
     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: " };
@@ -1099,7 +1184,8 @@ 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;
+        imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir, hostsDir, fileLocksmithDir,
+        mouseJumpDir, registryPreviewDir, peekDir, mwbDir;
 
     hr = WcaInitialize(hInstall, "CreateDotnetRuntimeHardlinksCA");
     ExitOnFailure(hr, "Failed to initialize");
@@ -1120,6 +1206,10 @@ UINT __stdcall CreateDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
     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)
     {
@@ -1136,6 +1226,10 @@ UINT __stdcall CreateDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
         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)
         {
@@ -1149,28 +1243,32 @@ UINT __stdcall CreateDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
 
     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::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;
-      }
+        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:
+LExit:
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
 }
@@ -1253,7 +1351,7 @@ UINT __stdcall DeleteDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
     UINT er = ERROR_SUCCESS;
     std::wstring installationFolder, colorPickerDir, powerOCRDir, launcherDir, fancyZonesDir,
       imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir,
-      hostsDir, fileLocksmithDir;
+      hostsDir, fileLocksmithDir, mouseJumpDir, registryPreviewDir, peekDir, mwbDir;
 
     hr = WcaInitialize(hInstall, "DeleteDotnetRuntimeHardlinksCA");
     ExitOnFailure(hr, "Failed to initialize");
@@ -1273,36 +1371,48 @@ UINT __stdcall DeleteDotnetRuntimeHardlinksCA(MSIHANDLE hInstall)
     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((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((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)
@@ -1336,16 +1446,34 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 9> processesToTerminate = {
+    std::array<std::wstring_view, 27> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.Awake.exe",
         L"PowerToys.FancyZones.exe",
         L"PowerToys.FancyZonesEditor.exe",
         L"PowerToys.FileLocksmithUI.exe",
+        L"PowerToys.MouseJumpUI.exe",
         L"PowerToys.ColorPickerUI.exe",
         L"PowerToys.AlwaysOnTop.exe",
-        L"PowerToys.exe"
+        L"PowerToys.RegistryPreview.exe",
+        L"PowerToys.Hosts.exe",
+        L"PowerToys.PowerRename.exe",
+        L"PowerToys.ImageResizer.exe",
+        L"PowerToys.GcodeThumbnailProvider.exe",
+        L"PowerToys.PdfThumbnailProvider.exe",
+        L"PowerToys.MonacoPreviewHandler.exe",
+        L"PowerToys.MarkdownPreviewHandler.exe",
+        L"PowerToys.StlThumbnailProvider.exe",
+        L"PowerToys.SvgThumbnailProvider.exe",
+        L"PowerToys.GcodePreviewHandler.exe",
+        L"PowerToys.PdfPreviewHandler.exe",
+        L"PowerToys.SvgPreviewHandler.exe",
+        L"PowerToys.Peek.UI.exe",
+        L"PowerToys.MouseWithoutBorders.exe",
+        L"PowerToys.MouseWithoutBordersHelper.exe",
+        L"PowerToys.MouseWithoutBordersService.exe",
+        L"PowerToys.exe",
     };
 
     for (const auto procID : processes)
@@ -1400,6 +1528,20 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
+void initSystemLogger()
+{
+    static std::once_flag initLoggerFlag;
+    std::call_once(initLoggerFlag, []() {
+        WCHAR temp_path[MAX_PATH];
+        auto ret = GetTempPath(MAX_PATH, temp_path);
+
+        if (ret)
+        {
+            Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
+        }
+        });
+}
+
 // DllMain - Initialize and cleanup WiX custom action utils.
 extern "C" BOOL WINAPI DllMain(__in HINSTANCE hInst, __in ULONG ulReason, __in LPVOID)
 {
@@ -1407,6 +1549,7 @@ extern "C" BOOL WINAPI DllMain(__in HINSTANCE hInst, __in ULONG ulReason, __in L
     {
     case DLL_PROCESS_ATTACH:
         WcaGlobalInitialize(hInst);
+        initSystemLogger();
         TraceLoggingRegister(g_hProvider);
         DLL_HANDLE = hInst;
         break;

installer/PowerToysSetupCustomActions/CustomAction.def

@@ -1,6 +1,7 @@
 LIBRARY "PowerToysSetupCustomActions"
 
 EXPORTS
+	CheckGPOCA
 	ApplyModulesRegistryChangeSetsCA
 	CreateScheduledTaskCA
 	CreateWinAppSDKHardlinksCA
@@ -26,4 +27,5 @@ EXPORTS
 	UnApplyModulesRegistryChangeSetsCA
 	UninstallVirtualCameraDriverCA
 	UnRegisterContextMenuPackagesCA
-	UninstallEmbeddedMSIXCA
+	UninstallEmbeddedMSIXCA
+	UninstallServicesCA

installer/PowerToysSetupCustomActions/DepsFilesLists.h

@@ -14,6 +14,7 @@ inline const std::vector<std::wstring> winAppSdkFiles = {
     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",
@@ -34,6 +35,7 @@ inline const std::vector<std::wstring> winAppSdkFiles = {
     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",

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
@@ -33,8 +33,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\obj\</IntDir>
+    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutDir>
+    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutDir>
+    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
+    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <LinkIncremental>true</LinkIncremental>
@@ -47,8 +49,35 @@
     <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\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""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Resources.wxs"" ""$(ProjectDir)..\PowerToysSetup\Resources.wxs.bk""""
+      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"
+      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>
       <Message>Backing up original files and populating .NET and WPF Runtime dependencies </Message>
     </PreBuildEvent>

installer/PowerToysSetupCustomActions/stdafx.h

@@ -8,6 +8,7 @@
 #include <strsafe.h>
 #include <msiquery.h>
 #include <Msi.h>
+#include <shlobj_core.h>
 
 // WiX Header Files:
 #include <wcautil.h>

nuget.config

@@ -1,5 +1,13 @@
 <configuration>
-    <config>
-         <clear />
-    </config>
+	<config>
+		<clear />
+	</config>
+	<packageSourceMapping>
+		<packageSource key="nuget.org">
+			<package pattern="*" />
+		</packageSource>
+		<packageSource key="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json">
+			<package pattern="CommunityToolkit.Labs.*" />
+		</packageSource>
+	</packageSourceMapping>
 </configuration>

src/Update/PowerToys.Update.cpp

@@ -110,7 +110,7 @@ bool InstallNewVersionStage1(fs::path installer)
     {
         // Detect if PT was running
         const auto pt_main_window = FindWindowW(pt_tray_icon_window_class, nullptr);
-        const bool launch_powertoys = pt_main_window != nullptr;
+
         if (pt_main_window != nullptr)
         {
             SendMessageW(pt_main_window, WM_CLOSE, 0, 0);
@@ -119,10 +119,7 @@ bool InstallNewVersionStage1(fs::path installer)
         std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
         arguments += L" \"";
         arguments += installer.c_str();
-        arguments += L"\" \"";
-        arguments += get_module_folderpath();
-        arguments += L"\" ";
-        arguments += launch_powertoys ? UPDATE_STAGE2_RESTART_PT : UPDATE_STAGE2_DONT_START_PT;
+        arguments += L"\"";
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
         sei.lpFile = copy_in_temp->c_str();
@@ -137,7 +134,7 @@ bool InstallNewVersionStage1(fs::path installer)
     }
 }
 
-bool InstallNewVersionStage2(std::wstring installer_path, std::wstring_view install_path, bool launch_powertoys)
+bool InstallNewVersionStage2(std::wstring installer_path)
 {
     std::transform(begin(installer_path), end(installer_path), begin(installer_path), ::towlower);
 
@@ -181,18 +178,6 @@ bool InstallNewVersionStage2(std::wstring installer_path, std::wstring_view inst
         state.state = UpdateState::upToDate;
     });
 
-    if (launch_powertoys)
-    {
-        std::wstring new_pt_path{ install_path };
-        new_pt_path += L"\\PowerToys.exe";
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
-        sei.lpFile = new_pt_path.c_str();
-        sei.nShow = SW_SHOWNORMAL;
-        sei.lpParameters = UPDATE_REPORT_SUCCESS;
-        return ShellExecuteExW(&sei) == TRUE;
-    }
-
     return true;
 }
 
@@ -230,7 +215,7 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     else if (action == UPDATE_NOW_LAUNCH_STAGE2)
     {
         using namespace std::string_view_literals;
-        const bool failed = !InstallNewVersionStage2(args[2], args[3], args[4] == std::wstring_view{ UPDATE_STAGE2_RESTART_PT });
+        const bool failed = !InstallNewVersionStage2(args[2]);
         if (failed)
         {
             UpdateState::store([&](UpdateState& state) {

src/codeAnalysis/GlobalSuppressions.cs

@@ -33,6 +33,7 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Static methods may improve performance but decrease maintainability")]
 [assembly: SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix", Justification = "Renaming everything would be a lot of work. It does not do any harm if an EventHandler delegate ends with the suffix EventHandler. Besides this, the Rule causes some false positives.")]
 [assembly: SuppressMessage("Performance", "CA1838:Avoid 'StringBuilder' parameters for P/Invokes", Justification = "We are not concerned about the performance impact of marshaling a StringBuilder")]
+[assembly: SuppressMessage("Performance", "CA1852:Seal internal types", Justification = "The assembly is getting a ComVisible set to false already.", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]
 
 // Threading suppressions
 [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.Controls.Notification.OnClose")]
@@ -54,3 +55,10 @@ using System.Diagnostics.CodeAnalysis;
 
 // Code quality
 [assembly: SuppressMessage("CodeQuality", "IDE0076:Invalid global 'SuppressMessageAttribute'", Justification = "Affect predefined suppressions.")]
+
+// Dotnet port
+[assembly: SuppressMessage("Design", "CA1069:Enums values should not be duplicated", Justification = "<Dotnet port with style preservation>", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]
+[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "<Dotnet port with style preservation>", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]
+[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "<Dotnet port with style preservation>", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "<Dotnet port with style preservation>", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Dotnet port with style preservation>", Scope="namespaceanddescendants", Target="MouseWithoutBorders")]