Fix decompilation of directories as children TARGETDIR.

5 files changed, 48 insertions, 17 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index b07f5bda..ab04da15 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -3,10 +3,8 @@
 namespace WixToolsetTest.CoreIntegration
 {
     using System.IO;
-    using System.Xml.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
-    using WixToolset.Extensibility.Services;
     using Xunit;
 
     public class DecompileFixture
@@ -78,5 +76,11 @@ namespace WixToolsetTest.CoreIntegration
         {
             DecompileAndCompare(@"TestData\DecompileNullComponent", "example.msi", "Expected.wxs");
         }
+
+        [Fact]
+        public void CanDecompileMergeModuleWithTargetDirComponent()
+        {
+            DecompileAndCompare(@"TestData\DecompileTargetDirMergeModule", "MergeModule1.msm", "Expected.wxs");
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
index 349bad2c..17e91692 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
@@ -46,19 +46,23 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.CompareLineByLine(new[]
                 {
                     "MergeRedirectFolder\tTARGETDIR\t.",
+                    "NotTheMergeRedirectFolder\tTARGETDIR\t.",
                     "TARGETDIR\t\tSourceDir"
                 }, dirSymbols.Select(d => String.Join("\t", d.Id.Id, d.ParentDirectoryRef, d.Name)).ToArray());
 
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileSymbol.Id.Id);
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(d => d.Id.Id).ToList();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    $"File1\t{Path.Combine(folder, @"data\test.txt")}\ttest.txt",
+                    $"File2\t{Path.Combine(folder, @"data\test.txt")}\ttest.txt",
+                }, fileSymbols.Select(fileSymbol => String.Join("\t", fileSymbol.Id.Id, fileSymbol[FileSymbolFields.Source].AsPath().Path, fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path)).ToArray());
 
                 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var fileRows = data.Tables["File"].Rows;
                 Assert.Equal(new[]
                 {
-                    "filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE"
+                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
+                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                 }, fileRows.Select(r => r.FieldAsString(0)).ToArray());
 
                 var cabPath = Path.Combine(intermediateFolder, "msm-test.cab");
@@ -66,7 +70,8 @@ namespace WixToolsetTest.CoreIntegration
                 var files = Query.GetCabinetFiles(cabPath);
                 Assert.Equal(new[]
                 {
-                    "filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE"
+                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
+                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                 }, files.Select(f => Path.Combine(f.Path, f.Name)).ToArray());
             }
         }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
new file mode 100644
index 00000000..7c5fe3cf
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" InstallerVersion="200">
+      <Directory Id="MergeRedirectFolder">
+        <Component Id="ModuleComponent2" Guid="{BB222EE8-229B-4051-9443-49E348F0CC77}" Bitness="always32">
+          <File Id="File2" ShortName="sfmxqeab.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File2.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
+        </Component>
+      </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="WixTestDir" ShortName="7bhhvaai" Name="WiX Toolset Test Directory">
+        <Component Id="ModuleComponent1" Guid="{D86EC5A2-9576-4699-BDC3-00586FF72CBE}" Bitness="always32">
+          <File Id="File1" ShortName="gahushls.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File1.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
+        </Component>
+      </Directory>
+    </StandardDirectory>
+    <SummaryInformation Description="MergeModule1" Manufacturer="WiX Toolset contributors" />
+  </Module>
+</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
new file mode 100644
index 00000000..2a7b5e3a
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
index 9a523162..8317e7af 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
@@ -1,13 +1,17 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200">
-    <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
+    <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200">
+        <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
 
-    <Directory Id="MergeRedirectFolder">
+        <Directory Id="MergeRedirectFolder">
+            <Component Id="ModuleComponent1" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
+                <File Id="File1" Source="test.txt" />
+            </Component>
+        </Directory>
 
-      <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
-        <File Source="test.txt" />
-      </Component> 
-
-    </Directory>
-  </Module>
+        <Directory Id="NotTheMergeRedirectFolder">
+            <Component Id="ModuleComponent2" Guid="EADB3047-BD32-417B-AABF-B8D9CCDC22DA">
+                <File Id="File2" Source="test.txt" />
+            </Component>
+        </Directory>
+    </Module>
 </Wix>