From ef6485ac4a03333701d343c1e3a52d25805c58f1 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 8 May 2019 13:35:21 -0700
Subject: Add additional strongly typed tuples

---
 src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs')

diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
index 673d2315..cd3660e4 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
@@ -5,7 +5,6 @@ namespace WixToolset.Data.WindowsInstaller.Rows
     using System;
     using System.Diagnostics;
     using System.Globalization;
-    using WixToolset.Data.Msi;
 
     /// <summary>
     /// Specialization of a row for the file table.
@@ -174,8 +173,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
             get
             {
-                bool compressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesCompressed));
-                bool noncompressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesNoncompressed));
+                bool compressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed));
+                bool noncompressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed));
 
                 if (compressedFlag && noncompressedFlag)
                 {
@@ -200,22 +199,22 @@ namespace WixToolset.Data.WindowsInstaller.Rows
                 if (YesNoType.Yes == value)
                 {
                     // these are mutually exclusive
-                    this.Attributes |= MsiInterop.MsidbFileAttributesCompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
+                    this.Attributes |= WindowsInstallerConstants.MsidbFileAttributesCompressed;
+                    this.Attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed;
                 }
                 else if (YesNoType.No == value)
                 {
                     // these are mutually exclusive
-                    this.Attributes |= MsiInterop.MsidbFileAttributesNoncompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
+                    this.Attributes |= WindowsInstallerConstants.MsidbFileAttributesNoncompressed;
+                    this.Attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed;
                 }
                 else // not specified
                 {
                     Debug.Assert(YesNoType.NotSet == value);
 
                     // clear any compression bits
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
+                    this.Attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed;
+                    this.Attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed;
                 }
             }
         }
-- 
cgit v1.2.3-55-g6feb