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/MultiCulturalMsiPackage/MsiPackage | |
| 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/MultiCulturalMsiPackage/MsiPackage')
| -rw-r--r-- | src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj | 11 |
1 files changed, 2 insertions, 9 deletions
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 @@ | |||
| 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> |
| @@ -12,10 +13,6 @@ | |||
| 12 | <Cultures>en-US,en;de-DE</Cultures> | 13 | <Cultures>en-US,en;de-DE</Cultures> |
| 13 | </PropertyGroup> | 14 | </PropertyGroup> |
| 14 | 15 | ||
| 15 | <PropertyGroup> | ||
| 16 | <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\net461\wix.targets</WixTargetsPath> | ||
| 17 | </PropertyGroup> | ||
| 18 | |||
| 19 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | 16 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
| 20 | <PlatformName>$(Platform)</PlatformName> | 17 | <PlatformName>$(Platform)</PlatformName> |
| 21 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | 18 | <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> |
| @@ -49,9 +46,5 @@ | |||
| 49 | <BindInputPaths Include="data" /> | 46 | <BindInputPaths Include="data" /> |
| 50 | </ItemGroup> | 47 | </ItemGroup> |
| 51 | 48 | ||
| 52 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | 49 | <Import Project="$(WixTargetsPath)" /> |
| 53 | <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> | ||
| 54 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | ||
| 55 | <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/." /> | ||
| 56 | </Target> | ||
| 57 | </Project> | 50 | </Project> |