use relative path

2025-12-15 19:27:56 +01:00 · 2025-11-04 18:16:47 +08:00
parent 229bedd09f
commit 4a62045183
13 changed files with 67 additions and 132 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -349,10 +349,7 @@ src/common/Telemetry/*.etl
 /src/modules/powerrename/ui/RCb24464

 # Generated installer file for Monaco source files.
-/installer/PowerToysSetup/MonacoSRC.wxs
-/installer/PowerToysSetup/DscResources.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
-/installer/PowerToysSetupVNext/DscResources.wxs

 # MSBuildCache
 /MSBuildCacheLogs/
--- a/.pipelines/generateDscManifests.ps1
+++ b/.pipelines/generateDscManifests.ps1
@@ -65,21 +65,28 @@ if (-not (Test-Path $outputDir)) {
    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
 }

-Write-Host "DSC manifests will be generated to: '$outputDir'"
+# DSC v3 manifests go to DSCv3 subfolder
+$dscOutputDir = Join-Path $outputDir 'DSCv3'
+if (-not (Test-Path $dscOutputDir)) {
+    Write-Host "Creating DSCv3 subfolder at '$dscOutputDir'."
+    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
+}

-Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
-Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+Write-Host "DSC manifests will be generated to: '$dscOutputDir'"

-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
+Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
+Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
 Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
 & $exePath @arguments
 if ($LASTEXITCODE -ne 0) {
    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
 }

-$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
 if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$outputDir'."
+    throw "No DSC manifest files were generated in '$dscOutputDir'."
 }

 Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -1672,14 +1672,16 @@ UINT __stdcall SetBundleInstallLocationCA(MSIHANDLE hInstall)
                
                if (_wcsicmp(regUpgradeCode.c_str(), bundleUpgradeCode.c_str()) == 0)
                {
-                    // Found matching Bundle, set InstallLocation
+                    // Found matching Bundle, set InstallLocation to DSCv3 subfolder for DSC v3 resource discovery
+                    std::wstring dscv3Location = installationFolder + L"DSCv3";
+                    
                    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)));
+                                 reinterpret_cast<const BYTE*>(dscv3Location.c_str()),
+                                 static_cast<DWORD>((dscv3Location.length() + 1) * sizeof(wchar_t)));
                    
                    if (setResult == ERROR_SUCCESS)
                    {
-                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set successfully");
+                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set to DSCv3 subfolder successfully");
                    }
                    else
                    {
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -54,6 +54,7 @@
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -15,8 +15,8 @@
        <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]" />
+        <!-- Append DSCv3 folder to current user's PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[DSCv3Folder]" />
      </Component>
      <?else?>
      <Component Id="powertoys_env_path_machine" Bitness="always64">
@@ -24,8 +24,8 @@
        <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]" />
+        <!-- Append DSCv3 folder to machine PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[DSCv3Folder]" />
      </Component>
      <?endif?>
      <Component Id="powertoys_toast_clsid" Bitness="always64">
@@ -121,6 +121,7 @@
        </RegistryKey>
        <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveDSCv3Folder" Directory="DSCv3Folder" On="uninstall" />
        <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
        <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
        <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
--- a/installer/PowerToysSetupVNext/DscResources.wxs
+++ b/installer/PowerToysSetupVNext/DscResources.wxs
@@ -0,0 +1,17 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define DscJsonFiles=?>
+  <?define DscJsonFilesPath=$(var.BinDir)DSCv3\?>
+
+  <Fragment>
+    <DirectoryRef Id="DSCv3Folder" FileSource="$(var.DscJsonFilesPath)">
+    <!-- Generated by generateAllFileComponents.ps1 -->
+    <!--DscJsonFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="DscResourcesComponentGroup">
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -14,7 +14,6 @@ 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'">
@@ -25,7 +24,6 @@ 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>
@@ -37,6 +35,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
      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 ..\..\..\DscResources.wxs.bk ..\..\..\DscResources.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
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -279,6 +279,7 @@
          <Directory Id="BaseApplicationsAssetsFolder" Name="Assets">
          </Directory>
          <Directory Id="DSCModulesReferenceFolder" Name="DSCModules" />
+          <Directory Id="DSCv3Folder" Name="DSCv3" />
          <Directory Id="WinUI3AppsInstallFolder" Name="WinUI3Apps">
              <Directory Id="WinUI3AppsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
                <Directory Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
--- a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
@@ -315,3 +315,7 @@ Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wx
 #Workspaces
 Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
 Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs
+
+#DSC Resources - JSON manifest files in DSCv3 subfolder
+Generate-FileList -fileDepsJson "" -fileListName DscJsonFiles -wxsFilePath $PSScriptRoot\DscResources.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\DSCv3\"
+Generate-FileComponents -fileListName "DscJsonFiles" -wxsFilePath $PSScriptRoot\DscResources.wxs
--- a/installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1
+++ b/installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1
@@ -1,102 +0,0 @@
-[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'"
--- a/src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs
+++ b/src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs
@@ -13,7 +13,7 @@ namespace PowerToys.DSC.Models;
 public sealed class DscManifest
 {
    private const string Schema = "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.vscode.json";
-    private const string Executable = @"PowerToys.DSC.exe";
+    private const string Executable = @"..\PowerToys.DSC.exe";

    private readonly string _type;
    private readonly string _version;
--- a/src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
+++ b/src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
@@ -40,9 +40,10 @@
    </EmbeddedResource>
  </ItemGroup>

-  <!-- In debug mode, generate the DSC resource JSON files -->
-    <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
-    <Message Text="Generating DSC resource JSON files inside ..." Importance="high" />
-    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)\&quot;" />
+  <!-- Generate the DSC resource JSON files for both Debug and Release builds -->
+  <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build">
+    <Message Text="Generating DSC resource JSON files to DSCv3 subfolder..." Importance="high" />
+    <MakeDir Directories="$(TargetDir)DSCv3" />
+    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCv3&quot;" />
  </Target>
 </Project>
--- a/tools/build/generate-dsc-manifests.ps1
+++ b/tools/build/generate-dsc-manifests.ps1
@@ -93,21 +93,28 @@ if (-not (Test-Path $outputDir)) {
    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
 }

-Write-Host "DSC manifests will be generated to: '$outputDir'"
+# DSC v3 manifests go to DSCv3 subfolder
+$dscOutputDir = Join-Path $outputDir 'DSCv3'
+if (-not (Test-Path $dscOutputDir)) {
+    Write-Host "Creating DSCv3 subfolder at '$dscOutputDir'."
+    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
+}

-Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
-Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+Write-Host "DSC manifests will be generated to: '$dscOutputDir'"

-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
+Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
+Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
 Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
 & $exePath @arguments
 if ($LASTEXITCODE -ne 0) {
    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
 }

-$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
 if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$outputDir'."
+    throw "No DSC manifest files were generated in '$dscOutputDir'."
 }

 Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"