diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-05-21 23:08:52 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-05-22 15:21:29 -0700 |
| commit | e28fcc906046ed12a867b621fc0eabf75fd9db09 (patch) | |
| tree | 4d879b9e222fcdeadf6091b4b185655ac71b8845 /src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |
| parent | a4cc6c64cb94279daeef2ab14e6319105806c053 (diff) | |
| download | wix-e28fcc906046ed12a867b621fc0eabf75fd9db09.tar.gz wix-e28fcc906046ed12a867b621fc0eabf75fd9db09.tar.bz2 wix-e28fcc906046ed12a867b621fc0eabf75fd9db09.zip | |
Add support using mergmod.dll and its interfaces
Diffstat (limited to 'src/WixToolset.Core.Native/WixToolset.Core.Native.csproj')
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj index ee5cbc8e..ca8797a9 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
| @@ -23,13 +23,13 @@ | |||
| 23 | </PropertyGroup> | 23 | </PropertyGroup> |
| 24 | 24 | ||
| 25 | <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' "> | 25 | <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' "> |
| 26 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | 26 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> |
| 27 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | 27 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> |
| 28 | </MSBuild> | 28 | </MSBuild> |
| 29 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | 29 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> |
| 30 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | 30 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> |
| 31 | </MSBuild> | 31 | </MSBuild> |
| 32 | 32 | ||
| 33 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> | 33 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> |
| 34 | 34 | ||
| 35 | <ItemGroup> | 35 | <ItemGroup> |