Skip to content

Commit 913e43c

Browse files
authored
add support for arm64 msi (#659)
1 parent 2bf8005 commit 913e43c

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

contrib/win32/install/openssh.wixproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
ProductVersion=$(ProductVersion);
1515
</DefineConstants>
1616
<DefineSolutionProperties>false</DefineSolutionProperties>
17+
<!-- This is sufficient for x86 and x64 but gets overwritten below for ARM64 -->
1718
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1819
</PropertyGroup>
1920

@@ -24,6 +25,12 @@
2425
</DefineConstants>
2526
</PropertyGroup>
2627

28+
<PropertyGroup Condition="'$(Platform)' == 'ARM64'">
29+
<!-- Assumes WixToolPath input is provided at runtime -->
30+
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
31+
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
32+
</PropertyGroup>
33+
2734
<ItemGroup>
2835
<BindInputPaths Include="..\..\..\bin\$(Platform)\$(Configuration)" />
2936
</ItemGroup>

contrib/win32/install/product.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<?elseif $(var.Platform) = "x86"?>
1212
<?define ProgramFilesFolder = "ProgramFilesFolder"?>
1313
<?define UpgradeCode = "2A1799F1-5B26-4DDC-A0C7-03F75C4C08D2"?>
14+
<?elseif $(var.Platform) = "ARM64"?>
15+
<?define ProgramFilesFolder = "ProgramFiles64Folder"?>
16+
<?define UpgradeCode = "5D153A07-920A-4978-8B33-8447DD4C42F9"?>
1417
<?else?>
1518
<?error Platform $(var.Platform) is not supported?>
1619
<?endif?>

0 commit comments

Comments
 (0)