Skip to content
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

Generate msi for win-arm64 installer #20516

Merged
merged 19 commits into from
Feb 1, 2024
Merged

Generate msi for win-arm64 installer #20516

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7d98c00
make changes in wxs files and packaging
anamnavi Jul 26, 2023
47e40b9
fix todo placeholders
anamnavi Aug 31, 2023
e344419
create GUIDs for stable and preview arm upgrade codes
anamnavi Aug 31, 2023
450a7fa
Get wix arm support path when generating new msi package
anamnavi Oct 18, 2023
73ea23b
ensure UpgradeCodes are unique for Product and Bundle files
anamnavi Oct 19, 2023
b77584d
use correct url for wix 3.14 package in error message
anamnavi Oct 25, 2023
8850e05
remove condition that prevents msi being created for arm
anamnavi Oct 25, 2023
a38f5bb
fix call to Get-WixPath to reflect arm product architecture
anamnavi Oct 26, 2023
756509a
ensure win-arm64 msi is signed
anamnavi Oct 30, 2023
d1e63c8
create exe for win-arm64
anamnavi Nov 7, 2023
4270035
add arm64 to possible values for ProductArchitecture for New-ExePackage
anamnavi Nov 7, 2023
0773e47
update link to get wix314 zip
anamnavi Nov 8, 2023
bd28e70
confirm that wix path for non arm version is present
anamnavi Nov 27, 2023
014e7c5
fix typos
anamnavi Nov 27, 2023
d1efb4e
add Verbose switch
anamnavi Nov 27, 2023
ee25471
add function to ci.psm1 to install wix version required for arm support
anamnavi Nov 27, 2023
2777247
fix typos
anamnavi Nov 27, 2023
8f00cf9
fix typos
anamnavi Nov 27, 2023
eaaf87f
clean up verbose statements from before used to debug
anamnavi Nov 28, 2023
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
9 changes: 9 additions & 0 deletions assets/wix/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
<?else?>
<?define UpgradeCode = $(var.UpgradeCodeRelease)?>
<?endif?>
<?elseif $(sys.BUILDARCH) = "ARM64"?>
<?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))"?>
<?define UpgradeCodePreview = "f064cf16-97b7-4550-b392-ce0f4a6823a3"?>
<?define UpgradeCodeRelease = "75c68ab2-09d8-46b8-b697-d829bdd4c94f"?>
<?if $(var.IsPreview)=True?>
<?define UpgradeCode = $(var.UpgradeCodePreview)?>
<?else?>
<?define UpgradeCode = $(var.UpgradeCodeRelease)?>
<?endif?>
<?else?>
<?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))"?>
<?define UpgradeCodePreview = "86abcfbd-1ccc-4a88-b8b2-0facfde29094"?>
Expand Down
9 changes: 9 additions & 0 deletions assets/wix/bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
<?else?>
<?define UpgradeCode = $(var.UpgradeCodeRelease)?>
<?endif?>
<?elseif $(sys.BUILDARCH) = "ARM64"?>
<?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))"?>
<?define UpgradeCodePreview = "499e9123-48aa-41df-aa20-6f4d28b54722"?>
<?define UpgradeCodeRelease = "4cc0e36a-17db-4c84-b4f4-560a11e7ddb6"?>
<?if $(var.IsPreview)=True?>
<?define UpgradeCode = $(var.UpgradeCodePreview)?>
<?else?>
<?define UpgradeCode = $(var.UpgradeCodeRelease)?>
<?endif?>
<?else?>
<?define UpgradeCodePreview = "4A699A9C-E904-4024-BCD2-44E098A8C6BD"?>
<?define UpgradeCodeRelease = "ED46CB02-64B3-43FD-A63E-6CF269D8C21C"?>
Expand Down
33 changes: 27 additions & 6 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,12 @@ function Start-PSPackage {
$TargetArchitecture = "x86"
$r2rArchitecture = "i386"
}
elseif ($Runtime -match "-arm64")
{
$TargetArchitecture = "arm64"
$r2rArchitecture = "arm64"
}

Write-Verbose "TargetArchitecture = $TargetArchitecture" -Verbose

$Arguments = @{
Expand Down Expand Up @@ -3186,12 +3192,23 @@ function Get-NugetSemanticVersion
# Get the paths to various WiX tools
function Get-WixPath
{
$wixToolsetBinPath = "${env:ProgramFiles(x86)}\WiX Toolset *\bin"
[CmdletBinding()]
param (
[bool] $IsProductArchitectureArm = $false
)

$wixToolsetBinPath = $IsProductArchitectureArm ? "${env:ProgramFiles(x86)}\Arm Support WiX Toolset *\bin" : "${env:ProgramFiles(x86)}\WiX Toolset *\bin"

Write-Verbose "Ensure Wix Toolset is present on the machine @ $wixToolsetBinPath"
if (-not (Test-Path $wixToolsetBinPath))
{
throw "The latest version of Wix Toolset 3.11 is required to create MSI package. Please install it from https://github.com/wixtoolset/wix3/releases"
if (!$IsProductArchitectureArm)
{
throw "The latest version of Wix Toolset 3.11 is required to create MSI package. Please install it from https://github.com/wixtoolset/wix3/releases"
}
else {
throw "The latest version of Wix Toolset 3.14 is required to create MSI package for arm. Please install it from https://powershellinfraartifacts.blob.core.windows.net/test/wix314-binaries.zip"
}
}

## Get the latest if multiple versions exist.
Expand All @@ -3215,7 +3232,6 @@ function Get-WixPath
WixLightExePath = $wixLightExePath
WixInsigniaExePath = $wixInsigniaExePath
}

}

<#
Expand Down Expand Up @@ -3267,7 +3283,7 @@ function New-MSIPackage

# Architecture to use when creating the MSI
[Parameter(Mandatory = $true)]
[ValidateSet("x86", "x64")]
[ValidateSet("x86", "x64", "arm64")]
[ValidateNotNullOrEmpty()]
[string] $ProductTargetArchitecture,

Expand All @@ -3277,7 +3293,7 @@ function New-MSIPackage
[string] $CurrentLocation = (Get-Location)
)

$wixPaths = Get-WixPath
$wixPaths = Get-WixPath -IsProductArchitectureArm ($ProductTargetArchitecture -eq "arm64")

$windowsNames = Get-WindowsNames -ProductName $ProductName -ProductNameSuffix $ProductNameSuffix -ProductVersion $ProductVersion
$productSemanticVersionWithName = $windowsNames.ProductSemanticVersionWithName
Expand Down Expand Up @@ -3315,6 +3331,11 @@ function New-MSIPackage
$fileArchitecture = 'x86'
$ProductProgFilesDir = "ProgramFilesFolder"
}
elseif ($ProductTargetArchitecture -eq "arm64")
{
$fileArchitecture = 'arm64'
$ProductProgFilesDir = "ProgramFiles64Folder"
}

$wixFragmentPath = Join-Path $env:Temp "Fragment.wxs"

Expand Down Expand Up @@ -3551,7 +3572,7 @@ function Start-MsiBuild {

$outDir = $env:Temp

$wixPaths = Get-WixPath
$wixPaths = Get-WixPath -IsProductArchitectureArm ($ProductTargetArchitecture -eq "arm64")

$extensionArgs = @()
foreach ($extensionName in $Extension) {
Expand Down
7 changes: 2 additions & 5 deletions tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,8 @@ try

if (!$Symbols -and $Runtime -notlike 'fxdependent*' -and !$ForMinimalSize)
{
if ($Runtime -notmatch 'arm')
{
Write-Verbose "Starting powershell packaging(msi)..." -Verbose
Start-PSPackage @pspackageParams @releaseTagParam
}
Write-Verbose "Starting powershell packaging(msi)..." -Verbose
Start-PSPackage @pspackageParams @releaseTagParam

$pspackageParams['Type']='msix'
Write-Verbose "Starting powershell packaging(msix)..." -Verbose
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
parameters:
architecture: arm64
version: $(version)
msi: no
msi: yes

- template: upload.yml
parameters:
Expand Down
Loading