Redo nuget package so that burn.exe's get put where Core expects them to be

3 files changed, 17 insertions, 9 deletions

diff --git a/src/stub/runtime.win.WixToolset.Burn.nuspec b/src/stub/WixToolset.Burn.nuspec
index e296bf8f..e71f64e4 100644
--- a/src/stub/runtime.win.WixToolset.Burn.nuspec
+++ b/src/stub/WixToolset.Burn.nuspec
@@ -14,7 +14,8 @@
   </metadata>
 
   <files>
-    <file src="Win32\burn.x86.exe" target="runtimes\win-x86\native" />
-    <file src="Win32\burn.x86.pdb" target="runtimes\win-x86\native" />
+    <file src="$projectFolder$$id$.props" target="buildTransitive" />
+    <file src="Win32\burn.exe" target="tools\x86" />
+    <file src="Win32\burn.pdb" target="tools\x86" />
   </files>
 </package>
diff --git a/src/stub/WixToolset.Burn.props b/src/stub/WixToolset.Burn.props
new file mode 100644
index 00000000..b83d0b1c
--- /dev/null
+++ b/src/stub/WixToolset.Burn.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <ItemGroup>
+    <BurnExes Include="$(MSBuildThisFileDirectory)..\tools\**\burn.exe" />
+    <None Include="@(BurnExes)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index 02c61295..7af42fa9 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.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>{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}</ProjectGuid>
     <ConfigurationType>Application</ConfigurationType>
     <ProjectSubSystem>Windows</ProjectSubSystem>
-    <TargetName>burn.$(NameSuffix)</TargetName>
+    <TargetName>burn</TargetName>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <Description>Native component of WixToolset.Burn</Description>
@@ -90,7 +85,7 @@
   </ItemGroup>
 
   <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack runtime.win.WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Burn;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
+    <Exec Command='nuget pack WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=WixToolset.Burn;Version="$(BuildVersionSimple)";ProjectFolder=$(MSBuildThisFileDirectory);Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
   </Target>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />