aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-05-22 00:58:13 -0700
committerRob Mensching <rob@firegiant.com>2019-05-23 16:02:37 -0700
commitd0462be8000f18aa7dc0791d02142f000bb19fbf (patch)
tree072aabc2bd9b8f171e17654473f85c44a8a42a66 /src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
parent1ed894bc0f39397ec7f7f6344370fc2123420c43 (diff)
downloadwix-d0462be8000f18aa7dc0791d02142f000bb19fbf.tar.gz
wix-d0462be8000f18aa7dc0791d02142f000bb19fbf.tar.bz2
wix-d0462be8000f18aa7dc0791d02142f000bb19fbf.zip
Integrate latest changes to tuple definitions
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs10
1 files changed, 5 insertions, 5 deletions
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
16 // TODO: Remove this 16 // TODO: Remove this
17 internal sealed class WixActionRowCollection : ICollection 17 internal sealed class WixActionRowCollection : ICollection
18 { 18 {
19 private SortedList collection; 19 private readonly SortedList collection;
20 20
21 /// <summary> 21 /// <summary>
22 /// Creates a new action table object. 22 /// Creates a new action table object.
@@ -235,7 +235,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
235 string id = null; 235 string id = null;
236 string condition = null; 236 string condition = null;
237 bool empty = reader.IsEmptyElement; 237 bool empty = reader.IsEmptyElement;
238 int sequence = int.MinValue; 238 int sequence = Int32.MinValue;
239 int sequenceCount = 0; 239 int sequenceCount = 0;
240 SequenceTable[] sequenceTables = new SequenceTable[Enum.GetValues(typeof(SequenceTable)).Length]; 240 SequenceTable[] sequenceTables = new SequenceTable[Enum.GetValues(typeof(SequenceTable)).Length];
241 241
@@ -263,7 +263,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
263 case "AdvtExecuteSequence": 263 case "AdvtExecuteSequence":
264 if (reader.Value.Equals("yes")) 264 if (reader.Value.Equals("yes"))
265 { 265 {
266 sequenceTables[sequenceCount] = SequenceTable.AdvtExecuteSequence; 266 sequenceTables[sequenceCount] = SequenceTable.AdvertiseExecuteSequence;
267 ++sequenceCount; 267 ++sequenceCount;
268 } 268 }
269 break; 269 break;
@@ -295,7 +295,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
295 throw new XmlException(); 295 throw new XmlException();
296 } 296 }
297 297
298 if (int.MinValue == sequence) 298 if (Int32.MinValue == sequence)
299 { 299 {
300 throw new XmlException(); 300 throw new XmlException();
301 } 301 }
@@ -316,7 +316,7 @@ namespace WixToolset.Core.WindowsInstaller.Rows
316 316
317 // create the actions 317 // create the actions
318 WixActionRow[] actionRows = new WixActionRow[sequenceCount]; 318 WixActionRow[] actionRows = new WixActionRow[sequenceCount];
319 for (int i = 0; i < sequenceCount; i++) 319 for (var i = 0; i < sequenceCount; i++)
320 { 320 {
321 //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence); 321 //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
322 //actionRows[i] = actionRow; 322 //actionRows[i] = actionRow;