From d232c5621fe336b1f563b69be7637c93e795e151 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 10 May 2020 12:04:47 +1000
Subject: Redo nuget package so that burn.exe's get put where Core expects them
 to be

---
 src/stub/WixToolset.Burn.nuspec             | 21 +++++++++++++++++++++
 src/stub/WixToolset.Burn.props              | 12 ++++++++++++
 src/stub/runtime.win.WixToolset.Burn.nuspec | 20 --------------------
 src/stub/stub.vcxproj                       |  9 ++-------
 4 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 src/stub/WixToolset.Burn.nuspec
 create mode 100644 src/stub/WixToolset.Burn.props
 delete mode 100644 src/stub/runtime.win.WixToolset.Burn.nuspec

(limited to 'src')

diff --git a/src/stub/WixToolset.Burn.nuspec b/src/stub/WixToolset.Burn.nuspec
new file mode 100644
index 00000000..e71f64e4
--- /dev/null
+++ b/src/stub/WixToolset.Burn.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>
+    <!-- <license type="expression">MS-RL</license> -->
+    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
+    <projectUrl>https://github.com/wixtoolset/burn</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <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/runtime.win.WixToolset.Burn.nuspec b/src/stub/runtime.win.WixToolset.Burn.nuspec
deleted file mode 100644
index e296bf8f..00000000
--- a/src/stub/runtime.win.WixToolset.Burn.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-    <!-- <license type="expression">MS-RL</license> -->
-    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
-    <projectUrl>https://github.com/wixtoolset/burn</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-
-  <files>
-    <file src="Win32\burn.x86.exe" target="runtimes\win-x86\native" />
-    <file src="Win32\burn.x86.pdb" target="runtimes\win-x86\native" />
-  </files>
-</package>
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" />
-- 
cgit v1.2.3-55-g6feb