From f8b6183ed434ee9cb07d8adfa5ac660b1ae1cce3 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 22 Dec 2018 11:05:22 -0800
Subject: Include wixnative.exe in the Core.Native .nupkg

This is done to place the wixnative.exe correctly for testing purposes.
The dependency on runtime.win.WixToolset.Core.Native.nupkg is used to
deliver wixnative.exe when publishing.
---
 src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 25034078..195ea7b6 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -23,11 +23,14 @@
 
   <files>
     <file src="$id$.dll" target="lib\netstandard2.0" />
-<!--
-    <file src="..\Win32\wixnative.exe" target="lib\netstandard2.0\x86" />
-    <file src="..\Win32\wixnative.pdb" target="lib\netstandard2.0\x86" />
-    <file src="..\x64\wixnative.exe" target="lib\netstandard2.0\x64" />
-    <file src="..\x64\wixnative.pdb" target="lib\netstandard2.0\x64" />
- -->
+
+    <!--
+      These native executables are included in this .nupkg to place the .exe correctly for tests to work.
+      That are ignored when published. The dependency above is used when publishing the tools.
+     -->
+    <file src="..\Win32\wixnative.x86.exe" target="lib\netstandard2.0" />
+    <file src="..\Win32\wixnative.x86.pdb" target="lib\netstandard2.0" />
+    <file src="..\x64\wixnative.amd64.exe" target="lib\netstandard2.0" />
+    <file src="..\x64\wixnative.amd64.pdb" target="lib\netstandard2.0" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb