diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-09-17 15:21:10 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-09-17 15:21:10 -0700 |
| commit | 851e838f9ee1a0388d088eac266655df2fc6d95d (patch) | |
| tree | e41eef3716b67fdb51c6a4fbe3924e15472d40f3 | |
| parent | f35f0d078762a48687b29ac224278a7defd5325a (diff) | |
| download | wix-851e838f9ee1a0388d088eac266655df2fc6d95d.tar.gz wix-851e838f9ee1a0388d088eac266655df2fc6d95d.tar.bz2 wix-851e838f9ee1a0388d088eac266655df2fc6d95d.zip | |
Remove "lib" from path in NuGet package
| -rw-r--r-- | src/dutil/build/WixToolset.DUtil.props | 4 | ||||
| -rw-r--r-- | src/dutil/dutil.nuspec | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/dutil/build/WixToolset.DUtil.props b/src/dutil/build/WixToolset.DUtil.props index ec1ae2a4..e39d9cea 100644 --- a/src/dutil/build/WixToolset.DUtil.props +++ b/src/dutil/build/WixToolset.DUtil.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)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.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)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 21 | </Link> | 21 | </Link> |
| 22 | </ItemDefinitionGroup> | 22 | </ItemDefinitionGroup> |
| 23 | </Project> | 23 | </Project> |
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec index 337d43cc..fd40b1d9 100644 --- a/src/dutil/dutil.nuspec +++ b/src/dutil/dutil.nuspec | |||
| @@ -15,9 +15,9 @@ | |||
| 15 | <files> | 15 | <files> |
| 16 | <file src="build\$id$.props" target="build\" /> | 16 | <file src="build\$id$.props" target="build\" /> |
| 17 | <file src="inc\*" target="build\native\include" /> | 17 | <file src="inc\*" target="build\native\include" /> |
| 18 | <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\lib\v140\x64" /> | 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\lib\v140\x86" /> | 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\lib\v141\x64" /> | 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\lib\v141\x86" /> | 21 | <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" /> |
| 22 | </files> | 22 | </files> |
| 23 | </package> | 23 | </package> |