From ef0dbdc18c4335fef395fb954845031ea90503be Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 28 May 2020 23:00:05 +1000
Subject: Move the targets files into the top-level tools folder.

---
 src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs         | 12 +++++++++++-
 src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs     |  5 ++++-
 .../WixToolsetTest.BuildTasks.csproj                         |  6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'src/test/WixToolsetTest.BuildTasks')

diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
index 0c225390..0768f863 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
@@ -11,7 +11,8 @@ namespace WixToolsetTest.BuildTasks
 
     public class MsbuildFixture
     {
-        private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath), "wix.targets");
+        private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
+        private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
 
         [Fact]
         public void CanBuildSimpleBundle()
@@ -27,6 +28,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -64,6 +66,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -126,6 +129,7 @@ namespace WixToolsetTest.BuildTasks
                 {
                     wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                 });
@@ -153,6 +157,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     $"-p:InstallerPlatform=x64",
@@ -178,6 +183,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:SuppressIces=\"ICE45;ICE46\""
@@ -200,6 +206,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:SuppressSpecificWarnings=\"1118;1102\""
@@ -225,6 +232,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:OutputType=IntermediatePostLink"
@@ -253,6 +261,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-v:diag"
@@ -271,6 +280,7 @@ namespace WixToolsetTest.BuildTasks
                 result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-t:Clean",
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
index 13dd0160..95805658 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
@@ -14,7 +14,8 @@ namespace WixToolsetTest.BuildTasks
 
     public class MsbuildHeatFixture
     {
-        private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath), "wix.targets");
+        private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
+        private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
 
         [Fact]
         public void CanBuildHeatFilePackage()
@@ -30,6 +31,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -86,6 +88,7 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 333c7c79..9fb2bc82 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -31,6 +31,12 @@
     <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="..\..\WixToolset.MSBuild\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\WixToolset.MSBuild\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\WixToolset.MSBuild\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" />
   </ItemGroup>
-- 
cgit v1.2.3-55-g6feb