From bca23da5bf27d31578346894be78d9b704970297 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 5 May 2020 13:14:36 +0200
Subject: [PATCH] installer: ARM64 requires msiexec version >=500

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 installer/installer.vcxproj | 6 +++++-
 installer/installer.wxs     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj
index c2f5468..3fc219a 100644
--- a/installer/installer.vcxproj
+++ b/installer/installer.vcxproj
@@ -105,6 +105,10 @@
     <Import Project="..\wintun.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <InstallerVersionMin>200</InstallerVersionMin>
+    <InstallerVersionMin Condition="'$(Platform)'=='ARM64'">500</InstallerVersionMin>
+  </PropertyGroup>
   <PropertyGroup>
     <OutDir>..\$(WintunPlatform)\$(Configuration)\</OutDir>
     <IntDir>..\$(WintunPlatform)\$(Configuration)\installer-intermediate\</IntDir>
@@ -116,7 +120,7 @@
     <WixArch Condition="'$(Platform)'=='Win32'">x86</WixArch>
     <WixArch Condition="'$(Platform)'=='x64'">x64</WixArch>
     <WixArch Condition="'$(Platform)'=='ARM64'">arm64</WixArch>
-    <WixCandleFlags>$(WixCandleFlags) -nologo -arch $(WixArch) -dWINTUN_PLATFORM=$(WintunPlatform) -dWINTUN_VERSION=$(WintunVersion) -sw1086</WixCandleFlags>
+    <WixCandleFlags>$(WixCandleFlags) -nologo -arch $(WixArch) -dWINTUN_PLATFORM=$(WintunPlatform) -dWINTUN_VERSION=$(WintunVersion) -dINSTALLER_VERSION_MIN=$(InstallerVersionMin) -sw1086</WixCandleFlags>
     <WixLightFlags>$(WixLightFlags) -nologo -b output_dir="$(OutDir.TrimEnd('\'))" -spdb -sw1076 -sw1079</WixLightFlags>
     <WixOutputPath>$(OutDir)</WixOutputPath>
     <WixOutputName>wintun</WixOutputName>
diff --git a/installer/installer.wxs b/installer/installer.wxs
index f1706cf..fbb7c42 100644
--- a/installer/installer.wxs
+++ b/installer/installer.wxs
@@ -10,7 +10,7 @@
       Id="c28309d9-1954-4f2d-a7d1-228850092460"
       Description="Wintun Userspace Tunnel"
       Manufacturer="WireGuard LLC"
-      InstallerVersion="200"
+      InstallerVersion="$(var.INSTALLER_VERSION_MIN)"
       InstallPrivileges="elevated"
       InstallScope="perMachine"
       ReadOnly="yes" />