The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 26, 2020 at 10:16 UTC
238d3caad2d0595c6276fdf7565d45466ce0fe72
26 files changed
+637
-637
src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+1
-1
@@ -7,7 +7,7 @@ namespace WixToolsetTest.Util
7
using WixBuildTools.TestSupport;
8
using WixToolset.Core.TestPackage;
9
using WixToolset.Data;
10
- using WixToolset.Data.Tuples;
10
+ using WixToolset.Data.Symbols;
11
using WixToolset.Util;
12
using Xunit;
13
src/wixext/Tuples/EventManifestTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition EventManifest = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.EventManifest.ToString(),
10
+ public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.EventManifest.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(EventManifestTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String),
16
},
17
- typeof(EventManifestTuple));
17
+ typeof(EventManifestSymbol));
18
}
19
}
20
21
-namespace WixToolset.Util.Tuples
21
+namespace WixToolset.Util.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum EventManifestTupleFields
25
+ public enum EventManifestSymbolFields
26
{
27
ComponentRef,
28
File,
29
}
30
31
- public class EventManifestTuple : IntermediateTuple
31
+ public class EventManifestSymbol : IntermediateSymbol
32
{
33
- public EventManifestTuple() : base(UtilTupleDefinitions.EventManifest, null, null)
33
+ public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null)
34
{
35
}
36
37
- public EventManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.EventManifest, sourceLineNumber, id)
37
+ public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id)
38
{
39
}
40
41
- public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index];
42
43
public string ComponentRef
44
{
45
- get => this.Fields[(int)EventManifestTupleFields.ComponentRef].AsString();
46
- set => this.Set((int)EventManifestTupleFields.ComponentRef, value);
45
+ get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString();
46
+ set => this.Set((int)EventManifestSymbolFields.ComponentRef, value);
47
}
48
49
public string File
50
{
51
- get => this.Fields[(int)EventManifestTupleFields.File].AsString();
52
- set => this.Set((int)EventManifestTupleFields.File, value);
51
+ get => this.Fields[(int)EventManifestSymbolFields.File].AsString();
52
+ set => this.Set((int)EventManifestSymbolFields.File, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/FileSharePermissionsTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition FileSharePermissions = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.FileSharePermissions.ToString(),
10
+ public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.FileSharePermissions.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShareRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.UserRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number),
17
},
18
- typeof(FileSharePermissionsTuple));
18
+ typeof(FileSharePermissionsSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum FileSharePermissionsTupleFields
26
+ public enum FileSharePermissionsSymbolFields
27
{
28
FileShareRef,
29
UserRef,
30
Permissions,
31
}
32
33
- public class FileSharePermissionsTuple : IntermediateTuple
33
+ public class FileSharePermissionsSymbol : IntermediateSymbol
34
{
35
- public FileSharePermissionsTuple() : base(UtilTupleDefinitions.FileSharePermissions, null, null)
35
+ public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null)
36
{
37
}
38
39
- public FileSharePermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileSharePermissions, sourceLineNumber, id)
39
+ public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index];
44
45
public string FileShareRef
46
{
47
- get => this.Fields[(int)FileSharePermissionsTupleFields.FileShareRef].AsString();
48
- set => this.Set((int)FileSharePermissionsTupleFields.FileShareRef, value);
47
+ get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString();
48
+ set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value);
49
}
50
51
public string UserRef
52
{
53
- get => this.Fields[(int)FileSharePermissionsTupleFields.UserRef].AsString();
54
- set => this.Set((int)FileSharePermissionsTupleFields.UserRef, value);
53
+ get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString();
54
+ set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value);
55
}
56
57
public int Permissions
58
{
59
- get => this.Fields[(int)FileSharePermissionsTupleFields.Permissions].AsNumber();
60
- set => this.Set((int)FileSharePermissionsTupleFields.Permissions, value);
59
+ get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber();
60
+ set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/FileShareTuple.cs
+23
-23
@@ -3,28 +3,28 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition FileShare = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.FileShare.ToString(),
10
+ public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.FileShare.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(FileShareTupleFields.ComponentRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(FileShareTupleFields.DirectoryRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String),
18
},
19
- typeof(FileShareTuple));
19
+ typeof(FileShareSymbol));
20
}
21
}
22
23
-namespace WixToolset.Util.Tuples
23
+namespace WixToolset.Util.Symbols
24
{
25
using WixToolset.Data;
26
27
- public enum FileShareTupleFields
27
+ public enum FileShareSymbolFields
28
{
29
ShareName,
30
ComponentRef,
@@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples
32
DirectoryRef,
33
}
34
35
- public class FileShareTuple : IntermediateTuple
35
+ public class FileShareSymbol : IntermediateSymbol
36
{
37
- public FileShareTuple() : base(UtilTupleDefinitions.FileShare, null, null)
37
+ public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null)
38
{
39
}
40
41
- public FileShareTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileShare, sourceLineNumber, id)
41
+ public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id)
42
{
43
}
44
45
- public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index];
45
+ public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index];
46
47
public string ShareName
48
{
49
- get => this.Fields[(int)FileShareTupleFields.ShareName].AsString();
50
- set => this.Set((int)FileShareTupleFields.ShareName, value);
49
+ get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString();
50
+ set => this.Set((int)FileShareSymbolFields.ShareName, value);
51
}
52
53
public string ComponentRef
54
{
55
- get => this.Fields[(int)FileShareTupleFields.ComponentRef].AsString();
56
- set => this.Set((int)FileShareTupleFields.ComponentRef, value);
55
+ get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString();
56
+ set => this.Set((int)FileShareSymbolFields.ComponentRef, value);
57
}
58
59
public string Description
60
{
61
- get => this.Fields[(int)FileShareTupleFields.Description].AsString();
62
- set => this.Set((int)FileShareTupleFields.Description, value);
61
+ get => this.Fields[(int)FileShareSymbolFields.Description].AsString();
62
+ set => this.Set((int)FileShareSymbolFields.Description, value);
63
}
64
65
public string DirectoryRef
66
{
67
- get => this.Fields[(int)FileShareTupleFields.DirectoryRef].AsString();
68
- set => this.Set((int)FileShareTupleFields.DirectoryRef, value);
67
+ get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString();
68
+ set => this.Set((int)FileShareSymbolFields.DirectoryRef, value);
69
}
70
}
71
}
\ No newline at end of file
src/wixext/Tuples/GroupTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition Group = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.Group.ToString(),
10
+ public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.Group.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String),
17
},
18
- typeof(GroupTuple));
18
+ typeof(GroupSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum GroupTupleFields
26
+ public enum GroupSymbolFields
27
{
28
ComponentRef,
29
Name,
30
Domain,
31
}
32
33
- public class GroupTuple : IntermediateTuple
33
+ public class GroupSymbol : IntermediateSymbol
34
{
35
- public GroupTuple() : base(UtilTupleDefinitions.Group, null, null)
35
+ public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null)
36
{
37
}
38
39
- public GroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Group, sourceLineNumber, id)
39
+ public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)GroupTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)GroupSymbolFields.ComponentRef, value);
49
}
50
51
public string Name
52
{
53
- get => this.Fields[(int)GroupTupleFields.Name].AsString();
54
- set => this.Set((int)GroupTupleFields.Name, value);
53
+ get => this.Fields[(int)GroupSymbolFields.Name].AsString();
54
+ set => this.Set((int)GroupSymbolFields.Name, value);
55
}
56
57
public string Domain
58
{
59
- get => this.Fields[(int)GroupTupleFields.Domain].AsString();
60
- set => this.Set((int)GroupTupleFields.Domain, value);
59
+ get => this.Fields[(int)GroupSymbolFields.Domain].AsString();
60
+ set => this.Set((int)GroupSymbolFields.Domain, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/PerfmonManifestTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition PerfmonManifest = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.PerfmonManifest.ToString(),
10
+ public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.PerfmonManifest.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String),
17
},
18
- typeof(PerfmonManifestTuple));
18
+ typeof(PerfmonManifestSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum PerfmonManifestTupleFields
26
+ public enum PerfmonManifestSymbolFields
27
{
28
ComponentRef,
29
File,
30
ResourceFileDirectory,
31
}
32
33
- public class PerfmonManifestTuple : IntermediateTuple
33
+ public class PerfmonManifestSymbol : IntermediateSymbol
34
{
35
- public PerfmonManifestTuple() : base(UtilTupleDefinitions.PerfmonManifest, null, null)
35
+ public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null)
36
{
37
}
38
39
- public PerfmonManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerfmonManifest, sourceLineNumber, id)
39
+ public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)PerfmonManifestTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)PerfmonManifestTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value);
49
}
50
51
public string File
52
{
53
- get => this.Fields[(int)PerfmonManifestTupleFields.File].AsString();
54
- set => this.Set((int)PerfmonManifestTupleFields.File, value);
53
+ get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString();
54
+ set => this.Set((int)PerfmonManifestSymbolFields.File, value);
55
}
56
57
public string ResourceFileDirectory
58
{
59
- get => this.Fields[(int)PerfmonManifestTupleFields.ResourceFileDirectory].AsString();
60
- set => this.Set((int)PerfmonManifestTupleFields.ResourceFileDirectory, value);
59
+ get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString();
60
+ set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/PerfmonTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition Perfmon = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.Perfmon.ToString(),
10
+ public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.Perfmon.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(PerfmonTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String),
17
},
18
- typeof(PerfmonTuple));
18
+ typeof(PerfmonSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum PerfmonTupleFields
26
+ public enum PerfmonSymbolFields
27
{
28
ComponentRef,
29
File,
30
Name,
31
}
32
33
- public class PerfmonTuple : IntermediateTuple
33
+ public class PerfmonSymbol : IntermediateSymbol
34
{
35
- public PerfmonTuple() : base(UtilTupleDefinitions.Perfmon, null, null)
35
+ public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null)
36
{
37
}
38
39
- public PerfmonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Perfmon, sourceLineNumber, id)
39
+ public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)PerfmonTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)PerfmonTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)PerfmonSymbolFields.ComponentRef, value);
49
}
50
51
public string File
52
{
53
- get => this.Fields[(int)PerfmonTupleFields.File].AsString();
54
- set => this.Set((int)PerfmonTupleFields.File, value);
53
+ get => this.Fields[(int)PerfmonSymbolFields.File].AsString();
54
+ set => this.Set((int)PerfmonSymbolFields.File, value);
55
}
56
57
public string Name
58
{
59
- get => this.Fields[(int)PerfmonTupleFields.Name].AsString();
60
- set => this.Set((int)PerfmonTupleFields.Name, value);
59
+ get => this.Fields[(int)PerfmonSymbolFields.Name].AsString();
60
+ set => this.Set((int)PerfmonSymbolFields.Name, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/PerformanceCategoryTuple.cs
+23
-23
@@ -3,28 +3,28 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition PerformanceCategory = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.PerformanceCategory.ToString(),
10
+ public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.PerformanceCategory.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Name), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.IniData), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ConstantData), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String),
18
},
19
- typeof(PerformanceCategoryTuple));
19
+ typeof(PerformanceCategorySymbol));
20
}
21
}
22
23
-namespace WixToolset.Util.Tuples
23
+namespace WixToolset.Util.Symbols
24
{
25
using WixToolset.Data;
26
27
- public enum PerformanceCategoryTupleFields
27
+ public enum PerformanceCategorySymbolFields
28
{
29
ComponentRef,
30
Name,
@@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples
32
ConstantData,
33
}
34
35
- public class PerformanceCategoryTuple : IntermediateTuple
35
+ public class PerformanceCategorySymbol : IntermediateSymbol
36
{
37
- public PerformanceCategoryTuple() : base(UtilTupleDefinitions.PerformanceCategory, null, null)
37
+ public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null)
38
{
39
}
40
41
- public PerformanceCategoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerformanceCategory, sourceLineNumber, id)
41
+ public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id)
42
{
43
}
44
45
- public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index];
45
+ public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index];
46
47
public string ComponentRef
48
{
49
- get => this.Fields[(int)PerformanceCategoryTupleFields.ComponentRef].AsString();
50
- set => this.Set((int)PerformanceCategoryTupleFields.ComponentRef, value);
49
+ get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString();
50
+ set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value);
51
}
52
53
public string Name
54
{
55
- get => this.Fields[(int)PerformanceCategoryTupleFields.Name].AsString();
56
- set => this.Set((int)PerformanceCategoryTupleFields.Name, value);
55
+ get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString();
56
+ set => this.Set((int)PerformanceCategorySymbolFields.Name, value);
57
}
58
59
public string IniData
60
{
61
- get => this.Fields[(int)PerformanceCategoryTupleFields.IniData].AsString();
62
- set => this.Set((int)PerformanceCategoryTupleFields.IniData, value);
61
+ get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString();
62
+ set => this.Set((int)PerformanceCategorySymbolFields.IniData, value);
63
}
64
65
public string ConstantData
66
{
67
- get => this.Fields[(int)PerformanceCategoryTupleFields.ConstantData].AsString();
68
- set => this.Set((int)PerformanceCategoryTupleFields.ConstantData, value);
67
+ get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString();
68
+ set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value);
69
}
70
}
71
}
\ No newline at end of file
src/wixext/Tuples/SecureObjectsTuple.cs
+32
-32
@@ -3,31 +3,31 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition SecureObjects = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.SecureObjects.ToString(),
10
+ public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.SecureObjects.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Attributes), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number),
20
- new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number),
20
+ new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String),
21
},
22
- typeof(SecureObjectsTuple));
22
+ typeof(SecureObjectsSymbol));
23
}
24
}
25
26
-namespace WixToolset.Util.Tuples
26
+namespace WixToolset.Util.Symbols
27
{
28
using WixToolset.Data;
29
30
- public enum SecureObjectsTupleFields
30
+ public enum SecureObjectsSymbolFields
31
{
32
SecureObject,
33
Table,
@@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples
38
ComponentRef,
39
}
40
41
- public class SecureObjectsTuple : IntermediateTuple
41
+ public class SecureObjectsSymbol : IntermediateSymbol
42
{
43
- public SecureObjectsTuple() : base(UtilTupleDefinitions.SecureObjects, null, null)
43
+ public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null)
44
{
45
}
46
47
- public SecureObjectsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.SecureObjects, sourceLineNumber, id)
47
+ public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id)
48
{
49
}
50
51
- public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index];
51
+ public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index];
52
53
public string SecureObject
54
{
55
- get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString();
56
- set => this.Set((int)SecureObjectsTupleFields.SecureObject, value);
55
+ get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString();
56
+ set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value);
57
}
58
59
public string Table
60
{
61
- get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString();
62
- set => this.Set((int)SecureObjectsTupleFields.Table, value);
61
+ get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString();
62
+ set => this.Set((int)SecureObjectsSymbolFields.Table, value);
63
}
64
65
public string Domain
66
{
67
- get => this.Fields[(int)SecureObjectsTupleFields.Domain].AsString();
68
- set => this.Set((int)SecureObjectsTupleFields.Domain, value);
67
+ get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString();
68
+ set => this.Set((int)SecureObjectsSymbolFields.Domain, value);
69
}
70
71
public string User
72
{
73
- get => this.Fields[(int)SecureObjectsTupleFields.User].AsString();
74
- set => this.Set((int)SecureObjectsTupleFields.User, value);
73
+ get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString();
74
+ set => this.Set((int)SecureObjectsSymbolFields.User, value);
75
}
76
77
public int Attributes
78
{
79
- get => this.Fields[(int)SecureObjectsTupleFields.Attributes].AsNumber();
80
- set => this.Set((int)SecureObjectsTupleFields.Attributes, value);
79
+ get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber();
80
+ set => this.Set((int)SecureObjectsSymbolFields.Attributes, value);
81
}
82
83
public int? Permission
84
{
85
- get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber();
86
- set => this.Set((int)SecureObjectsTupleFields.Permission, value);
85
+ get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber();
86
+ set => this.Set((int)SecureObjectsSymbolFields.Permission, value);
87
}
88
89
public string ComponentRef
90
{
91
- get => this.Fields[(int)SecureObjectsTupleFields.ComponentRef].AsString();
92
- set => this.Set((int)SecureObjectsTupleFields.ComponentRef, value);
91
+ get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString();
92
+ set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value);
93
}
94
}
95
}
\ No newline at end of file
src/wixext/Tuples/ServiceConfigTuple.cs
+41
-41
@@ -3,34 +3,34 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition ServiceConfig = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.ServiceConfig.ToString(),
10
+ public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.ServiceConfig.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number),
17
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ThirdFailureActionType), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ResetPeriodInDays), IntermediateFieldType.Number),
21
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number),
22
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ProgramCommandLine), IntermediateFieldType.String),
23
- new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RebootMessage), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number),
17
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number),
21
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number),
22
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String),
23
+ new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String),
24
},
25
- typeof(ServiceConfigTuple));
25
+ typeof(ServiceConfigSymbol));
26
}
27
}
28
29
-namespace WixToolset.Util.Tuples
29
+namespace WixToolset.Util.Symbols
30
{
31
using WixToolset.Data;
32
33
- public enum ServiceConfigTupleFields
33
+ public enum ServiceConfigSymbolFields
34
{
35
ServiceName,
36
ComponentRef,
@@ -44,76 +44,76 @@ namespace WixToolset.Util.Tuples
44
RebootMessage,
45
}
46
47
- public class ServiceConfigTuple : IntermediateTuple
47
+ public class ServiceConfigSymbol : IntermediateSymbol
48
{
49
- public ServiceConfigTuple() : base(UtilTupleDefinitions.ServiceConfig, null, null)
49
+ public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null)
50
{
51
}
52
53
- public ServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.ServiceConfig, sourceLineNumber, id)
53
+ public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id)
54
{
55
}
56
57
- public IntermediateField this[ServiceConfigTupleFields index] => this.Fields[(int)index];
57
+ public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index];
58
59
public string ServiceName
60
{
61
- get => this.Fields[(int)ServiceConfigTupleFields.ServiceName].AsString();
62
- set => this.Set((int)ServiceConfigTupleFields.ServiceName, value);
61
+ get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString();
62
+ set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value);
63
}
64
65
public string ComponentRef
66
{
67
- get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString();
68
- set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value);
67
+ get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString();
68
+ set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value);
69
}
70
71
public int NewService
72
{
73
- get => this.Fields[(int)ServiceConfigTupleFields.NewService].AsNumber();
74
- set => this.Set((int)ServiceConfigTupleFields.NewService, value);
73
+ get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber();
74
+ set => this.Set((int)ServiceConfigSymbolFields.NewService, value);
75
}
76
77
public string FirstFailureActionType
78
{
79
- get => this.Fields[(int)ServiceConfigTupleFields.FirstFailureActionType].AsString();
80
- set => this.Set((int)ServiceConfigTupleFields.FirstFailureActionType, value);
79
+ get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString();
80
+ set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value);
81
}
82
83
public string SecondFailureActionType
84
{
85
- get => this.Fields[(int)ServiceConfigTupleFields.SecondFailureActionType].AsString();
86
- set => this.Set((int)ServiceConfigTupleFields.SecondFailureActionType, value);
85
+ get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString();
86
+ set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value);
87
}
88
89
public string ThirdFailureActionType
90
{
91
- get => this.Fields[(int)ServiceConfigTupleFields.ThirdFailureActionType].AsString();
92
- set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value);
91
+ get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString();
92
+ set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value);
93
}
94
95
public int? ResetPeriodInDays
96
{
97
- get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber();
98
- set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value);
97
+ get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber();
98
+ set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value);
99
}
100
101
public int? RestartServiceDelayInSeconds
102
{
103
- get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber();
104
- set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value);
103
+ get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber();
104
+ set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value);
105
}
106
107
public string ProgramCommandLine
108
{
109
- get => this.Fields[(int)ServiceConfigTupleFields.ProgramCommandLine].AsString();
110
- set => this.Set((int)ServiceConfigTupleFields.ProgramCommandLine, value);
109
+ get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString();
110
+ set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value);
111
}
112
113
public string RebootMessage
114
{
115
- get => this.Fields[(int)ServiceConfigTupleFields.RebootMessage].AsString();
116
- set => this.Set((int)ServiceConfigTupleFields.RebootMessage, value);
115
+ get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString();
116
+ set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value);
117
}
118
}
119
}
\ No newline at end of file
src/wixext/Tuples/UserGroupTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition UserGroup = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.UserGroup.ToString(),
10
+ public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.UserGroup.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(UserGroupTupleFields.UserRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(UserGroupTupleFields.GroupRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String),
16
},
17
- typeof(UserGroupTuple));
17
+ typeof(UserGroupSymbol));
18
}
19
}
20
21
-namespace WixToolset.Util.Tuples
21
+namespace WixToolset.Util.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum UserGroupTupleFields
25
+ public enum UserGroupSymbolFields
26
{
27
UserRef,
28
GroupRef,
29
}
30
31
- public class UserGroupTuple : IntermediateTuple
31
+ public class UserGroupSymbol : IntermediateSymbol
32
{
33
- public UserGroupTuple() : base(UtilTupleDefinitions.UserGroup, null, null)
33
+ public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null)
34
{
35
}
36
37
- public UserGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.UserGroup, sourceLineNumber, id)
37
+ public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id)
38
{
39
}
40
41
- public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index];
42
43
public string UserRef
44
{
45
- get => this.Fields[(int)UserGroupTupleFields.UserRef].AsString();
46
- set => this.Set((int)UserGroupTupleFields.UserRef, value);
45
+ get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString();
46
+ set => this.Set((int)UserGroupSymbolFields.UserRef, value);
47
}
48
49
public string GroupRef
50
{
51
- get => this.Fields[(int)UserGroupTupleFields.GroupRef].AsString();
52
- set => this.Set((int)UserGroupTupleFields.GroupRef, value);
51
+ get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString();
52
+ set => this.Set((int)UserGroupSymbolFields.GroupRef, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/UserTuple.cs
+26
-26
@@ -3,29 +3,29 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition User = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.User.ToString(),
10
+ public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.User.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(UserTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(UserTupleFields.Name), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(UserTupleFields.Domain), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(UserTupleFields.Password), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(UserTupleFields.Attributes), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number),
19
},
20
- typeof(UserTuple));
20
+ typeof(UserSymbol));
21
}
22
}
23
24
-namespace WixToolset.Util.Tuples
24
+namespace WixToolset.Util.Symbols
25
{
26
using WixToolset.Data;
27
28
- public enum UserTupleFields
28
+ public enum UserSymbolFields
29
{
30
ComponentRef,
31
Name,
@@ -34,46 +34,46 @@ namespace WixToolset.Util.Tuples
34
Attributes,
35
}
36
37
- public class UserTuple : IntermediateTuple
37
+ public class UserSymbol : IntermediateSymbol
38
{
39
- public UserTuple() : base(UtilTupleDefinitions.User, null, null)
39
+ public UserSymbol() : base(UtilSymbolDefinitions.User, null, null)
40
{
41
}
42
43
- public UserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.User, sourceLineNumber, id)
43
+ public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id)
44
{
45
}
46
47
- public IntermediateField this[UserTupleFields index] => this.Fields[(int)index];
47
+ public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index];
48
49
public string ComponentRef
50
{
51
- get => this.Fields[(int)UserTupleFields.ComponentRef].AsString();
52
- set => this.Set((int)UserTupleFields.ComponentRef, value);
51
+ get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString();
52
+ set => this.Set((int)UserSymbolFields.ComponentRef, value);
53
}
54
55
public string Name
56
{
57
- get => this.Fields[(int)UserTupleFields.Name].AsString();
58
- set => this.Set((int)UserTupleFields.Name, value);
57
+ get => this.Fields[(int)UserSymbolFields.Name].AsString();
58
+ set => this.Set((int)UserSymbolFields.Name, value);
59
}
60
61
public string Domain
62
{
63
- get => this.Fields[(int)UserTupleFields.Domain].AsString();
64
- set => this.Set((int)UserTupleFields.Domain, value);
63
+ get => this.Fields[(int)UserSymbolFields.Domain].AsString();
64
+ set => this.Set((int)UserSymbolFields.Domain, value);
65
}
66
67
public string Password
68
{
69
- get => this.Fields[(int)UserTupleFields.Password].AsString();
70
- set => this.Set((int)UserTupleFields.Password, value);
69
+ get => this.Fields[(int)UserSymbolFields.Password].AsString();
70
+ set => this.Set((int)UserSymbolFields.Password, value);
71
}
72
73
public int Attributes
74
{
75
- get => this.Fields[(int)UserTupleFields.Attributes].AsNumber();
76
- set => this.Set((int)UserTupleFields.Attributes, value);
75
+ get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber();
76
+ set => this.Set((int)UserSymbolFields.Attributes, value);
77
}
78
}
79
}
\ No newline at end of file
src/wixext/Tuples/UtilTupleDefinitions.cs
+47
-47
@@ -6,7 +6,7 @@ namespace WixToolset.Util
6
using WixToolset.Data;
7
using WixToolset.Data.Burn;
8
9
- public enum UtilTupleDefinitionType
9
+ public enum UtilSymbolDefinitionType
10
{
11
EventManifest,
12
FileShare,
@@ -30,13 +30,13 @@ namespace WixToolset.Util
30
XmlFile,
31
}
32
33
- public static partial class UtilTupleDefinitions
33
+ public static partial class UtilSymbolDefinitions
34
{
35
public static readonly Version Version = new Version("4.0.0");
36
37
- public static IntermediateTupleDefinition ByName(string name)
37
+ public static IntermediateSymbolDefinition ByName(string name)
38
{
39
- if (!Enum.TryParse(name, out UtilTupleDefinitionType type))
39
+ if (!Enum.TryParse(name, out UtilSymbolDefinitionType type))
40
{
41
return null;
42
}
@@ -44,78 +44,78 @@ namespace WixToolset.Util
44
return ByType(type);
45
}
46
47
- public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type)
47
+ public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type)
48
{
49
switch (type)
50
{
51
- case UtilTupleDefinitionType.EventManifest:
52
- return UtilTupleDefinitions.EventManifest;
51
+ case UtilSymbolDefinitionType.EventManifest:
52
+ return UtilSymbolDefinitions.EventManifest;
53
54
- case UtilTupleDefinitionType.FileShare:
55
- return UtilTupleDefinitions.FileShare;
54
+ case UtilSymbolDefinitionType.FileShare:
55
+ return UtilSymbolDefinitions.FileShare;
56
57
- case UtilTupleDefinitionType.FileSharePermissions:
58
- return UtilTupleDefinitions.FileSharePermissions;
57
+ case UtilSymbolDefinitionType.FileSharePermissions:
58
+ return UtilSymbolDefinitions.FileSharePermissions;
59
60
- case UtilTupleDefinitionType.Group:
61
- return UtilTupleDefinitions.Group;
60
+ case UtilSymbolDefinitionType.Group:
61
+ return UtilSymbolDefinitions.Group;
62
63
- case UtilTupleDefinitionType.Perfmon:
64
- return UtilTupleDefinitions.Perfmon;
63
+ case UtilSymbolDefinitionType.Perfmon:
64
+ return UtilSymbolDefinitions.Perfmon;
65
66
- case UtilTupleDefinitionType.PerfmonManifest:
67
- return UtilTupleDefinitions.PerfmonManifest;
66
+ case UtilSymbolDefinitionType.PerfmonManifest:
67
+ return UtilSymbolDefinitions.PerfmonManifest;
68
69
- case UtilTupleDefinitionType.PerformanceCategory:
70
- return UtilTupleDefinitions.PerformanceCategory;
69
+ case UtilSymbolDefinitionType.PerformanceCategory:
70
+ return UtilSymbolDefinitions.PerformanceCategory;
71
72
- case UtilTupleDefinitionType.SecureObjects:
73
- return UtilTupleDefinitions.SecureObjects;
72
+ case UtilSymbolDefinitionType.SecureObjects:
73
+ return UtilSymbolDefinitions.SecureObjects;
74
75
- case UtilTupleDefinitionType.ServiceConfig:
76
- return UtilTupleDefinitions.ServiceConfig;
75
+ case UtilSymbolDefinitionType.ServiceConfig:
76
+ return UtilSymbolDefinitions.ServiceConfig;
77
78
- case UtilTupleDefinitionType.User:
79
- return UtilTupleDefinitions.User;
78
+ case UtilSymbolDefinitionType.User:
79
+ return UtilSymbolDefinitions.User;
80
81
- case UtilTupleDefinitionType.UserGroup:
82
- return UtilTupleDefinitions.UserGroup;
81
+ case UtilSymbolDefinitionType.UserGroup:
82
+ return UtilSymbolDefinitions.UserGroup;
83
84
- case UtilTupleDefinitionType.WixCloseApplication:
85
- return UtilTupleDefinitions.WixCloseApplication;
84
+ case UtilSymbolDefinitionType.WixCloseApplication:
85
+ return UtilSymbolDefinitions.WixCloseApplication;
86
87
- case UtilTupleDefinitionType.WixDetectSHA2Support:
88
- return UtilTupleDefinitions.WixDetectSHA2Support;
87
+ case UtilSymbolDefinitionType.WixDetectSHA2Support:
88
+ return UtilSymbolDefinitions.WixDetectSHA2Support;
89
90
- case UtilTupleDefinitionType.WixFormatFiles:
91
- return UtilTupleDefinitions.WixFormatFiles;
90
+ case UtilSymbolDefinitionType.WixFormatFiles:
91
+ return UtilSymbolDefinitions.WixFormatFiles;
92
93
- case UtilTupleDefinitionType.WixInternetShortcut:
94
- return UtilTupleDefinitions.WixInternetShortcut;
93
+ case UtilSymbolDefinitionType.WixInternetShortcut:
94
+ return UtilSymbolDefinitions.WixInternetShortcut;
95
96
- case UtilTupleDefinitionType.WixRemoveFolderEx:
97
- return UtilTupleDefinitions.WixRemoveFolderEx;
96
+ case UtilSymbolDefinitionType.WixRemoveFolderEx:
97
+ return UtilSymbolDefinitions.WixRemoveFolderEx;
98
99
- case UtilTupleDefinitionType.WixRestartResource:
100
- return UtilTupleDefinitions.WixRestartResource;
99
+ case UtilSymbolDefinitionType.WixRestartResource:
100
+ return UtilSymbolDefinitions.WixRestartResource;
101
102
- case UtilTupleDefinitionType.WixTouchFile:
103
- return UtilTupleDefinitions.WixTouchFile;
102
+ case UtilSymbolDefinitionType.WixTouchFile:
103
+ return UtilSymbolDefinitions.WixTouchFile;
104
105
- case UtilTupleDefinitionType.XmlConfig:
106
- return UtilTupleDefinitions.XmlConfig;
105
+ case UtilSymbolDefinitionType.XmlConfig:
106
+ return UtilSymbolDefinitions.XmlConfig;
107
108
- case UtilTupleDefinitionType.XmlFile:
109
- return UtilTupleDefinitions.XmlFile;
108
+ case UtilSymbolDefinitionType.XmlFile:
109
+ return UtilSymbolDefinitions.XmlFile;
110
111
default:
112
throw new ArgumentOutOfRangeException(nameof(type));
113
}
114
}
115
116
- static UtilTupleDefinitions()
116
+ static UtilSymbolDefinitions()
117
{
118
- WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);
118
+ WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
119
}
120
}
121
}
src/wixext/Tuples/WixCloseApplicationTuple.cs
+35
-35
@@ -3,32 +3,32 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixCloseApplication = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixCloseApplication.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixCloseApplication.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Attributes), IntermediateFieldType.Number),
18
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Sequence), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Property), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.TerminateExitCode), IntermediateFieldType.Number),
21
- new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Timeout), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number),
18
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number),
21
+ new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number),
22
},
23
- typeof(WixCloseApplicationTuple));
23
+ typeof(WixCloseApplicationSymbol));
24
}
25
}
26
27
-namespace WixToolset.Util.Tuples
27
+namespace WixToolset.Util.Symbols
28
{
29
using WixToolset.Data;
30
31
- public enum WixCloseApplicationTupleFields
31
+ public enum WixCloseApplicationSymbolFields
32
{
33
Target,
34
Description,
@@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples
40
Timeout,
41
}
42
43
- public class WixCloseApplicationTuple : IntermediateTuple
43
+ public class WixCloseApplicationSymbol : IntermediateSymbol
44
{
45
- public WixCloseApplicationTuple() : base(UtilTupleDefinitions.WixCloseApplication, null, null)
45
+ public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null)
46
{
47
}
48
49
- public WixCloseApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixCloseApplication, sourceLineNumber, id)
49
+ public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id)
50
{
51
}
52
53
- public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index];
53
+ public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index];
54
55
public string Target
56
{
57
- get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString();
58
- set => this.Set((int)WixCloseApplicationTupleFields.Target, value);
57
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString();
58
+ set => this.Set((int)WixCloseApplicationSymbolFields.Target, value);
59
}
60
61
public string Description
62
{
63
- get => this.Fields[(int)WixCloseApplicationTupleFields.Description].AsString();
64
- set => this.Set((int)WixCloseApplicationTupleFields.Description, value);
63
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString();
64
+ set => this.Set((int)WixCloseApplicationSymbolFields.Description, value);
65
}
66
67
public string Condition
68
{
69
- get => this.Fields[(int)WixCloseApplicationTupleFields.Condition].AsString();
70
- set => this.Set((int)WixCloseApplicationTupleFields.Condition, value);
69
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString();
70
+ set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value);
71
}
72
73
public int Attributes
74
{
75
- get => this.Fields[(int)WixCloseApplicationTupleFields.Attributes].AsNumber();
76
- set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value);
75
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber();
76
+ set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value);
77
}
78
79
public int? Sequence
80
{
81
- get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber();
82
- set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value);
81
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber();
82
+ set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value);
83
}
84
85
public string Property
86
{
87
- get => this.Fields[(int)WixCloseApplicationTupleFields.Property].AsString();
88
- set => this.Set((int)WixCloseApplicationTupleFields.Property, value);
87
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString();
88
+ set => this.Set((int)WixCloseApplicationSymbolFields.Property, value);
89
}
90
91
public int? TerminateExitCode
92
{
93
- get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber();
94
- set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value);
93
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber();
94
+ set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value);
95
}
96
97
public int? Timeout
98
{
99
- get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber();
100
- set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value);
99
+ get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber();
100
+ set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value);
101
}
102
}
103
}
\ No newline at end of file
src/wixext/Tuples/WixDetectSHA2SupportTuple.cs
+10
-10
@@ -3,31 +3,31 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixDetectSHA2Support = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixDetectSHA2Support.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(),
12
new IntermediateFieldDefinition[0],
13
- typeof(WixDetectSHA2SupportTuple));
13
+ typeof(WixDetectSHA2SupportSymbol));
14
}
15
}
16
17
-namespace WixToolset.Util.Tuples
17
+namespace WixToolset.Util.Symbols
18
{
19
using WixToolset.Data;
20
21
- public class WixDetectSHA2SupportTuple : IntermediateTuple
21
+ public class WixDetectSHA2SupportSymbol : IntermediateSymbol
22
{
23
- public WixDetectSHA2SupportTuple() : base(UtilTupleDefinitions.WixDetectSHA2Support, null, null)
23
+ public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null)
24
{
25
}
26
27
- public WixDetectSHA2SupportTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixDetectSHA2Support, sourceLineNumber, id)
27
+ public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id)
28
{
29
}
30
31
- public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index];
31
+ public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index];
32
}
33
}
src/wixext/Tuples/WixFormatFilesTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixFormatFiles = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixFormatFiles.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixFormatFiles.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.BinaryRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.FileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String),
16
},
17
- typeof(WixFormatFilesTuple));
17
+ typeof(WixFormatFilesSymbol));
18
}
19
}
20
21
-namespace WixToolset.Util.Tuples
21
+namespace WixToolset.Util.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum WixFormatFilesTupleFields
25
+ public enum WixFormatFilesSymbolFields
26
{
27
BinaryRef,
28
FileRef,
29
}
30
31
- public class WixFormatFilesTuple : IntermediateTuple
31
+ public class WixFormatFilesSymbol : IntermediateSymbol
32
{
33
- public WixFormatFilesTuple() : base(UtilTupleDefinitions.WixFormatFiles, null, null)
33
+ public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null)
34
{
35
}
36
37
- public WixFormatFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixFormatFiles, sourceLineNumber, id)
37
+ public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id)
38
{
39
}
40
41
- public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index];
42
43
public string BinaryRef
44
{
45
- get => this.Fields[(int)WixFormatFilesTupleFields.BinaryRef].AsString();
46
- set => this.Set((int)WixFormatFilesTupleFields.BinaryRef, value);
45
+ get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString();
46
+ set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value);
47
}
48
49
public string FileRef
50
{
51
- get => this.Fields[(int)WixFormatFilesTupleFields.FileRef].AsString();
52
- set => this.Set((int)WixFormatFilesTupleFields.FileRef, value);
51
+ get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString();
52
+ set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/WixInternetShortcutTuple.cs
+32
-32
@@ -3,31 +3,31 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixInternetShortcut = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixInternetShortcut.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixInternetShortcut.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Name), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Target), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Attributes), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconFile), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number),
21
},
22
- typeof(WixInternetShortcutTuple));
22
+ typeof(WixInternetShortcutSymbol));
23
}
24
}
25
26
-namespace WixToolset.Util.Tuples
26
+namespace WixToolset.Util.Symbols
27
{
28
using WixToolset.Data;
29
30
- public enum WixInternetShortcutTupleFields
30
+ public enum WixInternetShortcutSymbolFields
31
{
32
ComponentRef,
33
DirectoryRef,
@@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples
38
IconIndex,
39
}
40
41
- public class WixInternetShortcutTuple : IntermediateTuple
41
+ public class WixInternetShortcutSymbol : IntermediateSymbol
42
{
43
- public WixInternetShortcutTuple() : base(UtilTupleDefinitions.WixInternetShortcut, null, null)
43
+ public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null)
44
{
45
}
46
47
- public WixInternetShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixInternetShortcut, sourceLineNumber, id)
47
+ public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id)
48
{
49
}
50
51
- public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index];
51
+ public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index];
52
53
public string ComponentRef
54
{
55
- get => this.Fields[(int)WixInternetShortcutTupleFields.ComponentRef].AsString();
56
- set => this.Set((int)WixInternetShortcutTupleFields.ComponentRef, value);
55
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString();
56
+ set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value);
57
}
58
59
public string DirectoryRef
60
{
61
- get => this.Fields[(int)WixInternetShortcutTupleFields.DirectoryRef].AsString();
62
- set => this.Set((int)WixInternetShortcutTupleFields.DirectoryRef, value);
61
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString();
62
+ set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value);
63
}
64
65
public string Name
66
{
67
- get => this.Fields[(int)WixInternetShortcutTupleFields.Name].AsString();
68
- set => this.Set((int)WixInternetShortcutTupleFields.Name, value);
67
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString();
68
+ set => this.Set((int)WixInternetShortcutSymbolFields.Name, value);
69
}
70
71
public string Target
72
{
73
- get => this.Fields[(int)WixInternetShortcutTupleFields.Target].AsString();
74
- set => this.Set((int)WixInternetShortcutTupleFields.Target, value);
73
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString();
74
+ set => this.Set((int)WixInternetShortcutSymbolFields.Target, value);
75
}
76
77
public int Attributes
78
{
79
- get => this.Fields[(int)WixInternetShortcutTupleFields.Attributes].AsNumber();
80
- set => this.Set((int)WixInternetShortcutTupleFields.Attributes, value);
79
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber();
80
+ set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value);
81
}
82
83
public string IconFile
84
{
85
- get => this.Fields[(int)WixInternetShortcutTupleFields.IconFile].AsString();
86
- set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value);
85
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString();
86
+ set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value);
87
}
88
89
public int? IconIndex
90
{
91
- get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber();
92
- set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value);
91
+ get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber();
92
+ set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value);
93
}
94
}
95
}
\ No newline at end of file
src/wixext/Tuples/WixRemoveFolderExTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixRemoveFolderEx = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixRemoveFolderEx.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number),
17
},
18
- typeof(WixRemoveFolderExTuple));
18
+ typeof(WixRemoveFolderExSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum WixRemoveFolderExTupleFields
26
+ public enum WixRemoveFolderExSymbolFields
27
{
28
ComponentRef,
29
Property,
30
InstallMode,
31
}
32
33
- public class WixRemoveFolderExTuple : IntermediateTuple
33
+ public class WixRemoveFolderExSymbol : IntermediateSymbol
34
{
35
- public WixRemoveFolderExTuple() : base(UtilTupleDefinitions.WixRemoveFolderEx, null, null)
35
+ public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null)
36
{
37
}
38
39
- public WixRemoveFolderExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRemoveFolderEx, sourceLineNumber, id)
39
+ public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)WixRemoveFolderExTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)WixRemoveFolderExTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value);
49
}
50
51
public string Property
52
{
53
- get => this.Fields[(int)WixRemoveFolderExTupleFields.Property].AsString();
54
- set => this.Set((int)WixRemoveFolderExTupleFields.Property, value);
53
+ get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString();
54
+ set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value);
55
}
56
57
public int InstallMode
58
{
59
- get => this.Fields[(int)WixRemoveFolderExTupleFields.InstallMode].AsNumber();
60
- set => this.Set((int)WixRemoveFolderExTupleFields.InstallMode, value);
59
+ get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber();
60
+ set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/WixRestartResourceTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixRestartResource = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixRestartResource.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixRestartResource.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number),
17
},
18
- typeof(WixRestartResourceTuple));
18
+ typeof(WixRestartResourceSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum WixRestartResourceTupleFields
26
+ public enum WixRestartResourceSymbolFields
27
{
28
ComponentRef,
29
Resource,
30
Attributes,
31
}
32
33
- public class WixRestartResourceTuple : IntermediateTuple
33
+ public class WixRestartResourceSymbol : IntermediateSymbol
34
{
35
- public WixRestartResourceTuple() : base(UtilTupleDefinitions.WixRestartResource, null, null)
35
+ public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null)
36
{
37
}
38
39
- public WixRestartResourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRestartResource, sourceLineNumber, id)
39
+ public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)WixRestartResourceTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)WixRestartResourceTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value);
49
}
50
51
public string Resource
52
{
53
- get => this.Fields[(int)WixRestartResourceTupleFields.Resource].AsString();
54
- set => this.Set((int)WixRestartResourceTupleFields.Resource, value);
53
+ get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString();
54
+ set => this.Set((int)WixRestartResourceSymbolFields.Resource, value);
55
}
56
57
public int Attributes
58
{
59
- get => this.Fields[(int)WixRestartResourceTupleFields.Attributes].AsNumber();
60
- set => this.Set((int)WixRestartResourceTupleFields.Attributes, value);
59
+ get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber();
60
+ set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/WixTouchFileTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixTouchFile = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.WixTouchFile.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.WixTouchFile.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number),
17
},
18
- typeof(WixTouchFileTuple));
18
+ typeof(WixTouchFileSymbol));
19
}
20
}
21
22
-namespace WixToolset.Util.Tuples
22
+namespace WixToolset.Util.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum WixTouchFileTupleFields
26
+ public enum WixTouchFileSymbolFields
27
{
28
ComponentRef,
29
Path,
30
Attributes,
31
}
32
33
- public class WixTouchFileTuple : IntermediateTuple
33
+ public class WixTouchFileSymbol : IntermediateSymbol
34
{
35
- public WixTouchFileTuple() : base(UtilTupleDefinitions.WixTouchFile, null, null)
35
+ public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null)
36
{
37
}
38
39
- public WixTouchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixTouchFile, sourceLineNumber, id)
39
+ public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index];
44
45
public string ComponentRef
46
{
47
- get => this.Fields[(int)WixTouchFileTupleFields.ComponentRef].AsString();
48
- set => this.Set((int)WixTouchFileTupleFields.ComponentRef, value);
47
+ get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString();
48
+ set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value);
49
}
50
51
public string Path
52
{
53
- get => this.Fields[(int)WixTouchFileTupleFields.Path].AsString();
54
- set => this.Set((int)WixTouchFileTupleFields.Path, value);
53
+ get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString();
54
+ set => this.Set((int)WixTouchFileSymbolFields.Path, value);
55
}
56
57
public int Attributes
58
{
59
- get => this.Fields[(int)WixTouchFileTupleFields.Attributes].AsNumber();
60
- set => this.Set((int)WixTouchFileTupleFields.Attributes, value);
59
+ get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber();
60
+ set => this.Set((int)WixTouchFileSymbolFields.Attributes, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/XmlConfigTuple.cs
+35
-35
@@ -3,32 +3,32 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition XmlConfig = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.XmlConfig.ToString(),
10
+ public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.XmlConfig.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.File), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ElementPath), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.VerifyPath), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Name), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Value), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Flags), IntermediateFieldType.Number),
20
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ComponentRef), IntermediateFieldType.String),
21
- new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number),
20
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String),
21
+ new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number),
22
},
23
- typeof(XmlConfigTuple));
23
+ typeof(XmlConfigSymbol));
24
}
25
}
26
27
-namespace WixToolset.Util.Tuples
27
+namespace WixToolset.Util.Symbols
28
{
29
using WixToolset.Data;
30
31
- public enum XmlConfigTupleFields
31
+ public enum XmlConfigSymbolFields
32
{
33
File,
34
ElementPath,
@@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples
40
Sequence,
41
}
42
43
- public class XmlConfigTuple : IntermediateTuple
43
+ public class XmlConfigSymbol : IntermediateSymbol
44
{
45
- public XmlConfigTuple() : base(UtilTupleDefinitions.XmlConfig, null, null)
45
+ public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null)
46
{
47
}
48
49
- public XmlConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlConfig, sourceLineNumber, id)
49
+ public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id)
50
{
51
}
52
53
- public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index];
53
+ public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index];
54
55
public string File
56
{
57
- get => this.Fields[(int)XmlConfigTupleFields.File].AsString();
58
- set => this.Set((int)XmlConfigTupleFields.File, value);
57
+ get => this.Fields[(int)XmlConfigSymbolFields.File].AsString();
58
+ set => this.Set((int)XmlConfigSymbolFields.File, value);
59
}
60
61
public string ElementPath
62
{
63
- get => this.Fields[(int)XmlConfigTupleFields.ElementPath].AsString();
64
- set => this.Set((int)XmlConfigTupleFields.ElementPath, value);
63
+ get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString();
64
+ set => this.Set((int)XmlConfigSymbolFields.ElementPath, value);
65
}
66
67
public string VerifyPath
68
{
69
- get => this.Fields[(int)XmlConfigTupleFields.VerifyPath].AsString();
70
- set => this.Set((int)XmlConfigTupleFields.VerifyPath, value);
69
+ get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString();
70
+ set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value);
71
}
72
73
public string Name
74
{
75
- get => this.Fields[(int)XmlConfigTupleFields.Name].AsString();
76
- set => this.Set((int)XmlConfigTupleFields.Name, value);
75
+ get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString();
76
+ set => this.Set((int)XmlConfigSymbolFields.Name, value);
77
}
78
79
public string Value
80
{
81
- get => this.Fields[(int)XmlConfigTupleFields.Value].AsString();
82
- set => this.Set((int)XmlConfigTupleFields.Value, value);
81
+ get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString();
82
+ set => this.Set((int)XmlConfigSymbolFields.Value, value);
83
}
84
85
public int Flags
86
{
87
- get => this.Fields[(int)XmlConfigTupleFields.Flags].AsNumber();
88
- set => this.Set((int)XmlConfigTupleFields.Flags, value);
87
+ get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber();
88
+ set => this.Set((int)XmlConfigSymbolFields.Flags, value);
89
}
90
91
public string ComponentRef
92
{
93
- get => this.Fields[(int)XmlConfigTupleFields.ComponentRef].AsString();
94
- set => this.Set((int)XmlConfigTupleFields.ComponentRef, value);
93
+ get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString();
94
+ set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value);
95
}
96
97
public int? Sequence
98
{
99
- get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber();
100
- set => this.Set((int)XmlConfigTupleFields.Sequence, value);
99
+ get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber();
100
+ set => this.Set((int)XmlConfigSymbolFields.Sequence, value);
101
}
102
}
103
}
\ No newline at end of file
src/wixext/Tuples/XmlFileTuple.cs
+32
-32
@@ -3,31 +3,31 @@
3
namespace WixToolset.Util
4
{
5
using WixToolset.Data;
6
- using WixToolset.Util.Tuples;
6
+ using WixToolset.Util.Symbols;
7
8
- public static partial class UtilTupleDefinitions
8
+ public static partial class UtilSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition XmlFile = new IntermediateTupleDefinition(
11
- UtilTupleDefinitionType.XmlFile.ToString(),
10
+ public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition(
11
+ UtilSymbolDefinitionType.XmlFile.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number),
21
},
22
- typeof(XmlFileTuple));
22
+ typeof(XmlFileSymbol));
23
}
24
}
25
26
-namespace WixToolset.Util.Tuples
26
+namespace WixToolset.Util.Symbols
27
{
28
using WixToolset.Data;
29
30
- public enum XmlFileTupleFields
30
+ public enum XmlFileSymbolFields
31
{
32
File,
33
ElementPath,
@@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples
38
Sequence,
39
}
40
41
- public class XmlFileTuple : IntermediateTuple
41
+ public class XmlFileSymbol : IntermediateSymbol
42
{
43
- public XmlFileTuple() : base(UtilTupleDefinitions.XmlFile, null, null)
43
+ public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null)
44
{
45
}
46
47
- public XmlFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlFile, sourceLineNumber, id)
47
+ public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id)
48
{
49
}
50
51
- public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index];
51
+ public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index];
52
53
public string File
54
{
55
- get => this.Fields[(int)XmlFileTupleFields.File].AsString();
56
- set => this.Set((int)XmlFileTupleFields.File, value);
55
+ get => this.Fields[(int)XmlFileSymbolFields.File].AsString();
56
+ set => this.Set((int)XmlFileSymbolFields.File, value);
57
}
58
59
public string ElementPath
60
{
61
- get => this.Fields[(int)XmlFileTupleFields.ElementPath].AsString();
62
- set => this.Set((int)XmlFileTupleFields.ElementPath, value);
61
+ get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString();
62
+ set => this.Set((int)XmlFileSymbolFields.ElementPath, value);
63
}
64
65
public string Name
66
{
67
- get => this.Fields[(int)XmlFileTupleFields.Name].AsString();
68
- set => this.Set((int)XmlFileTupleFields.Name, value);
67
+ get => this.Fields[(int)XmlFileSymbolFields.Name].AsString();
68
+ set => this.Set((int)XmlFileSymbolFields.Name, value);
69
}
70
71
public string Value
72
{
73
- get => this.Fields[(int)XmlFileTupleFields.Value].AsString();
74
- set => this.Set((int)XmlFileTupleFields.Value, value);
73
+ get => this.Fields[(int)XmlFileSymbolFields.Value].AsString();
74
+ set => this.Set((int)XmlFileSymbolFields.Value, value);
75
}
76
77
public int Flags
78
{
79
- get => this.Fields[(int)XmlFileTupleFields.Flags].AsNumber();
80
- set => this.Set((int)XmlFileTupleFields.Flags, value);
79
+ get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber();
80
+ set => this.Set((int)XmlFileSymbolFields.Flags, value);
81
}
82
83
public string ComponentRef
84
{
85
- get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString();
86
- set => this.Set((int)XmlFileTupleFields.ComponentRef, value);
85
+ get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString();
86
+ set => this.Set((int)XmlFileSymbolFields.ComponentRef, value);
87
}
88
89
public int? Sequence
90
{
91
- get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber();
92
- set => this.Set((int)XmlFileTupleFields.Sequence, value);
91
+ get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber();
92
+ set => this.Set((int)XmlFileSymbolFields.Sequence, value);
93
}
94
}
95
}
\ No newline at end of file
src/wixext/UtilCompiler.cs
+62
-62
@@ -11,10 +11,10 @@ namespace WixToolset.Util
11
using System.Text.RegularExpressions;
12
using System.Xml.Linq;
13
using WixToolset.Data;
14
- using WixToolset.Data.Tuples;
14
+ using WixToolset.Data.Symbols;
15
using WixToolset.Extensibility;
16
using WixToolset.Extensibility.Data;
17
- using WixToolset.Util.Tuples;
17
+ using WixToolset.Util.Symbols;
18
19
/// <summary>
20
/// The compiler for the WiX Toolset Utility Extension.
@@ -447,7 +447,7 @@ namespace WixToolset.Util
447
448
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
449
450
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
450
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
451
452
if (!this.Messaging.EncounteredError)
453
{
@@ -465,7 +465,7 @@ namespace WixToolset.Util
465
break;
466
}
467
468
- section.AddTuple(new WixComponentSearchTuple(sourceLineNumbers, id)
468
+ section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id)
469
{
470
Guid = guid,
471
ProductCode = productCode,
@@ -491,7 +491,7 @@ namespace WixToolset.Util
491
{
492
case "Id":
493
refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
494
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixComponentSearch, refId);
494
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixComponentSearch, refId);
495
break;
496
default:
497
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -549,11 +549,11 @@ namespace WixToolset.Util
549
550
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
551
552
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId);
552
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId);
553
554
if (!this.Messaging.EncounteredError)
555
{
556
- section.AddTuple(new WixDetectSHA2SupportTuple(sourceLineNumbers, id));
556
+ section.AddSymbol(new WixDetectSHA2SupportSymbol(sourceLineNumbers, id));
557
}
558
}
559
@@ -573,7 +573,7 @@ namespace WixToolset.Util
573
{
574
case "Id":
575
var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
576
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.WixDetectSHA2Support, refId);
576
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixDetectSHA2Support, refId);
577
break;
578
default:
579
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -706,26 +706,26 @@ namespace WixToolset.Util
706
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
707
708
string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}";
709
- var id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false);
709
+ var id = this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false);
710
711
if (null != categoryMessageFile)
712
{
713
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false);
713
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false);
714
}
715
716
if (CompilerConstants.IntegerNotSet != categoryCount)
717
{
718
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false);
718
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false);
719
}
720
721
if (null != parameterMessageFile)
722
{
723
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false);
723
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false);
724
}
725
726
if (0 != typesSupported)
727
{
728
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false);
728
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false);
729
}
730
731
var componentKeyPath = this.CreateComponentKeyPath();
@@ -879,7 +879,7 @@ namespace WixToolset.Util
879
880
if (!this.Messaging.EncounteredError)
881
{
882
- var tuple = section.AddTuple(new WixCloseApplicationTuple(sourceLineNumbers, id)
882
+ var symbol = section.AddSymbol(new WixCloseApplicationSymbol(sourceLineNumbers, id)
883
{
884
Target = target,
885
Description = description,
@@ -889,15 +889,15 @@ namespace WixToolset.Util
889
});
890
if (CompilerConstants.IntegerNotSet != sequence)
891
{
892
- tuple.Sequence = sequence;
892
+ symbol.Sequence = sequence;
893
}
894
if (CompilerConstants.IntegerNotSet != terminateExitCode)
895
{
896
- tuple.TerminateExitCode = terminateExitCode;
896
+ symbol.TerminateExitCode = terminateExitCode;
897
}
898
if (CompilerConstants.IntegerNotSet != timeout)
899
{
900
- tuple.Timeout = timeout * 1000; // make the timeout milliseconds in the table.
900
+ symbol.Timeout = timeout * 1000; // make the timeout milliseconds in the table.
901
}
902
}
903
}
@@ -962,7 +962,7 @@ namespace WixToolset.Util
962
963
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
964
965
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
965
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
966
967
if (!this.Messaging.EncounteredError)
968
{
@@ -994,7 +994,7 @@ namespace WixToolset.Util
994
{
995
case "Id":
996
var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
997
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, refId);
997
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, refId);
998
break;
999
default:
1000
this.ParseHelper.UnexpectedAttribute(node, attrib);
@@ -1072,7 +1072,7 @@ namespace WixToolset.Util
1072
1073
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
1074
1075
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null);
1075
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null);
1076
1077
if (!this.Messaging.EncounteredError)
1078
{
@@ -1100,7 +1100,7 @@ namespace WixToolset.Util
1100
/// <param name="attributes"></param>
1101
private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes)
1102
{
1103
- section.AddTuple(new WixFileSearchTuple(sourceLineNumbers, id)
1103
+ section.AddSymbol(new WixFileSearchSymbol(sourceLineNumbers, id)
1104
{
1105
Path = path,
1106
Attributes = attributes,
@@ -1186,7 +1186,7 @@ namespace WixToolset.Util
1186
1187
if (!this.Messaging.EncounteredError)
1188
{
1189
- section.AddTuple(new FileShareTuple(sourceLineNumbers, id)
1189
+ section.AddSymbol(new FileShareSymbol(sourceLineNumbers, id)
1190
{
1191
ShareName = name,
1192
ComponentRef = componentId,
@@ -1215,7 +1215,7 @@ namespace WixToolset.Util
1215
{
1216
case "User":
1217
user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
1218
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.User, user);
1218
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.User, user);
1219
break;
1220
default:
1221
var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -1255,7 +1255,7 @@ namespace WixToolset.Util
1255
1256
if (!this.Messaging.EncounteredError)
1257
{
1258
- section.AddTuple(new FileSharePermissionsTuple(sourceLineNumbers)
1258
+ section.AddSymbol(new FileSharePermissionsSymbol(sourceLineNumbers)
1259
{
1260
FileShareRef = fileShareId.Id,
1261
UserRef = user,
@@ -1311,7 +1311,7 @@ namespace WixToolset.Util
1311
1312
if (!this.Messaging.EncounteredError)
1313
{
1314
- section.AddTuple(new GroupTuple(sourceLineNumbers, id)
1314
+ section.AddSymbol(new GroupSymbol(sourceLineNumbers, id)
1315
{
1316
ComponentRef = componentId,
1317
Name = name,
@@ -1338,7 +1338,7 @@ namespace WixToolset.Util
1338
{
1339
case "Id":
1340
groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
1341
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.Group, groupId);
1341
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.Group, groupId);
1342
break;
1343
default:
1344
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -1355,7 +1355,7 @@ namespace WixToolset.Util
1355
1356
if (!this.Messaging.EncounteredError)
1357
{
1358
- section.AddTuple(new UserGroupTuple(sourceLineNumbers)
1358
+ section.AddSymbol(new UserGroupSymbol(sourceLineNumbers)
1359
{
1360
UserRef = userId,
1361
GroupRef = groupId,
@@ -1478,7 +1478,7 @@ namespace WixToolset.Util
1478
// add the appropriate extension based on type of shortcut
1479
name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk");
1480
1481
- section.AddTuple(new WixInternetShortcutTuple(sourceLineNumbers, shortcutId)
1481
+ section.AddSymbol(new WixInternetShortcutSymbol(sourceLineNumbers, shortcutId)
1482
{
1483
ComponentRef = componentId,
1484
DirectoryRef = directoryId,
@@ -1495,7 +1495,7 @@ namespace WixToolset.Util
1495
this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder");
1496
1497
// use built-in MSI functionality to remove the shortcuts rather than doing so via CA
1498
- section.AddTuple(new RemoveFileTuple(sourceLineNumbers, shortcutId)
1498
+ section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId)
1499
{
1500
ComponentRef = componentId,
1501
DirProperty = directoryId,
@@ -1653,7 +1653,7 @@ namespace WixToolset.Util
1653
sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter);
1654
1655
// Add the calculated INI and H strings to the PerformanceCategory table.
1656
- section.AddTuple(new PerformanceCategoryTuple(sourceLineNumbers, id)
1656
+ section.AddSymbol(new PerformanceCategorySymbol(sourceLineNumbers, id)
1657
{
1658
ComponentRef = componentId,
1659
Name = name,
@@ -1666,15 +1666,15 @@ namespace WixToolset.Util
1666
var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName);
1667
var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName);
1668
1669
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false);
1670
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false);
1671
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false);
1672
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false);
1673
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false);
1674
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false);
1675
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false);
1676
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false);
1677
- this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false);
1669
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false);
1670
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false);
1671
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false);
1672
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false);
1673
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false);
1674
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false);
1675
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false);
1676
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false);
1677
+ this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false);
1678
}
1679
1680
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
@@ -2148,7 +2148,7 @@ namespace WixToolset.Util
2148
2149
if (!this.Messaging.EncounteredError)
2150
{
2151
- section.AddTuple(new PerfmonTuple(sourceLineNumbers)
2151
+ section.AddSymbol(new PerfmonSymbol(sourceLineNumbers)
2152
{
2153
ComponentRef = componentId,
2154
File = $"[#{fileId}]",
@@ -2196,7 +2196,7 @@ namespace WixToolset.Util
2196
2197
if (!this.Messaging.EncounteredError)
2198
{
2199
- section.AddTuple(new PerfmonManifestTuple(sourceLineNumbers)
2199
+ section.AddSymbol(new PerfmonManifestSymbol(sourceLineNumbers)
2200
{
2201
ComponentRef = componentId,
2202
File = $"[#{fileId}]",
@@ -2250,13 +2250,13 @@ namespace WixToolset.Util
2250
{
2251
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
2252
2253
- section.AddTuple(new WixFormatFilesTuple(sourceLineNumbers)
2253
+ section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers)
2254
{
2255
BinaryRef = binaryId,
2256
FileRef = fileId,
2257
});
2258
2259
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryId);
2259
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryId);
2260
}
2261
}
2262
@@ -2303,7 +2303,7 @@ namespace WixToolset.Util
2303
2304
if (!this.Messaging.EncounteredError)
2305
{
2306
- section.AddTuple(new EventManifestTuple(sourceLineNumbers)
2306
+ section.AddSymbol(new EventManifestSymbol(sourceLineNumbers)
2307
{
2308
ComponentRef = componentId,
2309
File = $"[#{fileId}]",
@@ -2311,7 +2311,7 @@ namespace WixToolset.Util
2311
2312
if (null != messageFile)
2313
{
2314
- section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile"))
2314
+ section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile"))
2315
{
2316
File = $"[#{fileId}]",
2317
ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]",
@@ -2323,7 +2323,7 @@ namespace WixToolset.Util
2323
}
2324
if (null != parameterFile)
2325
{
2326
- section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile"))
2326
+ section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile"))
2327
{
2328
File = $"[#{fileId}]",
2329
ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]",
@@ -2335,7 +2335,7 @@ namespace WixToolset.Util
2335
}
2336
if (null != resourceFile)
2337
{
2338
- section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile"))
2338
+ section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile"))
2339
{
2340
File = $"[#{fileId}]",
2341
ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]",
@@ -2463,7 +2463,7 @@ namespace WixToolset.Util
2463
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
2464
2465
var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2466
- section.AddTuple(new SecureObjectsTuple(sourceLineNumbers, id)
2466
+ section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id)
2467
{
2468
SecureObject = objectId,
2469
Table = tableName,
@@ -2550,7 +2550,7 @@ namespace WixToolset.Util
2550
2551
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
2552
2553
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2553
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2554
2555
if (!this.Messaging.EncounteredError)
2556
{
@@ -2577,7 +2577,7 @@ namespace WixToolset.Util
2577
attributes |= WixProductSearchAttributes.UpgradeCode;
2578
}
2579
2580
- section.AddTuple(new WixProductSearchTuple(sourceLineNumbers, id)
2580
+ section.AddSymbol(new WixProductSearchSymbol(sourceLineNumbers, id)
2581
{
2582
Guid = productCode ?? upgradeCode,
2583
Attributes = attributes,
@@ -2720,11 +2720,11 @@ namespace WixToolset.Util
2720
2721
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
2722
2723
- this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2723
+ this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2724
2725
if (!this.Messaging.EncounteredError)
2726
{
2727
- section.AddTuple(new WixRegistrySearchTuple(sourceLineNumbers, id)
2727
+ section.AddSymbol(new WixRegistrySearchSymbol(sourceLineNumbers, id)
2728
{
2729
Root = root.Value,
2730
Key = key,
@@ -2811,7 +2811,7 @@ namespace WixToolset.Util
2811
{
2812
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
2813
2814
- section.AddTuple(new WixRemoveFolderExTuple(sourceLineNumbers, id)
2814
+ section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id)
2815
{
2816
ComponentRef = componentId,
2817
Property = property,
@@ -2887,7 +2887,7 @@ namespace WixToolset.Util
2887
{
2888
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
2889
2890
- section.AddTuple(new WixRestartResourceTuple(sourceLineNumbers, id)
2890
+ section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id)
2891
{
2892
ComponentRef = componentId,
2893
Resource = resource,
@@ -2979,7 +2979,7 @@ namespace WixToolset.Util
2979
{
2980
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
2981
2982
- section.AddTuple(new ServiceConfigTuple(sourceLineNumbers)
2982
+ section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers)
2983
{
2984
ServiceName = serviceName,
2985
ComponentRef = componentId,
@@ -3074,7 +3074,7 @@ namespace WixToolset.Util
3074
3075
if (!this.Messaging.EncounteredError)
3076
{
3077
- section.AddTuple(new WixTouchFileTuple(sourceLineNumbers, id)
3077
+ section.AddSymbol(new WixTouchFileSymbol(sourceLineNumbers, id)
3078
{
3079
ComponentRef = componentId,
3080
Path = path,
@@ -3290,7 +3290,7 @@ namespace WixToolset.Util
3290
3291
if (!this.Messaging.EncounteredError)
3292
{
3293
- section.AddTuple(new UserTuple(sourceLineNumbers, id)
3293
+ section.AddSymbol(new UserSymbol(sourceLineNumbers, id)
3294
{
3295
ComponentRef = componentId,
3296
Name = name,
@@ -3424,7 +3424,7 @@ namespace WixToolset.Util
3424
3425
if (!this.Messaging.EncounteredError)
3426
{
3427
- var tuple = section.AddTuple(new XmlFileTuple(sourceLineNumbers, id)
3427
+ var symbol = section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, id)
3428
{
3429
File = file,
3430
ElementPath = elementPath,
@@ -3435,7 +3435,7 @@ namespace WixToolset.Util
3435
});
3436
if (-1 != sequence)
3437
{
3438
- tuple.Sequence = sequence;
3438
+ symbol.Sequence = sequence;
3439
}
3440
}
3441
@@ -3603,7 +3603,7 @@ namespace WixToolset.Util
3603
this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On"));
3604
}
3605
3606
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.XmlConfig, elementId);
3606
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId);
3607
}
3608
3609
var innerText = this.ParseHelper.GetTrimmedInnerText(element);
@@ -3653,7 +3653,7 @@ namespace WixToolset.Util
3653
3654
if (!this.Messaging.EncounteredError)
3655
{
3656
- var tuple = section.AddTuple(new XmlConfigTuple(sourceLineNumbers, id)
3656
+ var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id)
3657
{
3658
File = file,
3659
ElementPath = elementId ?? elementPath,
@@ -3665,7 +3665,7 @@ namespace WixToolset.Util
3665
});
3666
if (CompilerConstants.IntegerNotSet != sequence)
3667
{
3668
- tuple.Sequence = sequence;
3668
+ symbol.Sequence = sequence;
3669
}
3670
}
3671
src/wixext/UtilExtensionData.cs
+5
-5
@@ -9,15 +9,15 @@ namespace WixToolset.Util
9
{
10
public override string DefaultCulture => "en-US";
11
12
- public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
12
+ public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
13
{
14
- tupleDefinition = UtilTupleDefinitions.ByName(name);
15
- return tupleDefinition != null;
14
+ symbolDefinition = UtilSymbolDefinitions.ByName(name);
15
+ return symbolDefinition != null;
16
}
17
18
- public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
18
+ public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
19
{
20
- return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", tupleDefinitions);
20
+ return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", symbolDefinitions);
21
}
22
}
23
}
src/wixext/UtilTableDefinitions.cs
+38
-38
@@ -8,7 +8,7 @@ namespace WixToolset.Util
8
{
9
public static readonly TableDefinition Wix4CloseApplication = new TableDefinition(
10
"Wix4CloseApplication",
11
- UtilTupleDefinitions.WixCloseApplication,
11
+ UtilSymbolDefinitions.WixCloseApplication,
12
new[]
13
{
14
new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -21,12 +21,12 @@ namespace WixToolset.Util
21
new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."),
22
new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."),
23
},
24
- tupleIdIsPrimaryKey: true
24
+ symbolIdIsPrimaryKey: true
25
);
26
27
public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition(
28
"Wix4RemoveFolderEx",
29
- UtilTupleDefinitions.WixRemoveFolderEx,
29
+ UtilSymbolDefinitions.WixRemoveFolderEx,
30
new[]
31
{
32
new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -34,12 +34,12 @@ namespace WixToolset.Util
34
new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property),
35
new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."),
36
},
37
- tupleIdIsPrimaryKey: true
37
+ symbolIdIsPrimaryKey: true
38
);
39
40
public static readonly TableDefinition Wix4RestartResource = new TableDefinition(
41
"Wix4RestartResource",
42
- UtilTupleDefinitions.WixRestartResource,
42
+ UtilSymbolDefinitions.WixRestartResource,
43
new[]
44
{
45
new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column),
@@ -47,12 +47,12 @@ namespace WixToolset.Util
47
new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property),
48
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."),
49
},
50
- tupleIdIsPrimaryKey: true
50
+ symbolIdIsPrimaryKey: true
51
);
52
53
public static readonly TableDefinition Wix4FileShare = new TableDefinition(
54
"Wix4FileShare",
55
- UtilTupleDefinitions.FileShare,
55
+ UtilSymbolDefinitions.FileShare,
56
new[]
57
{
58
new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column),
@@ -61,24 +61,24 @@ namespace WixToolset.Util
61
new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"),
62
new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column),
63
},
64
- tupleIdIsPrimaryKey: true
64
+ symbolIdIsPrimaryKey: true
65
);
66
67
public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition(
68
"Wix4FileSharePermissions",
69
- UtilTupleDefinitions.FileSharePermissions,
69
+ UtilSymbolDefinitions.FileSharePermissions,
70
new[]
71
{
72
new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column),
73
new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column),
74
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"),
75
},
76
- tupleIdIsPrimaryKey: false
76
+ symbolIdIsPrimaryKey: false
77
);
78
79
public static readonly TableDefinition Wix4Group = new TableDefinition(
80
"Wix4Group",
81
- UtilTupleDefinitions.Group,
81
+ UtilSymbolDefinitions.Group,
82
new[]
83
{
84
new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -86,12 +86,12 @@ namespace WixToolset.Util
86
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property),
87
new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property),
88
},
89
- tupleIdIsPrimaryKey: true
89
+ symbolIdIsPrimaryKey: true
90
);
91
92
public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition(
93
"Wix4InternetShortcut",
94
- UtilTupleDefinitions.WixInternetShortcut,
94
+ UtilSymbolDefinitions.WixInternetShortcut,
95
new[]
96
{
97
new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -103,12 +103,12 @@ namespace WixToolset.Util
103
new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"),
104
new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."),
105
},
106
- tupleIdIsPrimaryKey: true
106
+ symbolIdIsPrimaryKey: true
107
);
108
109
public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition(
110
"Wix4PerformanceCategory",
111
- UtilTupleDefinitions.PerformanceCategory,
111
+ UtilSymbolDefinitions.PerformanceCategory,
112
new[]
113
{
114
new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -117,47 +117,47 @@ namespace WixToolset.Util
117
new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."),
118
new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."),
119
},
120
- tupleIdIsPrimaryKey: true
120
+ symbolIdIsPrimaryKey: true
121
);
122
123
public static readonly TableDefinition Wix4Perfmon = new TableDefinition(
124
"Wix4Perfmon",
125
- UtilTupleDefinitions.Perfmon,
125
+ UtilSymbolDefinitions.Perfmon,
126
new[]
127
{
128
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
129
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property),
130
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"),
131
},
132
- tupleIdIsPrimaryKey: false
132
+ symbolIdIsPrimaryKey: false
133
);
134
135
public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition(
136
"Wix4PerfmonManifest",
137
- UtilTupleDefinitions.PerfmonManifest,
137
+ UtilSymbolDefinitions.PerfmonManifest,
138
new[]
139
{
140
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
141
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property),
142
new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"),
143
},
144
- tupleIdIsPrimaryKey: false
144
+ symbolIdIsPrimaryKey: false
145
);
146
147
public static readonly TableDefinition Wix4EventManifest = new TableDefinition(
148
"Wix4EventManifest",
149
- UtilTupleDefinitions.EventManifest,
149
+ UtilSymbolDefinitions.EventManifest,
150
new[]
151
{
152
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
153
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property),
154
},
155
- tupleIdIsPrimaryKey: false
155
+ symbolIdIsPrimaryKey: false
156
);
157
158
public static readonly TableDefinition Wix4SecureObject = new TableDefinition(
159
"Wix4SecureObject",
160
- UtilTupleDefinitions.SecureObjects,
160
+ UtilSymbolDefinitions.SecureObjects,
161
new[]
162
{
163
new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column),
@@ -168,12 +168,12 @@ namespace WixToolset.Util
168
new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"),
169
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column),
170
},
171
- tupleIdIsPrimaryKey: false
171
+ symbolIdIsPrimaryKey: false
172
);
173
174
public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition(
175
"Wix4ServiceConfig",
176
- UtilTupleDefinitions.ServiceConfig,
176
+ UtilSymbolDefinitions.ServiceConfig,
177
new[]
178
{
179
new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"),
@@ -187,12 +187,12 @@ namespace WixToolset.Util
187
new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."),
188
new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."),
189
},
190
- tupleIdIsPrimaryKey: false
190
+ symbolIdIsPrimaryKey: false
191
);
192
193
public static readonly TableDefinition Wix4TouchFile = new TableDefinition(
194
"Wix4TouchFile",
195
- UtilTupleDefinitions.WixTouchFile,
195
+ UtilSymbolDefinitions.WixTouchFile,
196
new[]
197
{
198
new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -200,12 +200,12 @@ namespace WixToolset.Util
200
new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property),
201
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."),
202
},
203
- tupleIdIsPrimaryKey: true
203
+ symbolIdIsPrimaryKey: true
204
);
205
206
public static readonly TableDefinition Wix4User = new TableDefinition(
207
"Wix4User",
208
- UtilTupleDefinitions.User,
208
+ UtilSymbolDefinitions.User,
209
new[]
210
{
211
new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -215,23 +215,23 @@ namespace WixToolset.Util
215
new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property),
216
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"),
217
},
218
- tupleIdIsPrimaryKey: true
218
+ symbolIdIsPrimaryKey: true
219
);
220
221
public static readonly TableDefinition Wix4UserGroup = new TableDefinition(
222
"Wix4UserGroup",
223
- UtilTupleDefinitions.UserGroup,
223
+ UtilSymbolDefinitions.UserGroup,
224
new[]
225
{
226
new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column),
227
new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column),
228
},
229
- tupleIdIsPrimaryKey: false
229
+ symbolIdIsPrimaryKey: false
230
);
231
232
public static readonly TableDefinition Wix4XmlFile = new TableDefinition(
233
"Wix4XmlFile",
234
- UtilTupleDefinitions.XmlFile,
234
+ UtilSymbolDefinitions.XmlFile,
235
new[]
236
{
237
new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -243,12 +243,12 @@ namespace WixToolset.Util
243
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
244
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
245
},
246
- tupleIdIsPrimaryKey: true
246
+ symbolIdIsPrimaryKey: true
247
);
248
249
public static readonly TableDefinition Wix4XmlConfig = new TableDefinition(
250
"Wix4XmlConfig",
251
- UtilTupleDefinitions.XmlConfig,
251
+ UtilSymbolDefinitions.XmlConfig,
252
new[]
253
{
254
new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -261,18 +261,18 @@ namespace WixToolset.Util
261
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
262
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
263
},
264
- tupleIdIsPrimaryKey: true
264
+ symbolIdIsPrimaryKey: true
265
);
266
267
public static readonly TableDefinition Wix4FormatFile = new TableDefinition(
268
"Wix4FormatFile",
269
- UtilTupleDefinitions.WixFormatFiles,
269
+ UtilSymbolDefinitions.WixFormatFiles,
270
new[]
271
{
272
new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column),
273
new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column),
274
},
275
- tupleIdIsPrimaryKey: false
275
+ symbolIdIsPrimaryKey: false
276
);
277
278
public static readonly TableDefinition[] All = new[]
src/wixext/WixToolset.Util.wixext.csproj
+4
-4
@@ -20,16 +20,16 @@
20
</ItemGroup>
21
22
<ItemGroup>
23
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
24
- <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
25
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
23
+ <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
24
</ItemGroup>
25
26
<ItemGroup>
29
- <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
27
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" />
28
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
29
</ItemGroup>
30
31
<ItemGroup>
32
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
33
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
34
</ItemGroup>
35