diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-09 15:12:54 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-09 15:42:36 -0700 |
| commit | 1ec68f7c9925536e9f11f5f849eb812a99dfa8ce (patch) | |
| tree | 18aaba72609b397504cae8e37577d65de3d6a828 /src | |
| parent | 570c113409a6aaab462efec8e223e75a89e4ded0 (diff) | |
| download | wix-1ec68f7c9925536e9f11f5f849eb812a99dfa8ce.tar.gz wix-1ec68f7c9925536e9f11f5f849eb812a99dfa8ce.tar.bz2 wix-1ec68f7c9925536e9f11f5f849eb812a99dfa8ce.zip | |
Support VS2019
Diffstat (limited to 'src')
| -rw-r--r-- | src/dutil/build/WixToolset.DUtil.props | 5 | ||||
| -rw-r--r-- | src/dutil/dutil.nuspec | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/dutil/build/WixToolset.DUtil.props b/src/dutil/build/WixToolset.DUtil.props index e39d9cea..35749be8 100644 --- a/src/dutil/build/WixToolset.DUtil.props +++ b/src/dutil/build/WixToolset.DUtil.props | |||
| @@ -20,4 +20,9 @@ | |||
| 20 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\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 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) "> | ||
| 24 | <Link> | ||
| 25 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 26 | </Link> | ||
| 27 | </ItemDefinitionGroup> | ||
| 23 | </Project> | 28 | </Project> |
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec index f74081be..ab74dc79 100644 --- a/src/dutil/dutil.nuspec +++ b/src/dutil/dutil.nuspec | |||
| @@ -20,7 +20,15 @@ | |||
| 20 | <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" /> | 20 | <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" /> |
| 21 | <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" /> | 21 | <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" /> |
| 22 | <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" /> | 22 | <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" /> |
| 23 | <!-- | ||
| 23 | <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" /> | 24 | <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" /> |
| 24 | <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> | 25 | <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> |
| 26 | --> | ||
| 27 | <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" /> | ||
| 28 | <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" /> | ||
| 29 | <!-- | ||
| 30 | <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" /> | ||
| 31 | <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" /> | ||
| 32 | --> | ||
| 25 | </files> | 33 | </files> |
| 26 | </package> | 34 | </package> |