diff options
Diffstat (limited to 'src/WixToolset.Data.WindowsInstaller/Rows')
4 files changed, 31 insertions, 41 deletions
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs b/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs deleted file mode 100644 index 964e1caa..00000000 --- a/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | // 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. | ||
2 | |||
3 | namespace WixToolset.Data.Rows | ||
4 | { | ||
5 | /// <summary> | ||
6 | /// The types that the WixDeltaPatchSymbolPaths table can hold. | ||
7 | /// </summary> | ||
8 | /// <remarks>The order of these values is important since WixDeltaPatchSymbolPaths are sorted by this type.</remarks> | ||
9 | public enum SymbolPathType | ||
10 | { | ||
11 | File, | ||
12 | Component, | ||
13 | Directory, | ||
14 | Media, | ||
15 | Product | ||
16 | }; | ||
17 | } | ||
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs index 3009e59d..d1be706e 100644 --- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs +++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs | |||
@@ -8,27 +8,28 @@ namespace WixToolset.Data.Rows | |||
8 | using System.Globalization; | 8 | using System.Globalization; |
9 | using System.Xml; | 9 | using System.Xml; |
10 | using System.Xml.Schema; | 10 | using System.Xml.Schema; |
11 | using WixToolset.Data.Tuples; | ||
11 | 12 | ||
12 | /// <summary> | 13 | /// <summary> |
13 | /// The Sequence tables that actions may belong to. | 14 | /// The Sequence tables that actions may belong to. |
14 | /// </summary> | 15 | /// </summary> |
15 | public enum SequenceTable | 16 | //public enum SequenceTable |
16 | { | 17 | //{ |
17 | /// <summary>AdminUISequence</summary> | 18 | // /// <summary>AdminUISequence</summary> |
18 | AdminUISequence, | 19 | // AdminUISequence, |
19 | 20 | ||
20 | /// <summary>AdminExecuteSequence</summary> | 21 | // /// <summary>AdminExecuteSequence</summary> |
21 | AdminExecuteSequence, | 22 | // AdminExecuteSequence, |
22 | 23 | ||
23 | /// <summary>AdvtExecuteSequence</summary> | 24 | // /// <summary>AdvtExecuteSequence</summary> |
24 | AdvtExecuteSequence, | 25 | // AdvtExecuteSequence, |
25 | 26 | ||
26 | /// <summary>InstallUISequence</summary> | 27 | // /// <summary>InstallUISequence</summary> |
27 | InstallUISequence, | 28 | // InstallUISequence, |
28 | 29 | ||
29 | /// <summary>InstallExecuteSequence</summary> | 30 | // /// <summary>InstallExecuteSequence</summary> |
30 | InstallExecuteSequence | 31 | // InstallExecuteSequence |
31 | } | 32 | //} |
32 | 33 | ||
33 | /// <summary> | 34 | /// <summary> |
34 | /// Specialization of a row for the sequence tables. | 35 | /// Specialization of a row for the sequence tables. |
@@ -55,15 +56,15 @@ namespace WixToolset.Data.Rows | |||
55 | /// <param name="action">The name of the standard action.</param> | 56 | /// <param name="action">The name of the standard action.</param> |
56 | /// <param name="condition">The condition of the standard action.</param> | 57 | /// <param name="condition">The condition of the standard action.</param> |
57 | /// <param name="sequence">The suggested sequence number of the standard action.</param> | 58 | /// <param name="sequence">The suggested sequence number of the standard action.</param> |
58 | private WixActionRow(SequenceTable sequenceTable, string action, string condition, int sequence) : | 59 | //private WixActionRow(SequenceTable sequenceTable, string action, string condition, int sequence) : |
59 | base(null, WindowsInstallerStandard.GetTableDefinitions()["WixAction"]) | 60 | // base(null, WindowsInstallerStandard.GetTableDefinitions()["WixAction"]) |
60 | { | 61 | //{ |
61 | this.SequenceTable = sequenceTable; | 62 | // this.SequenceTable = sequenceTable; |
62 | this.Action = action; | 63 | // this.Action = action; |
63 | this.Condition = condition; | 64 | // this.Condition = condition; |
64 | this.Sequence = sequence; | 65 | // this.Sequence = sequence; |
65 | this.Overridable = true; // all standard actions are overridable by default | 66 | // this.Overridable = true; // all standard actions are overridable by default |
66 | } | 67 | //} |
67 | 68 | ||
68 | /// <summary> | 69 | /// <summary> |
69 | /// Instantiates an ActionRow by copying data from another ActionRow. | 70 | /// Instantiates an ActionRow by copying data from another ActionRow. |
@@ -296,13 +297,15 @@ namespace WixToolset.Data.Rows | |||
296 | WixActionRow[] actionRows = new WixActionRow[sequenceCount]; | 297 | WixActionRow[] actionRows = new WixActionRow[sequenceCount]; |
297 | for (int i = 0; i < sequenceCount; i++) | 298 | for (int i = 0; i < sequenceCount; i++) |
298 | { | 299 | { |
299 | WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence); | 300 | //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence); |
300 | actionRows[i] = actionRow; | 301 | //actionRows[i] = actionRow; |
302 | throw new NotImplementedException(); | ||
301 | } | 303 | } |
302 | 304 | ||
303 | return actionRows; | 305 | return actionRows; |
304 | } | 306 | } |
305 | 307 | ||
308 | #if DEAD_CODE | ||
306 | /// <summary> | 309 | /// <summary> |
307 | /// Determines whether this ActionRow contains the specified ActionRow as a child in its dependency tree. | 310 | /// Determines whether this ActionRow contains the specified ActionRow as a child in its dependency tree. |
308 | /// </summary> | 311 | /// </summary> |
@@ -370,5 +373,6 @@ namespace WixToolset.Data.Rows | |||
370 | } | 373 | } |
371 | } | 374 | } |
372 | } | 375 | } |
376 | #endif | ||
373 | } | 377 | } |
374 | } | 378 | } |
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs index 513a104f..9fab6b5d 100644 --- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs +++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs | |||
@@ -6,6 +6,7 @@ namespace WixToolset.Data.Rows | |||
6 | using System.Collections; | 6 | using System.Collections; |
7 | using System.Diagnostics; | 7 | using System.Diagnostics; |
8 | using System.Xml; | 8 | using System.Xml; |
9 | using WixToolset.Data.Tuples; | ||
9 | 10 | ||
10 | /// <summary> | 11 | /// <summary> |
11 | /// A collection of action rows sorted by their sequence table and action name. | 12 | /// A collection of action rows sorted by their sequence table and action name. |
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs index b6c0b840..3be5a56d 100644 --- a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs +++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs | |||
@@ -2,6 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Data.Rows | 3 | namespace WixToolset.Data.Rows |
4 | { | 4 | { |
5 | using WixToolset.Data.Tuples; | ||
6 | |||
5 | /// <summary> | 7 | /// <summary> |
6 | /// Specialization of a row for the WixDeltaPatchSymbolPaths table. | 8 | /// Specialization of a row for the WixDeltaPatchSymbolPaths table. |
7 | /// </summary> | 9 | /// </summary> |