diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-30 18:55:57 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-31 15:11:21 +1000 |
| commit | 05ee2175b44c68816c24a33a16861a637fa15ad7 (patch) | |
| tree | 1558e82360c67ca17fbc4440b773b7d74be5aac1 /src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage | |
| parent | d57dad051e9c15919646fb9e4fb320003ba839da (diff) | |
| download | wix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.gz wix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.bz2 wix-05ee2175b44c68816c24a33a16861a637fa15ad7.zip | |
Update MSBuild tests to use WixToolset.MSBuild.props to find wix.targets.
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage')
2 files changed, 4 insertions, 10 deletions
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <Import Project="$(WixMSBuildProps)" /> | ||
| 3 | <PropertyGroup> | 4 | <PropertyGroup> |
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | 6 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> |
| @@ -41,9 +42,5 @@ | |||
| 41 | <BindInputPaths Include="data" /> | 42 | <BindInputPaths Include="data" /> |
| 42 | </ItemGroup> | 43 | </ItemGroup> |
| 43 | 44 | ||
| 44 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | 45 | <Import Project="$(WixTargetsPath)" /> |
| 45 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 46 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 47 | <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/." /> | ||
| 48 | </Target> | ||
| 49 | </Project> \ No newline at end of file | 46 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <Import Project="$(WixMSBuildProps)" /> | ||
| 3 | <PropertyGroup> | 4 | <PropertyGroup> |
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | 6 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> |
| @@ -37,9 +38,5 @@ | |||
| 37 | <BindInputPaths Include="..\MsiPackage\data" /> | 38 | <BindInputPaths Include="..\MsiPackage\data" /> |
| 38 | </ItemGroup> | 39 | </ItemGroup> |
| 39 | 40 | ||
| 40 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | 41 | <Import Project="$(WixTargetsPath)" /> |
| 41 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> | ||
| 42 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 43 | <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/." /> | ||
| 44 | </Target> | ||
| 45 | </Project> \ No newline at end of file | 42 | </Project> \ No newline at end of file |