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.

---
 .../MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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

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