Merge branch 'feature/wix_migration' into peiyaozhao/adjust-custom-action

Prevent CmdPal window from maximizing when user double-click the title bar area.

 Closes: #39096

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

@@ -53,6 +53,8 @@ YVU
 YVYU
 zipfolder
 CODEOWNERS
+VNext
+vnext
 
 # FONTS
 
@@ -273,4 +275,4 @@ mengyuanchen
 testhost
 
 #Tools
-OIP
+OIP

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

@@ -8,6 +8,7 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
+acfs
 AClient
 AColumn
 acrt
@@ -197,6 +198,7 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
+clp
 CLSCTX
 clsids
 Clusion
@@ -273,6 +275,7 @@ CURSORINFO
 cursorpos
 customaction
 CUSTOMACTIONTEST
+CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
@@ -517,11 +520,13 @@ FRAMECHANGED
 frm
 Froml
 FROMTOUCH
+fsanitize
 fsmgmt
 FZE
 gacutil
 Gaeilge
 Gaidhlig
+gameid
 GC'ed
 GCLP
 gdi
@@ -628,6 +633,7 @@ HOTKEYF
 hotkeys
 hotlight
 hotspot
+Hostx
 HPAINTBUFFER
 HRAWINPUT
 HREDRAW
@@ -711,6 +717,7 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
+installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -1005,6 +1012,7 @@ netsh
 newcolor
 NEWDIALOGSTYLE
 NEWFILE
+NEWFILEHEADER
 newitem
 newpath
 newplus
@@ -1038,6 +1046,7 @@ NOINHERITLAYOUT
 NOINTERFACE
 NOINVERT
 NOLINKINFO
+nologo
 NOMCX
 NOMINMAX
 NOMIRRORBITMAP
@@ -1075,6 +1084,7 @@ NOTRACK
 NOTSRCCOPY
 NOTSRCERASE
 NOTXORPEN
+notwindows
 NOZORDER
 NPH
 npmjs
@@ -1269,6 +1279,7 @@ pstm
 PStr
 pstream
 pstrm
+pswd
 PSYSTEM
 psz
 ptb
@@ -1299,6 +1310,7 @@ QUNS
 QXZ
 RAII
 RAlt
+Rappl
 randi
 Rasterization
 Rasterize
@@ -1395,6 +1407,7 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
+sancov
 SAVEFAILED
 scanled
 schedtasks
@@ -1413,6 +1426,7 @@ searchterm
 SEARCHUI
 SECONDARYDISPLAY
 secpol
+securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
 SENDCHANGE
@@ -1566,6 +1580,7 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
+steamapps
 STGC
 STGM
 STGMEDIUM
@@ -1647,6 +1662,7 @@ telephon
 templatenamespace
 testprocess
 TEXCOORD
+TEXTBOXNEWLINE
 TEXTEXTRACTOR
 TEXTINCLUDE
 tfopen
@@ -1928,6 +1944,7 @@ WUX
 Wwanpp
 XAxis
 xclip
+xcopy
 XDocument
 XElement
 xfd
@@ -1966,3 +1983,11 @@ ZOOMITX
 ZXk
 ZXNs
 zzz
+ACIE
+AOklab
+BCIE
+BOklab
+culori
+Evercoder
+LCh
+CIELCh

.gitignore

@@ -350,6 +350,10 @@ src/common/Telemetry/*.etl
 
 # Generated installer file for Monaco source files.
 /installer/PowerToysSetup/MonacoSRC.wxs
+/installer/PowerToysSetupVNext/MonacoSRC.wxs
 
 # MSBuildCache
 /MSBuildCacheLogs/
+
+# PowerToysInstaller Build Temp Files
+installer/*/*.wxs.bk

.pipelines/ESRPSigning_core.json

@@ -220,6 +220,7 @@
                 "WinUI3Apps\\PowerToys.Settings.exe",
 
                 "PowerToys.CmdPalModuleInterface.dll",
+                "CmdPalKeyboardService.dll",
                 "*Microsoft.CmdPal.UI_*.msix"
             ],
             "SigningInfo": {
@@ -330,6 +331,8 @@
                 "TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\OpenAI.dll",
+                "Testably.Abstractions.FileSystem.Interface.dll",
+                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                 "ColorCode.Core.dll", 
                 "ColorCode.UWP.dll",
                 "UnitsNet.dll",

.pipelines/ESRPSigning_installer.json

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

.pipelines/UpdateVersions.ps1

@@ -1,16 +1,24 @@
 Param(
-  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.6",
+  [string]$winAppSdkVersionNumber = "1.7",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False
+  [boolean]$useExperimentalVersion = $False,
+
+  # Root folder Path for processing
+  [Parameter(Mandatory=$False,Position=3)]
+  [string]$rootPath = $(Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)),
+
+  # Root folder Path for processing
+  [Parameter(Mandatory=$False,Position=4)]
+  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
 function Update-NugetConfig {
     param (
-        [string]$filePath = "nuget.config"
+        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
     )
 
     Write-Host "Updating nuget.config file"
@@ -35,7 +43,33 @@ function Update-NugetConfig {
     $xml.Save($filePath)
 }
 
-$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+function Read-FileWithEncoding {
+    param (
+        [string]$Path
+    )
+
+    $reader = New-Object System.IO.StreamReader($Path, $true)  # auto-detect encoding
+    $content = $reader.ReadToEnd()
+    $encoding = $reader.CurrentEncoding
+    $reader.Close()
+
+    return [PSCustomObject]@{
+        Content  = $content
+        Encoding = $encoding
+    }
+}
+
+function Write-FileWithEncoding {
+    param (
+        [string]$Path,
+        [string]$Content,
+        [System.Text.Encoding]$Encoding
+    )
+
+    $writer = New-Object System.IO.StreamWriter($Path, $false, $Encoding)
+    $writer.Write($Content)
+    $writer.Close()
+}
 
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -79,50 +113,54 @@ if ($latestVersion) {
 }
 
 # Update packages.config files
-Get-ChildItem -Recurse packages.config | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+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
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }
 
 # Update Directory.Packages.props file
-$propsFile = "Directory.Packages.props"
+$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
 if (Test-Path $propsFile) {
-    $content = Get-Content $propsFile -Raw
+    $file = Read-FileWithEncoding -Path $propsFile
+    $content = $file.Content
     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
-        Set-Content -Path $propsFile -Value $content
+        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
         Write-Host "Modified " $propsFile
     }
 }
 
 # Update .vcxproj files
-Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+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]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName
     }
 }
 
 # Update .csproj files
-Get-ChildItem -Recurse *.csproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+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
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }

.pipelines/installWiXVNext.ps1

@@ -0,0 +1,26 @@
+$ProgressPreference = 'SilentlyContinue'
+
+$WixDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe"
+$WixBinariesDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"
+
+# Download WiX binaries and verify their hash sums
+Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
+if ($Hash -ne '6BF6D03D6923D9EF827AE1D943B90B42B8EBB1B0F68EF6D55F868FA34C738A29')
+{
+    Write-Error "$WixHash"
+    throw "wix314.exe has unexpected SHA256 hash: $Hash"
+}
+Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
+if($Hash -ne '6AC824E1642D6F7277D0ED7EA09411A508F6116BA6FAE0AA5F2C7DAA2FF43D31')
+{
+    throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
+}
+
+# Install WiX
+Start-Process -Wait -FilePath "$($ENV:Temp)\wix314.exe" -ArgumentList "/install /quiet"
+
+# Extract WiX binaries and copy wix.targets to the installed dir
+Expand-Archive -Path "$($ENV:Temp)\wix314-binaries.zip" -Force -DestinationPath "$($ENV:Temp)"
+Copy-Item -Path "$($ENV:Temp)\wix.targets" -Destination "C:\Program Files (x86)\WiX Toolset v3.14\"

.pipelines/tsa.json

@@ -3,5 +3,5 @@
     "notificationAliases": ["powertoys@microsoft.com"],
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\PowerToys"
 }

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

@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.6
+    default: 1.7
   - name: useExperimentalVersion
     type: boolean
     default: false

.pipelines/v2/release.yml

@@ -148,5 +148,7 @@ extends:
             parameters:
               versionNumber: ${{ parameters.versionNumber }}
               includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
+              ${{ if ne(parameters.publishSymbolsToPublic, true) }}:
+                symbolExpiryTime: 10 # For private builds, expire symbols within 10 days. The default is 100 years.
               subscription: $(SymbolPublishingServiceConnection)
               symbolProject: $(SymbolPublishingProject)

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

@@ -219,6 +219,10 @@ jobs:
       & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
     displayName: Download and install WiX 3.14 development build
 
+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\installWiXVNext.ps1"
+    displayName: Download and install WiX 4/5 development build
+
   - ${{ parameters.beforeBuildSteps }}
 
   - task: VSBuild@1
@@ -344,6 +348,11 @@ jobs:
       flattenFolders: True
       OverWrite: True
 
+  # Check if all projects (located in src sub-folder) import common props
+  - pwsh: |-
+      & '.pipelines/verifyCommonProps.ps1' -sourceDir '$(build.sourcesdirectory)\src'
+    displayName: Audit shared common props for CSharp projects in src sub-folder
+
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
@@ -452,6 +461,21 @@ jobs:
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
       buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
 
+  - template: steps-build-installer-vnext.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+
+  - template: steps-build-installer-vnext.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
+
   # This saves ~1GiB per architecture. We won't need these later.
   # Removes:
   # - All .pdbs from any static libs .libs (which were only used during linking)
@@ -474,6 +498,13 @@ jobs:
       flattenFolders: True
       targetFolder: $(JobOutputDirectory)
 
+  - task: CopyFiles@2
+    displayName: Stage Installers
+    inputs:
+      contents: "**/PowerToys*SetupVNext-*.exe"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)
+
   - task: CopyFiles@2
     displayName: Stage Symbols
     inputs:
@@ -507,6 +538,28 @@ jobs:
       $machineHash | out-file -filepath $combinedMachinePath
     displayName: Calculate file hashes
 
+  # Output config for installer vnext
+  - pwsh: |-
+      $p = "$(JobOutputDirectory)\"
+      $userHash = ((Get-Item $p\PowerToysUserSetupVNext*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetupVNext*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
+      
+      echo $p
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
+      
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes
+
   # Publishing the GPO files
   - pwsh: |-
       New-Item "$(JobOutputDirectory)/gpo" -Type Directory

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

@@ -0,0 +1,184 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
+  - name: buildUserInstaller
+    type: boolean
+    default: false
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+
+steps:
+  - pwsh: |-
+      & git clean -xfd -e *exe -- .\installer\
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
+
+  - pwsh: |-
+      $IsPerUser = $${{ parameters.buildUserInstaller }}
+      $InstallerBuildSlug = "MachineSetup"
+      $InstallerBasename = "PowerToysSetupVNext"
+      If($IsPerUser) {
+        $InstallerBuildSlug = "UserSetup"
+        $InstallerBasename = "PowerToysUserSetupVNext"
+      }
+      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+
+  # This dll needs to be built and signed before building the MSI.
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActionsVNext
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysSetupCustomActionsVNext
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        -restore -graph
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: true
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActionsVNext
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupCustomActionsVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  ## INSTALLER START
+  #### MSI BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore
+        /t:PowerToysInstallerVNext
+        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - script: |-
+      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi
+      dir $(build.sourcesdirectory)\extractedMsi
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+        git clean -xfd ./extractedMsi
+      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  #### END MSI
+  #### BOOTSTRAP BUILDING AND SIGNING
+
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapperVNext
+        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
+        -restore -graph
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: "installer"
+          Pattern: engine.exe
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolSign",
+                    "Parameters": {
+                        "OpusName": "Microsoft",
+                        "OpusInfo": "http://www.microsoft.com",
+                        "FileDigest": "/fd \"SHA256\"",
+                        "PageHash": "/NPH",
+                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    },
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
+
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END BOOTSTRAP
+  ## END INSTALLER

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

@@ -17,6 +17,7 @@ steps:
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
+      -rootPath "$(build.sourcesdirectory)"
 
 - script: echo $(WinAppSDKVersion)
   displayName: 'Display WinAppSDK Version Found'

.pipelines/verifyCommonProps.ps1

@@ -0,0 +1,54 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$sourceDir
+)
+
+# scan all csharp project in the source directory
+function Get-CSharpProjects {
+    param (
+        [string]$path
+    )
+
+    # Get all .csproj files under the specified path
+    return Get-ChildItem -Path $path -Recurse -Filter *.csproj | Select-Object -ExpandProperty FullName
+}
+
+# Check if the project file imports 'Common.Dotnet.CsWinRT.props'
+function Test-ImportSharedCsWinRTProps {
+    param (
+        [string]$filePath
+    )
+
+    # Load the XML content of the .csproj file
+    [xml]$csprojContent = Get-Content -Path $filePath
+
+    
+    # Check if the Import element with Project attribute containing 'Common.Dotnet.CsWinRT.props' exists
+    return $csprojContent.Project.Import | Where-Object { $null -ne $_.Project -and $_.Project.EndsWith('Common.Dotnet.CsWinRT.props') }
+}
+
+# Call the function with the provided source directory
+$csprojFilesArray = Get-CSharpProjects -path $sourceDir
+
+$hasInvalidCsProj = $false
+
+# Enumerate the array of file paths and call Validate-ImportSharedCsWinRTProps for each file
+foreach ($csprojFile in $csprojFilesArray) {
+    # Skip if the file ends with 'TemplateCmdPalExtension.csproj'
+    if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
+        continue
+    }
+
+    $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
+    if (!$importExists) {
+        Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."
+        $hasInvalidCsProj = $true
+    }
+}
+
+if ($hasInvalidCsProj) {
+    exit 1
+}
+
+exit 0

Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
     <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" />

NOTICE.md

@@ -75,6 +75,40 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
+## Utility: Command Palette Built-in Extensions
+
+### Calculator
+
+#### Mages
+
+We use the Mages NuGet package for calculating the result of expression.
+
+**Source**: [https://github.com/FlorianRappl/Mages](https://github.com/FlorianRappl/Mages)
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2016 - 2025 Florian Rappl
+
+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: File Explorer Add-ins
 
 ### Monaco Editor
@@ -1438,8 +1472,8 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.6.250205002
-- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
+- Microsoft.WindowsAppSDK 1.7.250401001
+- Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4

PowerToys.sln

@@ -708,6 +708,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2588,6 +2590,12 @@ Global
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2859,6 +2867,7 @@ Global
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/Fuzzing/CppFuzzingGuide.md

@@ -0,0 +1,117 @@
+# 🧪 C++ Project Fuzzing Test Guide
+
+This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
+.
+
+---
+
+## 🏗️ Step-by-Step Setup
+
+### 1. Create a New C++ Project
+
+- Use **Empty Project** template.
+- Name it `<ModuleName>.FuzzingTest`.
+
+---
+
+### 2. Update Build Configuration
+
+- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
+- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
+---
+
+### 3. Enable ASan and libFuzzer in `.vcxproj`
+
+Edit the project file to enable fuzzing:
+
+```xml
+<PropertyGroup>
+  <EnableASAN>true</EnableASAN>
+  <EnableFuzzer>true</EnableFuzzer>
+</PropertyGroup>
+```
+
+---
+
+### 4. Add Fuzzing Compiler Flags
+
+Add this to `AdditionalOptions` under the `Fuzzing` configuration:
+
+```xml
+/fsanitize=address
+/fsanitize-coverage=inline-8bit-counters
+/fsanitize-coverage=edge
+/fsanitize-coverage=trace-cmp
+/fsanitize-coverage=trace-div
+%(AdditionalOptions)
+```
+
+---
+
+### 5. Link the Sanitizer Coverage Runtime
+
+In `Linker → Input → Additional Dependencies`, add:
+
+```text
+$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
+```
+
+---
+
+### 6. Copy Required Runtime DLL
+
+Add a `PostBuildEvent` to copy the ASAN DLL:
+
+```xml
+<Command>
+  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
+</Command>
+```
+
+---
+
+### 7. Add Preprocessor Definitions
+
+To avoid annotation issues, add these to the `Preprocessor Definitions`:
+
+```text
+_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
+```
+
+---
+
+## 🧬 Required Code
+
+### `LLVMFuzzerTestOneInput` Entry Point
+
+Every fuzzing project must expose this function:
+
+```cpp
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    std::string input(reinterpret_cast<const char*>(data), size);
+
+    try
+    {
+        // Call your module with the input here.
+    }
+    catch (...) {}
+
+    return 0;
+}
+```
+
+---
+
+## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
+
+To submit a job to the cloud you can run with this command:
+
+```
+oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
+```
+You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
+
+OneFuzz will send you an email when the job has started.
+
+---

installer/PowerToysSetup.sln

@@ -17,6 +17,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\ve
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -78,6 +84,29 @@ Global
 		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -57,7 +57,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
       call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
       call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
-    </PostBuildEvent>
+      </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <Name>PowerToysInstaller</Name>

installer/PowerToysSetup/Product.wxs

@@ -79,10 +79,7 @@
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
       <ComponentGroupRef Id="WorkspacesComponentGroup" />
-
-      <?if $(var.CIBuild) = "true" ?>
-        <ComponentGroupRef Id="CmdPalComponentGroup" />
-      <?endif?>
+      <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -81,7 +81,7 @@
       if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
       if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
       </Command>
-      <Message>Backing up original files and populating .NET and WPF Runtime dependencies </Message>
+      <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -0,0 +1,29 @@
+LIBRARY "PowerToysSetupCustomActionsVNext"
+
+EXPORTS
+	LaunchPowerToysCA
+	CheckGPOCA
+	CleanVideoConferenceRegistryCA
+	ApplyModulesRegistryChangeSetsCA
+	DetectPrevInstallPathCA
+	RemoveScheduledTasksCA
+	TelemetryLogInstallSuccessCA
+	TelemetryLogInstallCancelCA
+	TelemetryLogInstallFailCA
+	TelemetryLogUninstallSuccessCA
+	TelemetryLogUninstallCancelCA
+	TelemetryLogUninstallFailCA
+	TelemetryLogRepairCancelCA
+	TelemetryLogRepairFailCA
+	TerminateProcessesCA
+	InstallEmbeddedMSIXCA
+	InstallDSCModuleCA
+	InstallCmdPalPackageCA
+	UnApplyModulesRegistryChangeSetsCA
+	UnRegisterContextMenuPackagesCA
+	UninstallEmbeddedMSIXCA
+	UninstallDSCModuleCA
+	UninstallServicesCA
+	UninstallCommandNotFoundModuleCA
+	UpgradeCommandNotFoundModuleCA
+	UnsetAdvancedPasteAPIKeyCA

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>PowerToysSetupCustomActionsVNext</RootNamespace>
+    <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)'=='Debug'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)'=='Release'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup\</OutDir>
+    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
+    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
+    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
+    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
+    <NormalizedPerUserValue>false</NormalizedPerUserValue>
+    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>..\..\src\common\Telemetry;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <PreBuildEvent>
+      <Command>
+      call cmd /C "copy ""$(ProjectDir)DepsFilesLists.h"" ""$(ProjectDir)DepsFilesLists.h.bk"""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\PowerRename.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Product.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Product.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\RegistryPreview.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Resources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Resources.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Run.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Run.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Settings.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ShortcutGuide.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Tools.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs.bk""""
+      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
+      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
+      </Command>
+      <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX VNext based installer</Message>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
+    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>inc;..\..\src\;..\..\src\common\Telemetry;telemetry;$(WixSdkPath)VS2017\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Userenv.lib;Wtsapi32.lib;WindowsApp.lib;Newdev.lib;Crypt32.lib;msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(WixSdkPath)VS2017\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <UACExecutionLevel>HighestAvailable</UACExecutionLevel>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <UACExecutionLevel>HighestAvailable</UACExecutionLevel>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="CustomAction.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CustomAction.def" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="DepsFilesLists.h" />
+    <ClInclude Include="RcResource.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="Telemetry\ProjectTelemetry.h" />
+    <ClInclude Include="Telemetry\TraceLoggingDefines.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <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')" />
+  </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'))" />
+  </Target>
+</Project>

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj.filters

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="CustomAction.cpp" />
+    <ClCompile Include="pch.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="Telemetry\ProjectTelemetry.h">
+      <Filter>Telemetry</Filter>
+    </ClInclude>
+    <ClInclude Include="Telemetry\TraceLoggingDefines.h">
+      <Filter>Telemetry</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="RcResource.h" />
+    <ClInclude Include="DepsFilesLists.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CustomAction.def" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Telemetry">
+      <UniqueIdentifier>{6e73ce5d-e715-4e7e-b796-c5d180b07ff2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
+</Project>

installer/PowerToysSetupCustomActionsVNext/RcResource.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#include <string_view>
+#include <optional>
+#include <filesystem>
+#include <fstream>
+
+#include <Windows.h>
+
+class RcResource
+{
+public:
+    const std::byte* _memory = nullptr;
+    size_t _size = 0;
+
+    static inline std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class, const HINSTANCE handle = nullptr)
+    {
+        const HRSRC resHandle = FindResourceW(handle, MAKEINTRESOURCEW(resource_id), resource_class.data());
+        if (!resHandle)
+        {
+            return std::nullopt;
+        }
+
+        const HGLOBAL memHandle = LoadResource(handle, resHandle);
+        if (!memHandle)
+        {
+            return std::nullopt;
+        }
+
+        const size_t resSize = SizeofResource(handle, resHandle);
+        if (!resSize)
+        {
+            return std::nullopt;
+        }
+
+        auto res = static_cast<const std::byte*>(LockResource(memHandle));
+        if (!res)
+        {
+            return std::nullopt;
+        }
+
+        return RcResource{ res, resSize };
+    }
+
+    inline bool saveAsFile(const std::filesystem::path destination)
+    {
+        std::fstream installerFile{ destination, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc };
+        if (!installerFile.is_open())
+        {
+            return false;
+        }
+
+        installerFile.write(reinterpret_cast<const char*>(_memory), _size);
+        return true;
+    }
+
+private:
+    RcResource() = delete;
+    RcResource(const std::byte* memory, size_t size) :
+        _memory{ memory }, _size{ size }
+    {
+    }
+};

installer/PowerToysSetupCustomActionsVNext/Resource.rc

@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include <windows.h>
+#include "resource.h"
+#include "../../src/common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+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
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE 25, 1
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE  
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE  
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+// TODO: Use to activate embedded MSIX
+//IDR_BIN_MSIX_HELLO_PACKAGE BIN "..\\..\..\\src\\modules\\HelloModule\\AppPackages\\HelloModule_1.0.0.0_x64_Test\\HelloModule_1.0.0.0_x64.msix"
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED

installer/PowerToysSetupCustomActionsVNext/packages.config

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

installer/PowerToysSetupCustomActionsVNext/pch.cpp

@@ -0,0 +1,5 @@
+// pch.cpp: source file corresponding to the pre-compiled header
+
+#include "pch.h"
+
+// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.

installer/PowerToysSetupCustomActionsVNext/pch.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define DPSAPI_VERSION 1
+// Windows Header Files:
+#include <windows.h>
+#include <newdev.h>
+#include <strsafe.h>
+#include <msiquery.h>
+#include <Msi.h>
+#include <shlobj_core.h>
+
+// WiX Header Files:
+#include <wcautil.h>
+
+#define SECURITY_WIN32
+#include <Security.h>
+#include <Lmcons.h>
+
+#include <comdef.h>
+#include <taskschd.h>
+#include <iostream>
+#include <strutil.h>
+#include <string>
+#include <optional>
+#include <pathcch.h>
+
+#include <psapi.h>
+#include <vector>
+#include <array>
+#include <mutex>
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.Management.Deployment.h>
+#include <winrt/Windows.System.h>

installer/PowerToysSetupCustomActionsVNext/resource.h

@@ -0,0 +1,20 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Resource.rc
+
+#define FILE_DESCRIPTION "PowerToys Setup Custom Actions"
+#define INTERNAL_NAME "PowerToysSetupCustomActionsVNext"
+#define ORIGINAL_FILENAME "PowerToysSetupCustomActionsVNext.dll"
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           102
+#endif
+#endif
+
+#define IDR_BIN_MSIX_HELLO_PACKAGE 101

installer/PowerToysSetupVNext/AdvancedPaste.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define AdvancedPasteAssetsFiles=?>
+  <?define AdvancedPasteAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\AdvancedPaste\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="AdvancedPasteAssetsFolder" Name="AdvancedPaste" />
+    </DirectoryRef>
+    <DirectoryRef Id="AdvancedPasteAssetsFolder" FileSource="$(var.AdvancedPasteAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AdvancedPasteAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="AdvancedPasteComponentGroup">
+      <Component Id="RemoveAdvancedPasteFolder" Guid="55AFE81D-F6BD-439A-A229-66AF5C360AB0" Directory="AdvancedPasteAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveAdvancedPasteFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderAdvancedPasteAssetsFolder" Directory="AdvancedPasteAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Awake.wxs

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define AwakeImagesFiles=?>
+  <?define AwakeImagesFilesPath=$(var.BinDir)\Assets\Awake\?>
+
+  <Fragment>
+    <!-- Awake images -->
+
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="AwakeImagesFolder" Name="Awake" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.AwakeImagesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AwakeImagesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="AwakeComponentGroup">
+      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveAwakeFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderAwakeImagesFolder" Directory="AwakeImagesFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/BaseApplications.wxs

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

installer/PowerToysSetupVNext/ColorPicker.wxs

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ColorPickerAssetsFiles=?>
+  <?define ColorPickerAssetsFilesPath=$(var.BinDir)Assets\ColorPicker\?>
+
+  <Fragment>
+  <!-- Color Picker -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ColorPickerAssetsFolder" Name="ColorPicker" />
+    </DirectoryRef>
+    <!-- Color Picker Resources -->
+    <DirectoryRef Id="ColorPickerAssetsFolder" FileSource="$(var.ColorPickerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ColorPickerAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="ColorPickerComponentGroup">
+      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveColorPickerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderColorPickerAssetsFolder" Directory="ColorPickerAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Common.wxi

@@ -0,0 +1,58 @@
+<Include>
+  <!-- Names of folders and projects -->
+  <?define FancyZonesProjectName="FancyZones"?>
+  <?define ImageResizerProjectName="ImageResizer"?>
+  <?define KeyboardManagerProjectName="KeyboardManager"?>
+  <?define PowerAccentProjectName="PowerAccent"?>
+  <?define PowerRenameProjectName="PowerRename"?>
+  <?define FileLocksmithProjectName="FileLocksmith"?>
+  <?define ColorPickerProjectName="ColorPicker"?>
+  <?define PowerOCRProjectName="PowerOCR"?>
+  <?define AwakeProjectName="Awake"?>
+  <?define MouseUtilsProjectName="MouseUtils"?>
+  <?define AlwaysOnTopProjectName="AlwaysOnTop"?>
+  <?define MeasureToolProjectName="MeasureTool"?>
+  <?define HostsProjectName="Hosts"?>
+  <?define MouseWithoutBordersProjectName="MouseWithoutBorders"?>
+  <?define AdvancedPasteProjectName="AdvancedPaste"?>
+  <?define RegistryPreviewProjectName="RegistryPreview"?>
+  <?define PeekProjectName="Peek"?>
+  <?define WorkspacesProjectName="Workspaces"?>
+  
+  <?define RepoDir="$(var.ProjectDir)..\..\" ?>
+  <?if $(var.Platform) = x64?>
+        <?define PowerToysPlatform="x64"?>
+        <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
+        <?define PlatformLK="x64" ?>
+        <?define BinDir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
+  <?else?>
+        <!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
+        <?define PowerToysPlatform="ARM64"?>
+        <!--TODO: define to ARM64 Program files once it's available-->
+        <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> 
+        <?define PlatformLK="arm64" ?>
+        <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
+  <?endif?>
+
+  <?if $(var.PerUser) = "true"?>
+        <?define PerMachineYesNo="no"?>
+        <?define MSIPath="UserSetup"?>
+        <?define MSIName="PowerToysUserSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="LocalAppDataFolder" ?>
+        <?define RegistryScope="HKCU" ?>
+        <?define InstallScope="perUser" ?>
+        <?define InstallPrivileges="limited" ?>
+        <?define UpgradeCodeGUID="D8B559DB-4C98-487A-A33F-50A8EEE42726" ?>
+   <?else?>
+        <?define PerMachineYesNo="yes"?>
+        <?define MSIPath="MachineSetup"?>
+        <?define MSIName="PowerToysSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
+        <?define RegistryScope="HKLM" ?>
+        <?define InstallScope="perMachine" ?>
+        <?define InstallPrivileges="elevated" ?>
+        <?define UpgradeCodeGUID="42B84BF7-5FBF-473B-9C8B-049DC16F7708" ?>
+  <?endif?>
+
+  <?define BinX32Dir="$(var.RepoDir)x86\$(var.Configuration)\" ?>
+</Include>

installer/PowerToysSetupVNext/Core.wxs

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
+      <Component Id="powertoys_per_machine_comp" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
+          <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
+        </RegistryKey>
+      </Component>
+      <Component Id="powertoys_toast_clsid" Win64="yes">
+        <RemoveFolder Id='Remove_powertoys_toast_clsid' On='uninstall' />
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
+          <RegistryValue Type="string" Value="PowerToys Toast Notifications Background Activator" />
+          <RegistryValue Type="string" Key="LocalServer32" Value="[INSTALLFOLDER]PowerToys.exe -ToastActivated" />
+          <RegistryValue Type="string" Key="LocalServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+      </Component>
+      <Component Id="powertoys_exe" Win64="yes" Guid="30261594-41A6-4509-AD09-FBC4E692F441">
+        <File Id="PowerToys.exe" Checksum="yes" />
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
+          <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes"/>
+          <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
+          <RegistryKey Key="DefaultIcon">
+            <RegistryValue Type="string" Value="PowerToys.exe" />
+          </RegistryKey>
+          <RegistryKey Key="shell\open\command">
+            <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]PowerToys.exe&quot; &quot;%1&quot;" />
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+      <Component Id="License_rtf" Win64="yes" Guid="632C60DF-0DDC-4F14-8F2B-A28136CD9E63">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="License_rtf" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" />
+      </Component>
+      <Component Id="Notice_md" Win64="yes" Guid="1671B5F5-1260-42CF-83A8-9B3430DFF8C5">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Notice_md" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+      <Component Id="PowerToysDSCReference" Win64="yes" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+      </Component>
+    </DirectoryRef>
+
+    <?if $(var.PerUser) = "true" ?>
+    <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
+    <?else?>
+    <DirectoryRef Id="ProgramFiles64Folder">
+      <Directory Id="WindowsPowerShellFolder" Name="WindowsPowerShell">
+        <Directory Id="PowerShellModulesFolder" Name="Modules">
+          <Directory Id="PowerToysDscFolder" Name="Microsoft.PowerToys.Configure">
+            <Directory Id="PowerToysDscVerFolder" Name="$(var.Version).0">
+              <Component Id="PowerToysDSC" Win64="yes" Guid="C52AECA0-DA73-49B8-BB49-31EF6640FF1F">
+                <!-- Don't fail installation because of DSC. Files are marked as not vital. -->
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConf.psd1" />
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConf.psm1" />
+              </Component>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+    <?endif?>
+
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="PowerToysStartMenuShortcut" >
+        <Shortcut Id="ApplicationStartMenuShortcut"
+        Name="PowerToys (Preview)"
+        Description="PowerToys - Windows system utilities to maximize productivity"
+        Icon="powertoys.exe"
+        IconIndex="0"
+        Target="[!PowerToys.exe]"
+        WorkingDirectory="INSTALLFOLDER">
+          <ShortcutProperty Key="System.AppUserModel.ID" Value="Microsoft.PowerToysWin32"/>
+        </Shortcut>
+        <RemoveFolder Id="CleanUpStartMenuShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <!-- ApplicationStartMenuShortcut is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
+        <RegistryValue Root="HKCU" Key="Software\Microsoft\PowerToys" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="DesktopShortcut" >
+        <Condition>INSTALLDESKTOPSHORTCUT</Condition>
+        <!-- DesktopShortcutId is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
+        <RegistryValue Root="HKCU"
+                        Key="Software\[Manufacturer]\[ProductName]"
+                        Name="desktopshorcutinstalled"
+                        Type="integer"
+                        Value="1"
+                        KeyPath="yes"/>
+        <Shortcut Id="DesktopShortcutId"
+                  Name="PowerToys (Preview)"
+                  Description="PowerToys - Windows system utilities to maximize productivity"
+                  Target="[!PowerToys.exe]"
+                  WorkingDirectory="INSTALLFOLDER"
+                  Icon="powertoys.exe"
+                  Directory="DesktopFolder"/>
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CoreComponents">
+      <Component Id="RemoveCoreFolder" Guid="9330BD69-2D12-4D98-B0C7-66C99564D619" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="powertoys_exe" />
+      <ComponentRef Id="PowerToysStartMenuShortcut"/>
+      <ComponentRef Id="powertoys_per_machine_comp" />
+      <ComponentRef Id="powertoys_toast_clsid" />
+      <ComponentRef Id="License_rtf" />
+      <ComponentRef Id="Notice_md" />
+      <ComponentRef Id="DesktopShortcut" />
+      <ComponentRef Id="PowerToysDSCReference" />
+      <?if $(var.PerUser) = "false" ?>
+      <ComponentRef Id="PowerToysDSC" />
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="PTInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+
+                <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
+                <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+                <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+                <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+                <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
+                <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="20" Y="160" Width="290" Height="17" Property="INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Text="Create a shortcut for [ProductName] on the desktop." />
+                <Control Id="ScheduledTaskCheckBox" Type="CheckBox" X="20" Y="180" Width="330" Height="17" Property="CREATESCHEDULEDTASK" CheckBoxValue="1" Text="Automatically start [ProductName] at logon." />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>

installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="PTLicenseDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}[ProductName] License" />
+        <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+          <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
+        </Control>
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no">
+          <Text SourceFile="!(wix.WixUILicenseRtf)" />
+        </Control>
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_LicenseAgreementDlg
+ - WixUI_PTInstallDirDlg
+ - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+
+Maintenance dialog sequence:
+ - WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_PTInstallDirDlg
+ - WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI Id="WixUI_PTInstallDir">
+            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+            <Property Id="WixUI_Mode" Value="InstallDir" />
+
+            <DialogRef Id="BrowseDlg" />
+            <DialogRef Id="DiskCostDlg" />
+            <DialogRef Id="ErrorDlg" />
+            <DialogRef Id="FatalError" />
+            <DialogRef Id="FilesInUse" />
+            <DialogRef Id="MsiRMFilesInUse" />
+            <DialogRef Id="PrepareDlg" />
+            <DialogRef Id="ProgressDlg" />
+            <DialogRef Id="ResumeDlg" />
+            <DialogRef Id="UserExit" />
+            
+            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="PTLicenseDlg">NOT Installed</Publish>
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+            <Publish Dialog="PTLicenseDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+            <Publish Dialog="PTLicenseDlg" Control="Next" Event="NewDialog" Value="PTInstallDirDlg">1</Publish>
+
+            <Publish Dialog="PTInstallDirDlg" Control="Back" Event="NewDialog" Value="PTLicenseDlg">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="PTInstallDirDlg" Order="1">NOT Installed</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+        </UI>
+
+        <UIRef Id="WixUI_Common" />
+    </Fragment>
+</Wix>

installer/PowerToysSetupVNext/EnvironmentVariables.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define EnvironmentVariablesAssetsFiles=?>
+  <?define EnvironmentVariablesAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\EnvironmentVariables\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="EnvironmentVariablesAssetsFolder" Name="EnvironmentVariables" />
+    </DirectoryRef>
+    <DirectoryRef Id="EnvironmentVariablesAssetsFolder" FileSource="$(var.EnvironmentVariablesAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--EnvironmentVariablesAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="EnvironmentVariablesComponentGroup">
+      <Component Id="RemoveEnvironmentVariablesFolder" Guid="B62A779D-38BA-46B2-859D-9D242D9B0CC1" Directory="EnvironmentVariablesAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveEnvironmentVariablesFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderEnvironmentVariablesAssetsFolder" Directory="EnvironmentVariablesAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/FileExplorerPreview.wxs

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define MonacoPreviewHandlerMonacoAssetsFiles=?>
+  <?define MonacoPreviewHandlerMonacoAssetsFilesPath=$(var.BinDir)Assets\Monaco\?>
+  <?define MonacoPreviewHandlerCustomLanguagesFiles=?>
+  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)Assets\Monaco\customLanguages\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="MonacoAssetsFolder" Name="Monaco">
+        <Directory Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" Name="customLanguages" />
+        <Directory Id="MonacoPreviewHandlerMonacoSRCFolder" Name="monacoSRC" />
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="MonacoAssetsFolder" FileSource="$(var.MonacoPreviewHandlerMonacoAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MonacoPreviewHandlerMonacoAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.MonacoPreviewHandlerCustomLanguagesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MonacoPreviewHandlerCustomLanguagesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="FileExplorerPreviewComponentGroup">
+      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="MonacoAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveFileExplorerPreviewFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveMonacoAssetsFolder" Directory="MonacoAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerCustomLanguagesFolder" Directory="MonacoPreviewHandlerMonacoCustomLanguagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerMonacoSRCFolder" Directory="MonacoPreviewHandlerMonacoSRCFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/FileLocksmith.wxs

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define FileLocksmithAssetsFiles=?>
+  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\FileLocksmith\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="FileLocksmithAssetsInstallFolder" Name="FileLocksmith" />
+    </DirectoryRef>
+    <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FileLocksmithAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+          <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.FileLocksmithExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="FileLocksmithComponentGroup">
+      <Component Id="RemoveFileLocksmithFolder" Guid="1DAC9A3F-D89C-4730-BF57-1778E011709B" Directory="FileLocksmithAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveFileLocksmithFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_FileLocksmith" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Hosts.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define HostsAssetsFiles=?>
+  <?define HostsAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Hosts\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="HostsAssetsFolder" Name="Hosts" />
+    </DirectoryRef>
+    <DirectoryRef Id="HostsAssetsFolder" FileSource="$(var.HostsAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HostsAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="HostsComponentGroup">
+      <Component Id="RemoveHostsFolder" Guid="7FF19EBB-041D-4498-9826-C9AECEBE86E1" Directory="HostsAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveHostsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderHostsAssetsFolder" Directory="HostsAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/ImageResizer.wxs

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ImageResizerAssetsFiles=?>
+  <?define ImageResizerAssetsFilesPath=$(var.BinDir)Assets\ImageResizer\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ImageResizerAssetsFolder" Name="ImageResizer" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ImageResizerAssetsFiles_Component_Def-->
+
+      <Component Id="Module_ImageResizer_Registry" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+          <RegistryValue Value="[INSTALLFOLDER]PowerToys.ImageResizerExt.dll" Type="string" />
+          <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
+        </RegistryKey>
+
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
+        <RegistryValue Root="$(var.RegistryScope)"
+                          Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
+                          Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                          Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+      </Component>
+
+    </DirectoryRef>
+
+    <ComponentGroup Id="ImageResizerComponentGroup">
+      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveImageResizerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_ImageResizer_Registry" />
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/KeyboardManager.wxs

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
+      <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
+    </DirectoryRef>
+
+    <!-- KBM Editor -->
+    <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEditor">
+      <Component Id="Module_KeyboardManager_Editor" Win64="yes" Guid="E9C74E78-970F-4DF5-9CC0-FFD3CCF285B4">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_KeyboardManager_Editor" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)KeyboardManagerEditor\PowerToys.KeyboardManagerEditor.exe" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.Toolkit.Win32.UI.XamlHost.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.UI.Xaml.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140_app.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\resources.pri" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_app.dll" />
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1_app.dll" />
+        <?endif ?>
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140.dll" />
+      </Component>
+    </DirectoryRef>
+
+    <!-- KBM Engine -->
+    <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEngine">
+      <Component Id="Module_KeyboardManager_Engine" Win64="yes" Guid="3F58FCE3-B44D-4676-94E9-C59F1FE42FFD">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_KeyboardManager_Engine" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="KeyboardManagerComponentGroup">
+      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveKeyboardManagerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_KeyboardManager_Editor" />
+      <ComponentRef Id="Module_KeyboardManager_Engine" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/MouseWithoutBorders.wxs

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+  xmlns:Fire="http://schemas.microsoft.com/wix/FirewallExtension"
+  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <ComponentGroup Id="MouseWithoutBordersComponentGroup">
+      <Component Id="MouseWithoutBordersFirewallComponent" Directory="INSTALLFOLDER" Guid="FEA59459-EC0E-4636-8E76-4C168235982B">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MouseWithoutBordersFirewall_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <!-- The program name used here will be generated by generateFileComponents.ps1 -->
+        <Fire:FirewallException Id="MouseWithoutBordersFirewallException1" Name="PowerToys.MouseWithoutBorders" Scope="localSubnet" IgnoreFailure="yes" Program="[#BaseApplicationsFiles_File_PowerToys.MouseWithoutBorders.exe]" />
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/NewPlus.wxs

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+   <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+   <?define NewPlusAssetsFiles=?>
+   <?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
+   <?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
+   <?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
+
+   <Fragment>
+
+      <!-- Assets -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
+         <!-- Generated by generateFileComponents.ps1 -->
+         <!--NewPlusAssetsFiles_Component_Def-->
+         
+         <!-- NewPlus Shell Extension for Win10 registration -->
+         <Component Id="NewPlus_ShellExtension_win10" Guid="D5456D4A-6EEC-4B85-944D-6A6A4A74FFA6" Win64="yes">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{FF90D477-E32A-4BE8-8CC5-A502A97F5401}">
+               <RegistryValue Type="string" Value="NewPlus Shell Extension Win10" />
+               <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+               <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.NewPlus.ShellExtension.win10.dll" />
+               <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+            </RegistryKey>
+            <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\NewPlusShellExtensionWin10">
+               <RegistryValue Type="string" Value="{FF90D477-E32A-4BE8-8CC5-A502A97F5401}"/>
+            </RegistryKey>
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusComponentGroup">
+         <Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlus_ShellExtension_win10" />
+      </ComponentGroup>
+
+      
+      <!-- Example templates -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusInstallFolder" Name="NewPlus">
+            <Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
+               <Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
+            </Directory>
+         </Directory>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
+         <Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
+         </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
+         <Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
+            <File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusTemplatesComponentGroup">
+         <Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlusTemplateFiles_Component" />
+         <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
+      </ComponentGroup>
+
+   </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Peek.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define PeekAssetsFiles=?>
+  <?define PeekAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Peek\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PeekAssetsFolder" Name="Peek" />
+    </DirectoryRef>
+    <DirectoryRef Id="PeekAssetsFolder" FileSource="$(var.PeekAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PeekAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="PeekComponentGroup">
+      <Component Id="RemovePeekFolder" Guid="EF9422D7-FF0A-4887-968A-E61B53ACD23A" Directory="PeekAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemovePeekFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderPeekAssetsFolder" Directory="PeekAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/PowerRename.wxs

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define PowerRenameAssetsFiles=?>
+  <?define PowerRenameAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerRename\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PowerRenameAssetsFolder" Name="PowerRename" />
+    </DirectoryRef>
+    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PowerRenameAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+          <RegistryValue Type="string" Value="PowerRename Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.PowerRenameExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="PowerRenameComponentGroup">
+      <Component Id="RemovePowerRenameFolder" Guid="2028549B-02E3-4D80-BC3F-59AEA37AC73D" Directory="PowerRenameAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemovePowerRenameFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_PowerRename" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/PowerToys.wxs

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?define UpgradeCode="6341382d-c0a9-4238-9188-be9607e3fab2"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+    xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+
+    <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)"
+            Version="$(var.Version)"
+            Manufacturer="Microsoft Corporation"
+            IconSourceFile="$(var.BinDir)svgs\icon.ico"
+            UpgradeCode="$(var.UpgradeCode)">
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
+            <bal:WixStandardBootstrapperApplication 
+              LicenseFile="$(var.RepoDir)\installer\License.rtf"
+              LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png"
+              SuppressOptionsUI="no"
+              SuppressRepair="yes" />
+        </BootstrapperApplicationRef>
+
+        <util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
+        <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
+
+        <?if $(var.PerUser) = "true" ?>
+            <Variable Name="InstallFolder" Type="string" Value="[LocalAppDataFolder]PowerToys" bal:Overridable="yes"/>
+        <?else?>
+            <Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
+        <?endif?>
+
+        <Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" /> 
+        <Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
+
+      <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
+      <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
+      <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0"/>
+      <Variable Name="TargetPowerToysVersion" Type="version" Value="$(var.Version)"/>
+      <Variable  Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
+      <Variable  Name="DetectedPowerToysUserVersion" Type="version" Value="0.0.0.0"/>
+
+      <util:ProductSearch Id="SearchInstalledPowerToysVersion" Variable="DetectedPowerToysVersion" UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708" Result="version" />
+      <util:ProductSearch Id="SearchInstalledPowerToysUserVersion" Variable="DetectedPowerToysUserVersion" UpgradeCode="D8B559DB-4C98-487A-A33F-50A8EEE42726" Result="version" />
+
+      <?if $(var.PerUser) = "true" ?>
+        <bal:Condition Message="PowerToys is already installed on this system for all users. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysVersion</bal:Condition>
+        <bal:Condition Message="The same or later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysUserVersion OR WixBundleInstalled</bal:Condition>
+      <?else?>
+        <bal:Condition Message="PowerToys is already installed on this system for current user. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysUserVersion</bal:Condition>
+        <bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
+      <?endif?>
+
+      <Variable Name="DetectedWindowsBuildNumber" Type="version" Value="0"/>
+      <util:RegistrySearch Id="SearchWindowsBuildNumber" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" Result="value" Format="raw" Variable="DetectedWindowsBuildNumber" />
+      <bal:Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">DetectedWindowsBuildNumber &gt;= 19041 OR WixBundleInstalled</bal:Condition>
+    
+        <Chain>
+            <ExePackage
+                DisplayName="Closing PowerToys application"
+                Name="terminate_powertoys.cmd"
+                Cache="no"
+                Compressed="yes"
+                Id="TerminatePowerToys"
+                SourceFile="terminate_powertoys.cmd"
+                Permanent="yes"
+                PerMachine="$(var.PerMachineYesNo)"
+                Vital="no">
+            </ExePackage>
+            <ExePackage
+                DisplayName="Microsoft Edge WebView2"
+                Name="MicrosoftEdgeWebview2Setup.exe"
+                Compressed="yes"
+                Id="WebView2"
+                DetectCondition="HasWebView2PerMachine OR HasWebView2PerUser"
+                SourceFile="WebView2\MicrosoftEdgeWebview2Setup.exe"
+                InstallCommand="/silent /install"
+                RepairCommand="/repair /passive"
+                Permanent="yes"
+                PerMachine="$(var.PerMachineYesNo)"
+                UninstallCommand="/silent /uninstall">
+            </ExePackage>
+            <MsiPackage
+                DisplayName="PowerToys MSI"
+                SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)"
+                Compressed="yes"
+                DisplayInternalUI="no">
+                <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
+            </MsiPackage>
+        </Chain>
+    </Bundle>
+</Wix>

installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0"
+  DefaultTargets="Build"
+  InitialTargets="EnsureNuGetPackageBuildImports"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\wixVNext.props" Condition="Exists('..\wixVNext.props')" />
+
+  <PropertyGroup>
+    <DefineConstants>Version=$(Version)</DefineConstants>
+    <Name>PowerToysVNextBootstrapper</Name>
+    <ProjectGuid>{da4e9744-80be-424c-b0f5-afd8757db575}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
+    <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputType>Bundle</OutputType>
+    <SuppressAclReset>True</SuppressAclReset>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <NuGetPackageImportStamp />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="PowerToys.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CustomDialogs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)"
+    Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
+    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled"
+    Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset vnext build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <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('..\wixVNext.props')"
+      Text="$([System.String]::Format('$(ErrorText)', '..\wixVNext.props'))" />
+  </Target>
+
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
+</Project>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\wixVNext.props" Condition="Exists('..\wixVNext.props')" />
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <!-- THIS IS AN INNER LOOP OPTIMIZATION
+    The build pipeline builds the Settings and Launcher projects for Publication
+    using a specific profile. If you're doing local installer builds, this will
+    simulate the build pipeline doing that for you. -->
+    <PreBuildEvent>IF NOT DEFINED IsPipeline (
+call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
+SET PTRoot=$(SolutionDir)\..
+call "..\..\..\publish.cmd" x64
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' != 'x64'">
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <PreBuildEvent>IF NOT DEFINED IsPipeline (
+call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
+SET PTRoot=$(SolutionDir)\..
+call "..\..\..\publish.cmd" arm64
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <PostBuildEvent>
+      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
+      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
+      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
+      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
+      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
+      call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
+      call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
+      call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
+      call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
+      call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
+      call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
+      call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
+      call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
+      call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
+      call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
+      call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
+      call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
+      call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
+      call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
+      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
+      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
+      call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
+    </PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Name>PowerToysVNextInstaller</Name>
+    <!-- We do not support debug installer builds -->
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform>$(Platform)</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputType>Package</OutputType>
+    <SuppressAclReset>True</SuppressAclReset>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <!-- 1076 and ICE91 - warning: using this configuration for perMachine install could cause problems. -->
+    <!-- 1026 - warning: file ID is too long -->
+    <SuppressIces>ICE91</SuppressIces>
+    <SuppressSpecificWarnings>1026;1076</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">obj\$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' == 'true' ">obj\$(Platform)\$(Configuration)\UserSetup</IntermediateOutputPath>
+    <SuppressIces>ICE40</SuppressIces>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- suppress warning 1108 regarding -sh being deprecated -->
+    <!-- -sh suppresses file information which was causing wix build to hang in CI -->
+    <LinkerAdditionalOptions>-v -sh -sw1108</LinkerAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />
+    <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
+    <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
+    <Compile Include="NewPlus.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="AdvancedPaste.wxs" />
+    <Compile Include="Awake.wxs" />
+    <Compile Include="BaseApplications.wxs" />
+    <Compile Include="ColorPicker.wxs" />
+    <Compile Include="EnvironmentVariables.wxs" />
+    <Compile Include="FileExplorerPreview.wxs" />
+    <Compile Include="FileLocksmith.wxs" />
+    <Compile Include="Hosts.wxs" />
+    <Compile Include="ImageResizer.wxs" />
+    <Compile Include="KeyboardManager.wxs" />
+    <Compile Include="Peek.wxs" />
+    <Compile Include="PowerRename.wxs" />
+    <Compile Include="RegistryPreview.wxs" />
+    <Compile Include="Run.wxs" />
+    <Compile Include="Settings.wxs" />
+    <Compile Include="ShortcutGuide.wxs" />
+    <Compile Include="Tools.wxs" />
+    <Compile Include="MouseWithoutBorders.wxs" />
+    <Compile Include="WinUI3Applications.wxs" />
+    <Compile Include="MonacoSRC.wxs" />
+    <Compile Include="Core.wxs" />
+    <Compile Include="Resources.wxs" />
+    <Compile Include="WinAppSDK.wxs" />
+    <Compile Include="Workspaces.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CustomDialogs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PowerToysSetupCustomActionsVNext\PowerToysSetupCustomActionsVNext.vcxproj">
+      <Name>PowerToysSetupCustomActionsVNext</Name>
+      <Project>{B3A354B0-1E54-4B55-A962-FB5AF9330C19}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset vnext build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <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('..\wixVNext.props')" Text="$([System.String]::Format('$(ErrorText)', '..\wixVNext.props'))" />
+  </Target>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target> -->
+  <Target Name="BeforeBuild">
+    <HeatDirectory Directory="..\..\src\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
+  </Target>
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
+</Project>

installer/PowerToysSetupVNext/Product.wxs

@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- WiX Components with multiple files cause issues due to the way Windows installs them. 
+         Windows decides whether to install a component by checking the existence of KeyPath file and its version.
+         Thus, if some files were updated but KeyPath file was not, the component wouldn't be updated.
+         Some resource files, e.g. images, do not have version, so even if Component has only a single image and a static GUID, it won't be updated.
+         
+         Considering all of the above, it's much simpler to just have one file per Component with an implicit Guid.
+
+         More info:
+         - https://stackoverflow.com/a/1604348/657390
+         - https://stackoverflow.com/a/1422121/657390
+         - https://robmensching.com/blog/posts/2003/10/18/component-rules-101/
+         - https://robmensching.com/blog/posts/2003/10/4/windows-installer-components-introduction/
+           -->
+
+  <Product Id="*"
+       Name="PowerToys (Preview)"
+       Language="1033"
+       Version="$(var.Version)"
+       Manufacturer="Microsoft Corporation"
+       UpgradeCode="$(var.UpgradeCodeGUID)">
+
+
+      <Package InstallerVersion="500" Compressed="yes" InstallScope="$(var.InstallScope)" InstallPrivileges="$(var.InstallPrivileges)" Platform="$(var.PlatformLK)" />
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
+
+    <Upgrade Id="$(var.UpgradeCodeGUID)">
+      <UpgradeVersion
+         Minimum="0.0.0" Maximum="$(var.Version)"
+         Property="PREVIOUSVERSIONSINSTALLED" 
+         IncludeMinimum="yes" IncludeMaximum="no" />
+    </Upgrade>
+
+    <MediaTemplate EmbedCab="yes" />
+
+    <Property Id="REINSTALLMODE" Value="amus" />
+    <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
+      <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
+    </Property>
+    <Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">
+      <![CDATA[(WINDOWSBUILDNUMBER >= 19041)]]>
+    </Condition>
+
+    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)svgs\icon.ico"/>
+
+    <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
+
+    <Feature Id="CoreFeature" Title="PowerToys" AllowAdvertise="no" Absent="disallow" TypicalDefault="install"
+             Description="Contains all PowerToys features.">
+      <ComponentGroupRef Id="CoreComponents" />
+      <ComponentGroupRef Id="BaseApplicationsComponentGroup" />
+      <ComponentGroupRef Id="WinUI3ApplicationsComponentGroup" />
+      <ComponentGroupRef Id="AwakeComponentGroup" />
+      <ComponentGroupRef Id="ColorPickerComponentGroup" />
+      <ComponentGroupRef Id="FileExplorerPreviewComponentGroup" />
+      <ComponentGroupRef Id="FileLocksmithComponentGroup" />
+      <ComponentGroupRef Id="HostsComponentGroup" />
+      <ComponentGroupRef Id="ImageResizerComponentGroup" />
+      <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
+      <ComponentGroupRef Id="PeekComponentGroup" />
+      <ComponentGroupRef Id="PowerRenameComponentGroup" />
+      <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
+      <ComponentGroupRef Id="RunComponentGroup" />
+      <ComponentGroupRef Id="SettingsComponentGroup" />
+      <ComponentGroupRef Id="ShortcutGuideComponentGroup" />
+      <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
+      <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
+      <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
+      <ComponentGroupRef Id="NewPlusComponentGroup" />
+      <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
+      <ComponentGroupRef Id="ResourcesComponentGroup" />
+      <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
+      <ComponentGroupRef Id="ToolComponentGroup" />
+      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
+      <ComponentGroupRef Id="WorkspacesComponentGroup" />
+    </Feature>
+
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+
+    <UI>
+      <UIRef Id="WixUI_InstallDir"/>
+      <Publish Dialog="WelcomeDlg"
+                Control="Next"
+                Event="NewDialog"
+                Value="InstallDirDlg"
+                Order="99">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+                Control="Back"
+                Event="NewDialog"
+                Value="WelcomeDlg"
+                Order="99">1</Publish>
+
+      <Publish Dialog="ExitDialog"
+            Control="Finish"
+            Event="EndDialog"
+            Value="Return">NOT Installed</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="_REMOVE_ALL" Value="Yes">1</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogInstallCancel">NOT Installed</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogInstallFail">NOT Installed</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallCancel">Installed AND _REMOVE_ALL="Yes"</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallFail">Installed AND _REMOVE_ALL="Yes"</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogRepairCancel">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogRepairFail">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
+    </UI>
+
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\Images\banner.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Images\dialog.png" />
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.RepoDir)\installer\License.rtf" />
+    <Property Id="INSTALLSTARTMENUSHORTCUT" Value="1"/>
+    <Property Id="WixShellExecTarget" Value="[#PowerToys_ActionRunner.exe]" />
+
+    <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[$(var.DefaultInstallDir)]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute"></SetProperty>
+
+    <!-- In case we didn't receive a value from the bootstrapper. -->
+    <SetProperty Action="SetBOOTSTRAPPERINSTALLFOLDER" Id="BOOTSTRAPPERINSTALLFOLDER" Value="[DEFAULTBOOTSTRAPPERINSTALLFOLDER]" Before="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = ""]]>
+    </SetProperty>
+    <!-- Have to compare value sent by bootstrapper to default to avoid using it, as a check to verify it's not default. This hack can be removed if it's possible to set the bootstrapper option to the previous install folder--> 
+    <SetProperty Action="SetINSTALLFOLDERTOPREVIOUSINSTALLFOLDER" Id="INSTALLFOLDER" Value="[PREVIOUSINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = DEFAULTBOOTSTRAPPERINSTALLFOLDER AND PREVIOUSINSTALLFOLDER <> ""]]>
+    </SetProperty>
+    <SetProperty Action="SetINSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER" Id="INSTALLFOLDER" Value="[BOOTSTRAPPERINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER <> DEFAULTBOOTSTRAPPERINSTALLFOLDER OR PREVIOUSINSTALLFOLDER = ""]]>
+    </SetProperty>
+
+    <SetProperty Id="InstallScope" Value="$(var.InstallScope)" Before="DetectPrevInstallPath" Sequence="execute"></SetProperty>
+    <InstallExecuteSequence>
+      <Custom Action="DetectPrevInstallPath" After="AppSearch" />
+      <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
+      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
+      <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
+      <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
+
+      <?if $(var.PerUser) = "true" ?>
+      <Custom Action="SetInstallDSCModuleParam" Before="InstallDSCModule" />
+      <?endif?>
+
+      <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
+      <Custom Action="CheckGPO" After="InstallInitialize">
+        NOT Installed
+      </Custom>
+      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
+        NOT Installed
+      </Custom>
+      <Custom Action="WixCloseApplications" Before="RemoveFiles" />
+      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
+      <!-- TODO: Use to activate embedded MSIX -->
+      <!--<Custom Action="InstallEmbeddedMSIXTask" After="InstallFinalize">
+        NOT Installed
+      </Custom>-->
+        <?if $(var.PerUser) = "true" ?>
+        <Custom Action="InstallDSCModule" After="InstallFiles"/>
+        <?endif?>
+        <Custom Action="TelemetryLogInstallSuccess" After="InstallFinalize">
+        NOT Installed
+      </Custom>
+      <Custom Action="TelemetryLogUninstallSuccess" After="InstallFinalize">
+        Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnApplyModulesRegistryChangeSets" Before="RemoveFiles">
+        Installed AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
+        Installed AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles">
+        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UninstallCommandNotFound" Before="RemoveFiles">
+        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UpgradeCommandNotFound" After="InstallFiles">
+        WIX_UPGRADE_DETECTED
+      </Custom>
+      <Custom Action="UninstallServicesTask" After="InstallFinalize">
+          Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+        <!-- TODO: Use to activate embedded MSIX -->
+      <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
+        Installed AND (REMOVE="ALL")
+      </Custom>-->
+      <?if $(var.PerUser) = "true" ?>
+      <Custom Action="UninstallDSCModule" After="InstallFinalize">
+          Installed AND (REMOVE="ALL")
+      </Custom>
+      <?endif?>
+      <Custom Action="TerminateProcesses" Before="InstallValidate" />
+      <Custom Action="LaunchPowerToys" Before="InstallFinalize">NOT Installed</Custom>
+
+      <!-- Clean Video Conference Mute registry keys that might be around from previous installations. We've deprecated this utility since then. -->
+      <Custom Action="CleanVideoConferenceRegistry" Before="InstallFinalize">NOT Installed</Custom>
+
+    </InstallExecuteSequence>
+
+    <CustomAction Id="SetLaunchPowerToysParam"
+                    Property="LaunchPowerToys"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction
+      Id="LaunchPowerToys"
+      Return="ignore"
+      Impersonate="yes"
+      Execute="deferred"
+      BinaryKey="PTCustomActions"
+      DllEntry="LaunchPowerToysCA"
+      />
+
+    <CustomAction
+      Id="TerminateProcesses"
+      Return="ignore"
+      Execute="immediate"
+      BinaryKey="PTCustomActions"
+      DllEntry="TerminateProcessesCA" />
+
+    <CustomAction Id="SetApplyModulesRegistryChangeSetsParam"
+                    Property="ApplyModulesRegistryChangeSets"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUnApplyModulesRegistryChangeSetsParam"
+                    Property="UnApplyModulesRegistryChangeSets"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetInstallDSCModuleParam"
+                    Property="InstallDSCModule"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUninstallCommandNotFoundParam"
+                    Property="UninstallCommandNotFound"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUpgradeCommandNotFoundParam"
+                    Property="UpgradeCommandNotFound"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreateWinAppSDKHardlinksParam"
+                    Property="CreateWinAppSDKHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeleteWinAppSDKHardlinksParam"
+                    Property="DeleteWinAppSDKHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreatePTInteropHardlinksParam"
+                    Property="CreatePTInteropHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeletePTInteropHardlinksParam"
+                    Property="DeletePTInteropHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreateDotnetRuntimeHardlinksParam"
+                    Property="CreateDotnetRuntimeHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeleteDotnetRuntimeHardlinksParam"
+                    Property="DeleteDotnetRuntimeHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="RemovePowerToysSchTasks"
+                  Return="ignore"
+                  Impersonate="no"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="RemoveScheduledTasksCA"
+                   />
+
+    <CustomAction Id="InstallEmbeddedMSIXTask"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="InstallEmbeddedMSIXCA"
+                   />
+
+    <CustomAction Id="UninstallEmbeddedMSIXTask"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UninstallEmbeddedMSIXCA"
+                   />
+
+    <CustomAction Id="InstallDSCModule"
+                  Return="ignore"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="InstallDSCModuleCA"
+                   />
+
+    <CustomAction Id="UninstallDSCModule"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UninstallDSCModuleCA"
+                   />
+
+      <CustomAction Id="UninstallServicesTask"
+                    Return="ignore"
+                    Impersonate="yes"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UninstallServicesCA"
+                   />
+
+      <CustomAction Id="UninstallCommandNotFound"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UninstallCommandNotFoundModuleCA"
+                   />
+      
+      <CustomAction Id="UpgradeCommandNotFound"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UpgradeCommandNotFoundModuleCA"
+                   />
+
+      <CustomAction Id="UnsetAdvancedPasteAPIKey"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UnsetAdvancedPasteAPIKeyCA"
+                   />
+
+      <CustomAction Id="TelemetryLogInstallSuccess"
+              Return="ignore"
+              Impersonate="yes"
+              BinaryKey="PTCustomActions"
+              DllEntry="TelemetryLogInstallSuccessCA"
+                   />
+
+    <CustomAction Id="TelemetryLogInstallCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogInstallCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogInstallFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogInstallFailCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallSuccess"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallSuccessCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallFailCA"
+                   />
+
+    <CustomAction Id="TelemetryLogRepairCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogRepairCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogRepairFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogRepairFailCA"
+                   />
+
+    <CustomAction Id="DetectPrevInstallPath"
+                  Return="check"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="DetectPrevInstallPathCA"
+                  />
+
+    <CustomAction Id="CleanVideoConferenceRegistry"
+                  Return="ignore"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="CleanVideoConferenceRegistryCA"
+                  />
+
+    <CustomAction Id="ApplyModulesRegistryChangeSets"
+                  Return="check"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="ApplyModulesRegistryChangeSetsCA"
+                  />
+
+    <CustomAction Id="UnApplyModulesRegistryChangeSets"
+                  Return="check"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UnApplyModulesRegistryChangeSetsCA"
+                  />
+
+    <CustomAction Id="UnRegisterContextMenuPackages"
+                      Return="ignore"
+                Impersonate="yes"
+                Execute="deferred"
+                BinaryKey="PTCustomActions"
+                DllEntry="UnRegisterContextMenuPackagesCA"
+                  />
+
+    <CustomAction Id="CheckGPO"
+                  Return="check"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="CheckGPOCA"
+                  />
+
+    <!-- Close 'PowerToys.exe' before uninstall-->
+    <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
+    <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
+    <util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" />
+  </Product>
+
+  <Fragment>
+    <Binary Id="PTCustomActions" SourceFile="$(var.PowerToysSetupCustomActionsVNext.TargetPath)" />
+  </Fragment>
+
+  <!-- Installation directory structure -->
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="$(var.DefaultInstallDir)">
+        <Directory Id="INSTALLFOLDER" Name="PowerToys">
+          <Directory Id="BaseApplicationsAssetsFolder" Name="Assets">
+          </Directory>
+          <Directory Id="DSCModulesReferenceFolder" Name="DSCModules" />
+          <Directory Id="WinUI3AppsInstallFolder" Name="WinUI3Apps">
+              <Directory Id="WinUI3AppsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
+                <Directory Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
+              </Directory>
+            <Directory Id="WinUI3AppsAssetsFolder" Name="Assets">
+            </Directory>
+          </Directory>
+          <Directory Id="ToolsFolder" Name="Tools"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="PowerToys (Preview)"/>
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+    </Directory>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/RegistryPreview.wxs

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define RegistryPreviewAssetsFiles=?>
+  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\RegistryPreview?>
+
+  <Fragment>
+    <!-- Registry Preview -->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="RegistryPreviewAssetsInstallFolder" Name="RegistryPreview" />
+    </DirectoryRef>
+    <DirectoryRef Id="RegistryPreviewAssetsInstallFolder" FileSource="$(var.RegistryPreviewAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryPreviewAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="RegistryPreviewComponentGroup">
+      <Component Id="RemoveRegistryPreviewFolder" Guid="D3DBC395-FAC5-44B1-BE44-3FE2B6E0F391" Directory="RegistryPreviewAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveRegistryPreviewFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderRegistryPreviewAssetsFolder" Directory="RegistryPreviewAssetsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Resources.wxs

@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- Languages for localization on build farm -->
+  <!-- qps-ploc;qps-ploca;qps-plocm; -->
+  <?define LocLanguageList = ar-SA;cs-CZ;de-DE;es-ES;fa-IR;fr-FR;he-IL;hu-HU;it-IT;ja-JP;ko-KR;nl-NL;pl-PL;pt-BR;pt-PT;ru-RU;sv-SE;tr-TR;uk-UA;zh-CN;zh-TW?>
+
+  <Fragment>
+    <!-- Resource directories should be added only if the installer is built on the build farm -->
+    <?ifdef env.IsPipeline?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+        <DirectoryRef Id="$(var.ParentDirectory)">
+          <!-- Resource file directories -->
+          <?foreach Language in $(var.LocLanguageList)?>
+          <!--NB: Ids can't contain hyphens-->
+          <?if $(var.Language) = ar-SA?>
+          <?define IdSafeLanguage = ar_SA?>
+          <?elseif $(var.Language) = cs-CZ?>
+          <?define IdSafeLanguage = cs_CZ?>
+          <?elseif $(var.Language) = de-DE?>
+          <?define IdSafeLanguage = de_DE?>
+          <?elseif $(var.Language) = es-ES?>
+          <?define IdSafeLanguage = es_ES?>
+          <?elseif $(var.Language) = fa-IR?>
+          <?define IdSafeLanguage = fa_IR?>
+          <?elseif $(var.Language) = fr-FR?>
+          <?define IdSafeLanguage = fr_FR?>
+          <?elseif $(var.Language) = he-IL?>
+          <?define IdSafeLanguage = he_IL?>
+          <?elseif $(var.Language) = hu-HU?>
+          <?define IdSafeLanguage = hu_HU?>
+          <?elseif $(var.Language) = it-IT?>
+          <?define IdSafeLanguage = it_IT?>
+          <?elseif $(var.Language) = ja-JP?>
+          <?define IdSafeLanguage = ja_JP?>
+          <?elseif $(var.Language) = ko-KR?>
+          <?define IdSafeLanguage = ko_KR?>
+          <?elseif $(var.Language) = nl-NL?>
+          <?define IdSafeLanguage = nl_NL?>
+          <?elseif $(var.Language) = pl-PL?>
+          <?define IdSafeLanguage = pl_PL?>
+          <?elseif $(var.Language) = pt-BR?>
+          <?define IdSafeLanguage = pt_BR?>
+          <?elseif $(var.Language) = pt-PT?>
+          <?define IdSafeLanguage = pt_PT?>
+          <!--
+          <?elseif $(var.Language) = qps-ploc?>
+          <?define IdSafeLanguage = qps_ploc?>
+          <?elseif $(var.Language) = qps-ploca?>
+          <?define IdSafeLanguage = qps_ploca?>
+          <?elseif $(var.Language) = qps-plocm?>
+          <?define IdSafeLanguage = qps_plocm?>
+          -->
+          <?elseif $(var.Language) = ru-RU?>
+          <?define IdSafeLanguage = ru_RU?>
+          <?elseif $(var.Language) = sv-SE?>
+          <?define IdSafeLanguage = sv_SE?>
+          <?elseif $(var.Language) = tr-TR?>
+          <?define IdSafeLanguage = tr_TR?>
+          <?elseif $(var.Language) = uk-UA?>
+          <?define IdSafeLanguage = uk_UA?>
+          <?elseif $(var.Language) = zh-CN?>
+          <?define IdSafeLanguage = zh_CN?>
+          <?elseif $(var.Language) = zh-TW?>
+          <?define IdSafeLanguage = zh_TW?>
+          <?else?>
+          <?define IdSafeLanguage = $(var.Language)?>
+          <?endif?>
+          <Directory Id="Resource$(var.IdSafeLanguage)$(var.ParentDirectory)" Name="$(var.Language)" />
+          <?undef IdSafeLanguage?>
+          <?endforeach?>
+        </DirectoryRef>
+      <?endforeach?>
+    <?endif?>
+
+    <ComponentGroup Id="ResourcesComponentGroup">
+      <!-- Resource components should be added only if the installer is built on the build farm -->
+      <?ifdef env.IsPipeline?>
+      <!-- Components for adding resource files -->
+      <?foreach Language in $(var.LocLanguageList)?>
+      <!--NB: Ids can't contain hyphens-->
+      <?if $(var.Language) = ar-SA?>
+      <!-- CompGUIDPrefix is language-dependent guid prefix missing the last 2 digits. -->
+      <?define CompGUIDPrefix = 4CF0A1CD-CA13-408B-AAC1-6E024B86A9?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define CompGUIDPrefix = 3E93405A-B91B-4E04-BAEC-26BEEE60F9?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define CompGUIDPrefix = AF28C057-7ED9-474C-8E7E-D583BE8ECF?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define CompGUIDPrefix = DD1FEEBD-55F0-44BA-A0FF-62C5C1C952?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define CompGUIDPrefix = 157411C9-CAB8-4CC5-AEA4-5ABEB91E59?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define CompGUIDPrefix = F9F86D61-C747-43FC-8509-F3D1F198E1?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define CompGUIDPrefix = AFEA6E19-5B93-4CBB-B0CB-AFB2565C7D?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define CompGUIDPrefix = 9A919A40-E457-47F5-97C8-E886F06DDE?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define CompGUIDPrefix = 48FBF6D9-32DB-46FF-A64C-225269E738?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define CompGUIDPrefix = FB8E04AB-C8E8-43C0-8883-19F73E4EBA?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define CompGUIDPrefix = 86C8F07C-80CA-420A-B6E7-86933D640C?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define CompGUIDPrefix = C68F115F-28DD-4B45-9512-405C432458?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define CompGUIDPrefix = 97494A31-5F57-4EC1-A6A9-994DF0813B?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define CompGUIDPrefix = F4985235-2AB9-446B-BF8E-B14929A160?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define CompGUIDPrefix = 58155841-D53A-4330-89D3-5C0338B928?>
+      <?define IdSafeLanguage = pt_PT?>
+      <!-- 
+      <?elseif $(var.Language) = qps-ploc?>
+      <?define CompGUIDPrefix = 75710CB2-DBDA-420B-9676-34D5F9D4A2?>
+      <?define IdSafeLanguage = qps_ploc?>
+      <?elseif $(var.Language) = qps-ploca?>
+      <?define CompGUIDPrefix = 55AF2A35-F959-49AB-B9EF-DFC9964A4F?>
+      <?define IdSafeLanguage = qps_ploca?>
+      <?elseif $(var.Language) = qps-plocm?>
+      <?define CompGUIDPrefix = D8CE2F7B-B0A1-4687-BFB7-1792B2FCCD?>
+      <?define IdSafeLanguage = qps_plocm?> 
+      -->
+      <?elseif $(var.Language) = ru-RU?>
+      <?define CompGUIDPrefix = 157BAF33-8D3F-46B7-9CF9-2C18E601CC?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define CompGUIDPrefix = 85B4199F-5F89-42C3-B7C2-DBCD3E5267?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define CompGUIDPrefix = EA375345-F52A-499B-A45E-108CE67EAF?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define CompGUIDPrefix = 17BA6BA7-8CB6-47CA-BEB1-2FE87A0724?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define CompGUIDPrefix = F8EE7CE9-58EA-4850-B76F-C22362DC0E?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define CompGUIDPrefix = F07F3210-79E2-4C38-AEF7-D8EBE06621?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?define CompGUIDPrefix = 94D9A417-56FC-435D-8167-A45F5D7A75?>
+      <?endif?>
+      <Component
+          Id="Launcher_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)00">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerLauncher.resources.dll" />
+      </Component>
+      <Component
+          Id="FancyZonesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)01">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="FancyZonesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
+      </Component>
+      <Component
+          Id="ImageResizer_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)02">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="ImageResizer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ImageResizer.resources.dll" />
+      </Component>
+      <Component
+          Id="ColorPicker_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)03">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="ColorPicker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="ColorPicker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ColorPickerUI.resources.dll" />
+      </Component>
+      <Component
+          Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)04">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)$(var.Language)\PowerToys.MarkdownPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="SVGPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)05">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="SVGPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="SVGPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.SvgPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="PDFPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)06">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="PDFPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="PDFPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PdfPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="GcodePreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)07">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="GcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="GcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.GcodePreviewHandler.resources.dll" />
+      </Component>
+      <!-- PowerToys Run aka Launcher plugin resources -->
+      <Component
+          Id="Launcher_Calculator_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder"
+          Guid="$(var.CompGUIDPrefix)08">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Calculator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Calculator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Calculator\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Calculator.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Folder_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder"
+          Guid="$(var.CompGUIDPrefix)09">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Folder_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Folder_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Folder\$(var.Language)\Microsoft.Plugin.Folder.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Program_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0A"
+          Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Program_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Program_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Program\$(var.Language)\Microsoft.Plugin.Program.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Shell_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0B"
+          Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Shell_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Shell_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Shell\$(var.Language)\Microsoft.Plugin.Shell.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Indexer_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0C"
+          Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Indexer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Indexer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Indexer\$(var.Language)\Microsoft.Plugin.Indexer.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Uri_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0D"
+          Directory="Resource$(var.IdSafeLanguage)UriPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Uri_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Uri_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Uri\$(var.Language)\Microsoft.Plugin.Uri.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0E"
+          Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\VSCodeWorkspaces\$(var.Language)\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.resources.dll" />
+      </Component>
+      <Component Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component"
+                 Guid="$(var.CompGUIDPrefix)0F"
+                 Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowWalker\$(var.Language)\Microsoft.Plugin.WindowWalker.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Registry_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)10"
+          Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Registry_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Registry_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Registry\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Registry.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Service_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)11"
+          Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Service_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Service_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Service\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Service.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_System_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)12"
+          Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_System_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_System_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\System\$(var.Language)\Microsoft.PowerToys.Run.Plugin.System.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)13"
+          Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsSettings\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsSettings.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)15"
+          Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsTerminal\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WebSearch_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)16"
+          Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WebSearch_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WebSearch_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WebSearch\$(var.Language)\Community.PowerToys.Run.Plugin.WebSearch.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)17"
+          Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\UnitConverter\$(var.Language)\Community.PowerToys.Run.Plugin.UnitConverter.resources.dll" />
+      </Component>
+      <Component
+                Id="Launcher_TimeDate_$(var.IdSafeLanguage)_Component"
+                Guid="$(var.CompGUIDPrefix)18"
+                Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_TimeDate_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_TimeDate_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\TimeDate\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeDate.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_OneNote_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)19"
+          Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Resource$(var.IdSafeLanguage)OneNotePluginFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_OneNote_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\OneNote\$(var.Language)\Microsoft.PowerToys.Run.Plugin.OneNote.resources.dll" />
+      </Component>
+      <Component
+          Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1A">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.MonacoPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_History_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1B">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_History_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1C">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_PowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
+      </Component>
+      <Component
+         Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component"
+         Guid="$(var.CompGUIDPrefix)1D"
+         Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\ValueGenerator\$(var.Language)\Community.PowerToys.Run.Plugin.ValueGenerator.resources.dll" />
+      </Component>
+      <Component
+          Id="QoiPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1E">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="QoiPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="QoiPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.QoiPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="Awake_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1F">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Awake_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Awake_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.Awake.resources.dll" />
+      </Component>
+      <Component
+          Id="PowerOCR_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)20">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="PowerOCR_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
+      </Component>
+      <Component
+          Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)21">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
+      </Component>
+      <?undef IdSafeLanguage?>
+      <?undef CompGUIDPrefix?>
+      <?endforeach?>
+      <?endif?>
+
+    <?ifdef env.IsPipeline?>
+      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveResourcesFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+      <?foreach Language in $(var.LocLanguageList)?>
+      <!--NB: Ids can't contain hyphens-->
+      <?if $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <!-- 
+      <?elseif $(var.Language) = qps-ploc?>
+      <?define IdSafeLanguage = qps_ploc?>
+      <?elseif $(var.Language) = qps-ploca?>
+      <?define IdSafeLanguage = qps_ploca?>
+      <?elseif $(var.Language) = qps-plocm?>
+      <?define IdSafeLanguage = qps_plocm?> 
+      -->
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)INSTALLFOLDER" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)CalculatorPluginFolder" Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FolderPluginFolder" Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ProgramPluginFolder" Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ShellPluginFolder" Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)IndexerPluginFolder" Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UriPluginFolder" Directory="Resource$(var.IdSafeLanguage)UriPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowWalkerPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)RegistryPluginFolder" Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ServicePluginFolder" Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)SystemPluginFolder" Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WebSearchPluginFolder" Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UnitConverterPluginFolder" Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)TimeDatePluginFolder" Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)OneNotePluginFolder" Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
+      <?undef IdSafeLanguage?>
+        <?endforeach?>
+      </Component>
+    <?endif?>
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Run.wxs

@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define launcherImagesComponentFiles=?>
+  <?define launcherImagesComponentFilesPath=$(var.BinDir)Assets\PowerLauncher\?>
+
+  <?define calcComponentFiles=?>
+  <?define calcComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\?>
+  <?define calcImagesComponentFiles=?>
+  <?define calcImagesComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\Images\?>
+
+  <?define FolderComponentFiles=?>
+  <?define FolderComponentFilesPath=$(var.BinDir)RunPlugins\Folder\?>
+  <?define FolderImagesComponentFiles=?>
+  <?define FolderImagesComponentFilesPath=$(var.BinDir)RunPlugins\Folder\Images?>
+
+  <?define ProgramComponentFiles=?>
+  <?define ProgramComponentFilesPath=$(var.BinDir)RunPlugins\Program\?>
+  <?define ProgramImagesComponentFiles=?>
+  <?define ProgramImagesComponentFilesPath=$(var.BinDir)RunPlugins\Program\Images\?>
+
+  <?define ShellComponentFiles=?>
+  <?define ShellComponentFilesPath=$(var.BinDir)RunPlugins\Shell\?>
+  <?define ShellImagesComponentFiles=?>
+  <?define ShellImagesComponentFilesPath=$(var.BinDir)RunPlugins\Shell\Images\?>
+
+  <?define IndexerComponentFiles=?>
+  <?define IndexerComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\?>
+  <?define IndexerImagesComponentFiles=?>
+  <?define IndexerImagesComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\Images\?>
+
+  <?define UnitConvCompFiles=?>
+  <?define UnitConvCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\?>
+  <?define UnitConvImagesCompFiles=?>
+  <?define UnitConvImagesCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\Images\?>
+
+  <?define WebSrchCompFiles=?>
+  <?define WebSrchCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\?>
+  <?define WebSrchImagesCompFiles=?>
+  <?define WebSrchImagesCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\Images\?>
+
+  <?define HistoryPluginComponentFiles=?>
+  <?define HistoryPluginComponentFilesPath=$(var.BinDir)RunPlugins\History\?>
+  <?define HistoryPluginImagesComponentFiles=?>
+  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)RunPlugins\History\Images\?>
+
+  <?define UriComponentFiles=?>
+  <?define UriComponentFilesPath=$(var.BinDir)RunPlugins\Uri\?>
+  <?define UriImagesComponentFiles=?>
+  <?define UriImagesComponentFilesPath=$(var.BinDir)RunPlugins\Uri\Images\?>
+
+  <?define VSCWrkCompFiles=?>
+  <?define VSCWrkCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\?>
+  <?define VSCWrkImagesCompFiles=?>
+  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\Images\?>
+
+  <?define WindowWlkrCompFiles=?>
+  <?define WindowWlkrCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\?>
+  <?define WindowWlkrImagesCompFiles=?>
+  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\Images\?>
+
+  <?define OneNoteComponentFiles=?>
+  <?define OneNoteComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\?>
+  <?define OneNoteImagesComponentFiles=?>
+  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\Images\?>
+
+  <?define RegistryComponentFiles=?>
+  <?define RegistryComponentFilesPath=$(var.BinDir)RunPlugins\Registry\?>
+  <?define RegistryImagesComponentFiles=?>
+  <?define RegistryImagesComponentFilesPath=$(var.BinDir)RunPlugins\Registry\Images\?>
+
+  <?define ServiceComponentFiles=?>
+  <?define ServiceComponentFilesPath=$(var.BinDir)RunPlugins\Service\?>
+  <?define ServiceImagesComponentFiles=?>
+  <?define ServiceImagesComponentFilesPath=$(var.BinDir)RunPlugins\Service\Images\?>
+
+  <?define SystemComponentFiles=?>
+  <?define SystemComponentFilesPath=$(var.BinDir)RunPlugins\System\?>
+  <?define SystemImagesComponentFiles=?>
+  <?define SystemImagesComponentFilesPath=$(var.BinDir)RunPlugins\System\Images\?>
+
+  <?define TimeDateComponentFiles=?>
+  <?define TimeDateComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\?>
+  <?define TimeDateImagesComponentFiles=?>
+  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\Images\?>
+
+  <?define WinSetCmpFiles=?>
+  <?define WinSetCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\?>
+  <?define WinSetImagesCmpFiles=?>
+  <?define WinSetImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\Images\?>
+
+  <?define WinTermCmpFiles=?>
+  <?define WinTermCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\?>
+  <?define WinTermImagesCmpFiles=?>
+  <?define WinTermImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\Images\?>
+
+  <?define PowerToysCmpFiles=?>
+  <?define PowerToysCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\?>
+  <?define PowerToysImagesCmpFiles=?>
+  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\Images\?>
+
+  <?define ValueGeneratorCmpFiles=?>
+  <?define ValueGeneratorCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\?>
+  <?define ValueGeneratorImagesCmpFiles=?>
+  <?define ValueGeneratorImagesCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\Images\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="LauncherImagesFolder" Name="PowerLauncher" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLFOLDER">
+      <!-- Plugins -->
+      <Directory Id="LauncherPluginsFolder" Name="RunPlugins">
+        <Directory Id="WebSearchPluginFolder" Name="WebSearch">
+          <Directory Id="WebSearchImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="CalculatorPluginFolder" Name="Calculator">
+          <Directory Id="CalculatorImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="FolderPluginFolder" Name="Folder">
+          <Directory Id="FolderPluginImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ProgramPluginFolder" Name="Program">
+          <Directory Id="ProgramImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ShellPluginFolder" Name="Shell">
+          <Directory Id="ShellImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="IndexerPluginFolder" Name="Indexer">
+          <Directory Id="IndexerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UriPluginFolder" Name="Uri">
+          <Directory Id="UriImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="HistoryPluginFolder" Name="History">
+          <Directory Id="HistoryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
+          <Directory Id="UnitConverterImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspaces">
+          <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
+          <Directory Id="WindowWalkerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="OneNotePluginFolder" Name="OneNote">
+          <Directory Id="OneNoteImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="PowerToysPluginFolder" Name="PowerToys">
+          <Directory Id="PowerToysImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="RegistryPluginFolder" Name="Registry">
+          <Directory Id="RegistryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ServicePluginFolder" Name="Service">
+          <Directory Id="ServiceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
+          <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="SystemPluginFolder" Name="System">
+          <Directory Id="SystemImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="TimeDatePluginFolder" Name="TimeDate">
+          <Directory Id="TimeDateImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
+          <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ValueGeneratorPluginFolder" Name="ValueGenerator">
+          <Directory Id="ValueGeneratorImagesFolder" Name="Images" />
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="LauncherImagesFolder" FileSource="$(var.launcherImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--launcherImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Calculator Plugin -->
+    <DirectoryRef Id="CalculatorPluginFolder" FileSource="$(var.calcComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="CalculatorImagesFolder" FileSource="$(var.calcImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Folder Plugin -->
+    <DirectoryRef Id="FolderPluginFolder" FileSource="$(var.FolderComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="FolderPluginImagesFolder" FileSource="$(var.FolderImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Program Plugin -->
+    <DirectoryRef Id="ProgramPluginFolder" FileSource="$(var.ProgramComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ProgramImagesFolder" FileSource="$(var.ProgramImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Shell Plugin -->
+    <DirectoryRef Id="ShellPluginFolder" FileSource="$(var.ShellComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ShellImagesFolder" FileSource="$(var.ShellImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Indexer Plugin -->
+    <DirectoryRef Id="IndexerPluginFolder" FileSource="$(var.IndexerComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="IndexerImagesFolder" FileSource="$(var.IndexerImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- UnitConverter Plugin -->
+    <DirectoryRef Id="UnitConverterPluginFolder" FileSource="$(var.UnitConvCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UnitConverterImagesFolder" FileSource="$(var.UnitConvImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WebSearch Plugin -->
+    <DirectoryRef Id="WebSearchPluginFolder" FileSource="$(var.WebSrchCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WebSearchImagesFolder" FileSource="$(var.WebSrchImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- History Plugin -->
+    <DirectoryRef Id="HistoryPluginFolder" FileSource="$(var.HistoryPluginComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="HistoryImagesFolder" FileSource="$(var.HistoryPluginImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Uri Plugin -->
+    <DirectoryRef Id="UriPluginFolder" FileSource="$(var.UriComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UriImagesFolder" FileSource="$(var.UriImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- VSCodeWorkspaces Plugin -->
+    <DirectoryRef Id="VSCodeWorkspacesPluginFolder" FileSource="$(var.VSCWrkCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="VSCodeWorkspaceImagesFolder" FileSource="$(var.VSCWrkImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowWalker Plugin -->
+    <DirectoryRef Id="WindowWalkerPluginFolder" FileSource="$(var.WindowWlkrCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrCompFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="WindowWalkerImagesFolder" FileSource="$(var.WindowWlkrImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- OneNote Plugin -->
+    <DirectoryRef Id="OneNotePluginFolder" FileSource="$(var.OneNoteComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="OneNoteImagesFolder" FileSource="$(var.OneNoteImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Registry Plugin -->
+    <DirectoryRef Id="RegistryPluginFolder" FileSource="$(var.RegistryComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="RegistryImagesFolder" FileSource="$(var.RegistryImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Service Plugin -->
+    <DirectoryRef Id="ServicePluginFolder" FileSource="$(var.ServiceComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ServiceImagesFolder" FileSource="$(var.ServiceImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- System Plugin -->
+    <DirectoryRef Id="SystemPluginFolder" FileSource="$(var.SystemComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="SystemImagesFolder" FileSource="$(var.SystemImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- TimeDate Plugin -->
+    <DirectoryRef Id="TimeDatePluginFolder" FileSource="$(var.TimeDateComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="TimeDateImagesFolder" FileSource="$(var.TimeDateImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsSettings Plugin -->
+    <DirectoryRef Id="WindowsSettingsPluginFolder" FileSource="$(var.WinSetCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsSettingsImagesFolder" FileSource="$(var.WinSetImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsTerminal Plugin -->
+    <DirectoryRef Id="WindowsTerminalPluginFolder" FileSource="$(var.WinTermCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsTerminalImagesFolder" FileSource="$(var.WinTermImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- PowerToys Plugin -->
+    <DirectoryRef Id="PowerToysPluginFolder" FileSource="$(var.PowerToysCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="PowerToysImagesFolder" FileSource="$(var.PowerToysImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ValueGeneratorPluginFolder" FileSource="$(var.ValueGeneratorCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ValueGeneratorImagesFolder" FileSource="$(var.ValueGeneratorImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="RunComponentGroup">
+      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveLauncherFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderLauncherImagesFolder" Directory="LauncherImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderLauncherPluginsFolder" Directory="LauncherPluginsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderCalculatorPluginFolder" Directory="CalculatorPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderCalculatorImagesFolder" Directory="CalculatorImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginFolder" Directory="FolderPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginImagesFolder" Directory="FolderPluginImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramPluginFolder" Directory="ProgramPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramImagesFolder" Directory="ProgramImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellPluginFolder" Directory="ShellPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellImagesFolder" Directory="ShellImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerPluginFolder" Directory="IndexerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerImagesFolder" Directory="IndexerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterPluginFolder" Directory="UnitConverterPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterImagesFolder" Directory="UnitConverterImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchPluginFolder" Directory="WebSearchPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchImagesFolder" Directory="WebSearchImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryPluginFolder" Directory="HistoryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryImagesFolder" Directory="HistoryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriPluginFolder" Directory="UriPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriImagesFolder" Directory="UriImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspacesPluginFolder" Directory="VSCodeWorkspacesPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspaceImagesFolder" Directory="VSCodeWorkspaceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerPluginFolder" Directory="WindowWalkerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerImagesFolder" Directory="WindowWalkerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNotePluginFolder" Directory="OneNotePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNoteImagesFolder" Directory="OneNoteImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryPluginFolder" Directory="RegistryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryImagesFolder" Directory="RegistryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServicePluginFolder" Directory="ServicePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServiceImagesFolder" Directory="ServiceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemPluginFolder" Directory="SystemPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemImagesFolder" Directory="SystemImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDatePluginFolder" Directory="TimeDatePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDateImagesFolder" Directory="TimeDateImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsPluginFolder" Directory="WindowsSettingsPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsImagesFolder" Directory="WindowsSettingsImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalPluginFolder" Directory="WindowsTerminalPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalImagesFolder" Directory="WindowsTerminalImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorPluginFolder" Directory="ValueGeneratorPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorImagesFolder" Directory="ValueGeneratorImagesFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Settings.wxs

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define SettingsV2AssetsFiles=?>
+  <?define SettingsV2AssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\?>
+
+  <?define SettingsV2AssetsModulesFiles=?>
+  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\?>
+
+  <?define SettingsV2OOBEAssetsModulesFiles=?>
+  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\OOBE\?>
+
+  <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
+  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
+        <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts"/>
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
+        <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
+          <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.SettingsV2AssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsModulesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsModulesInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsModulesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsFluentIconsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
+      <Component Id="CommandNotFound_Scripts" Win64="yes" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="CommandNotFound_Scripts" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="CommandNotFound_Scripts_EnableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\EnableModule.ps1" />
+        <File Id="CommandNotFound_Scripts_UpgradeModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\UpgradeModule.ps1" />
+        <File Id="CommandNotFound_Scripts_DisableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\DisableModule.ps1" />
+        <File Id="CommandNotFound_Scripts_CheckCmdNotFoundRequirements.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\CheckCmdNotFoundRequirements.ps1" />
+        <File Id="CommandNotFound_Scripts_InstallWinGetClientModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallWinGetClientModule.ps1" />
+        <File Id="CommandNotFound_Scripts_InstallPowerShell7.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallPowerShell7.ps1" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="SettingsComponentGroup">
+
+      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2AssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveSettingsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="CommandNotFound_Scripts"/>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/ShortcutGuide.wxs

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ShortcutGuideSvgFiles=?>
+  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
+
+  <Fragment>
+    <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ShortcutGuideSvgsInstallFolder" Name="ShortcutGuide" />
+    </DirectoryRef>
+    <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideSvgFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShortcutGuideSvgFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Shortcut guide -->
+    <ComponentGroup Id="ShortcutGuideComponentGroup" >
+      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideSvgsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderShortcutGuideSvgsInstallFolder" Directory="ShortcutGuideSvgsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/Tools.wxs

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="ToolsFolder">
+      <Component Id="BugReportTool_exe" Win64="yes" Guid="370D0C28-F423-4A12-9A64-6BAB57C7E5C3">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="BugReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)Tools\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" Checksum="yes" />
+      </Component>
+      <Component Id="StylesReportTool_exe" Win64="yes" Guid="9D348A78-38A0-4FDC-8D16-BDB0178E5F1E">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="StylesReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)StylesReportTool\PowerToys.StylesReportTool.exe" Id="StylesReportTool.exe" Checksum="yes" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="ToolComponentGroup">
+      <Component Id="RemoveToolsFolder" Guid="0402A3E8-1B4F-4762-9CCF-2267BCF8B6EE" Directory="ToolsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveToolsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderToolsFolder" Directory="ToolsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="BugReportTool_exe" />
+      <ComponentRef Id="StylesReportTool_exe" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/WinAppSDK.wxs

@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- Localization languages shipped with WinAppSDK. We should ship these as well. -->
+  <?define WinAppSDKLocLanguageList = af-ZA;ar-SA;az-Latn-AZ;bg-BG;bs-Latn-BA;ca-ES;cs-CZ;cy-GB;da-DK;de-DE;el-GR;en-GB;en-us;es-ES;es-MX;et-EE;eu-ES;fa-IR;fi-FI;fr-CA;fr-FR;gl-ES;he-IL;hi-IN;hr-HR;hu-HU;id-ID;is-IS;it-IT;ja-JP;ka-GE;kk-KZ;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;nn-NO;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sl-SI;sq-AL;sr-Cyrl-RS;sr-Latn-RS;sv-SE;th-TH;tr-TR;uk-UA;vi-VN;zh-CN;zh-TW?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets">
+      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="39889494-838A-4B9A-BD0A-105A1F0161BF">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
+      </Component>
+      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" Win64="yes" Guid="A970464C-A5BC-43DB-ACB3-7D83CF3047B3">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_map" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_map.html" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\map.html" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="WinUI3AppsInstallFolder">
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+      <Directory Id="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Name="$(var.Language)" />
+      <?undef IdSafeLanguage?>
+      <?endforeach?>
+    </DirectoryRef>
+
+    <ComponentGroup Id="WindowsAppSDKComponentGroup">
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define CompGUIDPrefix = 3C8E6C25-772A-4686-8FE3-8BE63F8D19?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define CompGUIDPrefix = E2E65A7F-48CA-49E1-847B-5B1116D32E?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define CompGUIDPrefix = 601F5B70-D386-4F68-B958-9D3F07167C?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define CompGUIDPrefix = 9DD6C8F9-8599-46E4-B9B6-8B8CB095F9?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define CompGUIDPrefix = CF68A082-D286-4556-BDF1-FBD9C7FE37?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define CompGUIDPrefix = 298A66A5-9683-4ABF-A1C5-D97DA031B3?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define CompGUIDPrefix = EDEC8BF7-6602-47E5-AC04-3D392BDD83?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define CompGUIDPrefix = 6E328AD9-58D4-4615-8A64-9710D5EA81?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define CompGUIDPrefix = BC5D9E5C-D4B8-4CEB-A944-1A34FD46E5?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define CompGUIDPrefix = 4E1F60E3-6257-4492-AD9E-22124393F7?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define CompGUIDPrefix = 0A340858-D5DF-44D1-90F9-E5435128D5?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define CompGUIDPrefix = 2F06617A-9700-4223-A309-58F2C1DA88?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define CompGUIDPrefix = A817585B-4AD2-4030-844B-1B2975DE6C?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define CompGUIDPrefix = 987CE029-212B-40AF-956E-D0D76F5EE8?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define CompGUIDPrefix = 9E806BDC-CB61-43C5-A314-6CB3C7CE17?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define CompGUIDPrefix = 07C20887-C0FD-4686-8D6C-CD70D4099E?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define CompGUIDPrefix = 43FDBB2A-DCF0-4E5C-98B2-DF5F8A7ABC?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define CompGUIDPrefix = 9A709AF1-A967-4188-9A6E-0EE1A01091?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define CompGUIDPrefix = 7C933CD2-E937-4BEF-835D-7D27660BF1?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define CompGUIDPrefix = 547742D0-6025-43A1-B37A-D7FE1C7AB7?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define CompGUIDPrefix = 5C208D3F-0A62-4DD3-9A3C-D5F5931BC0?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define CompGUIDPrefix = CC8360F1-B761-485F-AE34-D5E76C2133?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define CompGUIDPrefix = 5D3703BA-B7F8-45E6-8727-E184890524?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define CompGUIDPrefix = 85D55059-CFE3-47CD-A000-D795DCD0FF?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define CompGUIDPrefix = 2BD6767A-A7C5-440B-BDC7-EA505F6B69?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define CompGUIDPrefix = FB99F97C-A1C3-407E-AA4A-264621D1C4?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define CompGUIDPrefix = CBBA3A3A-B336-4CB0-ACB1-4BB666855D?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define CompGUIDPrefix = 57E8C11E-6D1F-4F29-A440-9F6175C607?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define CompGUIDPrefix = 1C4F8911-96E4-4903-A92B-CD48BF09DE?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define CompGUIDPrefix = EF51BC22-3D3E-4767-8558-BE43F729FD?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define CompGUIDPrefix = 7F625700-74B5-4F55-8F80-E86B4DC784?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define CompGUIDPrefix = 3F4019C3-2FA3-48BA-9096-C02E6679B5?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define CompGUIDPrefix = F6C1AAAD-1917-48AC-B89A-3953D01C20?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define CompGUIDPrefix = 6E48287B-937D-43D0-A7FB-161717D5E2?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define CompGUIDPrefix = F2E02A03-361C-43FA-ACFA-53369774A6?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define CompGUIDPrefix = 4D141E3C-7F30-4689-9D8D-36C1245845?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define CompGUIDPrefix = 939F5123-0700-4C0C-891F-04E331FC5E?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define CompGUIDPrefix = 5E97EAE0-F207-47F1-B4BD-12113D983C?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define CompGUIDPrefix = A1E74004-671D-46DC-AECD-826D068B26?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define CompGUIDPrefix = E1D983A8-D406-4C60-AE61-9F362CBEF2?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define CompGUIDPrefix = E6E4AF39-7758-4F52-B6CA-CD6D4513B7?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define CompGUIDPrefix = 8F4BB964-3EB7-4D91-816D-D0E25D69D0?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define CompGUIDPrefix = 8324BA46-F54F-4696-B348-3193856660?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define CompGUIDPrefix = 13BB6E4C-A928-4FD5-A0CA-CE45B8B857?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define CompGUIDPrefix = 63D22C1D-D00A-4194-B64F-9CA2DF93D5?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define CompGUIDPrefix = C007A438-5EBD-4E2A-9E03-8C9521762B?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define CompGUIDPrefix = 9058E23A-A9DD-45A2-A85C-5DE97D0F2A?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define CompGUIDPrefix = 7D21E8FC-368D-4393-A055-44D742C7A0?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define CompGUIDPrefix = F8B974A0-4BEA-44F7-8603-7D9BE3003F?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define CompGUIDPrefix = A56ECD85-B52C-421D-8C8A-CBADE0A92F?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define CompGUIDPrefix = C71B1361-A45E-42AB-8A20-95ED3AF74E?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define CompGUIDPrefix = 025B5CE3-6470-4C01-A606-DFC74A47E0?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define CompGUIDPrefix = AD78BE3F-6A3B-414D-AAEC-BC4C801B64?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define CompGUIDPrefix = 9F21001A-87DA-4D9E-A298-FEDC375D0C?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define CompGUIDPrefix = C8BB7DD7-EB7B-478E-925D-6F64107590?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define CompGUIDPrefix = E472BBC5-604D-44A2-8B95-3A456CFF56?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?define CompGUIDPrefix = 51B656B3-2D45-49D8-9871-F0A1C8BEEE?>
+      <?endif?>
+      <Component
+          Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
+          Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
+          Guid="$(var.CompGUIDPrefix)01">
+          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+            <RegistryValue Type="string" Name="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+          </RegistryKey>
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
+      </Component>
+      <?undef IdSafeLanguage?>
+      <?undef CompGUIDPrefix?>
+      <?endforeach?>
+      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinUI3AppsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveWinAppSDKFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+        <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
+      <?undef IdSafeLanguage?>
+      <?endforeach?>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
+      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" />
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+

installer/PowerToysSetupVNext/WinUI3Applications.wxs

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

installer/PowerToysSetupVNext/Workspaces.wxs

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define WorkspacesImagesComponentFiles=?>
+  <?define WorkspacesImagesComponentFilesPath=$(var.BinDir)Assets\Workspaces\?>
+
+  <Fragment>
+    <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="WorkspacesAssetsInstallFolder" Name="Workspaces" />
+    </DirectoryRef>
+    <DirectoryRef Id="WorkspacesAssetsInstallFolder" FileSource="$(var.WorkspacesImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WorkspacesImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Workspaces -->
+    <ComponentGroup Id="WorkspacesComponentGroup" >
+      <Component Id="RemoveWorkspacesAssetsFolder" Guid="34FC1245-1197-4025-9CF1-A298D509C2CC" Directory="WorkspacesAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveWorkspacesAssetsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderWorkspacesAssetsFolder" Directory="WorkspacesAssetsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -0,0 +1,323 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$platform,
+    [Parameter(Mandatory = $False, Position = 2)]
+    [string]$installscopeperuser = "false"
+)
+
+Function Generate-FileList() {
+    [CmdletBinding()]
+    Param(
+        # Can be multiple files separated by ; as long as they're on the same directory
+        [Parameter(Mandatory = $True, Position = 1)]
+        [AllowEmptyString()]
+        [string]$fileDepsJson,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$wxsFilePath,
+        # If there is no deps.json file, just pass path to files
+        [Parameter(Mandatory = $False, Position = 4)]
+        [string]$depsPath,
+        # launcher plugins are being loaded into launcher process,
+        # so there are some additional dependencies to skip
+        [Parameter(Mandatory = $False, Position = 5)]
+        [bool]$isLauncherPlugin
+    )
+
+    $fileWxs = Get-Content $wxsFilePath;
+
+    $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
+
+    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "srt.js", "monacoSpecialLanguages.js", "customTokenThemeRules.js", "*.pri")
+
+    $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
+
+    if ($fileDepsJson -eq [string]::Empty) {
+        $fileDepsRoot = $depsPath
+    } else {
+        $multipleDepsJson = $fileDepsJson.Split(";")
+
+        foreach ( $singleDepsJson in $multipleDepsJson )
+        {
+
+            $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
+            $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
+
+            $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
+                $_.Name -match "runtimepack.*Runtime"
+            };
+
+            $runtimeList | ForEach-Object {
+                $_.Value.PSObject.Properties.Value | ForEach-Object {
+                    $fileExclusionList += $_.PSObject.Properties.Name
+                }
+            }
+        }
+    }
+
+    $fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
+
+    if ($isLauncherPlugin -eq $True) {
+        $fileInclusionList += @("*.deps.json")
+        $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
+    }
+
+    $fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
+
+    $fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
+
+    Set-Content -Path $wxsFilePath -Value $fileWxs
+}
+
+Function Generate-FileComponents() {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $True, Position = 1)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$wxsFilePath,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$regroot
+    )
+
+    $wxsFile = Get-Content $wxsFilePath;
+
+    $wxsFile | ForEach-Object {
+        if ($_ -match "(<?define $fileListName=)(.*)\?>") {
+            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
+            Justification = 'variable is used in another scope')]
+
+            $fileList = $matches[2] -split ';'
+            return
+        }
+    }
+
+    $componentId = "$($fileListName)_Component"
+
+    $componentDefs = "`r`n"
+    $componentDefs +=
+    @"
+            <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
+              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+              </RegistryKey>`r`n
+"@
+
+    foreach ($file in $fileList) {
+        $fileTmp = $file -replace "-", "_"
+        $componentDefs +=
+    @"
+              <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
+"@
+    }
+
+    $componentDefs +=
+    @"
+            </Component>`r`n
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
+
+    $componentRef =
+    @"
+            <ComponentRef Id="$($componentId)" />
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
+
+    Set-Content -Path $wxsFilePath -Value $wxsFile
+}
+
+if ($platform -ceq "arm64") {
+    $platform = "ARM64"
+}
+
+if ($installscopeperuser -eq "true") {
+    $registryroot = "HKCU"
+} else {
+    $registryroot = "HKLM"
+}
+
+#BaseApplications
+Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
+
+#WinUI3Applications
+Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
+
+#AdvancedPaste
+Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
+
+#AwakeFiles
+Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
+
+#ColorPicker
+Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
+
+#Environment Variables
+Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
+
+#FileExplorerAdd-ons
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+
+#FileLocksmith
+Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
+
+#Hosts
+Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
+
+#ImageResizer
+Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+
+#New+
+Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
+
+#Peek
+Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
+
+#PowerRename
+Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
+
+#RegistryPreview
+Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
+
+#Run
+Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+## Plugins
+###Calculator
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Folder
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Program
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Shell
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Indexer
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###UnitConverter
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WebSearch
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###History
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Uri
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###VSCodeWorkspaces
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowWalker
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###OneNote
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Registry
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Service
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###System
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###TimeDate
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowsSettings
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowsTerminal
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###PowerToys
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###ValueGenerator
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+## Plugins
+
+#ShortcutGuide
+Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
+
+#Settings
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+
+#Workspaces
+Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
+Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot

installer/PowerToysSetupVNext/generateMonacoWxs.ps1

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

installer/PowerToysSetupVNext/packages.config

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+</packages>

installer/PowerToysSetupVNext/publish.cmd

@@ -0,0 +1,17 @@
+setlocal enableDelayedExpansion
+
+IF NOT DEFINED PTRoot (SET PTRoot=..\..)
+
+SET PlatformArg=%1
+IF NOT DEFINED PlatformArg (SET PlatformArg=x64)
+SET VCToolsVersion=!VCToolsVersion!
+SET ClearDevCommandPromptEnvVars=false
+
+rem In case of Release we should not use Debug CRT in VCRT forwarders
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

installer/PowerToysSetupVNext/terminate_powertoys.cmd

@@ -0,0 +1,12 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+@REM We loop here until taskkill cannot find a PowerToys process. We can't use /F flag, because it
+@REM doesn't give application an opportunity to cleanup. Thus we send WM_CLOSE which is being caught
+@REM by multiple windows running a msg loop in PowerToys.exe process, which we close one by one.
+for /l %%x in (1, 1, 100) do (
+    taskkill /IM PowerToys.exe 1>NUL 2>NUL
+    if !ERRORLEVEL! NEQ 0 goto quit
+)
+
+:quit

installer/wixVNext.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WixInstallPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\</WixInstallPath>
+    <WixExtDir>$(WixInstallPath)\</WixExtDir>
+
+    <WixTargetsPath>$(WixInstallPath)\..\wix.targets</WixTargetsPath>
+    <LuxTargetsPath>$(WixInstallPath)\..\lux.targets</LuxTargetsPath>
+
+    <WixTasksPath>$(WixInstallPath)\WixTasks.dll</WixTasksPath>
+    <WixSdkPath>$(WixInstallPath)\..\sdk\</WixSdkPath>
+    <WixCATargetsPath>$(WixSdkPath)\..\wix.ca.targets</WixCATargetsPath>
+  </PropertyGroup>
+</Project>

src/Common.Dotnet.CsWinRT.props

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
+
   <PropertyGroup>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>

src/Common.Dotnet.FuzzTest.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Some items may be set in Directory.Build.props in root -->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- OneFuzz does not currently support testing with .NET 9.
+       As a temporary workaround, create a .NET 8 project and use file links 
+       to include the code that needs testing. -->
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+  </PropertyGroup>
+</Project>

src/Common.Dotnet.PrepareGeneratedFolder.targets

@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
+    <PropertyGroup>
+      <!-- Only create the base 'generated' folder -->
+      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
+    </PropertyGroup>
+
+    <!-- Create 'generated' folder if missing -->
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+
+    <!-- Optional logging for debugging -->
+    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
+  </Target>
+
+</Project>

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -141,6 +141,40 @@ namespace ManagedCommon
             return lab;
         }
 
+        /// <summary>
+        /// Convert a given <see cref="Color"/> to a Oklab color
+        /// </summary>
+        /// <param name="color">The <see cref="Color"/> to convert</param>
+        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
+        public static (double Lightness, double ChromaticityA, double ChromaticityB) ConvertToOklabColor(Color color)
+        {
+            var linear = ConvertSRGBToLinearRGB(color.R / 255d, color.G / 255d, color.B / 255d);
+            var oklab = GetOklabColorFromLinearRGB(linear.R, linear.G, linear.B);
+            return oklab;
+        }
+
+        /// <summary>
+        /// Convert a given <see cref="Color"/> to a Oklch color
+        /// </summary>
+        /// <param name="color">The <see cref="Color"/> to convert</param>
+        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
+        public static (double Lightness, double Chroma, double Hue) ConvertToOklchColor(Color color)
+        {
+            var oklab = ConvertToOklabColor(color);
+            var oklch = GetOklchColorFromOklab(oklab.Lightness, oklab.ChromaticityA, oklab.ChromaticityB);
+
+            return oklch;
+        }
+
+        public static (double R, double G, double B) ConvertSRGBToLinearRGB(double r, double g, double b)
+        {
+            // inverse companding, gamma correction must be undone
+            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
+            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
+            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
+            return (rLinear, gLinear, bLinear);
+        }
+
         /// <summary>
         /// Convert a given <see cref="Color"/> to a CIE XYZ color (XYZ)
         /// The constants of the formula matches this Wikipedia page, but at a higher precision:
@@ -156,10 +190,7 @@ namespace ManagedCommon
             double g = color.G / 255d;
             double b = color.B / 255d;
 
-            // inverse companding, gamma correction must be undone
-            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
-            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
-            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
+            (double rLinear, double gLinear, double bLinear) = ConvertSRGBToLinearRGB(r, g, b);
 
             return (
                 (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
@@ -210,6 +241,63 @@ namespace ManagedCommon
             return (l, a, b);
         }
 
+        /// <summary>
+        /// Convert a linear RGB color <see cref="double"/> to an Oklab color.
+        /// The constants of this formula come from https://github.com/Evercoder/culori/blob/2bedb8f0507116e75f844a705d0b45cf279b15d0/src/oklab/convertLrgbToOklab.js
+        /// and the implementation is based on https://bottosson.github.io/posts/oklab/
+        /// </summary>
+        /// <param name="r">Linear R value</param>
+        /// <param name="g">Linear G value</param>
+        /// <param name="b">Linear B value</param>
+        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
+        private static (double Lightness, double ChromaticityA, double ChromaticityB)
+            GetOklabColorFromLinearRGB(double r, double g, double b)
+        {
+            double l = (0.41222147079999993 * r) + (0.5363325363 * g) + (0.0514459929 * b);
+            double m = (0.2119034981999999 * r) + (0.6806995450999999 * g) + (0.1073969566 * b);
+            double s = (0.08830246189999998 * r) + (0.2817188376 * g) + (0.6299787005000002 * b);
+
+            double l_ = Math.Cbrt(l);
+            double m_ = Math.Cbrt(m);
+            double s_ = Math.Cbrt(s);
+
+            return (
+                (0.2104542553 * l_) + (0.793617785 * m_) - (0.0040720468 * s_),
+                (1.9779984951 * l_) - (2.428592205 * m_) + (0.4505937099 * s_),
+                (0.0259040371 * l_) + (0.7827717662 * m_) - (0.808675766 * s_)
+            );
+        }
+
+        /// <summary>
+        /// Convert an Oklab color <see cref="double"/> from Cartesian form to its polar form Oklch
+        /// https://bottosson.github.io/posts/oklab/#the-oklab-color-space
+        /// </summary>
+        /// <param name="lightness">The <see cref="lightness"/></param>
+        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
+        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
+        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
+        private static (double Lightness, double Chroma, double Hue)
+            GetOklchColorFromOklab(double lightness, double chromaticity_a, double chromaticity_b)
+        {
+            return GetLCHColorFromLAB(lightness, chromaticity_a, chromaticity_b);
+        }
+
+        /// <summary>
+        /// Convert a color in Cartesian form (Lab) to its polar form (LCh)
+        /// </summary>
+        /// <param name="lightness">The <see cref="lightness"/></param>
+        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
+        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
+        /// <returns>The lightness, chroma, and hue angle</returns>
+        private static (double Lightness, double Chroma, double Hue)
+            GetLCHColorFromLAB(double lightness, double chromaticity_a, double chromaticity_b)
+        {
+            // Lab to LCh transformation
+            double chroma = Math.Sqrt(Math.Pow(chromaticity_a, 2) + Math.Pow(chromaticity_b, 2));
+            double hue = Math.Round(chroma, 3) == 0 ? 0.0 : ((Math.Atan2(chromaticity_b, chromaticity_a) * 180d / Math.PI) + 360d) % 360d;
+            return (lightness, chroma, hue);
+        }
+
         /// <summary>
         /// Convert a given <see cref="Color"/> to a natural color (hue, whiteness, blackness)
         /// </summary>
@@ -276,12 +364,17 @@ namespace ManagedCommon
             { "Br", 'p' },   // brightness       percent
             { "In", 'p' },   // intensity        percent
             { "Ll", 'p' },   // lightness (HSL)  percent
-            { "Lc", 'p' },   // lightness(CIELAB)percent
             { "Va", 'p' },   // value            percent
             { "Wh", 'p' },   // whiteness        percent
             { "Bn", 'p' },   // blackness        percent
-            { "Ca", 'p' },   // chromaticityA    percent
-            { "Cb", 'p' },   // chromaticityB    percent
+            { "Lc", 'p' },   // lightness (CIE)         percent
+            { "Ca", 'p' },   // chromaticityA (CIELAB)  percent
+            { "Cb", 'p' },   // chromaticityB (CIELAB)  percent
+            { "Lo", 'p' },   // lightness (Oklab/Oklch) percent
+            { "Oa", 'p' },   // chromaticityA (Oklab)   percent
+            { "Ob", 'p' },   // chromaticityB (Oklab)   percent
+            { "Oc", 'p' },   // chroma (Oklch)          percent
+            { "Oh", 'p' },   // hue angle (Oklch)       percent
             { "Xv", 'i' },   // X value          int
             { "Yv", 'i' },   // Y value          int
             { "Zv", 'i' },   // Z value          int
@@ -424,6 +517,10 @@ namespace ManagedCommon
                     var (lightnessC, _, _) = ConvertToCIELABColor(color);
                     lightnessC = Math.Round(lightnessC, 2);
                     return lightnessC.ToString(CultureInfo.InvariantCulture);
+                case "Lo":
+                    var (lightnessO, _, _) = ConvertToOklabColor(color);
+                    lightnessO = Math.Round(lightnessO, 2);
+                    return lightnessO.ToString(CultureInfo.InvariantCulture);
                 case "Wh":
                     var (_, whiteness, _) = ConvertToHWBColor(color);
                     whiteness = Math.Round(whiteness * 100);
@@ -440,6 +537,22 @@ namespace ManagedCommon
                     var (_, _, chromaticityB) = ConvertToCIELABColor(color);
                     chromaticityB = Math.Round(chromaticityB, 2);
                     return chromaticityB.ToString(CultureInfo.InvariantCulture);
+                case "Oa":
+                    var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
+                    chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
+                    return chromaticityAOklab.ToString(CultureInfo.InvariantCulture);
+                case "Ob":
+                    var (_, _, chromaticityBOklab) = ConvertToOklabColor(color);
+                    chromaticityBOklab = Math.Round(chromaticityBOklab, 2);
+                    return chromaticityBOklab.ToString(CultureInfo.InvariantCulture);
+                case "Oc":
+                    var (_, chromaOklch, _) = ConvertToOklchColor(color);
+                    chromaOklch = Math.Round(chromaOklch, 2);
+                    return chromaOklch.ToString(CultureInfo.InvariantCulture);
+                case "Oh":
+                    var (_, _, hueOklch) = ConvertToOklchColor(color);
+                    hueOklch = Math.Round(hueOklch, 2);
+                    return hueOklch.ToString(CultureInfo.InvariantCulture);
                 case "Xv":
                     var (x, _, _) = ConvertToCIEXYZColor(color);
                     x = Math.Round(x * 100, 4);
@@ -495,8 +608,10 @@ namespace ManagedCommon
                 case "HSI": return "hsi(%Hu, %Si%, %In%)";
                 case "HWB": return "hwb(%Hu, %Wh%, %Bn%)";
                 case "NCol": return "%Hn, %Wh%, %Bn%";
-                case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
                 case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
+                case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
+                case "Oklab": return "oklab(%Lo, %Oa, %Ob)";
+                case "Oklch": return "oklch(%Lo, %Oc, %Oh)";
                 case "VEC4": return "(%Reff, %Grff, %Blff, 1f)";
                 case "Decimal": return "%Dv";
                 case "HEX Int": return "0xFF%ReX%GrX%BlX";

src/common/ManagedCommon/IdRecoveryHelper.cs

@@ -0,0 +1,51 @@
+// 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.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ManagedCommon
+{
+    public static class IdRecoveryHelper
+    {
+        /// <summary>
+        /// Fixes invalid IDs in the given list by assigning unique values.
+        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
+        /// </summary>
+        /// <param name="items">The list of items that may contain invalid IDs.</param>
+        public static void RecoverInvalidIds<T>(IEnumerable<T> items)
+            where T : class, IHasId
+        {
+            var idSet = new HashSet<int>();
+            int newId = 0;
+            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
+
+            // Iterate through the list and fix invalid IDs
+            foreach (var item in sortedItems)
+            {
+                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
+                if (!idSet.Add(item.Id))
+                {
+                    // Find the next available unique ID
+                    while (idSet.Contains(newId))
+                    {
+                        newId++;
+                    }
+
+                    item.Id = newId;
+                    idSet.Add(newId); // Add the newly assigned ID to the set
+                }
+            }
+        }
+    }
+
+    public interface IHasId
+    {
+        int Id { get; set; }
+    }
+}

src/common/utils/package.h

@@ -301,6 +301,7 @@ namespace package
         if (!std::filesystem::exists(directoryPath))
         {
             Logger::error(L"The directory '" + directoryPath + L"' does not exist.");
+            return {};
         }
 
         const std::regex pattern(R"(^.+\.(appx|msix|msixbundle)$)", std::regex_constants::icase);

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

src/modules/AdvancedPaste/AdvancedPaste/Helpers/OcrHelpers.cs

@@ -18,10 +18,19 @@ public static class OcrHelpers
 {
     public static async Task<string> ExtractTextAsync(SoftwareBitmap bitmap, CancellationToken cancellationToken)
     {
-        var ocrLanguage = GetOCRLanguage() ?? throw new InvalidOperationException("Unable to determine OCR language");
+        var ocrLanguage = GetOCRLanguage();
         cancellationToken.ThrowIfCancellationRequested();
 
-        var ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine");
+        OcrEngine ocrEngine;
+        if (ocrLanguage is not null)
+        {
+            ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine from specified language");
+        }
+        else
+        {
+            ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages() ?? throw new InvalidOperationException("Unable to create OCR engine from user profile language");
+        }
+
         cancellationToken.ThrowIfCancellationRequested();
 
         var ocrResult = await ocrEngine.RecognizeAsync(bitmap);

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -15,8 +15,6 @@
     <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
-    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
-    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -56,7 +54,4 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
-  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-  </Target>
 </Project>

src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj

@@ -1,6 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
+
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <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')" />
   <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
     <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')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -153,7 +153,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -121,6 +121,22 @@ namespace AppLauncher
         // packaged apps: try launching first by AppUserModel.ID
         // usage example: elevated Terminal
         if (!launched && !app.appUserModelId.empty() && !app.packageFullName.empty())
+        {
+            Logger::trace(L"Launching {} as {} - {app.packageFullName}", app.name, app.appUserModelId, app.packageFullName);
+            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
+            if (res.isOk())
+            {
+                launched = true;
+            }
+            else
+            {
+                launchErrors.push_back({ std::filesystem::path(app.path).filename(), res.error() });
+            }
+        }
+
+        // win32 app with appUserModelId:
+        // usage example: steam games
+        if (!launched && !app.appUserModelId.empty())
         {
             Logger::trace(L"Launching {} as {}", app.name, app.appUserModelId);
             auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);

src/modules/Workspaces/WorkspacesLib/AppUtils.cpp

@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "AppUtils.h"
+#include "SteamHelper.h"
 
 #include <atlbase.h>
 #include <propvarutil.h>
@@ -34,6 +35,8 @@ namespace Utils
 
             constexpr const wchar_t* EdgeFilename = L"msedge.exe";
             constexpr const wchar_t* ChromeFilename = L"chrome.exe";
+
+            constexpr const wchar_t* SteamUrlProtocol = L"steam:";
         }
 
         AppList IterateAppsFolder()
@@ -138,6 +141,34 @@ namespace Utils
                                 else if (prop == NonLocalizable::PackageInstallPathProp || prop == NonLocalizable::InstallPathProp)
                                 {
                                     data.installPath = propVariantString.m_pData;
+
+                                    if (!data.installPath.empty())
+                                    {
+                                        const bool isSteamProtocol = data.installPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
+
+                                        if (isSteamProtocol)
+                                        {
+                                            Logger::info(L"Found steam game: protocol path: {}", data.installPath);
+                                            data.protocolPath = data.installPath;
+
+                                            try
+                                            {
+                                                auto gameId = Steam::GetGameIdFromUrlProtocolPath(data.installPath);
+                                                auto gameFolder = Steam::GetSteamGameInfoFromAcfFile(gameId);
+
+                                                if (gameFolder)
+                                                {
+                                                    data.installPath = gameFolder->gameInstallationPath;
+                                                    Logger::info(L"Found steam game: physical path: {}", data.installPath);
+                                                }
+                                            }
+                                            catch (std::exception ex)
+                                            {
+                                                Logger::error(L"Failed to get installPath for game {}", data.installPath);
+                                                Logger::error("Error: {}", ex.what());
+                                            }
+                                        }
+                                    }
                                 }
                             }
 
@@ -397,5 +428,10 @@ namespace Utils
         {
             return installPath.ends_with(NonLocalizable::ChromeFilename);
         }
+
+        bool AppData::IsSteamGame() const
+        {
+            return protocolPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
+        }
     }
 }

src/modules/Workspaces/WorkspacesLib/AppUtils.h

@@ -13,10 +13,12 @@ namespace Utils
             std::wstring packageFullName;
             std::wstring appUserModelId;
             std::wstring pwaAppId;
+            std::wstring protocolPath;
             bool canLaunchElevated = false;
 
             bool IsEdge() const;
             bool IsChrome() const;
+            bool IsSteamGame() const;
         };
 
         using AppList = std::vector<AppData>;

src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp

@@ -0,0 +1,171 @@
+#include "pch.h"
+#include "SteamHelper.h"
+#include <fstream>
+#include <sstream>
+#include <unordered_map>
+#include <filesystem>
+#include <regex>
+#include <string>
+
+namespace Utils
+{
+
+    static std::wstring Utf8ToWide(const std::string& utf8)
+    {
+        if (utf8.empty())
+            return L"";
+
+        int size = MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), nullptr, 0);
+        if (size <= 0)
+            return L"";
+
+        std::wstring wide(size, L'\0');
+        MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), wide.data(), size);
+        return wide;
+    }
+
+    namespace Steam
+    {
+        using namespace std;
+        namespace fs = std::filesystem;
+
+        static std::optional<std::wstring> GetSteamExePathFromRegistry()
+        {
+            static std::optional<std::wstring> cachedPath;
+            if (cachedPath.has_value())
+            {
+                return cachedPath;
+            }
+
+            const std::vector<HKEY> roots = { HKEY_CLASSES_ROOT, HKEY_LOCAL_MACHINE, HKEY_USERS };
+            const std::vector<std::wstring> subKeys = {
+                L"steam\\shell\\open\\command",
+                L"Software\\Classes\\steam\\shell\\open\\command",
+            };
+
+            for (HKEY root : roots)
+            {
+                for (const auto& subKey : subKeys)
+                {
+                    HKEY hKey;
+                    if (RegOpenKeyExW(root, subKey.c_str(), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+                    {
+                        wchar_t value[512];
+                        DWORD size = sizeof(value);
+                        DWORD type = 0;
+
+                        if (RegQueryValueExW(hKey, nullptr, nullptr, &type, reinterpret_cast<LPBYTE>(value), &size) == ERROR_SUCCESS &&
+                            (type == REG_SZ || type == REG_EXPAND_SZ))
+                        {
+                            std::wregex exeRegex(LR"delim("([^"]+steam\.exe)")delim");
+                            std::wcmatch match;
+                            if (std::regex_search(value, match, exeRegex) && match.size() > 1)
+                            {
+                                RegCloseKey(hKey);
+                                cachedPath = match[1].str();
+                                return cachedPath;
+                            }
+                        }
+
+                        RegCloseKey(hKey);
+                    }
+                }
+            }
+
+            cachedPath = std::nullopt;
+            return std::nullopt;
+        }
+
+        static fs::path GetSteamBasePath()
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return fs::path(*steamFolderOpt).parent_path() / L"steamapps";
+        }
+
+        static fs::path GetAcfFilePath(const std::wstring& gameId)
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return GetSteamBasePath() / (L"appmanifest_" + gameId + L".acf");
+        }
+
+        static fs::path GetGameInstallPath(const std::wstring& gameFolderName)
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return GetSteamBasePath() / L"common" / gameFolderName;
+        }
+
+        static unordered_map<wstring, wstring> ParseAcfFile(const fs::path& acfPath)
+        {
+            unordered_map<wstring, wstring> result;
+
+            ifstream file(acfPath);
+            if (!file.is_open())
+                return result;
+
+            string line;
+            while (getline(file, line))
+            {
+                smatch matches;
+                static const regex pattern(R"delim("([^"]+)"\s+"([^"]+)")delim");
+
+                if (regex_search(line, matches, pattern) && matches.size() == 3)
+                {
+                    wstring key = Utf8ToWide(matches[1].str());
+                    wstring value = Utf8ToWide(matches[2].str());
+                    result[key] = value;
+                }
+            }
+
+            return result;
+        }
+
+        std::unique_ptr<Steam::SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId)
+        {
+            fs::path acfPath = Steam::GetAcfFilePath(gameId);
+
+            if (!fs::exists(acfPath))
+                return nullptr;
+
+            auto kv = ParseAcfFile(acfPath);
+            if (kv.empty() || kv.find(L"installdir") == kv.end())
+                return nullptr;
+
+            fs::path gamePath = Steam::GetGameInstallPath(kv[L"installdir"]);
+            if (!fs::exists(gamePath))
+                return nullptr;
+
+            auto game = std::make_unique<Steam::SteamGame>();
+            game->gameId = gameId;
+            game->gameInstallationPath = gamePath.wstring();
+            return game;
+        }
+
+        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath)
+        {
+            const std::wstring steamGamePrefix = L"steam://rungameid/";
+
+            if (urlPath.rfind(steamGamePrefix, 0) == 0)
+            {
+                return urlPath.substr(steamGamePrefix.length());
+            }
+
+            return L"";
+        }
+
+    }
+}

src/modules/Workspaces/WorkspacesLib/SteamHelper.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "pch.h"
+
+namespace Utils
+{
+    namespace NonLocalizable
+    {
+        const std::wstring AcfFileNameTemplate = L"appmanifest_<gameid>.acfs";
+    }
+
+    namespace Steam
+    {
+        struct SteamGame
+        {
+            std::wstring gameId;
+            std::wstring gameInstallationPath;
+        };
+
+        std::unique_ptr<SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId);
+
+        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath);
+    }
+}

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -41,6 +41,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="PwaHelper.h" />
     <ClInclude Include="Result.h" />
+    <ClInclude Include="SteamHelper.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="utils.h" />
     <ClInclude Include="WbemHelper.h" />
@@ -57,6 +58,7 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="PwaHelper.cpp" />
+    <ClCompile Include="SteamGameHelper.cpp" />
     <ClCompile Include="two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="WbemHelper.cpp" />
     <ClCompile Include="WorkspacesData.cpp" />

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters

@@ -53,6 +53,9 @@
     <ClInclude Include="StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SteamHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -88,6 +91,9 @@
     <ClCompile Include="WbemHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SteamGameHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp

@@ -71,6 +71,8 @@ namespace SnapshotUtils
                 continue;
             }
 
+            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
+
             DWORD pid{};
             GetWindowThreadProcessId(window, &pid);
 
@@ -118,10 +120,19 @@ namespace SnapshotUtils
             auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
             if (!data.has_value() || data->name.empty())
             {
-                Logger::info(L"Installed app not found: {}", processPath);
+                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), processPath);
                 continue;
             }
 
+            if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
+            {
+                // Only care about steam games if it has no thick frame to remain consistent with
+                // the behavior as before.
+                continue;
+            }
+
+            Logger::info(L"Found app for window:{},{}", reinterpret_cast<void*>(window), processPath);
+
             auto appData = data.value();
 
             bool isEdge = appData.IsEdge();

src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp

@@ -200,6 +200,14 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
         }
 
         auto data = Utils::Apps::GetApp(processPath, pid, m_installedApps);
+
+        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
+        {
+            // Only care about steam games if it has no thick frame to remain consistent with 
+            // the behavior as before.
+            continue;
+        }
+
         if (!data.has_value())
         {
             continue;

src/modules/Workspaces/workspaces-common/WindowFilter.h

@@ -9,10 +9,12 @@ namespace WindowFilter
     {
         auto style = GetWindowLong(window, GWL_STYLE);
         bool isPopup = WindowUtils::HasStyle(style, WS_POPUP);
-        bool hasThickFrame = WindowUtils::HasStyle(style, WS_THICKFRAME);
         bool hasCaption = WindowUtils::HasStyle(style, WS_CAPTION);
         bool hasMinimizeMaximizeButtons = WindowUtils::HasStyle(style, WS_MINIMIZEBOX) || WindowUtils::HasStyle(style, WS_MAXIMIZEBOX);
-        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
+
+        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
+
+        if (isPopup && !(hasCaption || hasMinimizeMaximizeButtons))
         {
             // popup windows we want to snap: e.g. Calculator, Telegram
             // popup windows we don't want to snap: start menu, notification popup, tray window, etc.

src/modules/Workspaces/workspaces-common/WindowUtils.h

@@ -121,4 +121,11 @@ namespace WindowUtils
 
         return std::wstring(title);
     }
+
+    
+    inline bool HasThickFrame(HWND window)
+    {
+        auto style = GetWindowLong(window, GWL_STYLE);
+        return WindowUtils::HasStyle(style, WS_THICKFRAME);
+    }
 }

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -2,6 +2,7 @@
 <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')" />
+  <Import Project="..\Microsoft.CmdPal.UI\CmdPal.pre.props" Condition="Exists('..\Microsoft.CmdPal.UI\CmdPal.pre.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -49,13 +50,20 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>
+        EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;
+        %(PreprocessorDefinitions);
+      </PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'">
+        IS_DEV_BRANDING;%(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
+
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />