aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
index 23c481b7..74e2cdb5 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
@@ -66,7 +66,7 @@ namespace WixToolset.Core.WindowsInstaller.Databases
66 // When building merge module, all the files go to "#MergeModule.CABinet". 66 // When building merge module, all the files go to "#MergeModule.CABinet".
67 if (OutputType.Module == this.Output.Type) 67 if (OutputType.Module == this.Output.Type)
68 { 68 {
69 Table mergeModuleMediaTable = new Table(null, this.TableDefinitions["Media"]); 69 Table mergeModuleMediaTable = new Table(this.TableDefinitions["Media"]);
70 mergeModuleMediaRow = (MediaRow)mergeModuleMediaTable.CreateRow(null); 70 mergeModuleMediaRow = (MediaRow)mergeModuleMediaTable.CreateRow(null);
71 mergeModuleMediaRow.Cabinet = "#MergeModule.CABinet"; 71 mergeModuleMediaRow.Cabinet = "#MergeModule.CABinet";
72 72
@@ -150,8 +150,8 @@ namespace WixToolset.Core.WindowsInstaller.Databases
150 // When building a product, if the current file is not to be compressed or if 150 // When building a product, if the current file is not to be compressed or if
151 // the package set not to be compressed, don't cab it. 151 // the package set not to be compressed, don't cab it.
152 if (OutputType.Product == this.Output.Type && 152 if (OutputType.Product == this.Output.Type &&
153 (YesNoType.No == facade.File.Compressed || 153 (!facade.File.Compressed.Value ||
154 (YesNoType.NotSet == facade.File.Compressed && !this.FilesCompressed))) 154 (!facade.File.Compressed.HasValue && !this.FilesCompressed)))
155 { 155 {
156 uncompressedFiles.Add(facade); 156 uncompressedFiles.Add(facade);
157 continue; 157 continue;
@@ -270,8 +270,8 @@ namespace WixToolset.Core.WindowsInstaller.Databases
270 // When building a product, if the current file is not to be compressed or if 270 // When building a product, if the current file is not to be compressed or if
271 // the package set not to be compressed, don't cab it. 271 // the package set not to be compressed, don't cab it.
272 if (OutputType.Product == this.Output.Type && 272 if (OutputType.Product == this.Output.Type &&
273 (YesNoType.No == facade.File.Compressed || 273 (!facade.File.Compressed.Value ||
274 (YesNoType.NotSet == facade.File.Compressed && !this.FilesCompressed))) 274 (!facade.File.Compressed.HasValue && !this.FilesCompressed)))
275 { 275 {
276 uncompressedFiles.Add(facade); 276 uncompressedFiles.Add(facade);
277 } 277 }