Attempt to move wixnative.exe to independent runtime .nupkg

6 files changed, 42 insertions, 6 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index 872f2c93..a39fa567 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -7,5 +7,7 @@ msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolse
 
 msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj
 
+msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj
+
 @popd
 @endlocal
\ No newline at end of file
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>
diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
new file mode 100644
index 00000000..d6f122cc
--- /dev/null
+++ b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <licenseUrl>https://github.com/wixtoolset/Core.Native/blob/master/LICENSE.TXT</licenseUrl>
+    <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <file src="Win32\wixnative.x86.exe" target="runtimes\win\native" />
+    <file src="Win32\wixnative.x86.pdb" target="runtimes\win\native" />
+    <file src="x64\wixnative.amd64.exe" target="runtimes\win\native" />
+    <file src="x64\wixnative.amd64.pdb" target="runtimes\win\native" />
+  </files>
+</package>
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index cfec54e4..d4b31fd8 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -23,11 +23,16 @@
     </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</TargetName>
+    <TargetName>wixnative.$(NameSuffix)</TargetName>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <Description>Native component of WixToolset.Core</Description>
@@ -69,6 +74,10 @@
     <None Include="packages.config" />
   </ItemGroup>
 
+  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
+    <Exec Command="nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath &quot;$(BaseOutputPath)\&quot; -OutputDirectory &quot;$(BaseOutputPath)\&quot; -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version=&quot;$(BuildVersionSimple)&quot;;Platform=$(PlatformTarget);Authors=&quot;$(Authors)&quot;;Copyright=&quot;$(Copyright)&quot;;Description=&quot;$(Description)&quot;;Title=&quot;$(Title)&quot;" />
+  </Target>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>