Fix for FZ losing layout settings

* Add exception handling to prevent program from failing due to error in one program

* Error handling for program path function

* Fix incorrect log value in ProgramLogger

.gitattributes

@@ -1 +1,15 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+*.cs text eol=crlf
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
 *.rc diff

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,8 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Report errors or unexpected behavior
 title: ''
-labels: ''
+labels: Issue-Bug
 assignees: ''
 
 ---
@@ -12,26 +12,27 @@ assignees: ''
 Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
 -->
 
-# Environment
+## ℹ Computer information
 
-```
-Windows build number: [run "ver" at a command prompt]
-PowerToys version: 
-PowerToy module for which you are reporting the bug (if applicable):
-```
+- PowerToys version: 
+- PowerToy Utility:
+- Running PowerToys as Admin:
+- Windows build number: [run "winver"]
 
-# Steps to reproduce
+## 📝 Provide detailed reproduction steps (if any)
 
-<!-- A description of how to trigger this bug. -->
+1. …
+2. …
+3. …
 
-# Expected behavior
+### ✔️ Expected result
 
-<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->
+_What is the expected result of the above steps?_
 
-# Actual behavior
+### ❌ Actual result
 
-<!-- What's actually happening? -->
+_What is the actual result of the above steps?_
 
-# Screenshots
+## 📷 Screenshots
 
-<!-- If applicable, add screenshots to help explain your problem. -->
+_Are there any useful screenshots? WinKey+Shift+S and then just paste them directly into the form_

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,15 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "\U0001F4F7 VideoConference"
+    url: https://github.com/microsoft/PowerToys/issues/6246
+    about: Report Bug for the VideoConference Power Toy
+  - name: "\U0001F6A8 Microsoft Security Response Center (MSRC)"
+    url: https://msrc.microsoft.com/create-report
+    about: Report security bugs
+  - name: "\U0001F4DA PowerToys user documentation"
+    url: https://github.com/microsoft/PowerToys/wiki
+    about: Documentation for users of PowerToys
+  - name: "\U0001F4DA PowerToys dev documentation"
+    url: https://github.com/microsoft/PowerToys/tree/master/doc/devdocs
+    about: Documentation for people interested in developing for PowerToys
+ 

.github/ISSUE_TEMPLATE/documentation-issue.md

@@ -1,10 +1,14 @@
 ---
-name: Documentation Issue
+name: "\U0001F4DA Documentation Issue"
 about: Report issues in our documentation
 title: ''
-labels: ''
+labels: Issue-Docs
 assignees: ''
 
 ---
 
 <!-- Briefly describe which document needs to be corrected and why. -->
+
+## 📝 Provide a description of requested docs changes
+
+_What is the purpose and what should be changed?_

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,21 +1,16 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
+name: "⭐ Feature request"
+about: Propose something new.
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-# Summary of the new feature/enhancement
+## 📝 Provide a description of the new feature
 
-<!-- 
-A clear and concise description of what the problem is that the new feature would solve.
-Describe why and how a user would use this new functionality (if applicable).
--->
+_What is the expected behavior of the proposed feature?  What is the scenario this would be used?_
 
-# Proposed technical implementation details (optional)
+---
 
-<!-- 
-A clear and concise description of what you want to happen.
--->
+If you'd like to see this feature implemented, add a 👍 reaction to this post.

.github/pull_request_template.md

@@ -1,10 +1,7 @@
-<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
 ## Summary of the Pull Request
 
-<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> 
-## References
+_What is this about?_
 
-<!-- Please review the items on the PR checklist before submitting-->
 ## PR Checklist
 * [ ] Applies to #xxx
 * [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/PowerToys) and sign the CLA
@@ -12,8 +9,10 @@
 * [ ] Requires documentation to be updated
 * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
 
-<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
-## Detailed Description of the Pull Request / Additional comments
+## Info on Pull Request
+
+_What does this include?_
 
-<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
 ## Validation Steps Performed
+
+_How does someone test & validate?_

.gitignore

@@ -340,4 +340,5 @@ src/common/Telemetry/*.etl
 
 # Don't ignore MergeModules
 !**/MergeModules/Release/
-!**/MergeModules/Debug/
+!**/MergeModules/Debug/
+/src/modules/previewpane/SvgThumbnailProvider/$(SolutionDir)$(Platform)/$(Configuration)/modules/FileExplorerPreview/SvgThumbnailProvider.xml

.pipelines/build-bootstrapper.cmd

@@ -0,0 +1,10 @@
+cd /D "%~dp0"
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
+pushd .
+cd ..
+set SolutionDir=%cd%
+popd
+SET IsPipeline=1
+call msbuild ../installer/PowerToysBootstrapper/PowerToysBootstrapper.sln /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1
+

.pipelines/build-localization.cmd

@@ -0,0 +1,29 @@
+@echo off
+rem This script will fail to run unless you have the appropriate permissions
+
+cd /D "%~dp0"
+
+echo Preparing localization build...
+
+setlocal
+
+rem In this sample, the repo root is identical to the script directory path. Adjust the value of the RepoRoot variable accordingly based on your environment.
+rem Again, ensure the RepoRoot variable is set to the real repo root location, otherwise the localization toolset wouldn't work as intended.
+rem Note that the resolved %~dp0 ends with \.
+set RepoRootWithoutBackslash=%~dp0..
+set RepoRoot=%RepoRootWithoutBackslash%\
+set OutDir=%RepoRoot%out
+set NUGET_PACKAGES=%RepoRoot%packages
+set LocalizationXLocPkgVer=2.0.0
+
+echo Running localization build...
+
+set XLocPath=%NUGET_PACKAGES%\Localization.XLoc.%LocalizationXLocPkgVer%
+set LocProjectDirectory=%RepoRootWithoutBackslash%
+
+rem Run the localization tool on all LocProject.json files in the src directory and it's subdirectories (directory format must not end with \)
+dotnet "%XLocPath%\tools\netcore\Microsoft.Localization.XLoc.dll" /f "%LocProjectDirectory%"
+
+echo Localization build finished with exit code '%errorlevel%'.
+
+exit /b %errorlevel%

.pipelines/build.cmd

@@ -1,6 +1,6 @@
 cd /D "%~dp0"
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
-call msbuild ../PowerToys.sln /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1
+call msbuild -m ../PowerToys.sln /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1
 SET PTRoot=..
 call "..\installer\PowerToysSetup\publish.cmd"

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

@@ -1,7 +1,7 @@
 parameters:
   configuration: 'Release'
   platform: ''
-  additionalBuildArguments: '/p:CIBuild=true'
+  additionalBuildArguments: '-m /p:CIBuild=true'
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}
@@ -10,8 +10,10 @@ jobs:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
   pool: { vmImage: windows-2019 }
-
+  timeoutInMinutes: 120
+  strategy:
+    maxParallel: 10
   steps:
   - template: build-powertoys-steps.yml
     parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
+      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}

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

@@ -16,7 +16,7 @@ steps:
   displayName: Ensure VSTest Platform
 
 - task: NuGetCommand@2
-  displayName: Restore NuGet packages
+  displayName: Restore NuGet packages for PowerToys.sln
   inputs:
     command: restore
     feedsToUse: config
@@ -25,7 +25,7 @@ steps:
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
 - task: VSBuild@1
-  displayName: 'Build solution **\PowerToys.sln'
+  displayName: 'Build PowerToys.sln'
   inputs:
     solution: '**\PowerToys.sln'
     vsVersion: 16.0
@@ -34,16 +34,73 @@ steps:
     msbuildArgs: ${{ parameters.additionalBuildArguments }}
     maximumCpuCount: true
 
+- task: NuGetCommand@2
+  displayName: Restore NuGet packages for PowerToysSetup.sln
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: installer\PowerToysSetup.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\installer\packages'
+
+- task: VSBuild@1
+  displayName: 'Build PowerToysSetup.sln'
+  inputs:
+    solution: '**\installer\PowerToysSetup.sln'
+    vsVersion: 16.0
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    maximumCpuCount: true
+
+- task: NuGetCommand@2
+  displayName: Restore NuGet packages for PowerToysBootstrapper.sln
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: installer\PowerToysBootstrapper\PowerToysBootstrapper.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\installer\PowerToysBootstrapper\packages'
+
+- task: VSBuild@1
+  displayName: 'Build PowerToysBootstrapper.sln'
+  inputs:
+    solution: '**\installer\PowerToysBootstrapper\PowerToysBootstrapper.sln'
+    vsVersion: 16.0
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    msbuildArgs: ${{ parameters.additionalBuildArguments }}
+    maximumCpuCount: true
+
+
+# directly not doing WinAppDriver testing
 - task: VSTest@2
+  displayName: 'Run .Net Core Tests'
   inputs:
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
     testSelector: 'testAssemblies'
     testAssemblyVer2: |
-      **\PreviewPaneUnitTests.dll
-      **\UnitTests-SvgPreviewHandler.dll
-      **\UnitTests-PreviewHandlerCommon.dll
-      **\powerpreviewTest.dll
-      **\UnitTests-CommonLib.dll
-      !**\*TestAdapter.dll
+      **\Microsoft.Plugin.Program.UnitTests.dll
+      **\Microsoft.Plugin.Calculator.UnitTest.dll
+      **\Microsoft.Plugin.Uri.UnitTests.dll
+      **\Wox.Test.dll
+      **\*Microsoft.PowerToys.Settings.UI.UnitTests.dll
       !**\obj\**
+# .NetFramework assemblies
+- task: VSTest@2
+  displayName: 'Run .Net Framework Tests'
+  inputs:
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    testSelector: 'testAssemblies'
+    testAssemblyVer2: |
+      **\ImageResizer.Test.dll
+      **\KeyboardManagerTest.dll
+      **\UnitTests-CommonLib.dll
+      **\PreviewPaneUnitTests.dll #this is the markdown tests
+      **\UnitTests-PreviewHandlerCommon.dll
+      **\UnitTests-SvgPreviewHandler.dll
+      **\powerpreviewTest.dll
+      !**\obj\**
+#      **\PowerRenameUnitTests.dll

.pipelines/pipeline.user.windows.yml

@@ -20,6 +20,7 @@ package_sources:
   nuget:
     feeds:
       'Nuget': 'https://api.nuget.org/v3/index.json'
+      'Toolset': 'https://msazure.pkgs.visualstudio.com/_packaging/Toolset/nuget/v3/index.json'
       'PipelineBuildSupplement': 'https://msazure.pkgs.visualstudio.com/_packaging/PipelineBuildSupplement/nuget/v3/index.json'
 
 restore:
@@ -33,6 +34,9 @@ restore:
     - !!defaultcommand
       name: 'Restore Installer'
       command: '.pipelines\restore-installer.cmd'
+    - !!defaultcommand
+      name: 'Restore Localization packages'
+      command: '.pipelines\restore-localization.cmd'
 
 
 build:
@@ -50,6 +54,8 @@ build:
           to: 'Build_Output'
           include:
             - 'action_runner.exe'
+            - 'modules\ColorPicker\ColorPicker.dll'
+            - 'modules\ColorPicker\ColorPicker.exe'
             - 'modules\ImageResizer\ar\ImageResizer.resources.dll'
             - 'modules\ImageResizer\bg\ImageResizer.resources.dll'
             - 'modules\ImageResizer\ca\ImageResizer.resources.dll'
@@ -75,6 +81,7 @@ build:
             - 'modules\FileExplorerPreview\powerpreview.dll'
             - 'modules\FileExplorerPreview\PreviewHandlerCommon.dll'
             - 'modules\FileExplorerPreview\SvgPreviewHandler.dll'
+            - 'modules\FileExplorerPreview\SVGThumbnailProvider.dll'
             - 'modules\ImageResizer\ImageResizer.exe'
             - 'modules\ImageResizer\ImageResizerExt.dll'
             - 'modules\KeyboardManager\KeyboardManager.dll'
@@ -132,6 +139,29 @@ build:
             - 'PowerToysSetup-*.msi'
           signing_options:
             sign_inline: true  # This does signing a soon as this command completes
+    - !!buildcommand
+      name: 'Build Power Toys Bootstrapper'
+      command: '.pipelines\build-bootstrapper.cmd'
+      artifacts:
+        - to: 'Symbols'
+          include:
+            - 'installer\PowerToysBootstrapper\x64\Release\PowerToysSetup-*.pdb'
+        - from: 'installer\PowerToysBootstrapper\x64\Release'
+          to: 'Build_Installer_Output'
+          include:
+            - 'PowerToysSetup-*.exe'
+          signing_options:
+            sign_inline: true  # This does signing a soon as this command completes
+    # Localize the files after the build procedure to avoid existing localized files from getting overwritten. To be moved before the Build PowerToys step once the lcl files have been checked in. Tracked at https://github.com/microsoft/PowerToys/issues/6046
+    - !!buildcommand
+      name: 'Localize Power Toys'
+      command: '.pipelines\build-localization.cmd'
+      artifacts:
+        - from: 'out\loc'
+          to: 'loc'
+          include:
+            - '**/*'
+
 
 #package:
 #  commands:

.pipelines/restore-localization.cmd

@@ -0,0 +1,32 @@
+@echo off
+
+cd /D "%~dp0"
+
+echo Installing nuget packages
+
+setlocal
+
+rem In this sample, the repo root is identical to the script directory path. Adjust the value of the RepoRoot variable accordingly based on your environment.
+rem Again, ensure the RepoRoot variable is set to the real repo root location, otherwise the localization toolset wouldn't work as intended.
+rem Note that the resolved %~dp0 ends with \.
+set RepoRoot=%~dp0..\
+set OutDir=%RepoRoot%out
+set NUGET_PACKAGES=%RepoRoot%packages
+set LocalizationXLocPkgVer=2.0.0
+
+nuget install Localization.XLoc -Version %LocalizationXLocPkgVer% -OutputDirectory "%NUGET_PACKAGES%" -NonInteractive -Verbosity detailed
+if "%errorlevel%" neq "0" (
+    exit /b %errorlevel%
+)
+
+nuget install LSBuild.XLoc -OutputDirectory "%NUGET_PACKAGES%" -NonInteractive -Verbosity detailed
+if "%errorlevel%" neq "0" (
+    exit /b %errorlevel%
+)
+
+nuget install Localization.Languages -OutputDirectory "%NUGET_PACKAGES%" -NonInteractive -Verbosity detailed
+if "%errorlevel%" neq "0" (
+    exit /b %errorlevel%
+)
+
+exit /b %errorlevel%

NOTICE.md

@@ -1,6 +1,34 @@
 # NOTICES AND INFORMATION
 This software incorporates material from third parties.
 
+## PowerToy: Color Picker
+
+### Martin Chrzan's Color Picker
+
+**Source**: https://github.com/martinchrzan/ColorPicker
+
+MIT License
+
+Copyright (c) 2020 martinchrzan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ## PowerToy: ImageResizer
 
 ### Brice Lams's Image Resizer License

README.md

@@ -8,75 +8,96 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 ## Build status
 
-[![Build Status](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=master)](https://dev.azure.com/ms/PowerToys/_build?definitionId=219)
+| Branch | Status x64 |
+|---|---|
+| Master | [![Build Status for Master](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=master)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=master) |
+| Stable | [![Build Status for Stable](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=stable)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=stable) |
+| Installer | [![Build Status for Installer](https://github-private.visualstudio.com/microsoft/_apis/build/status/CDPX/powertoys/powertoys-Windows-Official-master-Test?branchName=master)](https://github-private.visualstudio.com/microsoft/_build/latest?definitionId=61&branchName=master) | 
 
 ## Current PowerToy Utilities
 
+### Color Picker
+
+[<img align="left" src="https://aka.ms/powerToysColorPickerImageSmall" />](https://aka.ms/PowerToysOverview_ColorPicker) [ColorPicker](https://aka.ms/PowerToysOverview_ColorPicker) is a simple and quick system-wide color picker with <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>C</kbd>. Color Picker allows to pick colors from any currently running application and automatically copies the HEX or RGB values to your clipboard. This code is based on [Martin Chrzan's Color Picker](https://github.com/martinchrzan/ColorPicker).
+<br/>
+<br/>
+<br/>
+
 ### FancyZones
 
-[<img align="left" src="./doc/images/overview/FancyZones_small.png" />](https://aka.ms/PowerToysOverview_FancyZones) [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) is a window manager that makes it easy to create complex window layouts and quickly position windows into those layouts.
-<br>
-<br>
-<br>
-<br>
-<br>
+[<img align="left" src="https://aka.ms/powerToysFancyZoneImageSmall" />](https://aka.ms/PowerToysOverview_FancyZones) [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) is a window manager that makes it easy to create complex window layouts and quickly position windows into those layouts.
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
 
-### File Explorer Add-ons (Preview Panes)
+### File Explorer Add-ons
 
-[<img align="left" src="./doc/images/overview/PowerPreview_small.PNG" />](https://aka.ms/PowerToysOverview_FileExplorerAddOns) [File Explorer](https://aka.ms/PowerToysOverview_FileExplorerAddOns) add-ons right now are just limited to Preview Pane additions for File Explorer. Preview Pane is an existing feature in the File Explorer.  To enable it, you just click the View tab in the ribbon and then click "Preview Pane".
+[<img align="left" src="https://aka.ms/powerToysPowerPreviewImageSmall" />](https://aka.ms/PowerToysOverview_FileExplorerAddOns) [File Explorer](https://aka.ms/PowerToysOverview_FileExplorerAddOns) add-ons will enable SVG icon rendering and Preview Pane additions for File Explorer. 
 
-PowerToys will now enable two types of files to be previewed: Markdown (.md) & SVG (.svg)
-<br>
-<br>
+Preview Pane is an existing feature in the File Explorer.  To enable it, you just click the View tab in the ribbon and then click "Preview Pane". PowerToys will now enable two types of files to be previewed: Markdown (.md) & SVG (.svg)
+<br/>
+<br/>
 
 ### Image Resizer
 
-[<img align="left" src="./doc/images/overview/ImageResizer_small.png" />](https://aka.ms/PowerToysOverview_ImageResizer) [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) is a Windows Shell Extension for quickly resizing images.  With a simple right click from File Explorer, resize one or many images instantly. This code is based on [Brice Lambson's Image Resizer](https://github.com/bricelam/ImageResizer).
-<br>
-<br>
-<br>
-<br>
+[<img align="left" src="https://aka.ms/powerToysImageResizerImageSmall" />](https://aka.ms/PowerToysOverview_ImageResizer) [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) is a Windows Shell Extension for quickly resizing images.  With a simple right click from File Explorer, resize one or many images instantly. This code is based on [Brice Lambson's Image Resizer](https://github.com/bricelam/ImageResizer).
+<br/>
+<br/>
+<br/>
+<br/>
 
 ### Keyboard Manager
 
-[<img align="left" src="./doc/images/overview/KBM_small.png" />](https://aka.ms/PowerToysOverview_KeyboardManager) [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) allows you to customize the keyboard to be more productive by remapping keys and creating your own keyboard shortcuts. This PowerToy requires Windows 10 1903 (build 18362) or later.
-<br>
-<br>
-<br>
-<br>
+[<img align="left" src="https://aka.ms/powerToysKBMImageSmall" />](https://aka.ms/PowerToysOverview_KeyboardManager) [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) allows you to customize the keyboard to be more productive by remapping keys and creating your own keyboard shortcuts. This PowerToy requires Windows 10 1903 (build 18362) or later.
+<br/>
+<br/>
+<br/>
+<br/>
 
 ### PowerRename
 
-[<img align="left" src="./doc/images/overview/PowerRename_small.PNG" />](https://aka.ms/PowerToysOverview_PowerRename) [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) is a Windows Shell Extension for advanced bulk renaming using search and replace or regular expressions. PowerRename allows simple search and replace or more advanced regular expression matching. While you type in the search and replace input fields, the preview area will show what the items will be renamed to. PowerRename then calls into the Windows Explorer file operations engine to perform the rename. This has the benefit of allowing the rename operation to be undone after PowerRename exits. This code is based on [Chris Davis's SmartRename](https://github.com/chrdavis/SmartRename).
-<br>
+[<img align="left" src="https://aka.ms/powerToysPowerRenameImageSmall" />](https://aka.ms/PowerToysOverview_PowerRename) [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) is a Windows Shell Extension for advanced bulk renaming using search and replace or regular expressions. PowerRename allows simple search and replace or more advanced regular expression matching. While you type in the search and replace input fields, the preview area will show what the items will be renamed to. PowerRename then calls into the Windows Explorer file operations engine to perform the rename. This has the benefit of allowing the rename operation to be undone after PowerRename exits. This code is based on [Chris Davis's SmartRename](https://github.com/chrdavis/SmartRename).
+<br/>
 
 ### PowerToys Run
 
-[<img align="left" src="./doc/images/overview/PowerLauncher_small.png" />](https://aka.ms/PowerToysOverview_PowerToysRun) [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) is a new toy in PowerToys that can help you search and launch your app instantly with a simple alt-space and start typing! It is open source and modular for additional plugins.  Window Walker is now inside too! This PowerToy requires Windows 10 1903 (build 18362) or later.
-<br>
-<br>
-<br>
+[<img align="left" src="https://aka.ms/powerToysPowerLauncherImageSmall" />](https://aka.ms/PowerToysOverview_PowerToysRun) [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) is a new toy in PowerToys that can help you search and launch your app instantly with a simple <kbd>Alt</kbd>+<kbd>Space</kbd> and start typing! It is open source and modular for additional plugins.  Window Walker is now inside too! This PowerToy requires Windows 10 1903 (build 18362) or later.
+<br/>
+<br/>
+<br/>
 
 ### Shortcut Guide
 
-[<img align="left" src="./doc/images/overview/Shortcut guide_small.png" />](https://aka.ms/PowerToysOverview_ShortcutGuide)  [Windows key shortcut guide](https://aka.ms/PowerToysOverview_ShortcutGuide) appears when a user holds the Windows key down for more than one second and shows the available shortcuts for the current state of the desktop.
-<br>
-<br>
-<br>
-<br>
-<br>
+[<img align="left" src="https://aka.ms/powerToysShortcutGuideImageSmall" />](https://aka.ms/PowerToysOverview_ShortcutGuide)  [Windows key shortcut guide](https://aka.ms/PowerToysOverview_ShortcutGuide) appears when a user holds the Windows key down for more than one second and shows the available shortcuts for the current state of the desktop.
+<br/>
+<br/>
+<br/>
+<br/>
+
+### Video Conference Mute (Experimental)
+
+[<img align="left" src="https://aka.ms/powerToysVideoConferenceImageSmall" />](https://aka.ms/PowerToysOverview_VideoConference)  [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) is a quick and easy way to do a global "mute" of both your microphone and webcam via <kbd>Win</kbd>+<kbd>N</kbd>. Just set your webcam in the target application to the PowerToys VideoConference camera.
+
+**Note:** This is only included in the [pre-release version of PowerToys installer][github-prerelease-link]. This PowerToy requires Windows 10 1903 (build 18362) or later.
+<br/>
+<br/>
+<br/>
 
 ## Installing and running Microsoft PowerToys
 
-**Requirements**
+#### Requirements
 - Windows 10 1803 (build 17134) or later.
-- Have [.NET Core 3.1 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-desktop-3.1.4-windows-x64-installer). The installer will prompt this but we want to directly make people aware.
+- Have [.NET Core 3.1 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-desktop-3.1.4-windows-x64-installer). The installer should handle this but we want to directly make people aware.
 
-### Via Github with MSI [Recommended]
+#### 0.18 users for updating via notifications
 
-Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.18.2-x64.msi` to download the PowerToys installer.
+- We adjusted how upgrading works in 0.20.  In 0.19 we accounted for this upcoming change but if you are going from 0.18 to 0.21, please directly use the installer file.
 
-**Note:** After installing, you will have to start PowerToys for the first time.  We will improve install experience this moving forward but due to a possible install dependency, we can't start after install currently.
+### Via GitHub with EXE [Recommended]
+
+Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.21.1-x64.exe` to download the PowerToys installer.
 
 This is our preferred method.
 
@@ -89,26 +110,11 @@ WinGet install powertoys
 
 ### Other install methods
 
-#### Via Chocolatey (Unofficial)
-
-Download and upgrade PowerToys from [Chocolatey](https://chocolatey.org). If you have any issues when installing/upgrading the package please go to the [package page](https://chocolatey.org/packages/powertoys) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
-
-To install PowerToys, run the following command from the command line / PowerShell:
-
-```powershell
-choco install powertoys
-```
-
-To upgrade PowerToys, run the following command from the command line / PowerShell:
-
-```powershell
-choco upgrade powertoys
-```
+There are [community driven install methods](./doc/unofficalInstallMethods.md) such as Chocolatey and Scoop.  If these are your perferred install solutions, this will have the install instructions.
 
 ### Known issues
 
-- [#2012 - Uninstalling with old control panel fails](https://github.com/microsoft/PowerToys/issues/2012): Please use the modern settings to uninstall. `Windows 10 Settings -> Apps -> Apps & features`
-- [#3384 - PowerToys Settings window is empty](https://github.com/microsoft/PowerToys/issues/3384): Workaround appears to be run as admin.  We are proactively looking into this as a hotfix.
+- Color Picker at times won't work when PT is running elevated - [#5348](https://github.com/microsoft/PowerToys/issues/5348).  We are currently working on a fix now for this.
 
 ### Processor support
 
@@ -120,30 +126,83 @@ We currently support the matrix below.
 
 ## What's Happening
 
-### May 2020 Update
+### August 2020 Update
 
-Our goals for 0.18 release cycle was three big items, PowerToys Run, Keyboard manager, and migrating to the new settings system.  This is also the first time we'll test out the auto-updating system.
+Our goals for 0.21 release cycle was to focus on stability, localization and quality of life improvements for both the development team and our end users. 
 
-Feedback is critical. We know there are areas for improvement on PT Run. We would love feedback so we can improve. We also would love to know if you want us to be more aggressive on auto-upgrading.
+One of the longer term goal items we have made progress on is the Out of Box experience / initial onboarding experience (OOBE) improvements.[@Niels9001](https://github.com/niels9001/) created a [wicked awesome proof of concept of what the OOBE experience could be](https://github.com/microsoft/PowerToys/issues/1285#issuecomment-679268558).  We are pretty stoked about this since it handles one an important item, critical shortcut default adjustments.
 
-- We shipped [v0.18][github-release-link]!
-- New Utilities
-   - PowerToys Run, our new application launcher (use alt-space to activate)
-   - Keyboard manager, a quick easy way to remap your keyboard
-- Fixed [#243](https://github.com/microsoft/PowerToys/issues/243)'s setting issue
-- Improved performance on FancyZones [#1264](https://github.com/microsoft/PowerToys/issues/1264)
-- Lots of bug fixes!
+#### Highlights from August
 
-For [0.19](https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F4), we are proactively working on:
+- We shipped [v0.21][github-release-link]!
+- [Video conference muting first public release][vidConfOverview]
 
-- Enable PT Run to be mapped to Win-Keys
-- Stability / tech debt fixes
-- Performance improvements with FancyZones
-- A testing utility for FancyZones to be sure we can test different window configurations.
+**PT Run:**
+- Removed need for space in action keywords.  This means you now can type `>ipconfig`
+- Icon caches fixed and now has colored icons
+- Improved font rendering via ClearType (Shout out to [@AnuthaDev](https://github.com/AnuthaDev) doing the heavy lifting here)
+- Result speed improvements
+- URLs are supported 
+- Fixed bugs including calculating bugs
 
-### Version 1.0 plan
+**FancyZone:**
+- <kbd>Win</kbd>+<kbd>Arrow key</kbd> is directional based on zone rect
+- Fixed bugs
 
-Our plan for all the [goals and utilities for v1.0 detailed over here in the wiki][v1].
+**Runner:**
+- Fixed toast notifications running elevated from non-admin account
+
+**Shortcut Guide:**
+- Improved vkey catching which will fix some use cases of it not showing up
+
+**SVG in File Explorer:**
+- Embedded image tags will now render in Explorer
+
+**Color Picker:**
+- Fixed bug where it would launch via false positive keystrokes
+
+**Accessibility:**
+- Settings, PT Run and KBM undergoing improvements
+
+**Localization:**
+- Pipeline is now setup and will be doing a full E2E pass on all utilities shortly.
+
+**Dev quality of life improvements:**
+- Continued warning count reduction. This release ~80 removed
+- StyleCop enabled E2E
+- FxCop starting to be added in E2E
+
+#### New experiential PowerToys utility - Video conference muting:
+
+**Note:** This is only included in the [pre-release version of PowerToys installer][github-prerelease-link]. This PowerToy requires Windows 10 1903 (build 18362) or later.
+
+Back in the June timeframe, we started prototyping an idea. With COVID-19, we're all multi-tasking and trying to make the best of everything and being able to quickly mute while on a conference call is critical regardless of where you are on your computer and what application has focus.
+
+The utility will mute not just your audio but your video as well with a single keystroke.  You can do audio, video both.  We knew this would impact our roadmap and goals but felt extremely strong that this is the right decision. We're all multi-tasking and trying to make the best of everything and being able to quickly mute while on a conference call is critical regardless of where you are on your computer.
+
+We know we have some issues and we have a [master tracking issue - #6246](https://github.com/microsoft/PowerToys/issues/6246). We know a certain laptops currently the video forwarding does not work and are proactively working on fixing this.
+
+To use:
+
+- Set your camera to the PowerToys Video driver in the target application
+- <kbd>Win</kbd>+<kbd>N</kbd> to toggle both Audio and Video at the same time
+- <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> to toggle video
+- <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>A</kbd> to toggle microphone
+
+For a more information, head over to the [Video conference mute overview][vidConfOverview]
+
+### What is being planned for 0.23
+
+For [0.23](https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F12), we are proactively working on:
+
+- Stability
+- Localization
+- Improve interactions with elevated windows and keeping most of the PT utilities non-elevated so we still have a 'shell' like experience
+- OOBE work
+
+### PowerToys roadmap
+
+Our [prioritized roadmap][roadmap] of features and utilites that the core team is focusing on..
 
 ## Developer Guidance
 
@@ -174,5 +233,7 @@ The application logs basic telemetry. Our Telemetry Data page (Coming Soon) has
 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md
 [github-release-link]: https://github.com/microsoft/PowerToys/releases/
-[v1]: https://github.com/microsoft/PowerToys/wiki/Version-1.0-Strategy
+[github-prerelease-link]: https://github.com/microsoft/PowerToys/releases/tag/v0.22.0-Experimental
+[roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacyLink]: http://go.microsoft.com/fwlink/?LinkId=521839
+[vidConfOverview]: https://aka.ms/PowerToysOverview_VideoConference

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.2 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [many more](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [definition](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

community.md

@@ -14,6 +14,9 @@ Niels has helped drive large sums of our update toward a new [consistent and mod
 
 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.
 
+### [@royvou](https://github.com/royvou)
+Roy has helped out contributing a features to PowerToys Run
+
 ## Open source projects
 
 As PowerToys creates new utilities, some will be based off existing technology. We'll continue to do our best to contribute back to these projects but their efforts were the base of some of our projects. We want to be sure their work is directly recognized.
@@ -44,4 +47,19 @@ Image Resizer is from Brice.
 
 ### [@chrdavis](https://github.com/chrdavis/) - Chris Davis
 
-PowerRename is from Chris's SmartRename.
+PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Explorer
+
+### [@martinchrzan](https://github.com/martinchrzan/) - Martin Chrzan
+
+Color Picker is from Martin.
+
+<!--
+@alekhyareddy28 
+@jyuwono 
+@laviusmotileng-ms 
+@ryanbodrug-microsoft 
+@saahmedm
+@somil55
+@traies 
+@udit3333
+-->

contributing.md

@@ -121,6 +121,12 @@ When you'd like the team to take a look, (even if the work is not yet fully-comp
 
 Once your code has been reviewed and approved by the requisite number of team members, it will be merged into the master branch. Once merged, your PR will be automatically closed.
 
+### How can I become a collaborateur on the PowerToys team
+
+Be a great community member. Just help out a lot and make useful additions, filing bugs/suggestions, help develop fixes and features, code reviews, and always, docs. Lets continue to make the PowerToys repository a great spot to learn and make a great set of utilities.
+
+When the time comes, Microsoft will reach out and help make you a formal team member. Just make sure they can reach out to you :)
+
 ---
 
 ## Thank you

doc/devdocs/modules/interface.md

@@ -11,9 +11,6 @@ public:
   virtual void enable() = 0;
   virtual void disable() = 0;
   virtual bool is_enabled() = 0;
-  virtual intptr_t signal_event(const wchar_t* name, intptr_t data) = 0;
-  virtual void register_system_menu_helper(PowertoySystemMenuIface* helper) = 0;
-  virtual void signal_system_menu_action(const wchar_t* name) = 0;
   virtual void destroy() = 0;
 };
 
@@ -28,7 +25,6 @@ The PowerToys runner will, for each PowerToy DLL:
 
 On the received object, the runner will call:
   - [`get_name()`](#get_name) to get the name of the PowerToy,
-  - [`get_events()`](#get_events) to get the list of the events the PowerToy wants to subscribe to,
   - [`enable()`](#enable) to initialize the PowerToy.
 
 While running, the runner might call the following methods between create_powertoy()
@@ -37,9 +33,6 @@ and destroy():
   - [`get_config()`](#get_config) to get the available configuration settings,
   - [`set_config()`](#set_config) to set settings after they have been edited in the Settings editor,
   - [`call_custom_action()`](#call_custom_action) when the user selects a custom action in the Settings editor,
-  - [`signal_event()`](#signal_event) to send an event the PowerToy registered to.
-  - [`register_system_menu_helper()`](#register_system_menu_helper) to pass object, responsible for handling customized system menus, to module.
-  - [`signal_system_menu_action()`](#signal_system_menu_action) to send an event when action is taken on system menu item.
 
 When terminating, the runner will:
   - call [`disable()`](#disable),
@@ -75,18 +68,6 @@ virtual const wchar_t* get_name()
 
 Returns the name of the PowerToy, it will be cached by the runner.
 
-## get_events
-
-```cpp
-virtual const wchar_t** get_events()
-```
-
-Returns a null-terminated table of the names of the events the PowerToy wants to subscribe to. Available events:
-  * ll_keyboard
-  * win_hook_event
-
-A nullptr can be returned to signal that the PowerToy does not want to subscribe to any event.
-
 ## get_config
 
 ```
@@ -140,38 +121,6 @@ Disables the PowerToy, should free as much memory as possible.
 
 Returns the PowerToy state.
 
-## signal_event
-
-```cpp
-  virtual intptr_t signal_event(const wchar_t* name, intptr_t data) = 0;
-```
-
-Handle event. Only the events the PowerToy subscribed to will be signaled.
-The data argument and return value meaning are event-specific:
-  * ll_keyboard: see [`lowlevel_keyboard_event_data.h`](./lowlevel_keyboard_event_data.h).
-  * win_hook_event: see [`win_hook_event_data.h`](./win_hook_event_data.h)
-
-Please note that some of the events are currently being signalled from a separate thread.
-
-## register_system_menu_helper
-
-```cpp
-  virtual void register_system_menu_helper(PowertoySystemMenuIface* helper) = 0;
-```
-
-Register helper class to handle all system menu items related actions. Creation, deletion
-and all other actions taken on system menu item will be handled by provided class.
-Module will be informed when action is taken on any item created on request of the module.
-
-## signal_system_menu_action
-
-```cpp
-  virtual void signal_system_menu_action(const wchar_t* name) = 0;
-```
-
-Runner invokes this API when action is taken on item created on request from the module.
-Item name is passed as an argument, so that module can distinguish between different menu items.
-
 ## destroy
 
 ```cpp
@@ -179,62 +128,7 @@ Item name is passed as an argument, so that module can distinguish between diffe
 ```
 Destroy the PowerToy and free all memory.
 
-## Powertoys system menu helper interface
-
-Interface for helper class responsible for handling all system menu related actions.
-```cpp
-class PowertoySystemMenuIface {
-public:
-  struct ItemInfo {
-    std::wstring name{};
-    bool enable{ false };
-    bool checkBox{ false };
-  };
-  virtual void SetConfiguration(PowertoyModuleIface* module, const std::vector<ItemInfo>& config) = 0;
-  virtual void ProcessSelectedItem(PowertoyModuleIface* module, HWND window, const wchar_t* itemName) = 0;
-};
-```
-
-## ItemInfo
-
-```cpp
-  struct ItemInfo {
-    std::wstring name{};
-    bool enable{ false };
-    bool checkBox{ false };
-  };
-```
-
-Structure containing all relevant information for system menu item: name (and hotkey if available), item
-status at creation (enabled/disabled) and whether check box will appear next to item name when action is taken.
-
-## SetConfiguration
-
-```cpp
-  virtual void SetConfiguration(PowertoyModuleIface* module, const std::vector<ItemInfo>& config) = 0;
-```
-
-Module should use this interface to inform system menu helper class which custom system menu items to create.
-
-## ProcessSelectedItem
-
-```cpp
-  virtual void ProcessSelectedItem(PowertoyModuleIface* module, HWND window, const wchar_t* itemName) = 0;
-```
-
-Process action taken on specific system menu item.
-
 # Code organization
 
 ### [`powertoy_module_interface.h`](/src/modules/interface/powertoy_module_interface.h)
 Contains the PowerToys interface definition.
-
-### [`powertoy_system_menu.h`](/src/modules/interface/powertoy_system_module.h)
-Contains the PowerToys system menu helper interface definition.
-
-### [`lowlevel_keyboard_event_data.h`](/src/modules/interface/lowlevel_keyboard_event_data.h)
-Contains the `LowlevelKeyboardEvent` structure that's passed to `signal_event` for `ll_keyboard` events.
-
-### [`win_hook_event_data.h`](/src/modules/interface/win_hook_event_data.h)
-Contains the `WinHookEvent` structure that's passed to `signal_event` for `win_hook_event` events.
-

doc/devdocs/readme.md

@@ -30,7 +30,7 @@ General project organization:
 
 Documentation for the project.
 
-### The [`Wiki`](/wiki)
+### The [`Wiki`](https://github.com/microsoft/PowerToys/wiki)
 
 The Wiki contains the current specs for the project.
 
@@ -40,7 +40,7 @@ Contains the source code of the PowerToys installer.
 
 ### The [`src`](/src) folder
 
-Contains the source code of the PowerToys runner and of all of the PowerToys modules. **This is where the most of the magic happens.**
+Contains the source code of the PowerToys runner and of all of the PowerToys modules. **This is where most of the magic happens.**
 
 ### The [`tools`](/tools) folder
 
@@ -52,12 +52,19 @@ Various tools used by PowerToys. Includes the Visual Studio 2019 project templat
 
 1. Windows 10 April 2018 Update (version 1803) or newer
 2. Visual Studio Community/Professional/Enterprise 2019
-3. Run the command below in cmd/terminal to install all the workloads and components for VS.<br />
-**Note:** the script assumes VS is installed and Community edition. Please update path accordingly if Professional/Enterprise.
+3. Run the command below in cmd/terminal to install all the workloads and components for VS.
 
 ```shell
+cd "%ProgramFiles(x86)%\Microsoft Visual Studio\2019"
+SET targetFolder="\"
+IF EXIST Enterprise\NUL (SET targetFolder=Enterprise)
+IF EXIST Professional\NUL (SET targetFolder=Professional)
+IF EXIST Community\NUL (SET targetFolder=Community)
+
+ECHO %targetFolder%
+
 "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vs_installer.exe" ^
-modify --installpath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\community" ^
+modify --installpath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\%targetFolder%" ^
 --add Microsoft.VisualStudio.Workload.NativeDesktop ^
 --add Microsoft.VisualStudio.Workload.ManagedDesktop ^
 --add Microsoft.VisualStudio.Workload.Universal ^
@@ -73,7 +80,11 @@ modify --installpath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\community
 - The PowerToys binaries will be in your repo under `x64\Release`.
 - If you want to copy the `PowerToys.exe` binary to a different location, you'll also need to copy the `modules` and the `svgs` folders.
 
-## Building the Installer (.MSI)
+## Building the Installers
+
+Our installer is two parts, an EXE and an MSI.  The EXE contains the MSI and handles more complex install logic. 
+- The EXE installs all prerequisites and installs PowerToys via the MSI. Also has additional features, such as silent installation flags
+- The MSI installs PowerToys.
 
 ### Prerequisites Building the Installer (.MSI)
 
@@ -85,6 +96,15 @@ modify --installpath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\community
 - From the `installer` folder open `PowerToysSetup.sln` in Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`, from the `Build` menu choose `Build Solution`.
 - The resulting `PowerToysSetup.msi` installer will be available in the `installer\PowerToysSetup\x64\Release\` folder.
 
+### Compiling Bootstraper Installer (.EXE)
+
+- MSI Installer needs to be built in release mode
+- Build `PowerToysBootstrapper` solution (`installer\PowerToysBootstrapper\`)
+
+#### Supported arguments for EXE installer:
+
+Head over to the wiki to get the [full list of supported installer arguments][installerArgWiki].
+
 ## Debugging
 
 The following configuration issue only applies if the user is a member of the Administrators group.
@@ -98,8 +118,8 @@ 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/specs/PowerToys-settings.md).
+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).
 
 ## Implementation details
 
@@ -127,7 +147,7 @@ The common lib, as the name suggests, contains code shared by multiple PowerToys
 
 WebView project for editing the PowerToys settings.
 
-The html portion of the project that is shown in the WebView is contained in [`settings-html`](/src/settings/settings-heml).
+The html portion of the project that is shown in the WebView is contained in [`settings-html`](/src/settings/settings-html).
 Instructions on how build a new version and update this project are in the [Web project for the Settings UI](./settings-web.md).
 
 While developing, it's possible to connect the WebView to the development server running in localhost by setting the `_DEBUG_WITH_LOCALHOST` flag to `1` and following the instructions near it in `./main.cpp`.
@@ -156,4 +176,6 @@ This module has a setting to serve as an example for each of the currently imple
 - ColorPicker property
 - CustomAction property
 
-![Image of the Options](/doc/images/example_powertoy/settings.png)
+![Image of the Options](/doc/images/settings/example_settings.png)
+
+[installerArgWiki]: https://github.com/microsoft/PowerToys/wiki/Installer-arguments-for-exe

doc/devdocs/run-as-admin-detection.md

@@ -1,50 +1,3 @@
-# PowerToys and running as Administrator
+# This file has been moved
 
-## Too long, Didn't Read 😁
-
-If you're running any application as an administrator (aka elevated) and PowerToys is not, a few things may not work correctly when the elevated applications are in focus or trying to interact with a PowerToys feature like FancyZones.
-
-## Having PowerToys keep functioning properly
-
-We understand users will run applications elevated. We do as well.  We have two options for you when this scenario happens:
-
-1. **Recommended:** PowerToys will prompt when we detect a process that is elevated.  Go to PowerToys settings inside the General Tab and click "Relaunch as administrator".
-2. Enable "Always run as administrator" in the PowerToys settings.
-
-## What is "Run as Administrator" / Elevated processes
-
-This is when a process runs with "elevated" privileges.  Typically this would be associated with the administrator accounts on a system.
-
-Basically it runs with additional access to the operating system.  Most things do not need run elevated. A common scenario would be needing to run certain PowerShell commands or edit the registry.
-
-How do i know my application is "elevated"?  If you see this prompt (User Access Control prompt), the application is requesting it:
-
-![alt text][uac]
-
-At times also, elevated terminals for instance, they will typically have the phrase "Administrator" appended to the title bar. Be warned, this isn't always the case it will be appended.
-
-![alt text][elevatedWindow]
-
-## When does PowerToys need this
-
-PowerToys in itself does not.  It only needs to be elevated when it has to interact with other applications that are running elevated. If those applications are in focus, PowerToys may not function unless it is elevated as well.
-
-These are the two scenarios we will not work in:
-
-1. Intercepting certain types of keyboard strokes
-2. Resizing / Moving windows
-
-### PowerToys affected
-
-1. FancyZones
-   - Snapping a window into a zone
-   - Moving the window to a different zone
-2. Shortcut guide
-   - Display shortcut
-3. Keyboard remapper
-   - key to key remapping
-   - Global level shortcuts remapping
-   - App-targeted shortcuts remapping
-
-[uac]: ../images/runAsAdmin/uac.png "User access control (UAC)"
-[elevatedWindow]: ../images/runAsAdmin/elevatedWindows.png "Run as admin"
+[PowerToys and running as Administrator](https://aka.ms/powertoysDetectedElevatedHelp)

doc/devdocs/shared-hooks.md

@@ -1,85 +0,0 @@
-# Shared hooks
-
-To minimize the performance impact on the machine only `runner` installs global hooks, passing the events to registered callbacks in each PowerToy module.
-
-When a PowerToy module is loaded, the `runner` calls the [`get_events()`](/src/modules/interface/powertoy_module_interface.h#L40) method to get a NULL-terminated array of NULL-terminated strings with the names of the events that the PowerToy wants to subscribe to. A `const wchar_t*` string is provided for each of the event names.
-
-Events are signalled by the `runner` calling the [`signal_event(name, data)`](/src/modules/interface/powertoy_module_interface.h#L53) method of the PowerToy module. The `name` parameter contains the NULL-terminated name of the event. The `data` parameter and the method return value are specific for each event.
-
-Currently supported hooks:
- * `"ll_keyboard"` - [Low Level Keyboard Hook](#low-level-keyboard-hook)
- * `"win_hook_event"` - [Windows Event Hook](#windows-event-hook)
-
-## Low Level Keyboard Hook
-
-This event is signaled whenever the user presses or releases a key on the keyboard. To subscribe to this event, add `"ll_keyboard"` to the table returned by the `get_events()` method.
-
-The PowerToys runner installs low-level keyboard hook using `SetWindowsHookEx(WH_KEYBOARD_LL, ...)`. See [this MSDN page](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms644985(v%3Dvs.85)) for details.
-
-When a keyboard event is signaled and `ncCode` equals `HC_ACTION`, the `wParam` and `lParam` event parameters are passed to all subscribed clients in the [`LowlevelKeyboardEvent`](/src/modules/interface/lowlevel_keyboard_event_data.h#L38-L41) struct.
-
-The `intptr_t data` event argument is a pointer to the `LowlevelKeyboardEvent` struct.
-
-A non-zero return value from any of the subscribed PowerToys will cause the runner hook proc to return 1, thus swallowing the keyboard event.
-
-Example usage, that makes Windows ignore the L key:
-
-```c++
-virtual const wchar_t** get_events() override {
-  static const wchar_t* events[2] = { ll_keyboard,
-                                      nullptr };
-  return events;
-}
-
-virtual intptr_t signal_event(const wchar_t* name, intptr_t data) override {
-  if (wcscmp(name, ll_keyboard) == 0) {
-    auto& event = *(reinterpret_cast<LowlevelKeyboardEvent*>(data));
-    // The L key has vkCode of 0x4C, see:
-    // https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-    if (event.wParam == WM_KEYDOWN && event.lParam->vkCode == 0x4C) {
-      return 1;
-    } else {
-      return 0;
-    }
-  } else {
-    return 0;
-  }
-}
-```
-
-## Windows Event Hook
-
-This event is signaled for [a range of events](https://docs.microsoft.com/pl-pl/windows/win32/winauto/event-constants). To subscribe to this event, add `"win_hook_event"` to the table returned by the `get_events()` method. See [this MSDN doc](https://docs.microsoft.com/pl-pl/windows/win32/api/winuser/nf-winuser-setwineventhook) for details.
-  
-The `intptr_t data` event argument is a pointer to the [`WinHookEvent`](/src/modules/interface/win_hook_event_data.h#L43-L50) struct.
-
-The return value of the event handler is ignored.
-
-Example usage, that detects a window being resized:
-
-```c++
-virtual const wchar_t** get_events() override {
-  static const wchar_t* events[2] = { win_hook_event,
-                                      nullptr };
-  return events;
-}
-
-virtual intptr_t signal_event(const wchar_t* name, intptr_t data) override {
-  if (wcscmp(name, win_hook_event) == 0) {
-    auto& event = *(reinterpret_cast<WinHookEvent*>(data));
-    switch (event.event) {
-    case EVENT_SYSTEM_MOVESIZESTART:
-      size_start(event.hwnd);
-      break;
-    case EVENT_SYSTEM_MOVESIZEEND:
-      size_end(event.hwnd);
-      break;
-    default:
-      break;
-    }
-  }
-  return 0;
-}
-```
-
-Taking too long to process the events has negative impact on the whole system performance. To address this, the events are signaled from a different thread, not from the event hook callback itself.

doc/devdocs/style.md

@@ -7,6 +7,6 @@
 ## Formatting
 
 - We use [`.clang-format`](https://github.com/microsoft/PowerToys/blob/master/.clang-format) style file to enable automatic code formatting. You can [easily format source files from Visual Studio](https://devblogs.microsoft.com/cppblog/clangformat-support-in-visual-studio-2017-15-7-preview-1/). For example, `CTRL+K CTRL+D` formats the current document.
-- If you prefer another text editor or have ClangFormat disabled in Visual Studio, you could invoke [`format_sources`](https://github.com/microsoft/PowerToys/blob/master/format_sources.ps1) powershell script from command line. It gets a list of all currently modified files from `git` and invokes clang-format on them.
+- If you prefer another text editor or have ClangFormat disabled in Visual Studio, you could invoke [`format_sources`](https://github.com/microsoft/PowerToys/blob/master/src/codeAnalysis/format_sources.ps1) powershell script from command line. It gets a list of all currently modified files from `git` and invokes clang-format on them.
 Please note that you should also have `clang-format.exe` in `%PATH%` for it to work. The script can infer the path of `clang-format.exe` version which is shipped with Visual Studio at `%VCINSTALLDIR%\Tools\Llvm\bin\`, if you launch it from the *Native Tools Command Prompt for VS*.
-- CI doesn't enforce code formatting yet, since we're gradually applying code formatting to the codebase, but please adhere to our formatting style for any new code.
+- CI doesn't enforce code formatting yet, since we're gradually applying code formatting to the codebase, but please adhere to our formatting style for any new code.

doc/devdocs/tools.md

@@ -0,0 +1,23 @@
+# Tools
+
+## [Monitor info report](tools\monitor_info_report)
+
+A small diagnostic tool which helps identifying WinAPI bugs related to the physical monitor detection. When launched, it creates a log file like this:
+
+```
+GetSystemMetrics = 2
+GetMonitorInfo OK
+EnumDisplayDevices OK:
+        DeviceID = \\?\DISPLAY#VSCBD34#5&25664547&0&UID4355#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}
+        DeviceKey = \Registry\Machine\System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318}\0002
+        DeviceName = \\.\DISPLAY1\Monitor0
+        DeviceString = Generic PnP Monitor
+GetMonitorInfo OK
+EnumDisplayDevices OK:
+        DeviceID = \\?\DISPLAY#ENC2682#5&25664547&0&UID4357#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}
+        DeviceKey = \Registry\Machine\System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318}\0003
+        DeviceName = \\.\DISPLAY2\Monitor0
+        DeviceString = Generic PnP Monitor
+EnumDisplayMonitors OK
+```
+and also duplicates the info to `stdout`.

doc/specs/readme.md

@@ -1,15 +1,15 @@
 # Specs
 
-All approved specs are inside the [Wiki](https://github.com/microsoft/PowerToys/wiki)
+All approved specs are inside the [Wiki spec section](https://github.com/microsoft/PowerToys/wiki/Specs)
 
 ## Spec process
 
 1. A proposed item is either new or requesting additional design 
 2. Spec is written inside the Specs folder and a PR happens with feedback.
-3. Once spec is signed off, we move it into the [Wiki](https://github.com/microsoft/PowerToys/wiki).
+3. Once spec is signed off, we move it into the [Wiki spec section](https://github.com/microsoft/PowerToys/wiki/Specs).
 
 ## Thought process behind this
 
 We want a single wholistic for PowerToys. This includes both source code, docs, and specs. At the same time, we want to ensure items have pull requests and feedback.  Since the wiki cannot do PR's, we will do the process above.
 
-This process will allow specs to be image rich but not impact the primary repository's size as more items come online.
+This process will allow specs to be image rich but not impact the primary repository's size as more items come online.

doc/unofficalInstallMethods.md

@@ -0,0 +1,37 @@
+# Unoffical community driven install methods
+
+These are community driven alternative install methods to Windows Package Manager (WinGet) and GitHub. The PowerToys teams does not update or manage these install methods. 
+
+These will be listed in alphabetical order.
+
+## Chocolatey
+
+Download and upgrade PowerToys from [Chocolatey](https://chocolatey.org). If you have any issues when installing/upgrading the package please go to the [package page](https://chocolatey.org/packages/powertoys) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
+
+To install PowerToys, run the following command from the command line / PowerShell:
+
+```powershell
+choco install powertoys
+```
+
+To upgrade PowerToys, run the following command from the command line / PowerShell:
+
+```powershell
+choco upgrade powertoys
+```
+
+## Scoop
+
+Download and update PowerToys from [Scoop](https://scoop.sh). 
+
+To install PowerToys, run the following command from the command line / PowerShell:
+
+```powershell
+scoop install powertoys
+```
+
+To update PowerToys, run the following command from the command line / PowerShell:
+
+```powershell
+scoop update powertoys
+```

installer/PowerToysBootstrapper/PowerToysBootstrapper.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updating", "..\..\src\common\updating\updating.vcxproj", "{17DA04DF-E393-4397-9CF0-84DABE11032E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\src\common\common.vcxproj", "{74485049-C722-400F-ABE5-86AC52D929B3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bootstrapper", "bootstrapper\bootstrapper.vcxproj", "{D194E3AA-F824-4CA9-9A58-034DD6B7D022}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.ActiveCfg = Debug|x64
+		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.Build.0 = Debug|x64
+		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.ActiveCfg = Release|x64
+		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.Build.0 = Release|x64
+		{74485049-C722-400F-ABE5-86AC52D929B3}.Debug|x64.ActiveCfg = Debug|x64
+		{74485049-C722-400F-ABE5-86AC52D929B3}.Debug|x64.Build.0 = Debug|x64
+		{74485049-C722-400F-ABE5-86AC52D929B3}.Release|x64.ActiveCfg = Release|x64
+		{74485049-C722-400F-ABE5-86AC52D929B3}.Release|x64.Build.0 = Release|x64
+		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Debug|x64.ActiveCfg = Debug|x64
+		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Debug|x64.Build.0 = Debug|x64
+		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Release|x64.ActiveCfg = Release|x64
+		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B288A538-1B79-4782-A737-14CD9CF07F58}
+	EndGlobalSection
+EndGlobal

installer/PowerToysBootstrapper/bootstrapper/LocProject.json

@@ -0,0 +1,14 @@
+{
+    "Projects": [
+        {
+            "LanguageSet": "Azure_Languages",
+            "LocItems": [
+                {
+                    "SourceFile": "installer\\PowerToysBootstrapper\\bootstrapper\\Resources.resx",
+                    "CopyOption": "LangIDOnName",
+                    "OutputPath": "installer\\PowerToysBootstrapper\\bootstrapper"
+                }
+            ]
+        }
+    ]
+}

installer/PowerToysBootstrapper/bootstrapper/Resources.resx

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
+    <value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
+  </data>
+  <data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
+    <value>PowerToys installation error</value>
+  </data>
+</root>

installer/PowerToysBootstrapper/bootstrapper/bootstrapper.base.rc

@@ -1,12 +1,9 @@
 #include <windows.h>
 #include "resource.h"
-#include "../common/version.h"
+#include "../../../src/common/version.h"
 
-STRINGTABLE
-BEGIN
-    IDS_DOTNET_CORE_DOWNLOAD_FAILURE "Couldn't download .NET Core Desktop Runtime 3.1.3, please install it manually."
-    IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE "PowerToys installation error"
-END
+MAINICON ICON "../../../src/runner/svgs/icon.ico" 
+IDR_BIN_ICON BIN "../../../src/runner/svgs/icon.ico" 
 
 1 VERSIONINFO
 FILEVERSION FILE_VERSION
@@ -40,3 +37,5 @@ BEGIN
         VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
     END
 END
+
+#include "Generated Files\installer_resource.rc"

installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp

@@ -0,0 +1,328 @@
+#include "pch.h"
+#include "Generated Files/resource.h"
+
+#include <common/common.h>
+#include <common/notifications.h>
+#include <common/RcResource.h>
+#include <common/updating/updating.h>
+#include <common/updating/dotnet_installation.h>
+#include <common/version.h>
+#include <common/appMutex.h>
+#include <common/processApi.h>
+
+
+#include <runner/action_runner_utils.h>
+
+extern "C" IMAGE_DOS_HEADER __ImageBase;
+
+namespace
+{
+    const wchar_t APPLICATION_ID[] = L"PowerToysInstaller";
+    const wchar_t TOAST_TAG[] = L"PowerToysInstallerProgress";
+}
+
+namespace localized_strings
+{
+    const wchar_t INSTALLER_EXTRACT_ERROR[] = L"Couldn't extract MSI installer!";
+    const wchar_t TOAST_TITLE[] = L"PowerToys Installation";
+    const wchar_t EXTRACTING_INSTALLER[] = L"Extracting PowerToys MSI...";
+    const wchar_t UNINSTALLING_PREVIOUS_VERSION[] = L"Uninstalling previous PowerToys version...";
+    const wchar_t UNINSTALL_PREVIOUS_VERSION_ERROR[] = L"Couldn't uninstall previous PowerToys version!";
+    const wchar_t INSTALLING_DOTNET[] = L"Installing dotnet...";
+    const wchar_t DOTNET_INSTALL_ERROR[] = L"Couldn't install dotnet!";
+    const wchar_t INSTALLING_NEW_VERSION[] = L"Installing new PowerToys version...";
+    const wchar_t NEW_VERSION_INSTALLATION_DONE[] = L"PowerToys installation complete!";
+    const wchar_t NEW_VERSION_INSTALLATION_ERROR[] = L"Couldn't install new PowerToys version.";
+}
+
+namespace fs = std::filesystem;
+
+std::optional<fs::path> extractEmbeddedInstaller()
+{
+    auto executableRes = RcResource::create(IDR_BIN_MSIINSTALLER, L"BIN");
+    if (!executableRes)
+    {
+        return std::nullopt;
+    }
+    auto installerPath = fs::temp_directory_path() / L"PowerToysBootstrappedInstaller-" PRODUCT_VERSION_STRING L".msi";
+    return executableRes->saveAsFile(installerPath) ? std::make_optional(std::move(installerPath)) : std::nullopt;
+}
+
+std::optional<fs::path> extractIcon()
+{
+    auto iconRes = RcResource::create(IDR_BIN_ICON, L"BIN");
+    if (!iconRes)
+    {
+        return std::nullopt;
+    }
+    auto icoPath = fs::temp_directory_path() / L"PowerToysBootstrappedInstaller.ico";
+    return iconRes->saveAsFile(icoPath) ? std::make_optional(std::move(icoPath)) : std::nullopt;
+}
+
+enum class CmdArgs
+{
+    silent,
+    noFullUI,
+    noStartPT,
+    skipDotnetInstall,
+    showHelp
+};
+
+namespace
+{
+    const std::unordered_map<std::wstring_view, CmdArgs> knownArgs = {
+        { L"--help", CmdArgs::showHelp },
+        { L"--no_full_ui", CmdArgs::noFullUI },
+        { L"--silent", CmdArgs::silent },
+        { L"--no_start_pt", CmdArgs::noStartPT },
+        { L"--skip_dotnet_install", CmdArgs::skipDotnetInstall }
+    };
+}
+
+std::unordered_set<CmdArgs> parseCmdArgs(const int nCmdArgs, LPWSTR* argList)
+{
+    std::unordered_set<CmdArgs> result;
+    for (size_t i = 1; i < nCmdArgs; ++i)
+    {
+        if (auto it = knownArgs.find(argList[i]); it != end(knownArgs))
+        {
+            result.emplace(it->second);
+        }
+    }
+    return result;
+}
+
+int bootstrapper()
+{
+    using namespace localized_strings;
+    winrt::init_apartment();
+
+    int nCmdArgs = 0;
+    LPWSTR* argList = CommandLineToArgvW(GetCommandLineW(), &nCmdArgs);
+    const auto cmdArgs = parseCmdArgs(nCmdArgs, argList);
+    std::wostringstream oss;
+    if (cmdArgs.contains(CmdArgs::showHelp))
+    {
+        oss << "Supported arguments:\n\n";
+        for (auto [arg, _] : knownArgs)
+        {
+            oss << arg << '\n';
+        }
+        MessageBoxW(nullptr, oss.str().c_str(), L"Help", MB_OK | MB_ICONINFORMATION);
+        return 0;
+    }
+    if (!cmdArgs.contains(CmdArgs::noFullUI))
+    {
+        MsiSetInternalUI(INSTALLUILEVEL_FULL, nullptr);
+    }
+    if (cmdArgs.contains(CmdArgs::silent))
+    {
+        if (is_process_elevated())
+        {
+            MsiSetInternalUI(INSTALLUILEVEL_NONE, nullptr);
+        }
+        else
+        {
+            // MSI fails to run in silent mode due to a suppressed UAC w/o elevation, so we restart elevated
+            std::wstring params;
+            for (int i = 1; i < nCmdArgs; ++i)
+            {
+                params += argList[i];
+                if (i != nCmdArgs - 1)
+                {
+                    params += L' ';
+                }
+            }
+            const auto processHandle = run_elevated(argList[0], params.c_str());
+            if (!processHandle)
+            {
+                return 1;
+            }
+            if (WaitForSingleObject(processHandle, 3600000) == WAIT_OBJECT_0)
+            {
+                DWORD exitCode = 0;
+                GetExitCodeProcess(processHandle, &exitCode);
+                return exitCode;
+            }
+            else
+            {
+                // Couldn't install using the completely silent mode in an hour, use basic UI.
+                TerminateProcess(processHandle, 0);
+                MsiSetInternalUI(INSTALLUILEVEL_BASIC, nullptr);
+            }
+        }
+    }
+
+    // Try killing PowerToys and prevent future processes launch
+    for (auto& handle : getProcessHandlesByName(L"PowerToys.exe", PROCESS_TERMINATE))
+    {
+        TerminateProcess(handle.get(), 0);
+    }
+    auto powerToysMutex = createAppMutex(POWERTOYS_MSI_MUTEX_NAME);
+
+    auto instanceMutex = createAppMutex(POWERTOYS_BOOTSTRAPPER_MUTEX_NAME);
+    if (!instanceMutex)
+    {
+        return 1;
+    }
+    notifications::override_application_id(APPLICATION_ID);
+
+    fs::path iconPath{ L"C:\\" };
+    if (auto extractedIcon = extractIcon())
+    {
+        iconPath = std::move(*extractedIcon);
+    }
+
+    notifications::register_application_id(TOAST_TITLE, iconPath.c_str());
+
+    auto removeShortcut = wil::scope_exit([&] {
+        notifications::unregister_application_id();
+    });
+
+    // Check if there's a newer version installed, and launch its installer if so.
+    const VersionHelper myVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);
+    if (const auto installedVersion = updating::get_installed_powertoys_version(); installedVersion && *installedVersion >= myVersion)
+    {
+        auto msi_path = updating::get_msi_package_path();
+        if (!msi_path.empty())
+        {
+            MsiInstallProductW(msi_path.c_str(), nullptr);
+            return 0;
+        }
+    }
+
+    std::mutex progressLock;
+    notifications::progress_bar_params progressParams;
+    progressParams.progress = 0.0f;
+    progressParams.progress_title = EXTRACTING_INSTALLER;
+    notifications::toast_params params{ TOAST_TAG, false, std::move(progressParams) };
+    if (!cmdArgs.contains(CmdArgs::silent))
+    {
+        notifications::show_toast_with_activations({}, TOAST_TITLE, {}, {}, std::move(params));
+    }
+
+    auto processToasts = wil::scope_exit([&] {
+        run_message_loop(true, 2);
+    });
+
+    if (!cmdArgs.contains(CmdArgs::silent))
+    {
+        // Worker thread to periodically increase progress and keep the progress toast from losing focus
+        std::thread{ [&] {
+            for (;; Sleep(3000))
+            {
+                std::scoped_lock lock{ progressLock };
+                if (progressParams.progress == 1.f)
+                {
+                    break;
+                }
+                progressParams.progress = std::min(0.99f, progressParams.progress + 0.001f);
+                notifications::update_progress_bar_toast(TOAST_TAG, progressParams);
+            }
+        } }.detach();
+    }
+
+    auto updateProgressBar = [&](const float value, const wchar_t* title) {
+        if (cmdArgs.contains(CmdArgs::silent))
+        {
+            return;
+        }
+        std::scoped_lock lock{ progressLock };
+        progressParams.progress = value;
+        progressParams.progress_title = title;
+        notifications::update_progress_bar_toast(TOAST_TAG, progressParams);
+    };
+
+    const auto installerPath = extractEmbeddedInstaller();
+    if (!installerPath)
+    {
+        if (!cmdArgs.contains(CmdArgs::silent))
+        {
+            notifications::show_toast(INSTALLER_EXTRACT_ERROR, TOAST_TITLE);
+        }
+        return 1;
+    }
+    auto removeExtractedInstaller = wil::scope_exit([&] {
+        std::error_code _;
+        fs::remove(*installerPath, _);
+    });
+
+    updateProgressBar(.25f, UNINSTALLING_PREVIOUS_VERSION);
+    const auto package_path = updating::get_msi_package_path();
+    if (!package_path.empty() && !updating::uninstall_msi_version(package_path) && !cmdArgs.contains(CmdArgs::silent))
+    {
+        notifications::show_toast(UNINSTALL_PREVIOUS_VERSION_ERROR, TOAST_TITLE);
+    }
+    const bool installDotnet = !cmdArgs.contains(CmdArgs::skipDotnetInstall);
+    if (installDotnet)
+    {
+        updateProgressBar(.5f, INSTALLING_DOTNET);
+    }
+
+    try
+    {
+        if (installDotnet &&
+            !updating::dotnet_is_installed() &&
+            !updating::install_dotnet(cmdArgs.contains(CmdArgs::silent)) &&
+            !cmdArgs.contains(CmdArgs::silent))
+        {
+            notifications::show_toast(DOTNET_INSTALL_ERROR, TOAST_TITLE);
+        }
+    }
+    catch (...)
+    {
+        MessageBoxW(nullptr, L".NET Core installation", L"Unknown exception encountered!", MB_OK | MB_ICONERROR);
+    }
+
+    updateProgressBar(.75f, INSTALLING_NEW_VERSION);
+
+    // Always skip dotnet install, because we should've installed it from here earlier
+    std::wstring msiProps = L"SKIPDOTNETINSTALL=1 ";
+    const bool installationDone = MsiInstallProductW(installerPath->c_str(), msiProps.c_str()) == ERROR_SUCCESS;
+    updateProgressBar(1.f, installationDone ? NEW_VERSION_INSTALLATION_DONE : NEW_VERSION_INSTALLATION_ERROR);
+    if (!installationDone)
+    {
+        return 1;
+    }
+
+    if (!cmdArgs.contains(CmdArgs::noStartPT) && !cmdArgs.contains(CmdArgs::silent))
+    {
+        auto newPTPath = updating::get_msi_package_installed_path();
+        if (!newPTPath)
+        {
+            return 1;
+        }
+        *newPTPath += L"\\PowerToys.exe";
+        SHELLEXECUTEINFOW sei{ sizeof(sei) };
+        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NO_CONSOLE };
+        sei.lpFile = newPTPath->c_str();
+        sei.nShow = SW_SHOWNORMAL;
+        ShellExecuteExW(&sei);
+    }
+
+    return 0;
+}
+
+int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    try
+    {
+        return bootstrapper();
+    }
+    catch (const std::exception& ex)
+    {
+        MessageBoxA(nullptr, ex.what(), "Unhandled stdexception encountered!", MB_OK | MB_ICONERROR);
+    }
+    catch (winrt::hresult_error const& ex)
+    {
+        winrt::hstring message = ex.message();
+        MessageBoxW(nullptr, message.c_str(), L"Unhandled winrt exception encountered!", MB_OK | MB_ICONERROR);
+    }
+    catch (...)
+    {
+        auto lastErrorMessage = get_last_error_message(GetLastError());
+        std::wstring message = lastErrorMessage ? std::move(*lastErrorMessage) : L"";
+        MessageBoxW(nullptr, message.c_str(), L"Unknown exception encountered!", MB_OK | MB_ICONERROR);
+    }
+    return 0;
+}

installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\src\Version.props" />
+  <Target Name="Generate Resource file" BeforeTargets="PrepareForBuild">
+    <ItemGroup>
+      <RCLines Include="IDR_BIN_MSIINSTALLER BIN &quot;..\\PowerToysSetup\\$(PlatformShortName)\\$(Configuration)\\PowerToysSetup-$(Version)-$(PlatformShortName).msi&quot;" />
+    </ItemGroup>
+    <WriteLinesToFile File="Generated Files\installer_resource.rc" Lines="@(RCLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
+  </Target>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)..\..\tools\build\convert-resx-to-rc.ps1 . resource.base.h resource.h bootstrapper.base.rc bootstrapper.rc 105" />
+  </Target>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{D194E3AA-F824-4CA9-9A58-034DD6B7D022}</ProjectGuid>
+    <RootNamespace>bootstrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <ProjectName>bootstrapper</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup>
+    <TargetName>PowerToysSetup-$(Version)-$(PlatformShortName)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>../;$(IncludePath)</IncludePath>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>../;$(IncludePath)</IncludePath>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalIncludeDirectories>../../../src/</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalIncludeDirectories>../../../src/</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="bootstrapper.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\runner\updating.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="bootstrapper.base.rc" />
+    <ResourceCompile Include="Generated Files/bootstrapper.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\runner\svgs\icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\common\common.vcxproj">
+      <Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\common\updating\updating.vcxproj">
+      <Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+  </Target>
+</Project>

installer/PowerToysBootstrapper/bootstrapper/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.200519.2" targetFramework="native" />
+</packages>

installer/PowerToysBootstrapper/bootstrapper/pch.cpp

@@ -0,0 +1 @@
+#include "pch.h"

installer/PowerToysBootstrapper/bootstrapper/pch.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <shellapi.h>
+
+#include <string_view>
+#include <optional>
+#include <fstream>
+#include <wil/resource.h>
+#include <Msi.h>
+
+#include <unordered_set>
+#include <tuple>
+#include <sstream>

installer/PowerToysBootstrapper/bootstrapper/resource.base.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by bootstrapper.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Bootstrapper"
+#define INTERNAL_NAME "bootstrapper"
+#define ORIGINAL_FILENAME "bootstrapper.exe"
+
+// Non-localizable
+//////////////////////////////
+
+#define IDR_BIN_MSIINSTALLER 103
+#define IDR_BIN_ICON 104

installer/PowerToysSetup/PowerToysSetup.wixproj

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
-  <Import Project="$(SolutionDir)Version.props" />
+  <Import Project="..\..\src\Version.props" />
+  <PropertyGroup>
+    <DefineConstants>Version=$(Version);</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>

installer/PowerToysSetup/Product.wxs

@@ -8,6 +8,7 @@
   <?define KeyboardManagerProjectName="KeyboardManager"?>
   <?define PowerRenameProjectName="PowerRename"?>
   <?define ShortcutGuideProjectName="ShortcutGuide"?>
+  <?define ColorPickerProjectName="ColorPicker"?>
 
   <?define RepoDir="$(var.ProjectDir)..\..\" ?>
   <?define BinX64Dir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
@@ -69,7 +70,8 @@
     <Property Id="INSTALLSTARTMENUSHORTCUT" Value="1"/>
     <Property Id="CREATESCHEDULEDTASK" Value="1"/>
     <Property Id="WixShellExecTarget" Value="[#action_runner.exe]" />
-    
+    <Property Id="SKIPDOTNETINSTALL" Value="0"/>
+        
     <Property Id ="EXISTINGPOWERRENAMEEXTPATH">
       <RegistrySearch Id="ExistingExtPath" Root="HKCR" Key="CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}\InprocServer32" Type="raw"/>
     </Property>
@@ -95,7 +97,7 @@
       </Custom>
       
       <Custom Action="InstallDotNet" After="InstallFinalize">
-        NOT Installed
+        NOT Installed and (SKIPDOTNETINSTALL = 0)
       </Custom>
 
       <Custom Action="TerminateProcesses" Before="InstallValidate" />
@@ -241,6 +243,9 @@
             <Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview" />
             <Directory Id="FancyZonesInstallFolder" Name="$(var.FancyZonesProjectName)" />
             <Directory Id="KeyboardManagerInstallFolder" Name="$(var.KeyboardManagerProjectName)" />
+            <Directory Id="ColorPickerInstallFolder" Name="$(var.ColorPickerProjectName)">
+              <Directory Id="ColorPickerResourcesFolder" Name="Resources"/>
+            </Directory>
             <Directory Id="LauncherInstallFolder" Name="launcher">
               <Directory Id="AssetsFolder" Name="Assets" />
               <Directory Id="LauncherImagesFolder" Name="Images" />               
@@ -271,6 +276,11 @@
                   <Directory Id="IndexerLanguagesFolder" Name="Languages" />
                   <Directory Id="IndexerpinyindbFolder" Name="pinyindb" />
                 </Directory>
+                <Directory Id="UriPluginFolder" Name="Microsoft.Plugin.Uri">
+                  <Directory Id="UriImagesFolder" Name="Images" />
+                  <Directory Id="UriLanguagesFolder" Name="Languages" />
+                  <Directory Id="UripinyindbFolder" Name="pinyindb" />
+                </Directory>
                 <Directory Id="WindowWalkerPluginFolder" Name="Microsoft.Plugin.WindowWalker">
                   <Directory Id="WindowWalkerImagesFolder" Name="Images" />
                   <Directory Id="WindowWalkerLanguagesFolder" Name="Languages" />
@@ -284,7 +294,9 @@
             <Directory Id="SettingsV2ViewsInstallFolder" Name="Views"/>
             <Directory Id="SettingsV2StylesInstallFolder" Name="Styles"/>
             <Directory Id="SettingsV2PropertiesInstallFolder" Name="Properties"/>
-            <Directory Id="SettingsV2AssetsInstallFolder" Name="Assets"/>
+            <Directory Id="SettingsV2AssetsInstallFolder" Name="Assets">
+              <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" />
+            </Directory>
             <Directory Id="SettingsV2ControlsInstallFolder" Name="Controls"/>
             <Directory Id="SettingsV2XamlInstallFolder" Name="Microsoft.UI.Xaml">
               <Directory Id="SettingsV2XamlAssetsInstallFolder" Name="Assets" />
@@ -355,9 +367,6 @@
       <Component Id="powertoysinterop_dll" Guid="B7DD2DF4-C8F2-46FA-9571-D6EF1588ADF3" Win64="yes">
         <File Id="PowerToysInterop.dll" KeyPath="yes" Checksum="yes" />
       </Component>
-      <Component Id="osDetection_dll" Guid="AA370C25-4AC8-447B-A2FF-C99365C6BE67" Win64="yes">
-        <File Source="$(var.BinX64Dir)os-detection.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
       <Component Id="vcredist_dlls" Guid="CBE26CB0-3AD0-4336-A7D6-503046BADEBC" Win64="yes">
         <!-- VCRuntime -->
         <?foreach File in vcruntime140.dll;vcruntime140_1.dll;concrt140.dll;msvcp140.dll;msvcp140_1.dll;msvcp140_2.dll;msvcp140_codecvt_ids.dll;vccorlib140.dll?>
@@ -412,35 +421,52 @@
         <!-- Added a separate component for Per-User registry changes -->
         <!-- Registry Key for Class Registration of Svg Preview Handler -->
         <RegistryKey Root="HKCR" Key="CLSID\{ddee2b8a-6807-48a6-bb20-2338174ff779}">
-          <RegistryValue Type="string" Value="SvgPreviewHandler.SvgPreviewHandler" />
+          <RegistryValue Type="string" Value="Microsoft.PowerToys.PreviewHandler.Svg.SvgPreviewHandler" />
           <RegistryValue Type="string" Name="DisplayName" Value="Svg Preview Handler" />
           <RegistryValue Type="string" Name="AppID" Value="{CF142243-F059-45AF-8842-DBBE9783DB14}" />
           <RegistryValue Type="string" Key="Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value=""/>
           <RegistryValue Type="string" Key="InprocServer32" Value="mscoree.dll" />
           <RegistryValue Type="string" Key="InprocServer32" Name="Assembly" Value="SvgPreviewHandler, Version=$(var.Version).0, Culture=neutral" />
-          <RegistryValue Type="string" Key="InprocServer32" Name="Class" Value="SvgPreviewHandler.SvgPreviewHandler" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="Class" Value="Microsoft.PowerToys.PreviewHandler.Svg.SvgPreviewHandler" />
           <RegistryValue Type="string" Key="InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" />
           <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Both" />
           <RegistryValue Type="string" Key="InprocServer32" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]SvgPreviewHandler.dll" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Assembly" Value="SvgPreviewHandler, Version=$(var.Version).0, Culture=neutral" />
-          <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Class" Value="SvgPreviewHandler.SvgPreviewHandler" />
+          <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Class" Value="Microsoft.PowerToys.PreviewHandler.Svg.SvgPreviewHandler" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="RuntimeVersion" Value="v4.0.30319" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]SvgPreviewHandler.dll" />
         </RegistryKey>
+        <!-- Registry Key for Class Registration of Svg Thumbnail Provider -->
+        <RegistryKey Root="HKCR" Key="CLSID\{36B27788-A8BB-4698-A756-DF9F11F64F84}">
+            <RegistryValue Type="string" Value="Microsoft.PowerToys.ThumbnailHandler.Svg.SvgThumbnailProvider" />
+            <RegistryValue Type="string" Name="DisplayName" Value="Svg Thumbnail Provider" />
+            <RegistryValue Type="string" Name="AppID" Value="{CF142243-F059-45AF-8842-DBBE9783DB14}" />
+            <RegistryValue Type="string" Key="Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value=""/>
+            <RegistryValue Type="string" Key="InprocServer32" Value="mscoree.dll" />
+            <RegistryValue Type="string" Key="InprocServer32" Name="Assembly" Value="SvgThumbnailProvider, Version=$(var.Version).0, Culture=neutral" />
+            <RegistryValue Type="string" Key="InprocServer32" Name="Class" Value="Microsoft.PowerToys.ThumbnailHandler.Svg.SvgThumbnailProvider" />
+            <RegistryValue Type="string" Key="InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" />
+            <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Both" />
+            <RegistryValue Type="string" Key="InprocServer32" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]SvgThumbnailProvider.dll" />
+            <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Assembly" Value="SvgThumbnailProvider, Version=$(var.Version).0, Culture=neutral" />
+            <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Class" Value="Microsoft.PowerToys.ThumbnailHandler.Svg.SvgThumbnailProvider" />
+            <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="RuntimeVersion" Value="v4.0.30319" />
+            <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]SvgThumbnailProvider.dll" />
+        </RegistryKey>
         <!-- Registry Key for Class Registration of Markdown Preview Handler -->
         <RegistryKey Root="HKCR" Key="CLSID\{45769bcc-e8fd-42d0-947e-02beef77a1f5}">
-          <RegistryValue Type="string" Value="MarkdownPreviewHandler.MarkdownPreviewHandler" />
+          <RegistryValue Type="string" Value="Microsoft.PowerToys.PreviewHandler.Markdown.MarkdownPreviewHandler" />
           <RegistryValue Type="string" Name="DisplayName" Value="Markdown Preview Handler" />
           <RegistryValue Type="string" Name="AppID" Value="{CF142243-F059-45AF-8842-DBBE9783DB14}" />
           <RegistryValue Type="string" Key="Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" />
           <RegistryValue Type="string" Key="InprocServer32" Value="mscoree.dll" />
           <RegistryValue Type="string" Key="InprocServer32" Name="Assembly" Value="MarkdownPreviewHandler, Version=$(var.Version).0, Culture=neutral" />
-          <RegistryValue Type="string" Key="InprocServer32" Name="Class" Value="MarkdownPreviewHandler.MarkdownPreviewHandler" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="Class" Value="Microsoft.PowerToys.PreviewHandler.Markdown.MarkdownPreviewHandler" />
           <RegistryValue Type="string" Key="InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" />
           <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Both" />
           <RegistryValue Type="string" Key="InprocServer32" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]MarkdownPreviewHandler.dll" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Assembly" Value="MarkdownPreviewHandler, Version=$(var.Version).0, Culture=neutral" />
-          <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Class" Value="MarkdownPreviewHandler.MarkdownPreviewHandler" />
+          <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="Class" Value="Microsoft.PowerToys.PreviewHandler.Markdown.MarkdownPreviewHandler" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="RuntimeVersion" Value="v4.0.30319" />
           <RegistryValue Type="string" Key="InprocServer32\$(var.Version).0" Name="CodeBase" Value="file:///[FileExplorerPreviewInstallFolder]MarkdownPreviewHandler.dll" />
         </RegistryKey>
@@ -460,6 +486,10 @@
         <RegistryKey Root="HKCR" Key=".svg\shellex">
           <RegistryValue Type="string" Key="{8895b1c6-b41f-4c1c-a562-0d564250836f}" Value="{ddee2b8a-6807-48a6-bb20-2338174ff779}" />
         </RegistryKey>
+        <!-- Add file type association for Svg Thumbnail Provider -->
+        <RegistryKey Root="HKCR" Key=".svg\shellex">
+            <RegistryValue Type="string" Key="{E357FCCD-A995-4576-B01F-234630154E96}" Value="{36B27788-A8BB-4698-A756-DF9F11F64F84}" />
+        </RegistryKey>
         <!-- Add file type association for Markdown Preview Handler -->
         <RegistryKey Root="HKCR" Key=".md\shellex">
           <RegistryValue Type="string" Key="{8895b1c6-b41f-4c1c-a562-0d564250836f}" Value="{45769bcc-e8fd-42d0-947e-02beef77a1f5}" />
@@ -468,6 +498,10 @@
         <RegistryKey Root="HKLM" 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="HKLM" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
+            <RegistryValue Type="integer" Name="dllhost.exe" Value="11000" />
+        </RegistryKey>
       </Component>
     </DirectoryRef>
 
@@ -484,7 +518,8 @@
           <netfx:NativeImage Id="Interactivity" Platform="all" Priority="0"/>
         </File>
         <File Source="$(var.BinX64Dir)modules\$(var.ImageResizerProjectName)\Newtonsoft.Json.dll" />
-        <File Source="$(var.BinX64Dir)modules\$(var.ImageResizerProjectName)\ImageResizerExt.dll" KeyPath="yes" />
+        <File Source="$(var.BinX64Dir)modules\$(var.ImageResizerProjectName)\ImageResizerExt.dll" KeyPath="yes" />		  
+        <File Id="ImageResizer_interop" Source="$(var.BinX64Dir)modules\$(var.ImageResizerProjectName)\PowerToysInterop.dll" />
 
         <!-- VCRuntime -->
         <?foreach File in vcruntime140.dll;vcruntime140_1.dll;concrt140.dll;msvcp140.dll;msvcp140_1.dll;msvcp140_2.dll;msvcp140_codecvt_ids.dll;vccorlib140.dll?>
@@ -562,6 +597,7 @@
         <File Source="$(var.BinX64Dir)modules\$(var.PowerRenameProjectName)\PowerRenameExt.dll" KeyPath="yes" />
         <RegistryKey Root="HKCR" Key="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]PowerRenameExt.dll" />
           <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
         </RegistryKey>
@@ -583,6 +619,22 @@
       </Component>
     </DirectoryRef>
 
+    <DirectoryRef Id="ColorPickerInstallFolder" FileSource="$(var.BinX64Dir)modules\$(var.ColorPickerProjectName)">
+      <Component Id="Module_ColorPicker" Guid="8A52A69E-37B2-4BEA-9D73-77763066052F" Win64="yes">
+        <?foreach File in ColorPicker.dll;ColorPicker.exe;ColorPicker.exe.config;Microsoft.Bcl.AsyncInterfaces.dll;Microsoft.Expression.Interactions.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;PowerToysInterop.dll;System.Buffers.dll;System.Memory.dll;System.Numerics.Vectors.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;System.Threading.Tasks.Extensions.dll;System.ValueTuple.dll;System.Windows.Interactivity.dll;Telemetry.dll;ManagedCommon.dll;System.Runtime.CompilerServices.Unsafe.dll?>
+        <File Id="ColorPickerFile_$(var.File)" Source="$(var.BinX64Dir)modules\$(var.ColorPickerProjectName)\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="ColorPickerResourcesFolder" FileSource="$(var.BinX64Dir)modules\$(var.ColorPickerProjectName)\Resources">
+      <Component Id="Module_ColorPicker_Resources" Guid="7544BD0F-1DB6-4C53-89D3-ADAD472FDCC1">
+        <?foreach File in colorPicker.cur;icon.ico?>
+        <File Id="ColorPickerFile_$(var.File)" Source="$(var.BinX64Dir)modules\$(var.ColorPickerProjectName)\Resources\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+
     <DirectoryRef Id="FileExplorerPreviewInstallFolder" FileSource="$(var.RepoDir)\modules\FileExplorerPreview\">
       <Component Id="Module_PowerPreview" Guid="FF1700D5-1B07-4E07-9A62-4D206645EEA9" Win64="yes">
         <!-- Component to include PowerPreview Module Source dll's -->
@@ -593,6 +645,8 @@
         <File Source="$(var.BinX64Dir)modules\FileExplorerPreview\Telemetry.dll" />
         <!-- File to include dll for Svg Preview Handler -->
         <File Source="$(var.BinX64Dir)modules\FileExplorerPreview\SvgPreviewHandler.dll" />
+        <!-- File to include dll for Svg Preview Handler -->
+        <File Source="$(var.BinX64Dir)modules\FileExplorerPreview\SvgThumbnailProvider.dll" />
         <!-- Files to include dll's for Markdown Preview Handler and it's dependencies -->
         <File Source="$(var.BinX64Dir)modules\FileExplorerPreview\MarkdownPreviewHandler.dll" />
         <File Source="$(var.BinX64Dir)modules\FileExplorerPreview\Markdig.Signed.dll" />
@@ -612,7 +666,7 @@
         <File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.exe"/>
         <File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.exe"/>
         <!-- dll -->
-        <?foreach File in concrt140_app.dll;Microsoft.Bcl.AsyncInterfaces.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;Microsoft.PowerToys.Settings.UI.Runner.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Wpf.UI.Controls.dll;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;PowerToysInterop.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Telemetry.dll;ManagedCommon.dll?>
+        <?foreach File in concrt140_app.dll;Microsoft.Bcl.AsyncInterfaces.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;Microsoft.PowerToys.Settings.UI.Runner.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Wpf.UI.Controls.dll;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;PowerToysInterop.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Telemetry.dll;ManagedCommon.dll?>
           <File Id="SettingsV2_$(var.File)" Source="$(var.BinX64Dir)SettingsUIRunner\$(var.File)" />
         <?endforeach?>
         <!-- json -->
@@ -650,6 +704,13 @@
         <File Id="Square44x44Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.scale-200.png" />
       </Component>
     </DirectoryRef>
+    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules">
+      <Component Id="SettingsV2AssetsModules" Guid="A0B961A9-77D0-4223-88A9-E3B41BD9C329" Win64="yes">
+        <?foreach File in ColorPicker.png;FancyZones.png;ImageResizer.png;KBM.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ShortcutGuide.png?>
+          <File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
     <DirectoryRef Id="SettingsV2ControlsInstallFolder" FileSource="$(var.BinX64Dir)SettingsUIRunner\Controls">
       <Component Id="SettingsV2Controls" Guid="05C55C88-B59A-4450-A07C-EB7626E0781A" Win64="yes">
         <?foreach File in HotkeySettingsControl.xbf?>
@@ -729,7 +790,6 @@
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
       <ComponentRef Id="powertoysinterop_dll" />
-      <ComponentRef Id="osDetection_dll" />
       <ComponentRef Id="vcredist_dlls" />
       <ComponentRef Id="PowerToysSvgs" />
       <ComponentRef Id="Module_ShortcutGuide" />
@@ -741,8 +801,11 @@
       <ComponentRef Id="Module_PowerPreview" />
       <ComponentRef Id="Module_PowerPreview_PerUserRegistry" />
       <ComponentRef Id="Module_KeyboardManager" />
+      <ComponentRef Id="Module_ColorPicker" />
+      <ComponentRef Id="Module_ColorPicker_Resources"/>
       <ComponentRef Id="SettingsV2" />
       <ComponentRef Id="SettingsV2Assets" />
+      <ComponentRef Id="SettingsV2AssetsModules" />
       <ComponentRef Id="SettingsV2Controls" />
       <ComponentRef Id="SettingsV2Properties" />
       <ComponentRef Id="SettingsV2Styles" />
@@ -781,7 +844,7 @@
     <ComponentGroup Id="LauncherComponents">
       <Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
         <File Source="$(var.BinX64Dir)modules\Launcher\Microsoft.Launcher.dll" />
-        <?foreach File in concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;Mages.Core.dll;Microsoft.Search.Interop.dll;EntityFramework.SqlServer.dll;EntityFramework.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;NLog.dll;NLog.Extensions.Logging.dll;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;System.Text.Json.dll;sni.dll;System.Data.SQLite.EF6.dll;PowerLauncher.runtimeconfig.json;SQLite.Interop.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;WindowsInput.dll;Wox.Core.dll;Wox.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToysInterop.dll;Telemetry.dll;PowerLauncher.Telemetry.dll;PropertyChanged.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.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;MahApps.Metro.dll;ManagedCommon.dll?>
+        <?foreach File in concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;Mages.Core.dll;Microsoft.Search.Interop.dll;EntityFramework.SqlServer.dll;EntityFramework.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;NLog.dll;NLog.Extensions.Logging.dll;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;System.Text.Json.dll;sni.dll;System.Data.SQLite.EF6.dll;PowerLauncher.runtimeconfig.json;SQLite.Interop.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Wox.Core.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToysInterop.dll;Telemetry.dll;PowerLauncher.Telemetry.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.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;MahApps.Metro.dll;ManagedCommon.dll?>
           <File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\$(var.File)" />
         <?endforeach?>
         <File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Lib.dll" />
@@ -791,7 +854,7 @@
         <?endforeach?>
       </Component>  
       <Component Id="launcherImagesComponent" Directory="LauncherImagesFolder" Guid="D254220C-1DD9-4C74-8810-1AAB2F940DE8">
-        <?foreach File in app.png;app_error.png;Browser.png;calculator.png;cancel.png;close.png;cmd.png;color.png;copy.png;down.png;EXE.png;file.png;find.png;folder.png;history.png;image.png;Link.png;lock.png;logoff.png;ok.png;open.png;plugin.png;recyclebin.png;restart.png;search.png;settings.png;shutdown.png;sleep.png;up.png;update.png;warning.png?>
+        <?foreach File in app.dark.png;app.light.png;app_error.dark.png;app_error.light.png;Browser.png;calculator.png;cancel.png;close.png;cmd.png;color.png;copy.png;down.png;EXE.png;file.png;find.png;folder.png;history.png;image.png;Link.png;lock.png;logoff.png;ok.png;open.png;plugin.png;recyclebin.png;restart.png;search.png;settings.png;shutdown.png;sleep.png;up.png;update.png;warning.png?>
           <File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Images\$(var.File)" />
         <?endforeach?>
         <File Source="$(var.BinX64Dir)modules\launcher\Images\New Message.png" />
@@ -809,22 +872,8 @@
         <?endforeach?>
       </Component>
       <Component Id="calculatorImagesComponent" Directory="CalculatorImagesFolder" Guid="07EC9232-CF9A-4CDB-8D8E-E79DC75096C0">
-        <File Id="calculatorPluginImg_calculator_light" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Calculator\Images\calculator_light.png" />
-        <File Id="calculatorPluginImg_calculator_dark" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Calculator\Images\calculator_dark.png" />
-      </Component>
-       <Component Id="calculatorLanguagesComponent" Directory="CalculatorLanguagesFolder" Guid="2D8019E7-664F-4529-9FAA-83C8DACF0732">
-        <?foreach LanguageFile in de.xaml;en.xaml;pl.xaml;tr.xaml;zh-cn.xaml;zh-tw.xaml?>
-          <!--NB: Ids can't contain hyphens-->
-          <?if $(var.LanguageFile) = zh-cn.xaml?>
-            <?define IdSafeLanguage = zh_cn.xaml?>
-          <?elseif $(var.LanguageFile) = zh-tw.xaml?>
-            <?define IdSafeLanguage = zh_tw.xaml?>
-          <?else?>
-            <?define IdSafeLanguage = $(var.LanguageFile)?>
-          <?endif?>
-          <File Id="File_calc_Plugin_$(var.IdSafeLanguage)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Calculator\Languages\$(var.LanguageFile)" />
-          <?undef IdSafeLanguage?>
-        <?endforeach?>
+        <File Id="calculatorPluginImg_calculator_light" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Calculator\Images\calculator.light.png" />
+        <File Id="calculatorPluginImg_calculator_dark" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Calculator\Images\calculator.dark.png" />
       </Component>
       <Component Id="calculatorpinyindbComponent" Directory="CalculatorpinyindbFolder" Guid="D5527670-BE9A-4AA9-9D36-1249F2184B5B">
         <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>
@@ -839,24 +888,10 @@
         <?endforeach?>
       </Component>
       <Component Id="FolderImagesComponent" Directory="FolderPluginImagesFolder" Guid="6C5226EB-E312-4768-B4D1-B1D3ACFCCBDF">
-        <?foreach File in copy.png;deletefilefolder.png;file.png;folder.png;user.png?>
+        <?foreach File in 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?>
           <File Id="FolderPlugin_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Folder\Images\$(var.File)" />
         <?endforeach?>
       </Component>
-      <Component Id="FolderPluginLanguagesComponent" Directory="FolderPluginLanguagesFolder" Guid="6316D847-5FD2-488B-A60E-5517BF95A25C">
-        <?foreach LanguageFile in de.xaml;en.xaml;pl.xaml;tr.xaml;zh-cn.xaml;zh-tw.xaml?>
-          <!--NB: Ids can't contain hyphens-->
-          <?if $(var.LanguageFile) = zh-cn.xaml?>
-            <?define IdSafeLanguage = zh_cn.xaml?>
-          <?elseif $(var.LanguageFile) = zh-tw.xaml?>
-            <?define IdSafeLanguage = zh_tw.xaml?>
-          <?else?>
-            <?define IdSafeLanguage = $(var.LanguageFile)?>
-          <?endif?>
-            <File Id="File_Folder_Plugin_$(var.IdSafeLanguage)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Folder\Languages\$(var.LanguageFile)" />
-          <?undef IdSafeLanguage?>
-        <?endforeach?>
-      </Component>
       <Component Id="FolderPluginpinyindbComponent" Directory="FolderPluginpinyindbFolder" Guid="233BE087-B9DC-408A-8809-593C42DE8B1B">
         <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>
           <File Id="FolderPlugin_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Folder\pinyindb\$(var.File)" />
@@ -870,23 +905,9 @@
         <?endforeach?>
       </Component>
       <Component Id="ProgramImagesComponent" Directory="ProgramImagesFolder" Guid="30D357F5-406F-47D1-BEFE-6022746469B4">
-        <?foreach File in cmd.png;disable.png;folder.png;program.png;user.png?>
+        <?foreach File in 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?>
           <File Id="Program_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Program\Images\$(var.File)" />
         <?endforeach?>
-      </Component>
-       <Component Id="ProgramLanguagesComponent" Directory="ProgramLanguagesFolder" Guid="EBFF53B6-3602-4F55-8784-FC7DB29D3D62">
-        <?foreach LanguageFile in de.xaml;en.xaml;pl.xaml;tr.xaml;zh-cn.xaml;zh-tw.xaml?>
-          <!--NB: Ids can't contain hyphens-->
-          <?if $(var.LanguageFile) = zh-cn.xaml?>
-            <?define IdSafeLanguage = zh_cn.xaml?>
-          <?elseif $(var.LanguageFile) = zh-tw.xaml?>
-            <?define IdSafeLanguage = zh_tw.xaml?>
-          <?else?>
-            <?define IdSafeLanguage = $(var.LanguageFile)?>
-          <?endif?>
-          <File Id="File_Program_Plugin_$(var.IdSafeLanguage)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Program\Languages\$(var.LanguageFile)" />
-          <?undef IdSafeLanguage?>
-        <?endforeach?>
       </Component>
       <Component Id="ProgrampinyindbComponent" Directory="ProgrampinyindbFolder" Guid="65A488C3-C67D-45F7-9654-6DF529AEEB3F">
         <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>
@@ -901,21 +922,8 @@
         <?endforeach?>
       </Component>
       <Component Id="ShellImagesComponent" Directory="ShellImagesFolder" Guid="15B5DBAE-E7C1-4BF7-A29E-6CE76242F8F4">
-        <File Id="ShellPluginImg" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Shell\Images\shell.png" />
-        <File Id="ShellPluginUserImg" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Shell\Images\user.png" />
-      </Component>
-       <Component Id="ShellLanguagesComponent" Directory="ShellLanguagesFolder" Guid="4190F789-8A66-46AA-B920-C76CB29277D7">
-        <?foreach LanguageFile in de.xaml;en.xaml;pl.xaml;tr.xaml;zh-cn.xaml;zh-tw.xaml?>
-          <!--NB: Ids can't contain hyphens-->
-          <?if $(var.LanguageFile) = zh-cn.xaml?>
-            <?define IdSafeLanguage = zh_cn.xaml?>
-          <?elseif $(var.LanguageFile) = zh-tw.xaml?>
-            <?define IdSafeLanguage = zh_tw.xaml?>
-          <?else?>
-            <?define IdSafeLanguage = $(var.LanguageFile)?>
-          <?endif?>
-          <File Id="File_Shell_Plugin_$(var.IdSafeLanguage)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Shell\Languages\$(var.LanguageFile)" />
-          <?undef IdSafeLanguage?>
+       <?foreach File in shell.light.png;shell.dark.png;user.light.png;user.dark.png?>
+          <File Id="Shell_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Shell\Images\$(var.File)" />
         <?endforeach?>
       </Component>
       <Component Id="ShellpinyindbComponent" Directory="ShellpinyindbFolder" Guid="A60742F3-2187-47F2-A5B5-300E44837DD7">
@@ -931,7 +939,9 @@
         <?endforeach?>
       </Component>
       <Component Id="IndexerImagesComponent" Directory="IndexerImagesFolder" Guid="DB2E8D49-D104-425B-9616-952AC8CAB676">
-        <File Id="IndexerPluginImg" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Indexer\Images\WindowsIndexerImg.bmp" />
+        <?foreach File in indexer.dark.png;indexer.light.png;Warning.light.png;Warning.dark.png?>
+          <File Id="Indexer_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Indexer\Images\$(var.File)" />
+        <?endforeach?>
       </Component>
       <Component Id="IndexerpinyindbComponent" Directory="IndexerpinyindbFolder" Guid="48DE333A-80F8-400A-87F4-244DF0A2DB05">
         <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>
@@ -939,6 +949,22 @@
         <?endforeach?>
       </Component>
 
+      <!-- Uri Plugin -->
+      <Component Id="UriComponent" Directory="UriPluginFolder" Guid="C7DC8F88-554C-4375-9510-9435399B5D3D">
+        <?foreach File in plugin.json;Wox.Infrastructure.dll;Wox.Plugin.dll;Microsoft.Plugin.Uri.deps.json;Microsoft.Plugin.Uri.dll;Telemetry.dll?>
+          <File Id="Uri_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Uri\$(var.File)" />
+        <?endforeach?>
+      </Component>
+      <Component Id="UriImagesComponent" Directory="UriImagesFolder" Guid="8C9C1634-28C8-45C4-A8EA-8D4C9B4810D0">
+        <File Id="UriDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Uri\Images\Uri.dark.png" />
+        <File Id="UriLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Uri\Images\Uri.light.png" />
+      </Component>
+      <Component Id="UripinyindbComponent" Directory="UripinyindbFolder" Guid="A52A7281-CD7C-4E7D-A5A6-EA8CFCF462A2">
+        <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>
+          <File Id="UriPlugin_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.Uri\pinyindb\$(var.File)" />
+        <?endforeach?>
+      </Component>
+
       <!-- WindowWalker Plugin -->  
       <Component Id="WindowWalkerComponent" Directory="WindowWalkerPluginFolder" Guid="EB1391C9-B701-421F-80FC-ABB2FEDFAD19">
         <?foreach File in plugin.json;Wox.Infrastructure.dll;Wox.Plugin.dll;Microsoft.Plugin.WindowWalker.deps.json;Microsoft.Plugin.WindowWalker.dll;Telemetry.dll?>
@@ -946,10 +972,8 @@
         <?endforeach?>
       </Component>
       <Component Id="WindowWalkerImagesComponent" Directory="WindowWalkerImagesFolder" Guid="3944A7F5-77F4-4979-9911-EDE709B2F509">
-          <File Id="WindowWalkerIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Images\windowwalker.png" />
-      </Component>
-      <Component Id="WindowWalkerLanguagesComponent" Directory="WindowWalkerLanguagesFolder" Guid="7D9471D9-5C0A-4BD1-9A01-BAB65DD58834">
-        <File Id="WindowWalkerLanguage" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Languages\en.xaml" />
+          <File Id="WindowWalkerDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Images\windowwalker.dark.png" />
+          <File Id="WindowWalkerLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Images\windowwalker.light.png" />
       </Component>
       <Component Id="WindowWalkerpinyindbComponent" Directory="WindowWalkerpinyindbFolder" Guid="02C7A758-CDD4-4E27-9EC7-2ED68DC444B0">
         <?foreach File in pinyin_gwoyeu_mapping.xml;pinyin_mapping.xml;unicode_to_hanyu_pinyin.txt?>

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -2,6 +2,8 @@
 
 #include <ProjectTelemetry.h>
 
+#include "../../src/common/updating/updating.h"
+
 using namespace std;
 
 TRACELOGGING_DEFINE_PROVIDER(
@@ -14,7 +16,6 @@ TRACELOGGING_DEFINE_PROVIDER(
 const DWORD USERNAME_DOMAIN_LEN = DNLEN + UNLEN + 2; // Domain Name + '\' + User Name + '\0'
 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}";
 
 // Creates a Scheduled Task to run at logon for the current user.
@@ -563,52 +564,6 @@ LExit:
     return WcaFinalize(er);
 }
 
-std::optional<std::wstring> getMsiPackageInstalledPath(const wchar_t* product_upgrade_code, const wchar_t* file_component)
-{
-    constexpr size_t guid_length = 39;
-    wchar_t product_ID[guid_length];
-    if (const bool found = ERROR_SUCCESS == MsiEnumRelatedProductsW(product_upgrade_code, 0, 0, product_ID); !found)
-    {
-        return std::nullopt;
-    }
-
-    if (const bool installed = INSTALLSTATE_DEFAULT == MsiQueryProductStateW(product_ID); !installed)
-    {
-        return std::nullopt;
-    }
-
-    DWORD buf_size = MAX_PATH;
-    wchar_t buf[MAX_PATH];
-    if (ERROR_SUCCESS == MsiGetProductInfoW(product_ID, INSTALLPROPERTY_INSTALLLOCATION, buf, &buf_size) && buf_size)
-    {
-        return buf;
-    }
-
-    DWORD package_path_size = 0;
-
-    if (ERROR_SUCCESS != MsiGetProductInfoW(product_ID, INSTALLPROPERTY_LOCALPACKAGE, nullptr, &package_path_size))
-    {
-        return std::nullopt;
-    }
-    std::wstring package_path(++package_path_size, L'\0');
-
-    if (ERROR_SUCCESS != MsiGetProductInfoW(product_ID, INSTALLPROPERTY_LOCALPACKAGE, package_path.data(), &package_path_size))
-    {
-        return std::nullopt;
-    }
-    package_path.resize(size(package_path) - 1); // trim additional \0 which we got from MsiGetProductInfoW
-
-    wchar_t path[256];
-    DWORD path_size = 256;
-    MsiGetComponentPathW(product_ID, file_component, path, &path_size);
-    if (!path_size)
-    {
-        return std::nullopt;
-    }
-    PathCchRemoveFileSpec(path, path_size);
-    return path;
-}
-
 UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -617,7 +572,7 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
 
     try
     {
-        if (auto install_path = getMsiPackageInstalledPath(POWERTOYS_UPGRADE_CODE, POWERTOYS_EXE_COMPONENT))
+        if (auto install_path = updating::get_msi_package_installed_path())
         {
             MsiSetPropertyW(hInstall, L"INSTALLFOLDER", install_path->data());
         }

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -60,7 +60,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;..\..\$(PlatformShortName)\$(Configuration)\common.lib;..\..\$(PlatformShortName)\$(Configuration)\updating.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(WIX)sdk\$(WixPlatformToolset)\lib\x64;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -82,7 +82,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;..\..\$(PlatformShortName)\$(Configuration)\common.lib;..\..\$(PlatformShortName)\$(Configuration)\updating.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(WIX)sdk\$(WixPlatformToolset)\lib\x64;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -93,12 +93,12 @@
       <UACExecutionLevel>HighestAvailable</UACExecutionLevel>
     </Link>
   </ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(CIBuild)'!='true'">
+  <ItemDefinitionGroup Condition="'$(CIBuild)'!='true'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
-  </ItemDefinitionGroup>  
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="CustomAction.cpp" />
     <ClCompile Include="stdafx.cpp">

nuget.config

@@ -0,0 +1,5 @@
+<configuration>
+    <config>
+         <clear />
+    </config>
+</configuration>

src/Version.props

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Version>0.19.0</Version>
-    <DefineConstants>Version=$(Version);</DefineConstants>
+    <Version>0.23.2</Version>
   </PropertyGroup>
 </Project>

src/action_runner/LocProject.json

@@ -0,0 +1,14 @@
+{
+    "Projects": [
+        {
+            "LanguageSet": "Azure_Languages",
+            "LocItems": [
+                {
+                    "SourceFile": "src\\runner\\Resources.resx",
+                    "CopyOption": "LangIDOnName",
+                    "OutputPath": "src\\runner"
+                }
+            ]
+        }
+    ]
+}

src/action_runner/Resources.resx

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
+    <value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
+  </data>
+  <data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
+    <value>PowerToys installation error</value>
+  </data>
+</root>

src/action_runner/action_runner.base.rc

@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../version.h"
+#include "../common/version.h"
 
 1 VERSIONINFO
 FILEVERSION FILE_VERSION

src/action_runner/action_runner.cpp

@@ -7,6 +7,7 @@
 #include <common/common.h>
 #include <common/updating/updating.h>
 #include <common/updating/http_client.h>
+#include <common/updating/dotnet_installation.h>
 
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Storage.h>
@@ -15,7 +16,7 @@
 #include "../runner/tray_icon.h"
 #include "../runner/action_runner_utils.h"
 
-#include "resource.h"
+#include "Generated Files/resource.h"
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
@@ -97,7 +98,7 @@ bool install_new_version_stage_1(const std::wstring_view installer_filename, con
     }
 }
 
-bool install_new_version_stage_2(std::wstring installer_path, std::wstring_view install_path, const bool launch_powertoys)
+bool install_new_version_stage_2(std::wstring installer_path, std::wstring_view install_path, bool launch_powertoys)
 {
     std::transform(begin(installer_path), end(installer_path), begin(installer_path), ::towlower);
 
@@ -111,11 +112,28 @@ bool install_new_version_stage_2(std::wstring installer_path, std::wstring_view
     {
         // If it's not .msi, then it's our .exe installer
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
+        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
         sei.lpFile = installer_path.c_str();
         sei.nShow = SW_SHOWNORMAL;
+        std::wstring parameters = L"--no_full_ui";
+        if (launch_powertoys)
+        {
+            // .exe installer launches the main app by default
+            launch_powertoys = false;
+        }
+        else
+        {
+            parameters += L"--no_start_pt";
+        }
+        sei.lpParameters = parameters.c_str();
 
         success = ShellExecuteExW(&sei) == TRUE;
+        // Wait for the install completion
+        if (success)
+        {
+            WaitForSingleObject(sei.hProcess, INFINITE);
+            CloseHandle(sei.hProcess);
+        }
     }
 
     std::error_code _;
@@ -140,57 +158,6 @@ bool install_new_version_stage_2(std::wstring installer_path, std::wstring_view
     return true;
 }
 
-bool dotnet_is_installed()
-{
-    auto runtimes = exec_and_read_output(LR"(dotnet --list-runtimes)");
-    if (!runtimes)
-    {
-        return false;
-    }
-    const char DESKTOP_DOTNET_RUNTIME_STRING[] = "Microsoft.WindowsDesktop.App 3.1.";
-    return runtimes->find(DESKTOP_DOTNET_RUNTIME_STRING) != std::string::npos;
-}
-
-bool install_dotnet()
-{
-    const wchar_t DOTNET_DESKTOP_DOWNLOAD_LINK[] = L"https://download.visualstudio.microsoft.com/download/pr/d8cf1fe3-21c2-4baf-988f-f0152996135e/0c00b94713ee93e7ad5b4f82e2b86607/windowsdesktop-runtime-3.1.4-win-x64.exe";
-    const wchar_t DOTNET_DESKTOP_FILENAME[] = L"windowsdesktop-runtime-3.1.4-win-x64.exe";
-
-    auto dotnet_download_path = fs::temp_directory_path() / DOTNET_DESKTOP_FILENAME;
-    winrt::Windows::Foundation::Uri download_link{ DOTNET_DESKTOP_DOWNLOAD_LINK };
-
-    const size_t max_attempts = 3;
-    bool download_success = false;
-    for (size_t i = 0; i < max_attempts; ++i)
-    {
-        try
-        {
-            http::HttpClient client;
-            client.download(download_link, dotnet_download_path).wait();
-            download_success = true;
-            break;
-        }
-        catch (...)
-        {
-            // couldn't download
-        }
-    }
-    if (!download_success)
-    {
-        MessageBoxW(nullptr,
-                    GET_RESOURCE_STRING(IDS_DOTNET_CORE_DOWNLOAD_FAILURE).c_str(),
-                    GET_RESOURCE_STRING(IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE).c_str(),
-                    MB_OK | MB_ICONERROR);
-        return false;
-    }
-    SHELLEXECUTEINFOW sei{ sizeof(sei) };
-    sei.fMask = { SEE_MASK_NOASYNC };
-    sei.lpFile = dotnet_download_path.c_str();
-    sei.nShow = SW_SHOWNORMAL;
-    sei.lpParameters = L"/install /passive";
-    return ShellExecuteExW(&sei) == TRUE;
-}
-
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 {
     int nArgs = 0;
@@ -223,7 +190,8 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
             }
             else
             {
-                params = args[nextArg];
+                params += args[nextArg];
+                params += L' ';
                 nextArg++;
             }
         }
@@ -264,11 +232,18 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     }
     else if (action == L"-install_dotnet")
     {
-        if (dotnet_is_installed())
+        if (updating::dotnet_is_installed())
         {
             return 0;
         }
-        return !install_dotnet();
+        const bool success = updating::install_dotnet();
+
+        MessageBoxW(nullptr,
+                    GET_RESOURCE_STRING(IDS_DOTNET_CORE_DOWNLOAD_FAILURE).c_str(),
+                    GET_RESOURCE_STRING(IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE).c_str(),
+                    MB_OK | MB_ICONERROR);
+
+        return !success;
     }
     else if (action == L"-uninstall_msi")
     {

src/action_runner/action_runner.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,6 +19,10 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 . resource.base.h resource.h action_runner.base.rc action_runner.rc" />
+  </Target>
+
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}</ProjectGuid>
@@ -99,6 +103,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <TreatWarningAsError>true</TreatWarningAsError>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -127,6 +132,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <TreatWarningAsError>true</TreatWarningAsError>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -165,20 +171,21 @@
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="action_runner.rc" />
+    <None Include="action_runner.base.rc" />
+    <ResourceCompile Include="Generated Files/action_runner.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/action_runner/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.200514.2" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
 </packages>

src/action_runner/resource.base.h

@@ -9,8 +9,3 @@
 #define INTERNAL_NAME "action_runner"
 #define ORIGINAL_FILENAME "action_runner.exe"
 
-// Non-localizable
-//////////////////////////////
-
-#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE 101
-#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE 102

src/codeAnalysis/format_sources.ps1

@@ -28,6 +28,7 @@ function Get-Dirty-Files-From-Git() {
   $result = New-Object System.Collections.Generic.List[string]
   $staged, $unstaged, $untracked | % {
     $_.Split(" ") | 
+      where {Test-Path $_ -PathType Leaf} |
       where {$sourceExtensions.Contains((Get-Item $_).Extension)} | 
       foreach {$result.Add($_)}
   } 

src/common/LowlevelKeyboardEvent.h

@@ -0,0 +1,9 @@
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+struct LowlevelKeyboardEvent
+{
+    KBDLLHOOKSTRUCT* lParam;
+    WPARAM wParam;
+};

src/common/ManagedCommon/ManagedCommon.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\installer\Version.props" />
+  <Import Project="..\..\Version.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Platforms>x64</Platforms>
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -35,5 +35,21 @@
   <ItemGroup>
     <ProjectReference Include="..\ManagedTelemetry\Telemetry\Telemetry.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\codeAnalysis\StyleCop.json">
+      <Link>StyleCop.json</Link>
+    </AdditionalFiles>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers">
+      <Version>1.1.118</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\codeAnalysis\GlobalSuppressions.cs">
+      <Link>GlobalSuppressions.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>

src/common/ManagedCommon/NativeMethods.cs

@@ -1,14 +1,18 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace ManagedCommon
-{
-    internal static class NativeMethods
-    {
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern IntPtr OpenProcess(uint processAccess, bool bInheritHandle, int processId);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace ManagedCommon
+{
+    internal static class NativeMethods
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern IntPtr OpenProcess(uint processAccess, bool bInheritHandle, int processId);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
+    }
+}

src/common/ManagedCommon/RunnerHelper.cs

@@ -1,35 +1,37 @@
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public static class RunnerHelper
-    {
-        public static void WaitForPowerToysRunner(int powerToysPID, Action act)
-        {
-            var stackTrace = new StackTrace();
-            var assembly = Assembly.GetCallingAssembly().GetName();
-            var callingMethod = stackTrace.GetFrame(1).GetMethod().Name;
-            PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner waiting for Event powerToysPID={powerToysPID}" });
-            Task.Run(() =>
-            {
-                const uint INFINITE = 0xFFFFFFFF;
-                const uint WAIT_OBJECT_0 = 0x00000000;
-                const uint SYNCHRONIZE = 0x00100000;
-
-                IntPtr powerToysProcHandle = NativeMethods.OpenProcess(SYNCHRONIZE, false, powerToysPID);
-                if (NativeMethods.WaitForSingleObject(powerToysProcHandle, INFINITE) == WAIT_OBJECT_0)
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner Event Notified powerToysPID={powerToysPID}" });
-                    act.Invoke();
-                }
-            });
-        }
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace ManagedCommon
+{
+    public static class RunnerHelper
+    {
+        public static void WaitForPowerToysRunner(int powerToysPID, Action act)
+        {
+            var stackTrace = new StackTrace();
+            var assembly = Assembly.GetCallingAssembly().GetName();
+            var callingMethod = stackTrace.GetFrame(1).GetMethod().Name;
+            PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner waiting for Event powerToysPID={powerToysPID}" });
+            Task.Run(() =>
+            {
+                const uint INFINITE = 0xFFFFFFFF;
+                const uint WAIT_OBJECT_0 = 0x00000000;
+                const uint SYNCHRONIZE = 0x00100000;
+
+                IntPtr powerToysProcHandle = NativeMethods.OpenProcess(SYNCHRONIZE, false, powerToysPID);
+                if (NativeMethods.WaitForSingleObject(powerToysProcHandle, INFINITE) == WAIT_OBJECT_0)
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner Event Notified powerToysPID={powerToysPID}" });
+                    act.Invoke();
+                }
+            });
+        }
+    }
+}

src/common/ManagedTelemetry/Telemetry/Events/DebugEvent.cs

@@ -1,14 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-
-namespace Microsoft.PowerToys.Telemetry.Events
-{
-    [EventData]
-    public class DebugEvent : EventBase, IEvent
-    {
-        public string Message { get; set; }
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+
+namespace Microsoft.PowerToys.Telemetry.Events
+{
+    [EventData]
+    public class DebugEvent : EventBase, IEvent
+    {
+        public string Message { get; set; }
+
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs

@@ -1,16 +1,42 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Text;
-
-namespace Microsoft.PowerToys.Telemetry.Events
-{
-    /// <summary>
-    /// A base class to implement properties that are common to all telemetry events. 
-    /// </summary>
-    [EventData]
-    public class EventBase
-    {
-        public bool UTCReplace_AppSessionGuid => true;
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.Tracing;
+using System.Reflection;
+
+namespace Microsoft.PowerToys.Telemetry.Events
+{
+    /// <summary>
+    /// A base class to implement properties that are common to all telemetry events.
+    /// </summary>
+    [EventData]
+    public class EventBase
+    {
+        public bool UTCReplace_AppSessionGuid => true;
+
+        private string _version;
+
+        public string Version
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_version))
+                {
+                    _version = GetVersionFromAssembly();
+                }
+
+                return _version;
+            }
+        }
+
+        private string GetVersionFromAssembly()
+        {
+            // For consistency this should be formatted the same way as
+            // https://github.com/microsoft/PowerToys/blob/710f92d99965109fd788d85ebf8b6b9e0ba1524a/src/common/common.cpp#L635
+            var version = Assembly.GetExecutingAssembly()?.GetName()?.Version ?? new Version();
+            return $"v{version.Major}.{version.Minor}.{version.Build}";
+        }
+    }
+}

src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.PowerToys.Telemetry.Events
-{
-    public interface IEvent
-    {
-        PartA_PrivTags PartA_PrivTags { get; }
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.PowerToys.Telemetry.Events
+{
+    public interface IEvent
+    {
+        PartA_PrivTags PartA_PrivTags { get; }
+    }
+}

src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs

@@ -1,49 +1,49 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.Telemetry.Events;
-using System.Diagnostics.Tracing;
-
-
-namespace Microsoft.PowerToys.Telemetry
-{
-    /// <summary>
-    /// Telemetry helper class for PowerToys.
-    /// </summary>
-    public class PowerToysTelemetry : TelemetryBase
-    {
-       
-        /// <summary>
-        /// Name for ETW event.
-        /// </summary>
-        private const string EventSourceName = "Microsoft.PowerToys";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PowerToysTelemetry"/> class.
-        /// </summary>
-        public PowerToysTelemetry()
-            : base(EventSourceName)
-        {
-        }
-
-        /// <summary>
-        /// Gets an instance of the <see cref="PowerLauncherTelemetry"/> class.
-        /// </summary>
-        public static PowerToysTelemetry Log = new PowerToysTelemetry();
-
-        /// <summary>
-        /// Publishes ETW event when an action is triggered on 
-        /// </summary>
-        public void WriteEvent<T>(T telemetryEvent)
-            where T : EventBase, IEvent
-        {
-            this.Write<T>(null, new EventSourceOptions()
-            {
-                Keywords = ProjectKeywordMeasure,
-                Tags = ProjectTelemetryTagProductAndServicePerformance,
-            },
-            telemetryEvent);
-        }
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.Telemetry
+{
+    /// <summary>
+    /// Telemetry helper class for PowerToys.
+    /// </summary>
+    public class PowerToysTelemetry : TelemetryBase
+    {
+        /// <summary>
+        /// Name for ETW event.
+        /// </summary>
+        private const string EventSourceName = "Microsoft.PowerToys";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PowerToysTelemetry"/> class.
+        /// </summary>
+        public PowerToysTelemetry()
+            : base(EventSourceName)
+        {
+        }
+
+        /// <summary>
+        /// Gets an instance of the <see cref="PowerLauncherTelemetry"/> class.
+        /// </summary>
+        public static PowerToysTelemetry Log { get; } = new PowerToysTelemetry();
+
+        /// <summary>
+        /// Publishes ETW event when an action is triggered on
+        /// </summary>
+        public void WriteEvent<T>(T telemetryEvent)
+            where T : EventBase, IEvent
+        {
+            this.Write<T>(
+                null,
+                new EventSourceOptions()
+                {
+                    Keywords = ProjectKeywordMeasure,
+                    Tags = ProjectTelemetryTagProductAndServicePerformance,
+                },
+                telemetryEvent);
+        }
+    }
+}

src/common/ManagedTelemetry/Telemetry/Telemetry.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\..\installer\Version.props" />
+  <Import Project="..\..\..\Version.props" />
   <PropertyGroup>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
@@ -14,10 +14,27 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>PowerToys</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\..\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
   </ItemGroup>
-
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\..\codeAnalysis\StyleCop.json">
+      <Link>StyleCop.json</Link>
+    </AdditionalFiles>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers">
+      <Version>1.1.118</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">
+      <Link>GlobalSuppressions.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>

src/common/RcResource.cpp

@@ -0,0 +1,40 @@
+#include "pch.h"
+#include "RcResource.h"
+
+#include <fstream>
+
+std::optional<RcResource> RcResource::create(int resource_id, const std::wstring_view resource_class)
+{
+    const HRSRC resHandle = FindResourceW(nullptr, MAKEINTRESOURCEW(resource_id), resource_class.data());
+    if (!resHandle)
+    {
+        return std::nullopt;
+    }
+    const HGLOBAL memHandle = LoadResource(nullptr, resHandle);
+    if (!memHandle)
+    {
+        return std::nullopt;
+    }
+    const size_t resSize = SizeofResource(nullptr, resHandle);
+    if (!resSize)
+    {
+        return std::nullopt;
+    }
+    auto res = static_cast<const std::byte*>(LockResource(memHandle));
+    if (!res)
+    {
+        return std::nullopt;
+    }
+    return RcResource{ res, resSize };
+}
+
+bool RcResource::saveAsFile(const std::filesystem::path destination)
+{
+    std::fstream installerFile{ destination, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc };
+    if (!installerFile.is_open())
+    {
+        return false;
+    }
+    installerFile.write(reinterpret_cast<const char*>(_memory), _size);
+    return true;
+}

src/common/RcResource.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string_view>
+#include <optional>
+#include <filesystem>
+
+class RcResource
+{
+public:
+    const std::byte* _memory = nullptr;
+    size_t _size = 0;
+
+    static std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class);
+    bool saveAsFile(const std::filesystem::path destination);
+
+private:
+    RcResource() = delete;
+    RcResource(const std::byte* memory, size_t size) :
+        _memory{ memory }, _size{ size }
+    {
+    }
+};

src/common/RestartManagement.cpp

@@ -4,45 +4,7 @@
 #include <RestartManager.h>
 #include <Psapi.h>
 
-std::vector<RM_UNIQUE_PROCESS> GetProcessInfoByName(const std::wstring& processName)
-{
-    DWORD bytesReturned{};
-    std::vector<DWORD> processIds{};
-    processIds.resize(1024);
-    DWORD processIdSize{ (DWORD)processIds.size() * sizeof(DWORD) };
-    EnumProcesses(processIds.data(), processIdSize, &bytesReturned);
-    while (bytesReturned == processIdSize)
-    {
-        processIdSize *= 2;
-        processIds.resize(processIdSize / sizeof(DWORD));
-        EnumProcesses(processIds.data(), processIdSize, &bytesReturned);
-    }
-    std::vector<RM_UNIQUE_PROCESS> pInfos{};
-    for (const DWORD& processId : processIds)
-    {
-        HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processId);
-        if (hProcess)
-        {
-            wchar_t name[MAX_PATH];
-            if (GetProcessImageFileName(hProcess, name, MAX_PATH) > 0)
-            {
-                if (processName == PathFindFileName(name))
-                {
-                    FILETIME creationTime{};
-                    FILETIME exitTime{};
-                    FILETIME kernelTime{};
-                    FILETIME userTime{};
-                    if (GetProcessTimes(hProcess, &creationTime, &exitTime, &kernelTime, &userTime))
-                    {
-                        pInfos.push_back({ processId, creationTime });
-                    }
-                }
-            }
-            CloseHandle(hProcess);
-        }
-    }
-    return pInfos;
-}
+#include "processApi.h"
 
 void RestartProcess(const std::wstring& processName)
 {
@@ -52,7 +14,18 @@ void RestartProcess(const std::wstring& processName)
     {
         return;
     }
-    std::vector<RM_UNIQUE_PROCESS> pInfo = GetProcessInfoByName(processName);
+    auto processHandles = getProcessHandlesByName(processName, PROCESS_QUERY_INFORMATION);
+    std::vector<RM_UNIQUE_PROCESS> pInfo;
+    for (const auto& hProcess : processHandles)
+    {
+        FILETIME creationTime{};
+        FILETIME _{};
+        if (GetProcessTimes(hProcess.get(), &creationTime, &_, &_, &_))
+        {
+            pInfo.emplace_back(RM_UNIQUE_PROCESS{ GetProcessId(hProcess.get()), creationTime });
+        }
+    }
+
     if (pInfo.empty() ||
         RmRegisterResources(sessionHandle, 0, nullptr, sizeof(pInfo), pInfo.data(), 0, nullptr) != ERROR_SUCCESS)
     {

src/common/Telemetry/TelemetryBase.cs

@@ -1,59 +1,60 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.Tracing;
-
-namespace Microsoft.PowerToys.Telemetry
-{
-    /// <summary>
-    /// Privacy Tag values
-    /// </summary>
-    public enum PartA_PrivTags
-           : ulong
-    {
-        /// <nodoc/>
-        None = 0,
-
-        /// <nodoc/>
-        ProductAndServicePerformance = 0x0u,
-
-        /// <nodoc/>
-        ProductAndServiceUsage = 0x0u,
-    }
-
-    /// <summary>
-    /// Base class for telemetry events.
-    /// </summary>
-    public class TelemetryBase : EventSource
-    {
-        /// <summary>
-        /// The event tag for this event source.
-        /// </summary>
-        public const EventTags ProjectTelemetryTagProductAndServicePerformance = (EventTags)0x0u;
-
-        /// <summary>
-        /// The event keyword for this event source.
-        /// </summary>
-        public const EventKeywords ProjectKeywordMeasure = (EventKeywords)0x0;
-
-        /// <summary>
-        /// Group ID for Powertoys project.
-        /// </summary>
-        private static readonly string[] PowerToysTelemetryTraits = { "ETW_GROUP", "{42749043-438c-46a2-82be-c6cbeb192ff2}" };
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TelemetryBase"/> class.
-        /// </summary>
-        /// <param name="eventSourceName">.</param>
-        public TelemetryBase(
-            string eventSourceName)
-            : base(
-            eventSourceName,
-            EventSourceSettings.EtwSelfDescribingEventFormat,
-            PowerToysTelemetryTraits)
-        {
-            return;
-        }
-    }
-}
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+
+// WARNING: THIS FILE GETS REPLACED ON THE BUILD FARM
+namespace Microsoft.PowerToys.Telemetry
+{
+    /// <summary>
+    /// Privacy Tag values
+    /// </summary>
+    public enum PartA_PrivTags
+           : ulong
+    {
+        /// <nodoc/>
+        None = 0,
+
+        /// <nodoc/>
+        ProductAndServicePerformance = 0x0u,
+
+        /// <nodoc/>
+        ProductAndServiceUsage = 0x0u,
+    }
+
+    /// <summary>
+    /// Base class for telemetry events.
+    /// </summary>
+    public class TelemetryBase : EventSource
+    {
+        /// <summary>
+        /// The event tag for this event source.
+        /// </summary>
+        public const EventTags ProjectTelemetryTagProductAndServicePerformance = (EventTags)0x0u;
+
+        /// <summary>
+        /// The event keyword for this event source.
+        /// </summary>
+        public const EventKeywords ProjectKeywordMeasure = (EventKeywords)0x0;
+
+        /// <summary>
+        /// Group ID for Powertoys project.
+        /// </summary>
+        private static readonly string[] PowerToysTelemetryTraits = { "ETW_GROUP", "{42749043-438c-46a2-82be-c6cbeb192ff2}" };
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TelemetryBase"/> class.
+        /// </summary>
+        /// <param name="eventSourceName">.</param>
+        public TelemetryBase(
+            string eventSourceName)
+            : base(
+            eventSourceName,
+            EventSourceSettings.EtwSelfDescribingEventFormat,
+            PowerToysTelemetryTraits)
+        {
+            return;
+        }
+    }
+}

src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -99,6 +99,8 @@
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</MultiProcessorCompilation>
+      <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</MultiProcessorCompilation>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -119,20 +121,20 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ResourceCompile Include="UnitTests-CommonLib.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="UnitTests-CommonLib.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>