Skip to content

update wix package install #21537

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
TravisEz13 merged 7 commits into from
May 2, 2024
Merged

update wix package install #21537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7cf264b
update wix package install
tgauth Apr 25, 2024
f0dd513
move previous install cleanup
tgauth Apr 29, 2024
7bd223d
add csproj for wix package
tgauth May 2, 2024
aa1a16a
add new csproj dir to restore-pspackage
tgauth May 2, 2024
da8fa7d
move files to wix folder
tgauth May 2, 2024
46be280
revert build.json changes
tgauth May 2, 2024
8ae8dc6
update path in restore-pspackage
tgauth May 2, 2024
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
13 changes: 0 additions & 13 deletions .pipelines/templates/windows-package-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,6 @@ jobs:
ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue

- pwsh: |
# cleanup previous install
if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
}
$toolsDir = New-Item -ItemType Directory -Path '$(Build.ArtifactStagingDirectory)\tools'
$wixUri = 'https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip'

Invoke-RestMethod -Uri $wixUri -OutFile '$(Build.ArtifactStagingDirectory)\tools\wix.zip' -MaximumRetryCount 5 -RetryIntervalSec 10
Import-Module '$(PowerShellRoot)\tools\releaseBuild\Images\microsoft_powershell_windowsservercore\wix.psm1'
$isArm64 = '$(Runtime)' -eq 'arm64'

Install-WixZip -zipPath '$(Build.ArtifactStagingDirectory)\tools\wix.zip' -arm64:$isArm64

$msixUrl = '$(makeappUrl)'
Invoke-RestMethod -Uri $msixUrl -OutFile '$(Pipeline.Workspace)\makeappx.zip'
Expand-Archive '$(Pipeline.Workspace)\makeappx.zip' -destination '\' -Force
Expand Down
7 changes: 6 additions & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ function Restore-PSPackage

if (-not $ProjectDirs)
{
$ProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules")
$ProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules", "$PSScriptRoot/tools/wix")

if ($Options.Runtime -like 'fxdependent*') {
$ProjectDirs += "$PSScriptRoot/src/Microsoft.PowerShell.GlobalTool.Shim"
Expand Down Expand Up @@ -2295,6 +2295,11 @@ function Start-PSBootstrap {
$psInstallFile = [System.IO.Path]::Combine($PSScriptRoot, "tools", "install-powershell.ps1")
& $psInstallFile -AddToPath
}
if ($Package) {
Import-Module '$(PowerShellRoot)\tools\wix\wix.psm1'
$isArm64 = '$(Runtime)' -eq 'arm64'
Install-Wix -arm64:$isArm64
}
}
} finally {
Pop-Location
Expand Down
9 changes: 9 additions & 0 deletions tools/wix/Microsoft.PowerShell.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="..\..\PowerShell.Common.props" />

<ItemGroup>
<!-- Keep version in sync with wix.psm1 line 18 -->
<PackageReference Include="WiX" Version="3.14.1" />
</ItemGroup>

</Project>
13 changes: 9 additions & 4 deletions ...oft_powershell_windowsservercore/wix.psm1 → tools/wix/wix.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ Import-Module "$PSScriptRoot\dockerInstall.psm1"

# Install using Wix Zip because the MSI requires an older version of dotnet
# which was large and unstable in docker
function Install-WixZip
function Install-Wix
{
param($zipPath, $arm64 = $false)
param($arm64 = $false)

$targetRoot = $arm64 ? "${env:ProgramFiles(x86)}\Arm Support WiX Toolset xcopy" : "${env:ProgramFiles(x86)}\WiX Toolset xcopy"
# cleanup previous install
if(Test-Path $targetRoot) {
Remove-Item $targetRoot -Recurse -Force
}
$binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
Write-Verbose "Expanding $zipPath to $binPath ..." -Verbose
Expand-Archive -Path $zipPath -DestinationPath $binPath -Force
Register-PSRepository -Name NuGetGallery -SourceLocation https://api.nuget.org/v3/index.json
# keep version in sync with Microsoft.PowerShell.Packaging.csproj
Save-Module -name wix -RequiredVersion 3.14.1 -path "$binPath/"
$docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
$sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
$docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'
Expand Down