diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-16 10:48:29 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-16 11:01:46 -0700 |
| commit | ecf0f8e0a3038e65d18cb3ace71b845af27407ae (patch) | |
| tree | 1c4d337e7d9790e52f47fe42b80e5a1577498e1d /src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |
| parent | 089a08fd6b9398b0e1040f96b8e24ba81acfe05b (diff) | |
| download | wix-ecf0f8e0a3038e65d18cb3ace71b845af27407ae.tar.gz wix-ecf0f8e0a3038e65d18cb3ace71b845af27407ae.tar.bz2 wix-ecf0f8e0a3038e65d18cb3ace71b845af27407ae.zip | |
Implement validation and fix abandoned validation mutex
Fixes wixtoolset/issues#5946
Fixes wixtoolset/issues#6366
Diffstat (limited to 'src/WixToolset.Core.Native/WixToolset.Core.Native.csproj')
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj index 41e75f99..4069b6b4 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
| @@ -11,6 +11,11 @@ | |||
| 11 | <CreateDocumentationFile>true</CreateDocumentationFile> | 11 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | ||
| 15 | <None Include="cubes\darice.cub" CopyToOutputDirectory="PreserveNewest" /> | ||
| 16 | <None Include="cubes\mergemod.cub" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | </ItemGroup> | ||
| 18 | |||
| 14 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 19 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 15 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" /> | 20 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" /> |
| 16 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=Win32" /> | 21 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=Win32" /> |
| @@ -29,7 +34,7 @@ | |||
| 29 | </ItemGroup> | 34 | </ItemGroup> |
| 30 | 35 | ||
| 31 | <ItemGroup> | 36 | <ItemGroup> |
| 32 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 37 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> |
| 33 | </ItemGroup> | 38 | </ItemGroup> |
| 34 | 39 | ||
| 35 | <ItemGroup> | 40 | <ItemGroup> |