Update to WiX Intermediate Representation

1 files changed, 12 insertions, 38 deletions

diff --git a/src/WixToolset.Core/Link/ConnectToFeature.cs b/src/WixToolset.Core/Link/ConnectToFeature.cs
index 6e046b89..bc85426a 100644
--- a/src/WixToolset.Core/Link/ConnectToFeature.cs
+++ b/src/WixToolset.Core/Link/ConnectToFeature.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.Link
 {
-    using System.Collections.Specialized;
+    using System.Collections.Generic;
     using WixToolset.Data;
 
     /// <summary>
@@ -10,19 +10,12 @@ namespace WixToolset.Link
     /// </summary>
     public sealed class ConnectToFeature
     {
-        private Section section;
-        private string childId;
-
-        private string primaryFeature;
-        private bool explicitPrimaryFeature;
-        private StringCollection connectFeatures;
-
         /// <summary>
         /// Creates a new connect to feature.
         /// </summary>
         /// <param name="section">Section this connect belongs to.</param>
         /// <param name="childId">Id of the child.</param>
-        public ConnectToFeature(Section section, string childId) :
+        public ConnectToFeature(IntermediateSection section, string childId) :
             this(section, childId, null, false)
         {
         }
@@ -34,62 +27,43 @@ namespace WixToolset.Link
         /// <param name="childId">Id of the child.</param>
         /// <param name="primaryFeature">Sets the primary feature for the connection.</param>
         /// <param name="explicitPrimaryFeature">Sets if this is explicit primary.</param>
-        public ConnectToFeature(Section section, string childId, string primaryFeature, bool explicitPrimaryFeature)
+        public ConnectToFeature(IntermediateSection section, string childId, string primaryFeature, bool explicitPrimaryFeature)
         {
-            this.section = section;
-            this.childId = childId;
+            this.Section = section;
+            this.ChildId = childId;
 
-            this.primaryFeature = primaryFeature;
-            this.explicitPrimaryFeature = explicitPrimaryFeature;
-
-            this.connectFeatures = new StringCollection();
+            this.PrimaryFeature = primaryFeature;
+            this.IsExplicitPrimaryFeature = explicitPrimaryFeature;
         }
 
         /// <summary>
         /// Gets the section.
         /// </summary>
         /// <value>Section.</value>
-        public Section Section
-        {
-            get { return this.section; }
-        }
+        public IntermediateSection Section { get; }
 
         /// <summary>
         /// Gets the child identifier.
         /// </summary>
         /// <value>The child identifier.</value>
-        public string ChildId
-        {
-            get { return this.childId; }
-        }
+        public string ChildId { get; }
 
         /// <summary>
         /// Gets or sets if the flag for if the primary feature was set explicitly.
         /// </summary>
         /// <value>The flag for if the primary feature was set explicitly.</value>
-        public bool IsExplicitPrimaryFeature
-        {
-            get { return this.explicitPrimaryFeature; }
-            set { this.explicitPrimaryFeature = value; }
-        }
+        public bool IsExplicitPrimaryFeature { get; set; }
 
         /// <summary>
         /// Gets or sets the primary feature.
         /// </summary>
         /// <value>The primary feature.</value>
-        public string PrimaryFeature
-        {
-            get { return this.primaryFeature; }
-            set { this.primaryFeature = value; }
-        }
+        public string PrimaryFeature { get; set; }
 
         /// <summary>
         /// Gets the features connected to.
         /// </summary>
         /// <value>Features connected to.</value>
-        public StringCollection ConnectFeatures
-        {
-            get { return this.connectFeatures; }
-        }
+        public List<string> ConnectFeatures { get; } = new List<string>();
     }
 }