diff options
Diffstat (limited to 'src/wixext/Tuples')
-rw-r--r-- | src/wixext/Tuples/HelpFileToNamespaceTuple.cs | 34 | ||||
-rw-r--r-- | src/wixext/Tuples/HelpFileTuple.cs | 64 | ||||
-rw-r--r-- | src/wixext/Tuples/HelpFilterToNamespaceTuple.cs | 34 | ||||
-rw-r--r-- | src/wixext/Tuples/HelpFilterTuple.cs | 34 | ||||
-rw-r--r-- | src/wixext/Tuples/HelpNamespaceTuple.cs | 40 | ||||
-rw-r--r-- | src/wixext/Tuples/HelpPluginTuple.cs | 52 | ||||
-rw-r--r-- | src/wixext/Tuples/VSTupleDefinitions.cs | 34 |
7 files changed, 146 insertions, 146 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
21 | namespace WixToolset.VisualStudio.Tuples | 21 | namespace 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
26 | namespace WixToolset.VisualStudio.Tuples | 26 | namespace 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
21 | namespace WixToolset.VisualStudio.Tuples | 21 | namespace 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
21 | namespace WixToolset.VisualStudio.Tuples | 21 | namespace 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
22 | namespace WixToolset.VisualStudio.Tuples | 22 | namespace 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 @@ | |||
3 | namespace WixToolset.VisualStudio | 3 | namespace 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 | ||
24 | namespace WixToolset.VisualStudio.Tuples | 24 | namespace 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)); |