Initial DSC v3 support for PowerToys (#41132)

<!-- 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

Tasks checklist
- [X] Implement DSC infra in PowerToys
- [X] Implement Settings DSC resource
  - [X] Implement Get, Set, Test, Export, Schema
  - [X] Generate manifest (DSC resource JSON)
- [X] Added Unit Tests
- [x] Add `NJsonSchema` v11.4.0 to the stream
- [x] Package the manifest files so dsc.exe can discover them
- [x] Add `PowerToys.DSC.exe` to the PATH (maybe?)
- [x] Add `InstallLocation` in the registry key so `winget configue
export` can export the PowerToys DSC resources
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [X] Closes: #37276
- [X] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [X] **Tests:** Added/updated and all pass
- [X] **Localization:** All end-user-facing strings can be localized
- [x] **Dev docs:** Added/updated
- [x] **New binaries:** Added on the required places
- [x] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [x] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [x] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [x] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [x] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

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

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

---------

Co-authored-by: vanzue <vanzue@outlook.com>
Co-authored-by: Kai Tao (from Dev Box) <kaitao@microsoft.com>
Co-authored-by: Leilei Zhang <leilzh@microsoft.com>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -16,6 +16,7 @@ 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'">
@@ -26,6 +27,7 @@ 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>
@@ -121,6 +123,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <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" />

installer/PowerToysSetup/Product.wxs

@@ -75,6 +75,7 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
+      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -324,7 +325,6 @@
                   BinaryKey="PTCustomActions"
                   DllEntry="UninstallDSCModuleCA"
                    />
-
       <CustomAction Id="UninstallServicesTask"
                     Return="ignore"
                     Impersonate="yes"

installer/PowerToysSetup/generateDscResourcesWxs.ps1

@@ -0,0 +1,87 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True)]
+    [string]$dscWxsFile,
+    [Parameter(Mandatory = $True)]
+    [string]$Platform,
+    [Parameter(Mandatory = $True)]
+    [string]$Configuration
+)
+
+$ErrorActionPreference = 'Stop'
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
+
+if (-not (Test-Path $buildOutputDir)) {
+    Write-Error "Build output directory not found: '$buildOutputDir'"
+    exit 1
+}
+
+$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
+
+if (-not $dscFiles) {
+    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
+    $wxsContent = @"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+    Set-Content -Path $dscWxsFile -Value $wxsContent
+    exit 0
+}
+
+Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
+
+$wxsContent = @"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+"@
+
+$componentRefs = @()
+foreach ($file in $dscFiles) {
+    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
+    $fileId = $componentId + "_File"
+    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
+    $componentRefs += $componentId
+    
+    $wxsContent += @"
+
+      <Component Id="$componentId" Guid="{$guid}">
+        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
+      </Component>
+"@
+}
+
+$wxsContent += @"
+
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+"@
+
+foreach ($componentId in $componentRefs) {
+    $wxsContent += @"
+
+      <ComponentRef Id="$componentId"/>
+"@
+}
+
+$wxsContent += @"
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+
+Set-Content -Path $dscWxsFile -Value $wxsContent
+Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -3,6 +3,7 @@
 #include "RcResource.h"
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
+#include <filesystem>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -232,7 +233,9 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
 
         auto action = [&commandLine](HANDLE userToken)
         {
-            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+            STARTUPINFO startupInfo = { 0 };
+            startupInfo.cb = sizeof(STARTUPINFO);
+            startupInfo.wShowWindow = SW_SHOWNORMAL;
             PROCESS_INFORMATION processInformation;
 
             PVOID lpEnvironment = NULL;
@@ -271,7 +274,9 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
     }
     else
     {
-        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        STARTUPINFO startupInfo = { 0 };
+        startupInfo.cb = sizeof(STARTUPINFO);
+        startupInfo.wShowWindow = SW_SHOWNORMAL;
 
         PROCESS_INFORMATION processInformation;
 
@@ -424,7 +429,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
         const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
-        fs::create_directories(modulesPath, errorCode);
+        std::filesystem::create_directories(modulesPath, errorCode);
         if (errorCode)
         {
             hr = E_FAIL;
@@ -433,7 +438,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
+            std::filesystem::copy_file(std::filesystem::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, std::filesystem::copy_options::overwrite_existing, errorCode);
 
             if (errorCode)
             {
@@ -481,7 +486,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            fs::remove(versionedModulePath / filename, errorCode);
+            std::filesystem::remove(versionedModulePath / filename, errorCode);
 
             if (errorCode)
             {
@@ -492,7 +497,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
         {
-            fs::remove(*modulePath, errorCode);
+            std::filesystem::remove(*modulePath, errorCode);
 
             if (errorCode)
             {
@@ -1375,6 +1380,120 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
+UINT __stdcall SetBundleInstallLocationCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    
+    // Declare all variables at the beginning to avoid goto issues
+    std::wstring customActionData;
+    std::wstring installationFolder;
+    std::wstring bundleUpgradeCode;
+    std::wstring installScope;
+    bool isPerUser = false;
+    size_t pos1 = std::wstring::npos;
+    size_t pos2 = std::wstring::npos;
+    std::vector<HKEY> keysToTry;
+
+    hr = WcaInitialize(hInstall, "SetBundleInstallLocationCA");
+    ExitOnFailure(hr, "Failed to initialize");
+    
+    // Parse CustomActionData: "installFolder;upgradeCode;installScope"
+    hr = getInstallFolder(hInstall, customActionData);
+    ExitOnFailure(hr, "Failed to get CustomActionData.");
+    
+    pos1 = customActionData.find(L';');
+    if (pos1 == std::wstring::npos) 
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Invalid CustomActionData format - missing first semicolon");
+    }
+    
+    pos2 = customActionData.find(L';', pos1 + 1);
+    if (pos2 == std::wstring::npos) 
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Invalid CustomActionData format - missing second semicolon");
+    }
+    
+    installationFolder = customActionData.substr(0, pos1);
+    bundleUpgradeCode = customActionData.substr(pos1 + 1, pos2 - pos1 - 1);
+    installScope = customActionData.substr(pos2 + 1);
+    
+    isPerUser = (installScope == L"perUser");
+    
+    // Use the appropriate registry based on install scope
+    HKEY targetKey = isPerUser ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+    const wchar_t* keyName = isPerUser ? L"HKCU" : L"HKLM";
+    
+    WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Searching for Bundle in %ls registry", keyName);
+    
+    HKEY uninstallKey;
+    LONG openResult = RegOpenKeyExW(targetKey, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &uninstallKey);
+    if (openResult != ERROR_SUCCESS)
+    {
+        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to open uninstall key, error: %ld", openResult);
+        goto LExit;
+    }
+    
+    DWORD index = 0;
+    wchar_t subKeyName[256];
+    DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
+    
+    while (RegEnumKeyExW(uninstallKey, index, subKeyName, &subKeyNameSize, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
+    {
+        HKEY productKey;
+        if (RegOpenKeyExW(uninstallKey, subKeyName, 0, KEY_READ | KEY_WRITE, &productKey) == ERROR_SUCCESS)
+        {
+            wchar_t upgradeCode[256];
+            DWORD upgradeCodeSize = sizeof(upgradeCode);
+            DWORD valueType;
+            
+            if (RegQueryValueExW(productKey, L"BundleUpgradeCode", nullptr, &valueType, 
+                               reinterpret_cast<LPBYTE>(upgradeCode), &upgradeCodeSize) == ERROR_SUCCESS)
+            {
+                // Remove brackets from registry upgradeCode for comparison (bundleUpgradeCode doesn't have brackets)
+                std::wstring regUpgradeCode = upgradeCode;
+                if (!regUpgradeCode.empty() && regUpgradeCode.front() == L'{' && regUpgradeCode.back() == L'}')
+                {
+                    regUpgradeCode = regUpgradeCode.substr(1, regUpgradeCode.length() - 2);
+                }
+                
+                if (_wcsicmp(regUpgradeCode.c_str(), bundleUpgradeCode.c_str()) == 0)
+                {
+                    // Found matching Bundle, set InstallLocation
+                    LONG setResult = RegSetValueExW(productKey, L"InstallLocation", 0, REG_SZ,
+                                 reinterpret_cast<const BYTE*>(installationFolder.c_str()),
+                                 static_cast<DWORD>((installationFolder.length() + 1) * sizeof(wchar_t)));
+                    
+                    if (setResult == ERROR_SUCCESS)
+                    {
+                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set successfully");
+                    }
+                    else
+                    {
+                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to set InstallLocation, error: %ld", setResult);
+                    }
+                    
+                    RegCloseKey(productKey);
+                    RegCloseKey(uninstallKey);
+                    goto LExit;
+                }
+            }
+            RegCloseKey(productKey);
+        }
+        
+        index++;
+        subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
+    }
+    
+    RegCloseKey(uninstallKey);
+    
+LExit:
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 void initSystemLogger()
 {
     static std::once_flag initLoggerFlag;

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -32,4 +32,4 @@ EXPORTS
 	CleanFileLocksmithRuntimeRegistryCA
 	CleanPowerRenameRuntimeRegistryCA
 	CleanNewPlusRuntimeRegistryCA
-	
+	SetBundleInstallLocationCA

installer/PowerToysSetupVNext/Core.wxs

@@ -9,6 +9,25 @@
           <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}">
@@ -109,6 +128,11 @@
       <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/PowerToys.wxs

@@ -28,6 +28,9 @@
 
         <Log Disable="no" Prefix="powertoys-bootstrapper-msi-$(var.Version)" Extension=".log" />
 
+        <!-- Store Bundle UpgradeCode for CustomAction -->
+        <Variable Name="BundleUpgradeCode" Type="string" Value="$(var.UpgradeCode)" />
+
       <!-- 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" />
@@ -58,6 +61,7 @@
             <MsiPackage DisplayName="PowerToys MSI" SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)" Compressed="yes" bal:DisplayInternalUICondition="false">
                 <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
                 <MsiProperty Name="MSIRESTARTMANAGERCONTROL" Value="Disable" />
+                <MsiProperty Name="BUNDLEINFO" Value="[BundleUpgradeCode]" />
             </MsiPackage>
         </Chain>
     </Bundle>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -14,6 +14,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -24,6 +25,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -115,6 +117,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
+    <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />
     <Compile Include="Settings.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -62,6 +62,7 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
+      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -69,8 +70,8 @@
       <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
-
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" Sequence="execute" />
+    
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
 
     <UI>
@@ -117,6 +118,8 @@
 
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
+      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed" />
+      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
@@ -160,6 +163,9 @@
 
     <CustomAction Id="SetInstallCmdPalPackageParam" Property="InstallCmdPalPackage" Value="[INSTALLFOLDER]" />
 
+    <!-- Set InstallLocation for Bundle entry as well -->
+    <CustomAction Id="SetBundleInstallLocationData" Property="SetBundleInstallLocation" Value="[INSTALLFOLDER];[BUNDLEINFO];[InstallScope]" />
+
     <CustomAction Id="LaunchPowerToys" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="LaunchPowerToysCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="TerminateProcesses" Return="ignore" Execute="immediate" DllEntry="TerminateProcessesCA" BinaryRef="PTCustomActions" />
@@ -244,6 +250,8 @@
 
     <CustomAction Id="InstallCmdPalPackage" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallCmdPalPackageCA" BinaryRef="PTCustomActions" />
 
+    <CustomAction Id="SetBundleInstallLocation" Return="ignore" Impersonate="no" Execute="deferred" DllEntry="SetBundleInstallLocationCA" BinaryRef="PTCustomActions" />
+
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />

installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1

@@ -0,0 +1,102 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True)]
+    [string]$dscWxsFile,
+    [Parameter(Mandatory = $True)]
+    [string]$Platform,
+    [Parameter(Mandatory = $True)]
+    [string]$Configuration
+)
+
+$ErrorActionPreference = 'Stop'
+
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+
+# Find build output directory
+$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
+
+if (-not (Test-Path $buildOutputDir)) {
+    Write-Error "Build output directory not found: '$buildOutputDir'"
+    exit 1
+}
+
+# Find all DSC manifest JSON files
+$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
+
+if (-not $dscFiles) {
+    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
+    # Create empty component group
+    $wxsContent = @"
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+    Set-Content -Path $dscWxsFile -Value $wxsContent
+    exit 0
+}
+
+Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
+
+# Generate WiX fragment
+$wxsContent = @"
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include `$(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+"@
+
+$componentRefs = @()
+
+foreach ($file in $dscFiles) {
+    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
+    $fileId = $componentId + "_File"
+    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
+    
+    $componentRefs += $componentId
+    
+    $wxsContent += @"
+
+      <Component Id="$componentId" Guid="{$guid}" Directory="DSCModulesReferenceFolder">
+        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
+      </Component>
+"@
+}
+
+$wxsContent += @"
+
+    </DirectoryRef>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="DscResourcesComponentGroup">
+"@
+
+foreach ($componentId in $componentRefs) {
+    $wxsContent += @"
+
+      <ComponentRef Id="$componentId"/>
+"@
+}
+
+$wxsContent += @"
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+"@
+
+# Write the WiX file
+Set-Content -Path $dscWxsFile -Value $wxsContent
+
+Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"