From ea3d18595a610ee07b03f07af4f03cf75b5ab420 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 29 Nov 2017 14:08:08 -0800
Subject: Improved cabinet handling

---
 .../WixToolset.Core.Native.csproj                  | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(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 3e66d84e..aa87186b 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <Description>Core Native</Description>
     <!-- <BeforePack>SetNuspecProperties</BeforePack> -->
   </PropertyGroup>
 
@@ -10,9 +11,26 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
   </ItemGroup>
 
-  <!-- <ItemGroup>
-    <ProjectReference Include="..\winterop\winterop.vcxproj" ExcludeAssets="All" />
-  </ItemGroup> -->
+  <Target Name="BuildWixNative"
+          BeforeTargets="GetCopyToOutputDirectoryItems">
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" />
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" />
+
+    <ItemGroup>
+      <NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb">
+        <TargetRelativeFolder>x86\</TargetRelativeFolder>
+      </NativeProjectOutput>
+      <NativeProjectOutput Include="$(OutputPath)..\x64\*.exe;$(OutputPath)..\x64\*.pdb">
+        <TargetRelativeFolder>x64\</TargetRelativeFolder>
+      </NativeProjectOutput>
+
+      <AllItemsFullPathWithTargetPath Include="@(NativeProjectOutput->'%(FullPath)')">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <TargetPath>%(TargetRelativeFolder)%(Filename)%(Extension)</TargetPath>
+      </AllItemsFullPathWithTargetPath>
+    </ItemGroup>
+  </Target>
+
   <Target Name="SetNuspecProperties"
           AfterTargets="Build">
     <PropertyGroup>
-- 
cgit v1.2.3-55-g6feb