Remove "lib" from path in NuGet package to match dutil.
Sean Hall committed
Dec 30, 2018 at 20:36 UTC
0480be68d919d232caa081570257674902879382
2 files changed
+6
-6
src/wcautil/build/WixToolset.WcaUtil.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)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
15
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
16
</Link>
17
</ItemDefinitionGroup>
18
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
19
<Link>
20
- <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
20
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\wcautil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21
</Link>
22
</ItemDefinitionGroup>
23
</Project>
src/wcautil/wcautil.nuspec
+4
-4
@@ -19,9 +19,9 @@
19
<files>
20
<file src="build\$id$.props" target="build\" />
21
<file src="inc\*" target="build\native\include" />
22
- <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\lib\v140\x64" />
23
- <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\lib\v140\x86" />
24
- <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\lib\v141\x64" />
25
- <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\lib\v141\x86" />
22
+ <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\v140\x64" />
23
+ <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
24
+ <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
25
+ <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
26
</files>
27
</package>