microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 04:38:24 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

PGO: Update the Helix payload to rely on the unpackaged distribution (#15123)

Browse Source 
The unpackaged distribution was made for this exact use, so let's *do
it*!
This commit is contained in:
Dustin L. Howett 2023-04-06 15:01:00 -05:00 committed by GitHub
parent 083fc647bb
commit c7498a4269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/Helix/PrepareHelixPayload.ps1
View File

@ -55,14 +55,7 @@ Copy-Item "build\helix\runtests.cmd" $payloadDir
Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir" Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir"
Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir" Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"
# Copy the APPX package from the 'drop' artifact dir and Windows Kits # Extract the unpackaged distribution of Windows Terminal to the payload directory,
Copy-Item "$repoDirectory\Artifacts\$ArtifactName\appx\CascadiaPackage_0.0.1.0_$Platform.msix" $payloadDir\CascadiaPackage.zip # where it will create a subdirectory named terminal-0.0.1.0
Copy-Item "C:\program files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs.Desktop\14.0\Appx\Retail\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" $payloadDir\VCLibs.zip # This is referenced in TerminalApp.cs later as part of the test harness.
& tar -x -v -f "$repoDirectory\Artifacts\$ArtifactName\unpackaged\WindowsTerminalDev_0.0.1.0_x64.zip" -C "$payloadDir"
# Rename it to extension of ZIP because Expand-Archive is real sassy on the build machines
# and refuses to unzip it because of its file extension while on a desktop, it just
# does the job without complaining.
# Extract the APPX package
Expand-Archive -LiteralPath $payloadDir\CascadiaPackage.zip -DestinationPath $payloadDir\appx
Expand-Archive -LiteralPath $payloadDir\VCLibs.zip -DestinationPath $payloadDir\appx -Force

4
src/cascadia/WindowsTerminal_UIATests/Elements/TerminalApp.cs
View File

@ -50,8 +50,8 @@ namespace WindowsTerminal.UIA.Tests.Elements
this.context = context; this.context = context;
// If running locally, set WTPath to where we can find a loose deployment of Windows Terminal // If running locally, set WTPath to where we can find a loose deployment of Windows Terminal
// On the build machines, the scripts lay it out at the appx\ subfolder of the test deployment directory // On the build machines, the scripts lay it out at the terminal-0.0.1.0\ subfolder of the test deployment directory
string path = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, @"appx\WindowsTerminal.exe")); string path = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, @"terminal-0.0.1.0\WindowsTerminal.exe"));
if (context.Properties.Contains("WTPath")) if (context.Properties.Contains("WTPath"))
{ {
path = (string)context.Properties["WTPath"]; path = (string)context.Properties["WTPath"];