From 05ee2175b44c68816c24a33a16861a637fa15ad7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 30 May 2020 18:55:57 +1000
Subject: Update MSBuild tests to use WixToolset.MSBuild.props to find
 wix.targets.

---
 .../TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle')

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
-- 
cgit v1.2.3-55-g6feb