diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-04-12 15:13:08 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-04-12 15:22:15 -0400 |
| commit | 3f4bd928ab4c048792bf4c5c10004a1f22e8aa19 (patch) | |
| tree | a884ad428b3db891adefb3111dc8819e90c83855 /src/test/WixToolsetTest.CoreIntegration/TestData | |
| parent | d77302d94b356a1db2b2b834e45c8962381eae6b (diff) | |
| download | wix-3f4bd928ab4c048792bf4c5c10004a1f22e8aa19.tar.gz wix-3f4bd928ab4c048792bf4c5c10004a1f22e8aa19.tar.bz2 wix-3f4bd928ab4c048792bf4c5c10004a1f22e8aa19.zip | |
Fix decompilation of directories as children TARGETDIR.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')
3 files changed, 31 insertions, 9 deletions
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" InstallerVersion="200"> | ||
| 4 | <Directory Id="MergeRedirectFolder"> | ||
| 5 | <Component Id="ModuleComponent2" Guid="{BB222EE8-229B-4051-9443-49E348F0CC77}" Bitness="always32"> | ||
| 6 | <File Id="File2" ShortName="sfmxqeab.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File2.F844F0E3_8CB4_4A0F_973E_31C4F9338382" /> | ||
| 7 | </Component> | ||
| 8 | </Directory> | ||
| 9 | <StandardDirectory Id="ProgramFilesFolder"> | ||
| 10 | <Directory Id="WixTestDir" ShortName="7bhhvaai" Name="WiX Toolset Test Directory"> | ||
| 11 | <Component Id="ModuleComponent1" Guid="{D86EC5A2-9576-4699-BDC3-00586FF72CBE}" Bitness="always32"> | ||
| 12 | <File Id="File1" ShortName="gahushls.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File1.F844F0E3_8CB4_4A0F_973E_31C4F9338382" /> | ||
| 13 | </Component> | ||
| 14 | </Directory> | ||
| 15 | </StandardDirectory> | ||
| 16 | <SummaryInformation Description="MergeModule1" Manufacturer="WiX Toolset contributors" /> | ||
| 17 | </Module> | ||
| 18 | </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 | |||
| Binary files differ | |||
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 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200"> | 2 | <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200"> |
| 3 | <SummaryInformation Manufacturer="!(loc.Manufacturer)" /> | 3 | <SummaryInformation Manufacturer="!(loc.Manufacturer)" /> |
| 4 | 4 | ||
| 5 | <Directory Id="MergeRedirectFolder"> | 5 | <Directory Id="MergeRedirectFolder"> |
| 6 | <Component Id="ModuleComponent1" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45"> | ||
| 7 | <File Id="File1" Source="test.txt" /> | ||
| 8 | </Component> | ||
| 9 | </Directory> | ||
| 6 | 10 | ||
| 7 | <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45"> | 11 | <Directory Id="NotTheMergeRedirectFolder"> |
| 8 | <File Source="test.txt" /> | 12 | <Component Id="ModuleComponent2" Guid="EADB3047-BD32-417B-AABF-B8D9CCDC22DA"> |
| 9 | </Component> | 13 | <File Id="File2" Source="test.txt" /> |
| 10 | 14 | </Component> | |
| 11 | </Directory> | 15 | </Directory> |
| 12 | </Module> | 16 | </Module> |
| 13 | </Wix> | 17 | </Wix> |