remove the path

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
Fixes for the light switch module.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [x] Closes: #42878 + another bug that was discovered.
- [x] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,6 +58,7 @@ body:
       - Image Resizer
       - Installer
       - Keyboard Manager
+      - Light Switch
       - Mouse Utilities
       - Mouse Without Borders
       - New+

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -38,6 +38,7 @@ body:
     - Image Resizer
     - Installer
     - Keyboard Manager
+    - Light Switch
     - Mouse Utilities
     - Mouse Without Borders
     - New+

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

@@ -29,8 +29,6 @@ shortcutguide
 
 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy

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

@@ -121,6 +121,10 @@
 ^src/modules/MouseWithoutBorders/App/Helper/.*\.resx$
 ^src/modules/MouseWithoutBorders/ModuleInterface/generateSecurityDescriptor\.h$
 ^src/modules/peek/Peek.Common/NativeMethods\.txt$
+^src/modules/peek/Peek.UITests/TestAssets/4\.qoi$
+^src/modules/powerrename/PowerRenameUITest/testItems/folder1/testCase2\.txt$
+^src/modules/powerrename/PowerRenameUITest/testItems/folder2/SpecialCase\.txt$
+^src/modules/powerrename/PowerRenameUITest/testItems/testCase1\.txt$
 ^src/modules/previewpane/SvgPreviewHandler/SvgHTMLPreviewGenerator\.cs$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag\.txt$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$

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

@@ -26,8 +26,6 @@ ADMINS
 adml
 admx
 advancedpaste
-advancedpasteui
-advancedpasteuishortcut
 advapi
 advfirewall
 AFeature
@@ -45,7 +43,6 @@ ALLINPUT
 Allman
 Allmodule
 ALLOWUNDO
-allpc
 ALLVIEW
 ALPHATYPE
 AModifier
@@ -136,7 +133,6 @@ bla
 BLACKFRAME
 BLENDFUNCTION
 Blockquotes
-blogs
 Blt
 BLURBEHIND
 BLURREGION
@@ -512,7 +508,6 @@ FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
 fesf
-fff
 FFFF
 FILEEXPLORER
 fileexploreraddons
@@ -585,6 +580,7 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
+gitmodules
 GHND
 GMEM
 GNumber
@@ -672,11 +668,7 @@ Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
-hotkeylockmachine
-hotkeyreconnect
 hotkeys
-hotkeyswitch
-hotkeytoggleeasymouse
 hotlight
 hotspot
 HPAINTBUFFER
@@ -735,8 +727,6 @@ IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
-imagetotext
-imagetotextshortcut
 imagingdevices
 ime
 imgflip
@@ -868,7 +858,6 @@ localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKMACHINE
 LOCKTYPE
 LOGFONT
 LOGFONTW
@@ -877,7 +866,6 @@ LOGMSG
 LOGPIXELSX
 LOGPIXELSY
 lng
-LOn
 lon
 longdate
 LONGNAMES
@@ -929,12 +917,10 @@ luid
 LUMA
 lusrmgr
 LVal
-lvm
 LWA
 lwin
 LZero
 MAGTRANSFORM
-MAJORMINOR
 MAKEINTRESOURCE
 MAKEINTRESOURCEA
 MAKEINTRESOURCEW
@@ -959,7 +945,6 @@ MDL
 mdtext
 mdtxt
 mdwn
-measuretool
 meme
 memicmp
 MENUITEMINFO
@@ -1009,7 +994,6 @@ MOUSEHWHEEL
 MOUSEINPUT
 mousejump
 mousepointer
-mousepointercrosshairs
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
@@ -1054,7 +1038,6 @@ MWBEx
 MYICON
 NAMECHANGE
 namespaceanddescendants
-Namotion
 nao
 NCACTIVATE
 ncc
@@ -1092,7 +1075,6 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
-NJson
 NLog
 NLSTEXT
 NMAKE
@@ -1219,18 +1201,6 @@ PARENTRELATIVEFORUI
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pasteashtmlfile
-pasteashtmlfileshortcut
-pasteasjson
-pasteasjsonshortcut
-pasteasmarkdown
-pasteasmarkdownshortcut
-pasteasplaintext
-pasteasplaintextshortcut
-pasteaspngfile
-pasteaspngfileshortcut
-pasteastxtfile
-pasteastxtfileshortcut
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
@@ -1301,7 +1271,6 @@ Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
-powerocr
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1352,7 +1321,6 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
-projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1360,6 +1328,7 @@ PRTL
 prvpane
 psapi
 pscid
+pscustomobject
 PSECURITY
 psfgao
 psfi
@@ -1445,7 +1414,6 @@ Removelnk
 renamable
 RENAMEONCOLLISION
 reparented
-reparenthotkey
 reparenting
 reportfileaccesses
 requery
@@ -1471,7 +1439,6 @@ RIDEV
 RIGHTSCROLLBAR
 riid
 RKey
-Rns
 RNumber
 rop
 ROUNDSMALL
@@ -1695,7 +1662,6 @@ STYLECHANGED
 STYLECHANGING
 subkeys
 sublang
-Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
@@ -1768,7 +1734,6 @@ THICKFRAME
 THEMECHANGED
 THISCOMPONENT
 throughs
-thumbnailhotkey
 TILEDWINDOW
 TILLSON
 timedate
@@ -1784,9 +1749,7 @@ tlbimp
 tlc
 tmain
 TNP
-TOGGLEEASYMOUSE
 Toolhelp
-toolkitconverters
 toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
@@ -1798,11 +1761,9 @@ tracelogging
 tracerpt
 trackbar
 trafficmanager
-transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
-Tru
 trl
 trx
 tsa
@@ -1838,7 +1799,6 @@ ULONGLONG
 ums
 uncompilable
 UNCPRIORITY
-undefining
 UNDNAME
 UNICODETEXT
 unins
@@ -2005,6 +1965,7 @@ WMI
 WMICIM
 wmimgmt
 wmp
+wmsg
 WMSYSCOMMAND
 wnd
 WNDCLASS
@@ -2018,6 +1979,7 @@ WORKSPACESEDITOR
 WORKSPACESLAUNCHER
 WORKSPACESSNAPSHOTTOOL
 WORKSPACESWINDOWARRANGER
+Worktree
 wox
 wparam
 wpf

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

@@ -1,5 +1,10 @@
 # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
 
+# marker to ignore all code on line
+^.*/\* #no-spell-check-line \*/.*$
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
+
 # Gaelic
 Gàidhlig
 
@@ -264,3 +269,7 @@ St&yle
 # This matches a relative clause where the relative pronoun "that" is omitted.
 # Example: "Gets or sets the window the TitleBar should configure."
 \bthe\s+\w+\s+the\b
+
+# Usernames with numbers
+# 0x6f677548 is user name but user folder causes a flag
+\bx6f677548\b

.pipelines/ESRPSigning_installer.json

@@ -4,7 +4,6 @@
     "SignBatches": [
         {
             "MatchedPath": [
-                "PowerToysSetupCustomActions.dll",
                 "PowerToysSetupCustomActionsVNext.dll",
                 "SilentFilesInUseBAFunction.dll",
                 "PowerToys*Setup-*.exe",

.pipelines/installWiX.ps1

@@ -1,26 +0,0 @@
-$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/v2/release.yml

@@ -20,11 +20,6 @@ parameters:
     type: string
     default: '0.0.1'
 
-  - name: installerSuffix
-    type: string
-    displayName: "WiX5 installer suffix (e.g., 'wix5', 'vnext', etc.)"
-    default: "wix5"
-
   - name: buildConfigurations
     displayName: "Build Configurations"
     type: object
@@ -78,10 +73,11 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-                ${{ else }}:
-                  image: SHINE-VS17-Latest
+                demands:
+                  # Our INT agents have a large disk mounted at P:\
+                  - WorkFolder -equals P:\_work
+                  - ${{ if eq(parameters.useVSPreview, true) }}:
+                    - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
@@ -104,8 +100,7 @@ extends:
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
-              installerSuffix: ${{ parameters.installerSuffix }}
-              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:InstallerSuffix=${{ parameters.installerSuffix }}  /p:EnableCmdPalAOT=true
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=true
               beforeBuildSteps:
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-

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

@@ -65,9 +65,6 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
-  - name: installerSuffix
-    type: string
-    default: "wix5"
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -240,9 +237,7 @@ jobs:
       parameters:
         directory: $(build.sourcesdirectory)\src\modules\cmdpal
 
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
-    displayName: Download and install WiX 3.14 development build
+
 
   - ${{ parameters.beforeBuildSteps }}
 
@@ -274,7 +269,7 @@ jobs:
   # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
   - task: VSBuild@1
     displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
-    condition: ne(variables['BuildPlatform'], 'x64')
+    condition: and(succeeded(), ne(variables['BuildPlatform'], 'x64'))
     inputs:
       solution: src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
       msbuildArgs: /t:Build /m /restore
@@ -508,20 +503,7 @@ jobs:
       Copy-Item -Verbose -Force "$(CmdPalPackagePath)" "$(JobOutputDirectory)"
     displayName: Stage the final CmdPal package
 
-  - template: steps-build-installer.yml
-    parameters:
-      codeSign: ${{ parameters.codeSign }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      versionNumber: ${{ parameters.versionNumber }}
-      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
 
-  - template: steps-build-installer.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
 
   - template: steps-build-installer-vnext.yml
     parameters:
@@ -529,7 +511,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
 
   - template: steps-build-installer-vnext.yml
     parameters:
@@ -537,7 +518,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
       buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
 
   # This saves ~1GiB per architecture. We won't need these later.
@@ -564,29 +544,29 @@ jobs:
       flattenFolders: True
       targetFolder: $(JobOutputDirectory)
 
-  - task: CopyFiles@2
-    displayName: Stage Symbols
-    inputs:
-      contents: |-
-        **\*.pdb
-        !**\vc143.pdb
-        !**\*test*.pdb
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/symbols-$(BuildPlatform)/
+  - pwsh: |-
+      $Symbols = Get-ChildItem "$(BuildPlatform)" -Recurse -Filter *.pdb -Exclude "vc143.pdb","*test*.pdb" |
+          Group-Object Name | ForEach-Object { $_.Group[0] }
+      $OutDir = "$(JobOutputDirectory)/symbols-$(BuildPlatform)"
+      New-Item -Type Directory $OutDir -EA:Ignore
+      Write-Host "Linking $($Symbols.Length) symbols into place at $OutDir"
+      ForEach($s in $Symbols) {
+        New-Item -Type HardLink -Target $s.FullName (Join-Path $OutDir $s.Name)
+      }
+    displayName: Stage Unique Symbols (as hard links)
 
   - pwsh: |-
       $p = "$(JobOutputDirectory)\"
-      $installerSuffix = "${{ parameters.installerSuffix }}"
       
-      # Calculate hashes for regular installers (without custom suffix)
-      $userSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" }
-      $machineSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" -and $_.Name -notmatch "PowerToysUserSetup" }
+      # Calculate hashes for installers
+      $userSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*.exe"
+      $machineSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*.exe" | Where-Object { $_.Name -notmatch "PowerToysUserSetup" }
       
       if ($userSetupFiles.Count -gt 0) {
           $userHash = ($userSetupFiles[0] | Get-FileHash).Hash;
           $userPlat = "hash_user_$(BuildPlatform).txt";
           $combinedUserPath = $p + $userPlat;
-          echo "Regular User: $userHash"
+          echo "User: $userHash"
           $userHash | out-file -filepath $combinedUserPath
       }
       
@@ -594,48 +574,37 @@ jobs:
           $machineHash = ($machineSetupFiles[0] | Get-FileHash).Hash;
           $machinePlat = "hash_machine_$(BuildPlatform).txt";
           $combinedMachinePath = $p + $machinePlat;
-          echo "Regular Machine: $machineHash"
+          echo "Machine: $machineHash"
           $machineHash | out-file -filepath $combinedMachinePath
       }
-      
-      # Calculate hashes for VNext installers (with custom suffix)
-      $userVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*-$installerSuffix-*.exe"
-      $machineVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*-$installerSuffix-*.exe" | Where-Object { $_.Name -notmatch "PowerToysUserSetup" }
-      
-      if ($userVNextFiles.Count -gt 0) {
-          $userVNextHash = ($userVNextFiles[0] | Get-FileHash).Hash;
-          $userVNextPlat = "hash_user_vnext_$(BuildPlatform).txt";
-          $combinedUserVNextPath = $p + $userVNextPlat;
-          echo "VNext User: $userVNextHash"
-          $userVNextHash | out-file -filepath $combinedUserVNextPath
-      }
-      
-      if ($machineVNextFiles.Count -gt 0) {
-          $machineVNextHash = ($machineVNextFiles[0] | Get-FileHash).Hash;
-          $machineVNextPlat = "hash_machine_vnext_$(BuildPlatform).txt";
-          $combinedMachineVNextPath = $p + $machineVNextPlat;
-          echo "VNext Machine: $machineVNextHash"
-          $machineVNextHash | out-file -filepath $combinedMachineVNextPath
-      }
     displayName: Calculate file hashes for all installers
 
   # Publishing the GPO files
   - pwsh: |-
-      New-Item "$(JobOutputDirectory)/gpo" -Type Directory
-      Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
+      $GpoArchive = "$(JobOutputDirectory)\GroupPolicyObjectFiles-${{ parameters.versionNumber }}.zip"
+      tar -c -v --format=zip -C .\src\gpo\assets -f $GpoArchive *
     displayName: Stage GPO files
 
-  # Running the tests may result in future jobs consuming artifacts out of this build
   - ${{ if or(eq(parameters.runTests, true), eq(parameters.buildTests, true)) }}:
-    - task: CopyFiles@2
-      displayName: Stage entire build output
-      inputs:
-        sourceFolder: '$(Build.SourcesDirectory)'
-        contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
-        targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    # Running the tests may result in future jobs consuming artifacts out of this build
+    # Instead of running an expensive file copy step, move everything over since the build is totally done.
+    - pwsh: |-
+        # It seems weird, but this is for compatibility. Our artifacts historically contained the folder x64/Release/x64/Release (for example).
+        $FinalOutputRoot = "$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)\$(BuildPlatform)"
+        $ProjectBuildRoot = "$(Build.SourcesDirectory)\$(BuildPlatform)"
+        $ProjectBuildDirectory = "$ProjectBuildRoot\$(BuildConfiguration)"
+
+        New-Item -Type Directory $FinalOutputRoot -EA:Ignore
+        Move-Item $ProjectBuildDirectory $FinalOutputRoot
+      displayName: Move entire output directory into artifacts
 
   - ${{ if eq(parameters.publishArtifacts, true) }}:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)
       displayName: Publish all outputs
-      condition: always()
+      condition: succeeded()
+
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
+      displayName: Publish failure logs
+      condition: or(failed(), canceled())

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

@@ -14,9 +14,6 @@ parameters:
   - name: additionalBuildOptions
     type: string
     default: ''
-  - name: installerSuffix
-    type: string
-    default: "wix5"
 
 steps:
   # Install WiX 5.0.2 tools needed for VNext installer (matching project SDK)
@@ -41,10 +38,10 @@ steps:
       # VNext bundle folder; base name intentionally omits the VNext suffix
       $InstallerFolder = 'PowerToysSetupVNext'
       if ($IsPerUser) {
-        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
+        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
       }
       else {
-        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
+        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
       }
 
       # Export variables for downstream steps
@@ -63,7 +60,6 @@ steps:
       msbuildArgs: >-
         /t:PowerToysSetupCustomActionsVNext
         /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         -restore -graph
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
         ${{ parameters.additionalBuildOptions }}
@@ -95,7 +91,6 @@ steps:
         -restore
         /t:PowerToysInstallerVNext
         /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
@@ -142,7 +137,6 @@ steps:
       msbuildArgs: >-
         /t:SilentFilesInUseBAFunction
         /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         -restore -graph
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-SilentFilesInUseBAFunction.binlog
         ${{ parameters.additionalBuildOptions }}
@@ -175,7 +169,6 @@ steps:
         -restore
         /t:PowerToysBootstrapperVNext
         /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
         -restore -graph
         ${{ parameters.additionalBuildOptions }}

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

@@ -1,208 +0,0 @@
-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 = "PowerToysSetup"
-      If($IsPerUser) {
-        $InstallerBuildSlug = "UserSetup"
-        $InstallerBasename = "PowerToysUserSetup"
-      }
-      $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 PowerToysSetupCustomActions
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysSetupCustomActions
-        /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 PowerToysSetupCustomActions
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetupCustomActions/$(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 MSI
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        -restore
-        /t:PowerToysInstaller
-        /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\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).msi
-      dir $(build.sourcesdirectory)\extractedMsi
-    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
-
-  # Extract CmdPal msix package to check if its content is signed
-  - pwsh: |-
-      Write-Host "Extracting CmdPal MSIX package"
-
-      # Define the directory to search
-      $searchDir = "extractedMsi\File"
-
-      # Define the regex pattern for MSIX files
-      $pattern = '^Microsoft.CmdPal.UI.*\.msix$'
-
-      # Get all files in the directory and subdirectories
-      $msixFile = Get-ChildItem -Path $searchDir -Recurse -File | Where-Object {
-          $_.Name -match $pattern
-      }
-
-      Write-Host "MSIX file found: " $msixFile
-
-      $destinationDir = "$(build.sourcesdirectory)\extractedMsi\File\extractedCmdPalMsix"
-
-      Expand-Archive -Path $msixFile -DestinationPath $destinationDir
-      Get-ChildItem -Path $destinationDir -Recurse -File
-
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract CmdPal MSIX package
-
-  # 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 MSI
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetup/$(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 Bootstrapper
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysBootstrapper
-        /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\PowerToysSetup\$(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\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetup\$(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/PowerToysSetup/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END BOOTSTRAP
-  ## END INSTALLER

Directory.Packages.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -9,6 +9,7 @@
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
@@ -39,21 +40,12 @@
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Amazon" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" Version="1.66.0-beta" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.HuggingFace" Version="1.66.0-preview" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- 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. -->
@@ -80,7 +72,7 @@
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
-    <PackageVersion Include="OpenAI" Version="2.5.0" />
+    <PackageVersion Include="OpenAI" Version="2.0.0" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />

NOTICE.md

@@ -1495,6 +1495,7 @@ SOFTWARE.
 - AdaptiveCards.Rendering.WinUI3
 - AdaptiveCards.Templating
 - Appium.WebDriver
+- Azure.AI.OpenAI
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock

PowerToys.sln

@@ -825,7 +825,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightSwitch.UITests", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj", "{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageModelProvider", "src\common\LanguageModelProvider\LanguageModelProvider.csproj", "{45354F4F-1414-45CE-B600-51CD1209FD19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UI.ViewModels.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.UI.ViewModels.UnitTests\Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj", "{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2997,14 +2997,14 @@ Global
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.Build.0 = Release|ARM64
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.ActiveCfg = Release|x64
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.Build.0 = Release|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.Build.0 = Debug|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.ActiveCfg = Debug|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.Build.0 = Debug|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.ActiveCfg = Release|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.Build.0 = Release|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.ActiveCfg = Release|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.Build.0 = Release|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|x64.ActiveCfg = Debug|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|x64.Build.0 = Debug|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|ARM64.Build.0 = Release|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.ActiveCfg = Release|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3333,7 +3333,7 @@ Global
 		{3DCCD936-D085-4869-A1DE-CA6A64152C94} = {5B201255-53C8-490B-A34F-01F05D48A477}
 		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F} = {3DCCD936-D085-4869-A1DE-CA6A64152C94}
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{45354F4F-1414-45CE-B600-51CD1209FD19} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/devdocs/core/installer.md

@@ -1,6 +1,6 @@
 # PowerToys Installer
 
-## Installer Architecture (WiX 3/ WiX 5)
+## Installer Architecture (WiX 5)
 
 - Uses a bootstrapper to check dependencies and close PowerToys
 - MSI defined in product.wxs
@@ -22,7 +22,7 @@
 
 ### MSI Installer Build Process
 
-- First builds `PowerToysSetupCustomActions` DLL and signs it, for WiX5 project, installer will build `PowerToysSetupCustomActionsVNext` DLL.
+- First builds `PowerToysSetupCustomActionsVNext` DLL and signs it
 - Then builds the installer without cleaning, to reuse the signed DLL
 - Uses PowerShell scripts to modify .wxs files before build
 - Restores original .wxs files after build completes
@@ -96,9 +96,14 @@ The following manual steps will not install the MSIX apps (such as Command Palet
 
 #### Prerequisites for building the MSI installer
 
-1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
-1. Install the [WiX Toolset build tools](https://github.com/wixtoolset/wix3/releases/tag/wix3141rtm). (installer [direct link](https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe))
-1. Download [WiX binaries](https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip) and extract `wix.targets` to `C:\Program Files (x86)\WiX Toolset v3.14`.
+PowerToys uses WiX v5 for creating installers. The WiX v5 tools are automatically installed during the build process via dotnet tool.
+
+For manual installation of WiX v5 tools:
+```powershell
+dotnet tool install --global wix --version 5.0.2
+```
+
+> **Note:** As of release 0.94, PowerToys has migrated from WiX v3 to WiX v5. The WiX v3 toolset is no longer required.
 
 #### Building prerequisite projects
 
@@ -133,17 +138,9 @@ If you prefer, you can alternatively build prerequisite projects for the install
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu choose `Build Solution`.
 
-The resulting `PowerToysSetup.msi` installer will be available in the `installer\PowerToysSetup\x64\Release\` folder.
+The resulting installer will be available in the `installer\PowerToysSetupVNext\x64\Release\` folder.
 
-For WiX3 project, run `Developer Command Prompt for VS 2022` in admin mode and execute the following command to build the installer. The generated installer package will be located at `\installer\PowerToysSetup\{platform}\Release\MachineSetup`.
-
-```
-git clean -xfd  -e *exe -- .\installer\
-MSBuild -t:restore  .\installer\PowerToysSetup.sln -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
-MSBuild -m .\installer\PowerToysSetup.sln /t:PowerToysInstaller /p:Configuration=Release /p:Platform="x64" 
-MSBuild -m .\installer\PowerToysSetup.sln /t:PowerToysBootstrapper /p:Configuration=Release /p:Platform="x64" 
-```
-For WiX5 project, run `Developer Command Prompt for VS 2022` in admin mode and execute the following command to build the installer. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
+To build the installer from the command line, run `Developer Command Prompt for VS 2022` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
 
 ```
 git clean -xfd  -e *exe -- .\installer\

installer/PowerToysSetup.sln

@@ -2,16 +2,10 @@
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysInstaller", "PowerToysSetup\PowerToysInstaller.wixproj", "{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToysSetupCustomActions", "PowerToysSetupCustomActions\PowerToysSetupCustomActions.vcxproj", "{32F3882B-F2D6-4586-B5ED-11E39E522BD3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "..\src\common\logger\logger.vcxproj", "{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysBootstrapper", "PowerToysSetup\PowerToysBootstrapper.wixproj", "{31D72625-43C1-41B1-B784-BCE4A8DC5543}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
@@ -32,21 +26,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.ActiveCfg = Debug|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.Build.0 = Debug|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.Build.0 = Release|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.ActiveCfg = Release|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.Build.0 = Release|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.ActiveCfg = Debug|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.Build.0 = Debug|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.Build.0 = Release|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.ActiveCfg = Release|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.Build.0 = Release|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
@@ -61,14 +40,6 @@ Global
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|ARM64
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.ActiveCfg = Release|x64
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.Build.0 = Release|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.Build.0 = Debug|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.ActiveCfg = Debug|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.Build.0 = Debug|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.ActiveCfg = Release|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.Build.0 = Release|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.ActiveCfg = Release|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.Build.0 = Release|x64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.ActiveCfg = Debug|x64

installer/PowerToysSetup/AdvancedPaste.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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/PowerToysSetup/Awake.wxs

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/BaseApplications.wxs

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

installer/PowerToysSetup/CmdPal.wxs

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPal\"?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
-      <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
-        <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_arm64.msix" />
-        <?endif ?>
-
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="CmdPalComponentGroup">
-      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="Module_CmdPal" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/ColorPicker.wxs

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/Common.wxi

@@ -1,58 +0,0 @@
-<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="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
-        <?define DefaultInstallDir="LocalAppDataFolder" ?>
-        <?define RegistryScope="HKCU" ?>
-        <?define InstallScope="perUser" ?>
-        <?define InstallPrivileges="limited" ?>
-        <?define UpgradeCodeGUID="D8B559DB-4C98-487A-A33F-50A8EEE42726" ?>
-   <?else?>
-        <?define PerMachineYesNo="yes"?>
-        <?define MSIPath="MachineSetup"?>
-        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
-        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
-        <?define RegistryScope="HKLM" ?>
-        <?define InstallScope="perMachine" ?>
-        <?define InstallPrivileges="elevated" ?>
-        <?define UpgradeCodeGUID="42B84BF7-5FBF-473B-9C8B-049DC16F7708" ?>
-  <?endif?>
-
-  <?define BinX32Dir="$(var.RepoDir)x86\$(var.Configuration)\" ?>
-</Include>

installer/PowerToysSetup/Core.wxs

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="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/PowerToysSetup/CustomDialogs/PTInstallDirDlg.wxs

@@ -1,29 +0,0 @@
-<?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/PowerToysSetup/CustomDialogs/PTLicenseDlg.wxs

@@ -1,29 +0,0 @@
-<?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/PowerToysSetup/CustomDialogs/WixUI_PTInstallDir.wxs

@@ -1,78 +0,0 @@
-<?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/PowerToysSetup/EnvironmentVariables.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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/PowerToysSetup/FileExplorerPreview.wxs

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/FileLocksmith.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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-->
-    </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>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/Hosts.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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/PowerToysSetup/ImageResizer.wxs

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define ImageResizerAssetsFiles=?>
-  <?define ImageResizerAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ImageResizer\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="ImageResizerAssetsFolder" Name="ImageResizer" />
-    </DirectoryRef>
-
-    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ImageResizerAssetsFiles_Component_Def-->
-
-    </DirectoryRef>
-
-    <ComponentGroup Id="ImageResizerComponentGroup">
-      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="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>
-    </ComponentGroup>
-  </Fragment>
-</Wix>

installer/PowerToysSetup/KeyboardManager.wxs

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="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/PowerToysSetup/MouseWithoutBorders.wxs

@@ -1,20 +0,0 @@
-<?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/PowerToysSetup/NewPlus.wxs

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-   <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-   <?define 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-->
-      </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>
-    </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/PowerToysSetup/Peek.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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/PowerToysSetup/PowerRename.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?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-->
-    </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>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/PowerToys.wxs

@@ -1,92 +0,0 @@
-<?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\PowerToysSetup\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/PowerToysSetup/PowerToysBootstrapper.wixproj

@@ -1,93 +0,0 @@
-<?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="..\wix.props" Condition="Exists('..\wix.props')" />
-
-  <PropertyGroup>
-    <DefineConstants>Version=$(Version)</DefineConstants>
-    <Name>PowerToysBootstrapper</Name>
-    <ProjectGuid>{31d72625-43c1-41b1-b784-bce4a8dc5543}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=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>PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputType>Bundle</OutputType>
-    <SuppressAclReset>True</SuppressAclReset>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
-    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
-    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <NuGetPackageImportStamp />
-  </PropertyGroup>
-  <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 v3 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('..\wix.props')"
-      Text="$([System.String]::Format('$(ErrorText)', '..\wix.props'))" />
-  </Target>
-
-  <!-- Prevents NU1503 -->
-  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
-    <ItemGroup>
-      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="Restore" />
-</Project>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -1,204 +0,0 @@
-<?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="..\..\src\CmdPalVersion.props" Condition="Exists('..\..\src\CmdPalVersion.props')" />
-  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
-  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</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"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);</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"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
-    </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 ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.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>
-    <Name>PowerToysInstaller</Name>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We do not support debug installer builds -->
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform>$(Platform)</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>022a9d30-7c4f-416d-a9df-5ff2661cc0ad</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
-    <OutputType>Package</OutputType>
-    <SuppressAclReset>True</SuppressAclReset>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <!-- 1076 and ICE91 - warning: using this configuration for perMachine install could cause problems. -->
-    <!-- 1026 - warning: file ID is too long -->
-    <SuppressIces>ICE91</SuppressIces>
-    <SuppressSpecificWarnings>1026;1076</SuppressSpecificWarnings>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutputPath 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="CmdPal.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="DscResources.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="..\PowerToysSetupCustomActions\PowerToysSetupCustomActions.vcxproj">
-      <Name>PowerToysSetupCustomActions</Name>
-      <Project>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</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 v3 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('..\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\wix.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/PowerToysSetup/Product.wxs

@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- 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="DscResourcesComponentGroup" />
-      <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
-      <ComponentGroupRef Id="ToolComponentGroup" />
-      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
-      <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
-    </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="SetInstallCmdPalPackageParam" Before="InstallCmdPalPackage" />
-      <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="InstallCmdPalPackage" 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="CleanImageResizerRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanFileLocksmithRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanPowerRenameRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanNewPlusRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) 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="SetInstallCmdPalPackageParam"
-                    Property="InstallCmdPalPackage"
-                    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="CleanImageResizerRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanImageResizerRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanFileLocksmithRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanFileLocksmithRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanPowerRenameRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanPowerRenameRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanNewPlusRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanNewPlusRuntimeRegistryCA"
-                  />
-
-    <CustomAction Id="UnRegisterCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UnRegisterCmdPalPackageCA"
-                  />
-
-    <CustomAction Id="CheckGPO"
-                  Return="check"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CheckGPOCA"
-                  />
-
-    <CustomAction Id="InstallCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallCmdPalPackageCA"
-                  />
-
-    <!-- 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.PowerToysSetupCustomActions.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/PowerToysSetup/RegistryPreview.wxs

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/Resources.wxs

@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- 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;WinUI3AppsInstallFolder;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)WinUI3AppsInstallFolder"
-          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)\WinUI3Apps\$(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>
-      <Component
-          Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)22">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="BgcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.BgcodePreviewHandler.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"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
-      <?undef IdSafeLanguage?>
-        <?endforeach?>
-      </Component>
-    <?endif?>
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>

installer/PowerToysSetup/Run.wxs

@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/Settings.wxs

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/ShortcutGuide.wxs

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/Tools.wxs

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <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/PowerToysSetup/WinAppSDK.wxs

@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- 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/PowerToysSetup/WinUI3Applications.wxs

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

installer/PowerToysSetup/Workspaces.wxs

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define 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/PowerToysSetup/generateAllFileComponents.ps1

@@ -1,323 +0,0 @@
-[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\WinUI3Apps\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/PowerToysSetup/generateMonacoWxs.ps1

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

installer/PowerToysSetup/packages.config

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

installer/PowerToysSetup/publish.cmd

@@ -1,17 +0,0 @@
-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 -p:TargetFramework=net9.0-windows10.0.26100.0
-
-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 -p:TargetFramework=net9.0-windows10.0.26100.0
-
-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 -p:TargetFramework=net9.0-windows10.0.26100.0
-
-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 -p:TargetFramework=net9.0-windows10.0.26100.0

installer/PowerToysSetup/terminate_powertoys.cmd

@@ -1,12 +0,0 @@
-@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/PowerToysSetupCustomActions/CustomAction.def

@@ -1,34 +0,0 @@
-LIBRARY "PowerToysSetupCustomActions"
-
-EXPORTS
-	LaunchPowerToysCA
-	CheckGPOCA
-	CleanVideoConferenceRegistryCA
-	ApplyModulesRegistryChangeSetsCA
-	DetectPrevInstallPathCA
-	RemoveScheduledTasksCA
-	TelemetryLogInstallSuccessCA
-	TelemetryLogInstallCancelCA
-	TelemetryLogInstallFailCA
-	TelemetryLogUninstallSuccessCA
-	TelemetryLogUninstallCancelCA
-	TelemetryLogUninstallFailCA
-	TelemetryLogRepairCancelCA
-	TelemetryLogRepairFailCA
-	TerminateProcessesCA
-	InstallEmbeddedMSIXCA
-	InstallDSCModuleCA
-	InstallCmdPalPackageCA
-	UnApplyModulesRegistryChangeSetsCA
-	UnRegisterCmdPalPackageCA
-	UnRegisterContextMenuPackagesCA
-	UninstallEmbeddedMSIXCA
-	UninstallDSCModuleCA
-	UninstallServicesCA
-	UninstallCommandNotFoundModuleCA
-	UpgradeCommandNotFoundModuleCA
-	UnsetAdvancedPasteAPIKeyCA
-	CleanImageResizerRuntimeRegistryCA
-	CleanFileLocksmithRuntimeRegistryCA
-	CleanPowerRenameRuntimeRegistryCA
-	CleanNewPlusRuntimeRegistryCA

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -1,180 +0,0 @@
-<?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>PowerToysSetupCustomActions</RootNamespace>
-    <ProjectName>PowerToysSetupCustomActions</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)..\PowerToysSetup\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Resources.wxs"" ""$(ProjectDir)..\PowerToysSetup\Resources.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Run.wxs"" ""$(ProjectDir)..\PowerToysSetup\Run.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetup\Settings.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetup\Tools.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs.bk""""
-      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 for WiX3 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/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj.filters

@@ -1,31 +0,0 @@
-<?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/PowerToysSetupCustomActions/RcResource.h

@@ -1,63 +0,0 @@
-#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/PowerToysSetupCustomActions/Resource.rc

@@ -1,96 +0,0 @@
-// 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/PowerToysSetupCustomActions/packages.config

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

installer/PowerToysSetupCustomActions/pch.cpp

@@ -1,5 +0,0 @@
-// 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/PowerToysSetupCustomActions/pch.h

@@ -1,37 +0,0 @@
-#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/PowerToysSetupCustomActions/resource.h

@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Resource.rc
-
-#define FILE_DESCRIPTION "PowerToys Setup Custom Actions"
-#define INTERNAL_NAME "PowerToysSetupCustomActions"
-#define ORIGINAL_FILENAME "PowerToysSetupCustomActions.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/Common.wxi

@@ -37,7 +37,7 @@
   <?if $(var.PerUser) = "true"?>
         <?define PerMachineYesNo="no"?>
         <?define MSIPath="UserSetup"?>
-        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="LocalAppDataFolder" ?>
         <?define RegistryScope="HKCU" ?>
         <?define InstallScope="perUser" ?>
@@ -46,7 +46,7 @@
    <?else?>
         <?define PerMachineYesNo="yes"?>
         <?define MSIPath="MachineSetup"?>
-        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="ProgramFiles64Folder" ?>
         <?define RegistryScope="HKLM" ?>
         <?define InstallScope="perMachine" ?>

installer/PowerToysSetupVNext/Core.wxs

@@ -9,25 +9,6 @@
           <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
         </RegistryKey>
       </Component>
-      <?if $(var.PerUser) = "true" ?>
-      <Component Id="powertoys_env_path_user" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to current user's PATH -->
-        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?else?>
-      <Component Id="powertoys_env_path_machine" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to machine PATH -->
-        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
         <RemoveFolder Id="Remove_powertoys_toast_clsid" On="uninstall" />
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
@@ -128,11 +109,6 @@
       <ComponentRef Id="powertoys_exe" />
       <ComponentRef Id="PowerToysStartMenuShortcut" />
       <ComponentRef Id="powertoys_per_machine_comp" />
-  <?if $(var.PerUser) = "true" ?>
-  <ComponentRef Id="powertoys_env_path_user" />
-  <?else?>
-  <ComponentRef Id="powertoys_env_path_machine" />
-  <?endif?>
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />

installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj

@@ -3,7 +3,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>Version=$(Version);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version)</DefineConstants>
     <Name>PowerToysVNextBootstrapper</Name>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
@@ -22,12 +22,11 @@
     <Configuration>Release</Configuration>
     <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
     <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName>PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Bundle</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
     <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
     <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
     <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">$(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -4,7 +4,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
+  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</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. -->
@@ -18,7 +18,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</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)\..
@@ -80,9 +80,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
     <NuGetPackageImportStamp>

installer/wix.props

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

nuget.config

@@ -2,17 +2,9 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
-		<packageSource key="nuget.org">
-            <package pattern="Microsoft.SemanticKernel*" />
-            <package pattern="Microsoft.Extensions.*" />
-            <package pattern="System.*" />
-            <package pattern="OpenAI" />
-            <package pattern="Azure.*" />
-        </packageSource>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>

src/common/LanguageModelProvider/AppUtils.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider;
-
-internal static class AppUtils
-{
-    public static string GetThemeAssetSuffix()
-    {
-        // Default suffix for assets that are theme-agnostic today.
-        return string.Empty;
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryCatalogModel.cs

@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record FoundryCatalogModel
-{
-    [JsonPropertyName("name")]
-    public string Name { get; init; } = string.Empty;
-
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; init; } = string.Empty;
-
-    [JsonPropertyName("providerType")]
-    public string ProviderType { get; init; } = string.Empty;
-
-    [JsonPropertyName("uri")]
-    public string Uri { get; init; } = string.Empty;
-
-    [JsonPropertyName("version")]
-    public string Version { get; init; } = string.Empty;
-
-    [JsonPropertyName("modelType")]
-    public string ModelType { get; init; } = string.Empty;
-
-    [JsonPropertyName("promptTemplate")]
-    public PromptTemplate PromptTemplate { get; init; } = default!;
-
-    [JsonPropertyName("publisher")]
-    public string Publisher { get; init; } = string.Empty;
-
-    [JsonPropertyName("task")]
-    public string Task { get; init; } = string.Empty;
-
-    [JsonPropertyName("runtime")]
-    public Runtime Runtime { get; init; } = default!;
-
-    [JsonPropertyName("fileSizeMb")]
-    public long FileSizeMb { get; init; }
-
-    [JsonPropertyName("modelSettings")]
-    public ModelSettings ModelSettings { get; init; } = default!;
-
-    [JsonPropertyName("alias")]
-    public string Alias { get; init; } = string.Empty;
-
-    [JsonPropertyName("supportsToolCalling")]
-    public bool SupportsToolCalling { get; init; }
-
-    [JsonPropertyName("license")]
-    public string License { get; init; } = string.Empty;
-
-    [JsonPropertyName("licenseDescription")]
-    public string LicenseDescription { get; init; } = string.Empty;
-
-    [JsonPropertyName("parentModelUri")]
-    public string ParentModelUri { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs

@@ -1,229 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Globalization;
-using System.Text;
-using System.Text.Json;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryClient
-{
-    public static async Task<FoundryClient?> CreateAsync()
-    {
-        var serviceManager = FoundryServiceManager.TryCreate();
-        if (serviceManager is null)
-        {
-            return null;
-        }
-
-        if (!await serviceManager.IsRunning().ConfigureAwait(false))
-        {
-            if (!await serviceManager.StartService().ConfigureAwait(false))
-            {
-                return null;
-            }
-        }
-
-        var serviceUrl = await serviceManager.GetServiceUrl().ConfigureAwait(false);
-
-        if (string.IsNullOrEmpty(serviceUrl))
-        {
-            return null;
-        }
-
-        var serviceUri = new Uri(serviceUrl, UriKind.Absolute);
-        var baseAddress = serviceUri.AbsoluteUri.EndsWith('/')
-            ? serviceUri
-            : new Uri(serviceUri, "/");
-
-        var httpClient = new HttpClient
-        {
-            BaseAddress = baseAddress,
-            Timeout = TimeSpan.FromHours(2),
-        };
-
-        var assemblyVersion = typeof(FoundryClient).Assembly.GetName().Version?.ToString() ?? "unknown";
-        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd($"foundry-local-cs-sdk/{assemblyVersion}");
-
-        return new FoundryClient(serviceManager, httpClient);
-    }
-
-    public FoundryServiceManager ServiceManager { get; }
-
-    private readonly HttpClient _httpClient;
-    private readonly List<FoundryCatalogModel> _catalogModels = [];
-
-    private FoundryClient(FoundryServiceManager serviceManager, HttpClient httpClient)
-    {
-        ServiceManager = serviceManager;
-        _httpClient = httpClient;
-    }
-
-    public async Task<List<FoundryCatalogModel>> ListCatalogModels()
-    {
-        if (_catalogModels.Count > 0)
-        {
-            return _catalogModels;
-        }
-
-        try
-        {
-            var response = await _httpClient.GetAsync("/foundry/list").ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-
-            var models = await JsonSerializer.DeserializeAsync(
-                response.Content.ReadAsStream(),
-                FoundryJsonContext.Default.ListFoundryCatalogModel).ConfigureAwait(false);
-
-            if (models is { Count: > 0 })
-            {
-                models.ForEach(_catalogModels.Add);
-            }
-        }
-        catch
-        {
-            // Surfacing errors here prevents listing other providers; swallow and return cached list instead.
-        }
-
-        return _catalogModels;
-    }
-
-    public async Task<List<FoundryCachedModel>> ListCachedModels()
-    {
-        var response = await _httpClient.GetAsync("/openai/models").ConfigureAwait(false);
-        response.EnsureSuccessStatusCode();
-
-        var catalogModels = await ListCatalogModels().ConfigureAwait(false);
-
-        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-        var modelIds = content
-            .Trim('[', ']')
-            .Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
-            .Select(id => id.Trim('"'));
-
-        List<FoundryCachedModel> models = [];
-
-        foreach (var id in modelIds)
-        {
-            var model = catalogModels.FirstOrDefault(m => m.Name == id);
-            models.Add(model != null ? new FoundryCachedModel(id, model.Alias) : new FoundryCachedModel(id, null));
-        }
-
-        return models;
-    }
-
-    public async Task<FoundryDownloadResult> DownloadModel(FoundryCatalogModel model, IProgress<float>? progress, CancellationToken cancellationToken = default)
-    {
-        var models = await ListCachedModels().ConfigureAwait(false);
-
-        if (models.Any(m => m.Name == model.Name))
-        {
-            return new(true, "Model already downloaded");
-        }
-
-        return await Task.Run(
-            async () =>
-            {
-                try
-                {
-                    var providerType = model.ProviderType.EndsWith("Local", StringComparison.OrdinalIgnoreCase)
-                        ? model.ProviderType
-                        : $"{model.ProviderType}Local";
-
-                    var downloadRequest = new FoundryDownloadBody
-                    {
-                        Model = new FoundryModelDownload
-                        {
-                            Name = model.Name,
-                            Uri = model.Uri,
-                            Publisher = model.Publisher,
-                            ProviderType = providerType,
-                            PromptTemplate = model.PromptTemplate,
-                        },
-                        Token = string.Empty,
-                        IgnorePipeReport = true,
-                    };
-
-                    var downloadBodyContext = FoundryJsonContext.Default.FoundryDownloadBody;
-                    string body = JsonSerializer.Serialize(downloadRequest, downloadBodyContext);
-
-                    using var request = new HttpRequestMessage(HttpMethod.Post, "/openai/download")
-                    {
-                        Content = new StringContent(body, Encoding.UTF8, "application/json"),
-                    };
-
-                    using var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-
-                    response.EnsureSuccessStatusCode();
-
-                    using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-                    using var reader = new StreamReader(stream);
-
-                    StringBuilder jsonBuilder = new();
-                    var collectingJson = false;
-                    var completed = false;
-
-                    while (!completed && (await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) is string line)
-                    {
-                        if (string.IsNullOrWhiteSpace(line))
-                        {
-                            continue;
-                        }
-
-                        if (line.StartsWith("Total", StringComparison.CurrentCultureIgnoreCase) &&
-                            line.Contains("Downloading", StringComparison.OrdinalIgnoreCase) &&
-                            line.Contains('%'))
-                        {
-                            var percentStr = line.Split('%')[0].Split(' ').Last();
-                            if (double.TryParse(percentStr, NumberStyles.Float, CultureInfo.CurrentCulture, out var percentage))
-                            {
-                                progress?.Report((float)(percentage / 100));
-                            }
-                        }
-                        else if (line.Contains("[DONE]", StringComparison.OrdinalIgnoreCase) ||
-                                 line.Contains("All Completed", StringComparison.OrdinalIgnoreCase))
-                        {
-                            collectingJson = true;
-                        }
-                        else if (collectingJson && line.TrimStart().StartsWith('{'))
-                        {
-                            jsonBuilder.AppendLine(line);
-                        }
-                        else if (collectingJson && jsonBuilder.Length > 0)
-                        {
-                            jsonBuilder.AppendLine(line);
-                            if (line.Trim() == "}")
-                            {
-                                completed = true;
-                            }
-                        }
-                    }
-
-                    var downloadResultContext = FoundryJsonContext.Default.FoundryDownloadResult;
-                    var jsonPayload = jsonBuilder.Length > 0 ? jsonBuilder.ToString() : null;
-
-                    if (jsonPayload is null)
-                    {
-                        return new FoundryDownloadResult(false, "No completion response received from server.");
-                    }
-
-                    try
-                    {
-                        return JsonSerializer.Deserialize(jsonPayload, downloadResultContext)
-                               ?? new FoundryDownloadResult(false, "Failed to parse completion response.");
-                    }
-                    catch (JsonException ex)
-                    {
-                        return new FoundryDownloadResult(false, $"Failed to parse completion response: {ex.Message}");
-                    }
-                }
-                catch (Exception e)
-                {
-                    return new FoundryDownloadResult(false, e.Message);
-                }
-            },
-            cancellationToken).ConfigureAwait(false);
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadBody.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryDownloadBody
-{
-    [JsonPropertyName("Model")]
-    public required FoundryModelDownload Model { get; init; }
-
-    [JsonPropertyName("token")]
-    public required string Token { get; init; }
-
-    [JsonPropertyName("IgnorePipeReport")]
-    public required bool IgnorePipeReport { get; init; }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadResult.cs

@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record FoundryDownloadResult(bool Success, string? ErrorMessage);

src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs

@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-[JsonSourceGenerationOptions(
-    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
-    WriteIndented = false)]
-[JsonSerializable(typeof(FoundryCatalogModel))]
-[JsonSerializable(typeof(List<FoundryCatalogModel>))]
-[JsonSerializable(typeof(FoundryDownloadResult))]
-[JsonSerializable(typeof(FoundryModelDownload))]
-[JsonSerializable(typeof(FoundryDownloadBody))]
-internal sealed partial class FoundryJsonContext : JsonSerializerContext
-{
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryModelDownload.cs

@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryModelDownload
-{
-    [JsonPropertyName("Name")]
-    public required string Name { get; init; }
-
-    [JsonPropertyName("Uri")]
-    public required string Uri { get; init; }
-
-    [JsonPropertyName("Publisher")]
-    public required string Publisher { get; init; }
-
-    [JsonPropertyName("ProviderType")]
-    public required string ProviderType { get; init; }
-
-    [JsonPropertyName("PromptTemplate")]
-    public required PromptTemplate? PromptTemplate { get; init; }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryServiceManager.cs

@@ -1,80 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryServiceManager
-{
-    public static FoundryServiceManager? TryCreate()
-    {
-        return IsAvailable() ? new FoundryServiceManager() : null;
-    }
-
-    private static bool IsAvailable()
-    {
-        using var process = new Process();
-        process.StartInfo.FileName = "where";
-        process.StartInfo.Arguments = "foundry";
-        process.StartInfo.RedirectStandardOutput = true;
-        process.StartInfo.RedirectStandardError = true;
-        process.StartInfo.UseShellExecute = false;
-        process.StartInfo.CreateNoWindow = true;
-        process.Start();
-        process.WaitForExit();
-        return process.ExitCode == 0;
-    }
-
-    private static string? GetUrl(string output)
-    {
-        var match = Regex.Match(output, @"https?:\/\/[^\/]+:\d+");
-        return match.Success ? match.Value : null;
-    }
-
-    public async Task<string?> GetServiceUrl()
-    {
-        var status = await Utils.RunFoundryWithArguments("service status").ConfigureAwait(false);
-
-        if (status.ExitCode != 0 || string.IsNullOrWhiteSpace(status.Output))
-        {
-            return null;
-        }
-
-        return GetUrl(status.Output);
-    }
-
-    public async Task<bool> IsRunning()
-    {
-        var url = await GetServiceUrl().ConfigureAwait(false);
-        return url is not null;
-    }
-
-    public async Task<bool> StartService(int maxWaitSeconds = 30)
-    {
-        if (await IsRunning().ConfigureAwait(false))
-        {
-            return true;
-        }
-
-        // Start foundry service (fire-and-forget, don't wait for the process to exit)
-        _ = Task.Run(() => Utils.RunFoundryWithArguments("service start"));
-
-        // Poll to check if service is running
-        int elapsedSeconds = 0;
-        while (elapsedSeconds < maxWaitSeconds)
-        {
-            await Task.Delay(1000).ConfigureAwait(false);
-            elapsedSeconds++;
-
-            if (await IsRunning().ConfigureAwait(false))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/ModelSettings.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record ModelSettings
-{
-    // The sample shows an empty array; keep it open-ended.
-    [JsonPropertyName("parameters")]
-    public List<JsonElement> Parameters { get; init; } = [];
-}

src/common/LanguageModelProvider/FoundryLocal/PromptTemplate.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record PromptTemplate
-{
-    [JsonPropertyName("assistant")]
-    public string Assistant { get; init; } = string.Empty;
-
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/Runtime.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record Runtime
-{
-    [JsonPropertyName("deviceType")]
-    public string DeviceType { get; init; } = string.Empty;
-
-    [JsonPropertyName("executionProvider")]
-    public string ExecutionProvider { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/Utils.cs

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal static class Utils
-{
-    public static async Task<(string? Output, string? Error, int ExitCode)> RunFoundryWithArguments(string arguments)
-    {
-        try
-        {
-            using var process = new Process();
-            process.StartInfo.FileName = "foundry";
-            process.StartInfo.Arguments = arguments;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.CreateNoWindow = true;
-
-            process.Start();
-
-            string? output = await process.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
-            string? error = await process.StandardError.ReadToEndAsync().ConfigureAwait(false);
-
-            await process.WaitForExitAsync().ConfigureAwait(false);
-
-            return (output, error, process.ExitCode);
-        }
-        catch
-        {
-            return (null, null, -1);
-        }
-    }
-}

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -1,206 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ClientModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using LanguageModelProvider.FoundryLocal;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-namespace LanguageModelProvider;
-
-public sealed class FoundryLocalModelProvider : ILanguageModelProvider
-{
-    private IEnumerable<ModelDetails>? _downloadedModels;
-    private IEnumerable<ModelDetails>? _catalogModels;
-    private FoundryClient? _foundryManager;
-    private string? _serviceUrl;
-
-    public static FoundryLocalModelProvider Instance { get; } = new();
-
-    public string Name => "FoundryLocal";
-
-    public HardwareAccelerator ModelHardwareAccelerator => HardwareAccelerator.FOUNDRYLOCAL;
-
-    public string ProviderDescription => "The model will run locally via Foundry Local";
-
-    public string UrlPrefix => "fl://";
-
-    public string Icon => $"fl{AppUtils.GetThemeAssetSuffix()}.svg";
-
-    public string Url => _serviceUrl ?? string.Empty;
-
-    public string GetDetailsUrl(ModelDetails details)
-    {
-        throw new NotImplementedException();
-    }
-
-    public IChatClient? GetIChatClient(string url)
-    {
-        try
-        {
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch
-        {
-            return null;
-        }
-
-        if (string.IsNullOrWhiteSpace(_serviceUrl))
-        {
-            return null;
-        }
-
-        var modelId = url.Split('/').LastOrDefault();
-        if (string.IsNullOrWhiteSpace(modelId))
-        {
-            return null;
-        }
-
-        return new OpenAIClient(
-            new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = new Uri($"{_serviceUrl}/v1") })
-            .GetChatClient(modelId)
-            .AsIChatClient();
-    }
-
-    public string GetIChatClientString(string url)
-    {
-        try
-        {
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch
-        {
-            return string.Empty;
-        }
-
-        var modelId = url.Split('/').LastOrDefault();
-
-        if (string.IsNullOrWhiteSpace(_serviceUrl) || string.IsNullOrWhiteSpace(modelId))
-        {
-            return string.Empty;
-        }
-
-        return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
-    }
-
-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
-    {
-        if (ignoreCached)
-        {
-            Reset();
-        }
-
-        await InitializeAsync(cancelationToken);
-
-        return _downloadedModels ?? [];
-    }
-
-    public IEnumerable<ModelDetails> GetAllModelsInCatalog()
-    {
-        return _catalogModels ?? [];
-    }
-
-    public async Task<bool> DownloadModel(ModelDetails modelDetails, IProgress<float>? progress, CancellationToken cancellationToken = default)
-    {
-        if (_foundryManager == null)
-        {
-            return false;
-        }
-
-        if (modelDetails.ProviderModelDetails is not FoundryCatalogModel model)
-        {
-            return false;
-        }
-
-        return (await _foundryManager.DownloadModel(model, progress, cancellationToken)).Success;
-    }
-
-    private void Reset()
-    {
-        _downloadedModels = null;
-        _ = InitializeAsync();
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
-        {
-            return;
-        }
-
-        _foundryManager ??= await FoundryClient.CreateAsync();
-
-        if (_foundryManager == null)
-        {
-            return;
-        }
-
-        _serviceUrl ??= await _foundryManager.ServiceManager.GetServiceUrl();
-
-        if (_catalogModels == null || !_catalogModels.Any())
-        {
-            _catalogModels = (await _foundryManager.ListCatalogModels()).Select(ToModelDetails).ToArray();
-        }
-
-        var cachedModels = await _foundryManager.ListCachedModels();
-
-        List<ModelDetails> downloadedModels = [];
-
-        foreach (var model in _catalogModels)
-        {
-            var cachedModel = cachedModels.FirstOrDefault(m => m.Name == model.Name);
-
-            if (cachedModel != default)
-            {
-                model.Id = $"{UrlPrefix}{cachedModel.Id}";
-                downloadedModels.Add(model);
-                cachedModels.Remove(cachedModel);
-            }
-        }
-
-        foreach (var model in cachedModels)
-        {
-            downloadedModels.Add(new ModelDetails
-            {
-                Id = $"fl-{model.Name}",
-                Name = model.Name,
-                Url = $"{UrlPrefix}{model.Name}",
-                Description = $"{model.Name} running locally with Foundry Local",
-                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-                SupportedOnQualcomm = true,
-                ProviderModelDetails = model,
-            });
-        }
-
-        _downloadedModels = downloadedModels;
-    }
-
-    private ModelDetails ToModelDetails(FoundryCatalogModel model)
-    {
-        return new ModelDetails
-        {
-            Id = $"fl-{model.Name}",
-            Name = model.Name,
-            Url = $"{UrlPrefix}{model.Name}",
-            Description = $"{model.Alias} running locally with Foundry Local",
-            HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-            Size = model.FileSizeMb * 1024 * 1024,
-            SupportedOnQualcomm = true,
-            License = model.License?.ToLowerInvariant() ?? string.Empty,
-            ProviderModelDetails = model,
-        };
-    }
-
-    public async Task<bool> IsAvailable()
-    {
-        await InitializeAsync();
-        return _foundryManager != null;
-    }
-}

src/common/LanguageModelProvider/HardwareAccelerator.cs

@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider;
-
-public enum HardwareAccelerator
-{
-    CPU,
-    DML,
-    QNN,
-    WCRAPI,
-    OLLAMA,
-    OPENAI,
-    FOUNDRYLOCAL,
-    LEMONADE,
-    NPU,
-    GPU,
-    VitisAI,
-    OpenVINO,
-    NvTensorRT,
-}

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Extensions.AI;
-
-namespace LanguageModelProvider;
-
-public interface ILanguageModelProvider
-{
-    string Name { get; }
-
-    string UrlPrefix { get; }
-
-    string Icon { get; }
-
-    HardwareAccelerator ModelHardwareAccelerator { get; }
-
-    string ProviderDescription { get; }
-
-    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
-
-    IChatClient? GetIChatClient(string url);
-
-    string GetIChatClientString(string url);
-
-    string GetDetailsUrl(ModelDetails details);
-
-    string Url { get; }
-}

src/common/LanguageModelProvider/LanguageModelProvider.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-    <PackageReference Include="OpenAI" />
-  </ItemGroup>
-</Project>

src/common/LanguageModelProvider/LanguageModelService.cs

@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Concurrent;
-using Microsoft.Extensions.AI;
-
-namespace LanguageModelProvider;
-
-public sealed class LanguageModelService
-{
-    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
-
-    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
-    {
-        ArgumentNullException.ThrowIfNull(providers);
-
-        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var provider in providers)
-        {
-            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
-            {
-                _providersByPrefix[provider.UrlPrefix] = provider;
-            }
-        }
-    }
-
-    public static LanguageModelService CreateDefault()
-    {
-        return new LanguageModelService(new[]
-        {
-            FoundryLocalModelProvider.Instance,
-        });
-    }
-
-    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
-
-    public bool RegisterProvider(ILanguageModelProvider provider)
-    {
-        ArgumentNullException.ThrowIfNull(provider);
-
-        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
-        {
-            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
-        }
-
-        _providersByPrefix[provider.UrlPrefix] = provider;
-        return true;
-    }
-
-    public ILanguageModelProvider? GetProviderFor(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return provider;
-            }
-        }
-
-        return null;
-    }
-
-    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
-    {
-        List<ModelDetails> models = [];
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
-            models.AddRange(providerModels);
-        }
-
-        return models;
-    }
-
-    public IChatClient? GetClient(ModelDetails model)
-    {
-        if (model is null)
-        {
-            return null;
-        }
-
-        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
-        return GetClient(reference);
-    }
-
-    public IChatClient? GetClient(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        var provider = GetProviderFor(modelReference);
-
-        return provider?.GetIChatClient(modelReference);
-    }
-}

src/common/LanguageModelProvider/ModelDetails.cs

@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-namespace LanguageModelProvider;
-
-public class ModelDetails
-{
-    public string Id { get; set; } = string.Empty;
-
-    public string Name { get; set; } = string.Empty;
-
-    public string Url { get; set; } = string.Empty;
-
-    public string Description { get; set; } = string.Empty;
-
-    public long Size { get; set; }
-
-    public bool IsUserAdded { get; set; }
-
-    public string Icon { get; set; } = string.Empty;
-
-    public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];
-
-    public bool SupportedOnQualcomm { get; set; }
-
-    public string License { get; set; } = string.Empty;
-
-    public object? ProviderModelDetails { get; set; }
-}

src/common/interop/PowerToys.Interop.vcxproj

@@ -63,14 +63,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs

@@ -23,8 +23,7 @@ public sealed class SettingsResourceAdvancedPasteModuleTest : SettingsResourceMo
         {
             s.Properties.ShowCustomPreview = !s.Properties.ShowCustomPreview;
             s.Properties.CloseAfterLosingFocus = !s.Properties.CloseAfterLosingFocus;
-
-            // s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
+            s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
             s.Properties.AdvancedPasteUIShortcut = new HotkeySettings
             {
                 Key = "mock",

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj

@@ -33,25 +33,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml" />
     <None Remove="AdvancedPasteXAML\Controls\PromptBox.xaml" />
     <None Remove="Assets\AdvancedPaste\AIIcon.png" />
-    <None Remove="Assets\AdvancedPaste\Anthropic.svg" />
-    <None Remove="Assets\AdvancedPaste\Azure.svg" />
-    <None Remove="Assets\AdvancedPaste\AzureAI.svg" />
-    <None Remove="Assets\AdvancedPaste\Bedrock.svg" />
-    <None Remove="Assets\AdvancedPaste\FoundryLocal.svg" />
-    <None Remove="Assets\AdvancedPaste\Gemini.svg" />
     <None Remove="Assets\AdvancedPaste\Gradient.png" />
     <None Remove="AdvancedPasteXAML\Controls\AnimatedContentControl\AnimatedBorderBrush.xaml" />
     <None Remove="AdvancedPasteXAML\Views\MainPage.xaml" />
-    <None Remove="Assets\AdvancedPaste\HuggingFace.svg" />
-    <None Remove="Assets\AdvancedPaste\Mistral.svg" />
-    <None Remove="Assets\AdvancedPaste\Ollama.svg" />
-    <None Remove="Assets\AdvancedPaste\Onnx.svg" />
-    <None Remove="Assets\AdvancedPaste\OpenAI.dark.svg" />
-    <None Remove="Assets\AdvancedPaste\OpenAI.light.svg" />
-    <None Remove="Assets\AdvancedPaste\WindowsML.svg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -63,6 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="OpenAI" />
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
@@ -70,12 +57,6 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageReference Include="MessagePack" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Amazon" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Google" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.HuggingFace" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.MistralAI" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.SemanticKernel" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
@@ -121,7 +102,6 @@
     <!-- HACK: Common.UI is referenced, even if it is not used, to force dll versions to be the same as in other projects that use it. It's still unclear why this is the case, but this is need for flattening the install directory. -->
     <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\LanguageModelProvider\LanguageModelProvider.csproj" />
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
   </ItemGroup>
@@ -134,11 +114,6 @@
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
-  <ItemGroup>
-    <Page Update="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Page Update="AdvancedPasteXAML\Controls\PromptBox.xaml">
       <Generator>MSBuild:Compile</Generator>

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs

@@ -10,10 +10,10 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services;
-using AdvancedPaste.Services.CustomActions;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
 using ManagedCommon;
@@ -77,12 +77,11 @@ namespace AdvancedPaste
             {
                 services.AddSingleton<IFileSystem, FileSystem>();
                 services.AddSingleton<IUserSettings, UserSettings>();
-                services.AddSingleton<IAICredentialsProvider, EnhancedVaultCredentialsProvider>();
+                services.AddSingleton<IAICredentialsProvider, Services.OpenAI.VaultCredentialsProvider>();
                 services.AddSingleton<IPromptModerationService, Services.OpenAI.PromptModerationService>();
+                services.AddSingleton<ICustomTextTransformService, Services.OpenAI.CustomTextTransformService>();
                 services.AddSingleton<IKernelQueryCacheService, CustomActionKernelQueryCacheService>();
-                services.AddSingleton<IPasteAIProviderFactory, PasteAIProviderFactory>();
-                services.AddSingleton<ICustomActionTransformService, CustomActionTransformService>();
-                services.AddSingleton<IKernelService, AdvancedAIKernelService>();
+                services.AddSingleton<IKernelService, Services.OpenAI.KernelService>();
                 services.AddSingleton<IPasteFormatExecutor, PasteFormatExecutor>();
                 services.AddSingleton<OptionsViewModel>();
             }).Build();

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="AdvancedPaste.Controls.ClipboardHistoryItemPreviewControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:AdvancedPaste.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:AdvancedPaste.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <converters:DateTimeToFriendlyStringConverter x:Key="DateTimeToFriendlyStringConverter" />
-        <tkconverters:BoolToVisibilityConverter x:Name="BoolToVisibilityConverter" />
-    </UserControl.Resources>
-    <Grid Height="64" ColumnSpacing="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Border Background="{ThemeResource SubtleFillColorSecondaryBrush}" CornerRadius="16,0,0,16">
-            <Grid>
-                <!--  Image preview  -->
-                <Image
-                    Source="{x:Bind ClipboardItem.Image, Mode=OneWay}"
-                    Stretch="UniformToFill"
-                    Visibility="{x:Bind HasImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <!--  Text preview  -->
-                <TextBlock
-                    Margin="8,0,0,0"
-                    VerticalAlignment="Center"
-                    FontSize="10"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Text="{x:Bind ClipboardItem.Content, Mode=OneWay}"
-                    TextWrapping="Wrap"
-                    Visibility="{x:Bind HasText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <!--  Icon glyph fallback  -->
-                <FontIcon
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="48"
-                    Glyph="{x:Bind IconGlyph, Mode=OneWay}"
-                    Visibility="{x:Bind HasGlyph, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </Grid>
-        </Border>
-        <StackPanel
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            Spacing="2">
-            <TextBlock
-                Style="{StaticResource BodyTextBlockStyle}"
-                Text="{x:Bind Header, Mode=OneWay}"
-                TextWrapping="NoWrap" />
-            <TextBlock
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind Timestamp, Converter={StaticResource DateTimeToFriendlyStringConverter}, Mode=OneWay}" />
-        </StackPanel>
-    </Grid>
-</UserControl>