The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 25, 2020 at 12:56 UTC
a63b926f147dd4dc551d7dcc8dcea9c8acb8d357
15 files changed
+97
-97
src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
+6
-6
@@ -27,9 +27,9 @@ namespace WixToolset.Extensibility
27
protected IBurnBackendHelper BackendHelper { get; private set; }
28
29
/// <summary>
30
- /// Optional tuple definitions.
30
+ /// Optional symbol definitions.
31
/// </summary>
32
- protected virtual IEnumerable<IntermediateTupleDefinition> TupleDefinitions => Enumerable.Empty<IntermediateTupleDefinition>();
32
+ protected virtual IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => Enumerable.Empty<IntermediateSymbolDefinition>();
33
34
public virtual void BundleFinalize()
35
{
@@ -56,12 +56,12 @@ namespace WixToolset.Extensibility
56
return null;
57
}
58
59
- public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple)
59
+ public virtual bool TryAddSymbolToDataManifest(IntermediateSection section, IntermediateSymbol symbol)
60
{
61
- if (this.TupleDefinitions.Any(t => t == tuple.Definition) &&
62
- tuple.Definition.HasTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
61
+ if (this.SymbolDefinitions.Any(t => t == symbol.Definition) &&
62
+ symbol.Definition.HasTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag))
63
{
64
- this.BackendHelper.AddBootstrapperApplicationData(tuple);
64
+ this.BackendHelper.AddBootstrapperApplicationData(symbol);
65
return true;
66
}
67
src/WixToolset.Extensibility/BaseExtensionData.cs
+3
-3
@@ -11,14 +11,14 @@ namespace WixToolset.Extensibility
11
{
12
public virtual string DefaultCulture => null;
13
14
- public virtual Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
14
+ public virtual Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
15
{
16
return null;
17
}
18
19
- public virtual bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
19
+ public virtual bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20
{
21
- tupleDefinition = null;
21
+ symbolDefinition = null;
22
return false;
23
}
24
}
src/WixToolset.Extensibility/BaseLibrarianExtension.cs
+3
-3
@@ -21,7 +21,7 @@ namespace WixToolset.Extensibility
21
/// Messaging for use by the extension.
22
/// </summary>
23
protected IMessaging Messaging { get; private set; }
24
-
24
+
25
/// <summary>
26
/// Called at the beginning of combining.
27
/// </summary>
@@ -37,10 +37,10 @@ namespace WixToolset.Extensibility
37
/// Resolves a path to a file path on disk.
38
/// </summary>
39
/// <param name="sourceLineNumber">Source line number for the path to resolve.</param>
40
- /// <param name="tupleDefinition">Tuple related to the path to resolve.</param>
40
+ /// <param name="symbolDefinition">Symbol related to the path to resolve.</param>
41
/// <param name="path">Path to resolve.</param>
42
/// <returns>Optional resolved file result.</returns>
43
- public virtual IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path)
43
+ public virtual IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateSymbolDefinition symbolDefinition, string path)
44
{
45
return null;
46
}
src/WixToolset.Extensibility/BaseResolverExtension.cs
+1
-1
@@ -36,7 +36,7 @@ namespace WixToolset.Extensibility
36
this.Messaging = context.ServiceProvider.GetService<IMessaging>();
37
}
38
39
- public virtual IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
39
+ public virtual IResolveFileResult ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
40
{
41
return null;
42
}
src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
+5
-5
@@ -5,7 +5,7 @@ namespace WixToolset.Extensibility
5
using System.Collections.Generic;
6
using System.Linq;
7
using WixToolset.Data;
8
- using WixToolset.Data.Tuples;
8
+ using WixToolset.Data.Symbols;
9
using WixToolset.Data.WindowsInstaller;
10
using WixToolset.Extensibility.Data;
11
using WixToolset.Extensibility.Services;
@@ -51,13 +51,13 @@ namespace WixToolset.Extensibility
51
52
public virtual IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files) => null;
53
54
- public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
54
+ public virtual string ResolveMedia(MediaSymbol mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
55
56
- public virtual bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
56
+ public virtual bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
57
{
58
- if (this.TableDefinitions.Any(t => t.TupleDefinition == tuple.Definition))
58
+ if (this.TableDefinitions.Any(t => t.SymbolDefinition == symbol.Definition))
59
{
60
- return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions);
60
+ return this.BackendHelper.TryAddSymbolToOutputMatchingTableDefinitions(section, symbol, output, tableDefinitions);
61
}
62
63
return false;
src/WixToolset.Extensibility/Data/IDelayedField.cs
+3
-3
@@ -1,4 +1,4 @@
1
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
1
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
namespace WixToolset.Extensibility.Data
4
{
@@ -8,6 +8,6 @@ namespace WixToolset.Extensibility.Data
8
{
9
IntermediateField Field { get; }
10
11
- IntermediateTuple Row { get; }
11
+ IntermediateSymbol Symbol { get; }
12
}
13
-}
\ No newline at end of file
13
+}
src/WixToolset.Extensibility/Data/ILinkContext.cs
+1
-1
@@ -19,7 +19,7 @@ namespace WixToolset.Extensibility.Data
19
20
IEnumerable<Intermediate> Intermediates { get; set; }
21
22
- ITupleDefinitionCreator TupleDefinitionCreator { get; set; }
22
+ ISymbolDefinitionCreator SymbolDefinitionCreator { get; set; }
23
24
CancellationToken CancellationToken { get; set; }
25
}
src/WixToolset.Extensibility/IBurnBackendExtension.cs
+5
-5
@@ -17,16 +17,16 @@ namespace WixToolset.Extensibility
17
string ResolveUrl(string url, string fallbackUrl, string packageId, string payloadId, string fileName);
18
19
/// <summary>
20
- /// Called for each extension tuple that hasn't been handled yet.
20
+ /// Called for each extension symbol that hasn't been handled yet.
21
/// Use IBurnBackendHelper to add data to the appropriate data manifest.
22
/// </summary>
23
/// <param name="section">The linked section.</param>
24
- /// <param name="tuple">The current tuple.</param>
24
+ /// <param name="symbol">The current symbol.</param>
25
/// <returns>
26
- /// True if the extension handled the tuple, false otherwise.
27
- /// The Burn backend will warn on all unhandled tuples.
26
+ /// True if the extension handled the symbol, false otherwise.
27
+ /// The Burn backend will warn on all unhandled symbols.
28
/// </returns>
29
- bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple);
29
+ bool TryAddSymbolToDataManifest(IntermediateSection section, IntermediateSymbol symbol);
30
31
/// <summary>
32
/// Called after all output changes occur and right before the output is bound into its final format.
src/WixToolset.Extensibility/IExtensionData.cs
+5
-5
@@ -16,18 +16,18 @@ namespace WixToolset.Extensibility
16
string DefaultCulture { get; }
17
18
/// <summary>
19
- ///
19
+ ///
20
/// </summary>
21
/// <param name="name"></param>
22
- /// <param name="tupleDefinition"></param>
22
+ /// <param name="symbolDefinition"></param>
23
/// <returns>True </returns>
24
- bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition);
24
+ bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition);
25
26
/// <summary>
27
/// Gets the library associated with this extension.
28
/// </summary>
29
- /// <param name="tupleDefinitions">The tuple definitions to use while loading the library.</param>
29
+ /// <param name="symbolDefinitions">The symbol definitions to use while loading the library.</param>
30
/// <returns>The library for this extension or null if there is no library.</returns>
31
- Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions);
31
+ Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions);
32
}
33
}
src/WixToolset.Extensibility/ILibrarianExtension.cs
+1
-1
@@ -9,7 +9,7 @@ namespace WixToolset.Extensibility
9
{
10
void PreCombine(ILibraryContext context);
11
12
- IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path);
12
+ IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateSymbolDefinition symbolDefinition, string path);
13
14
void PostCombine(Intermediate library);
15
}
src/WixToolset.Extensibility/IResolverExtension.cs
+1
-1
@@ -18,7 +18,7 @@ namespace WixToolset.Extensibility
18
/// <summary>
19
/// Called to attempt to resolve source to a file.
20
/// </summary>
21
- IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
21
+ IResolveFileResult ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
22
23
/// <summary>
24
/// Called after all resolving occurs.
src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
+3
-3
@@ -4,7 +4,7 @@ namespace WixToolset.Extensibility
4
{
5
using System.Collections.Generic;
6
using WixToolset.Data;
7
- using WixToolset.Data.Tuples;
7
+ using WixToolset.Data.Symbols;
8
using WixToolset.Data.WindowsInstaller;
9
using WixToolset.Extensibility.Data;
10
@@ -22,9 +22,9 @@ namespace WixToolset.Extensibility
22
23
IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files);
24
25
- string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory);
25
+ string ResolveMedia(MediaSymbol mediaRow, string mediaLayoutDirectory, string layoutDirectory);
26
27
- bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
27
+ bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
28
29
/// <summary>
30
/// Called after all output changes occur and right before the output is bound into its final format.
src/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
+16
-16
@@ -16,16 +16,16 @@ namespace WixToolset.Extensibility.Services
16
void AddBootstrapperApplicationData(string xml);
17
18
/// <summary>
19
- /// Adds an XML element for the given tuple to the BootstrapperApplicationData manifest.
20
- /// The tuple's name is used for the element's name.
21
- /// All of the tuple's fields are used for the element's attributes.
19
+ /// Adds an XML element for the given symbol to the BootstrapperApplicationData manifest.
20
+ /// The symbol's name is used for the element's name.
21
+ /// All of the symbol's fields are used for the element's attributes.
22
/// </summary>
23
- /// <param name="tuple">The tuple to create the element from.</param>
24
- /// <param name="tupleIdIsIdAttribute">
25
- /// If true and the tuple has an Id,
26
- /// then an Id attribute is created with a value of the tuple's Id.
23
+ /// <param name="symbol">The symbol to create the element from.</param>
24
+ /// <param name="symbolIdIsIdAttribute">
25
+ /// If true and the symbol has an Id,
26
+ /// then an Id attribute is created with a value of the symbol's Id.
27
/// </param>
28
- void AddBootstrapperApplicationData(IntermediateTuple tuple, bool tupleIdIsIdAttribute = false);
28
+ void AddBootstrapperApplicationData(IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false);
29
30
/// <summary>
31
/// Adds the given XML to the BundleExtensionData manifest for the given bundle extension.
@@ -35,16 +35,16 @@ namespace WixToolset.Extensibility.Services
35
void AddBundleExtensionData(string extensionId, string xml);
36
37
/// <summary>
38
- /// Adds an XML element for the given tuple to the BundleExtensionData manifest for the given bundle extension.
39
- /// The tuple's name is used for the element's name.
40
- /// All of the tuple's fields are used for the element's attributes.
38
+ /// Adds an XML element for the given symbol to the BundleExtensionData manifest for the given bundle extension.
39
+ /// The symbol's name is used for the element's name.
40
+ /// All of the symbol's fields are used for the element's attributes.
41
/// </summary>
42
/// <param name="extensionId">The bundle extension's id.</param>
43
- /// <param name="tuple">The tuple to create the element from.</param>
44
- /// <param name="tupleIdIsIdAttribute">
45
- /// If true and the tuple has an Id,
46
- /// then an Id attribute is created with a value of the tuple's Id.
43
+ /// <param name="symbol">The symbol to create the element from.</param>
44
+ /// <param name="symbolIdIsIdAttribute">
45
+ /// If true and the symbol has an Id,
46
+ /// then an Id attribute is created with a value of the symbol's Id.
47
/// </param>
48
- void AddBundleExtensionData(string extensionId, IntermediateTuple tuple, bool tupleIdIsIdAttribute = false);
48
+ void AddBundleExtensionData(string extensionId, IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false);
49
}
50
}
src/WixToolset.Extensibility/Services/IParseHelper.cs
+42
-42
@@ -6,7 +6,7 @@ namespace WixToolset.Extensibility.Services
6
using System.Collections.Generic;
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
- using WixToolset.Data.Tuples;
9
+ using WixToolset.Data.Symbols;
10
using WixToolset.Data.WindowsInstaller;
11
using WixToolset.Extensibility.Data;
12
@@ -39,38 +39,38 @@ namespace WixToolset.Extensibility.Services
39
Identifier CreateIdentifierFromFilename(string filename);
40
41
/// <summary>
42
- /// Creates a tuple in the section.
42
+ /// Creates a symbol in the section.
43
/// </summary>
44
- /// <param name="section">Section to add the new tuple to.</param>
45
- /// <param name="sourceLineNumbers">Source and line number of current tuple.</param>
46
- /// <param name="tupleName">Name of tuple definition.</param>
47
- /// <param name="identifier">Optional identifier for the tuple.</param>
48
- /// <returns>New tuple.</returns>
49
- IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, Identifier identifier = null);
44
+ /// <param name="section">Section to add the new symbol to.</param>
45
+ /// <param name="sourceLineNumbers">Source and line number of current symbol.</param>
46
+ /// <param name="symbolName">Name of symbol definition.</param>
47
+ /// <param name="identifier">Optional identifier for the symbol.</param>
48
+ /// <returns>New symbol.</returns>
49
+ IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, Identifier identifier = null);
50
51
/// <summary>
52
- /// Creates a tuple in the section.
52
+ /// Creates a symbol in the section.
53
/// </summary>
54
- /// <param name="section">Section to add the new tuple to.</param>
55
- /// <param name="sourceLineNumbers">Source and line number of current tuple.</param>
56
- /// <param name="tupleDefinition">Tuple definition to create from.</param>
57
- /// <param name="identifier">Optional identifier for the tuple.</param>
58
- /// <returns>New tuple.</returns>
59
- IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, Identifier identifier = null);
54
+ /// <param name="section">Section to add the new symbol to.</param>
55
+ /// <param name="sourceLineNumbers">Source and line number of current symbol.</param>
56
+ /// <param name="symbolDefinition">Symbol definition to create from.</param>
57
+ /// <param name="identifier">Optional identifier for the symbol.</param>
58
+ /// <returns>New symbol.</returns>
59
+ IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, Identifier identifier = null);
60
61
[Obsolete]
62
- IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
62
+ IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
63
64
[Obsolete]
65
- IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null);
65
+ IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null);
66
67
[Obsolete]
68
- IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null);
68
+ IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null);
69
70
/// <summary>
71
/// Creates a directory row from a name.
72
/// </summary>
73
- /// <param name="section">Section to add the new tuple to.</param>
73
+ /// <param name="section">Section to add the new symbol to.</param>
74
/// <param name="sourceLineNumbers">Source line information.</param>
75
/// <param name="id">Optional identifier for the new row.</param>
76
/// <param name="parentId">Optional identifier for the parent row.</param>
@@ -80,7 +80,7 @@ namespace WixToolset.Extensibility.Services
80
/// <param name="sourceName">Optional source name for the directory.</param>
81
/// <param name="shortSourceName">Optional short source name for the directory.</param>
82
/// <returns>Identifier for the newly created row.</returns>
83
- Identifier CreateDirectoryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
83
+ Identifier CreateDirectorySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
84
85
[Obsolete]
86
Identifier CreateDirectoryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
@@ -88,7 +88,7 @@ namespace WixToolset.Extensibility.Services
88
/// <summary>
89
/// Creates directories using the inline directory syntax.
90
/// </summary>
91
- /// <param name="section">Section to add the new tuple to.</param>
91
+ /// <param name="section">Section to add the new symbol to.</param>
92
/// <param name="sourceLineNumbers">Source line information.</param>
93
/// <param name="parentId">Optional identifier of parent directory.</param>
94
/// <param name="attribute">The attribute to parse.</param>
@@ -97,16 +97,16 @@ namespace WixToolset.Extensibility.Services
97
string CreateDirectoryReferenceFromInlineSyntax(IntermediateSection section, SourceLineNumber sourceLineNumbers, string parentId, XAttribute attribute, ISet<string> sectionInlinedDirectoryIds);
98
99
/// <summary>
100
- /// Creates a Registry tuple in the active section.
100
+ /// Creates a Registry symbol in the active section.
101
/// </summary>
102
- /// <param name="sourceLineNumbers">Source and line number of the current tuple.</param>
102
+ /// <param name="sourceLineNumbers">Source and line number of the current symbol.</param>
103
/// <param name="root">The registry entry root.</param>
104
/// <param name="key">The registry entry key.</param>
105
/// <param name="name">The registry entry name.</param>
106
/// <param name="value">The registry entry value.</param>
107
/// <param name="componentId">The component which will control installation/uninstallation of the registry entry.</param>
108
/// <param name="escapeLeadingHash">If true, "escape" leading '#' characters so the value is written as a REG_SZ.</param>
109
- Identifier CreateRegistryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
109
+ Identifier CreateRegistrySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
110
111
[Obsolete]
112
Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
@@ -122,20 +122,20 @@ namespace WixToolset.Extensibility.Services
122
string CreateShortName(string longName, bool keepExtension, bool allowWildcards, params string[] args);
123
124
/// <summary>
125
- /// Create a WixSimpleReference tuple in the active section.
125
+ /// Create a WixSimpleReference symbol in the active section.
126
/// </summary>
127
/// <param name="sourceLineNumbers">Source line information for the row.</param>
128
- /// <param name="tupleName">The tuple name of the simple reference.</param>
128
+ /// <param name="symbolName">The symbol name of the simple reference.</param>
129
/// <param name="primaryKeys">The primary keys of the simple reference.</param>
130
- void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys);
130
+ void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys);
131
132
/// <summary>
133
- /// Create a WixSimpleReference tuple in the active section.
133
+ /// Create a WixSimpleReference symbol in the active section.
134
/// </summary>
135
/// <param name="sourceLineNumbers">Source line information for the row.</param>
136
- /// <param name="tupleDefinition">The tuple definition of the simple reference.</param>
136
+ /// <param name="symbolDefinition">The symbol definition of the simple reference.</param>
137
/// <param name="primaryKeys">The primary keys of the simple reference.</param>
138
- void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys);
138
+ void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys);
139
140
/// <summary>
141
/// Create a reference in the specified section for a custom action specialized for specific platforms,
@@ -149,7 +149,7 @@ namespace WixToolset.Extensibility.Services
149
void CreateCustomActionReference(SourceLineNumber sourceLineNumbers, IntermediateSection section, string customAction, Platform platform, CustomActionPlatforms supportedPlatforms);
150
151
/// <summary>
152
- /// Creates WixComplexReference and WixGroup tuples in the active section.
152
+ /// Creates WixComplexReference and WixGroup symbols in the active section.
153
/// </summary>
154
/// <param name="section">Section to create the reference in.</param>
155
/// <param name="sourceLineNumbers">Source line information.</param>
@@ -162,7 +162,7 @@ namespace WixToolset.Extensibility.Services
162
void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary);
163
164
/// <summary>
165
- /// A tuple in the WixGroup table is added for this child node and its parent node.
165
+ /// A symbol in the WixGroup table is added for this child node and its parent node.
166
/// </summary>
167
/// <param name="section">Section to create the reference in.</param>
168
/// <param name="sourceLineNumbers">Source line information for the row.</param>
@@ -170,13 +170,13 @@ namespace WixToolset.Extensibility.Services
170
/// <param name="parentId">Id of the parenet node.</param>
171
/// <param name="childType">Complex reference type of child</param>
172
/// <param name="childId">Id of the Child Node.</param>
173
- void CreateWixGroupTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
173
+ void CreateWixGroupSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
174
175
[Obsolete]
176
void CreateWixGroupRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
177
178
/// <summary>
179
- /// Creates a tuple in the WixSearch table.
179
+ /// Creates a symbol in the WixSearch table.
180
/// </summary>
181
/// <param name="section">Section to create the reference in.</param>
182
/// <param name="sourceLineNumbers">Source line number for the search element.</param>
@@ -186,17 +186,17 @@ namespace WixToolset.Extensibility.Services
186
/// <param name="condition">A condition to test before evaluating the search.</param>
187
/// <param name="after">The search that this one will execute after.</param>
188
/// <param name="bundleExtensionId">The id of the bundle extension that handles this search.</param>
189
- void CreateWixSearchTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId);
189
+ void CreateWixSearchSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId);
190
191
/// <summary>
192
- ///
192
+ ///
193
/// </summary>
194
/// <param name="section">Section to create the reference in.</param>
195
/// <param name="sourceLineNumbers">Source line number for the parent element.</param>
196
/// <param name="id">Identifier of the search (key into the WixSearch table)</param>
197
/// <param name="parentId">Identifier of the search that comes before (key into the WixSearch table)</param>
198
/// <param name="attributes">Further details about the relation between id and parentId.</param>
199
- void CreateWixSearchRelationTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes);
199
+ void CreateWixSearchRelationSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes);
200
201
/// <summary>
202
/// Checks if the string contains a property (i.e. "foo[Property]bar")
@@ -206,14 +206,14 @@ namespace WixToolset.Extensibility.Services
206
bool ContainsProperty(string possibleProperty);
207
208
/// <summary>
209
- /// Add the appropriate tuples to make sure that the given table shows up in the resulting output.
209
+ /// Add the appropriate symbols to make sure that the given table shows up in the resulting output.
210
/// </summary>
211
/// <param name="sourceLineNumbers">Source line numbers.</param>
212
/// <param name="tableName">Name of the table to ensure existance of.</param>
213
void EnsureTable(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName);
214
215
/// <summary>
216
- /// Add the appropriate tuples to make sure that the given table shows up in the resulting output.
216
+ /// Add the appropriate symbols to make sure that the given table shows up in the resulting output.
217
/// </summary>
218
/// <param name="sourceLineNumbers">Source line numbers.</param>
219
/// <param name="tableDefinition">Definition of the table to ensure existance of.</param>
@@ -411,9 +411,9 @@ namespace WixToolset.Extensibility.Services
411
void ParseForExtensionElements(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement element);
412
413
/// <summary>
414
- /// Schedules an action tuple.
414
+ /// Schedules an action symbol.
415
/// </summary>
416
- /// <param name="section">Section to add the tuple to.</param>
416
+ /// <param name="section">Section to add the symbol to.</param>
417
/// <param name="sourceLineNumbers">Source line information about the owner element.</param>
418
/// <param name="access">Access modifier for the scheduled action.</param>
419
/// <param name="sequence">Sequence to add the action to.</param>
@@ -422,7 +422,7 @@ namespace WixToolset.Extensibility.Services
422
/// <param name="beforeAction">Optional action to schedule before.</param>
423
/// <param name="afterAction">Option action to schedule after.</param>
424
/// <param name="overridable">Optional overridable flag.</param>
425
- WixActionTuple ScheduleActionTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string name, string condition, string beforeAction, string afterAction, bool overridable = false);
425
+ WixActionSymbol ScheduleActionSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string name, string condition, string beforeAction, string afterAction, bool overridable = false);
426
427
/// <summary>
428
/// Called when the compiler encounters an unexpected attribute.
src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
+2
-2
@@ -10,7 +10,7 @@ namespace WixToolset.Extensibility.Services
10
/// </summary>
11
public interface IWindowsInstallerBackendHelper
12
{
13
- Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition);
14
- bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
13
+ Row CreateRow(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinition tableDefinition);
14
+ bool TryAddSymbolToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
15
}
16
}