@joebigelow / wix / commits / 4badef4f

Fix lib path in WixToolset.BalUtil.props and add dependencies in balutil.nuspec.

Sean Hall committed Dec 30, 2018 at 20:40 UTC 4badef4fea21e91fb0b1558cf07260ee82131562
2 files changed +6 -2
src/balutil/balutil.nuspec
+4
@@ -11,6 +11,10 @@
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <description>$description$</description>
13 <copyright>$copyright$</copyright>
14 + <dependencies>
15 + <dependency id="WixToolset.BootstrapperCore" version="[4,5)" />
16 + <dependency id="WixToolset.DUtil" version="[4,5)" />
17 + </dependencies>
18 </metadata>
19
20 <files>
src/balutil/build/WixToolset.BalUtil.props
+2 -2
@@ -12,12 +12,12 @@
12 </ItemDefinitionGroup>
13 <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
14 <Link>
15 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16 </Link>
17 </ItemDefinitionGroup>
18 <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19 <Link>
20 - <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
20 + <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 </Link>
22 </ItemDefinitionGroup>
23 </Project>