From 913e43cb7143ef8fe9eea08e86ef1c1f0815e20e Mon Sep 17 00:00:00 2001
From: Tess Gauthier <tgauth@bu.edu>
Date: Tue, 7 Feb 2023 17:07:13 -0500
Subject: [PATCH] add support for arm64 msi (#659)

---
 contrib/win32/install/openssh.wixproj | 7 +++++++
 contrib/win32/install/product.wxs     | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/contrib/win32/install/openssh.wixproj b/contrib/win32/install/openssh.wixproj
index 538e6cf67..5b4fd331a 100644
--- a/contrib/win32/install/openssh.wixproj
+++ b/contrib/win32/install/openssh.wixproj
@@ -14,6 +14,7 @@
             ProductVersion=$(ProductVersion);
         </DefineConstants>
         <DefineSolutionProperties>false</DefineSolutionProperties>
+        <!-- This is sufficient for x86 and x64 but gets overwritten below for ARM64 -->
         <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     </PropertyGroup>
 
@@ -24,6 +25,12 @@
         </DefineConstants>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
+        <!-- Assumes WixToolPath input is provided at runtime -->
+        <WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
+        <WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
+    </PropertyGroup>
+
     <ItemGroup>
         <BindInputPaths Include="..\..\..\bin\$(Platform)\$(Configuration)" />
     </ItemGroup>
diff --git a/contrib/win32/install/product.wxs b/contrib/win32/install/product.wxs
index 30c07a8ab..9a47e4cb0 100644
--- a/contrib/win32/install/product.wxs
+++ b/contrib/win32/install/product.wxs
@@ -11,6 +11,9 @@
 <?elseif $(var.Platform) = "x86"?>
 <?define ProgramFilesFolder = "ProgramFilesFolder"?>
 <?define UpgradeCode = "2A1799F1-5B26-4DDC-A0C7-03F75C4C08D2"?>
+<?elseif $(var.Platform) = "ARM64"?>
+<?define ProgramFilesFolder = "ProgramFiles64Folder"?>
+<?define UpgradeCode = "5D153A07-920A-4978-8B33-8447DD4C42F9"?>
 <?else?>
 <?error Platform $(var.Platform) is not supported?>
 <?endif?>