mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 11:17:53 +01:00
<!-- 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 Background: The current PowerToys installer is built using Wix3, which has now been deprecated. To improve security, service quality, and community support, we’re upgrading the installer to Wix5. Implementation: Created Wix5-based projects(PowerToysSetupVext and PowerToysSetupCustomActionsVNext) within the installer while retaining the existing Wix3 project. Both versions are built to generate separate installation packages. The Wix3-related code will be removed after successful release testing confirms no issues. Special case: Wix5 has removed the property for 'ShowFilesInUse'. Now, whenever a file is in use during installation, a FilesInUse pop-upwill automatically appear asking for the next step. To ensure this doesn't interfere with scenarios that require silent installation (e.g. Winget method), we’ve handled it using the bafunction approach. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **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: Jerry Xu <n.xu@outlook.com> Co-authored-by: Kai Tao <69313318+vanzue@users.noreply.github.com> Co-authored-by: leileizhang <leilzh@microsoft.com> Co-authored-by: Kai Tao (from Dev Box) <kaitao@microsoft.com> Co-authored-by: vanzue <vanzue@outlook.com>
97 lines
2.8 KiB
PowerShell
97 lines
2.8 KiB
PowerShell
[CmdletBinding()]
|
|
Param(
|
|
[Parameter(Mandatory = $True, Position = 1)]
|
|
[string]$monacoWxsFile,
|
|
[Parameter(Mandatory = $True, Position = 2)]
|
|
[string]$platform,
|
|
[Parameter(Mandatory = $True, Position = 3)]
|
|
[string]$nugetHeatPath
|
|
)
|
|
|
|
$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
|
|
|
|
if ($platform -eq "x64") {
|
|
$HeatPath = Join-Path $nugetHeatPath "tools\net472\x64"
|
|
} else {
|
|
$HeatPath = Join-Path $nugetHeatPath "tools\net472\x86"
|
|
}
|
|
|
|
# Validate heat.exe exists at the resolved path; fail fast if not found.
|
|
$heatExe = Join-Path $HeatPath "heat.exe"
|
|
if (-not (Test-Path $heatExe)) {
|
|
Write-Error "heat.exe not found at '$heatExe'. Ensure the WixToolset.Heat package (5.0.2) is restored under '$nugetHeatPath'."
|
|
exit 1
|
|
}
|
|
|
|
$SourceDir = Join-Path $scriptDir "..\..\src\Monaco\monacoSRC" # Now relative to script location
|
|
$OutputFile = Join-Path $scriptDir "MonacoSRC.wxs"
|
|
$ComponentGroup = "MonacoSRCHeatGenerated"
|
|
$DirectoryRef = "MonacoPreviewHandlerMonacoSRCFolder"
|
|
$Variable = "var.MonacoSRCHarvestPath"
|
|
|
|
& $heatExe dir "$SourceDir" -out "$OutputFile" -cg "$ComponentGroup" -dr "$DirectoryRef" -var "$Variable" -gg -srd -nologo
|
|
|
|
$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 |