From d0462be8000f18aa7dc0791d02142f000bb19fbf Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 22 May 2019 00:58:13 -0700
Subject: Integrate latest changes to tuple definitions

---
 .../Rows/WixActionRowCollection.cs                             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Rows')

diff --git a/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs b/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
index 9964b414..5abf02ce 100644
--- a/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
     // TODO: Remove this
     internal sealed class WixActionRowCollection : ICollection
     {
-        private SortedList collection;
+        private readonly SortedList collection;
 
         /// <summary>
         /// Creates a new action table object.
@@ -235,7 +235,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
             string id = null;
             string condition = null;
             bool empty = reader.IsEmptyElement;
-            int sequence = int.MinValue;
+            int sequence = Int32.MinValue;
             int sequenceCount = 0;
             SequenceTable[] sequenceTables = new SequenceTable[Enum.GetValues(typeof(SequenceTable)).Length];
 
@@ -263,7 +263,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
                     case "AdvtExecuteSequence":
                         if (reader.Value.Equals("yes"))
                         {
-                            sequenceTables[sequenceCount] = SequenceTable.AdvtExecuteSequence;
+                            sequenceTables[sequenceCount] = SequenceTable.AdvertiseExecuteSequence;
                             ++sequenceCount;
                         }
                         break;
@@ -295,7 +295,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
                 throw new XmlException();
             }
 
-            if (int.MinValue == sequence)
+            if (Int32.MinValue == sequence)
             {
                 throw new XmlException();
             }
@@ -316,7 +316,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
 
             // create the actions
             WixActionRow[] actionRows = new WixActionRow[sequenceCount];
-            for (int i = 0; i < sequenceCount; i++)
+            for (var i = 0; i < sequenceCount; i++)
             {
                 //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
                 //actionRows[i] = actionRow;
-- 
cgit v1.2.3-55-g6feb