5 files changed, 131 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
new file mode 100644
index 00000000..77ee4420
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
@@ -0,0 +1,44 @@
+<?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>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Package.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj">
+      <Name>SimpleMergeModule</Name>
+      <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs
new file mode 100644
index 00000000..1c25e684
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <MediaTemplate />
+    <Feature Id="ProductFeature" Title="ATitle">
+      <MergeRef Id="SimpleMM" />
+    </Feature>
+  </Product>
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage">
+          <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
+        </Directory>
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
new file mode 100644
index 00000000..b9ab953a
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Module Id="SimpleMM" Language="1033" Version="1.0.0.0">
+    <Package Id="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200" Manufacturer="Example Corporation" />
+    <ComponentGroupRef Id="ProductComponents" />
+  </Module>
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="MergeRedirectFolder" />
+    </Directory>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="MergeRedirectFolder">
+       <Component Id="MMtxt" Guid="2D93B748-4926-4185-BC84-9F1D6883AF20">
+         <File Source="MergeModule.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
new file mode 100644
index 00000000..91579790
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
@@ -0,0 +1,42 @@
+<?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>
+    <OutputType>Module</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectGuid>{9F84998B-7F45-4CB3-8795-915801DBBB74}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="MergeModule.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BindInputPaths Include="data" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt
@@ -0,0 +1 @@
+This is test.txt.
+\ No newline at end of file

diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj new file mode 100644 index 00000000..77ee4420 --- /dev/null +++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
@@ -0,0 +1,44 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
	3	<Import Project="$(WixMSBuildProps)" />
	4	<PropertyGroup>
	5	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
	6	<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
	7	</PropertyGroup>
	8
	9	<PropertyGroup>
	10	<ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
	11	</PropertyGroup>
	12
	13	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|x86' ">
	14	<PlatformName>$(Platform)</PlatformName>
	15	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	16	<DefineConstants>Debug</DefineConstants>
	17	</PropertyGroup>
	18	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|x86' ">
	19	<PlatformName>$(Platform)</PlatformName>
	20	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	21	</PropertyGroup>
	22	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|x64' ">
	23	<PlatformName>$(Platform)</PlatformName>
	24	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	25	<DefineConstants>Debug</DefineConstants>
	26	</PropertyGroup>
	27	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|x64' ">
	28	<PlatformName>$(Platform)</PlatformName>
	29	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	30	</PropertyGroup>
	31
	32	<ItemGroup>
	33	<Compile Include="Package.wxs" />
	34	</ItemGroup>
	35
	36	<ItemGroup>
	37	<ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj">
	38	<Name>SimpleMergeModule</Name>
	39	<Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
	40	</ProjectReference>
	41	</ItemGroup>
	42
	43	<Import Project="$(WixTargetsPath)" />
	44	</Project> \ No newline at end of file


diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs new file mode 100644 index 00000000..1c25e684 --- /dev/null +++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/MergeMsiPackage/Package.wxs
@@ -0,0 +1,22 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	3	<Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
	4	<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
	5
	6	<MediaTemplate />
	7
	8	<Feature Id="ProductFeature" Title="ATitle">
	9	<MergeRef Id="SimpleMM" />
	10	</Feature>
	11	</Product>
	12
	13	<Fragment>
	14	<Directory Id="TARGETDIR" Name="SourceDir">
	15	<Directory Id="ProgramFilesFolder">
	16	<Directory Id="INSTALLFOLDER" Name="MsiPackage">
	17	<Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
	18	</Directory>
	19	</Directory>
	20	</Directory>
	21	</Fragment>
	22	</Wix>


diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs new file mode 100644 index 00000000..b9ab953a --- /dev/null +++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
@@ -0,0 +1,22 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	3	<Module Id="SimpleMM" Language="1033" Version="1.0.0.0">
	4	<Package Id="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200" Manufacturer="Example Corporation" />
	5
	6	<ComponentGroupRef Id="ProductComponents" />
	7	</Module>
	8
	9	<Fragment>
	10	<Directory Id="TARGETDIR" Name="SourceDir">
	11	<Directory Id="MergeRedirectFolder" />
	12	</Directory>
	13	</Fragment>
	14
	15	<Fragment>
	16	<ComponentGroup Id="ProductComponents" Directory="MergeRedirectFolder">
	17	<Component Id="MMtxt" Guid="2D93B748-4926-4185-BC84-9F1D6883AF20">
	18	<File Source="MergeModule.txt" />
	19	</Component>
	20	</ComponentGroup>
	21	</Fragment>
	22	</Wix>


diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj new file mode 100644 index 00000000..91579790 --- /dev/null +++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
@@ -0,0 +1,42 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
	3	<Import Project="$(WixMSBuildProps)" />
	4	<PropertyGroup>
	5	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
	6	<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
	7	<OutputType>Module</OutputType>
	8	</PropertyGroup>
	9
	10	<PropertyGroup>
	11	<ProjectGuid>{9F84998B-7F45-4CB3-8795-915801DBBB74}</ProjectGuid>
	12	</PropertyGroup>
	13
	14	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|x86' ">
	15	<PlatformName>$(Platform)</PlatformName>
	16	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	17	<DefineConstants>Debug</DefineConstants>
	18	</PropertyGroup>
	19	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|x86' ">
	20	<PlatformName>$(Platform)</PlatformName>
	21	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	22	</PropertyGroup>
	23	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|x64' ">
	24	<PlatformName>$(Platform)</PlatformName>
	25	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	26	<DefineConstants>Debug</DefineConstants>
	27	</PropertyGroup>
	28	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|x64' ">
	29	<PlatformName>$(Platform)</PlatformName>
	30	<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
	31	</PropertyGroup>
	32
	33	<ItemGroup>
	34	<Compile Include="MergeModule.wxs" />
	35	</ItemGroup>
	36
	37	<ItemGroup>
	38	<BindInputPaths Include="data" />
	39	</ItemGroup>
	40
	41	<Import Project="$(WixTargetsPath)" />
	42	</Project> \ No newline at end of file


diff --git a/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt new file mode 100644 index 00000000..cd0db0e1 --- /dev/null +++ b/src/test/WixToolsetTest.MSBuild/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt
@@ -0,0 +1 @@
		This is test.txt. \ No newline at end of file