From 0480be68d919d232caa081570257674902879382 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 30 Dec 2018 20:36:34 -0600
Subject: Remove "lib" from path in NuGet package to match dutil.

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

(limited to 'src/wcautil')

diff --git a/src/wcautil/build/WixToolset.WcaUtil.props b/src/wcautil/build/WixToolset.WcaUtil.props
index 71a9743e..6eb8188f 100644
--- a/src/wcautil/build/WixToolset.WcaUtil.props
+++ b/src/wcautil/build/WixToolset.WcaUtil.props
@@ -12,12 +12,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v140\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec
index c5d7e4bd..66baa81b 100644
--- a/src/wcautil/wcautil.nuspec
+++ b/src/wcautil/wcautil.nuspec
@@ -19,9 +19,9 @@
   <files>
     <file src="build\$id$.props" target="build\" />
     <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\lib\v140\x64" />
-    <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\lib\v140\x86" />
-    <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\lib\v141\x64" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\lib\v141\x86" />
+    <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\v140\x64" />
+    <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb