diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-08-11 01:12:28 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-08-11 01:12:28 -0700 |
| commit | f34941825894d44059a560d9f95016ac97803504 (patch) | |
| tree | 2d81fa80cefb53d8a41b335679196d046baff292 /src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage | |
| parent | c7d69b36789b6403f5b02a975afad80f6b23b48b (diff) | |
| download | wix-f34941825894d44059a560d9f95016ac97803504.tar.gz wix-f34941825894d44059a560d9f95016ac97803504.tar.bz2 wix-f34941825894d44059a560d9f95016ac97803504.zip | |
Fix Build and Clean targets
Diffstat (limited to 'src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj index 31c3ec9c..d5cac8d8 100644 --- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj +++ b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj | |||
| @@ -1,18 +1,12 @@ | |||
| 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 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> | 5 | <Platform Condition=" '$(Platform)' == '' ">x86</Platform> |
| 6 | <ProductVersion>0.9</ProductVersion> | ||
| 7 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> | ||
| 8 | <OutputName>MsiPackage</OutputName> | ||
| 9 | <OutputType>Package</OutputType> | ||
| 10 | <Name>MsiPackage</Name> | ||
| 11 | <RootNamespace>MsiPackage</RootNamespace> | ||
| 12 | </PropertyGroup> | 6 | </PropertyGroup> |
| 13 | 7 | ||
| 14 | <PropertyGroup> | 8 | <PropertyGroup> |
| 15 | <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\wix.targets</WixTargetsPath> | 9 | <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid> |
| 16 | </PropertyGroup> | 10 | </PropertyGroup> |
| 17 | 11 | ||
| 18 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | 12 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
| @@ -48,8 +42,8 @@ | |||
| 48 | </ItemGroup> | 42 | </ItemGroup> |
| 49 | 43 | ||
| 50 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> | 44 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> |
| 51 | <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> | 45 | <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " /> |
| 52 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | 46 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> |
| 53 | <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/." /> | 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/." /> |
| 54 | </Target> | 48 | </Target> |
| 55 | </Project> \ No newline at end of file | 49 | </Project> \ No newline at end of file |
