Use NATIVE_DLL_SEARCH_DIRECTORIES to support cross-platform wixnative.exe

4 files changed, 26 insertions, 14 deletions

diff --git a/src/WixToolset.Core.Native/WixNativeExe.cs b/src/WixToolset.Core.Native/WixNativeExe.cs
index 935c2a89..063485d3 100644
--- a/src/WixToolset.Core.Native/WixNativeExe.cs
+++ b/src/WixToolset.Core.Native/WixNativeExe.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.Native
 
     internal class WixNativeExe
     {
+        private const string WixNativeExeFileName = "wixnative.exe";
         private static string PathToWixNativeExe;
 
         private readonly string commandLine;
@@ -80,7 +81,25 @@ namespace WixToolset.Core.Native
         {
             if (String.IsNullOrEmpty(PathToWixNativeExe))
             {
-                var path = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), "wixnative.x86.exe");
+                var path = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), WixNativeExeFileName);
+
+                if (!File.Exists(path))
+                {
+                    var searchDirectoriesString = AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES") as string;
+                    var searchDirectories = searchDirectoriesString?.Split(';');
+                    if (searchDirectories != null)
+                    {
+                        foreach (string directoryPath in searchDirectories)
+                        {
+                            var possiblePath = Path.Combine(directoryPath, WixNativeExeFileName);
+                            if (File.Exists(possiblePath))
+                            {
+                                path = possiblePath;
+                                break;
+                            }
+                        }
+                    }
+                }
 
                 if (!File.Exists(path))
                 {
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 195ea7b6..1ff5538b 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -25,12 +25,10 @@
     <file src="$id$.dll" target="lib\netstandard2.0" />
 
     <!--
-      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>
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>