The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 27, 2020 at 03:16 UTC
77b1836e860d2318bf50c5edf09a8fa70db36893
10 files changed
+197
-197
src/wixext/Tuples/HelpFileToNamespaceTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpFileToNamespace = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpFileToNamespace.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpFileToNamespace = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpFileToNamespace.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpFileRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpFileRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
16
},
17
- typeof(HelpFileToNamespaceTuple));
17
+ typeof(HelpFileToNamespaceSymbol));
18
}
19
}
20
21
-namespace WixToolset.VisualStudio.Tuples
21
+namespace WixToolset.VisualStudio.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum HelpFileToNamespaceTupleFields
25
+ public enum HelpFileToNamespaceSymbolFields
26
{
27
HelpFileRef,
28
HelpNamespaceRef,
29
}
30
31
- public class HelpFileToNamespaceTuple : IntermediateTuple
31
+ public class HelpFileToNamespaceSymbol : IntermediateSymbol
32
{
33
- public HelpFileToNamespaceTuple() : base(VSTupleDefinitions.HelpFileToNamespace, null, null)
33
+ public HelpFileToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFileToNamespace, null, null)
34
{
35
}
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
{
39
}
40
41
- public IntermediateField this[HelpFileToNamespaceTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[HelpFileToNamespaceSymbolFields index] => this.Fields[(int)index];
42
43
public string HelpFileRef
44
{
45
- get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpFileRef].AsString();
46
- set => this.Set((int)HelpFileToNamespaceTupleFields.HelpFileRef, value);
45
+ get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpFileRef].AsString();
46
+ set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpFileRef, value);
47
}
48
49
public string HelpNamespaceRef
50
{
51
- get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpNamespaceRef].AsString();
52
- set => this.Set((int)HelpFileToNamespaceTupleFields.HelpNamespaceRef, value);
51
+ get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef].AsString();
52
+ set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/HelpFileTuple.cs
+32
-32
@@ -3,31 +3,31 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpFile = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpFile.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpFile = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpFile.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HelpFileName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.LangID), IntermediateFieldType.Number),
16
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxSFileRef), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxIFileRef), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxQFileRef), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxRFileRef), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(HelpFileTupleFields.SamplesFileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HelpFileName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.LangID), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxSFileRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxIFileRef), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxQFileRef), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxRFileRef), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.SamplesFileRef), IntermediateFieldType.String),
21
},
22
- typeof(HelpFileTuple));
22
+ typeof(HelpFileSymbol));
23
}
24
}
25
26
-namespace WixToolset.VisualStudio.Tuples
26
+namespace WixToolset.VisualStudio.Symbols
27
{
28
using WixToolset.Data;
29
30
- public enum HelpFileTupleFields
30
+ public enum HelpFileSymbolFields
31
{
32
HelpFileName,
33
LangID,
@@ -38,58 +38,58 @@ namespace WixToolset.VisualStudio.Tuples
38
SamplesFileRef,
39
}
40
41
- public class HelpFileTuple : IntermediateTuple
41
+ public class HelpFileSymbol : IntermediateSymbol
42
{
43
- public HelpFileTuple() : base(VSTupleDefinitions.HelpFile, null, null)
43
+ public HelpFileSymbol() : base(VSSymbolDefinitions.HelpFile, null, null)
44
{
45
}
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
{
49
}
50
51
- public IntermediateField this[HelpFileTupleFields index] => this.Fields[(int)index];
51
+ public IntermediateField this[HelpFileSymbolFields index] => this.Fields[(int)index];
52
53
public string HelpFileName
54
{
55
- get => this.Fields[(int)HelpFileTupleFields.HelpFileName].AsString();
56
- set => this.Set((int)HelpFileTupleFields.HelpFileName, value);
55
+ get => this.Fields[(int)HelpFileSymbolFields.HelpFileName].AsString();
56
+ set => this.Set((int)HelpFileSymbolFields.HelpFileName, value);
57
}
58
59
public int? LangID
60
{
61
- get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber();
62
- set => this.Set((int)HelpFileTupleFields.LangID, value);
61
+ get => this.Fields[(int)HelpFileSymbolFields.LangID].AsNullableNumber();
62
+ set => this.Set((int)HelpFileSymbolFields.LangID, value);
63
}
64
65
public string HxSFileRef
66
{
67
- get => this.Fields[(int)HelpFileTupleFields.HxSFileRef].AsString();
68
- set => this.Set((int)HelpFileTupleFields.HxSFileRef, value);
67
+ get => this.Fields[(int)HelpFileSymbolFields.HxSFileRef].AsString();
68
+ set => this.Set((int)HelpFileSymbolFields.HxSFileRef, value);
69
}
70
71
public string HxIFileRef
72
{
73
- get => this.Fields[(int)HelpFileTupleFields.HxIFileRef].AsString();
74
- set => this.Set((int)HelpFileTupleFields.HxIFileRef, value);
73
+ get => this.Fields[(int)HelpFileSymbolFields.HxIFileRef].AsString();
74
+ set => this.Set((int)HelpFileSymbolFields.HxIFileRef, value);
75
}
76
77
public string HxQFileRef
78
{
79
- get => this.Fields[(int)HelpFileTupleFields.HxQFileRef].AsString();
80
- set => this.Set((int)HelpFileTupleFields.HxQFileRef, value);
79
+ get => this.Fields[(int)HelpFileSymbolFields.HxQFileRef].AsString();
80
+ set => this.Set((int)HelpFileSymbolFields.HxQFileRef, value);
81
}
82
83
public string HxRFileRef
84
{
85
- get => this.Fields[(int)HelpFileTupleFields.HxRFileRef].AsString();
86
- set => this.Set((int)HelpFileTupleFields.HxRFileRef, value);
85
+ get => this.Fields[(int)HelpFileSymbolFields.HxRFileRef].AsString();
86
+ set => this.Set((int)HelpFileSymbolFields.HxRFileRef, value);
87
}
88
89
public string SamplesFileRef
90
{
91
- get => this.Fields[(int)HelpFileTupleFields.SamplesFileRef].AsString();
92
- set => this.Set((int)HelpFileTupleFields.SamplesFileRef, value);
91
+ get => this.Fields[(int)HelpFileSymbolFields.SamplesFileRef].AsString();
92
+ set => this.Set((int)HelpFileSymbolFields.SamplesFileRef, value);
93
}
94
}
95
}
\ No newline at end of file
src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpFilterToNamespace = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpFilterToNamespace.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpFilterToNamespace = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpFilterToNamespace.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpFilterRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpFilterRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
16
},
17
- typeof(HelpFilterToNamespaceTuple));
17
+ typeof(HelpFilterToNamespaceSymbol));
18
}
19
}
20
21
-namespace WixToolset.VisualStudio.Tuples
21
+namespace WixToolset.VisualStudio.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum HelpFilterToNamespaceTupleFields
25
+ public enum HelpFilterToNamespaceSymbolFields
26
{
27
HelpFilterRef,
28
HelpNamespaceRef,
29
}
30
31
- public class HelpFilterToNamespaceTuple : IntermediateTuple
31
+ public class HelpFilterToNamespaceSymbol : IntermediateSymbol
32
{
33
- public HelpFilterToNamespaceTuple() : base(VSTupleDefinitions.HelpFilterToNamespace, null, null)
33
+ public HelpFilterToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFilterToNamespace, null, null)
34
{
35
}
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
{
39
}
40
41
- public IntermediateField this[HelpFilterToNamespaceTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[HelpFilterToNamespaceSymbolFields index] => this.Fields[(int)index];
42
43
public string HelpFilterRef
44
{
45
- get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpFilterRef].AsString();
46
- set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpFilterRef, value);
45
+ get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpFilterRef].AsString();
46
+ set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpFilterRef, value);
47
}
48
49
public string HelpNamespaceRef
50
{
51
- get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef].AsString();
52
- set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef, value);
51
+ get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef].AsString();
52
+ set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/HelpFilterTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpFilter = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpFilter.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpFilter = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpFilter.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.Description), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.QueryString), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.Description), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.QueryString), IntermediateFieldType.String),
16
},
17
- typeof(HelpFilterTuple));
17
+ typeof(HelpFilterSymbol));
18
}
19
}
20
21
-namespace WixToolset.VisualStudio.Tuples
21
+namespace WixToolset.VisualStudio.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum HelpFilterTupleFields
25
+ public enum HelpFilterSymbolFields
26
{
27
Description,
28
QueryString,
29
}
30
31
- public class HelpFilterTuple : IntermediateTuple
31
+ public class HelpFilterSymbol : IntermediateSymbol
32
{
33
- public HelpFilterTuple() : base(VSTupleDefinitions.HelpFilter, null, null)
33
+ public HelpFilterSymbol() : base(VSSymbolDefinitions.HelpFilter, null, null)
34
{
35
}
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
{
39
}
40
41
- public IntermediateField this[HelpFilterTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[HelpFilterSymbolFields index] => this.Fields[(int)index];
42
43
public string Description
44
{
45
- get => this.Fields[(int)HelpFilterTupleFields.Description].AsString();
46
- set => this.Set((int)HelpFilterTupleFields.Description, value);
45
+ get => this.Fields[(int)HelpFilterSymbolFields.Description].AsString();
46
+ set => this.Set((int)HelpFilterSymbolFields.Description, value);
47
}
48
49
public string QueryString
50
{
51
- get => this.Fields[(int)HelpFilterTupleFields.QueryString].AsString();
52
- set => this.Set((int)HelpFilterTupleFields.QueryString, value);
51
+ get => this.Fields[(int)HelpFilterSymbolFields.QueryString].AsString();
52
+ set => this.Set((int)HelpFilterSymbolFields.QueryString, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/HelpNamespaceTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpNamespace = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpNamespace.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpNamespace = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpNamespace.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.NamespaceName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.CollectionFileRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.Description), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.NamespaceName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.CollectionFileRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.Description), IntermediateFieldType.String),
17
},
18
- typeof(HelpNamespaceTuple));
18
+ typeof(HelpNamespaceSymbol));
19
}
20
}
21
22
-namespace WixToolset.VisualStudio.Tuples
22
+namespace WixToolset.VisualStudio.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum HelpNamespaceTupleFields
26
+ public enum HelpNamespaceSymbolFields
27
{
28
NamespaceName,
29
CollectionFileRef,
30
Description,
31
}
32
33
- public class HelpNamespaceTuple : IntermediateTuple
33
+ public class HelpNamespaceSymbol : IntermediateSymbol
34
{
35
- public HelpNamespaceTuple() : base(VSTupleDefinitions.HelpNamespace, null, null)
35
+ public HelpNamespaceSymbol() : base(VSSymbolDefinitions.HelpNamespace, null, null)
36
{
37
}
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
{
41
}
42
43
- public IntermediateField this[HelpNamespaceTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[HelpNamespaceSymbolFields index] => this.Fields[(int)index];
44
45
public string NamespaceName
46
{
47
- get => this.Fields[(int)HelpNamespaceTupleFields.NamespaceName].AsString();
48
- set => this.Set((int)HelpNamespaceTupleFields.NamespaceName, value);
47
+ get => this.Fields[(int)HelpNamespaceSymbolFields.NamespaceName].AsString();
48
+ set => this.Set((int)HelpNamespaceSymbolFields.NamespaceName, value);
49
}
50
51
public string CollectionFileRef
52
{
53
- get => this.Fields[(int)HelpNamespaceTupleFields.CollectionFileRef].AsString();
54
- set => this.Set((int)HelpNamespaceTupleFields.CollectionFileRef, value);
53
+ get => this.Fields[(int)HelpNamespaceSymbolFields.CollectionFileRef].AsString();
54
+ set => this.Set((int)HelpNamespaceSymbolFields.CollectionFileRef, value);
55
}
56
57
public string Description
58
{
59
- get => this.Fields[(int)HelpNamespaceTupleFields.Description].AsString();
60
- set => this.Set((int)HelpNamespaceTupleFields.Description, value);
59
+ get => this.Fields[(int)HelpNamespaceSymbolFields.Description].AsString();
60
+ set => this.Set((int)HelpNamespaceSymbolFields.Description, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/HelpPluginTuple.cs
+26
-26
@@ -3,29 +3,29 @@
3
namespace WixToolset.VisualStudio
4
{
5
using WixToolset.Data;
6
- using WixToolset.VisualStudio.Tuples;
6
+ using WixToolset.VisualStudio.Symbols;
7
8
- public static partial class VSTupleDefinitions
8
+ public static partial class VSSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition HelpPlugin = new IntermediateTupleDefinition(
11
- VSTupleDefinitionType.HelpPlugin.ToString(),
10
+ public static readonly IntermediateSymbolDefinition HelpPlugin = new IntermediateSymbolDefinition(
11
+ VSSymbolDefinitionType.HelpPlugin.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHelpNamespaceRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxTFileRef), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxAFileRef), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHxTFileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHelpNamespaceRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxTFileRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxAFileRef), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHxTFileRef), IntermediateFieldType.String),
19
},
20
- typeof(HelpPluginTuple));
20
+ typeof(HelpPluginSymbol));
21
}
22
}
23
24
-namespace WixToolset.VisualStudio.Tuples
24
+namespace WixToolset.VisualStudio.Symbols
25
{
26
using WixToolset.Data;
27
28
- public enum HelpPluginTupleFields
28
+ public enum HelpPluginSymbolFields
29
{
30
HelpNamespaceRef,
31
ParentHelpNamespaceRef,
@@ -34,46 +34,46 @@ namespace WixToolset.VisualStudio.Tuples
34
ParentHxTFileRef,
35
}
36
37
- public class HelpPluginTuple : IntermediateTuple
37
+ public class HelpPluginSymbol : IntermediateSymbol
38
{
39
- public HelpPluginTuple() : base(VSTupleDefinitions.HelpPlugin, null, null)
39
+ public HelpPluginSymbol() : base(VSSymbolDefinitions.HelpPlugin, null, null)
40
{
41
}
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
{
45
}
46
47
- public IntermediateField this[HelpPluginTupleFields index] => this.Fields[(int)index];
47
+ public IntermediateField this[HelpPluginSymbolFields index] => this.Fields[(int)index];
48
49
public string HelpNamespaceRef
50
{
51
- get => this.Fields[(int)HelpPluginTupleFields.HelpNamespaceRef].AsString();
52
- set => this.Set((int)HelpPluginTupleFields.HelpNamespaceRef, value);
51
+ get => this.Fields[(int)HelpPluginSymbolFields.HelpNamespaceRef].AsString();
52
+ set => this.Set((int)HelpPluginSymbolFields.HelpNamespaceRef, value);
53
}
54
55
public string ParentHelpNamespaceRef
56
{
57
- get => this.Fields[(int)HelpPluginTupleFields.ParentHelpNamespaceRef].AsString();
58
- set => this.Set((int)HelpPluginTupleFields.ParentHelpNamespaceRef, value);
57
+ get => this.Fields[(int)HelpPluginSymbolFields.ParentHelpNamespaceRef].AsString();
58
+ set => this.Set((int)HelpPluginSymbolFields.ParentHelpNamespaceRef, value);
59
}
60
61
public string HxTFileRef
62
{
63
- get => this.Fields[(int)HelpPluginTupleFields.HxTFileRef].AsString();
64
- set => this.Set((int)HelpPluginTupleFields.HxTFileRef, value);
63
+ get => this.Fields[(int)HelpPluginSymbolFields.HxTFileRef].AsString();
64
+ set => this.Set((int)HelpPluginSymbolFields.HxTFileRef, value);
65
}
66
67
public string HxAFileRef
68
{
69
- get => this.Fields[(int)HelpPluginTupleFields.HxAFileRef].AsString();
70
- set => this.Set((int)HelpPluginTupleFields.HxAFileRef, value);
69
+ get => this.Fields[(int)HelpPluginSymbolFields.HxAFileRef].AsString();
70
+ set => this.Set((int)HelpPluginSymbolFields.HxAFileRef, value);
71
}
72
73
public string ParentHxTFileRef
74
{
75
- get => this.Fields[(int)HelpPluginTupleFields.ParentHxTFileRef].AsString();
76
- set => this.Set((int)HelpPluginTupleFields.ParentHxTFileRef, value);
75
+ get => this.Fields[(int)HelpPluginSymbolFields.ParentHxTFileRef].AsString();
76
+ set => this.Set((int)HelpPluginSymbolFields.ParentHxTFileRef, value);
77
}
78
}
79
}
\ No newline at end of file
src/wixext/Tuples/VSTupleDefinitions.cs
+17
-17
@@ -5,7 +5,7 @@ namespace WixToolset.VisualStudio
5
using System;
6
using WixToolset.Data;
7
8
- public enum VSTupleDefinitionType
8
+ public enum VSSymbolDefinitionType
9
{
10
HelpFile,
11
HelpFileToNamespace,
@@ -15,13 +15,13 @@ namespace WixToolset.VisualStudio
15
HelpPlugin,
16
}
17
18
- public static partial class VSTupleDefinitions
18
+ public static partial class VSSymbolDefinitions
19
{
20
public static readonly Version Version = new Version("4.0.0");
21
22
- public static IntermediateTupleDefinition ByName(string name)
22
+ public static IntermediateSymbolDefinition ByName(string name)
23
{
24
- if (!Enum.TryParse(name, out VSTupleDefinitionType type))
24
+ if (!Enum.TryParse(name, out VSSymbolDefinitionType type))
25
{
26
return null;
27
}
@@ -29,27 +29,27 @@ namespace WixToolset.VisualStudio
29
return ByType(type);
30
}
31
32
- public static IntermediateTupleDefinition ByType(VSTupleDefinitionType type)
32
+ public static IntermediateSymbolDefinition ByType(VSSymbolDefinitionType type)
33
{
34
switch (type)
35
{
36
- case VSTupleDefinitionType.HelpFile:
37
- return VSTupleDefinitions.HelpFile;
36
+ case VSSymbolDefinitionType.HelpFile:
37
+ return VSSymbolDefinitions.HelpFile;
38
39
- case VSTupleDefinitionType.HelpFileToNamespace:
40
- return VSTupleDefinitions.HelpFileToNamespace;
39
+ case VSSymbolDefinitionType.HelpFileToNamespace:
40
+ return VSSymbolDefinitions.HelpFileToNamespace;
41
42
- case VSTupleDefinitionType.HelpFilter:
43
- return VSTupleDefinitions.HelpFilter;
42
+ case VSSymbolDefinitionType.HelpFilter:
43
+ return VSSymbolDefinitions.HelpFilter;
44
45
- case VSTupleDefinitionType.HelpFilterToNamespace:
46
- return VSTupleDefinitions.HelpFilterToNamespace;
45
+ case VSSymbolDefinitionType.HelpFilterToNamespace:
46
+ return VSSymbolDefinitions.HelpFilterToNamespace;
47
48
- case VSTupleDefinitionType.HelpNamespace:
49
- return VSTupleDefinitions.HelpNamespace;
48
+ case VSSymbolDefinitionType.HelpNamespace:
49
+ return VSSymbolDefinitions.HelpNamespace;
50
51
- case VSTupleDefinitionType.HelpPlugin:
52
- return VSTupleDefinitions.HelpPlugin;
51
+ case VSSymbolDefinitionType.HelpPlugin:
52
+ return VSSymbolDefinitions.HelpPlugin;
53
54
default:
55
throw new ArgumentOutOfRangeException(nameof(type));
src/wixext/VSCompiler.cs
+34
-34
@@ -7,10 +7,10 @@ namespace WixToolset.VisualStudio
7
using System.Globalization;
8
using System.Xml.Linq;
9
using WixToolset.Data;
10
- using WixToolset.Data.Tuples;
10
+ using WixToolset.Data.Symbols;
11
using WixToolset.Data.WindowsInstaller;
12
using WixToolset.Extensibility;
13
- using WixToolset.VisualStudio.Tuples;
13
+ using WixToolset.VisualStudio.Symbols;
14
15
/// <summary>
16
/// The compiler for the WiX Toolset Visual Studio Extension.
@@ -93,7 +93,7 @@ namespace WixToolset.VisualStudio
93
{
94
case "Id":
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;
98
default:
99
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -212,7 +212,7 @@ namespace WixToolset.VisualStudio
212
213
if (!this.Messaging.EncounteredError)
214
{
215
- section.AddTuple(new HelpNamespaceTuple(sourceLineNumbers, id)
215
+ section.AddSymbol(new HelpNamespaceSymbol(sourceLineNumbers, id)
216
{
217
NamespaceName = name,
218
CollectionFileRef = fileId,
@@ -249,11 +249,11 @@ namespace WixToolset.VisualStudio
249
break;
250
case "AttributeIndex":
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;
254
case "Index":
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;
258
case "Language":
259
language = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
@@ -263,11 +263,11 @@ namespace WixToolset.VisualStudio
263
break;
264
case "SampleLocation":
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;
268
case "Search":
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;
272
case "SuppressCustomActions":
273
suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -303,7 +303,7 @@ namespace WixToolset.VisualStudio
303
304
if (!this.Messaging.EncounteredError)
305
{
306
- section.AddTuple(new HelpFileTuple(sourceLineNumbers, id)
306
+ section.AddSymbol(new HelpFileSymbol(sourceLineNumbers, id)
307
{
308
HelpFileName = name,
309
LangID = language,
@@ -334,7 +334,7 @@ namespace WixToolset.VisualStudio
334
{
335
case "Id":
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;
339
default:
340
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -356,7 +356,7 @@ namespace WixToolset.VisualStudio
356
357
if (!this.Messaging.EncounteredError)
358
{
359
- section.AddTuple(new HelpFileToNamespaceTuple(sourceLineNumbers, id)
359
+ section.AddSymbol(new HelpFileToNamespaceSymbol(sourceLineNumbers, id)
360
{
361
HelpFileRef = id.Id,
362
HelpNamespaceRef = collectionId.Id,
@@ -415,7 +415,7 @@ namespace WixToolset.VisualStudio
415
416
if (!this.Messaging.EncounteredError)
417
{
418
- section.AddTuple(new HelpFilterTuple(sourceLineNumbers, id)
418
+ section.AddSymbol(new HelpFilterSymbol(sourceLineNumbers, id)
419
{
420
Description = name,
421
QueryString = filterDefinition,
@@ -441,7 +441,7 @@ namespace WixToolset.VisualStudio
441
{
442
case "Id":
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;
446
default:
447
this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -463,7 +463,7 @@ namespace WixToolset.VisualStudio
463
464
if (!this.Messaging.EncounteredError)
465
{
466
- section.AddTuple(new HelpFilterToNamespaceTuple(sourceLineNumbers, id)
466
+ section.AddSymbol(new HelpFilterToNamespaceSymbol(sourceLineNumbers, id)
467
{
468
HelpFilterRef = id.Id,
469
HelpNamespaceRef = collectionId.Id,
@@ -533,7 +533,7 @@ namespace WixToolset.VisualStudio
533
534
if (!this.Messaging.EncounteredError)
535
{
536
- section.AddTuple(new HelpPluginTuple(sourceLineNumbers, parentId)
536
+ section.AddSymbol(new HelpPluginSymbol(sourceLineNumbers, parentId)
537
{
538
HelpNamespaceRef = parentId.Id,
539
ParentHelpNamespaceRef = namespaceParent,
@@ -550,7 +550,7 @@ namespace WixToolset.VisualStudio
550
this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
551
ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false);
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
}
555
}
556
else if (pluginVS08)
@@ -561,13 +561,13 @@ namespace WixToolset.VisualStudio
561
this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
562
ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false);
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
}
566
}
567
else
568
{
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
}
572
}
573
}
@@ -679,10 +679,10 @@ namespace WixToolset.VisualStudio
679
if (!this.Messaging.EncounteredError)
680
{
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
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
687
var cmdlinePrefix = "/q ";
688
@@ -699,12 +699,12 @@ namespace WixToolset.VisualStudio
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.
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
{
704
ExecutionType = CustomActionExecutionType.Deferred,
705
Impersonate = true,
706
};
707
- var installPerMachineCA = new CustomActionTuple(sourceLineNumbers, installNamePerMachine)
707
+ var installPerMachineCA = new CustomActionSymbol(sourceLineNumbers, installNamePerMachine)
708
{
709
ExecutionType = CustomActionExecutionType.Deferred,
710
Impersonate = false,
@@ -724,13 +724,13 @@ namespace WixToolset.VisualStudio
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.
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
{
729
ExecutionType = CustomActionExecutionType.Rollback,
730
IgnoreResult = true,
731
Impersonate = true,
732
};
733
- var rollbackPerMachineCA = new CustomActionTuple(sourceLineNumbers, rollbackNamePerMachine)
733
+ var rollbackPerMachineCA = new CustomActionSymbol(sourceLineNumbers, rollbackNamePerMachine)
734
{
735
ExecutionType = CustomActionExecutionType.Rollback,
736
IgnoreResult = true,
@@ -755,13 +755,13 @@ namespace WixToolset.VisualStudio
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.
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
{
760
ExecutionType = CustomActionExecutionType.Deferred,
761
IgnoreResult = true,
762
Impersonate = true,
763
};
764
- var uninstallPerMachineCA = new CustomActionTuple(sourceLineNumbers, uninstallNamePerMachine)
764
+ var uninstallPerMachineCA = new CustomActionSymbol(sourceLineNumbers, uninstallNamePerMachine)
765
{
766
ExecutionType = CustomActionExecutionType.Deferred,
767
IgnoreResult = true,
@@ -774,7 +774,7 @@ namespace WixToolset.VisualStudio
774
}
775
}
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
{
779
const SequenceTable sequence = SequenceTable.InstallExecuteSequence;
780
@@ -782,9 +782,9 @@ namespace WixToolset.VisualStudio
782
caTemplate.Source = source;
783
caTemplate.TargetType = CustomActionTargetType.Exe;
784
caTemplate.Target = cmdline;
785
- section.AddTuple(caTemplate);
785
+ section.AddSymbol(caTemplate);
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
{
789
SequenceTable = SequenceTable.InstallExecuteSequence,
790
Action = name.Id,
@@ -799,11 +799,11 @@ namespace WixToolset.VisualStudio
799
{
800
if (WindowsInstallerStandard.IsStandardAction(beforeAction))
801
{
802
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), beforeAction);
802
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction);
803
}
804
else
805
{
806
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, beforeAction);
806
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, beforeAction);
807
}
808
}
809
@@ -811,18 +811,18 @@ namespace WixToolset.VisualStudio
811
{
812
if (WindowsInstallerStandard.IsStandardAction(afterAction))
813
{
814
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), afterAction);
814
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), afterAction);
815
}
816
else
817
{
818
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, afterAction);
818
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, afterAction);
819
}
820
}
821
}
822
823
private void AddReferenceToRegisterMicrosoftHelp(IntermediateSection section, SourceLineNumber sourceLineNumbers)
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
}
827
}
828
}
src/wixext/VSExtensionData.cs
+5
-5
@@ -13,15 +13,15 @@ namespace WixToolset.VisualStudio
13
/// <value>The default culture.</value>
14
public override string DefaultCulture => "en-US";
15
16
- public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
16
+ public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
17
{
18
- tupleDefinition = VSTupleDefinitions.ByName(name);
19
- return tupleDefinition != null;
18
+ symbolDefinition = VSSymbolDefinitions.ByName(name);
19
+ return symbolDefinition != null;
20
}
21
22
- public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
22
+ public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
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
}
26
}
27
}
src/wixext/VSTableDefinitions.cs
+12
-12
@@ -8,7 +8,7 @@ namespace WixToolset.VisualStudio
8
{
9
public static readonly TableDefinition HelpFile = new TableDefinition(
10
"HelpFile",
11
- VSTupleDefinitions.HelpFile,
11
+ VSSymbolDefinitions.HelpFile,
12
new[]
13
{
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),
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
},
23
- tupleIdIsPrimaryKey: true
23
+ symbolIdIsPrimaryKey: true
24
);
25
26
public static readonly TableDefinition HelpFileToNamespace = new TableDefinition(
27
"HelpFileToNamespace",
28
- VSTupleDefinitions.HelpFileToNamespace,
28
+ VSSymbolDefinitions.HelpFileToNamespace,
29
new[]
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),
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
},
34
- tupleIdIsPrimaryKey: false
34
+ symbolIdIsPrimaryKey: false
35
);
36
37
public static readonly TableDefinition HelpFilter = new TableDefinition(
38
"HelpFilter",
39
- VSTupleDefinitions.HelpFilter,
39
+ VSSymbolDefinitions.HelpFilter,
40
new[]
41
{
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)."),
44
new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."),
45
},
46
- tupleIdIsPrimaryKey: true
46
+ symbolIdIsPrimaryKey: true
47
);
48
49
public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition(
50
"HelpFilterToNamespace",
51
- VSTupleDefinitions.HelpFilterToNamespace,
51
+ VSSymbolDefinitions.HelpFilterToNamespace,
52
new[]
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),
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
},
57
- tupleIdIsPrimaryKey: false
57
+ symbolIdIsPrimaryKey: false
58
);
59
60
public static readonly TableDefinition HelpNamespace = new TableDefinition(
61
"HelpNamespace",
62
- VSTupleDefinitions.HelpNamespace,
62
+ VSSymbolDefinitions.HelpNamespace,
63
new[]
64
{
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),
68
new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."),
69
},
70
- tupleIdIsPrimaryKey: true
70
+ symbolIdIsPrimaryKey: true
71
);
72
73
public static readonly TableDefinition HelpPlugin = new TableDefinition(
74
"HelpPlugin",
75
- VSTupleDefinitions.HelpPlugin,
75
+ VSSymbolDefinitions.HelpPlugin,
76
new[]
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)."),
@@ -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),
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
},
84
- tupleIdIsPrimaryKey: false
84
+ symbolIdIsPrimaryKey: false
85
);
86
87
public static readonly TableDefinition[] All = new[]