aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/wixext/Tuples/HelpFileToNamespaceTuple.cs34
-rw-r--r--src/wixext/Tuples/HelpFileTuple.cs64
-rw-r--r--src/wixext/Tuples/HelpFilterToNamespaceTuple.cs34
-rw-r--r--src/wixext/Tuples/HelpFilterTuple.cs34
-rw-r--r--src/wixext/Tuples/HelpNamespaceTuple.cs40
-rw-r--r--src/wixext/Tuples/HelpPluginTuple.cs52
-rw-r--r--src/wixext/Tuples/VSTupleDefinitions.cs34
-rw-r--r--src/wixext/VSCompiler.cs68
-rw-r--r--src/wixext/VSExtensionData.cs10
-rw-r--r--src/wixext/VSTableDefinitions.cs24
10 files changed, 197 insertions, 197 deletions
diff --git a/src/wixext/Tuples/HelpFileToNamespaceTuple.cs b/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
index f91dacc1..f18d6701 100644
--- a/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
@@ -3,53 +3,53 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpFileToNamespace = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpFileToNamespace = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpFileToNamespace.ToString(), 11 VSSymbolDefinitionType.HelpFileToNamespace.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpFileRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpFileRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
16 }, 16 },
17 typeof(HelpFileToNamespaceTuple)); 17 typeof(HelpFileToNamespaceSymbol));
18 } 18 }
19} 19}
20 20
21namespace WixToolset.VisualStudio.Tuples 21namespace WixToolset.VisualStudio.Symbols
22{ 22{
23 using WixToolset.Data; 23 using WixToolset.Data;
24 24
25 public enum HelpFileToNamespaceTupleFields 25 public enum HelpFileToNamespaceSymbolFields
26 { 26 {
27 HelpFileRef, 27 HelpFileRef,
28 HelpNamespaceRef, 28 HelpNamespaceRef,
29 } 29 }
30 30
31 public class HelpFileToNamespaceTuple : IntermediateTuple 31 public class HelpFileToNamespaceSymbol : IntermediateSymbol
32 { 32 {
33 public HelpFileToNamespaceTuple() : base(VSTupleDefinitions.HelpFileToNamespace, null, null) 33 public HelpFileToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFileToNamespace, null, null)
34 { 34 {
35 } 35 }
36 36
37 public HelpFileToNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFileToNamespace, sourceLineNumber, id) 37 public HelpFileToNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFileToNamespace, sourceLineNumber, id)
38 { 38 {
39 } 39 }
40 40
41 public IntermediateField this[HelpFileToNamespaceTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[HelpFileToNamespaceSymbolFields index] => this.Fields[(int)index];
42 42
43 public string HelpFileRef 43 public string HelpFileRef
44 { 44 {
45 get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpFileRef].AsString(); 45 get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpFileRef].AsString();
46 set => this.Set((int)HelpFileToNamespaceTupleFields.HelpFileRef, value); 46 set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpFileRef, value);
47 } 47 }
48 48
49 public string HelpNamespaceRef 49 public string HelpNamespaceRef
50 { 50 {
51 get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpNamespaceRef].AsString(); 51 get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef].AsString();
52 set => this.Set((int)HelpFileToNamespaceTupleFields.HelpNamespaceRef, value); 52 set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFileTuple.cs b/src/wixext/Tuples/HelpFileTuple.cs
index 49d3bc44..8078f4ab 100644
--- a/src/wixext/Tuples/HelpFileTuple.cs
+++ b/src/wixext/Tuples/HelpFileTuple.cs
@@ -3,31 +3,31 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpFile = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpFile = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpFile.ToString(), 11 VSSymbolDefinitionType.HelpFile.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HelpFileName), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HelpFileName), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.LangID), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.LangID), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxSFileRef), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxSFileRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxIFileRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxIFileRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxQFileRef), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxQFileRef), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxRFileRef), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxRFileRef), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(HelpFileTupleFields.SamplesFileRef), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.SamplesFileRef), IntermediateFieldType.String),
21 }, 21 },
22 typeof(HelpFileTuple)); 22 typeof(HelpFileSymbol));
23 } 23 }
24} 24}
25 25
26namespace WixToolset.VisualStudio.Tuples 26namespace WixToolset.VisualStudio.Symbols
27{ 27{
28 using WixToolset.Data; 28 using WixToolset.Data;
29 29
30 public enum HelpFileTupleFields 30 public enum HelpFileSymbolFields
31 { 31 {
32 HelpFileName, 32 HelpFileName,
33 LangID, 33 LangID,
@@ -38,58 +38,58 @@ namespace WixToolset.VisualStudio.Tuples
38 SamplesFileRef, 38 SamplesFileRef,
39 } 39 }
40 40
41 public class HelpFileTuple : IntermediateTuple 41 public class HelpFileSymbol : IntermediateSymbol
42 { 42 {
43 public HelpFileTuple() : base(VSTupleDefinitions.HelpFile, null, null) 43 public HelpFileSymbol() : base(VSSymbolDefinitions.HelpFile, null, null)
44 { 44 {
45 } 45 }
46 46
47 public HelpFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFile, sourceLineNumber, id) 47 public HelpFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFile, sourceLineNumber, id)
48 { 48 {
49 } 49 }
50 50
51 public IntermediateField this[HelpFileTupleFields index] => this.Fields[(int)index]; 51 public IntermediateField this[HelpFileSymbolFields index] => this.Fields[(int)index];
52 52
53 public string HelpFileName 53 public string HelpFileName
54 { 54 {
55 get => this.Fields[(int)HelpFileTupleFields.HelpFileName].AsString(); 55 get => this.Fields[(int)HelpFileSymbolFields.HelpFileName].AsString();
56 set => this.Set((int)HelpFileTupleFields.HelpFileName, value); 56 set => this.Set((int)HelpFileSymbolFields.HelpFileName, value);
57 } 57 }
58 58
59 public int? LangID 59 public int? LangID
60 { 60 {
61 get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber(); 61 get => this.Fields[(int)HelpFileSymbolFields.LangID].AsNullableNumber();
62 set => this.Set((int)HelpFileTupleFields.LangID, value); 62 set => this.Set((int)HelpFileSymbolFields.LangID, value);
63 } 63 }
64 64
65 public string HxSFileRef 65 public string HxSFileRef
66 { 66 {
67 get => this.Fields[(int)HelpFileTupleFields.HxSFileRef].AsString(); 67 get => this.Fields[(int)HelpFileSymbolFields.HxSFileRef].AsString();
68 set => this.Set((int)HelpFileTupleFields.HxSFileRef, value); 68 set => this.Set((int)HelpFileSymbolFields.HxSFileRef, value);
69 } 69 }
70 70
71 public string HxIFileRef 71 public string HxIFileRef
72 { 72 {
73 get => this.Fields[(int)HelpFileTupleFields.HxIFileRef].AsString(); 73 get => this.Fields[(int)HelpFileSymbolFields.HxIFileRef].AsString();
74 set => this.Set((int)HelpFileTupleFields.HxIFileRef, value); 74 set => this.Set((int)HelpFileSymbolFields.HxIFileRef, value);
75 } 75 }
76 76
77 public string HxQFileRef 77 public string HxQFileRef
78 { 78 {
79 get => this.Fields[(int)HelpFileTupleFields.HxQFileRef].AsString(); 79 get => this.Fields[(int)HelpFileSymbolFields.HxQFileRef].AsString();
80 set => this.Set((int)HelpFileTupleFields.HxQFileRef, value); 80 set => this.Set((int)HelpFileSymbolFields.HxQFileRef, value);
81 } 81 }
82 82
83 public string HxRFileRef 83 public string HxRFileRef
84 { 84 {
85 get => this.Fields[(int)HelpFileTupleFields.HxRFileRef].AsString(); 85 get => this.Fields[(int)HelpFileSymbolFields.HxRFileRef].AsString();
86 set => this.Set((int)HelpFileTupleFields.HxRFileRef, value); 86 set => this.Set((int)HelpFileSymbolFields.HxRFileRef, value);
87 } 87 }
88 88
89 public string SamplesFileRef 89 public string SamplesFileRef
90 { 90 {
91 get => this.Fields[(int)HelpFileTupleFields.SamplesFileRef].AsString(); 91 get => this.Fields[(int)HelpFileSymbolFields.SamplesFileRef].AsString();
92 set => this.Set((int)HelpFileTupleFields.SamplesFileRef, value); 92 set => this.Set((int)HelpFileSymbolFields.SamplesFileRef, value);
93 } 93 }
94 } 94 }
95} \ No newline at end of file 95} \ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs b/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
index c6690d47..f3d21289 100644
--- a/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
@@ -3,53 +3,53 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpFilterToNamespace = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpFilterToNamespace = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpFilterToNamespace.ToString(), 11 VSSymbolDefinitionType.HelpFilterToNamespace.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpFilterRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpFilterRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
16 }, 16 },
17 typeof(HelpFilterToNamespaceTuple)); 17 typeof(HelpFilterToNamespaceSymbol));
18 } 18 }
19} 19}
20 20
21namespace WixToolset.VisualStudio.Tuples 21namespace WixToolset.VisualStudio.Symbols
22{ 22{
23 using WixToolset.Data; 23 using WixToolset.Data;
24 24
25 public enum HelpFilterToNamespaceTupleFields 25 public enum HelpFilterToNamespaceSymbolFields
26 { 26 {
27 HelpFilterRef, 27 HelpFilterRef,
28 HelpNamespaceRef, 28 HelpNamespaceRef,
29 } 29 }
30 30
31 public class HelpFilterToNamespaceTuple : IntermediateTuple 31 public class HelpFilterToNamespaceSymbol : IntermediateSymbol
32 { 32 {
33 public HelpFilterToNamespaceTuple() : base(VSTupleDefinitions.HelpFilterToNamespace, null, null) 33 public HelpFilterToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFilterToNamespace, null, null)
34 { 34 {
35 } 35 }
36 36
37 public HelpFilterToNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFilterToNamespace, sourceLineNumber, id) 37 public HelpFilterToNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFilterToNamespace, sourceLineNumber, id)
38 { 38 {
39 } 39 }
40 40
41 public IntermediateField this[HelpFilterToNamespaceTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[HelpFilterToNamespaceSymbolFields index] => this.Fields[(int)index];
42 42
43 public string HelpFilterRef 43 public string HelpFilterRef
44 { 44 {
45 get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpFilterRef].AsString(); 45 get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpFilterRef].AsString();
46 set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpFilterRef, value); 46 set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpFilterRef, value);
47 } 47 }
48 48
49 public string HelpNamespaceRef 49 public string HelpNamespaceRef
50 { 50 {
51 get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef].AsString(); 51 get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef].AsString();
52 set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef, value); 52 set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFilterTuple.cs b/src/wixext/Tuples/HelpFilterTuple.cs
index 6592defa..9deb47d0 100644
--- a/src/wixext/Tuples/HelpFilterTuple.cs
+++ b/src/wixext/Tuples/HelpFilterTuple.cs
@@ -3,53 +3,53 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpFilter = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpFilter = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpFilter.ToString(), 11 VSSymbolDefinitionType.HelpFilter.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.Description), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.Description), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.QueryString), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.QueryString), IntermediateFieldType.String),
16 }, 16 },
17 typeof(HelpFilterTuple)); 17 typeof(HelpFilterSymbol));
18 } 18 }
19} 19}
20 20
21namespace WixToolset.VisualStudio.Tuples 21namespace WixToolset.VisualStudio.Symbols
22{ 22{
23 using WixToolset.Data; 23 using WixToolset.Data;
24 24
25 public enum HelpFilterTupleFields 25 public enum HelpFilterSymbolFields
26 { 26 {
27 Description, 27 Description,
28 QueryString, 28 QueryString,
29 } 29 }
30 30
31 public class HelpFilterTuple : IntermediateTuple 31 public class HelpFilterSymbol : IntermediateSymbol
32 { 32 {
33 public HelpFilterTuple() : base(VSTupleDefinitions.HelpFilter, null, null) 33 public HelpFilterSymbol() : base(VSSymbolDefinitions.HelpFilter, null, null)
34 { 34 {
35 } 35 }
36 36
37 public HelpFilterTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFilter, sourceLineNumber, id) 37 public HelpFilterSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFilter, sourceLineNumber, id)
38 { 38 {
39 } 39 }
40 40
41 public IntermediateField this[HelpFilterTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[HelpFilterSymbolFields index] => this.Fields[(int)index];
42 42
43 public string Description 43 public string Description
44 { 44 {
45 get => this.Fields[(int)HelpFilterTupleFields.Description].AsString(); 45 get => this.Fields[(int)HelpFilterSymbolFields.Description].AsString();
46 set => this.Set((int)HelpFilterTupleFields.Description, value); 46 set => this.Set((int)HelpFilterSymbolFields.Description, value);
47 } 47 }
48 48
49 public string QueryString 49 public string QueryString
50 { 50 {
51 get => this.Fields[(int)HelpFilterTupleFields.QueryString].AsString(); 51 get => this.Fields[(int)HelpFilterSymbolFields.QueryString].AsString();
52 set => this.Set((int)HelpFilterTupleFields.QueryString, value); 52 set => this.Set((int)HelpFilterSymbolFields.QueryString, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/HelpNamespaceTuple.cs b/src/wixext/Tuples/HelpNamespaceTuple.cs
index 69b471fb..8d2c2f80 100644
--- a/src/wixext/Tuples/HelpNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpNamespaceTuple.cs
@@ -3,61 +3,61 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpNamespace = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpNamespace = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpNamespace.ToString(), 11 VSSymbolDefinitionType.HelpNamespace.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.NamespaceName), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.NamespaceName), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.CollectionFileRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.CollectionFileRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.Description), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.Description), IntermediateFieldType.String),
17 }, 17 },
18 typeof(HelpNamespaceTuple)); 18 typeof(HelpNamespaceSymbol));
19 } 19 }
20} 20}
21 21
22namespace WixToolset.VisualStudio.Tuples 22namespace WixToolset.VisualStudio.Symbols
23{ 23{
24 using WixToolset.Data; 24 using WixToolset.Data;
25 25
26 public enum HelpNamespaceTupleFields 26 public enum HelpNamespaceSymbolFields
27 { 27 {
28 NamespaceName, 28 NamespaceName,
29 CollectionFileRef, 29 CollectionFileRef,
30 Description, 30 Description,
31 } 31 }
32 32
33 public class HelpNamespaceTuple : IntermediateTuple 33 public class HelpNamespaceSymbol : IntermediateSymbol
34 { 34 {
35 public HelpNamespaceTuple() : base(VSTupleDefinitions.HelpNamespace, null, null) 35 public HelpNamespaceSymbol() : base(VSSymbolDefinitions.HelpNamespace, null, null)
36 { 36 {
37 } 37 }
38 38
39 public HelpNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpNamespace, sourceLineNumber, id) 39 public HelpNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpNamespace, sourceLineNumber, id)
40 { 40 {
41 } 41 }
42 42
43 public IntermediateField this[HelpNamespaceTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[HelpNamespaceSymbolFields index] => this.Fields[(int)index];
44 44
45 public string NamespaceName 45 public string NamespaceName
46 { 46 {
47 get => this.Fields[(int)HelpNamespaceTupleFields.NamespaceName].AsString(); 47 get => this.Fields[(int)HelpNamespaceSymbolFields.NamespaceName].AsString();
48 set => this.Set((int)HelpNamespaceTupleFields.NamespaceName, value); 48 set => this.Set((int)HelpNamespaceSymbolFields.NamespaceName, value);
49 } 49 }
50 50
51 public string CollectionFileRef 51 public string CollectionFileRef
52 { 52 {
53 get => this.Fields[(int)HelpNamespaceTupleFields.CollectionFileRef].AsString(); 53 get => this.Fields[(int)HelpNamespaceSymbolFields.CollectionFileRef].AsString();
54 set => this.Set((int)HelpNamespaceTupleFields.CollectionFileRef, value); 54 set => this.Set((int)HelpNamespaceSymbolFields.CollectionFileRef, value);
55 } 55 }
56 56
57 public string Description 57 public string Description
58 { 58 {
59 get => this.Fields[(int)HelpNamespaceTupleFields.Description].AsString(); 59 get => this.Fields[(int)HelpNamespaceSymbolFields.Description].AsString();
60 set => this.Set((int)HelpNamespaceTupleFields.Description, value); 60 set => this.Set((int)HelpNamespaceSymbolFields.Description, value);
61 } 61 }
62 } 62 }
63} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/HelpPluginTuple.cs b/src/wixext/Tuples/HelpPluginTuple.cs
index 5f146199..a452fbd5 100644
--- a/src/wixext/Tuples/HelpPluginTuple.cs
+++ b/src/wixext/Tuples/HelpPluginTuple.cs
@@ -3,29 +3,29 @@
3namespace WixToolset.VisualStudio 3namespace WixToolset.VisualStudio
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.VisualStudio.Tuples; 6 using WixToolset.VisualStudio.Symbols;
7 7
8 public static partial class VSTupleDefinitions 8 public static partial class VSSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition HelpPlugin = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition HelpPlugin = new IntermediateSymbolDefinition(
11 VSTupleDefinitionType.HelpPlugin.ToString(), 11 VSSymbolDefinitionType.HelpPlugin.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HelpNamespaceRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHelpNamespaceRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHelpNamespaceRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxTFileRef), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxTFileRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxAFileRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxAFileRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHxTFileRef), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHxTFileRef), IntermediateFieldType.String),
19 }, 19 },
20 typeof(HelpPluginTuple)); 20 typeof(HelpPluginSymbol));
21 } 21 }
22} 22}
23 23
24namespace WixToolset.VisualStudio.Tuples 24namespace WixToolset.VisualStudio.Symbols
25{ 25{
26 using WixToolset.Data; 26 using WixToolset.Data;
27 27
28 public enum HelpPluginTupleFields 28 public enum HelpPluginSymbolFields
29 { 29 {
30 HelpNamespaceRef, 30 HelpNamespaceRef,
31 ParentHelpNamespaceRef, 31 ParentHelpNamespaceRef,
@@ -34,46 +34,46 @@ namespace WixToolset.VisualStudio.Tuples
34 ParentHxTFileRef, 34 ParentHxTFileRef,
35 } 35 }
36 36
37 public class HelpPluginTuple : IntermediateTuple 37 public class HelpPluginSymbol : IntermediateSymbol
38 { 38 {
39 public HelpPluginTuple() : base(VSTupleDefinitions.HelpPlugin, null, null) 39 public HelpPluginSymbol() : base(VSSymbolDefinitions.HelpPlugin, null, null)
40 { 40 {
41 } 41 }
42 42
43 public HelpPluginTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpPlugin, sourceLineNumber, id) 43 public HelpPluginSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpPlugin, sourceLineNumber, id)
44 { 44 {
45 } 45 }
46 46
47 public IntermediateField this[HelpPluginTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[HelpPluginSymbolFields index] => this.Fields[(int)index];
48 48
49 public string HelpNamespaceRef 49 public string HelpNamespaceRef
50 { 50 {
51 get => this.Fields[(int)HelpPluginTupleFields.HelpNamespaceRef].AsString(); 51 get => this.Fields[(int)HelpPluginSymbolFields.HelpNamespaceRef].AsString();
52 set => this.Set((int)HelpPluginTupleFields.HelpNamespaceRef, value); 52 set => this.Set((int)HelpPluginSymbolFields.HelpNamespaceRef, value);
53 } 53 }
54 54
55 public string ParentHelpNamespaceRef 55 public string ParentHelpNamespaceRef
56 { 56 {
57 get => this.Fields[(int)HelpPluginTupleFields.ParentHelpNamespaceRef].AsString(); 57 get => this.Fields[(int)HelpPluginSymbolFields.ParentHelpNamespaceRef].AsString();
58 set => this.Set((int)HelpPluginTupleFields.ParentHelpNamespaceRef, value); 58 set => this.Set((int)HelpPluginSymbolFields.ParentHelpNamespaceRef, value);
59 } 59 }
60 60
61 public string HxTFileRef 61 public string HxTFileRef
62 { 62 {
63 get => this.Fields[(int)HelpPluginTupleFields.HxTFileRef].AsString(); 63 get => this.Fields[(int)HelpPluginSymbolFields.HxTFileRef].AsString();
64 set => this.Set((int)HelpPluginTupleFields.HxTFileRef, value); 64 set => this.Set((int)HelpPluginSymbolFields.HxTFileRef, value);
65 } 65 }
66 66
67 public string HxAFileRef 67 public string HxAFileRef
68 { 68 {
69 get => this.Fields[(int)HelpPluginTupleFields.HxAFileRef].AsString(); 69 get => this.Fields[(int)HelpPluginSymbolFields.HxAFileRef].AsString();
70 set => this.Set((int)HelpPluginTupleFields.HxAFileRef, value); 70 set => this.Set((int)HelpPluginSymbolFields.HxAFileRef, value);
71 } 71 }
72 72
73 public string ParentHxTFileRef 73 public string ParentHxTFileRef
74 { 74 {
75 get => this.Fields[(int)HelpPluginTupleFields.ParentHxTFileRef].AsString(); 75 get => this.Fields[(int)HelpPluginSymbolFields.ParentHxTFileRef].AsString();
76 set => this.Set((int)HelpPluginTupleFields.ParentHxTFileRef, value); 76 set => this.Set((int)HelpPluginSymbolFields.ParentHxTFileRef, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79} \ No newline at end of file
diff --git a/src/wixext/Tuples/VSTupleDefinitions.cs b/src/wixext/Tuples/VSTupleDefinitions.cs
index fadcf808..cea6a2b6 100644
--- a/src/wixext/Tuples/VSTupleDefinitions.cs
+++ b/src/wixext/Tuples/VSTupleDefinitions.cs
@@ -5,7 +5,7 @@ namespace WixToolset.VisualStudio
5 using System; 5 using System;
6 using WixToolset.Data; 6 using WixToolset.Data;
7 7
8 public enum VSTupleDefinitionType 8 public enum VSSymbolDefinitionType
9 { 9 {
10 HelpFile, 10 HelpFile,
11 HelpFileToNamespace, 11 HelpFileToNamespace,
@@ -15,13 +15,13 @@ namespace WixToolset.VisualStudio
15 HelpPlugin, 15 HelpPlugin,
16 } 16 }
17 17
18 public static partial class VSTupleDefinitions 18 public static partial class VSSymbolDefinitions
19 { 19 {
20 public static readonly Version Version = new Version("4.0.0"); 20 public static readonly Version Version = new Version("4.0.0");
21 21
22 public static IntermediateTupleDefinition ByName(string name) 22 public static IntermediateSymbolDefinition ByName(string name)
23 { 23 {
24 if (!Enum.TryParse(name, out VSTupleDefinitionType type)) 24 if (!Enum.TryParse(name, out VSSymbolDefinitionType type))
25 { 25 {
26 return null; 26 return null;
27 } 27 }
@@ -29,27 +29,27 @@ namespace WixToolset.VisualStudio
29 return ByType(type); 29 return ByType(type);
30 } 30 }
31 31
32 public static IntermediateTupleDefinition ByType(VSTupleDefinitionType type) 32 public static IntermediateSymbolDefinition ByType(VSSymbolDefinitionType type)
33 { 33 {
34 switch (type) 34 switch (type)
35 { 35 {
36 case VSTupleDefinitionType.HelpFile: 36 case VSSymbolDefinitionType.HelpFile:
37 return VSTupleDefinitions.HelpFile; 37 return VSSymbolDefinitions.HelpFile;
38 38
39 case VSTupleDefinitionType.HelpFileToNamespace: 39 case VSSymbolDefinitionType.HelpFileToNamespace:
40 return VSTupleDefinitions.HelpFileToNamespace; 40 return VSSymbolDefinitions.HelpFileToNamespace;
41 41
42 case VSTupleDefinitionType.HelpFilter: 42 case VSSymbolDefinitionType.HelpFilter:
43 return VSTupleDefinitions.HelpFilter; 43 return VSSymbolDefinitions.HelpFilter;
44 44
45 case VSTupleDefinitionType.HelpFilterToNamespace: 45 case VSSymbolDefinitionType.HelpFilterToNamespace:
46 return VSTupleDefinitions.HelpFilterToNamespace; 46 return VSSymbolDefinitions.HelpFilterToNamespace;
47 47
48 case VSTupleDefinitionType.HelpNamespace: 48 case VSSymbolDefinitionType.HelpNamespace:
49 return VSTupleDefinitions.HelpNamespace; 49 return VSSymbolDefinitions.HelpNamespace;
50 50
51 case VSTupleDefinitionType.HelpPlugin: 51 case VSSymbolDefinitionType.HelpPlugin:
52 return VSTupleDefinitions.HelpPlugin; 52 return VSSymbolDefinitions.HelpPlugin;
53 53
54 default: 54 default:
55 throw new ArgumentOutOfRangeException(nameof(type)); 55 throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs
index b9390fea..d3afc2ab 100644
--- a/src/wixext/VSCompiler.cs
+++ b/src/wixext/VSCompiler.cs
@@ -7,10 +7,10 @@ namespace WixToolset.VisualStudio
7 using System.Globalization; 7 using System.Globalization;
8 using System.Xml.Linq; 8 using System.Xml.Linq;
9 using WixToolset.Data; 9 using WixToolset.Data;
10 using WixToolset.Data.Tuples; 10 using WixToolset.Data.Symbols;
11 using WixToolset.Data.WindowsInstaller; 11 using WixToolset.Data.WindowsInstaller;
12 using WixToolset.Extensibility; 12 using WixToolset.Extensibility;
13 using WixToolset.VisualStudio.Tuples; 13 using WixToolset.VisualStudio.Symbols;
14 14
15 /// <summary> 15 /// <summary>
16 /// The compiler for the WiX Toolset Visual Studio Extension. 16 /// The compiler for the WiX Toolset Visual Studio Extension.
@@ -93,7 +93,7 @@ namespace WixToolset.VisualStudio
93 { 93 {
94 case "Id": 94 case "Id":
95 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 95 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
96 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpNamespace, id.Id); 96 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpNamespace, id.Id);
97 break; 97 break;
98 default: 98 default:
99 this.ParseHelper.UnexpectedAttribute(element, attrib); 99 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -212,7 +212,7 @@ namespace WixToolset.VisualStudio
212 212
213 if (!this.Messaging.EncounteredError) 213 if (!this.Messaging.EncounteredError)
214 { 214 {
215 section.AddTuple(new HelpNamespaceTuple(sourceLineNumbers, id) 215 section.AddSymbol(new HelpNamespaceSymbol(sourceLineNumbers, id)
216 { 216 {
217 NamespaceName = name, 217 NamespaceName = name,
218 CollectionFileRef = fileId, 218 CollectionFileRef = fileId,
@@ -249,11 +249,11 @@ namespace WixToolset.VisualStudio
249 break; 249 break;
250 case "AttributeIndex": 250 case "AttributeIndex":
251 hxr = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 251 hxr = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
252 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxr); 252 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxr);
253 break; 253 break;
254 case "Index": 254 case "Index":
255 hxi = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 255 hxi = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
256 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxi); 256 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxi);
257 break; 257 break;
258 case "Language": 258 case "Language":
259 language = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue); 259 language = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
@@ -263,11 +263,11 @@ namespace WixToolset.VisualStudio
263 break; 263 break;
264 case "SampleLocation": 264 case "SampleLocation":
265 samples = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 265 samples = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
266 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, samples); 266 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, samples);
267 break; 267 break;
268 case "Search": 268 case "Search":
269 hxq = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 269 hxq = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
270 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxq); 270 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxq);
271 break; 271 break;
272 case "SuppressCustomActions": 272 case "SuppressCustomActions":
273 suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); 273 suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -303,7 +303,7 @@ namespace WixToolset.VisualStudio
303 303
304 if (!this.Messaging.EncounteredError) 304 if (!this.Messaging.EncounteredError)
305 { 305 {
306 section.AddTuple(new HelpFileTuple(sourceLineNumbers, id) 306 section.AddSymbol(new HelpFileSymbol(sourceLineNumbers, id)
307 { 307 {
308 HelpFileName = name, 308 HelpFileName = name,
309 LangID = language, 309 LangID = language,
@@ -334,7 +334,7 @@ namespace WixToolset.VisualStudio
334 { 334 {
335 case "Id": 335 case "Id":
336 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 336 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
337 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpFile, id.Id); 337 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpFile, id.Id);
338 break; 338 break;
339 default: 339 default:
340 this.ParseHelper.UnexpectedAttribute(element, attrib); 340 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -356,7 +356,7 @@ namespace WixToolset.VisualStudio
356 356
357 if (!this.Messaging.EncounteredError) 357 if (!this.Messaging.EncounteredError)
358 { 358 {
359 section.AddTuple(new HelpFileToNamespaceTuple(sourceLineNumbers, id) 359 section.AddSymbol(new HelpFileToNamespaceSymbol(sourceLineNumbers, id)
360 { 360 {
361 HelpFileRef = id.Id, 361 HelpFileRef = id.Id,
362 HelpNamespaceRef = collectionId.Id, 362 HelpNamespaceRef = collectionId.Id,
@@ -415,7 +415,7 @@ namespace WixToolset.VisualStudio
415 415
416 if (!this.Messaging.EncounteredError) 416 if (!this.Messaging.EncounteredError)
417 { 417 {
418 section.AddTuple(new HelpFilterTuple(sourceLineNumbers, id) 418 section.AddSymbol(new HelpFilterSymbol(sourceLineNumbers, id)
419 { 419 {
420 Description = name, 420 Description = name,
421 QueryString = filterDefinition, 421 QueryString = filterDefinition,
@@ -441,7 +441,7 @@ namespace WixToolset.VisualStudio
441 { 441 {
442 case "Id": 442 case "Id":
443 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 443 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
444 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpFilter, id.Id); 444 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpFilter, id.Id);
445 break; 445 break;
446 default: 446 default:
447 this.ParseHelper.UnexpectedAttribute(element, attrib); 447 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -463,7 +463,7 @@ namespace WixToolset.VisualStudio
463 463
464 if (!this.Messaging.EncounteredError) 464 if (!this.Messaging.EncounteredError)
465 { 465 {
466 section.AddTuple(new HelpFilterToNamespaceTuple(sourceLineNumbers, id) 466 section.AddSymbol(new HelpFilterToNamespaceSymbol(sourceLineNumbers, id)
467 { 467 {
468 HelpFilterRef = id.Id, 468 HelpFilterRef = id.Id,
469 HelpNamespaceRef = collectionId.Id, 469 HelpNamespaceRef = collectionId.Id,
@@ -533,7 +533,7 @@ namespace WixToolset.VisualStudio
533 533
534 if (!this.Messaging.EncounteredError) 534 if (!this.Messaging.EncounteredError)
535 { 535 {
536 section.AddTuple(new HelpPluginTuple(sourceLineNumbers, parentId) 536 section.AddSymbol(new HelpPluginSymbol(sourceLineNumbers, parentId)
537 { 537 {
538 HelpNamespaceRef = parentId.Id, 538 HelpNamespaceRef = parentId.Id,
539 ParentHelpNamespaceRef = namespaceParent, 539 ParentHelpNamespaceRef = namespaceParent,
@@ -550,7 +550,7 @@ namespace WixToolset.VisualStudio
550 this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty, 550 this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
551 ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false); 551 ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false);
552 // Reference CustomAction since nothing will happen without it 552 // Reference CustomAction since nothing will happen without it
553 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_HxMerge_VSIPCC_VSCC"); 553 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_HxMerge_VSIPCC_VSCC");
554 } 554 }
555 } 555 }
556 else if (pluginVS08) 556 else if (pluginVS08)
@@ -561,13 +561,13 @@ namespace WixToolset.VisualStudio
561 this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty, 561 this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
562 ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false); 562 ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false);
563 // Reference CustomAction since nothing will happen without it 563 // Reference CustomAction since nothing will happen without it
564 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC"); 564 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
565 } 565 }
566 } 566 }
567 else 567 else
568 { 568 {
569 // Reference the parent namespace to enforce the foreign key relationship 569 // Reference the parent namespace to enforce the foreign key relationship
570 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpNamespace, namespaceParent); 570 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpNamespace, namespaceParent);
571 } 571 }
572 } 572 }
573 } 573 }
@@ -679,10 +679,10 @@ namespace WixToolset.VisualStudio
679 if (!this.Messaging.EncounteredError) 679 if (!this.Messaging.EncounteredError)
680 { 680 {
681 // Ensure there is a reference to the AppSearch Property that will find the VsixInstaller.exe. 681 // Ensure there is a reference to the AppSearch Property that will find the VsixInstaller.exe.
682 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Property, propertyId); 682 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Property, propertyId);
683 683
684 // Ensure there is a reference to the package file (even if we are a child under it). 684 // Ensure there is a reference to the package file (even if we are a child under it).
685 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, fileId); 685 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, fileId);
686 686
687 var cmdlinePrefix = "/q "; 687 var cmdlinePrefix = "/q ";
688 688
@@ -699,12 +699,12 @@ namespace WixToolset.VisualStudio
699 var installCmdLinePerMachine = String.Concat(installCmdLinePerUser, " /admin"); 699 var installCmdLinePerMachine = String.Concat(installCmdLinePerUser, " /admin");
700 var installConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed. 700 var installConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
701 var installConditionPerMachine = String.Format("ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed. 701 var installConditionPerMachine = String.Format("ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
702 var installPerUserCA = new CustomActionTuple(sourceLineNumbers, installNamePerUser) 702 var installPerUserCA = new CustomActionSymbol(sourceLineNumbers, installNamePerUser)
703 { 703 {
704 ExecutionType = CustomActionExecutionType.Deferred, 704 ExecutionType = CustomActionExecutionType.Deferred,
705 Impersonate = true, 705 Impersonate = true,
706 }; 706 };
707 var installPerMachineCA = new CustomActionTuple(sourceLineNumbers, installNamePerMachine) 707 var installPerMachineCA = new CustomActionSymbol(sourceLineNumbers, installNamePerMachine)
708 { 708 {
709 ExecutionType = CustomActionExecutionType.Deferred, 709 ExecutionType = CustomActionExecutionType.Deferred,
710 Impersonate = false, 710 Impersonate = false,
@@ -724,13 +724,13 @@ namespace WixToolset.VisualStudio
724 var rollbackCmdLinePerMachine = String.Concat(rollbackCmdLinePerUser, " /admin"); 724 var rollbackCmdLinePerMachine = String.Concat(rollbackCmdLinePerUser, " /admin");
725 var rollbackConditionPerUser = String.Format("NOT ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already. 725 var rollbackConditionPerUser = String.Format("NOT ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
726 var rollbackConditionPerMachine = String.Format("ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already. 726 var rollbackConditionPerMachine = String.Format("ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
727 var rollbackPerUserCA = new CustomActionTuple(sourceLineNumbers, rollbackNamePerUser) 727 var rollbackPerUserCA = new CustomActionSymbol(sourceLineNumbers, rollbackNamePerUser)
728 { 728 {
729 ExecutionType = CustomActionExecutionType.Rollback, 729 ExecutionType = CustomActionExecutionType.Rollback,
730 IgnoreResult = true, 730 IgnoreResult = true,
731 Impersonate = true, 731 Impersonate = true,
732 }; 732 };
733 var rollbackPerMachineCA = new CustomActionTuple(sourceLineNumbers, rollbackNamePerMachine) 733 var rollbackPerMachineCA = new CustomActionSymbol(sourceLineNumbers, rollbackNamePerMachine)
734 { 734 {
735 ExecutionType = CustomActionExecutionType.Rollback, 735 ExecutionType = CustomActionExecutionType.Rollback,
736 IgnoreResult = true, 736 IgnoreResult = true,
@@ -755,13 +755,13 @@ namespace WixToolset.VisualStudio
755 var uninstallCmdLinePerMachine = String.Concat(uninstallCmdLinePerUser, " /admin"); 755 var uninstallCmdLinePerMachine = String.Concat(uninstallCmdLinePerUser, " /admin");
756 var uninstallConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled. 756 var uninstallConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
757 var uninstallConditionPerMachine = String.Format("ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled. 757 var uninstallConditionPerMachine = String.Format("ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
758 var uninstallPerUserCA = new CustomActionTuple(sourceLineNumbers, uninstallNamePerUser) 758 var uninstallPerUserCA = new CustomActionSymbol(sourceLineNumbers, uninstallNamePerUser)
759 { 759 {
760 ExecutionType = CustomActionExecutionType.Deferred, 760 ExecutionType = CustomActionExecutionType.Deferred,
761 IgnoreResult = true, 761 IgnoreResult = true,
762 Impersonate = true, 762 Impersonate = true,
763 }; 763 };
764 var uninstallPerMachineCA = new CustomActionTuple(sourceLineNumbers, uninstallNamePerMachine) 764 var uninstallPerMachineCA = new CustomActionSymbol(sourceLineNumbers, uninstallNamePerMachine)
765 { 765 {
766 ExecutionType = CustomActionExecutionType.Deferred, 766 ExecutionType = CustomActionExecutionType.Deferred,
767 IgnoreResult = true, 767 IgnoreResult = true,
@@ -774,7 +774,7 @@ namespace WixToolset.VisualStudio
774 } 774 }
775 } 775 }
776 776
777 private void SchedulePropertyExeAction(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, CustomActionTuple caTemplate, string condition, string beforeAction, string afterAction) 777 private void SchedulePropertyExeAction(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, CustomActionSymbol caTemplate, string condition, string beforeAction, string afterAction)
778 { 778 {
779 const SequenceTable sequence = SequenceTable.InstallExecuteSequence; 779 const SequenceTable sequence = SequenceTable.InstallExecuteSequence;
780 780
@@ -782,9 +782,9 @@ namespace WixToolset.VisualStudio
782 caTemplate.Source = source; 782 caTemplate.Source = source;
783 caTemplate.TargetType = CustomActionTargetType.Exe; 783 caTemplate.TargetType = CustomActionTargetType.Exe;
784 caTemplate.Target = cmdline; 784 caTemplate.Target = cmdline;
785 section.AddTuple(caTemplate); 785 section.AddSymbol(caTemplate);
786 786
787 section.AddTuple(new WixActionTuple(sourceLineNumbers, new Identifier(name.Access, sequence, name.Id)) 787 section.AddSymbol(new WixActionSymbol(sourceLineNumbers, new Identifier(name.Access, sequence, name.Id))
788 { 788 {
789 SequenceTable = SequenceTable.InstallExecuteSequence, 789 SequenceTable = SequenceTable.InstallExecuteSequence,
790 Action = name.Id, 790 Action = name.Id,
@@ -799,11 +799,11 @@ namespace WixToolset.VisualStudio
799 { 799 {
800 if (WindowsInstallerStandard.IsStandardAction(beforeAction)) 800 if (WindowsInstallerStandard.IsStandardAction(beforeAction))
801 { 801 {
802 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), beforeAction); 802 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction);
803 } 803 }
804 else 804 else
805 { 805 {
806 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, beforeAction); 806 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, beforeAction);
807 } 807 }
808 } 808 }
809 809
@@ -811,18 +811,18 @@ namespace WixToolset.VisualStudio
811 { 811 {
812 if (WindowsInstallerStandard.IsStandardAction(afterAction)) 812 if (WindowsInstallerStandard.IsStandardAction(afterAction))
813 { 813 {
814 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), afterAction); 814 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), afterAction);
815 } 815 }
816 else 816 else
817 { 817 {
818 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, afterAction); 818 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, afterAction);
819 } 819 }
820 } 820 }
821 } 821 }
822 822
823 private void AddReferenceToRegisterMicrosoftHelp(IntermediateSection section, SourceLineNumber sourceLineNumbers) 823 private void AddReferenceToRegisterMicrosoftHelp(IntermediateSection section, SourceLineNumber sourceLineNumbers)
824 { 824 {
825 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"); 825 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
826 } 826 }
827 } 827 }
828} 828}
diff --git a/src/wixext/VSExtensionData.cs b/src/wixext/VSExtensionData.cs
index 3d28b625..51199d2c 100644
--- a/src/wixext/VSExtensionData.cs
+++ b/src/wixext/VSExtensionData.cs
@@ -13,15 +13,15 @@ namespace WixToolset.VisualStudio
13 /// <value>The default culture.</value> 13 /// <value>The default culture.</value>
14 public override string DefaultCulture => "en-US"; 14 public override string DefaultCulture => "en-US";
15 15
16 public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) 16 public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
17 { 17 {
18 tupleDefinition = VSTupleDefinitions.ByName(name); 18 symbolDefinition = VSSymbolDefinitions.ByName(name);
19 return tupleDefinition != null; 19 return symbolDefinition != null;
20 } 20 }
21 21
22 public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) 22 public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
23 { 23 {
24 return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", tupleDefinitions); 24 return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", symbolDefinitions);
25 } 25 }
26 } 26 }
27} 27}
diff --git a/src/wixext/VSTableDefinitions.cs b/src/wixext/VSTableDefinitions.cs
index bbc74b96..0c3ca907 100644
--- a/src/wixext/VSTableDefinitions.cs
+++ b/src/wixext/VSTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.VisualStudio
8 { 8 {
9 public static readonly TableDefinition HelpFile = new TableDefinition( 9 public static readonly TableDefinition HelpFile = new TableDefinition(
10 "HelpFile", 10 "HelpFile",
11 VSTupleDefinitions.HelpFile, 11 VSSymbolDefinitions.HelpFile,
12 new[] 12 new[]
13 { 13 {
14 new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column), 14 new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column),
@@ -20,46 +20,46 @@ namespace WixToolset.VisualStudio
20 new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column), 20 new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column),
21 new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column), 21 new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column),
22 }, 22 },
23 tupleIdIsPrimaryKey: true 23 symbolIdIsPrimaryKey: true
24 ); 24 );
25 25
26 public static readonly TableDefinition HelpFileToNamespace = new TableDefinition( 26 public static readonly TableDefinition HelpFileToNamespace = new TableDefinition(
27 "HelpFileToNamespace", 27 "HelpFileToNamespace",
28 VSTupleDefinitions.HelpFileToNamespace, 28 VSSymbolDefinitions.HelpFileToNamespace,
29 new[] 29 new[]
30 { 30 {
31 new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column), 31 new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column),
32 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), 32 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
33 }, 33 },
34 tupleIdIsPrimaryKey: false 34 symbolIdIsPrimaryKey: false
35 ); 35 );
36 36
37 public static readonly TableDefinition HelpFilter = new TableDefinition( 37 public static readonly TableDefinition HelpFilter = new TableDefinition(
38 "HelpFilter", 38 "HelpFilter",
39 VSTupleDefinitions.HelpFilter, 39 VSSymbolDefinitions.HelpFilter,
40 new[] 40 new[]
41 { 41 {
42 new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column), 42 new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column),
43 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."), 43 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."),
44 new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."), 44 new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."),
45 }, 45 },
46 tupleIdIsPrimaryKey: true 46 symbolIdIsPrimaryKey: true
47 ); 47 );
48 48
49 public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition( 49 public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition(
50 "HelpFilterToNamespace", 50 "HelpFilterToNamespace",
51 VSTupleDefinitions.HelpFilterToNamespace, 51 VSSymbolDefinitions.HelpFilterToNamespace,
52 new[] 52 new[]
53 { 53 {
54 new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column), 54 new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column),
55 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), 55 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
56 }, 56 },
57 tupleIdIsPrimaryKey: false 57 symbolIdIsPrimaryKey: false
58 ); 58 );
59 59
60 public static readonly TableDefinition HelpNamespace = new TableDefinition( 60 public static readonly TableDefinition HelpNamespace = new TableDefinition(
61 "HelpNamespace", 61 "HelpNamespace",
62 VSTupleDefinitions.HelpNamespace, 62 VSSymbolDefinitions.HelpNamespace,
63 new[] 63 new[]
64 { 64 {
65 new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."), 65 new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."),
@@ -67,12 +67,12 @@ namespace WixToolset.VisualStudio
67 new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column), 67 new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column),
68 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."), 68 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."),
69 }, 69 },
70 tupleIdIsPrimaryKey: true 70 symbolIdIsPrimaryKey: true
71 ); 71 );
72 72
73 public static readonly TableDefinition HelpPlugin = new TableDefinition( 73 public static readonly TableDefinition HelpPlugin = new TableDefinition(
74 "HelpPlugin", 74 "HelpPlugin",
75 VSTupleDefinitions.HelpPlugin, 75 VSSymbolDefinitions.HelpPlugin,
76 new[] 76 new[]
77 { 77 {
78 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."), 78 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."),
@@ -81,7 +81,7 @@ namespace WixToolset.VisualStudio
81 new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column), 81 new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column),
82 new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column), 82 new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column),
83 }, 83 },
84 tupleIdIsPrimaryKey: false 84 symbolIdIsPrimaryKey: false
85 ); 85 );
86 86
87 public static readonly TableDefinition[] All = new[] 87 public static readonly TableDefinition[] All = new[]
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-26 03:05:07 +0000