add missing powertoys events

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

@@ -95,7 +95,6 @@ OTP
 Yubi
 Yubico
 Perplexity
-Groq
 svgl
 
 # KEYS
@@ -329,13 +328,3 @@ FFF
 HHH
 riday
 YYY
-
-# GitHub issue/PR commands
-azp
-feedbackhub
-needinfo
-reportbug
-
-#ffmpeg
-crf
-nostdin

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

@@ -141,11 +141,8 @@ BITSPIXEL
 bla
 BLACKFRAME
 BLENDFUNCTION
-blittable
 Blockquotes
 blt
-bluelightreduction
-bluelightreductionstate
 BLURBEHIND
 BLURREGION
 bmi
@@ -252,7 +249,6 @@ colorformat
 colorhistory
 colorhistorylimit
 COLORKEY
-colorref
 comctl
 comdlg
 comexp
@@ -324,6 +320,7 @@ CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
+CVS
 CWMO
 CXSCREEN
 CXSMICON
@@ -731,9 +728,9 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
-icf
 IDCANCEL
 IDD
 idk
@@ -776,7 +773,6 @@ INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
 inlines
-Inno
 INPC
 inproc
 INPUTHARDWARE
@@ -1114,7 +1110,6 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
-nightlight
 NLog
 NLSTEXT
 NMAKE
@@ -1485,7 +1480,6 @@ rgh
 rgn
 rgs
 rguid
-rhk
 RIDEV
 RIGHTSCROLLBAR
 riid
@@ -1591,7 +1585,6 @@ SHGDNF
 SHGFI
 SHIL
 shinfo
-shk
 shlwapi
 shobjidl
 SHORTCUTATLEAST
@@ -1636,7 +1629,6 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
-slnx
 SMALLICON
 smartphone
 smileys
@@ -1850,14 +1842,11 @@ uitests
 UITo
 ULONGLONG
 ums
-UMax
-UMin
 uncompilable
 UNCPRIORITY
 UNDNAME
 UNICODETEXT
 unins
-Uninstaller
 uninstalls
 Uniquifies
 unitconverter
@@ -1865,7 +1854,6 @@ unittests
 UNLEN
 UNORM
 unremapped
-Unsubscribes
 unvirtualized
 unwide
 unzoom
@@ -1950,7 +1938,7 @@ vswhere
 Vtbl
 WANTNUKEWARNING
 WANTPALM
-WASDK
+wasdk
 wbem
 WBounds
 Wca

.pipelines/ESRPSigning_core.json

@@ -60,8 +60,6 @@
             "PowerToys.FancyZonesEditorCommon.dll",
             "PowerToys.FancyZonesModuleInterface.dll",
             "PowerToys.FancyZones.exe",
-            "FancyZonesCLI.exe",
-            "FancyZonesCLI.dll",
 
             "PowerToys.GcodePreviewHandler.dll",
             "PowerToys.GcodePreviewHandler.exe",
@@ -353,11 +351,6 @@
                 "Microsoft.SemanticKernel.Connectors.Ollama.dll",
                 "OllamaSharp.dll",
 
-                "boost_regex-vc143-mt-gd-x32-1_87.dll",
-                "boost_regex-vc143-mt-gd-x64-1_87.dll",
-                "boost_regex-vc143-mt-x32-1_87.dll",
-                "boost_regex-vc143-mt-x64-1_87.dll",
-
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
                 "Wpf.Ui.dll"

.pipelines/UpdateVersions.ps1

@@ -1,7 +1,7 @@
 Param(
   # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.8",
+  [string]$winAppSdkVersionNumber = "1.7",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
@@ -16,7 +16,32 @@ Param(
   [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
+function Update-NugetConfig {
+    param (
+        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
+    )
 
+    Write-Host "Updating nuget.config file"
+    [xml]$xml = Get-Content -Path $filePath
+
+    # Add localpackages source into nuget.config
+    $packageSourcesNode = $xml.configuration.packageSources
+    $addNode = $xml.CreateElement("add")
+    $addNode.SetAttribute("key", "localpackages")
+    $addNode.SetAttribute("value", "localpackages")
+    $packageSourcesNode.AppendChild($addNode) | Out-Null
+
+    # Remove <packageSourceMapping> tag and its content
+    $packageSourceMappingNode = $xml.configuration.packageSourceMapping
+    if ($packageSourceMappingNode) {
+        $xml.configuration.RemoveChild($packageSourceMappingNode) | Out-Null
+    }
+
+    # print nuget.config after modification
+    $xml.OuterXml
+    # Save the modified nuget.config file
+    $xml.Save($filePath)
+}
 
 function Read-FileWithEncoding {
     param (
@@ -46,132 +71,6 @@ function Write-FileWithEncoding {
     $writer.Close()
 }
 
-
-function Add-NuGetSourceAndMapping {
-    param (
-        [xml]$Xml,
-        [string]$Key,
-        [string]$Value,
-        [string[]]$Patterns
-    )
-
-    # Ensure packageSources exists
-    if (-not $Xml.configuration.packageSources) {
-        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
-    }
-    $sources = $Xml.configuration.packageSources
-
-    # Add/Update Source
-    $sourceNode = $sources.SelectSingleNode("add[@key='$Key']")
-    if (-not $sourceNode) {
-        $sourceNode = $Xml.CreateElement("add")
-        $sourceNode.SetAttribute("key", $Key)
-        $sources.AppendChild($sourceNode) | Out-Null
-    }
-    $sourceNode.SetAttribute("value", $Value)
-
-    # Ensure packageSourceMapping exists
-    if (-not $Xml.configuration.packageSourceMapping) {
-        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
-    }
-    $mapping = $Xml.configuration.packageSourceMapping
-
-    # Remove invalid packageSource nodes (missing key or empty key)
-    $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
-    if ($invalidNodes) {
-        foreach ($node in $invalidNodes) {
-            $mapping.RemoveChild($node) | Out-Null
-        }
-    }
-
-    # Add/Update Mapping Source
-    $mappingSource = $mapping.SelectSingleNode("packageSource[@key='$Key']")
-    if (-not $mappingSource) {
-        $mappingSource = $Xml.CreateElement("packageSource")
-        $mappingSource.SetAttribute("key", $Key)
-        # Insert at top for priority
-        if ($mapping.HasChildNodes) {
-            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
-        } else {
-            $mapping.AppendChild($mappingSource) | Out-Null
-        }
-    }
-    
-    # Double check and force attribute
-    if (-not $mappingSource.HasAttribute("key")) {
-         $mappingSource.SetAttribute("key", $Key)
-    }
-
-    # Update Patterns
-    # RemoveAll() removes all child nodes AND attributes, so we must re-set the key afterwards
-    $mappingSource.RemoveAll()
-    $mappingSource.SetAttribute("key", $Key)
-
-    foreach ($pattern in $Patterns) {
-        $pkg = $Xml.CreateElement("package")
-        $pkg.SetAttribute("pattern", $pattern)
-        $mappingSource.AppendChild($pkg) | Out-Null
-    }
-}
-
-function Resolve-WinAppSdkSplitDependencies {
-    Write-Host "Version $WinAppSDKVersion detected. Resolving split dependencies..."
-    $installDir = Join-Path $rootPath "localpackages\output"
-    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
-
-    # Create a temporary nuget.config to avoid interference from the repo's config
-    $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
-    Set-Content -Path $tempConfig -Value "<?xml version='1.0' encoding='utf-8'?><configuration><packageSources><clear /><add key='TempSource' value='$sourceLink' /></packageSources></configuration>"
-
-    try {
-        # Extract BuildTools version from Directory.Packages.props to ensure we have the required version
-        $dirPackagesProps = Join-Path $rootPath "Directory.Packages.props"
-        if (Test-Path $dirPackagesProps) {
-            $propsContent = Get-Content $dirPackagesProps -Raw
-            if ($propsContent -match '<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="([^"]+)"') {
-                $buildToolsVersion = $Matches[1]
-                Write-Host "Downloading Microsoft.Windows.SDK.BuildTools version $buildToolsVersion..."
-                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
-                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
-            }
-        }
-
-        # Download package to inspect nuspec and keep it for the build
-        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
-        Invoke-Expression "nuget $nugetArgs" | Out-Null
-
-        # Parse dependencies from the installed folders
-        # Folder structure is typically {PackageId}.{Version}
-        $directories = Get-ChildItem -Path $installDir -Directory
-        $allLocalPackages = @()
-        foreach ($dir in $directories) {
-            # Match any package pattern: PackageId.Version
-            if ($dir.Name -match "^(.+?)\.(\d+\..*)$") {
-                $pkgId = $Matches[1]
-                $pkgVer = $Matches[2]
-                $allLocalPackages += $pkgId
-
-                $packageVersions[$pkgId] = $pkgVer
-                Write-Host "Found dependency: $pkgId = $pkgVer"
-            }
-        }
-
-        # Update repo's nuget.config to use localpackages
-        $nugetConfig = Join-Path $rootPath "nuget.config"
-        $configData = Read-FileWithEncoding -Path $nugetConfig
-        [xml]$xml = $configData.Content
-
-        Add-NuGetSourceAndMapping -Xml $xml -Key "localpackages" -Value $installDir -Patterns $allLocalPackages
-
-        $xml.Save($nugetConfig)
-        Write-Host "Updated nuget.config with localpackages mapping."
-    } catch {
-        Write-Warning "Failed to resolve dependencies: $_"
-    } finally {
-        Remove-Item $tempConfig -Force -ErrorAction SilentlyContinue
-    }
-}
-
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
     # The nuget list for experimental versions will cost more time
@@ -213,36 +112,56 @@ if ($latestVersion) {
     exit 1
 }
 
-# Resolve dependencies for 1.8+
-$packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
-
-Resolve-WinAppSdkSplitDependencies
+# Update packages.config files
+Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
+    if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
+        $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
+        $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $_.FullName 
+    }
+}
 
 # Update Directory.Packages.props file
 Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
     $content = $file.Content
-    $isModified = $false
-    
-    foreach ($pkgId in $packageVersions.Keys) {
-        $ver = $packageVersions[$pkgId]
-        # Escape dots in package ID for regex
-        $pkgIdRegex = $pkgId -replace '\.', '\.'
-        
-        $newVersionString = "<PackageVersion Include=""$pkgId"" Version=""$ver"" />"
-        $oldVersionString = "<PackageVersion Include=""$pkgIdRegex"" Version=""[-.0-9a-zA-Z]*"" />"
-
-        if ($content -match "<PackageVersion Include=""$pkgIdRegex""") {
-            # Update existing package
-            if ($content -notmatch [regex]::Escape($newVersionString)) {
-                $content = $content -replace $oldVersionString, $newVersionString
-                $isModified = $true
-            }
-        }
-    }
-
-    if ($isModified) {
+    if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
+        $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
+        $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
+        $content = $content -replace $oldVersionString, $newVersionString
         Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName
     }
 }
+
+# Update .vcxproj files
+Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
+    if ($content -match '\\Microsoft.WindowsAppSDK.') {
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.(?=[-.0-9a-zA-Z]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
+        $content = $content -replace $oldVersionString, $newVersionString
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $_.FullName
+    }
+}
+
+# Update .csproj files
+Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
+    if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
+        $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
+        $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $_.FullName 
+    }
+}
+
+Update-NugetConfig

.pipelines/packages.config

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

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.8
+    default: 1.7
   - name: useExperimentalVersion
     type: boolean
     default: false

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

@@ -129,7 +129,7 @@ jobs:
       MSBuildMainBuildTargets: Build
     ${{ insert }}: ${{ parameters.variables }}
     ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
-      RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages" /p:IgnoreExperimentalWarnings=true'
+      RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"'
     ${{ else }}:
       RestoreAdditionalProjectSourcesArg: ''
   displayName: Build
@@ -192,14 +192,14 @@ jobs:
     displayName: Verify XAML formatting
 
   - pwsh: |-
-      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
-    displayName: Verify Nuget package versions for PowerToys.slnx
+      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+    displayName: Verify Nuget package versions for PowerToys.sln
 
   - pwsh: |-
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
     displayName: Verify ARM64 configurations
 
   - ${{ if eq(parameters.enablePackageCaching, true) }}:
@@ -252,7 +252,7 @@ jobs:
     ${{ else }}:
       displayName: Build PowerToys main project
     inputs:
-      solution: 'PowerToys.slnx'
+      solution: 'PowerToys.sln'
       vsVersion: 17.0
       msbuildArgs: >-
         -restore -graph
@@ -275,7 +275,7 @@ jobs:
     displayName: Generate DSC artifacts for ARM64
     condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
     inputs:
-      solution: PowerToys.slnx
+      solution: PowerToys.sln
       vsVersion: 17.0
       msbuildArgs: >-
         -restore

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

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

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

@@ -35,7 +35,7 @@ steps:
   - task: VSBuild@1
     displayName: Build Shared Support DLLs
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
@@ -74,7 +74,7 @@ steps:
   - task: VSBuild@1
     displayName: 💻 Build VNext MSI
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
@@ -91,7 +91,7 @@ steps:
   - task: VSBuild@1
     displayName: 👤 Build VNext MSI
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysInstallerVNext
@@ -142,7 +142,7 @@ steps:
   - task: VSBuild@1
     displayName: 💻 Build VNext Bootstrapper
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
@@ -159,7 +159,7 @@ steps:
   - task: VSBuild@1
     displayName: 👤 Build VNext Bootstrapper
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysBootstrapperVNext

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

@@ -19,20 +19,39 @@ steps:
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
       -rootPath "$(build.sourcesdirectory)"
 
-# - task: NuGetCommand@2
-#   displayName: 'Restore NuGet packages (slnx)'
-#   inputs:
-#     command: 'restore'
-#     feedsToUse: 'config'
-#     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-#     restoreSolution: '$(build.sourcesdirectory)\**\*.slnx'
-#     includeNuGetOrg: false
+- script: echo $(WinAppSDKVersion)
+  displayName: 'Display WinAppSDK Version Found'
 
-- task: DotNetCoreCLI@2
-  displayName: 'Restore NuGet packages (dotnet)'
+- task: DownloadPipelineArtifact@2
+  displayName: 'Download WindowsAppSDK'
+  inputs:
+    buildType: 'specific'
+    project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
+    definition: '104083'
+    buildVersionToDownload: 'latestFromBranch'
+    branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
+    artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
+    targetPath: '$(Build.SourcesDirectory)\localpackages'
+
+- script: dir $(Build.SourcesDirectory)\localpackages\NugetPackages
+  displayName: 'List downloaded packages'
+
+- task: NuGetCommand@2
+  displayName: 'Install WindowsAppSDK'
+  inputs:
+    command: 'custom'
+    arguments: >
+      install "Microsoft.WindowsAppSDK"
+      -Source "$(Build.SourcesDirectory)\localpackages\NugetPackages"
+      -Version "$(WinAppSDKVersion)"
+      -OutputDirectory "$(Build.SourcesDirectory)\localpackages\output"
+      -FallbackSource "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+
+- task: NuGetCommand@2
+  displayName: 'Restore NuGet packages'
   inputs:
     command: 'restore'
-    projects: '$(build.sourcesdirectory)\**\*.slnx'
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-    workingDirectory: '$(build.sourcesdirectory)'
+    restoreSolution: '$(build.sourcesdirectory)\**\*.sln'
+    includeNuGetOrg: false

.pipelines/versionAndSignCheck.ps1

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

COMMUNITY.md

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

Cpp.Build.props

@@ -42,11 +42,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <!-- Make angle-bracket includes external and turn off code analysis for them -->
-      <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
-      <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
-      <DisableAnalyzeExternal>true</DisableAnalyzeExternal>
-
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -116,11 +111,13 @@
   </PropertyGroup>
 
   <!-- Debug/Release props -->
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'"
+    Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'"
+    Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <LinkIncremental>false</LinkIncremental>

DATA_AND_PRIVACY.md

@@ -262,7 +262,6 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Command Palette
-
 <table style="width:100%">
   <tr>
     <th>Event Name</th>
@@ -316,14 +315,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.CmdPalProcessStarted</td>
     <td>Triggered when the Command Palette process is started.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_ExtensionInvoked</td>
-    <td>Tracks extension usage including extension ID, command details, success status, and execution time.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_SessionDuration</td>
-    <td>Logs session metrics from launch to dismissal including duration, commands executed, pages visited, search queries, navigation depth, and errors.</td>
-  </tr>
 </table>
 
 ### Crop And Lock

Directory.Build.targets

@@ -8,24 +8,4 @@
   <PropertyGroup Label="ManifestToolOverride">
     <ManifestTool Condition="Exists('$(WindowsSdkDir)bin\x64\mt.exe')">$(WindowsSdkDir)bin\x64\mt.exe</ManifestTool>
   </PropertyGroup>
-
-  <!-- Auto-restore NuGet for native vcxproj (PackageReference) when building inside VS -->
-  <Target Name="EnsureNuGetRestoreForVcxproj" BeforeTargets="PrepareForBuild" Condition="
-            '$(BuildingInsideVisualStudio)' == 'true'
-            and '$(DesignTimeBuild)' != 'true'
-            and '$(RestoreInProgress)' != 'true'
-            and '$(MSBuildProjectExtension)' == '.vcxproj'
-            and '$(RestoreProjectStyle)' == 'PackageReference'
-            and '$(MSBuildProjectExtensionsPath)' != ''
-            and !Exists('$(MSBuildProjectExtensionsPath)project.assets.json')
-          ">
-
-    <Message Importance="normal" Text="NuGet assets missing for $(MSBuildProjectName); running Restore...; IntDir=$(IntDir); BaseIntermediateOutputPath=$(BaseIntermediateOutputPath)" />
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Restore" Properties="RestoreInProgress=true" BuildInParallel="false" />
-  </Target>
-
-  <PropertyGroup Condition="'$(IgnoreExperimentalWarnings)' == 'true'">
-    <NoWarn>$(NoWarn);CS8305;SA1500;CA1852</NoWarn>
-  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -7,8 +7,6 @@
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
     <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
-    <PackageVersion Include="boost" Version="1.87.0" TargetFramework="native" />
-    <PackageVersion Include="boost_regex-vc143" Version="1.87.0" TargetFramework="native" />
     <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
@@ -40,7 +38,6 @@
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
@@ -72,12 +69,10 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.39" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.251106002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
@@ -116,7 +111,6 @@
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
     <PackageVersion Include="System.Management" Version="9.0.10" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Numerics.Tensors" Version="9.0.11" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Caching" Version="9.0.10" />
@@ -124,7 +118,6 @@
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
     <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="ToolGood.Words.Pinyin" Version="3.1.0.3" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />

NOTICE.md

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

doc/devdocs/commands.md

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

doc/devdocs/core/installer.md

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

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

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

doc/devdocs/development/debugging.md

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

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

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

doc/devdocs/development/ui-tests.md

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

doc/devdocs/localization.md

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

doc/devdocs/modules/alwaysontop.md

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

doc/devdocs/modules/fancyzones.md

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

doc/devdocs/modules/keyboardmanager/debug.md

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

doc/devdocs/modules/lightswitch.md

@@ -92,7 +92,7 @@ The module’s settings are exposed in the PowerToys Settings UI. Options includ
 3. Build the solution:
 
    ```sh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.slnx
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
    ```
 
    > Note: This may take some time.

doc/devdocs/modules/screenruler.md

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

doc/devdocs/modules/shortcut_guide.md

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

doc/devdocs/readme.md

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

doc/thirdPartyRunPlugins.md

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

installer/PowerToysSetup.sln

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

installer/PowerToysSetup.slnx

@@ -1,22 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="ARM64" />
-    <Platform Name="x64" />
-  </Configurations>
-  <Project Path="../src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="../src/common/Telemetry/EtwTrace/EtwTrace.vcxproj" Id="8f021b46-362b-485c-bfba-ccf83e820cbd" />
-  <Project Path="../src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
-  <Project Path="../src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj" Id="b3a354b0-1e54-4b55-a962-fb5af9330c19">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/PowerToysInstallerVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj" Id="f8b9f842-f5c3-4a2d-8c85-7f8b9e2b4f1d">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-</Solution>

installer/PowerToysSetupVNext/Product.wxs

@@ -124,7 +124,7 @@
       <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
-      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed AND WINDOWSBUILDNUMBER &gt;= 22000" />
+      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->

src/RunnerV2/RunnerV2/Extensions/PackageVersionExtensions.cs

@@ -1,17 +0,0 @@
-// 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 Windows.ApplicationModel;
-
-namespace RunnerV2.Extensions
-{
-    internal static class PackageVersionExtensions
-    {
-        public static Version ToVersion(this PackageVersion packageVersion)
-        {
-            return new Version(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/COMUtils.cs

@@ -1,57 +0,0 @@
-// 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 RunnerV2.Helpers
-{
-    internal static class COMUtils
-    {
-        public static void InitializeCOMSecurity(string securityDescriptor)
-        {
-            if (!NativeMethods.ConvertStringSecurityDescriptorToSecurityDescriptorW(
-                securityDescriptor,
-                1,
-                out IntPtr pSD,
-                out _))
-            {
-                return;
-            }
-
-            uint absoluteSDSize = 0;
-            uint daclSize = 0;
-            uint groupSize = 0;
-            uint ownerSize = 0;
-            uint saclSize = 0;
-
-            if (!NativeMethods.MakeAbsoluteSD(pSD, IntPtr.Zero, ref absoluteSDSize, IntPtr.Zero, ref daclSize, IntPtr.Zero, ref saclSize, IntPtr.Zero, ref ownerSize, IntPtr.Zero, ref groupSize))
-            {
-                return;
-            }
-
-            IntPtr absoluteSD = Marshal.AllocHGlobal((int)absoluteSDSize);
-            IntPtr dacl = Marshal.AllocHGlobal((int)daclSize);
-            IntPtr sacl = Marshal.AllocHGlobal((int)saclSize);
-            IntPtr owner = Marshal.AllocHGlobal((int)ownerSize);
-            IntPtr group = Marshal.AllocHGlobal((int)groupSize);
-
-            if (!NativeMethods.MakeAbsoluteSD(pSD, absoluteSD, ref absoluteSDSize, dacl, ref daclSize, sacl, ref saclSize, owner, ref ownerSize, group, ref groupSize))
-            {
-                return;
-            }
-
-            _ = NativeMethods.CoInitializeSecurity(
-                absoluteSD,
-                -1,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                6, // RPC_C_AUTHN_LEVEL_PKT_PRIVACY
-                2, // RPC_C_IMP_LEVEL_IDENTIFY
-                IntPtr.Zero,
-                64 | 4096, // EOAC_DYNAMIC_CLOAKING | EOAC_DISABLE_AAA
-                IntPtr.Zero);
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs

@@ -1,218 +0,0 @@
-// 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.Collections.Generic;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Windows.System;
-
-namespace RunnerV2.Helpers
-{
-    internal static class CentralizedKeyboardHookManager
-    {
-        private static readonly UIntPtr _ignoreKeyEventFlag = 0x5555;
-
-        private static readonly Dictionary<string, List<(HotkeySettings HotkeySettings, Action Action)>> _keyboardHooks = [];
-
-        private static HotkeySettingsControlHook _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
-
-        private static void OnKeyDown(int key)
-        {
-            if ((VirtualKey)key == VirtualKey.RightMenu && _ctrlState)
-            {
-                _ctrlAltState = true;
-            }
-
-            switch ((VirtualKey)key)
-            {
-                case VirtualKey.Control:
-                case VirtualKey.LeftControl:
-                case VirtualKey.RightControl:
-                    _ctrlState = true;
-                    break;
-                case VirtualKey.Menu:
-                case VirtualKey.LeftMenu:
-                case VirtualKey.RightMenu:
-                    _altState = true;
-                    break;
-                case VirtualKey.Shift:
-                case VirtualKey.LeftShift:
-                case VirtualKey.RightShift:
-                    _shiftState = true;
-                    break;
-                case VirtualKey.LeftWindows:
-                case VirtualKey.RightWindows:
-                    _winState = true;
-                    break;
-                default:
-                    if (OnKeyboardEvent(new HotkeySettings
-                    {
-                        Code = key,
-                        Ctrl = _ctrlState,
-                        Alt = _altState,
-                        Shift = _shiftState,
-                        Win = _winState,
-                    }))
-                    {
-                        return;
-                    }
-
-                    break;
-            }
-
-            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyDown);
-        }
-
-        private static void OnKeyUp(int key)
-        {
-            switch ((VirtualKey)key)
-            {
-                case VirtualKey.Control:
-                case VirtualKey.LeftControl:
-                case VirtualKey.RightControl:
-                    _ctrlState = false;
-                    break;
-                case VirtualKey.Menu:
-                case VirtualKey.LeftMenu:
-                case VirtualKey.RightMenu:
-                    _altState = false;
-                    break;
-                case VirtualKey.Shift:
-                case VirtualKey.LeftShift:
-                case VirtualKey.RightShift:
-                    _shiftState = false;
-                    break;
-                case VirtualKey.LeftWindows:
-                case VirtualKey.RightWindows:
-                    _winState = false;
-                    break;
-            }
-
-            // Correctly release Ctrl key if Ctrl+Alt (AltGr) was used.
-            if (_ctrlAltState && (VirtualKey)key == VirtualKey.RightMenu)
-            {
-                _ctrlAltState = false;
-                _ctrlState = false;
-
-                SendSingleKeyboardInput((short)VirtualKey.LeftControl, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
-            }
-
-            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
-        }
-
-        private static bool _ctrlState;
-        private static bool _altState;
-        private static bool _shiftState;
-        private static bool _winState;
-        private static bool _ctrlAltState;
-
-        private static bool _isActive;
-
-        private static bool IsActive()
-        {
-            return _isActive;
-        }
-
-        public static void AddKeyboardHook(string moduleName, HotkeySettings hotkeySettings, Action action)
-        {
-#pragma warning disable CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
-            if (!_keyboardHooks.ContainsKey(moduleName))
-            {
-                _keyboardHooks[moduleName] = [];
-            }
-#pragma warning restore CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
-
-            _keyboardHooks[moduleName].Add((hotkeySettings, action));
-        }
-
-        public static void RemoveAllHooksFromModule(string moduleName)
-        {
-            _keyboardHooks.Remove(moduleName);
-        }
-
-        private static bool OnKeyboardEvent(HotkeySettings pressedHotkey)
-        {
-            bool shortcutHandled = false;
-
-            foreach (var moduleHooks in _keyboardHooks.Values)
-            {
-                foreach (var (hotkeySettings, action) in moduleHooks)
-                {
-                    if (hotkeySettings == pressedHotkey)
-                    {
-                        action();
-                        shortcutHandled = true;
-                    }
-                }
-            }
-
-            return shortcutHandled;
-        }
-
-        public static void Start()
-        {
-            if (_hotkeySettingsControlHook.GetDisposedState())
-            {
-                _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
-            }
-
-            _isActive = true;
-        }
-
-        public static void Stop()
-        {
-            _isActive = false;
-            _hotkeySettingsControlHook.Dispose();
-        }
-
-        // Function to send a single key event to the system which would be ignored by the hotkey control.
-        private static void SendSingleKeyboardInput(short keyCode, uint keyStatus)
-        {
-            if (IsExtendedVirtualKey(keyCode))
-            {
-               keyStatus |= (uint)NativeKeyboardHelper.KeyEventF.ExtendedKey;
-            }
-
-            NativeKeyboardHelper.INPUT input = new()
-            {
-                type = NativeKeyboardHelper.INPUTTYPE.INPUT_KEYBOARD,
-                data = new NativeKeyboardHelper.InputUnion
-                {
-                    ki = new NativeKeyboardHelper.KEYBDINPUT
-                    {
-                        wVk = keyCode,
-                        dwFlags = keyStatus,
-                        dwExtraInfo = _ignoreKeyEventFlag,
-                    },
-                },
-            };
-
-            NativeKeyboardHelper.INPUT[] inputs = [input];
-
-            _ = NativeMethods.SendInput(1, inputs, NativeKeyboardHelper.INPUT.Size);
-        }
-
-        private static bool IsExtendedVirtualKey(short vk)
-        {
-            return vk switch
-            {
-                0xA5 => true, // VK_RMENU (Right Alt - AltGr)
-                0xA3 => true, // VK_RCONTROL
-                0x2D => true, // VK_INSERT
-                0x2E => true, // VK_DELETE
-                0x23 => true, // VK_END
-                0x24 => true, // VK_HOME
-                0x21 => true, // VK_PRIOR (Page Up)
-                0x22 => true, // VK_NEXT (Page Down)
-                0x25 => true, // VK_LEFT
-                0x26 => true, // VK_UP
-                0x27 => true, // VK_RIGHT
-                0x28 => true, // VK_DOWN
-                0x90 => true, // VK_NUMLOCK
-                _ => false,
-            };
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/ElevationHelper.cs

@@ -1,90 +0,0 @@
-// 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.Runtime.InteropServices;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2.Helpers
-{
-    internal static partial class ElevationHelper
-    {
-        internal static RestartScheduledMode RestartScheduled { get; set; } = RestartScheduledMode.None;
-
-        internal enum RestartScheduledMode
-        {
-            None,
-            RestartElevated,
-            RestartElevatedWithOpenSettings,
-            RestartNonElevated,
-        }
-
-        private static bool? _cachedValue;
-
-        internal static void RestartIfScheudled()
-        {
-            switch (RestartScheduled)
-            {
-                case RestartScheduledMode.None:
-                    return;
-                case RestartScheduledMode.RestartElevated:
-                    RestartAsAdministrator("--restartedElevated");
-                    break;
-                case RestartScheduledMode.RestartElevatedWithOpenSettings:
-                    RestartAsAdministrator("--restartedElevated --open-settings");
-                    break;
-                case RestartScheduledMode.RestartNonElevated:
-                    // Todo: restart unelevated
-                    break;
-            }
-        }
-
-        private static void RestartAsAdministrator(string arguments)
-        {
-            ProcessStartInfo processStartInfo = new()
-            {
-                Arguments = arguments,
-                Verb = "runas",
-                UseShellExecute = true,
-                FileName = Environment.ProcessPath,
-            };
-
-            try
-            {
-                Process.Start(processStartInfo);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Failed to restart as administrator: " + ex);
-            }
-        }
-
-        internal static bool IsProcessElevated(bool useCachedValue = true)
-        {
-            if (_cachedValue is not null && useCachedValue)
-            {
-                return _cachedValue.Value;
-            }
-
-            bool elevated = false;
-            if (OpenProcessToken(Process.GetCurrentProcess().Handle, TOKENQUERY, out nint token))
-            {
-                TokenElevation elevation = default;
-                if (GetTokenInformation(token, TOKEN_INFORMATION_CLASS.TOKEN_ELEVATION, ref elevation, (uint)Marshal.SizeOf(elevation), out uint _))
-                {
-                    elevated = elevation.TokenIsElevated != 0;
-                }
-
-                if (token != IntPtr.Zero)
-                {
-                    CloseHandle(token);
-                }
-            }
-
-            _cachedValue = elevated;
-            return elevated;
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/HotkeyManager.cs

@@ -1,62 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using ManagedCommon;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2.Helpers
-{
-    internal static partial class HotkeyManager
-    {
-        private static readonly Dictionary<int, Action> _hotkeyActions = [];
-
-        [STAThread]
-        public static void EnableHotkey(HotkeyEx hotkey, Action onHotkey)
-        {
-            if (_hotkeyActions.ContainsKey(hotkey.Identifier))
-            {
-                DisableHotkey(hotkey);
-            }
-
-            _hotkeyActions[hotkey.Identifier] = onHotkey;
-
-            if (!RegisterHotKey(Runner.RunnerHwnd, hotkey.Identifier, hotkey.ModifiersMask, hotkey.VkCode))
-            {
-                Console.WriteLine("Failed to register hotkey: " + hotkey);
-                var lastError = Marshal.GetLastWin32Error();
-                Console.WriteLine("LastError: " + lastError);
-            }
-        }
-
-        [STAThread]
-        public static void DisableHotkey(HotkeyEx hotkey)
-        {
-            if (!_hotkeyActions.ContainsKey(hotkey.Identifier))
-            {
-                return;
-            }
-
-            _hotkeyActions.Remove(hotkey.Identifier);
-            if (!UnregisterHotKey(Runner.RunnerHwnd, hotkey.Identifier))
-            {
-                Console.WriteLine("Failed to unregister hotkey: " + hotkey);
-                var lastError = Marshal.GetLastWin32Error();
-                Console.WriteLine("LastError: " + lastError);
-            }
-        }
-
-        public static void ProcessHotkey(nuint hotkeyId)
-        {
-            ulong hashId = hotkeyId.ToUInt64();
-            if (_hotkeyActions.Any(h => h.Key == (int)hashId))
-            {
-                _hotkeyActions.First(h => h.Key == (int)hashId).Value();
-            }
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/PackageHelper.cs

@@ -1,179 +0,0 @@
-// 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.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using ManagedCommon;
-using RunnerV2.Extensions;
-using Windows.ApplicationModel;
-using Windows.Foundation;
-using Windows.Management.Deployment;
-
-namespace RunnerV2.Helpers
-{
-    /// <summary>
-    /// Provides helper methods for working with UWP packages.
-    /// </summary>
-    internal static partial class PackageHelper
-    {
-        /// <summary>
-        /// Gets the registered UWP package based on the display name and version check.
-        /// </summary>
-        /// <param name="packageDisplayName">The display name of the package.</param>
-        /// <param name="checkVersion">If true, the package version will be checked against the executing assembly version.</param>
-        /// <returns>If a package is found the corresponding <see cref="Package"/> object. If none is found <c>null</c>.</returns>
-        internal static Package? GetRegisteredPackage(string packageDisplayName, bool checkVersion)
-        {
-            PackageManager packageManager = new();
-            foreach (var package in packageManager.FindPackagesForUser(null))
-            {
-                if (package.Id.FullName.Contains(packageDisplayName) && (!checkVersion || package.Id.Version.ToVersion() == Assembly.GetExecutingAssembly().GetName().Version))
-                {
-                    return package;
-                }
-            }
-
-            return null;
-        }
-
-        internal static string[] FindMsixFiles(string directoryPath, bool recursive)
-        {
-            if (!Directory.Exists(directoryPath))
-            {
-                Logger.LogError("Tried to search msix files in " + directoryPath + ", but it does not exist.");
-                return [];
-            }
-
-            List<string> matchedFiles = [];
-
-            try
-            {
-                foreach (string file in Directory.GetFiles(directoryPath, "*", recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly))
-                {
-                    if (File.Exists(file) && msixPackagePattern().IsMatch(Path.GetFileName(file)))
-                    {
-                        matchedFiles.Add(file);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError("An error occured while searching for MSIX files.", e);
-            }
-
-            return [.. matchedFiles];
-        }
-
-        /// <summary>
-        /// Installs the specified appx package along with its dependencies.
-        /// </summary>
-        /// <param name="packagePath">Path to the package</param>
-        /// <param name="dependencies">Array of dependency package paths</param>
-        /// <returns>True if the installation was successful, false otherwise</returns>
-        internal static bool InstallPackage(string packagePath, string[] dependencies)
-        {
-            Logger.LogInfo("Starting package install of package \"" + packagePath + "\"");
-            PackageManager packageManager = new();
-            List<Uri> uris = [];
-
-            foreach (string dependency in dependencies)
-            {
-                try
-                {
-                    if (IsPackageSatisfied(dependency))
-                    {
-                        Logger.LogInfo("Dependency \"" + dependency + "\" is already satisfied.");
-                        continue;
-                    }
-                    else
-                    {
-                        uris.Add(new Uri(packagePath));
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("Could not process dependency package at path \"" + dependency + "\"", ex);
-                }
-            }
-
-            try
-            {
-                IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> deploymentOperation = packageManager.AddPackageAsync(new Uri(packagePath), uris, DeploymentOptions.ForceApplicationShutdown);
-                deploymentOperation.Get();
-
-                switch (deploymentOperation.Status)
-                {
-                    case AsyncStatus.Error:
-                        Logger.LogError($"Registering {packagePath} failed. ErrorCode: {deploymentOperation.ErrorCode}, ErrorText: {deploymentOperation.GetResults().ErrorText}");
-                        break;
-                    case AsyncStatus.Canceled:
-                        Logger.LogError($"Registering {packagePath} was canceled.");
-                        break;
-                    case AsyncStatus.Completed:
-                        Logger.LogInfo($"Registering {packagePath} succeded.");
-                        break;
-                    default:
-                        Logger.LogDebug($"Registering {packagePath} package started.");
-                        break;
-                }
-
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Exception thrown while trying to register package: {packagePath}", e);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if the package specified by the given path is already installed and satisfies the required version.
-        /// </summary>
-        /// <param name="packagePath">Path to the package.</param>
-        /// <returns>True if the package is already installed and satisfies the required version, false otherwise.</returns>
-        private static bool IsPackageSatisfied(string packagePath)
-        {
-            if (!GetPackageNameAndVersionFromAppx(packagePath, out string name, out PackageVersion version))
-            {
-                Logger.LogError("Could not get package name and version from dependency package at path \"" + packagePath + "\"");
-                return false;
-            }
-
-            PackageManager packageManager = new();
-
-            foreach (var package in packageManager.FindPackagesForUser(null))
-            {
-                if (package.Id.Name.Equals(name, StringComparison.OrdinalIgnoreCase) &&
-                    package.Id.Version.ToVersion() > version.ToVersion())
-                {
-                    Logger.LogInfo($@"Package ""{name}"" is already statisfied with version: {package.Id.Version}. Target version: {version}. PackagePath: {packagePath}");
-                    return true;
-                }
-            }
-
-            Logger.LogInfo($@"Package ""{name}"" with version {version} is not satisfied. PackagePath: {packagePath}");
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the package name and version from the specified appx package file.
-        /// </summary>
-        /// <param name="packagePath">Path to the package file.</param>
-        /// <param name="name">Output parameter for the package name.</param>
-        /// <param name="packageVersion">Output parameter for the package version.</param>
-        /// <returns>True if the package name and version were successfully retrieved, false otherwise.</returns>
-        private static bool GetPackageNameAndVersionFromAppx(string packagePath, out string name, out PackageVersion packageVersion)
-        {
-            // Todo: Implement this without interop if possible
-            return NativeMethods.GetPackageNameAndVersionFromAppx(packagePath, out name, out packageVersion);
-        }
-
-        [GeneratedRegex("(^.+\\.(appx|msix|msixbundle)$)", RegexOptions.IgnoreCase)]
-        private static partial Regex msixPackagePattern();
-    }
-}

src/RunnerV2/RunnerV2/Helpers/ProcessHelper.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Helpers
-{
-    internal static class ProcessHelper
-    {
-        internal static void ScheudleProcessKill(string processName, int msDelay = 500)
-        {
-            new Thread(async () =>
-            {
-                Process[] processes = Process.GetProcessesByName(processName);
-
-                await Task.Delay(msDelay);
-                foreach (var process in processes)
-                {
-                    if (!process.HasExited)
-                    {
-                        process.Kill();
-                    }
-                }
-            }).Start();
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/SettingsHelper.cs

@@ -1,222 +0,0 @@
-// 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.Drawing;
-using System.Globalization;
-using System.IO;
-using System.IO.Pipelines;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.Interop;
-using RunnerV2.Models;
-using Update;
-
-namespace RunnerV2.Helpers
-{
-    /// <summary>
-    /// This class provides helper methods to interact with the PowerToys Settings window.
-    /// </summary>
-    internal static class SettingsHelper
-    {
-        private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
-        private static Process? _process;
-        private static TwoWayPipeMessageIPCManaged? _ipc;
-
-        public static void OpenSettingsWindow(bool showOobeWindow = false, bool showScoobeWindow = false, bool showFlyout = false, Point? flyoutPosition = null, string? additionalArguments = null)
-        {
-            if (_process is not null && _ipc is not null && !_process.HasExited)
-            {
-                if (showFlyout)
-                {
-                    _ipc.Send(@"{""ShowYourself"": ""flyout""}");
-                }
-                else
-                {
-                    _ipc.Send($@"{{""ShowYourself"": ""{additionalArguments ?? "Dashboard"}""}}");
-                }
-
-                return;
-            }
-
-            _ipc?.End();
-            _ipc = null;
-
-            // Arg 1: Executable path
-            string executablePath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("No executable path found"), "WinUI3Apps", "PowerToys.Settings.exe");
-
-            // Arg 2,3: Pipe names
-            Pipe settingsPipe = new();
-            Pipe powertoysPipe = new();
-
-            string powerToysPipeName = @"\\.\pipe\powertoys_runner_" + Guid.NewGuid();
-            string settingsPipeName = @"\\.\pipe\powertoys_settings_" + Guid.NewGuid();
-
-            // Arg 4: Process pid
-            string currentProcessId = Environment.ProcessId.ToString(CultureInfo.InvariantCulture);
-
-            // Arg 5: Settings theme
-            string theme = Program.GeneralSettings.Theme switch
-            {
-                "light" => "light",
-                "dark" => "dark",
-                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Light => "light",
-                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Dark => "dark",
-                _ => throw new NotImplementedException(),
-            };
-
-            // Arg 6: Elevated status
-            string isElevated = Program.GeneralSettings.IsElevated ? "true" : "false";
-
-            // Arg 7: Is user an administrator
-            string isAdmin = Program.GeneralSettings.IsAdmin ? "true" : "false";
-
-            // Arg 8: Show OOBE window
-            string showOobeArg = showOobeWindow ? "true" : "false";
-
-            // Arg 9: Show SCOOBE window
-            string showScoobeArg = showScoobeWindow ? "true" : "false";
-
-            // Arg 10: Show flyout
-            string showFlyoutArg = showFlyout ? "true" : "false";
-
-            // Arg 11: Are there additional settings window arguments
-            string areThereadditionalArgs = string.IsNullOrEmpty(additionalArguments) ? "false" : "true";
-
-            // Arg 12: Are there flyout position arguments
-            string areThereFlyoutPositionArgs = flyoutPosition.HasValue ? "true" : "false";
-
-            string executableArgs = $"{powerToysPipeName} {settingsPipeName} {currentProcessId} {theme} {isElevated} {isAdmin} {showOobeArg} {showScoobeArg} {showFlyoutArg} {areThereadditionalArgs} {areThereFlyoutPositionArgs}";
-
-            if (!string.IsNullOrEmpty(additionalArguments))
-            {
-                executableArgs += $" {additionalArguments}";
-            }
-
-            if (flyoutPosition is not null)
-            {
-                executableArgs += $" {flyoutPosition.Value.X} {flyoutPosition.Value.Y}";
-            }
-
-            _process = Process.Start(executablePath, executableArgs);
-
-            // Initialize listening to pipes
-            _ipc = new TwoWayPipeMessageIPCManaged(powerToysPipeName, settingsPipeName, OnSettingsMessageReceived);
-            _ipc.Start();
-        }
-
-        private static void OnSettingsMessageReceived(string message)
-        {
-            JsonDocument messageDocument = JsonDocument.Parse(message);
-
-            foreach (var property in messageDocument.RootElement.EnumerateObject())
-            {
-                switch (property.Name)
-                {
-                    case "action":
-                        foreach (var moduleName in property.Value.EnumerateObject())
-                        {
-                            _settingsUtils.SaveSettings(moduleName.Value.ToString(), moduleName.Name);
-                            if (moduleName.Name == "general")
-                            {
-                                switch (moduleName.Value.GetProperty("action_name").GetString())
-                                {
-                                    case "restart_elevation":
-                                        ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevatedWithOpenSettings;
-                                        Runner.Close();
-                                        break;
-                                    case "restart_mentain_elevation":
-                                        // Todo:
-                                        break;
-                                    case "check_for_updates":
-                                        UpdateSettingsHelper.TriggerUpdateCheck();
-                                        break;
-                                    case "request_update_state_date":
-                                        // Todo:
-                                        break;
-                                }
-
-                                break;
-                            }
-
-                            foreach (IPowerToysModule ptModule in Runner.LoadedModules)
-                            {
-                                if (ptModule.CustomActions.TryGetValue(moduleName.Value.GetProperty("action_name").GetString() ?? string.Empty, out Action? action))
-                                {
-                                    action();
-                                }
-                            }
-                        }
-
-                        break;
-                    case "get_all_hotkey_conflicts":
-                        // Todo: Handle hotkey conflict
-                        break;
-                    case "bugreport":
-                        TrayIconManager.ProcessTrayMenuCommand((nuint)TrayIconManager.TrayButton.ReportBug);
-                        break;
-                    case "bug_report_status":
-                        _ipc?.Send($@"{{""bug_report_running:"" {(TrayIconManager.IsBugReportToolRunning ? "true" : "false")}");
-                        break;
-                    case "killrunner":
-                        Runner.Close();
-                        break;
-                    case "general":
-                        try
-                        {
-                            _settingsUtils.SaveSettings(property.Value.ToString(), string.Empty);
-                        }
-                        catch (Exception)
-                        {
-                            // TODO: Log error
-                        }
-
-                        NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
-
-                        foreach (IPowerToysModule module in Runner.ModulesToLoad)
-                        {
-                            module.OnSettingsChanged("general", property.Value);
-                        }
-
-                        break;
-                    case "powertoys":
-                        foreach (var powertoysSettingsPart in property.Value.EnumerateObject())
-                        {
-                            _settingsUtils.SaveSettings(powertoysSettingsPart.Value.ToString(), powertoysSettingsPart.Name);
-
-                            if (Runner.LoadedModules.Find(m => m.Name == powertoysSettingsPart.Name) is IPowerToysModule module)
-                            {
-                                module.OnSettingsChanged(powertoysSettingsPart.Name, powertoysSettingsPart.Value);
-                            }
-                            else
-                            {
-                                // If no specific module was found, notify all enabled modules
-                                foreach (IPowerToysModule module2 in Runner.LoadedModules.Where(m => m.Enabled))
-                                {
-                                    module2.OnSettingsChanged(powertoysSettingsPart.Name, powertoysSettingsPart.Value);
-                                }
-                            }
-
-                            NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
-                        }
-
-                        break;
-                    default:
-                        Console.WriteLine($"Unknown message received from Settings: {property.Name}");
-                        break;
-                }
-            }
-        }
-
-        public static void CloseSettingsWindow()
-        {
-            using var closeEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerToysRunnerTerminateSettingsEvent());
-            closeEventWrapper.Set();
-        }
-    }
-}

src/RunnerV2/RunnerV2/Helpers/TrayIconManager.cs

@@ -1,150 +0,0 @@
-// 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.Drawing;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2.Helpers
-{
-    internal static partial class TrayIconManager
-    {
-        internal static void StartTrayIcon()
-        {
-            NOTIFYICONDATA notifyicondata = new()
-            {
-                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
-                HWnd = Runner.RunnerHwnd,
-                UId = 1,
-                HIcon = Icon.ExtractAssociatedIcon(Environment.ProcessPath!)!.Handle,
-                UFlags = 0x0000001 | 0x00000002 | 0x4,
-                UCallbackMessage = (uint)WindowMessages.ICON_NOTIFY,
-                SzTip = "PowerToys Runner",
-            };
-
-            ChangeWindowMessageFilterEx(Runner.RunnerHwnd, 0x0111, 0x0001, IntPtr.Zero);
-
-            Shell_NotifyIcon(NIMADD, ref notifyicondata);
-        }
-
-        internal static void StopTrayIcon()
-        {
-            NOTIFYICONDATA notifyicondata = new()
-            {
-                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
-                HWnd = Runner.RunnerHwnd,
-                UId = 1,
-            };
-
-            Shell_NotifyIcon(NIMDELETE, ref notifyicondata);
-        }
-
-        internal enum TrayButton : uint
-        {
-            Settings = 1,
-            Documentation,
-            ReportBug,
-            Close,
-        }
-
-        private static bool _doubleClickTimerRunning;
-        private static bool _doubleClickDetected;
-
-        private static IntPtr _trayIconMenu;
-
-        static TrayIconManager()
-        {
-            _trayIconMenu = CreatePopupMenu();
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), "Settings\tDouble-click");
-            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Documentation), "Documentation");
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.ReportBug), "Report a Bug");
-            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Close), "Close");
-        }
-
-        internal static void ProcessTrayIconMessage(long lParam)
-        {
-            switch (lParam)
-            {
-                case 0x0205: // WM_RBUTTONDBLCLK
-                case 0x007B: // WM_CONTEXTMENU
-                    SetForegroundWindow(Runner.RunnerHwnd);
-                    TrackPopupMenu(_trayIconMenu, 0x0004 | 0x0020, Cursor.Position.X, Cursor.Position.Y, 0, Runner.RunnerHwnd, IntPtr.Zero);
-                    break;
-                case 0x0202: // WM_LBUTTONUP
-                    if (_doubleClickTimerRunning)
-                    {
-                        break;
-                    }
-
-                    _doubleClickTimerRunning = true;
-                    Task.Delay(SystemInformation.DoubleClickTime).ContinueWith(_ =>
-                    {
-                        if (!_doubleClickDetected)
-                        {
-                            SettingsHelper.OpenSettingsWindow(showFlyout: true, flyoutPosition: Cursor.Position);
-                        }
-
-                        _doubleClickDetected = false;
-                        _doubleClickTimerRunning = false;
-                    });
-                    break;
-                case 0x0203: // WM_LBUTTONDBLCLK
-                    _doubleClickDetected = true;
-                    SettingsHelper.OpenSettingsWindow();
-                    break;
-            }
-        }
-
-        internal static bool IsBugReportToolRunning { get; set; }
-
-        internal static void ProcessTrayMenuCommand(nuint commandId)
-        {
-            switch ((TrayButton)commandId)
-            {
-                case TrayButton.Settings:
-                    SettingsHelper.OpenSettingsWindow();
-                    break;
-                case TrayButton.Documentation:
-                    Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "https://aka.ms/PowerToysOverview",
-                        UseShellExecute = true,
-                    });
-                    break;
-                case TrayButton.ReportBug:
-                    Process bugReportProcess = new();
-                    bugReportProcess.StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "Tools\\PowerToys.BugReportTool.exe",
-                        CreateNoWindow = true,
-                    };
-
-                    bugReportProcess.EnableRaisingEvents = true;
-
-                    EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x000000 | 0x00001);
-
-                    bugReportProcess.Exited += (sender, e) =>
-                    {
-                        bugReportProcess.Dispose();
-                        EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x00000000);
-                        IsBugReportToolRunning = false;
-                    };
-
-                    bugReportProcess.Start();
-                    IsBugReportToolRunning = true;
-
-                    break;
-                case TrayButton.Close:
-                    Runner.Close();
-                    break;
-            }
-        }
-    }
-}

src/RunnerV2/RunnerV2/Models/IPowerToysModule.cs

@@ -1,74 +0,0 @@
-// 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.Collections.Generic;
-using System.Text.Json;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-
-namespace RunnerV2.Models
-{
-    public interface IPowerToysModule
-    {
-        /// <summary>
-        /// Gets the short name of the module. The same used as the name of the folder containing its settings.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// This function is called when the module is enabled.
-        /// </summary>
-        public void Enable();
-
-        /// <summary>
-        /// This function is called when the module is disabled.
-        /// </summary>
-        public void Disable();
-
-        /// <summary>
-        /// Gets a value indicating whether the module is enabled.
-        /// </summary>
-        /// <remarks>
-        /// This value shall be read from the settings of the module in the module interface implementation.
-        /// </remarks>
-        public bool Enabled { get; }
-
-        /// <summary>
-        /// Gets the GPO rule configured state for the module.
-        /// </summary>
-        /// <remarks>
-        /// This value shall be read from the GPO settings with the <see cref="GPOWrapper"/> class.
-        /// </remarks>
-        public GpoRuleConfigured GpoRuleConfigured { get; }
-
-        /// <summary>
-        /// Gets a dictionary of hotkeys and their associated actions. Every hotkey must have an associated id.
-        /// </summary>
-        /// <remarks>
-        /// If this property is not overridden, the module is considered to not have hotkeys.
-        /// </remarks>
-        public Dictionary<HotkeyEx, Action> Hotkeys { get => []; }
-
-        /// <summary>
-        /// Gets a list of shortcuts, that shall be registered in the keyboard hook, and their associated actions.
-        /// </summary>
-        /// <remarks>
-        /// If this property is not overridden, the module is considered to not have shortcuts.
-        /// </remarks>
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get => []; }
-
-        public Dictionary<string, Action> CustomActions { get => []; }
-
-        /// <summary>
-        /// This function is called when the settings of the module or the general settings are changed.
-        /// </summary>
-        /// <param name="settingsKind">Value of <see cref="Name"/> or "general" indicating the type of change.</param>
-        /// <param name="jsonProperties">The json element with the new settings.</param>
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/Models/ProcessModuleAbstractClass.cs

@@ -1,168 +0,0 @@
-// 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.Globalization;
-using RunnerV2.Helpers;
-
-namespace RunnerV2.Models
-{
-    /// <summary>
-    /// Base abstract class for modules that launch and manage external processes.
-    /// </summary>
-    internal abstract class ProcessModuleAbstractClass
-    {
-        /// <summary>
-        /// Options for launching a process.
-        /// </summary>
-        [Flags]
-        public enum ProcessLaunchOptions
-        {
-            /// <summary>
-            /// Only a single instance of the process should be running.
-            /// </summary>
-            SingletonProcess = 1,
-
-            /// <summary>
-            /// Elevate the process if the current process is elevated.
-            /// </summary>
-            ElevateIfApplicable = 2,
-
-            /// <summary>
-            /// Provide the runner process ID as the first argument to the launched process.
-            /// </summary>
-            RunnerProcessIdAsFirstArgument = 4,
-
-            /// <summary>
-            /// Indicates that the application should not launch automatically when the specified module is enabled.
-            /// </summary>
-            SupressLaunchOnModuleEnabled = 8,
-
-            /// <summary>
-            /// Specifies that the process should be started using the operating system shell.
-            /// </summary>
-            UseShellExecute = 16,
-
-            /// <summary>
-            /// Indicates that the process should never exit automatically.
-            /// </summary>
-            /// <remarks>Use this value when using a helper process to launch an application like explorer.exe.</remarks>
-            NeverExit = 32,
-
-            /// <summary>
-            /// Suppresses UI when process is launched.
-            /// </summary>
-            HideUI = 64,
-
-            /// <summary>
-            /// Sets the launched process to realtime priority.
-            /// </summary>
-            RealtimePriority = 128,
-        }
-
-        /// <summary>
-        /// Gets the relative or absolute path to the process executable.
-        /// </summary>
-        public abstract string ProcessPath { get; }
-
-        /// <summary>
-        /// Gets the name of the process without the .exe extension.
-        /// </summary>
-        /// <remarks>
-        /// Has no effect if the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.UseShellExecute"/> flag set.
-        /// </remarks>
-        public abstract string ProcessName { get; }
-
-        /// <summary>
-        /// Gets the arguments to pass to the process on launch.
-        /// </summary>
-        /// <remarks>
-        /// If not overridden, no arguments are passed.
-        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.RunnerProcessIdAsFirstArgument"/> flag is set, the runner process ID is prepended to these arguments.
-        /// </remarks>
-        public virtual string ProcessArguments { get; } = string.Empty;
-
-        /// <summary>
-        /// Gets the options used to configure how the process is launched.
-        /// </summary>
-        public abstract ProcessLaunchOptions LaunchOptions { get; }
-
-        /// <summary>
-        /// Ensures that atleast one process is launched. If the process is already running, does nothing.
-        /// </summary>
-        public void EnsureLaunched()
-        {
-            Process[] processes = Process.GetProcessesByName(ProcessName);
-            if (processes.Length > 0)
-            {
-                return;
-            }
-
-            LaunchProcess();
-        }
-
-        /// <summary>
-        /// Launches the process with the specified options.
-        /// </summary>
-        /// <param name="isModuleEnableProcess">Specifies if the <see cref="Runner"/> class is currently calling this function as part of a module startup</param>
-        public void LaunchProcess(bool isModuleEnableProcess = false)
-        {
-            if (isModuleEnableProcess && LaunchOptions.HasFlag(ProcessLaunchOptions.SupressLaunchOnModuleEnabled))
-            {
-                return;
-            }
-
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.SingletonProcess))
-            {
-                Process[] processes = Process.GetProcessesByName(ProcessName);
-                if (processes.Length > 0)
-                {
-                    return;
-                }
-            }
-
-            string arguments = (LaunchOptions.HasFlag(ProcessLaunchOptions.RunnerProcessIdAsFirstArgument) ? Environment.ProcessId.ToString(CultureInfo.InvariantCulture) + (string.IsNullOrEmpty(ProcessArguments) ? string.Empty : " ") : string.Empty) + ProcessArguments;
-
-            Process? p = Process.Start(new ProcessStartInfo()
-            {
-                UseShellExecute = LaunchOptions.HasFlag(ProcessLaunchOptions.UseShellExecute),
-                FileName = ProcessPath,
-                Arguments = arguments,
-                Verb = LaunchOptions.HasFlag(ProcessLaunchOptions.ElevateIfApplicable) && ElevationHelper.IsProcessElevated() ? "runas" : "open",
-            });
-
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.RealtimePriority))
-            {
-                try
-                {
-                    if (p != null && !p.HasExited)
-                    {
-                        p.PriorityClass = ProcessPriorityClass.RealTime;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"[ProcessModuleAbstractClass] Failed to set realtime priority for process {ProcessName}", ex);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Schedules all processes with the specified <see cref="ProcessName"/>.
-        /// </summary>
-        /// <remarks>
-        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.NeverExit"/> flag set, this function does nothing.
-        /// </remarks>
-        public void ProcessExit()
-        {
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.NeverExit))
-            {
-                return;
-            }
-
-            ProcessHelper.ScheudleProcessKill(ProcessName);
-        }
-    }
-}

src/RunnerV2/RunnerV2/Models/RegistryChangeSet.cs

@@ -1,45 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Models
-{
-    internal readonly struct RegistryChangeSet
-    {
-        public RegistryValueChange[] Changes { get; init; }
-
-        public readonly bool IsApplied => Changes.All(c => c.IsApplied);
-
-        public readonly bool Apply()
-        {
-            bool allApplied = true;
-            foreach (var change in Changes)
-            {
-                allApplied = (change.Apply() || !change.Required) && allApplied;
-            }
-
-            return allApplied;
-        }
-
-        public readonly bool ApplyIfNotApplied() => IsApplied || Apply();
-
-        public readonly bool UnApplyIfApplied() => !IsApplied || UnApply();
-
-        public readonly bool UnApply()
-        {
-            bool allUnapplied = true;
-            foreach (var change in Changes)
-            {
-                allUnapplied = (change.UnApply() || !change.Required) && allUnapplied;
-            }
-
-            return allUnapplied;
-        }
-    }
-}

src/RunnerV2/RunnerV2/Models/RegistryValueChange.cs

@@ -1,124 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.Win32;
-
-namespace RunnerV2.Models
-{
-    internal readonly struct RegistryValueChange
-    {
-        public RegistryValueChange()
-        {
-        }
-
-        public required string KeyPath { get; init; }
-
-        public required string? KeyName { get; init; }
-
-        public bool Required { get; init; } = true;
-
-        public required object Value { get; init; }
-
-        public RegistryHive Scope { get; init; } = RegistryHive.CurrentUser;
-
-        private static RegistryValueKind ValueTypeToRegistryValueKind(object value)
-        {
-            return value switch
-            {
-                int => RegistryValueKind.DWord,
-                long => RegistryValueKind.QWord,
-                string => RegistryValueKind.String,
-                string[] => RegistryValueKind.MultiString,
-                byte[] => RegistryValueKind.Binary,
-                _ => throw new ArgumentException("Unsupported value type"),
-            };
-        }
-
-        public readonly bool IsApplied
-        {
-            get
-            {
-                try
-                {
-                    using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, false);
-                    return key != null && ValueTypeToRegistryValueKind(Value) == key.GetValueKind(KeyName) && Value.Equals(key.GetValue(KeyName));
-                }
-                catch (Exception e)
-                {
-                    Logger.LogError($"Testing if registry change \"{this}\" is applied failed.", e);
-                    return false;
-                }
-            }
-        }
-
-        public readonly bool RequiresElevation
-        {
-            get => Scope == RegistryHive.LocalMachine;
-        }
-
-        public readonly bool Apply()
-        {
-            try
-            {
-                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).CreateSubKey(KeyPath, true);
-                if (key == null)
-                {
-                    Logger.LogError($"Applying registry change \"{this}\" failed because the registry key could not be created.");
-                    return false;
-                }
-
-                key.SetValue(KeyName, Value, ValueTypeToRegistryValueKind(Value));
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Applying registry change \"{this}\" failed.", e);
-                return false;
-            }
-        }
-
-        public readonly bool UnApply()
-        {
-            try
-            {
-                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, true);
-                if (key == null)
-                {
-                    Logger.LogError($"Unapplying registry change \"{this}\" failed because the registry key could not be opened.");
-                    return false;
-                }
-
-                if (KeyName is not null)
-                {
-                    key.DeleteValue(KeyName, false);
-                }
-                else
-                {
-                    key.SetValue(null, string.Empty); // Delete the default value
-                }
-
-                // Check if the path doesn't contain anything and delete it if so
-                if (key.GetValueNames().Length == 0 && key.GetSubKeyNames().Length == 0)
-                {
-                    RegistryKey.OpenBaseKey(Scope, RegistryView.Default).DeleteSubKey(KeyPath, false);
-                }
-
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Unapplying registry change \"{this}\" failed.", e);
-                return false;
-            }
-        }
-
-        public override readonly string ToString() => $"{RegistryKey.OpenBaseKey(Scope, RegistryView.Default).Name}\\{KeyPath}\\{KeyName}:{Value}";
-    }
-}

src/RunnerV2/RunnerV2/Models/SpecialMode.cs

@@ -1,15 +0,0 @@
-// 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 RunnerV2.Models
-{
-    internal enum SpecialMode
-    {
-        None,
-        Win32ToastNotificationCOMServer,
-        ToastNotificationHandler,
-        UpdateNow,
-        ReportSuccessfulUpdate,
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/AdvancedPasteModuleInterface.cs

@@ -1,107 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Windows.Forms;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Helpers;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AdvancedPasteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable
-    {
-        public string Name => "AdvancedPaste";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AdvancedPaste;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAdvancedPasteEnabledValue();
-
-        public void Disable()
-        {
-            if (_ipc != null)
-            {
-                _ipc.Send(Constants.AdvancedPasteTerminateAppMessage());
-                _ipc.End();
-                _ipc = null;
-            }
-        }
-
-        private const string IpcName = @"\\.\pipe\PowerToys.AdvancedPaste";
-        private TwoWayPipeMessageIPCManaged? _ipc;
-
-        public void Enable()
-        {
-            _ipc = new TwoWayPipeMessageIPCManaged(string.Empty, IpcName, (_) => { });
-            _ipc.Start();
-
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            PopulateShortcuts();
-        }
-
-        public void PopulateShortcuts()
-        {
-            _ipc ??= new TwoWayPipeMessageIPCManaged(string.Empty, @"\\.\pipe\PowerToys.AdvancedPaste", (_) => { });
-
-            Shortcuts.Clear();
-
-            AdvancedPasteSettings settings = SettingsUtils.Default.GetSettingsOrDefault<AdvancedPasteSettings>(Name);
-            Shortcuts.Add((settings.Properties.AdvancedPasteUIShortcut, () =>
-                _ipc.Send(Constants.AdvancedPasteShowUIMessage())
-            ));
-            Shortcuts.Add((settings.Properties.PasteAsPlainTextShortcut, TryToPasteAsPlainText));
-            Shortcuts.Add((settings.Properties.PasteAsMarkdownShortcut, () => _ipc.Send(Constants.AdvancedPasteMarkdownMessage())));
-            Shortcuts.Add((settings.Properties.PasteAsJsonShortcut, () => _ipc.Send(Constants.AdvancedPasteJsonMessage())));
-
-            HotkeyAccessor[] hotkeyAccessors = settings.GetAllHotkeyAccessors();
-            int additionalActionsCount = settings.Properties.AdditionalActions.GetAllActions().Count() - 2;
-            for (int i = 0; i < additionalActionsCount; i++)
-            {
-                int scopedI = i;
-                Shortcuts.Add((hotkeyAccessors[4 + i].Value, () => _ipc.Send(Constants.AdvancedPasteAdditionalActionMessage() + " " + (3 + scopedI))));
-            }
-
-            for (int i = 4 + additionalActionsCount; i < hotkeyAccessors.Length; i++)
-            {
-                int scopedI = i;
-                Shortcuts.Add((hotkeyAccessors[i].Value, () => _ipc.Send(Constants.AdvancedPasteCustomActionMessage() + " " + (scopedI - 4 - additionalActionsCount))));
-            }
-        }
-
-        private void TryToPasteAsPlainText()
-        {
-            if (Clipboard.ContainsText())
-            {
-                string text = Clipboard.GetText();
-                SendKeys.SendWait(text);
-            }
-
-            throw new NotImplementedException();
-        }
-
-        public void Dispose()
-        {
-            _ipc?.Dispose();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.AdvancedPaste.exe";
-
-        public override string ProcessName => "PowerToys.AdvancedPaste";
-
-        public override string ProcessArguments => IpcName;
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/AlwaysOnTopModuleInterface.cs

@@ -1,59 +0,0 @@
-// 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.Collections.Generic;
-using System.Text.Json;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AlwaysOnTopModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AlwaysOnTop;
-
-        public string Name => "AlwaysOnTop";
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAlwaysOnTopEnabledValue();
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopTerminateEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-            InitializeHotkey();
-        }
-
-        private void InitializeHotkey()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<AlwaysOnTopSettings>(Name).Properties.Hotkey.Value, () =>
-                {
-                    using var pinEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopPinEvent());
-                    pinEventWrapper.Set();
-                }
-            ));
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            InitializeHotkey();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.AlwaysOnTop.exe";
-
-        public override string ProcessName => "PowerToys.AlwaysOnTop";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.ElevateIfApplicable;
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/AwakeModuleInterface.cs

@@ -1,41 +0,0 @@
-// 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.Globalization;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AwakeModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Awake";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.Awake;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAwakeEnabledValue();
-
-        public override string ProcessPath => "PowerToys.Awake.exe";
-
-        public override string ProcessName => "PowerToys.Awake";
-
-        public override string ProcessArguments => $"--use-pt-config --pid {Environment.ProcessId.ToString(CultureInfo.InvariantCulture)}";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AwakeExitEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/CmdNotFoundModuleInterface.cs

@@ -1,80 +0,0 @@
-// 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.IO;
-using System.Threading;
-using ManagedCommon;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class CmdNotFoundModuleInterface : IPowerToysModule
-    {
-        public string Name => "CmdNotFound";
-
-        public bool Enabled => true;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdNotFoundEnabledValue();
-
-        public CmdNotFoundModuleInterface()
-        {
-            if (GpoRuleConfigured == GpoRuleConfigured.Disabled)
-            {
-                UninstallModule();
-            }
-
-            if (GpoRuleConfigured == GpoRuleConfigured.Enabled)
-            {
-                InstallModule();
-            }
-        }
-
-        public void InstallModule()
-        {
-            Logger.LogInfo("Installing Command Not Found module invoked through GPO");
-
-            new Thread(async () =>
-            {
-                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\EnableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
-                await p.WaitForExitAsync();
-                if (p.ExitCode == 0)
-                {
-                    Logger.LogInfo("Command Not Found was successfully installed.");
-                    return;
-                }
-
-                Logger.LogInfo("Command Not Found failed to install with exit code: " + p.ExitCode);
-            }).Start();
-        }
-
-        public void UninstallModule()
-        {
-            Logger.LogInfo("Uninstalling Command Not Found module invoked through GPO");
-
-            new Thread(async () =>
-            {
-                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
-                await p.WaitForExitAsync();
-                if (p.ExitCode == 0)
-                {
-                    Logger.LogInfo("Command Not Found was successfully uninstalled.");
-                    return;
-                }
-
-                Logger.LogInfo("Command Not Found failed to uninstall with exit code: " + p.ExitCode);
-            }).Start();
-        }
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/ColorPickerModuleInterface.cs

@@ -1,59 +0,0 @@
-// 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.Collections.Generic;
-using System.Text.Json;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class ColorPickerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "ColorPicker";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.ColorPicker;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredColorPickerEnabledValue();
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateColorPickerSharedEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-        }
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<ColorPickerSettings>(Name).Properties.ActivationShortcut, () =>
-            {
-                using var showUiEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowColorPickerSharedEvent());
-                showUiEventWrapper.Set();
-            }
-            ));
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            InitializeShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.ColorPickerUI.exe";
-
-        public override string ProcessName => "PowerToys.ColorPickerUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/CommandPaletteModuleInterface.cs

@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class CommandPaletteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        private const string PackageName = "Microsoft.CommandPalette"
-#if DEBUG
-            + ".Dev"
-#endif
-            ;
-
-        public string Name => "CmdPal";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.CmdPal;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdPalEnabledValue();
-
-        public override string ProcessPath => "explorer.exe";
-
-        public override string ProcessArguments => "x-cmdpal://background";
-
-        public override string ProcessName => string.Empty;
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.UseShellExecute | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
-            {
-                try
-                {
-                    string architectureString = RuntimeInformation.ProcessArchitecture == Architecture.X64 ? "x64" : "ARM64";
-#if DEBUG
-                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\", false);
-                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\Dependencies\\" + architectureString + "\\", true);
-#else
-                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\", false);
-                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
-#endif
-
-                    if (msixFiles.Length > 0)
-                    {
-                        if (!PackageHelper.InstallPackage(msixFiles[0], dependencies))
-                        {
-                            Logger.LogError("Failed to register Command Palette package.");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("Exception occurred while enabling Command Palette package.", ex);
-                }
-            }
-
-            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
-            {
-                Logger.LogError("Command Palette package is not registered after attempting to enable it.");
-                return;
-            }
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/CropAndLockModuleInterface.cs

@@ -1,68 +0,0 @@
-// 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.Collections.Generic;
-using System.Text.Json;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class CropAndLockModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable
-    {
-        public string Name => "CropAndLock";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.CropAndLock;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCropAndLockEnabledValue();
-
-        private EventWaitHandle _reparentEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockReparentEvent());
-        private EventWaitHandle _thumbnailEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockThumbnailEvent());
-        private EventWaitHandle _terminateEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockExitEvent());
-
-        public void Disable()
-        {
-            _terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<CropAndLockSettings>(Name);
-            Shortcuts.Add((settings.Properties.ThumbnailHotkey.Value,  () => _thumbnailEvent.Set()));
-            Shortcuts.Add((settings.Properties.ReparentHotkey.Value,  () => _reparentEvent.Set()));
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.CropAndLock.exe";
-
-        public override string ProcessName => "PowerToys.CropAndLock";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            _reparentEvent.Dispose();
-            _thumbnailEvent.Dispose();
-            _terminateEvent.Dispose();
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/EnvironmentVariablesModuleInterface.cs

@@ -1,33 +0,0 @@
-// 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.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class EnvironmentVariablesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Environment Variables";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.EnvironmentVariables;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredEnvironmentVariablesEnabledValue();
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.EnvironmentVariables.exe";
-
-        public override string ProcessName => "PowerToys.EnvironmentVariables";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/FancyZonesModuleInterface.cs

@@ -1,51 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class FancyZonesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "FancyZones";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.FancyZones;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredFancyZonesEnabledValue();
-
-        public override string ProcessPath => "PowerToys.FancyZones.exe";
-
-        public override string ProcessName => "PowerToys.FancyZones";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.HideUI;
-
-        public void Disable()
-        {
-            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEExitEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-        }
-
-        public Dictionary<string, Action> CustomActions => new()
-        {
-            {
-                "ToggledFZEditor",
-                () =>
-                {
-                    EnsureLaunched();
-                    using var invokeFZEditorEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEToggleEvent());
-                    invokeFZEditorEvent.Set();
-                }
-            },
-        };
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/FileExplorerModuleInterface.cs

@@ -1,330 +0,0 @@
-// 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.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text.Json;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class FileExplorerModuleInterface : IPowerToysModule
-    {
-        private record struct FileExplorerModule(Func<bool> IsEnabled, GpoRuleConfigured GpoRule, RegistryChangeSet RegistryChanges);
-
-        private static readonly List<FileExplorerModule> _fileExplorerModules;
-
-        private static readonly string[] ExtSVG = { ".svg" };
-        private static readonly string[] ExtMarkdown = { ".md", ".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".mdtxt", ".mdtext" };
-        private static readonly string[] ExtPDF = { ".pdf" };
-        private static readonly string[] ExtGCode = { ".gcode" };
-        private static readonly string[] ExtBGCode = { ".bgcode" };
-        private static readonly string[] ExtSTL = { ".stl" };
-        private static readonly string[] ExtQOI = { ".qoi" };
-
-        static FileExplorerModuleInterface()
-        {
-            static PowerPreviewProperties GetProperties() => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties;
-
-            string installationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-
-            _fileExplorerModules = [
-                new FileExplorerModule(
-                    () => GetProperties().EnableBgcodePreview,
-                    GPOWrapper.GetConfiguredBgcodePreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{0e6d5bdd-d5f8-4692-a089-8bb88cdd37f4}", Path.Combine(installationPath, "PowerToys.BgcodePreviewHandlerCpp.dll"), "BgcodePreviewHandler", "Binary G-code Preview Handler", ExtBGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableBgcodeThumbnail,
-                    GPOWrapper.GetConfiguredBgcodeThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{5c93a1e4-99d0-4fb3-991c-6c296a27be21}", Path.Combine(installationPath, "PowerToys.BgcodeThumbnailProviderCpp.dll"), "BgcodeThumbnailProvider", "Binary G-code Thumbnail Provider", ExtBGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableGcodePreview,
-                    GPOWrapper.GetConfiguredGcodePreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A0257634-8812-4CE8-AF11-FA69ACAEAFAE}", Path.Combine(installationPath, "PowerToys.GcodePreviewHandlerCpp.dll"), "GcodePreviewHandler", "G-code Preview Handler", ExtGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableGcodeThumbnail,
-                    GPOWrapper.GetConfiguredGcodeThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{F2847CBE-CD03-4C83-A359-1A8052C1B9D5}", Path.Combine(installationPath, "PowerToys.GcodeThumbnailProviderCpp.dll"), "GcodeThumbnailProvider", "G-code Thumbnail Provider", ExtGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableMdPreview,
-                    GPOWrapper.GetConfiguredMarkdownPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{60789D87-9C3C-44AF-B18C-3DE2C2820ED3}", Path.Combine(installationPath, "PowerToys.MarkdownPreviewHandlerCpp.dll"), "MarkdownPreviewHandler", "Markdown Preview Handler", ExtMarkdown)),
-                new FileExplorerModule(
-                    () => GetProperties().EnablePdfPreview,
-                    GPOWrapper.GetConfiguredPdfPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A5A41CC7-02CB-41D4-8C9B-9087040D6098}", Path.Combine(installationPath, "PowerToys.PdfPreviewHandlerCpp.dll"), "PdfPreviewHandler", "PDF Preview Handler", ExtPDF)),
-                new FileExplorerModule(
-                    () => GetProperties().EnablePdfThumbnail,
-                    GPOWrapper.GetConfiguredPdfThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{D8BB9942-93BD-412D-87E4-33FAB214DC1A}", Path.Combine(installationPath, "PowerToys.PdfThumbnailProviderCpp.dll"), "PdfThumbnailProvider", "PDF Thumbnail Provider", ExtPDF)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableQoiPreview,
-                    GPOWrapper.GetConfiguredQoiPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{729B72CD-B72E-4FE9-BCBF-E954B33FE699}", Path.Combine(installationPath, "PowerToys.QoiPreviewHandlerCpp.dll"), "QoiPreviewHandler", "QOI Preview Handler", ExtQOI)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableQoiThumbnail,
-                    GPOWrapper.GetConfiguredQoiThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{AD856B15-D25E-4008-AFB7-AFAA55586188}", Path.Combine(installationPath, "PowerToys.QoiThumbnailProviderCpp.dll"), "QoiThumbnailProvider", "QOI Thumbnail Provider", ExtQOI, "image", "Picture")),
-                new FileExplorerModule(
-                    () => GetProperties().EnableStlThumbnail,
-                    GPOWrapper.GetConfiguredStlThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{77257004-6F25-4521-B602-50ECC6EC62A6}", Path.Combine(installationPath, "PowerToys.StlThumbnailProviderCpp.dll"), "StlThumbnailProvider", "STL Thumbnail Provider", ExtSTL)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableSvgPreview,
-                    GPOWrapper.GetConfiguredSvgPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{FCDD4EED-41AA-492F-8A84-31A1546226E0}", Path.Combine(installationPath, "PowerToys.SvgPreviewHandlerCpp.dll"), "SvgPreviewHandler", "SVG Preview Handler", ExtSVG)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableSvgThumbnail,
-                    GPOWrapper.GetConfiguredSvgThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{10144713-1526-46C9-88DA-1FB52807A9FF}", Path.Combine(installationPath, "PowerToys.SvgThumbnailProviderCpp.dll"), "SvgThumbnailProvider", "SVG Thumbnail Provider", ExtSVG, "image", "Picture")),
-                GetMonacoFileExplorerModule(installationPath)
-            ];
-        }
-
-        private static FileExplorerModule GetMonacoFileExplorerModule(string installationPath)
-        {
-            // .svgz is a binary file type that Monaco cannot handle, so we exclude it from the preview handler
-            string[] extExclusions = [..ExtMarkdown, ..ExtSVG, ".svgz"];
-            List<string> extensions = [];
-
-            string languagesFilePath = Path.Combine(installationPath, "Assets\\Monaco\\monaco_languages.json");
-
-            if (!File.Exists(languagesFilePath))
-            {
-                Logger.LogError("PowerPreviewModuleInterface: Unable to find monaco_languages.json file at " + languagesFilePath);
-                goto returnLabel;
-            }
-
-            try
-            {
-                JsonDocument jsonDocument = JsonDocument.Parse(File.ReadAllText(languagesFilePath));
-                var list = jsonDocument.RootElement.GetProperty("list");
-
-                foreach (var item in list.EnumerateArray())
-                {
-                    if (item.TryGetProperty("extensions", out JsonElement extensionsElement))
-                    {
-                        foreach (var ext in extensionsElement.EnumerateArray())
-                        {
-                            string extension = ext.GetString() ?? string.Empty;
-                            if (!string.IsNullOrEmpty(extension) && !extensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
-                            {
-                                extensions.Add(extension);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("PowerPreviewModuleInterface: Failed to parse monaco_languages.json file.", ex);
-            }
-
-        returnLabel:
-            return new FileExplorerModule(
-                () => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties.EnableMonacoPreview,
-                GPOWrapper.GetConfiguredMonacoPreviewEnabledValue(),
-                GetFileExplorerAddOnChangeSet(
-                    FileExplorerAddOnType.PreviewHandler,
-                    "{D8034CFA-F34B-41FE-AD45-62FCBB52A6DA}",
-                    Path.Combine(installationPath, "PowerToys.MonacoPreviewHandlerCpp.dll"),
-                    "MonacoPreviewHandler",
-                    "Monaco Preview Handler",
-                    [.. extensions.Where(ext => !extExclusions.Contains(ext))]));
-        }
-
-        private enum FileExplorerAddOnType
-        {
-            ThumbnailProvider,
-            PreviewHandler,
-        }
-
-        private static RegistryChangeSet GetFileExplorerAddOnChangeSet(FileExplorerAddOnType type, string handlerClsid, string pathToHandler, string className, string displayName, string[] fileTypes, string? perceivedType = null, string? fileKindType = null)
-        {
-            string clsidPath = "Software\\Classes\\CLSID\\" + handlerClsid;
-            string inprocServer32Path = clsidPath + "\\InprocServer32";
-
-            string assemblyKeyValue;
-            int lastDotPos = className.LastIndexOf('.');
-
-            if (lastDotPos != -1)
-            {
-                assemblyKeyValue = string.Concat("PowerToys.", className.AsSpan(lastDotPos + 1));
-            }
-            else
-            {
-                assemblyKeyValue = "PowerToys." + className;
-            }
-
-            assemblyKeyValue += $", Version={Assembly.GetExecutingAssembly().GetName().Version!}, Culture=neutral";
-
-            List<RegistryValueChange> changes = [
-                new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = "DisplayName",
-                    Value = displayName,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = null,
-                    Value = className,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = null,
-                    Value = pathToHandler,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "Assembly",
-                    Value = assemblyKeyValue,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "Class",
-                    Value = className,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "ThreadingModel",
-                    Value = "Apartment",
-                },
-            ];
-
-            foreach (string fileType in fileTypes)
-            {
-                string fileTypePath = "Software\\Classes\\" + fileType;
-                string fileAssociationPath = fileTypePath + "\\shellex\\" + (type == FileExplorerAddOnType.PreviewHandler ? IPREVIEWHANDLERCLSID : ITHUMBNAILPROVIDERCLSID);
-
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = fileAssociationPath,
-                    KeyName = null,
-                    Value = handlerClsid,
-                });
-
-                if (!string.IsNullOrEmpty(fileKindType))
-                {
-                    // Registering a file type as a kind needs to be done at the HKEY_LOCAL_MACHINE level.
-                    // Make it optional as well so that we don't fail registering the handler if we can't write to HKEY_LOCAL_MACHINE.
-                    string kindPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\KindMap";
-                    changes.Add(new RegistryValueChange
-                    {
-                        Scope = Microsoft.Win32.RegistryHive.LocalMachine,
-                        KeyPath = kindPath,
-                        KeyName = fileType,
-                        Value = fileKindType,
-                        Required = false,
-                    });
-                }
-
-                if (!string.IsNullOrEmpty(perceivedType))
-                {
-                    changes.Add(new RegistryValueChange
-                    {
-                        KeyPath = fileTypePath,
-                        KeyName = "PerceivedType",
-                        Value = perceivedType,
-                    });
-                }
-
-                // this regfile registry key has precedence over Software\Classes\.reg for .reg files
-                if (type == FileExplorerAddOnType.PreviewHandler && fileType.Equals(".reg", StringComparison.OrdinalIgnoreCase))
-                {
-                    string regFilePath = "Software\\Classes\\regfile\\shellex\\" + IPREVIEWHANDLERCLSID;
-                    changes.Add(new RegistryValueChange
-                    {
-                        KeyPath = regFilePath,
-                        KeyName = null,
-                        Value = handlerClsid,
-                    });
-                }
-            }
-
-            if (type == FileExplorerAddOnType.PreviewHandler)
-            {
-                string previewHostClsid = "{6d2b5079-2f0b-48dd-ab7f-97cec514d30b}";
-                string previewHandlerListPath = "(Software\\Microsoft\\Windows\\CurrentVersion\\PreviewHandlers)";
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = "AppID",
-                    Value = previewHostClsid,
-                });
-
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = previewHandlerListPath,
-                    KeyName = handlerClsid,
-                    Value = displayName,
-                });
-            }
-
-            changes.Add(new RegistryValueChange
-            {
-                Scope = Microsoft.Win32.RegistryHive.LocalMachine,
-                KeyPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
-                KeyName = handlerClsid,
-                Value = displayName,
-                Required = false,
-            });
-
-            return new RegistryChangeSet
-            {
-                Changes = [.. changes],
-            };
-        }
-
-        private const string ITHUMBNAILPROVIDERCLSID = "{E357FCCD-A995-4576-B01F-234630154E96}";
-        private const string IPREVIEWHANDLERCLSID = "{8895b1c6-b41f-4c1c-a562-0d564250836f}";
-
-        public string Name => "File Explorer";
-
-        public bool Enabled => true;
-
-        public GpoRuleConfigured GpoRuleConfigured => GpoRuleConfigured.Unavailable;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            OnSettingsChanged("File Explorer", default);
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            foreach (FileExplorerModule submodule in _fileExplorerModules)
-            {
-                if (submodule.GpoRule == GpoRuleConfigured.Disabled)
-                {
-                    submodule.RegistryChanges.UnApplyIfApplied();
-                    continue;
-                }
-
-                if (submodule.IsEnabled() || submodule.GpoRule == GpoRuleConfigured.Enabled)
-                {
-                    submodule.RegistryChanges.ApplyIfNotApplied();
-                }
-                else
-                {
-                    submodule.RegistryChanges.UnApplyIfApplied();
-                }
-            }
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/HostsModuleInterface.cs

@@ -1,35 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class HostsModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.Hosts;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
-
-        public string Name => "Hosts";
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.Hosts.exe";
-
-        public override string ProcessName => "PowerToys.Hosts";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/KeyboardManagerModuleInterface.cs

@@ -1,38 +0,0 @@
-// 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.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class KeyboardManagerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Keyboard Manager";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.KeyboardManager;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredKeyboardManagerEnabledValue();
-
-        public override string ProcessPath => "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe";
-
-        public override string ProcessName => "PowerToys.KeyboardManagerEngine";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.RealtimePriority;
-
-        public void Disable()
-        {
-            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateKBMSharedEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/LightSwitchModuleInterface.cs

@@ -1,60 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-using Settings.UI.Library;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class LightSwitchModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "LightSwitch";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.LightSwitch;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredLightSwitchEnabledValue();
-
-        public override string ProcessPath => "LightSwitchService\\PowerToys.LightSwitchService.exe";
-
-        public override string ProcessName => "PowerToys.LightSwitchService";
-
-        public override string ProcessArguments => $"--pid {Environment.ProcessId}";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts
-        {
-            get => [(SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties.ToggleThemeHotkey.Value, () =>
-            {
-                LightSwitchProperties properties = SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties;
-                EnsureLaunched();
-                if (properties.ChangeSystem.Value)
-                {
-                    ThemeHelper.SetSystemTheme(!ThemeHelper.GetCurrentSystemTheme());
-                }
-
-                if (properties.ChangeApps.Value)
-                {
-                    ThemeHelper.SetAppsTheme(!ThemeHelper.GetCurrentAppsTheme());
-                }
-
-                using var manualOverrideEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.LightSwitchManualOverrideEvent());
-                manualOverrideEvent.Set();
-            })];
-        }
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/MeasureToolModuleInterface.cs

@@ -1,54 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class MeasureToolModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Measure Tool";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MeasureTool;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredScreenRulerEnabledValue();
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.MeasureToolUI.exe";
-
-        public override string ProcessName => "PowerToys.MeasureToolUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.SupressLaunchOnModuleEnabled;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        private void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<MeasureToolSettings>(Name).Properties.ActivationShortcut, () =>
-                {
-                    LaunchProcess();
-                }
-            ));
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/MouseJumpModuleInterface.cs

@@ -1,58 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class MouseJumpModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "MouseJump";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MouseJump;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMouseJumpEnabledValue();
-
-        public override string ProcessPath => "PowerToys.MouseJumpUI.exe";
-
-        public override string ProcessName => "PowerToys.MouseJumpUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Disable()
-        {
-            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.TerminateMouseJumpSharedEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<MouseJumpSettings>(Name);
-            Shortcuts.Add((settings.Properties.ActivationShortcut, () =>
-            {
-                EnsureLaunched();
-                using var invokeMouseJumpEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.MouseJumpShowPreviewEvent());
-                invokeMouseJumpEvent.Set();
-            }));
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerAccentModuleInterface.cs

@@ -1,33 +0,0 @@
-// 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.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class PowerAccentModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "PowerAccent";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.PowerAccent;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredQuickAccentEnabledValue();
-
-        public override string ProcessPath => "PowerToys.PowerAccent.exe";
-
-        public override string ProcessName => "PowerToys.PowerAccent";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerOCRModuleInterface.cs

@@ -1,59 +0,0 @@
-// 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.Collections.Generic;
-using System.Text.Json;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class PowerOCRModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "TextExtractor";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerOcr;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredTextExtractorEnabledValue();
-
-        public override string ProcessPath => "PowerToys.PowerOCR.exe";
-
-        public override string ProcessName => "PowerToys.PowerOCR";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        private void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<PowerOcrSettings>(Name).Properties.ActivationShortcut, () =>
-                {
-                    using var invokeOcrEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowPowerOCRSharedEvent());
-                    invokeOcrEvent.Set();
-                }
-            ));
-        }
-
-        public void Disable()
-        {
-            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminatePowerOCRSharedEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            PopulateShortcuts();
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerToysRunModuleInterface.cs

@@ -1,54 +0,0 @@
-// 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.Collections.Generic;
-using System.IO;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class PowerToysRunModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "PowerToys Run";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerLauncher;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPowerLauncherEnabledValue();
-
-        public override string ProcessPath => Path.GetFullPath("PowerToys.PowerLauncher.exe");
-
-        public override string ProcessName => "PowerToys.PowerLauncher";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.ElevateIfApplicable | ProcessLaunchOptions.SingletonProcess;
-
-        public override string ProcessArguments => $"-powerToysPid {Environment.ProcessId}";
-
-        public void Disable()
-        {
-            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.RunExitEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts =>
-        [
-            (
-                SettingsUtils.Default.GetSettings<PowerLauncherSettings>(Name).Properties.OpenPowerLauncher,
-                () =>
-                {
-                    EnsureLaunched();
-                    using var invokeRunEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.PowerLauncherCentralizedHookSharedEvent());
-                    invokeRunEvent.Set();
-                }
-            ),
-        ];
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/RegistryPreviewModuleInterface.cs

@@ -1,142 +0,0 @@
-// 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.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text.Json;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.Win32;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class RegistryPreviewModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.RegistryPreview;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
-
-        public string Name => "RegistryPreview";
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.RegistryPreview.exe";
-
-        public override string ProcessName => "PowerToys.RegistryPreview";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-            if (!RegistryPreviewChangeSet.UnApplyIfApplied())
-            {
-                Logger.LogError("Unapplying registry changes failed");
-            }
-        }
-
-        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
-        {
-            bool defaultRegApp = SettingsUtils.Default.GetSettings<RegistryPreviewSettings>(Name).Properties.DefaultRegApp;
-            if (defaultRegApp && !RegistryPreviewSetDefaultAppChangeSet.IsApplied)
-            {
-                if (!RegistryPreviewSetDefaultAppChangeSet.Apply())
-                {
-                    Logger.LogError("Applying reg default handler failed.");
-                }
-
-                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
-            }
-            else if (!defaultRegApp && RegistryPreviewSetDefaultAppChangeSet.IsApplied)
-            {
-                if (RegistryPreviewSetDefaultAppChangeSet.UnApply())
-                {
-                    Logger.LogError("Unapplying reg default handler failed.");
-                }
-
-                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
-            }
-        }
-
-        public void Enable()
-        {
-            if (!RegistryPreviewChangeSet.ApplyIfNotApplied())
-            {
-                Logger.LogError("Applying registry changes failed");
-            }
-
-            OnSettingsChanged(null!, default);
-        }
-
-        public Dictionary<string, Action> CustomActions
-        {
-            get => new() { { "Launch", () => LaunchProcess() } };
-        }
-
-        private RegistryChangeSet RegistryPreviewSetDefaultAppChangeSet
-        {
-            get
-            {
-                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-
-                string appName = "Registry Preview";
-                string registryKeyPrefix = "Software\\Classes\\";
-                RegistryValueChange[] changes =
-                    [
-                        new RegistryValueChange
-                    {
-                        KeyPath = registryKeyPrefix + ProcessName + "\\Application",
-                        KeyName = "ApplicationName",
-                        Value = appName,
-                    },
-                    new RegistryValueChange
-                    {
-                        KeyPath = registryKeyPrefix + ProcessName + "\\DefaultIcon",
-                        KeyName = null,
-                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe",
-                    },
-                    new RegistryValueChange
-                    {
-                        KeyPath = registryKeyPrefix + ProcessName + "\\shell\\open\\command",
-                        KeyName = null,
-                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"----ms-protocol:ms-encodedlaunch:App?ContractId=Windows.File&Verb=open&File=%1\"",
-                    },
-                    new RegistryValueChange
-                    {
-                        KeyPath = registryKeyPrefix + ".reg\\OpenWithProgIDs",
-                        KeyName = null,
-                        Value = ProcessName,
-                    }
-                    ];
-                return new RegistryChangeSet { Changes = changes };
-            }
-        }
-
-        private RegistryChangeSet RegistryPreviewChangeSet
-        {
-            get
-            {
-                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-
-                RegistryValueChange[] changes =
-                    [
-                        new RegistryValueChange
-                    {
-                        KeyPath = "Software\\Classes\\regfile\\shell\\preview\\command",
-                        KeyName = null,
-                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"%1\"",
-                    },
-                    new RegistryValueChange
-                    {
-                        KeyPath = "Software\\Classes\\regfile\\shell\\preview",
-                        KeyName = "icon",
-                        Value = installationDir + "\\WinUI3Apps\\Assets\\RegistryPreview\\RegistryPreview.ico",
-                    }
-                    ];
-                return new RegistryChangeSet() { Changes = changes };
-            }
-        }
-    }
-}

src/RunnerV2/RunnerV2/ModuleInterfaces/ZoomItModuleInterface.cs

@@ -1,45 +0,0 @@
-// 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.Collections.Generic;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class ZoomItModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "ZoomIt";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.ZoomIt;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredZoomItEnabledValue();
-
-        public override string ProcessPath => "PowerToys.ZoomIt.exe";
-
-        public override string ProcessName => "PowerToys.ZoomIt";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-
-        public Dictionary<string, Action> CustomActions { get => new() { { "refresh_settings", () => OnSettingsChanged(null!, default) } }; }
-
-        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
-        {
-            using var refreshSettingsEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ZoomItRefreshSettingsEvent());
-            refreshSettingsEvent.Set();
-        }
-    }
-}

src/RunnerV2/RunnerV2/NativeMethods.cs

@@ -1,246 +0,0 @@
-// 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.Drawing;
-using System.Runtime.InteropServices;
-using ManagedCommon;
-using Windows.ApplicationModel;
-
-namespace RunnerV2
-{
-    internal static partial class NativeMethods
-    {
-        [LibraryImport("advapi32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool OpenProcessToken(IntPtr processHandle, uint desiredAccess, out IntPtr tokenHandle);
-
-        [LibraryImport("advapi32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool GetTokenInformation(IntPtr tokenHandle, TOKEN_INFORMATION_CLASS tokenInformationClass, ref TokenElevation tokenInformation, uint tokenInformationLength, out uint returnLength);
-
-        [LibraryImport("Kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool CloseHandle(IntPtr hObject);
-
-        internal enum TOKEN_INFORMATION_CLASS
-        {
-            TOKEN_ELEVATION = 20,
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct TokenElevation
-        {
-            public uint TokenIsElevated;
-        }
-
-        internal const int TOKENQUERY = 0x0008;
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vk);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool UnregisterHotKey(IntPtr hWnd, int id);
-
-        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool AppendMenuW(IntPtr hMenu, uint uFlags, UIntPtr uIDNewItem, string lpNewItem);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        internal static partial IntPtr CreatePopupMenu();
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool SetForegroundWindow(IntPtr hWnd);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool TrackPopupMenu(IntPtr hMenu, uint uFlags, int x, int y, int nReserved, IntPtr hWnd, IntPtr prcRect);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
-
-        internal const uint NIMADD = 0x00000000;
-        internal const uint NIMDELETE = 0x00000002;
-
-        internal struct NOTIFYICONDATA
-        {
-            public uint CbSize;
-            public IntPtr HWnd;
-            public uint UId;
-            public uint UFlags;
-            public uint UCallbackMessage;
-            public IntPtr HIcon;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-            public string SzTip;
-            public uint DwState;
-            public uint DwStateMask;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-            public string SzInfo;
-            public uint UTimeoutOrVersion;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-            public string SzInfoTitle;
-            public uint DwInfoFlags;
-            public Guid GuidItem;
-            public IntPtr HBalloonIcon;
-        }
-
-        [DllImport("shell32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool Shell_NotifyIcon(uint dwMessage, ref NOTIFYICONDATA lpdata);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, uint action, IntPtr pChangeFilterStruct);
-
-        internal const uint CSVREDRAW = 0x0001;
-        internal const uint CSHREDRAW = 0x0002;
-
-        internal const uint WSOVERLAPPEDWINDOW = 0x00CF0000;
-        internal const uint WSPOPUP = 0x80000000;
-
-        internal const int CWUSEDEFAULT = unchecked((int)0x80000000);
-
-        internal static readonly IntPtr IDCARROW = new(32512);
-
-        [DllImport("user32.dll")]
-        internal static extern IntPtr GetMessageW(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
-
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool TranslateMessage(ref MSG lpMsg);
-
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool DispatchMessageW(ref MSG lpMsg);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool PostMessageW(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-        [LibraryImport("kernel32.dll")]
-        internal static partial ushort AddAtomW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
-
-        internal struct MSG
-        {
-            public IntPtr HWnd;
-            public uint Message;
-            public UIntPtr WParam;
-            public long LParam;
-            public ulong Time;
-            public Point Pt;
-        }
-
-        internal enum WindowMessages : uint
-        {
-            COMMAND = 0x0111,
-            HOTKEY = 0x0312,
-            ICON_NOTIFY = 0x0800,
-            WINDOWPOSCHANGING = 0x0046,
-            DESTROY = 0x0002,
-            REFRESH_SETTINGS = 0x0400 + 2,
-        }
-
-        [DllImport("user32.dll")]
-        internal static extern ushort RegisterClassW(ref WNDCLASS lpWndClass);
-
-        [LibraryImport("user32.dll", SetLastError = false)]
-        internal static partial IntPtr DefWindowProcW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        internal static partial uint RegisterWindowMessageW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
-
-        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-        internal static partial nint CreateWindowExW(
-            uint dwExStyle,
-            string lpClassName,
-            string lpWindowName,
-            uint dwStyle,
-            int x,
-            int y,
-            int nWidth,
-            int nHeight,
-            IntPtr hWndParent,
-            IntPtr hMenu,
-            IntPtr hInstance,
-            IntPtr lpParam);
-
-        [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        internal delegate IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct WNDCLASS
-        {
-            public uint Style;
-            public WndProc LpfnWndProc;
-            public int CbClsExtra;
-            public int CbWndExtra;
-            public IntPtr HInstance;
-            public IntPtr HIcon;
-            public IntPtr HCursor;
-            public IntPtr HbrBackground;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string LpszMenuName;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string LpszClassName;
-        }
-
-        [DllImport("Advapi32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool ConvertStringSecurityDescriptorToSecurityDescriptorW(
-            [MarshalAs(UnmanagedType.LPWStr)] string StringSecurityDescriptor,
-            uint StringSDRevision,
-            out IntPtr SecurityDescriptor,
-            out uint SecurityDescriptorSize);
-
-        [DllImport("Advapi32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool MakeAbsoluteSD(
-            IntPtr pSelfRelativeSD,
-            IntPtr pAbsoluteSD,
-            ref uint lpdwAbsoluteSDSize,
-            IntPtr pDacl,
-            ref uint lpdwDaclSize,
-            IntPtr pSacl,
-            ref uint lpdwSaclSize,
-            IntPtr pOwner,
-            ref uint lpdwOwnerSize,
-            IntPtr pPrimaryGroup,
-            ref uint lpdwPrimaryGroupSize);
-
-        [DllImport("ole32.dll", SetLastError = true)]
-        internal static extern int CoInitializeSecurity(
-            IntPtr pSecDesc,
-            int cAuthSvc,
-            IntPtr asAuthSvc,
-            IntPtr pReserved1,
-            uint dwAuthnLevel,
-            uint dwImpLevel,
-            IntPtr pAuthList,
-            uint dwCapabilities,
-            IntPtr pReserved3);
-
-        [DllImport("user32.dll")]
-        internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
-
-        [DllImport("PowerToys.Interop.dll", CallingConvention = CallingConvention.Cdecl)]
-        internal static extern bool GetPackageNameAndVersionFromAppx(
-            [MarshalAs(UnmanagedType.LPWStr)] string appxPath,
-            [MarshalAs(UnmanagedType.LPWStr)] out string outName,
-            out PackageVersion outVersion);
-
-        [LibraryImport("Shell32.dll", SetLastError = true)]
-        internal static partial void SHChangeNotify(
-            uint wEventId,
-            uint uFlags,
-            IntPtr dwItem1,
-            IntPtr dwItem2);
-
-        internal const uint SHCNE_ASSOCCHANGED = 0x8000000;
-        internal const uint SHCNF_IDLIST = 0x0;
-    }
-}

src/RunnerV2/RunnerV2/Program.cs

@@ -1,157 +0,0 @@
-// 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.Linq;
-using System.Reflection;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapperProjection;
-using RunnerV2;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-using Settings.UI.Library;
-
-internal sealed class Program
-{
-    private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
-
-    internal static GeneralSettings GeneralSettings => _settingsUtils.GetSettings<GeneralSettings>();
-
-    private static void Main(string[] args)
-    {
-        Logger.InitializeLogger("\\RunnerLogs");
-
-        string securityDescriptor =
-        "O:BA" // Owner: Builtin (local) administrator
-        + "G:BA" // Group: Builtin (local) administrator
-        + "D:"
-        + "(A;;0x7;;;PS)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Personal self
-        + "(A;;0x7;;;IU)" // Access allowed on COM_RIGHTS_EXECUTE for Interactive Users
-        + "(A;;0x3;;;SY)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Local system
-        + "(A;;0x7;;;BA)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Builtin (local) administrator
-        + "(A;;0x3;;;S-1-15-3-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Win32WebViewHost package capability
-        + "S:"
-        + "(ML;;NX;;;LW)"; // Integrity label on No execute up for Low mandatory level
-
-        COMUtils.InitializeCOMSecurity(securityDescriptor);
-
-        switch (ShouldRunInSpecialMode(args))
-        {
-            case SpecialMode.None:
-                break;
-            case SpecialMode.UpdateNow:
-                UpdateNow();
-                return;
-            default:
-                throw new NotImplementedException("Special modes are not implemented yet.");
-        }
-
-        bool shouldOpenSettings = args.Any(s => s.StartsWith("--open-settings", StringComparison.InvariantCulture));
-        bool shouldOpenSettingsToSpecificPage = args.Any(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture));
-
-        // Check if PowerToys is already running
-        if (Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length > 1)
-        {
-            throw new NotImplementedException("Opening another instance window is not supported yet.");
-        }
-
-        /*
-         * Todo: Data diagnotics
-        */
-
-        bool isElevated = ElevationHelper.IsProcessElevated();
-        bool hasDontElevateArgument = args.Contains("--dont-elevate");
-        bool runElevatedSetting = GeneralSettings.RunElevated;
-        bool hasRestartedElevatedArgment = args.Contains("--restartedElevated");
-
-        Action afterInitializationAction = () => { };
-        Version version = Assembly.GetExecutingAssembly().GetName().Version!;
-
-        if ($"v{version.Major}.{version.Minor}.{version.Build}" != _settingsUtils.GetSettings<LastVersionRunSettings>(fileName: "last_version_run.json").LastVersion && (!GeneralSettings.ShowWhatsNewAfterUpdates || GPOWrapper.GetDisableShowWhatsNewAfterUpdatesValue() != GpoRuleConfigured.Disabled))
-        {
-            afterInitializationAction += () =>
-            {
-                SettingsHelper.OpenSettingsWindow(showScoobeWindow: true);
-            };
-        }
-
-        if (!_settingsUtils.GetSettings<OOBESettings>(fileName: "oobe_settings.json").OpenedAtFirstLaunch)
-        {
-            afterInitializationAction += () =>
-            {
-                SettingsHelper.OpenSettingsWindow(showOobeWindow: true);
-            };
-        }
-
-        if (shouldOpenSettings)
-        {
-            afterInitializationAction += () =>
-            {
-                SettingsHelper.OpenSettingsWindow(additionalArguments: shouldOpenSettingsToSpecificPage ? args.First(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture)).Replace("--open-settings=", string.Empty, StringComparison.InvariantCulture) : null);
-            };
-        }
-
-        // Set last version run
-        _settingsUtils.SaveSettings(new LastVersionRunSettings() { LastVersion = $"v{version.Major}.{version.Minor}.{version.Build}" }.ToJsonString(), fileName: "last_version_run.json");
-
-        switch ((isElevated, hasDontElevateArgument, runElevatedSetting, hasRestartedElevatedArgment))
-        {
-            case (true, true, false, _):
-                // Todo: Scheudle restart as non elevated
-                throw new NotImplementedException();
-            case (true, _, _, _):
-            case (_, _, false, _):
-            case (_, true, _, _):
-            case (false, _, _, true):
-                GeneralSettings tempGeneralSettings = GeneralSettings;
-                tempGeneralSettings.IsElevated = isElevated;
-                _settingsUtils.SaveSettings(tempGeneralSettings.ToJsonString());
-
-                Runner.Run(afterInitializationAction);
-                break;
-            default:
-                ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevated;
-                break;
-        }
-
-        ElevationHelper.RestartIfScheudled();
-    }
-
-    /// <summary>
-    /// Returns whether the application should run in a special mode based on the provided arguments.
-    /// </summary>
-    /// <param name="args">The arguments passed to <see cref="Main(string[])"/></param>
-    /// <returns>The <see cref="SpecialMode"/> the app should run in.</returns>
-    private static SpecialMode ShouldRunInSpecialMode(string[] args)
-    {
-        if (args.Length > 0 && args[0].StartsWith("powertoys://", StringComparison.InvariantCultureIgnoreCase))
-        {
-            Uri uri = new(args[0]);
-            string host = uri.Host.ToLowerInvariant();
-            return host switch
-            {
-                "update_now" => SpecialMode.UpdateNow,
-                _ => SpecialMode.None,
-            };
-        }
-
-        return SpecialMode.None;
-    }
-
-    /// <summary>
-    /// Starts the update process for PowerToys.
-    /// </summary>
-    private static void UpdateNow()
-    {
-        Process.Start(new ProcessStartInfo()
-        {
-            UseShellExecute = false,
-            CreateNoWindow = true,
-            FileName = "PowerToys.Update.exe",
-            Arguments = "-update_now",
-        });
-    }
-}

src/RunnerV2/RunnerV2/Runner.cs

@@ -1,315 +0,0 @@
-// 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.Collections.Frozen;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ManagedCommon;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-using RunnerV2.ModuleInterfaces;
-using Update;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2
-{
-    internal static partial class Runner
-    {
-        /// <summary>
-        /// Gets the window handle for the Runner main window that hosts the tray icon and receives system messages.
-        /// </summary>
-        public static nint RunnerHwnd { get; private set; }
-
-        private const string TrayWindowClassName = "pt_tray_icon_window_class";
-
-        /// <summary>
-        /// Gets all the currently loaded modules.
-        /// </summary>
-        public static List<IPowerToysModule> LoadedModules { get; } = [];
-
-        /// <summary>
-        /// Gets the list of all available PowerToys modules.
-        /// </summary>
-        public static FrozenSet<IPowerToysModule> ModulesToLoad { get; } =
-        [
-            new ColorPickerModuleInterface(),
-            new AlwaysOnTopModuleInterface(),
-            new HostsModuleInterface(),
-            new PowerAccentModuleInterface(),
-            new AdvancedPasteModuleInterface(),
-            new AwakeModuleInterface(),
-            new CmdNotFoundModuleInterface(),
-            new CommandPaletteModuleInterface(),
-            new CropAndLockModuleInterface(),
-            new EnvironmentVariablesModuleInterface(),
-            new RegistryPreviewModuleInterface(),
-            new FileExplorerModuleInterface(),
-            new ZoomItModuleInterface(),
-            new PowerOCRModuleInterface(),
-            new MeasureToolModuleInterface(),
-            new MouseJumpModuleInterface(),
-            new FancyZonesModuleInterface(),
-            new PowerToysRunModuleInterface(),
-            new KeyboardManagerModuleInterface(),
-            new LightSwitchModuleInterface(),
-        ];
-
-        /// <summary>
-        /// Runs the main message loop for Runner.
-        /// </summary>
-        /// <param name="afterInitializationAction">A function to execute after initialization.</param>
-        internal static void Run(Action afterInitializationAction)
-        {
-            Logger.LogInfo("Runner started");
-
-            InitializeTrayWindow();
-            TrayIconManager.StartTrayIcon();
-
-            Task.Run(UpdateUtilities.UninstallPreviousMsixVersions);
-
-            foreach (IPowerToysModule module in ModulesToLoad)
-            {
-                ToggleModuleStateBasedOnEnabledProperty(module);
-            }
-
-            CentralizedKeyboardHookManager.Start();
-
-            afterInitializationAction();
-
-            MessageLoop();
-        }
-
-        private static readonly uint _taskbarCreatedMessage = RegisterWindowMessageW("TaskbarCreated");
-
-        /// <summary>
-        /// The main message loop that processes Windows messages.
-        /// </summary>
-        [STAThread]
-        private static void MessageLoop()
-        {
-            while (GetMessageW(out MSG msg, IntPtr.Zero, 0, 0) != 0)
-            {
-                TranslateMessage(ref msg);
-                DispatchMessageW(ref msg);
-
-                // Supress duplicate handling of HOTKEY messages
-                if (msg.Message == (uint)WindowMessages.HOTKEY)
-                {
-                    continue;
-                }
-
-                HandleMessage(msg.HWnd, msg.Message, (nint)msg.WParam, (nint)msg.LParam);
-            }
-
-            Close();
-        }
-
-        /// <summary>
-        /// Closes Runner and all loaded modules.
-        /// </summary>
-        [DoesNotReturn]
-        internal static void Close()
-        {
-            TrayIconManager.StopTrayIcon();
-            SettingsHelper.CloseSettingsWindow();
-            ElevationHelper.RestartIfScheudled();
-
-            foreach (IPowerToysModule module in LoadedModules)
-            {
-                try
-                {
-                    module.Disable();
-
-                    if (module is ProcessModuleAbstractClass pmac)
-                    {
-                        pmac.ProcessExit();
-                    }
-
-                    foreach (var hotkey in module.Hotkeys)
-                    {
-                        HotkeyManager.DisableHotkey(hotkey.Key);
-                    }
-                }
-                catch (Exception e)
-                {
-                    MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-
-            Environment.Exit(0);
-        }
-
-        /// <summary>
-        /// Toggles the state of a module based on its enabled property and GPO rules.
-        /// </summary>
-        /// <param name="module">The module to toggle</param>
-        public static void ToggleModuleStateBasedOnEnabledProperty(IPowerToysModule module)
-        {
-            try
-            {
-                if ((module.Enabled && (module.GpoRuleConfigured != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)) || module.GpoRuleConfigured == PowerToys.GPOWrapper.GpoRuleConfigured.Enabled)
-                {
-                    /* Todo: conflict manager */
-
-                    if (!LoadedModules.Contains(module))
-                    {
-                        module.Enable();
-                        if (module is ProcessModuleAbstractClass pmac)
-                        {
-                            pmac.LaunchProcess(true);
-                        }
-
-                        LoadedModules.Add(module);
-                    }
-
-                    // ToArray is called to mitigate mutations while the foreach is executing
-                    foreach (var hotkey in module.Hotkeys.ToArray())
-                    {
-                        HotkeyManager.EnableHotkey(hotkey.Key, hotkey.Value);
-                    }
-
-                    CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
-
-                    foreach (var shortcut in module.Shortcuts.ToArray())
-                    {
-                        CentralizedKeyboardHookManager.AddKeyboardHook(module.Name, shortcut.Hotkey, shortcut.Action);
-                    }
-
-                    return;
-                }
-            }
-            catch (IOException)
-            {
-                return;
-            }
-            catch (Exception e)
-            {
-                MessageBox.Show($"The module {module.Name} failed to load: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            try
-            {
-                module.Disable();
-
-                if (module is ProcessModuleAbstractClass pmac)
-                {
-                    pmac.ProcessExit();
-                }
-
-                foreach (var hotkey in module.Hotkeys)
-                {
-                    HotkeyManager.DisableHotkey(hotkey.Key);
-                }
-
-                CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
-
-                LoadedModules.Remove(module);
-            }
-            catch (IOException)
-            {
-            }
-            catch (Exception e)
-            {
-                MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        /// <summary>
-        /// Initializes the tray window to receive system messages.
-        /// </summary>
-        [STAThread]
-        private static void InitializeTrayWindow()
-        {
-            IntPtr hInstance = Process.GetCurrentProcess().MainModule!.BaseAddress;
-            IntPtr hCursor = Cursors.Arrow.Handle;
-            IntPtr hIcon = SystemIcons.Application.Handle;
-
-            var wc = new WNDCLASS
-            {
-                HCursor = hCursor,
-                HInstance = hInstance,
-                LpszClassName = TrayWindowClassName,
-                Style = CSHREDRAW | CSVREDRAW,
-                LpfnWndProc = HandleMessage,
-                HIcon = hIcon,
-                HbrBackground = IntPtr.Zero,
-                LpszMenuName = string.Empty,
-                CbClsExtra = 0,
-                CbWndExtra = 0,
-            };
-
-            _ = RegisterClassW(ref wc);
-
-            RunnerHwnd = CreateWindowExW(
-                0,
-                wc.LpszClassName,
-                TrayWindowClassName,
-                WSOVERLAPPEDWINDOW | WSPOPUP,
-                CWUSEDEFAULT,
-                CWUSEDEFAULT,
-                CWUSEDEFAULT,
-                CWUSEDEFAULT,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                wc.HInstance,
-                IntPtr.Zero);
-
-            if (RunnerHwnd == IntPtr.Zero)
-            {
-                var err = Marshal.GetLastPInvokeError();
-                MessageBox.Show($"CreateWindowExW failed. LastError={err}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        /// <summary>
-        /// Handles Windows messages sent to the tray window.
-        /// </summary>
-        private static IntPtr HandleMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        {
-            switch (msg)
-            {
-                case (uint)WindowMessages.HOTKEY:
-                    HotkeyManager.ProcessHotkey((nuint)wParam);
-                    break;
-                case (uint)WindowMessages.ICON_NOTIFY:
-                    TrayIconManager.ProcessTrayIconMessage(lParam);
-                    break;
-                case (uint)WindowMessages.COMMAND:
-                    TrayIconManager.ProcessTrayMenuCommand((nuint)wParam);
-                    break;
-                case (uint)WindowMessages.WINDOWPOSCHANGING:
-                    TrayIconManager.StartTrayIcon();
-                    break;
-                case (uint)WindowMessages.DESTROY:
-                    Close();
-                    break;
-                case (uint)WindowMessages.REFRESH_SETTINGS:
-                    foreach (IPowerToysModule module in ModulesToLoad)
-                    {
-                        ToggleModuleStateBasedOnEnabledProperty(module);
-                    }
-
-                    break;
-                default:
-                    if (msg == _taskbarCreatedMessage)
-                    {
-                        TrayIconManager.StartTrayIcon();
-                    }
-
-                    break;
-            }
-
-            return DefWindowProcW(hWnd, msg, wParam, lParam);
-        }
-    }
-}

src/RunnerV2/RunnerV2/RunnerV2.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.SelfContained.props" />
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <Description>PowerToys Runner</Description>
-    <AssemblyName>PowerToys</AssemblyName>
-    <OutputPath>..\..\..\$(Platform)\$(Configuration)</OutputPath>
-    <Nullable>enable</Nullable>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
-    <ProjectReference Include="..\..\modules\poweraccent\PowerAccent.UI\PowerAccent.UI.csproj" />
-    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-    <ProjectReference Include="..\..\Update\Update.csproj" />
-  </ItemGroup>
-</Project>

src/RunnerV2/RunnerV2/app.manifest

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>

src/Update/PowerToys.Update.base.rc

@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../common/version/version.h"
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/Update/PowerToys.Update.cpp

@@ -0,0 +1,234 @@
+// 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.
+
+#define WIN32_LEAN_AND_MEAN
+#include "Generated Files/resource.h"
+
+#include <Windows.h>
+#include <shellapi.h>
+
+#include <filesystem>
+#include <string_view>
+
+#include <common/updating/updating.h>
+#include <common/updating/updateState.h>
+#include <common/updating/installer.h>
+
+#include <common/utils/elevation.h>
+#include <common/utils/HttpClient.h>
+#include <common/utils/process_path.h>
+#include <common/utils/resources.h>
+#include <common/utils/timeutil.h>
+
+#include <common/SettingsAPI/settings_helpers.h>
+
+#include <common/logger/logger.h>
+
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.Storage.h>
+#include <Msi.h>
+
+#include "../runner/tray_icon.h"
+#include "../runner/UpdateUtils.h"
+
+using namespace cmdArg;
+
+namespace fs = std::filesystem;
+
+std::optional<fs::path> CopySelfToTempDir()
+{
+    std::error_code error;
+    auto dst_path = fs::temp_directory_path() / "PowerToys.Update.exe";
+    fs::copy_file(get_module_filename(), dst_path, fs::copy_options::overwrite_existing, error);
+    if (error)
+    {
+        return std::nullopt;
+    }
+
+    return std::move(dst_path);
+}
+
+std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
+{
+    using namespace updating;
+
+    isUpToDate = false;
+
+    auto state = UpdateState::read();
+
+    const auto new_version_info = get_github_version_info_async().get();
+    if (std::holds_alternative<version_up_to_date>(*new_version_info))
+    {
+        isUpToDate = true;
+        Logger::error("Invoked with -update_now argument, but no update was available");
+        return std::nullopt;
+    }
+
+    if (state.state == UpdateState::readyToDownload || state.state == UpdateState::errorDownloading)
+    {
+        if (!new_version_info)
+        {
+            Logger::error(L"Couldn't obtain github version info: {}", new_version_info.error());
+            return std::nullopt;
+        }
+
+        // Cleanup old updates before downloading the latest
+        updating::cleanup_updates();
+
+        auto downloaded_installer = download_new_version(std::get<new_version_download_info>(*new_version_info)).get();
+        if (!downloaded_installer)
+        {
+            Logger::error("Couldn't download new installer");
+        }
+
+        return downloaded_installer;
+    }
+    else if (state.state == UpdateState::readyToInstall)
+    {
+        fs::path installer{ get_pending_updates_path() / state.downloadedInstallerFilename };
+        if (fs::is_regular_file(installer))
+        {
+            return std::move(installer);
+        }
+        else
+        {
+            Logger::error(L"Couldn't find a downloaded installer {}", installer.native());
+            return std::nullopt;
+        }
+    }
+    else if (state.state == UpdateState::upToDate)
+    {
+        isUpToDate = true;
+        return std::nullopt;
+    }
+
+    Logger::error("Invoked with -update_now argument, but update state was invalid");
+    return std::nullopt;
+}
+
+bool InstallNewVersionStage1(fs::path installer)
+{
+    if (auto copy_in_temp = CopySelfToTempDir())
+    {
+        // Detect if PT was running
+        const auto pt_main_window = FindWindowW(pt_tray_icon_window_class, nullptr);
+
+        if (pt_main_window != nullptr)
+        {
+            SendMessageW(pt_main_window, WM_CLOSE, 0, 0);
+        }
+
+        std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
+        arguments += L" \"";
+        arguments += installer.c_str();
+        arguments += L"\"";
+        SHELLEXECUTEINFOW sei{ sizeof(sei) };
+        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
+        sei.lpFile = copy_in_temp->c_str();
+        sei.nShow = SW_SHOWNORMAL;
+
+        sei.lpParameters = arguments.c_str();
+        return ShellExecuteExW(&sei) == TRUE;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool InstallNewVersionStage2(std::wstring installer_path)
+{
+    std::transform(begin(installer_path), end(installer_path), begin(installer_path), ::towlower);
+
+    bool success = true;
+
+    if (installer_path.ends_with(L".msi"))
+    {
+        success = MsiInstallProductW(installer_path.data(), nullptr) == ERROR_SUCCESS;
+    }
+    else
+    {
+        // If it's not .msi, then it's a wix bootstrapper
+        SHELLEXECUTEINFOW sei{ sizeof(sei) };
+        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"/passive /norestart";
+        sei.lpParameters = parameters.c_str();
+
+        success = ShellExecuteExW(&sei) == TRUE;
+
+        // Wait for the install completion
+        if (success)
+        {
+            WaitForSingleObject(sei.hProcess, INFINITE);
+            DWORD exitCode = 0;
+            GetExitCodeProcess(sei.hProcess, &exitCode);
+            success = exitCode == 0;
+            CloseHandle(sei.hProcess);
+        }
+    }
+
+    if (!success)
+    {
+        return false;
+    }
+
+    UpdateState::store([&](UpdateState& state) {
+        state = {};
+        state.githubUpdateLastCheckedDate.emplace(timeutil::now());
+        state.state = UpdateState::upToDate;
+    });
+
+    return true;
+}
+
+int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    int nArgs = 0;
+    LPWSTR* args = CommandLineToArgvW(GetCommandLineW(), &nArgs);
+    if (!args || nArgs < 2)
+    {
+        return 1;
+    }
+
+    std::wstring_view action{ args[1] };
+
+    std::filesystem::path logFilePath(PTSettingsHelper::get_root_save_folder_location());
+    logFilePath.append(LogSettings::updateLogPath);
+    Logger::init(LogSettings::updateLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
+
+    if (action == UPDATE_NOW_LAUNCH_STAGE1)
+    {
+        bool isUpToDate = false;
+        auto installerPath = ObtainInstaller(isUpToDate);
+        bool failed = !installerPath.has_value();
+        failed = failed || !InstallNewVersionStage1(std::move(*installerPath));
+        if (failed)
+        {
+            UpdateState::store([&](UpdateState& state) {
+                state = {};
+                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
+                state.state = isUpToDate ? UpdateState::upToDate : UpdateState::errorDownloading;
+            });
+        }
+        return failed;
+    }
+    else if (action == UPDATE_NOW_LAUNCH_STAGE2)
+    {
+        using namespace std::string_view_literals;
+        const bool failed = !InstallNewVersionStage2(args[2]);
+        if (failed)
+        {
+            UpdateState::store([&](UpdateState& state) {
+                state = {};
+                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
+                state.state = UpdateState::errorDownloading;
+            });
+        }
+        return failed;
+    }
+
+    return 0;
+}

src/Update/PowerToys.Update.vcxproj

@@ -0,0 +1,81 @@
+<?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.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
+  </Target>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{44CE9AE1-4390-42C5-BACC-0FD6B40AA203}</ProjectGuid>
+    <RootNamespace>Update</RootNamespace>
+    <ProjectName>PowerToys.Update</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="..\..\deps\expected.props" />
+  <PropertyGroup>
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="PowerToys.Update.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\common\updating\updating.vcxproj">
+      <Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PowerToys.Update.base.rc" />
+    <ResourceCompile Include="Generated Files\PowerToys.Update.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\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.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+  </Target>
+</Project>

src/Update/Program.cs

@@ -1,183 +0,0 @@
-// 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.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Threading.Tasks;
-using Update;
-
-[SupportedOSPlatform("windows")]
-internal sealed partial class Program
-{
-    private static readonly string _installerPath = Path.Combine(Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "Microsoft",
-        "PowerToys",
-        "Updates"));
-
-    private static async Task Main(string[] args)
-    {
-        if (args.Length < 1)
-        {
-            Environment.Exit(1);
-            return;
-        }
-
-        string action = args[0];
-
-        switch (action)
-        {
-            case UpdateStage.UPDATENOWLAUNCHSTAGE1:
-                await PerformUpdateNowStage1();
-                break;
-            case UpdateStage.UPDATENOWLAUNCHSTAGE2:
-                if (args.Length < 2)
-                {
-                    Environment.Exit(1);
-                }
-
-                await PerformUpdateNowStage2(args[1]);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private static async Task PerformUpdateNowStage2(string installerPath)
-    {
-        Process installerProcess = new()
-        {
-            StartInfo = new ProcessStartInfo
-            {
-                FileName = installerPath,
-                Arguments = "/passive /norestart",
-                UseShellExecute = true,
-            },
-        };
-
-        installerProcess.Start();
-        await installerProcess.WaitForExitAsync();
-
-        if (installerProcess.ExitCode == 0)
-        {
-            UpdateSettingsHelper.ProcessNoUpdateAvailable();
-        }
-        else
-        {
-            UpdateSettingsHelper.SetUpdateState(UpdatingSettings.UpdatingState.ErrorDownloading);
-        }
-    }
-
-    private static async Task PerformUpdateNowStage1()
-    {
-        UpdateSettingsHelper.TriggerUpdateCheck();
-        UpdateSettingsHelper.UpdateInfo updateInfo = await UpdateSettingsHelper.GetUpdateAvailableInfo();
-
-        if (updateInfo is not UpdateSettingsHelper.UpdateInfo.UpdateAvailable ua)
-        {
-            // No update found
-            Environment.Exit(1);
-            return;
-        }
-
-        // Copy itsself to the temp folder
-        File.Copy("PowerToys.Update.exe", Path.Combine(Path.GetTempPath(), "PowerToys.Update.exe"), true);
-
-        string? installerFilePath = null;
-
-        switch (UpdateSettingsHelper.GetUpdateState())
-        {
-            case UpdatingSettings.UpdatingState.ReadyToDownload:
-            case UpdatingSettings.UpdatingState.ErrorDownloading:
-                CleanupUpdates();
-                installerFilePath = await DownloadFile(ua.InstallerDownloadUrl.ToString(), ua.InstallerFilename);
-                break;
-            case UpdatingSettings.UpdatingState.ReadyToInstall:
-                installerFilePath = Path.Combine(_installerPath, ua.InstallerFilename);
-                if (!File.Exists(installerFilePath))
-                {
-                    // Installer not found
-                    Environment.Exit(1);
-                    return;
-                }
-
-                break;
-            case UpdatingSettings.UpdatingState.UpToDate:
-                Environment.Exit(0);
-                return;
-        }
-
-        if (installerFilePath == null)
-        {
-            UpdateSettingsHelper.SetUpdateState(UpdatingSettings.UpdatingState.ErrorDownloading);
-            Environment.Exit(1);
-            return;
-        }
-
-        IntPtr runnerHwnd = FindWindowW("pt_tray_icon_window_class");
-
-        if (runnerHwnd != IntPtr.Zero)
-        {
-            SendMessageW(runnerHwnd, 0x0010, IntPtr.Zero, IntPtr.Zero); // Send WM_CLOSE
-        }
-
-        string arguments = $"{UpdateStage.UPDATENOWLAUNCHSTAGE2} \"{installerFilePath}\"";
-
-        Process.Start(new ProcessStartInfo
-        {
-            FileName = Path.Combine(Path.GetTempPath(), "PowerToys.Update.exe"),
-            Arguments = arguments,
-            UseShellExecute = true,
-            CreateNoWindow = true,
-            WorkingDirectory = Environment.CurrentDirectory,
-        });
-    }
-
-    private static async Task<string?> DownloadFile(string downloadUri, string downloadFileName)
-    {
-        HttpClient httpClient = new();
-        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("PowerToys Runner"); // GitHub API requires a user-agent
-
-        // 3 Attempts to download the file
-        for (int i = 0; i < 3; i++)
-        {
-            try
-            {
-                using FileStream fileStream = new(Path.Combine(_installerPath, downloadFileName), FileMode.Create, FileAccess.Write, FileShare.None);
-                await (await httpClient.GetStreamAsync(downloadUri)).CopyToAsync(fileStream);
-                return fileStream.Name;
-            }
-            catch
-            {
-            }
-        }
-
-        return null;
-    }
-
-    private static void CleanupUpdates()
-    {
-        if (!Path.Exists(_installerPath))
-        {
-            return;
-        }
-
-        foreach (string file in Directory.GetFiles(_installerPath).Where(f => f.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)))
-        {
-            File.Delete(file);
-        }
-    }
-
-    [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-    private static partial IntPtr FindWindowW(string lpClassName);
-
-    [LibraryImport("user32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool SendMessageW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
-}

src/Update/Resources.resx

@@ -0,0 +1,82 @@
+<?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>
+  <data name="GITHUB_NEW_VERSION_AVAILABLE" xml:space="preserve">
+    <value>An update to PowerToys is available.</value>
+  </data>
+  <data name="GITHUB_NEW_VERSION_UPDATE_NOW" xml:space="preserve">
+    <value>Update now</value>
+  </data>
+  <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
+    <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
+  </data>
+  <data name="GITHUB_NEW_VERSION_MORE_INFO" xml:space="preserve">
+    <value>More info...</value>
+  </data>
+  <data name="TOAST_TITLE" xml:space="preserve">
+    <value>PowerToys Update</value>
+  </data>
+</root>

src/Update/Update.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\Common.SelfContained.props" />
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <Description>PowerToys Runner</Description>
-    <AssemblyName>PowerToys.Update</AssemblyName>
-    <OutputPath>..\..\$(Platform)\$(Configuration)</OutputPath>
-    <Nullable>enable</Nullable>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<PublishAot>true</PublishAot>
-		<PublishSingleFile>true</PublishSingleFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <_IsPublishing Condition="'$(_IsPublishing)'==''">false</_IsPublishing>
-  </PropertyGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(_IsPublishing)'!='true'">
-    <Exec Command="dotnet publish &quot;$(ProjectPath)&quot; -c $(Configuration) -r $(RuntimeIdentifier) --self-contained -o &quot;$(OutputPath)&quot;" />
-  </Target>
-</Project>

src/Update/UpdateSettingsHelper.cs

@@ -1,227 +0,0 @@
-// 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.Globalization;
-using System.IO;
-using System.Net.Http;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Win32;
-
-namespace Update
-{
-    [SupportedOSPlatform("windows")]
-    public static class UpdateSettingsHelper
-    {
-        private static Thread? _updateThread;
-
-        private const string INSTALLERFILENAME = "powertoyssetup";
-        private const string USERINSTALLERFILENAME = "powertoysusersetup";
-
-        public static void TriggerUpdateCheck()
-        {
-            if (_updateThread is not null && _updateThread.IsAlive)
-            {
-                return;
-            }
-
-            _updateThread = new Thread(async () =>
-            {
-                UpdateInfo updateInfo = await GetUpdateAvailableInfo();
-                switch (updateInfo)
-                {
-                    case UpdateInfo.UpdateCheckFailed ucf:
-                        ProcessUpdateCheckFailed(ucf);
-                        break;
-                    case UpdateInfo.UpdateAvailable ua:
-                        ProcessUpdateAvailable(ua);
-                        break;
-                    case UpdateInfo.NoUpdateAvailable:
-                        ProcessNoUpdateAvailable();
-                        break;
-                }
-            });
-
-            _updateThread.Start();
-        }
-
-        internal record UpdateInfo
-        {
-            private UpdateInfo()
-            {
-            }
-
-            public sealed record NoUpdateAvailable : UpdateInfo;
-
-            public sealed record UpdateAvailable(Uri ReleasePageUri, Version AvailableVersion, Uri InstallerDownloadUrl, string InstallerFilename) : UpdateInfo;
-
-            public sealed record UpdateCheckFailed(Exception Exception) : UpdateInfo;
-        }
-
-        internal static async Task<UpdateInfo> GetUpdateAvailableInfo()
-        {
-            Version? currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
-
-            if (currentVersion is null)
-            {
-                // Todo: Log
-                return new UpdateInfo.NoUpdateAvailable();
-            }
-
-            if (currentVersion is { Major: 0, Minor: 0 })
-            {
-                // Pre-release or local build, skip update check
-                return new UpdateInfo.NoUpdateAvailable();
-            }
-
-            try
-            {
-                HttpClient httpClient = new();
-                httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("PowerToys Runner"); // GitHub API requires a user-agent
-                Stream body = await httpClient.GetStreamAsync("https://api.github.com/repos/microsoft/PowerToys/releases/latest").ConfigureAwait(false);
-                JsonElement releaseObject = (await JsonDocument.ParseAsync(body)).RootElement;
-                Version latestVersion = new(releaseObject.GetProperty("tag_name").GetString()?.TrimStart('V', 'v') ?? throw new FormatException("The \"tag_name\" field could not be found"));
-                string architectureString = RuntimeInformation.OSArchitecture switch
-                {
-                    Architecture.X64 => "x64",
-                    Architecture.Arm64 => "arm64",
-                    _ => throw new InvalidDataException("Unknown architecture"),
-                };
-
-                if (latestVersion > currentVersion)
-                {
-                    Uri releasePageUri = new(releaseObject.GetProperty("html_url").GetString() ?? throw new FormatException("The \"html_url\" field could not be found"));
-
-                    string requiredFilename = GetInstallScope() == InstallScope.PerMachine ? INSTALLERFILENAME : USERINSTALLERFILENAME;
-
-                    Uri? installerDownloadUrl = null;
-                    string? installerFilename = null;
-
-                    foreach (JsonElement asset in releaseObject.GetProperty("assets").EnumerateArray())
-                    {
-                        string? name = asset.GetProperty("name").GetString();
-                        string? browserDownloadUrl = asset.GetProperty("browser_download_url").GetString();
-
-                        if (name is null
-                            || browserDownloadUrl is null
-                            || !name.Contains(requiredFilename, StringComparison.InvariantCultureIgnoreCase)
-                            || !name.Contains(".exe", StringComparison.InvariantCultureIgnoreCase)
-                            || !name.Contains(architectureString, StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        installerDownloadUrl = new Uri(browserDownloadUrl);
-                        installerFilename = name;
-                        break;
-                    }
-
-                    return installerDownloadUrl is null || installerFilename is null
-                        ? new UpdateInfo.UpdateCheckFailed(new InvalidDataException("No installer found in GitHub release"))
-                        : new UpdateInfo.UpdateAvailable(releasePageUri, latestVersion, installerDownloadUrl, installerFilename);
-                }
-
-                return new UpdateInfo.NoUpdateAvailable();
-            }
-            catch (Exception e)
-            {
-                return new UpdateInfo.UpdateCheckFailed(e);
-            }
-        }
-
-        private enum InstallScope
-        {
-            PerMachine,
-            PerUser,
-        }
-
-        [SupportedOSPlatform("windows")]
-        private static InstallScope GetInstallScope()
-        {
-            if (Registry.LocalMachine.OpenSubKey(@"Software\Classes\powertoys\", false) is not RegistryKey machineKey)
-            {
-                if (Registry.CurrentUser.OpenSubKey(@"Software\Classes\powertoys\", false) is not RegistryKey userKey)
-                {
-                    // Both keys are missing
-                    return InstallScope.PerMachine;
-                }
-
-                if (userKey.GetValue("InstallScope") is not string installScope)
-                {
-                    userKey.Close();
-                    return InstallScope.PerMachine;
-                }
-
-                userKey.Close();
-
-                return installScope.Contains("perUser") ? InstallScope.PerUser : InstallScope.PerMachine;
-            }
-
-            machineKey.Close();
-
-            return InstallScope.PerMachine;
-        }
-
-        private static readonly string _settingsPath = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-            "Microsoft",
-            "PowerToys");
-
-        private static readonly string _updatingSettingsFile = Path.Combine(_settingsPath, "UpdateState.json");
-
-        private static void ProcessUpdateAvailable(UpdateInfo.UpdateAvailable updateAvailable)
-        {
-            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
-            Console.WriteLine($"Update available: {updateAvailable.AvailableVersion}");
-
-            updatingSettings.State = UpdatingSettings.UpdatingState.ReadyToDownload;
-            updatingSettings.ReleasePageLink = updateAvailable.ReleasePageUri.ToString();
-            updatingSettings.DownloadedInstallerFilename = updateAvailable.InstallerFilename;
-            updatingSettings.ReleasePageLink = updateAvailable.ReleasePageUri.ToString();
-            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
-
-            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
-        }
-
-        internal static void ProcessNoUpdateAvailable()
-        {
-            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
-
-            updatingSettings.State = UpdatingSettings.UpdatingState.UpToDate;
-            updatingSettings.ReleasePageLink = string.Empty;
-            updatingSettings.DownloadedInstallerFilename = string.Empty;
-            updatingSettings.ReleasePageLink = string.Empty;
-            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
-            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
-        }
-
-        private static void ProcessUpdateCheckFailed(UpdateInfo.UpdateCheckFailed updateCheckFailed)
-        {
-            // Todo: Log failed attempt
-            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
-
-            updatingSettings.State = UpdatingSettings.UpdatingState.NetworkError;
-            updatingSettings.ReleasePageLink = string.Empty;
-            updatingSettings.DownloadedInstallerFilename = string.Empty;
-            updatingSettings.ReleasePageLink = string.Empty;
-            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
-            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
-        }
-
-        internal static void SetUpdateState(UpdatingSettings.UpdatingState state)
-        {
-            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
-
-            updatingSettings.State = state;
-            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
-        }
-
-        internal static UpdatingSettings.UpdatingState GetUpdateState() => UpdatingSettings.LoadSettings().State;
-    }
-}

src/Update/UpdateStage.cs

@@ -1,16 +0,0 @@
-// 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.Collections.Generic;
-using System.Text;
-
-namespace Update
-{
-    internal static class UpdateStage
-    {
-        internal const string UPDATENOWLAUNCHSTAGE1 = "-update_now";
-        internal const string UPDATENOWLAUNCHSTAGE2 = "-update_now_stage_2";
-    }
-}

src/Update/UpdateUtilities.cs

@@ -1,44 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Update
-{
-    public static class UpdateUtilities
-    {
-        public static async void UninstallPreviousMsixVersions()
-        {
-            try
-            {
-                Windows.Management.Deployment.PackageManager packageManager = new();
-                var packages = packageManager.FindPackagesForUser(string.Empty, "Microsoft.PowerToys", "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US");
-
-                Version? currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
-
-                if (currentVersion == null)
-                {
-                    return;
-                }
-
-                foreach (var package in packages)
-                {
-                    Version msixVersion = new Version(package.Id.Version.Major, package.Id.Version.Minor, package.Id.Version.Revision);
-                    if (msixVersion < currentVersion)
-                    {
-                        await packageManager.RemovePackageAsync(package.Id.FullName);
-                    }
-                }
-            }
-            catch
-            {
-            }
-        }
-    }
-}

src/Update/UpdatingSettings.cs

@@ -1,124 +0,0 @@
-// 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.Globalization;
-using System.IO;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Update
-{
-    public sealed class UpdatingSettings
-    {
-        public enum UpdatingState
-        {
-            UpToDate = 0,
-            ErrorDownloading,
-            ReadyToDownload,
-            ReadyToInstall,
-            NetworkError,
-        }
-
-        // Gets or sets a value of the updating state
-        [JsonPropertyName("state")]
-        public UpdatingState State { get; set; }
-
-        // Gets or sets a value of the release page url
-        [JsonPropertyName("releasePageUrl")]
-        public string ReleasePageLink { get; set; } = string.Empty;
-
-        // Gets or sets a value of the github last checked date
-        [JsonPropertyName("githubUpdateLastCheckedDate")]
-        public string LastCheckedDate { get; set; } = string.Empty;
-
-        // Gets or sets a value of the updating state
-        [JsonPropertyName("downloadedInstallerFilename")]
-        public string DownloadedInstallerFilename { get; set; } = string.Empty;
-
-        // Non-localizable strings: Files
-        public const string SettingsFilePath = "\\Microsoft\\PowerToys\\";
-        public const string SettingsFile = "UpdateState.json";
-
-        public string NewVersion
-        {
-            get
-            {
-                if (ReleasePageLink == null)
-                {
-                    return string.Empty;
-                }
-
-                try
-                {
-                    string version = ReleasePageLink.Substring(ReleasePageLink.LastIndexOf('/') + 1);
-                    return version.Trim();
-                }
-                catch (Exception)
-                {
-                }
-
-                return string.Empty;
-            }
-        }
-
-        public string LastCheckedDateLocalized
-        {
-            get
-            {
-                try
-                {
-                    if (LastCheckedDate == null)
-                    {
-                        return string.Empty;
-                    }
-
-                    long seconds = long.Parse(LastCheckedDate, CultureInfo.CurrentCulture);
-                    var date = DateTimeOffset.FromUnixTimeSeconds(seconds).UtcDateTime;
-                    return date.ToLocalTime().ToString(CultureInfo.CurrentCulture);
-                }
-                catch (Exception)
-                {
-                }
-
-                return string.Empty;
-            }
-        }
-
-        public UpdatingSettings()
-        {
-            State = UpdatingState.UpToDate;
-        }
-
-        public static UpdatingSettings LoadSettings()
-        {
-            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            var file = localAppDataDir + SettingsFilePath + SettingsFile;
-
-            if (File.Exists(file))
-            {
-                try
-                {
-                    FileStream inputStream = File.Open(file, FileMode.Open);
-                    StreamReader reader = new(inputStream);
-                    string data = reader.ReadToEnd();
-                    inputStream.Close();
-                    reader.Dispose();
-
-                    return JsonSerializer.Deserialize(data, UpdatingsSettingsSourceGenerationContext.Default.UpdatingSettings)!;
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            return new UpdatingSettings();
-        }
-
-        public string ToJsonString()
-        {
-            return JsonSerializer.Serialize(this, UpdatingsSettingsSourceGenerationContext.Default.UpdatingSettings);
-        }
-    }
-}

src/Update/UpdatingsSettingsSourceGenerationContext.cs

@@ -1,22 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
-using System.Threading.Tasks;
-
-namespace Update
-{
-    [JsonSourceGenerationOptions(WriteIndented = true)]
-    [JsonSerializable(typeof(UpdatingSettings))]
-
-    internal sealed partial class UpdatingsSettingsSourceGenerationContext : JsonSerializerContext
-    {
-    }
-}

src/Update/packages.config

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

src/Update/resource.base.h

@@ -0,0 +1,11 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PowerToys.Update.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Update"
+#define INTERNAL_NAME "PowerToys.Update"
+#define ORIGINAL_FILENAME "PowerToys.Update.exe"
+

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,10 +66,5 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
-
-        public static GpoRuleConfigured GetDisableShowWhatsNewAfterUpdatesValue()
-        {
-            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetDisableShowWhatsNewAfterUpdatesValue();
-        }
     }
 }

src/common/ManagedCommon/HotkeyEx.cs

@@ -1,8 +0,0 @@
-// 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 ManagedCommon
-{
-    public record HotkeyEx(ushort ModifiersMask, ushort VkCode, int Identifier);
-}

src/common/ManagedCommon/LanguageHelper.cs

@@ -18,7 +18,7 @@ namespace ManagedCommon
         internal sealed class OutGoingLanguageSettings
         {
             [JsonPropertyName("language")]
-            public string? LanguageTag { get; set; }
+            public string LanguageTag { get; set; }
         }
 
         public static string LoadLanguage()
@@ -36,7 +36,7 @@ namespace ManagedCommon
                     inputStream.Close();
                     reader.Dispose();
 
-                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data, SourceGenerationContext.Default.OutGoingLanguageSettings)!.LanguageTag!;
+                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data, SourceGenerationContext.Default.OutGoingLanguageSettings).LanguageTag;
                 }
                 catch (Exception)
                 {

src/common/ManagedCommon/Logger.cs

@@ -29,17 +29,17 @@ namespace ManagedCommon
         /// <summary>
         /// Gets the path to the log directory for the current version of the app.
         /// </summary>
-        public static string? CurrentVersionLogDirectoryPath { get; private set; }
+        public static string CurrentVersionLogDirectoryPath { get; private set; }
 
         /// <summary>
         /// Gets the path to the current log file.
         /// </summary>
-        public static string? CurrentLogFile { get; private set; }
+        public static string CurrentLogFile { get; private set; }
 
         /// <summary>
         /// Gets the path to the log directory for the app.
         /// </summary>
-        public static string? AppLogDirectoryPath { get; private set; }
+        public static string AppLogDirectoryPath { get; private set; }
 
         /// <summary>
         /// Initializes the logger and sets the path for logging.
@@ -50,7 +50,7 @@ namespace ManagedCommon
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
             string versionedPath = LogDirectoryPath(applicationLogPath, isLocalLow);
-            string basePath = Path.GetDirectoryName(versionedPath)!;
+            string basePath = Path.GetDirectoryName(versionedPath);
 
             if (!Directory.Exists(versionedPath))
             {

src/common/ManagedCommon/ManagedCommon.csproj

@@ -6,7 +6,6 @@
   <PropertyGroup>
     <Description>PowerToys ManagedCommon</Description>
     <AssemblyName>PowerToys.ManagedCommon</AssemblyName>
-		<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
@@ -21,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GPOWrapperProjection\GPOWrapperProjection.csproj" />
     <ProjectReference Include="..\interop\PowerToys.Interop.vcxproj" />
     <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
   </ItemGroup>

src/common/ManagedCommon/NativeMethods.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 
 namespace ManagedCommon
 {
-    internal static partial class NativeMethods
+    internal static class NativeMethods
     {
         [DllImport("kernel32.dll", SetLastError = true)]
         internal static extern IntPtr OpenProcess(uint processAccess, bool bInheritHandle, int processId);
@@ -21,13 +21,6 @@ namespace ManagedCommon
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool QueryFullProcessImageName(IntPtr hProcess, uint dwFlags, System.Text.StringBuilder lpExeName, ref uint lpdwSize);
 
-        [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-        internal static partial IntPtr CreateEventW(IntPtr lpEventAttributes, [MarshalAs(UnmanagedType.Bool)] bool bManualReset, [MarshalAs(UnmanagedType.Bool)] bool bInitialState, string lpName);
-
-        [LibraryImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool SetEvent(IntPtr hEvent);
-
         [DllImport("kernel32.dll", SetLastError = true)]
         internal static extern bool GetExitCodeProcess(IntPtr hProcess, out uint lpExitCode);
 

src/common/ManagedCommon/ThemeHelpers.cs

@@ -24,7 +24,7 @@ namespace ManagedCommon
         // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
         public static AppTheme GetAppTheme()
         {
-            int value = (int)Registry.GetValue($"{HKeyRoot}\\{HkeyWindowsPersonalizeTheme}", HValueAppTheme, 1)!;
+            int value = (int)Registry.GetValue($"{HKeyRoot}\\{HkeyWindowsPersonalizeTheme}", HValueAppTheme, 1);
             return (AppTheme)value;
         }
 

src/common/ManagedCommon/ThemeListener.cs

@@ -24,7 +24,7 @@ namespace ManagedCommon
         /// <summary>
         /// An event that fires if the Theme changes.
         /// </summary>
-        public event ThemeChangedEvent? ThemeChanged;
+        public event ThemeChangedEvent ThemeChanged;
 
         private readonly ManagementEventWatcher watcher;
 
@@ -33,7 +33,7 @@ namespace ManagedCommon
             var currentUser = WindowsIdentity.GetCurrent();
             var query = new WqlEventQuery(
                 $"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND " +
-                $"KeyPath='{currentUser.User?.Value}\\\\{ThemeHelpers.HkeyWindowsPersonalizeTheme.Replace("\\", "\\\\")}' AND ValueName='{ThemeHelpers.HValueAppTheme}'");
+                $"KeyPath='{currentUser.User.Value}\\\\{ThemeHelpers.HkeyWindowsPersonalizeTheme.Replace("\\", "\\\\")}' AND ValueName='{ThemeHelpers.HValueAppTheme}'");
             watcher = new ManagementEventWatcher(query);
             watcher.EventArrived += Watcher_EventArrived;
             watcher.Start();

src/common/ManagedCsWin32/CLSID.cs

@@ -16,5 +16,4 @@ public static partial class CLSID
     public static readonly Guid CollatorDataSource = new Guid("9E175B8B-F52A-11D8-B9A5-505054503030");
     public static readonly Guid ApplicationActivationManager = new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C");
     public static readonly Guid VirtualDesktopManager = new("aa509086-5ca9-4c25-8f95-589d3c07b48a");
-    public static readonly Guid DesktopWallpaper = new("C2CF3110-460E-4FC1-B9D0-8A1C0C9CC4BD");
 }