aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-12-22 11:05:22 -0800
committerRob Mensching <rob@firegiant.com>2018-12-22 11:05:22 -0800
commitf8b6183ed434ee9cb07d8adfa5ac660b1ae1cce3 (patch)
treebfe2f727a18d7f41aebaf3df9ef8f86a6755652c
parentc90ae13f242350786cf9103330c28e660d35eeb8 (diff)
downloadwix-f8b6183ed434ee9cb07d8adfa5ac660b1ae1cce3.tar.gz
wix-f8b6183ed434ee9cb07d8adfa5ac660b1ae1cce3.tar.bz2
wix-f8b6183ed434ee9cb07d8adfa5ac660b1ae1cce3.zip
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.
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec15
1 files changed, 9 insertions, 6 deletions
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 @@
23 23
24 <files> 24 <files>
25 <file src="$id$.dll" target="lib\netstandard2.0" /> 25 <file src="$id$.dll" target="lib\netstandard2.0" />
26<!-- 26
27 <file src="..\Win32\wixnative.exe" target="lib\netstandard2.0\x86" /> 27 <!--
28 <file src="..\Win32\wixnative.pdb" target="lib\netstandard2.0\x86" /> 28 These native executables are included in this .nupkg to place the .exe correctly for tests to work.
29 <file src="..\x64\wixnative.exe" target="lib\netstandard2.0\x64" /> 29 That are ignored when published. The dependency above is used when publishing the tools.
30 <file src="..\x64\wixnative.pdb" target="lib\netstandard2.0\x64" /> 30 -->
31 --> 31 <file src="..\Win32\wixnative.x86.exe" target="lib\netstandard2.0" />
32 <file src="..\Win32\wixnative.x86.pdb" target="lib\netstandard2.0" />
33 <file src="..\x64\wixnative.amd64.exe" target="lib\netstandard2.0" />
34 <file src="..\x64\wixnative.amd64.pdb" target="lib\netstandard2.0" />
32 </files> 35 </files>
33</package> 36</package>