diff options
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 385ed33f..4000c923 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |||
@@ -9,13 +9,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
9 | using System.Runtime.InteropServices; | 9 | using System.Runtime.InteropServices; |
10 | using System.Text; | 10 | using System.Text; |
11 | using WixToolset.Core.Bind; | 11 | using WixToolset.Core.Bind; |
12 | using WixToolset.Core.Native; | 12 | using WixToolset.Core.WindowsInstaller.Msi; |
13 | using WixToolset.Data; | 13 | using WixToolset.Data; |
14 | using WixToolset.Data.WindowsInstaller; | 14 | using WixToolset.Data.WindowsInstaller; |
15 | using WixToolset.Data.WindowsInstaller.Rows; | 15 | using WixToolset.Data.WindowsInstaller.Rows; |
16 | using WixToolset.Extensibility.Services; | 16 | using WixToolset.Extensibility.Services; |
17 | using WixToolset.MergeMod; | ||
18 | using WixToolset.Msi; | ||
19 | 17 | ||
20 | /// <summary> | 18 | /// <summary> |
21 | /// Update file information. | 19 | /// Update file information. |
@@ -315,18 +313,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
315 | if (!file.File.Compressed.HasValue) | 313 | if (!file.File.Compressed.HasValue) |
316 | { | 314 | { |
317 | // Clear all compression bits. | 315 | // Clear all compression bits. |
318 | attributes &= ~MsiInterop.MsidbFileAttributesCompressed; | 316 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; |
319 | attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed; | 317 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
320 | } | 318 | } |
321 | else if (file.File.Compressed.Value) | 319 | else if (file.File.Compressed.Value) |
322 | { | 320 | { |
323 | attributes |= MsiInterop.MsidbFileAttributesCompressed; | 321 | attributes |= WindowsInstallerConstants.MsidbFileAttributesCompressed; |
324 | attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed; | 322 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
325 | } | 323 | } |
326 | else if (!file.File.Compressed.Value) | 324 | else if (!file.File.Compressed.Value) |
327 | { | 325 | { |
328 | attributes |= MsiInterop.MsidbFileAttributesNoncompressed; | 326 | attributes |= WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
329 | attributes &= ~MsiInterop.MsidbFileAttributesCompressed; | 327 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; |
330 | } | 328 | } |
331 | 329 | ||
332 | recordUpdate.SetInteger(2, attributes); | 330 | recordUpdate.SetInteger(2, attributes); |