Thanks to visit codestin.com
Credit goes to github.com

Skip to content

update wix install in ci.psm1 #23870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 1 commit into from
May 29, 2024
Merged

update wix install in ci.psm1 #23870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 2 additions & 28 deletions tools/ci.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,8 @@ function Invoke-CIFinish
}
}

Install-WixArmZip
Import-Module "$PSScriptRoot\wix\wix.psm1"
Install-Wix -arm64:$true
$packages = Start-PSPackage -Type $packageTypes -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime

foreach ($package in $packages) {
Expand Down Expand Up @@ -622,33 +623,6 @@ function Invoke-CIFinish
}
}

function Install-WixArmZip
{
# cleanup previous install
if((Test-Path "${env:ProgramFiles(x86)}\Arm Support WiX Toolset xcopy")) {
Remove-Item "${env:ProgramFiles(x86)}\Arm Support WiX Toolset xcopy" -Recurse -Force
}

# This URI is for wix 3.14 which supports generating msi for arm architecures.
$wixUriArmSupport = 'https://aka.ms/ps-wix-3-14-zip'
$zipArmSupport = "$env:TEMP\wixArmSupport.zip"
$targetRoot = "${env:ProgramFiles(x86)}\Arm Support WiX Toolset xcopy"
Invoke-RestMethod -Uri $wixUriArmSupport -OutFile $zipArmSupport

$binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
Write-Verbose "Expanding $zipArmSupport to $binPath ..." -Verbose
Expand-Archive -Path $zipArmSupport -DestinationPath $binPath -Force
$docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
$sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
$docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'
$sdkTargetPath = Join-Path -Path $targetRoot -ChildPath 'sdk'
Write-Verbose "Fixing folder structure ..." -Verbose
Move-Item -Path $docExpandPath -Destination $docTargetPath
Move-Item -Path $sdkExpandPath -Destination $sdkTargetPath
Set-Path -Append -Path $binPath
Write-Verbose "Done installing WIX for arm!"
}

function Set-Path
{
param
Expand Down