From ecf0f8e0a3038e65d18cb3ace71b845af27407ae Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 16 Mar 2021 10:48:29 -0700
Subject: Implement validation and fix abandoned validation mutex

Fixes wixtoolset/issues#5946
Fixes wixtoolset/issues#6366
---
 src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/WixToolset.Core.Native/WixToolset.Core.Native.csproj')

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 @@
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="cubes\darice.cub" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="cubes\mergemod.cub" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" />
     <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=Win32" />
@@ -29,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb