Remove "lib" from path in NuGet package
Rob Mensching committed
Sep 17, 2017 at 15:21 UTC
851e838f9ee1a0388d088eac266655df2fc6d95d
2 files changed
+6
-6
src/dutil/build/WixToolset.DUtil.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)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16
</Link>
17
</ItemDefinitionGroup>
18
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19
<Link>
20
- <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
20
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21
</Link>
22
</ItemDefinitionGroup>
23
</Project>
src/dutil/dutil.nuspec
+4
-4
@@ -15,9 +15,9 @@
15
<files>
16
<file src="build\$id$.props" target="build\" />
17
<file src="inc\*" target="build\native\include" />
18
- <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\lib\v140\x64" />
19
- <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\lib\v140\x86" />
20
- <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\lib\v141\x64" />
21
- <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\lib\v141\x86" />
18
+ <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\v140\x64" />
19
+ <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" />
20
+ <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" />
21
+ <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" />
22
</files>
23
</package>