From 4badef4fea21e91fb0b1558cf07260ee82131562 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 30 Dec 2018 20:40:11 -0600
Subject: Fix lib path in WixToolset.BalUtil.props and add dependencies in
 balutil.nuspec.

---
 src/balutil/balutil.nuspec                 | 4 ++++
 src/balutil/build/WixToolset.BalUtil.props | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/balutil')

diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index fb07def8..67ed9bde 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -11,6 +11,10 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <dependencies>
+        <dependency id="WixToolset.BootstrapperCore" version="[4,5)" />
+        <dependency id="WixToolset.DUtil" version="[4,5)" />
+    </dependencies>
   </metadata>
 
   <files>
diff --git a/src/balutil/build/WixToolset.BalUtil.props b/src/balutil/build/WixToolset.BalUtil.props
index 6275e0e8..0c92a3fb 100644
--- a/src/balutil/build/WixToolset.BalUtil.props
+++ b/src/balutil/build/WixToolset.BalUtil.props
@@ -12,12 +12,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb