aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-22 14:53:27 -0700
committerRob Mensching <rob@firegiant.com>2020-05-22 15:25:19 -0700
commit6b30680fd7a712b45538c3f0a89d652f0457a893 (patch)
tree46ef7f7d51de4189b7ef1af07dda3add16ad302f /src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
parent236f958468923f65a8f02e406601fb47e71cd58e (diff)
downloadwix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.gz
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.bz2
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.zip
Support merging merge modules
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
new file mode 100644
index 00000000..303e2ba8
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
@@ -0,0 +1,24 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Product Id="*" Name="MsiPackage" Codepage="1252" 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 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 <MediaTemplate />
8
9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10 <MergeRef Id="TestMsm" />
11 </Feature>
12 </Product>
13
14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir">
16 <Directory Id="ProgramFilesFolder">
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage">
18 <!-- -->
19 <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" DiskId="1" />
20 </Directory>
21 </Directory>
22 </Directory>
23 </Fragment>
24</Wix>