From 670075995cf1b78d0a66e1a7678fd2facc8958ff Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 9 May 2020 21:08:49 +1000
Subject: Use NATIVE_DLL_SEARCH_DIRECTORIES to support cross-platform
 wixnative.exe

---
 src/wixnative/runtime.win.WixToolset.Core.Native.nuspec | 8 ++++----
 src/wixnative/wixnative.vcxproj                         | 7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/wixnative')

diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
index f7697694..59eff4e6 100644
--- a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
+++ b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
@@ -14,9 +14,9 @@
   </metadata>
 
   <files>
-    <file src="Win32\wixnative.x86.exe" target="runtimes\win-x86\native" />
-    <file src="Win32\wixnative.x86.pdb" target="runtimes\win-x86\native" />
-    <file src="x64\wixnative.amd64.exe" target="runtimes\win-x64\native" />
-    <file src="x64\wixnative.amd64.pdb" target="runtimes\win-x64\native" />
+    <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
+    <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
+    <file src="x64\wixnative.exe" target="runtimes\win-x64\native" />
+    <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" />
   </files>
 </package>
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index 1c1c9010..57afcc0b 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -23,16 +23,11 @@
     </ProjectConfiguration>
   </ItemGroup>
 
-  <PropertyGroup>
-    <NameSuffix Condition=" '$(Platform)'=='Win32' ">x86</NameSuffix>
-    <NameSuffix Condition=" '$(Platform)'=='x64' ">amd64</NameSuffix>
-  </PropertyGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid>
     <ConfigurationType>Application</ConfigurationType>
     <ProjectSubSystem>Console</ProjectSubSystem>
-    <TargetName>wixnative.$(NameSuffix)</TargetName>
+    <TargetName>wixnative</TargetName>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <Description>Native component of WixToolset.Core</Description>
-- 
cgit v1.2.3-55-g6feb