From 75fd55d5a71c492c6ea904768858c51aa97da29f Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 8 May 2019 14:13:31 -0700 Subject: Use new strongly typed tuples --- .../Bind/MergeModulesCommand.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs') 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 using System.Runtime.InteropServices; using System.Text; using WixToolset.Core.Bind; - using WixToolset.Core.Native; + using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility.Services; - using WixToolset.MergeMod; - using WixToolset.Msi; /// /// Update file information. @@ -315,18 +313,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!file.File.Compressed.HasValue) { // Clear all compression bits. - attributes &= ~MsiInterop.MsidbFileAttributesCompressed; - attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed; + attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; + attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; } else if (file.File.Compressed.Value) { - attributes |= MsiInterop.MsidbFileAttributesCompressed; - attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed; + attributes |= WindowsInstallerConstants.MsidbFileAttributesCompressed; + attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; } else if (!file.File.Compressed.Value) { - attributes |= MsiInterop.MsidbFileAttributesNoncompressed; - attributes &= ~MsiInterop.MsidbFileAttributesCompressed; + attributes |= WindowsInstallerConstants.MsidbFileAttributesNoncompressed; + attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; } recordUpdate.SetInteger(2, attributes); -- cgit v1.2.3-55-g6feb