Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

installer: ARM64 requires msiexec version >=500

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-05-05 13:14:36 +02:00 committed by Jason A. Donenfeld
parent 9b61d0d851
commit bca23da5bf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/installer.vcxproj
View File

@ -105,6 +105,10 @@
<Import Project="..\wintun.props" /> <Import Project="..\wintun.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup>
<InstallerVersionMin>200</InstallerVersionMin>
<InstallerVersionMin Condition="'$(Platform)'=='ARM64'">500</InstallerVersionMin>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OutDir>..\$(WintunPlatform)\$(Configuration)\</OutDir> <OutDir>..\$(WintunPlatform)\$(Configuration)\</OutDir>
<IntDir>..\$(WintunPlatform)\$(Configuration)\installer-intermediate\</IntDir> <IntDir>..\$(WintunPlatform)\$(Configuration)\installer-intermediate\</IntDir>
@ -116,7 +120,7 @@
<WixArch Condition="'$(Platform)'=='Win32'">x86</WixArch> <WixArch Condition="'$(Platform)'=='Win32'">x86</WixArch>
<WixArch Condition="'$(Platform)'=='x64'">x64</WixArch> <WixArch Condition="'$(Platform)'=='x64'">x64</WixArch>
<WixArch Condition="'$(Platform)'=='ARM64'">arm64</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> <WixLightFlags>$(WixLightFlags) -nologo -b output_dir="$(OutDir.TrimEnd('\'))" -spdb -sw1076 -sw1079</WixLightFlags>
<WixOutputPath>$(OutDir)</WixOutputPath> <WixOutputPath>$(OutDir)</WixOutputPath>
<WixOutputName>wintun</WixOutputName> <WixOutputName>wintun</WixOutputName>

2
installer/installer.wxs
View File

@ -10,7 +10,7 @@
Id="c28309d9-1954-4f2d-a7d1-228850092460" Id="c28309d9-1954-4f2d-a7d1-228850092460"
Description="Wintun Userspace Tunnel" Description="Wintun Userspace Tunnel"
Manufacturer="WireGuard LLC" Manufacturer="WireGuard LLC"
InstallerVersion="200" InstallerVersion="$(var.INSTALLER_VERSION_MIN)"
InstallPrivileges="elevated" InstallPrivileges="elevated"
InstallScope="perMachine" InstallScope="perMachine"
ReadOnly="yes" /> ReadOnly="yes" />