Fix source path and cabinet processing

2 files changed, 32 insertions, 46 deletions

diff --git a/src/WixToolset.Core/Preprocess/IfContext.cs b/src/WixToolset.Core/Preprocess/IfContext.cs
index 64b5bd91..e7c6e6f5 100644
--- a/src/WixToolset.Core/Preprocess/IfContext.cs
+++ b/src/WixToolset.Core/Preprocess/IfContext.cs
@@ -1,46 +1,21 @@
 // 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.Preprocess
+namespace WixToolset.Core.Preprocess
 {
-    using System;
-
-    /// <summary>
-    /// Current state of the if context.
-    /// </summary>
-    internal enum IfState
-    {
-        /// <summary>Context currently in unknown state.</summary>
-        Unknown,
-
-        /// <summary>Context currently inside if statement.</summary>
-        If,
-
-        /// <summary>Context currently inside elseif statement..</summary>
-        ElseIf,
-
-        /// <summary>Conext currently inside else statement.</summary>
-        Else,
-    }
-
     /// <summary>
     /// Context for an if statement in the preprocessor.
     /// </summary>
     internal sealed class IfContext
     {
-        private bool active;
         private bool keep;
-        private bool everKept;
-        private IfState state;
 
         /// <summary>
         /// Creates a default if context object, which are used for if's within an inactive preprocessor block
         /// </summary>
         public IfContext()
         {
-            this.active = false;
-            this.keep = false;
-            this.everKept = true;
-            this.state = IfState.If;
+            this.WasEverTrue = true;
+            this.IfState = IfState.If;
         }
 
         /// <summary>
@@ -51,21 +26,17 @@ namespace WixToolset.Preprocess
         /// <param name="state">State of context to start in.</param>
         public IfContext(bool active, bool keep, IfState state)
         {
-            this.active = active;
+            this.Active = active;
             this.keep = keep;
-            this.everKept = keep;
-            this.state = state;
+            this.WasEverTrue = keep;
+            this.IfState = IfState.If;
         }
 
         /// <summary>
         /// Gets and sets if this if context is currently active.
         /// </summary>
         /// <value>true if context is active.</value>
-        public bool Active
-        {
-            get { return this.active; }
-            set { this.active = value; }
-        }
+        public bool Active { get; set; }
 
         /// <summary>
         /// Gets and sets if context is current true.
@@ -83,7 +54,7 @@ namespace WixToolset.Preprocess
                 this.keep = value;
                 if (this.keep)
                 {
-                    this.everKept = true;
+                    this.WasEverTrue = true;
                 }
             }
         }
@@ -92,19 +63,12 @@ namespace WixToolset.Preprocess
         /// Gets if the context was ever true.
         /// </summary>
         /// <value>True if context was ever true.</value>
-        public bool WasEverTrue
-        {
-            get { return this.everKept; }
-        }
+        public bool WasEverTrue { get; private set; }
 
         /// <summary>
         /// Gets the current state of the if context.
         /// </summary>
         /// <value>Current state of context.</value>
-        public IfState IfState
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
+        public IfState IfState { get; set; }
     }
 }
diff --git a/src/WixToolset.Core/Preprocess/IfState.cs b/src/WixToolset.Core/Preprocess/IfState.cs
new file mode 100644
index 00000000..f5bb3e87
--- /dev/null
+++ b/src/WixToolset.Core/Preprocess/IfState.cs
@@ -0,0 +1,22 @@
+// 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.Core.Preprocess
+{
+    /// <summary>
+    /// Current state of the if context.
+    /// </summary>
+    internal enum IfState
+    {
+        /// <summary>Context currently in unknown state.</summary>
+        Unknown,
+
+        /// <summary>Context currently inside if statement.</summary>
+        If,
+
+        /// <summary>Context currently inside elseif statement..</summary>
+        ElseIf,
+
+        /// <summary>Conext currently inside else statement.</summary>
+        Else,
+    }
+}