mirror of
https://github.com/microsoft/terminal.git
synced 2026-07-08 17:46:05 +00:00
dc4ce1c096
## Summary of the Pull Request The Windows SDK path may not be the same on all PCs, especially when Visual Studio (VS) is installed on a drive other than `C:/`. However, we can read the correct path from the Registry, which this PR does. ## Validation Steps Performed 1. Install VS on `E:/`. 2. Build the solution and see it passes without erroring on accessing `MakePri.exe`.
58 lines
2.1 KiB
PowerShell
58 lines
2.1 KiB
PowerShell
Param(
|
|
[Parameter(Mandatory,
|
|
HelpMessage="Root directory of extracted Terminal AppX")]
|
|
[string[]]
|
|
$TerminalRoot,
|
|
|
|
[Parameter(Mandatory,
|
|
HelpMessage="Root directory of extracted Xaml AppX")]
|
|
[string[]]
|
|
$XamlRoot,
|
|
|
|
[Parameter(Mandatory,
|
|
HelpMessage="Output Path")]
|
|
[string]
|
|
$OutputPath,
|
|
|
|
[Parameter(HelpMessage="Path to makepri.exe")]
|
|
[ValidateScript({Test-Path $_ -Type Leaf})]
|
|
[string]
|
|
$MakePriPath
|
|
)
|
|
|
|
$ErrorActionPreference = 'Stop'
|
|
|
|
If (-not $MakePriPath) {
|
|
$winSdk10Root = $(Get-ItemPropertyValue -Path "HKLM:\Software\Microsoft\Windows Kits\Installed Roots" -Name "KitsRoot10")
|
|
$MakePriPath = "$winSdk10Root\bin\10.0.26100.0\x64\MakePri.exe"
|
|
}
|
|
|
|
If ($null -Eq (Get-Item $MakePriPath -EA:SilentlyContinue)) {
|
|
Write-Error "Could not find MakePriPath.exe at `"$MakePriPath`".`nMake sure that -MakePriPath points to a valid SDK."
|
|
Exit 1
|
|
}
|
|
|
|
$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "tmp$([Convert]::ToString((Get-Random 65535),16).PadLeft(4,'0')).tmp"
|
|
New-Item -ItemType Directory -Path $tempDir | Out-Null
|
|
|
|
$terminalDump = Join-Path $tempDir "terminal.pri.xml"
|
|
|
|
& $MakePriPath dump /if (Join-Path $TerminalRoot "resources.pri") /of $terminalDump /dt detailed
|
|
|
|
Write-Verbose "Removing Microsoft.UI.Xaml node from Terminal to prevent a collision with XAML"
|
|
$terminalXMLDocument = [xml](Get-Content $terminalDump)
|
|
$resourceMap = $terminalXMLDocument.PriInfo.ResourceMap
|
|
$fileSubtree = $resourceMap.ResourceMapSubtree | Where-Object { $_.Name -eq "Files" }
|
|
$subtrees = $fileSubtree.ResourceMapSubtree
|
|
$xamlSubtreeChild = ($subtrees | Where-Object { $_.Name -eq "Microsoft.UI.Xaml" })
|
|
if ($Null -Ne $xamlSubtreeChild) {
|
|
$null = $fileSubtree.RemoveChild($xamlSubtreeChild)
|
|
$terminalXMLDocument.Save($terminalDump)
|
|
}
|
|
|
|
$indexName = $terminalXMLDocument.PriInfo.ResourceMap.name
|
|
|
|
& (Join-Path $PSScriptRoot "Merge-PriFiles.ps1") -Path $terminalDump, (Join-Path $XamlRoot "resources.pri") -IndexName $indexName -OutputPath $OutputPath -MakePriPath $MakePriPath
|
|
|
|
Remove-Item -Recurse -Force $tempDir
|