diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-12-30 20:40:11 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2018-12-30 20:40:11 -0600 |
| commit | 4badef4fea21e91fb0b1558cf07260ee82131562 (patch) | |
| tree | 8d3ef5cc0ca3862b9143cd2d691fce4e83906d31 /src | |
| parent | f7ac308e1384f6a7c703a7429de79e67afc41e71 (diff) | |
| download | wix-4badef4fea21e91fb0b1558cf07260ee82131562.tar.gz wix-4badef4fea21e91fb0b1558cf07260ee82131562.tar.bz2 wix-4badef4fea21e91fb0b1558cf07260ee82131562.zip | |
Fix lib path in WixToolset.BalUtil.props and add dependencies in balutil.nuspec.
Diffstat (limited to 'src')
| -rw-r--r-- | src/balutil/balutil.nuspec | 4 | ||||
| -rw-r--r-- | src/balutil/build/WixToolset.BalUtil.props | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec index fb07def8..67ed9bde 100644 --- a/src/balutil/balutil.nuspec +++ b/src/balutil/balutil.nuspec | |||
| @@ -11,6 +11,10 @@ | |||
| 11 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 11 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 12 | <description>$description$</description> | 12 | <description>$description$</description> |
| 13 | <copyright>$copyright$</copyright> | 13 | <copyright>$copyright$</copyright> |
| 14 | <dependencies> | ||
| 15 | <dependency id="WixToolset.BootstrapperCore" version="[4,5)" /> | ||
| 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | ||
| 17 | </dependencies> | ||
| 14 | </metadata> | 18 | </metadata> |
| 15 | 19 | ||
| 16 | <files> | 20 | <files> |
diff --git a/src/balutil/build/WixToolset.BalUtil.props b/src/balutil/build/WixToolset.BalUtil.props index 6275e0e8..0c92a3fb 100644 --- a/src/balutil/build/WixToolset.BalUtil.props +++ b/src/balutil/build/WixToolset.BalUtil.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)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\balutil.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)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | 20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 21 | </Link> | 21 | </Link> |
| 22 | </ItemDefinitionGroup> | 22 | </ItemDefinitionGroup> |
| 23 | </Project> | 23 | </Project> |