4 files changed, 16 insertions, 36 deletions

diff --git a/src/WixToolset.Core/Cab/CabinetFileInfo.cs b/src/WixToolset.Core/Cab/CabinetFileInfo.cs
index 849bb3bb..816f9e3e 100644
--- a/src/WixToolset.Core/Cab/CabinetFileInfo.cs
+++ b/src/WixToolset.Core/Cab/CabinetFileInfo.cs
@@ -1,19 +1,12 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset
+namespace WixToolset.Core.Cab
 {
-    using System;
-
     /// <summary>
     /// Properties of a file in a cabinet.
     /// </summary>
-    internal sealed class CabinetFileInfo
+    public sealed class CabinetFileInfo
     {
-        private string fileId;
-        private ushort date;
-        private ushort time;
-        private int size;
-
         /// <summary>
         /// Constructs CabinetFileInfo
         /// </summary>
@@ -22,43 +15,31 @@ namespace WixToolset
         /// <param name="time">Last modified time (MS-DOS time)</param>
         public CabinetFileInfo(string fileId, ushort date, ushort time, int size)
         {
-            this.fileId = fileId;
-            this.date = date;
-            this.time = time;
-            this.size = size;
+            this.FileId = fileId;
+            this.Date = date;
+            this.Time = time;
+            this.Size = size;
         }
 
         /// <summary>
         /// Gets the file Id of the file.
         /// </summary>
         /// <value>file Id</value>
-        public string FileId
-        {
-            get { return this.fileId; }
-        }
+        public string FileId { get; }
 
         /// <summary>
         /// Gets modified date (DOS format).
         /// </summary>
-        public ushort Date
-        {
-            get { return this.date; }
-        }
+        public ushort Date { get; }
 
         /// <summary>
         /// Gets modified time (DOS format).
         /// </summary>
-        public ushort Time
-        {
-            get { return this.time; }
-        }
+        public ushort Time { get; }
 
         /// <summary>
         /// Gets the size of the file in bytes.
         /// </summary>
-        public int Size
-        {
-            get { return this.size; }
-        }
+        public int Size { get; }
     }
 }
diff --git a/src/WixToolset.Core/Cab/WixCreateCab.cs b/src/WixToolset.Core/Cab/WixCreateCab.cs
index 8f985a43..4ebdd1c0 100644
--- a/src/WixToolset.Core/Cab/WixCreateCab.cs
+++ b/src/WixToolset.Core/Cab/WixCreateCab.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Cab
+namespace WixToolset.Core.Cab
 {
     using System;
     using System.Globalization;
     using System.IO;
     using System.Runtime.InteropServices;
-    using WixToolset.Bind.Databases;
+    using WixToolset.Core.Bind;
     using WixToolset.Core.Native;
     using WixToolset.Data;
 
diff --git a/src/WixToolset.Core/Cab/WixEnumerateCab.cs b/src/WixToolset.Core/Cab/WixEnumerateCab.cs
index 017eeffb..0b4055d6 100644
--- a/src/WixToolset.Core/Cab/WixEnumerateCab.cs
+++ b/src/WixToolset.Core/Cab/WixEnumerateCab.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Cab
+namespace WixToolset.Core.Cab
 {
     using System;
     using System.Collections.Generic;
@@ -10,7 +10,7 @@ namespace WixToolset.Cab
     /// <summary>
     /// Wrapper class around interop with wixcab.dll to enumerate files from a cabinet.
     /// </summary>
-    internal sealed class WixEnumerateCab : IDisposable
+    public sealed class WixEnumerateCab : IDisposable
     {
         private bool disposed;
         private List<CabinetFileInfo> fileInfoList;
@@ -38,7 +38,7 @@ namespace WixToolset.Cab
         /// </summary>
         /// <param name="cabinetFile">path to cabinet</param>
         /// <returns>list of CabinetFileInfo</returns>
-        internal List<CabinetFileInfo> Enumerate(string cabinetFile)
+        public List<CabinetFileInfo> Enumerate(string cabinetFile)
         {
             this.fileInfoList = new List<CabinetFileInfo>();
 
diff --git a/src/WixToolset.Core/Cab/WixExtractCab.cs b/src/WixToolset.Core/Cab/WixExtractCab.cs
index debdaf15..e776b08e 100644
--- a/src/WixToolset.Core/Cab/WixExtractCab.cs
+++ b/src/WixToolset.Core/Cab/WixExtractCab.cs
@@ -1,9 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Cab
+namespace WixToolset.Core.Cab
 {
     using System;
-    using System.Runtime.InteropServices;
     using WixToolset.Core.Native;
 
     /// <summary>