diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-12-30 20:36:34 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2018-12-30 20:36:34 -0600 |
| commit | 0480be68d919d232caa081570257674902879382 (patch) | |
| tree | f0010aabacc9599dc9d8c1bc0a71558b78ce6f27 /src/wcautil | |
| parent | 8630e9627cf35aef2a924cb55c5b1a2122c2ae65 (diff) | |
| download | wix-0480be68d919d232caa081570257674902879382.tar.gz wix-0480be68d919d232caa081570257674902879382.tar.bz2 wix-0480be68d919d232caa081570257674902879382.zip | |
Remove "lib" from path in NuGet package to match dutil.
Diffstat (limited to 'src/wcautil')
| -rw-r--r-- | src/wcautil/build/WixToolset.WcaUtil.props | 4 | ||||
| -rw-r--r-- | src/wcautil/wcautil.nuspec | 8 |
2 files changed, 6 insertions, 6 deletions
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 @@ | |||
| 12 | </ItemDefinitionGroup> | 12 | </ItemDefinitionGroup> |
| 13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) "> | 13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) "> |
| 14 | <Link> | 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> | 16 | </Link> |
| 17 | </ItemDefinitionGroup> | 17 | </ItemDefinitionGroup> |
| 18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> | 18 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) "> |
| 19 | <Link> | 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> | 21 | </Link> |
| 22 | </ItemDefinitionGroup> | 22 | </ItemDefinitionGroup> |
| 23 | </Project> | 23 | </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 @@ | |||
| 19 | <files> | 19 | <files> |
| 20 | <file src="build\$id$.props" target="build\" /> | 20 | <file src="build\$id$.props" target="build\" /> |
| 21 | <file src="inc\*" target="build\native\include" /> | 21 | <file src="inc\*" target="build\native\include" /> |
| 22 | <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\lib\v140\x64" /> | 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\lib\v140\x86" /> | 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\lib\v141\x64" /> | 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\lib\v141\x86" /> | 25 | <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" /> |
| 26 | </files> | 26 | </files> |
| 27 | </package> | 27 | </package> |