tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update wixproj to work with wix install on new build image

This commit is contained in:
Tess Gauthier 2023-05-12 14:09:30 -04:00
parent 3687fcd2f2
commit ce2fd04c3b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/win32/install/openssh.wixproj
View File

@ -14,8 +14,11 @@
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>
<!-- Assumes WixToolPath is an input provided at runtime -->
<!-- If building x86/x64 MSI and have Wix 3.11 installed, can also try the below line instead -->
<!-- WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath -->
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@ -25,12 +28,6 @@
</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>