Attempt to move wixnative.exe to independent runtime .nupkg

3 files changed, 9 insertions, 5 deletions

diff --git a/src/WixToolset.Core.Native/WixNativeExe.cs b/src/WixToolset.Core.Native/WixNativeExe.cs
index 8626bea3..92dcfdda 100644
--- a/src/WixToolset.Core.Native/WixNativeExe.cs
+++ b/src/WixToolset.Core.Native/WixNativeExe.cs
@@ -19,7 +19,7 @@ namespace WixToolset.Core.Native
 
         static WixNativeExe()
         {
-            PathToWixNativeExe = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), "x86\\wixnative.exe");
+            PathToWixNativeExe = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), "wixnative.x86.exe");
         }
 
         public WixNativeExe(params object[] args)
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index 51238020..a95f8852 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -20,10 +20,10 @@
 
     <ItemGroup>
       <NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb">
-        <TargetRelativeFolder>x86\</TargetRelativeFolder>
+        <TargetRelativeFolder>.\</TargetRelativeFolder>
       </NativeProjectOutput>
       <NativeProjectOutput Include="$(OutputPath)..\x64\*.exe;$(OutputPath)..\x64\*.pdb">
-        <TargetRelativeFolder>x64\</TargetRelativeFolder>
+        <TargetRelativeFolder>.\</TargetRelativeFolder>
       </NativeProjectOutput>
 
       <AllItemsFullPathWithTargetPath Include="@(NativeProjectOutput->'%(FullPath)')">
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 88dd4d34..3394f8ab 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -10,19 +10,23 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
-<!--
+
     <dependencies>
+      <dependency id="runtime.win.WixToolset.Core.Native" version="$version$" />
+<!--
       <dependency id="runtime.win-x86.WixToolset.Core.Native" version="$version$" />
       <dependency id="runtime.win-x64.WixToolset.Core.Native" version="$version$" />
+-->
     </dependencies>
-     -->
   </metadata>
 
   <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" />
+ -->
   </files>
 </package>