Update MSBuild tests to use WixToolset.MSBuild.props to find wix.targets.

12 files changed, 29 insertions, 45 deletions

diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj
index 212d1bae..9811782c 100644
--- a/src/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Directory.Build.props" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
 
   <PropertyGroup>
     <ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
@@ -23,7 +23,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <Import Project="$(OutputPath)\publish\WixToolset.MSBuild\tools\wix.targets" />
+  <Import Project="$(WixTargetsPath)" />
 
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/Wix.Build.props b/src/Wix.Build.props
index 936126e3..bf286bb4 100644
--- a/src/Wix.Build.props
+++ b/src/Wix.Build.props
@@ -9,4 +9,6 @@
   <ItemGroup>
     <BindInputPaths Include="$(OutputPath)Win32\" />
   </ItemGroup>
+
+  <Import Project="$(OutputPath)\publish\WixToolset.MSBuild\build\WixToolset.MSBuild.props" />
 </Project>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 2d5ea01b..ba67660c 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index ff0d74ee..be04d21b 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -11,7 +11,7 @@
   </metadata>
 
   <files>
-    <file src="$projectFolder$$id$.props" target="build" />
+    <file src="build\**\*" target="build" />
     <file src="tools\**\*" target="tools" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props
index b453361b..b453361b 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props
+++ b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
index abb8673d..4a831061 100644
--- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
@@ -11,7 +11,7 @@ namespace WixToolsetTest.MSBuild
 
     public class MsbuildFixture
     {
-        private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
+        private static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
 
         [Fact]
         public void CanBuildSimpleBundle()
@@ -27,7 +27,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                 });
                 result.AssertSuccess();
 
@@ -63,7 +63,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                 });
                 result.AssertSuccess();
 
@@ -124,7 +124,7 @@ namespace WixToolsetTest.MSBuild
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                 });
                 result.AssertSuccess();
 
@@ -150,7 +150,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     $"-p:InstallerPlatform=x64",
                 });
                 result.AssertSuccess();
@@ -185,7 +185,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     "-p:SuppressIces=\"ICE45;ICE46\""
                 });
                 result.AssertSuccess();
@@ -206,7 +206,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     "-p:SuppressSpecificWarnings=\"1118;1102\""
                 });
                 result.AssertSuccess();
@@ -230,7 +230,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     "-p:OutputType=IntermediatePostLink"
                 });
                 result.AssertSuccess();
@@ -256,7 +256,7 @@ namespace WixToolsetTest.MSBuild
                 // Build
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     "-v:diag"
                 });
                 result.AssertSuccess();
@@ -272,7 +272,7 @@ namespace WixToolsetTest.MSBuild
                 // Clean
                 result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                     "-t:Clean",
                     "-v:diag"
                 });
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
index b5331cbc..58a3d333 100644
--- a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
@@ -13,7 +13,7 @@ namespace WixToolsetTest.MSBuild
 
     public class MsbuildHeatFixture
     {
-        private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
+        private static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
 
         [Fact]
         public void CanBuildHeatFilePackage()
@@ -30,7 +30,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                 });
                 result.AssertSuccess();
 
@@ -86,7 +86,7 @@ namespace WixToolsetTest.MSBuild
 
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:WixMSBuildProps={WixPropsPath}",
                 });
                 result.AssertSuccess();
 
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
index 860fc2dd..7d751319 100644
--- a/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -53,9 +54,5 @@
     </HarvestFile>
   </ItemGroup>
 
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
+  <Import Project="$(WixTargetsPath)" />
 </Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
index 87f4388a..3988acaf 100644
--- a/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -48,9 +49,5 @@
     </HarvestFile>
   </ItemGroup>
 
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
+  <Import Project="$(WixTargetsPath)" />
 </Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
index e04ea43d..555addbe 100644
--- a/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -12,10 +13,6 @@
     <Cultures>en-US,en;de-DE</Cultures>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\net461\wix.targets</WixTargetsPath>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformName>$(Platform)</PlatformName>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -49,9 +46,5 @@
     <BindInputPaths Include="data" />
   </ItemGroup>
 
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
+  <Import Project="$(WixTargetsPath)" />
 </Project>
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index d5cac8d8..18ae08b2 100644
--- a/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -41,9 +42,5 @@
     <BindInputPaths Include="data" />
   </ItemGroup>
 
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
+  <Import Project="$(WixTargetsPath)" />
 </Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
index 4c837936..199eb6d9 100644
--- a/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -37,9 +38,5 @@
     <BindInputPaths Include="..\MsiPackage\data" />
   </ItemGroup>
 
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
+  <Import Project="$(WixTargetsPath)" />
 </Project>
\ No newline at end of file