From 6b30680fd7a712b45538c3f0a89d652f0457a893 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 22 May 2020 14:53:27 -0700
Subject: Support merging merge modules

---
 .../TestData/SimpleMerge/.data/test.msm            | Bin 0 -> 24576 bytes
 .../TestData/SimpleMerge/Package.en-us.wxl         |  11 ++++++++++
 .../TestData/SimpleMerge/Package.wxs               |  24 +++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
new file mode 100644
index 00000000..6f179aba
Binary files /dev/null and b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm differ
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Product Id="*" Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <MergeRef Id="TestMsm" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+          <Directory Id="INSTALLFOLDER" Name="MsiPackage">
+              <!--   -->
+              <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" DiskId="1" />
+          </Directory>
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
-- 
cgit v1.2.3-55-g6feb