aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-22 14:47:36 -0700
committerRob Mensching <rob@firegiant.com>2020-05-22 15:25:19 -0700
commite8030ca17ff96a794a3fecd66bb01b81581a5451 (patch)
tree6f05c2356882f33b375e2372efecf3d60830686b /src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
parentd84ed7360adec89569eaab3793e9723f38d2a855 (diff)
downloadwix-e8030ca17ff96a794a3fecd66bb01b81581a5451.tar.gz
wix-e8030ca17ff96a794a3fecd66bb01b81581a5451.tar.bz2
wix-e8030ca17ff96a794a3fecd66bb01b81581a5451.zip
Fix naming of file in a merge module's cabinet
The file was stored in the merge module's cabinet with plain FileId, without the modularization GUID. This change fixes the cabinet builder so that it adds the modularization GUID when creating the cabinet.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
index 6483f0fc..d5806fee 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
@@ -35,14 +35,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
35 /// <summary> 35 /// <summary>
36 /// Modularization guid, or null if the output is not a module. 36 /// Modularization guid, or null if the output is not a module.
37 /// </summary> 37 /// </summary>
38 public string ModularizationGuid { get; private set; } 38 public string ModularizationSuffix { get; private set; }
39 39
40 public void Execute() 40 public void Execute()
41 { 41 {
42 this.Compressed = false; 42 this.Compressed = false;
43 this.LongNames = false; 43 this.LongNames = false;
44 this.InstallerVersion = 0; 44 this.InstallerVersion = 0;
45 this.ModularizationGuid = null; 45 this.ModularizationSuffix = null;
46 46
47 var foundCreateDataTime = false; 47 var foundCreateDataTime = false;
48 var foundLastSaveDataTime = false; 48 var foundLastSaveDataTime = false;
@@ -71,7 +71,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
71 71
72 if (SectionType.Module == this.Section.Type) 72 if (SectionType.Module == this.Section.Type)
73 { 73 {
74 this.ModularizationGuid = packageCode.Substring(1, 36).Replace('-', '_'); 74 this.ModularizationSuffix = "." + packageCode.Substring(1, 36).Replace('-', '_');
75 } 75 }
76 else if ("*" == packageCode) 76 else if ("*" == packageCode)
77 { 77 {