From 3eb3c26c796984b64365fda077f173af8bf31559 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 1 Mar 2021 10:14:38 -0800
Subject: Fix handling of suppress modularization

Partially fixes wixtoolset/issues#5944
---
 .../TestData/SuppressModularization/Module.en-us.wxl           | 10 ++++++++++
 .../TestData/SuppressModularization/Module.wxs                 | 10 ++++++++++
 .../TestData/SuppressModularization/data/test.txt              |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt

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

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl
new file mode 100644
index 00000000..c74e86a7
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl
@@ -0,0 +1,10 @@
+<?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="Manufacturer">Example Company</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs
new file mode 100644
index 00000000..f4ce9c48
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+    <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
+
+    <Property Id="Test" Hidden="true" SuppressModularization="true" />
+    <CustomAction Id="Test" DllEntry="TestEntry" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="FakeCA" />
+
+    <Binary Id="FakeCA" SourceFile="test.txt" />
+  </Module>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb