Use "Ref" instead of "_" as the reference convention
Rob Mensching committed
May 22, 2019 at 14:45 UTC
b36433623fcac28cf620868430d49bc36fca2963
88 files changed
+849
-849
src/WixToolset.Data/Tuples/AppSearchTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Property), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Signature_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
15
},
16
typeof(AppSearchTuple));
17
}
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
public enum AppSearchTupleFields
23
{
24
Property,
25
- Signature_,
25
+ SignatureRef,
26
}
27
28
public class AppSearchTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)AppSearchTupleFields.Property, value);
44
}
45
46
- public string Signature_
46
+ public string SignatureRef
47
{
48
- get => (string)this.Fields[(int)AppSearchTupleFields.Signature_];
49
- set => this.Set((int)AppSearchTupleFields.Signature_, value);
48
+ get => (string)this.Fields[(int)AppSearchTupleFields.SignatureRef];
49
+ set => this.Set((int)AppSearchTupleFields.SignatureRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/BBControlTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.BBControl,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(BBControlTupleFields.Billboard_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(BBControlTupleFields.BillboardRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(BBControlTupleFields.BBControl), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(BBControlTupleFields.Type), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(BBControlTupleFields.X), IntermediateFieldType.Number),
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
37
{
38
public enum BBControlTupleFields
39
{
40
- Billboard_,
40
+ BillboardRef,
41
BBControl,
42
Type,
43
X,
@@ -69,10 +69,10 @@ namespace WixToolset.Data.Tuples
69
70
public IntermediateField this[BBControlTupleFields index] => this.Fields[(int)index];
71
72
- public string Billboard_
72
+ public string BillboardRef
73
{
74
- get => (string)this.Fields[(int)BBControlTupleFields.Billboard_];
75
- set => this.Set((int)BBControlTupleFields.Billboard_, value);
74
+ get => (string)this.Fields[(int)BBControlTupleFields.BillboardRef];
75
+ set => this.Set((int)BBControlTupleFields.BillboardRef, value);
76
}
77
78
public string BBControl
src/WixToolset.Data/Tuples/BillboardTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Billboard,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(BillboardTupleFields.Feature_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(BillboardTupleFields.FeatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum BillboardTupleFields
24
{
25
- Feature_,
25
+ FeatureRef,
26
Action,
27
Ordering,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
41
42
- public string Feature_
42
+ public string FeatureRef
43
{
44
- get => (string)this.Fields[(int)BillboardTupleFields.Feature_];
45
- set => this.Set((int)BillboardTupleFields.Feature_, value);
44
+ get => (string)this.Fields[(int)BillboardTupleFields.FeatureRef];
45
+ set => this.Set((int)BillboardTupleFields.FeatureRef, value);
46
}
47
48
public string Action
src/WixToolset.Data/Tuples/ClassTuple.cs
+25
-25
@@ -12,16 +12,16 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(ClassTupleFields.CLSID), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ClassTupleFields.Context), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ClassTupleFields.Component_), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(ClassTupleFields.ProgId_Default), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ClassTupleFields.ComponentRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(ClassTupleFields.DefaultProgIdRef), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(ClassTupleFields.Description), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(ClassTupleFields.AppId_), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(ClassTupleFields.AppIdRef), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(ClassTupleFields.FileTypeMask), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(ClassTupleFields.Icon_), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(ClassTupleFields.IconRef), IntermediateFieldType.String),
21
new IntermediateFieldDefinition(nameof(ClassTupleFields.IconIndex), IntermediateFieldType.Number),
22
new IntermediateFieldDefinition(nameof(ClassTupleFields.DefInprocHandler), IntermediateFieldType.String),
23
new IntermediateFieldDefinition(nameof(ClassTupleFields.Argument), IntermediateFieldType.String),
24
- new IntermediateFieldDefinition(nameof(ClassTupleFields.Feature_), IntermediateFieldType.String),
24
+ new IntermediateFieldDefinition(nameof(ClassTupleFields.FeatureRef), IntermediateFieldType.String),
25
new IntermediateFieldDefinition(nameof(ClassTupleFields.RelativePath), IntermediateFieldType.Bool),
26
},
27
typeof(ClassTuple));
@@ -34,16 +34,16 @@ namespace WixToolset.Data.Tuples
34
{
35
CLSID,
36
Context,
37
- Component_,
38
- ProgId_Default,
37
+ ComponentRef,
38
+ DefaultProgIdRef,
39
Description,
40
- AppId_,
40
+ AppIdRef,
41
FileTypeMask,
42
- Icon_,
42
+ IconRef,
43
IconIndex,
44
DefInprocHandler,
45
Argument,
46
- Feature_,
46
+ FeatureRef,
47
RelativePath,
48
}
49
@@ -71,16 +71,16 @@ namespace WixToolset.Data.Tuples
71
set => this.Set((int)ClassTupleFields.Context, value);
72
}
73
74
- public string Component_
74
+ public string ComponentRef
75
{
76
- get => (string)this.Fields[(int)ClassTupleFields.Component_];
77
- set => this.Set((int)ClassTupleFields.Component_, value);
76
+ get => (string)this.Fields[(int)ClassTupleFields.ComponentRef];
77
+ set => this.Set((int)ClassTupleFields.ComponentRef, value);
78
}
79
80
- public string ProgId_Default
80
+ public string DefaultProgIdRef
81
{
82
- get => (string)this.Fields[(int)ClassTupleFields.ProgId_Default];
83
- set => this.Set((int)ClassTupleFields.ProgId_Default, value);
82
+ get => (string)this.Fields[(int)ClassTupleFields.DefaultProgIdRef];
83
+ set => this.Set((int)ClassTupleFields.DefaultProgIdRef, value);
84
}
85
86
public string Description
@@ -89,10 +89,10 @@ namespace WixToolset.Data.Tuples
89
set => this.Set((int)ClassTupleFields.Description, value);
90
}
91
92
- public string AppId_
92
+ public string AppIdRef
93
{
94
- get => (string)this.Fields[(int)ClassTupleFields.AppId_];
95
- set => this.Set((int)ClassTupleFields.AppId_, value);
94
+ get => (string)this.Fields[(int)ClassTupleFields.AppIdRef];
95
+ set => this.Set((int)ClassTupleFields.AppIdRef, value);
96
}
97
98
public string FileTypeMask
@@ -101,10 +101,10 @@ namespace WixToolset.Data.Tuples
101
set => this.Set((int)ClassTupleFields.FileTypeMask, value);
102
}
103
104
- public string Icon_
104
+ public string IconRef
105
{
106
- get => (string)this.Fields[(int)ClassTupleFields.Icon_];
107
- set => this.Set((int)ClassTupleFields.Icon_, value);
106
+ get => (string)this.Fields[(int)ClassTupleFields.IconRef];
107
+ set => this.Set((int)ClassTupleFields.IconRef, value);
108
}
109
110
public int IconIndex
@@ -125,10 +125,10 @@ namespace WixToolset.Data.Tuples
125
set => this.Set((int)ClassTupleFields.Argument, value);
126
}
127
128
- public string Feature_
128
+ public string FeatureRef
129
{
130
- get => (string)this.Fields[(int)ClassTupleFields.Feature_];
131
- set => this.Set((int)ClassTupleFields.Feature_, value);
130
+ get => (string)this.Fields[(int)ClassTupleFields.FeatureRef];
131
+ set => this.Set((int)ClassTupleFields.FeatureRef, value);
132
}
133
134
public bool RelativePath
src/WixToolset.Data/Tuples/ComplusTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Complus,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ComplusTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ComplusTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ComplusTupleFields.ExpType), IntermediateFieldType.Number),
15
},
16
typeof(ComplusTuple));
@@ -21,7 +21,7 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum ComplusTupleFields
23
{
24
- Component_,
24
+ ComponentRef,
25
ExpType,
26
}
27
@@ -37,10 +37,10 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[ComplusTupleFields index] => this.Fields[(int)index];
39
40
- public string Component_
40
+ public string ComponentRef
41
{
42
- get => (string)this.Fields[(int)ComplusTupleFields.Component_];
43
- set => this.Set((int)ComplusTupleFields.Component_, value);
42
+ get => (string)this.Fields[(int)ComplusTupleFields.ComponentRef];
43
+ set => this.Set((int)ComplusTupleFields.ComponentRef, value);
44
}
45
46
public int ExpType
src/WixToolset.Data/Tuples/ComponentTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(ComponentTupleFields.Directory_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ComponentTupleFields.DirectoryRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ComponentTupleFields.Location), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(ComponentTupleFields.DisableRegistryReflection), IntermediateFieldType.Bool),
17
new IntermediateFieldDefinition(nameof(ComponentTupleFields.NeverOverwrite), IntermediateFieldType.Bool),
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
34
public enum ComponentTupleFields
35
{
36
ComponentId,
37
- Directory_,
37
+ DirectoryRef,
38
Location,
39
DisableRegistryReflection,
40
NeverOverwrite,
@@ -74,10 +74,10 @@ namespace WixToolset.Data.Tuples
74
set => this.Set((int)ComponentTupleFields.ComponentId, value);
75
}
76
77
- public string Directory_
77
+ public string DirectoryRef
78
{
79
- get => (string)this.Fields[(int)ComponentTupleFields.Directory_];
80
- set => this.Set((int)ComponentTupleFields.Directory_, value);
79
+ get => (string)this.Fields[(int)ComponentTupleFields.DirectoryRef];
80
+ set => this.Set((int)ComponentTupleFields.DirectoryRef, value);
81
}
82
83
public ComponentLocation Location
src/WixToolset.Data/Tuples/ConditionTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Condition,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ConditionTupleFields.Feature_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ConditionTupleFields.FeatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ConditionTupleFields.Level), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(ConditionTupleFields.Condition), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum ConditionTupleFields
24
{
25
- Feature_,
25
+ FeatureRef,
26
Level,
27
Condition,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[ConditionTupleFields index] => this.Fields[(int)index];
41
42
- public string Feature_
42
+ public string FeatureRef
43
{
44
- get => (string)this.Fields[(int)ConditionTupleFields.Feature_];
45
- set => this.Set((int)ConditionTupleFields.Feature_, value);
44
+ get => (string)this.Fields[(int)ConditionTupleFields.FeatureRef];
45
+ set => this.Set((int)ConditionTupleFields.FeatureRef, value);
46
}
47
48
public int Level
src/WixToolset.Data/Tuples/ControlConditionTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.ControlCondition,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Dialog_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Control_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.DialogRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.ControlRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Action), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Condition), IntermediateFieldType.String),
17
},
@@ -23,8 +23,8 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ControlConditionTupleFields
25
{
26
- Dialog_,
27
- Control_,
26
+ DialogRef,
27
+ ControlRef,
28
Action,
29
Condition,
30
}
@@ -41,16 +41,16 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ControlConditionTupleFields index] => this.Fields[(int)index];
43
44
- public string Dialog_
44
+ public string DialogRef
45
{
46
- get => (string)this.Fields[(int)ControlConditionTupleFields.Dialog_];
47
- set => this.Set((int)ControlConditionTupleFields.Dialog_, value);
46
+ get => (string)this.Fields[(int)ControlConditionTupleFields.DialogRef];
47
+ set => this.Set((int)ControlConditionTupleFields.DialogRef, value);
48
}
49
50
- public string Control_
50
+ public string ControlRef
51
{
52
- get => (string)this.Fields[(int)ControlConditionTupleFields.Control_];
53
- set => this.Set((int)ControlConditionTupleFields.Control_, value);
52
+ get => (string)this.Fields[(int)ControlConditionTupleFields.ControlRef];
53
+ set => this.Set((int)ControlConditionTupleFields.ControlRef, value);
54
}
55
56
public string Action
src/WixToolset.Data/Tuples/ControlEventTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.ControlEvent,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Dialog_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Control_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ControlEventTupleFields.DialogRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ControlEventTupleFields.ControlRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Event), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Argument), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Condition), IntermediateFieldType.String),
@@ -25,8 +25,8 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum ControlEventTupleFields
27
{
28
- Dialog_,
29
- Control_,
28
+ DialogRef,
29
+ ControlRef,
30
Event,
31
Argument,
32
Condition,
@@ -45,16 +45,16 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[ControlEventTupleFields index] => this.Fields[(int)index];
47
48
- public string Dialog_
48
+ public string DialogRef
49
{
50
- get => (string)this.Fields[(int)ControlEventTupleFields.Dialog_];
51
- set => this.Set((int)ControlEventTupleFields.Dialog_, value);
50
+ get => (string)this.Fields[(int)ControlEventTupleFields.DialogRef];
51
+ set => this.Set((int)ControlEventTupleFields.DialogRef, value);
52
}
53
54
- public string Control_
54
+ public string ControlRef
55
{
56
- get => (string)this.Fields[(int)ControlEventTupleFields.Control_];
57
- set => this.Set((int)ControlEventTupleFields.Control_, value);
56
+ get => (string)this.Fields[(int)ControlEventTupleFields.ControlRef];
57
+ set => this.Set((int)ControlEventTupleFields.ControlRef, value);
58
}
59
60
public string Event
src/WixToolset.Data/Tuples/ControlTuple.cs
+10
-10
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Control,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ControlTupleFields.Dialog_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ControlTupleFields.DialogRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ControlTupleFields.Control), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ControlTupleFields.Type), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ControlTupleFields.X), IntermediateFieldType.Number),
@@ -28,7 +28,7 @@ namespace WixToolset.Data
28
new IntermediateFieldDefinition(nameof(ControlTupleFields.Visible), IntermediateFieldType.Bool),
29
new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
30
new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
31
- new IntermediateFieldDefinition(nameof(ControlTupleFields.Control_Next), IntermediateFieldType.String),
31
+ new IntermediateFieldDefinition(nameof(ControlTupleFields.NextControlRef), IntermediateFieldType.String),
32
new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
33
new IntermediateFieldDefinition(nameof(ControlTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
34
new IntermediateFieldDefinition(nameof(ControlTupleFields.SourceFile), IntermediateFieldType.Path),
@@ -41,7 +41,7 @@ namespace WixToolset.Data.Tuples
41
{
42
public enum ControlTupleFields
43
{
44
- Dialog_,
44
+ DialogRef,
45
Control,
46
Type,
47
X,
@@ -59,7 +59,7 @@ namespace WixToolset.Data.Tuples
59
Visible,
60
Property,
61
Text,
62
- Control_Next,
62
+ NextControlRef,
63
Help,
64
TrackDiskSpace,
65
SourceFile,
@@ -77,10 +77,10 @@ namespace WixToolset.Data.Tuples
77
78
public IntermediateField this[ControlTupleFields index] => this.Fields[(int)index];
79
80
- public string Dialog_
80
+ public string DialogRef
81
{
82
- get => (string)this.Fields[(int)ControlTupleFields.Dialog_];
83
- set => this.Set((int)ControlTupleFields.Dialog_, value);
82
+ get => (string)this.Fields[(int)ControlTupleFields.DialogRef];
83
+ set => this.Set((int)ControlTupleFields.DialogRef, value);
84
}
85
86
public string Control
@@ -276,10 +276,10 @@ namespace WixToolset.Data.Tuples
276
set => this.Set((int)ControlTupleFields.Text, value);
277
}
278
279
- public string Control_Next
279
+ public string NextControlRef
280
{
281
- get => (string)this.Fields[(int)ControlTupleFields.Control_Next];
282
- set => this.Set((int)ControlTupleFields.Control_Next, value);
281
+ get => (string)this.Fields[(int)ControlTupleFields.NextControlRef];
282
+ set => this.Set((int)ControlTupleFields.NextControlRef, value);
283
}
284
285
public string Help
src/WixToolset.Data/Tuples/CreateFolderTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.CreateFolder,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Directory_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.DirectoryRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.ComponentRef), IntermediateFieldType.String),
15
},
16
typeof(CreateFolderTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum CreateFolderTupleFields
23
{
24
- Directory_,
25
- Component_,
24
+ DirectoryRef,
25
+ ComponentRef,
26
}
27
28
public class CreateFolderTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[CreateFolderTupleFields index] => this.Fields[(int)index];
39
40
- public string Directory_
40
+ public string DirectoryRef
41
{
42
- get => (string)this.Fields[(int)CreateFolderTupleFields.Directory_];
43
- set => this.Set((int)CreateFolderTupleFields.Directory_, value);
42
+ get => (string)this.Fields[(int)CreateFolderTupleFields.DirectoryRef];
43
+ set => this.Set((int)CreateFolderTupleFields.DirectoryRef, value);
44
}
45
46
- public string Component_
46
+ public string ComponentRef
47
{
48
- get => (string)this.Fields[(int)CreateFolderTupleFields.Component_];
49
- set => this.Set((int)CreateFolderTupleFields.Component_, value);
48
+ get => (string)this.Fields[(int)CreateFolderTupleFields.ComponentRef];
49
+ set => this.Set((int)CreateFolderTupleFields.ComponentRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/DialogTuple.cs
+15
-15
@@ -26,9 +26,9 @@ namespace WixToolset.Data
26
new IntermediateFieldDefinition(nameof(DialogTupleFields.SystemModal), IntermediateFieldType.Bool),
27
new IntermediateFieldDefinition(nameof(DialogTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
28
new IntermediateFieldDefinition(nameof(DialogTupleFields.Title), IntermediateFieldType.String),
29
- new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_First), IntermediateFieldType.String),
30
- new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Default), IntermediateFieldType.String),
31
- new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Cancel), IntermediateFieldType.String),
29
+ new IntermediateFieldDefinition(nameof(DialogTupleFields.FirstControlRef), IntermediateFieldType.String),
30
+ new IntermediateFieldDefinition(nameof(DialogTupleFields.DefaultControlRef), IntermediateFieldType.String),
31
+ new IntermediateFieldDefinition(nameof(DialogTupleFields.CancelControlRef), IntermediateFieldType.String),
32
},
33
typeof(DialogTuple));
34
}
@@ -54,9 +54,9 @@ namespace WixToolset.Data.Tuples
54
SystemModal,
55
TrackDiskSpace,
56
Title,
57
- Control_First,
58
- Control_Default,
59
- Control_Cancel,
57
+ FirstControlRef,
58
+ DefaultControlRef,
59
+ CancelControlRef,
60
}
61
62
public class DialogTuple : IntermediateTuple
@@ -167,22 +167,22 @@ namespace WixToolset.Data.Tuples
167
set => this.Set((int)DialogTupleFields.Title, value);
168
}
169
170
- public string Control_First
170
+ public string FirstControlRef
171
{
172
- get => (string)this.Fields[(int)DialogTupleFields.Control_First];
173
- set => this.Set((int)DialogTupleFields.Control_First, value);
172
+ get => (string)this.Fields[(int)DialogTupleFields.FirstControlRef];
173
+ set => this.Set((int)DialogTupleFields.FirstControlRef, value);
174
}
175
176
- public string Control_Default
176
+ public string DefaultControlRef
177
{
178
- get => (string)this.Fields[(int)DialogTupleFields.Control_Default];
179
- set => this.Set((int)DialogTupleFields.Control_Default, value);
178
+ get => (string)this.Fields[(int)DialogTupleFields.DefaultControlRef];
179
+ set => this.Set((int)DialogTupleFields.DefaultControlRef, value);
180
}
181
182
- public string Control_Cancel
182
+ public string CancelControlRef
183
{
184
- get => (string)this.Fields[(int)DialogTupleFields.Control_Cancel];
185
- set => this.Set((int)DialogTupleFields.Control_Cancel, value);
184
+ get => (string)this.Fields[(int)DialogTupleFields.CancelControlRef];
185
+ set => this.Set((int)DialogTupleFields.CancelControlRef, value);
186
}
187
}
188
}
\ No newline at end of file
src/WixToolset.Data/Tuples/DirectoryTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Directory,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory_Parent), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum DirectoryTupleFields
24
{
25
- Directory_Parent,
25
+ ParentDirectoryRef,
26
DefaultDir,
27
ComponentGuidGenerationSeed,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
41
42
- public string Directory_Parent
42
+ public string ParentDirectoryRef
43
{
44
- get => (string)this.Fields[(int)DirectoryTupleFields.Directory_Parent];
45
- set => this.Set((int)DirectoryTupleFields.Directory_Parent, value);
44
+ get => (string)this.Fields[(int)DirectoryTupleFields.ParentDirectoryRef];
45
+ set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
46
}
47
48
public string DefaultDir
src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.DrLocator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Signature_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Parent), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Path), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Depth), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum DrLocatorTupleFields
25
{
26
- Signature_,
26
+ SignatureRef,
27
Parent,
28
Path,
29
Depth,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[DrLocatorTupleFields index] => this.Fields[(int)index];
43
44
- public string Signature_
44
+ public string SignatureRef
45
{
46
- get => (string)this.Fields[(int)DrLocatorTupleFields.Signature_];
47
- set => this.Set((int)DrLocatorTupleFields.Signature_, value);
46
+ get => (string)this.Fields[(int)DrLocatorTupleFields.SignatureRef];
47
+ set => this.Set((int)DrLocatorTupleFields.SignatureRef, value);
48
}
49
50
public string Parent
src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
+20
-20
@@ -10,10 +10,10 @@ namespace WixToolset.Data
10
TupleDefinitionType.DuplicateFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.Component_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.File_), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestName), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestFolder), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.ComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationName), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationFolder), IntermediateFieldType.String),
17
},
18
typeof(DuplicateFileTuple));
19
}
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum DuplicateFileTupleFields
25
{
26
- Component_,
27
- File_,
28
- DestName,
29
- DestFolder,
26
+ ComponentRef,
27
+ FileRef,
28
+ DestinationName,
29
+ DestinationFolder,
30
}
31
32
public class DuplicateFileTuple : IntermediateTuple
@@ -41,28 +41,28 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
43
44
- public string Component_
44
+ public string ComponentRef
45
{
46
- get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_];
47
- set => this.Set((int)DuplicateFileTupleFields.Component_, value);
46
+ get => (string)this.Fields[(int)DuplicateFileTupleFields.ComponentRef];
47
+ set => this.Set((int)DuplicateFileTupleFields.ComponentRef, value);
48
}
49
50
- public string File_
50
+ public string FileRef
51
{
52
- get => (string)this.Fields[(int)DuplicateFileTupleFields.File_];
53
- set => this.Set((int)DuplicateFileTupleFields.File_, value);
52
+ get => (string)this.Fields[(int)DuplicateFileTupleFields.FileRef];
53
+ set => this.Set((int)DuplicateFileTupleFields.FileRef, value);
54
}
55
56
- public string DestName
56
+ public string DestinationName
57
{
58
- get => (string)this.Fields[(int)DuplicateFileTupleFields.DestName];
59
- set => this.Set((int)DuplicateFileTupleFields.DestName, value);
58
+ get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationName];
59
+ set => this.Set((int)DuplicateFileTupleFields.DestinationName, value);
60
}
61
62
- public string DestFolder
62
+ public string DestinationFolder
63
{
64
- get => (string)this.Fields[(int)DuplicateFileTupleFields.DestFolder];
65
- set => this.Set((int)DuplicateFileTupleFields.DestFolder, value);
64
+ get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationFolder];
65
+ set => this.Set((int)DuplicateFileTupleFields.DestinationFolder, value);
66
}
67
}
68
}
\ No newline at end of file
src/WixToolset.Data/Tuples/EnvironmentTuple.cs
+5
-5
@@ -17,7 +17,7 @@ namespace WixToolset.Data
17
new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Part), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Permanent), IntermediateFieldType.Bool),
19
new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.System), IntermediateFieldType.Bool),
20
- new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Component_), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.ComponentRef), IntermediateFieldType.String),
21
},
22
typeof(EnvironmentTuple));
23
}
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
34
Part,
35
Permanent,
36
System,
37
- Component_,
37
+ ComponentRef,
38
}
39
40
public enum EnvironmentActionType
@@ -105,10 +105,10 @@ namespace WixToolset.Data.Tuples
105
set => this.Set((int)EnvironmentTupleFields.System, value);
106
}
107
108
- public string Component_
108
+ public string ComponentRef
109
{
110
- get => (string)this.Fields[(int)EnvironmentTupleFields.Component_];
111
- set => this.Set((int)EnvironmentTupleFields.Component_, value);
110
+ get => (string)this.Fields[(int)EnvironmentTupleFields.ComponentRef];
111
+ set => this.Set((int)EnvironmentTupleFields.ComponentRef, value);
112
}
113
}
114
}
\ No newline at end of file
src/WixToolset.Data/Tuples/EventMappingTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.EventMapping,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Dialog_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Control_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(EventMappingTupleFields.DialogRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(EventMappingTupleFields.ControlRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Event), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Attribute), IntermediateFieldType.String),
17
},
@@ -23,8 +23,8 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum EventMappingTupleFields
25
{
26
- Dialog_,
27
- Control_,
26
+ DialogRef,
27
+ ControlRef,
28
Event,
29
Attribute,
30
}
@@ -41,16 +41,16 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[EventMappingTupleFields index] => this.Fields[(int)index];
43
44
- public string Dialog_
44
+ public string DialogRef
45
{
46
- get => (string)this.Fields[(int)EventMappingTupleFields.Dialog_];
47
- set => this.Set((int)EventMappingTupleFields.Dialog_, value);
46
+ get => (string)this.Fields[(int)EventMappingTupleFields.DialogRef];
47
+ set => this.Set((int)EventMappingTupleFields.DialogRef, value);
48
}
49
50
- public string Control_
50
+ public string ControlRef
51
{
52
- get => (string)this.Fields[(int)EventMappingTupleFields.Control_];
53
- set => this.Set((int)EventMappingTupleFields.Control_, value);
52
+ get => (string)this.Fields[(int)EventMappingTupleFields.ControlRef];
53
+ set => this.Set((int)EventMappingTupleFields.ControlRef, value);
54
}
55
56
public string Event
src/WixToolset.Data/Tuples/ExtensionTuple.cs
+20
-20
@@ -11,10 +11,10 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Extension), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Component_), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgId_), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MIME_), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Feature_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgIdRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MimeRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(ExtensionTupleFields.FeatureRef), IntermediateFieldType.String),
18
},
19
typeof(ExtensionTuple));
20
}
@@ -25,10 +25,10 @@ namespace WixToolset.Data.Tuples
25
public enum ExtensionTupleFields
26
{
27
Extension,
28
- Component_,
29
- ProgId_,
30
- MIME_,
31
- Feature_,
28
+ ComponentRef,
29
+ ProgIdRef,
30
+ MimeRef,
31
+ FeatureRef,
32
}
33
34
public class ExtensionTuple : IntermediateTuple
@@ -49,28 +49,28 @@ namespace WixToolset.Data.Tuples
49
set => this.Set((int)ExtensionTupleFields.Extension, value);
50
}
51
52
- public string Component_
52
+ public string ComponentRef
53
{
54
- get => (string)this.Fields[(int)ExtensionTupleFields.Component_];
55
- set => this.Set((int)ExtensionTupleFields.Component_, value);
54
+ get => (string)this.Fields[(int)ExtensionTupleFields.ComponentRef];
55
+ set => this.Set((int)ExtensionTupleFields.ComponentRef, value);
56
}
57
58
- public string ProgId_
58
+ public string ProgIdRef
59
{
60
- get => (string)this.Fields[(int)ExtensionTupleFields.ProgId_];
61
- set => this.Set((int)ExtensionTupleFields.ProgId_, value);
60
+ get => (string)this.Fields[(int)ExtensionTupleFields.ProgIdRef];
61
+ set => this.Set((int)ExtensionTupleFields.ProgIdRef, value);
62
}
63
64
- public string MIME_
64
+ public string MimeRef
65
{
66
- get => (string)this.Fields[(int)ExtensionTupleFields.MIME_];
67
- set => this.Set((int)ExtensionTupleFields.MIME_, value);
66
+ get => (string)this.Fields[(int)ExtensionTupleFields.MimeRef];
67
+ set => this.Set((int)ExtensionTupleFields.MimeRef, value);
68
}
69
70
- public string Feature_
70
+ public string FeatureRef
71
{
72
- get => (string)this.Fields[(int)ExtensionTupleFields.Feature_];
73
- set => this.Set((int)ExtensionTupleFields.Feature_, value);
72
+ get => (string)this.Fields[(int)ExtensionTupleFields.FeatureRef];
73
+ set => this.Set((int)ExtensionTupleFields.FeatureRef, value);
74
}
75
}
76
}
\ No newline at end of file
src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.FeatureComponents,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Feature_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.FeatureRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.ComponentRef), IntermediateFieldType.String),
15
},
16
typeof(FeatureComponentsTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum FeatureComponentsTupleFields
23
{
24
- Feature_,
25
- Component_,
24
+ FeatureRef,
25
+ ComponentRef,
26
}
27
28
public class FeatureComponentsTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[FeatureComponentsTupleFields index] => this.Fields[(int)index];
39
40
- public string Feature_
40
+ public string FeatureRef
41
{
42
- get => (string)this.Fields[(int)FeatureComponentsTupleFields.Feature_];
43
- set => this.Set((int)FeatureComponentsTupleFields.Feature_, value);
42
+ get => (string)this.Fields[(int)FeatureComponentsTupleFields.FeatureRef];
43
+ set => this.Set((int)FeatureComponentsTupleFields.FeatureRef, value);
44
}
45
46
- public string Component_
46
+ public string ComponentRef
47
{
48
- get => (string)this.Fields[(int)FeatureComponentsTupleFields.Component_];
49
- set => this.Set((int)FeatureComponentsTupleFields.Component_, value);
48
+ get => (string)this.Fields[(int)FeatureComponentsTupleFields.ComponentRef];
49
+ set => this.Set((int)FeatureComponentsTupleFields.ComponentRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/FeatureTuple.cs
+10
-10
@@ -10,12 +10,12 @@ namespace WixToolset.Data
10
TupleDefinitionType.Feature,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(FeatureTupleFields.Feature_Parent), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(FeatureTupleFields.ParentFeatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(FeatureTupleFields.Title), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(FeatureTupleFields.Description), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(FeatureTupleFields.Display), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(FeatureTupleFields.Level), IntermediateFieldType.Number),
18
- new IntermediateFieldDefinition(nameof(FeatureTupleFields.Directory_), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(FeatureTupleFields.DirectoryRef), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAbsent), IntermediateFieldType.Bool),
20
new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAdvertise), IntermediateFieldType.Bool),
21
new IntermediateFieldDefinition(nameof(FeatureTupleFields.InstallDefault), IntermediateFieldType.Number),
@@ -29,12 +29,12 @@ namespace WixToolset.Data.Tuples
29
{
30
public enum FeatureTupleFields
31
{
32
- Feature_Parent,
32
+ ParentFeatureRef,
33
Title,
34
Description,
35
Display,
36
Level,
37
- Directory_,
37
+ DirectoryRef,
38
DisallowAbsent,
39
DisallowAdvertise,
40
InstallDefault,
@@ -66,10 +66,10 @@ namespace WixToolset.Data.Tuples
66
67
public IntermediateField this[FeatureTupleFields index] => this.Fields[(int)index];
68
69
- public string Feature_Parent
69
+ public string ParentFeatureRef
70
{
71
- get => (string)this.Fields[(int)FeatureTupleFields.Feature_Parent];
72
- set => this.Set((int)FeatureTupleFields.Feature_Parent, value);
71
+ get => (string)this.Fields[(int)FeatureTupleFields.ParentFeatureRef];
72
+ set => this.Set((int)FeatureTupleFields.ParentFeatureRef, value);
73
}
74
75
public string Title
@@ -96,10 +96,10 @@ namespace WixToolset.Data.Tuples
96
set => this.Set((int)FeatureTupleFields.Level, value);
97
}
98
99
- public string Directory_
99
+ public string DirectoryRef
100
{
101
- get => (string)this.Fields[(int)FeatureTupleFields.Directory_];
102
- set => this.Set((int)FeatureTupleFields.Directory_, value);
101
+ get => (string)this.Fields[(int)FeatureTupleFields.DirectoryRef];
102
+ set => this.Set((int)FeatureTupleFields.DirectoryRef, value);
103
}
104
105
public bool DisallowAbsent
src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.FileSFPCatalog,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.File_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalog_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.FileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalogRef), IntermediateFieldType.String),
15
},
16
typeof(FileSFPCatalogTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum FileSFPCatalogTupleFields
23
{
24
- File_,
25
- SFPCatalog_,
24
+ FileRef,
25
+ SFPCatalogRef,
26
}
27
28
public class FileSFPCatalogTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[FileSFPCatalogTupleFields index] => this.Fields[(int)index];
39
40
- public string File_
40
+ public string FileRef
41
{
42
- get => (string)this.Fields[(int)FileSFPCatalogTupleFields.File_];
43
- set => this.Set((int)FileSFPCatalogTupleFields.File_, value);
42
+ get => (string)this.Fields[(int)FileSFPCatalogTupleFields.FileRef];
43
+ set => this.Set((int)FileSFPCatalogTupleFields.FileRef, value);
44
}
45
46
- public string SFPCatalog_
46
+ public string SFPCatalogRef
47
{
48
- get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalog_];
49
- set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalog_, value);
48
+ get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalogRef];
49
+ set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalogRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/FileTuple.cs
+15
-15
@@ -10,9 +10,9 @@ namespace WixToolset.Data
10
TupleDefinitionType.File,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(FileTupleFields.Component_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(FileTupleFields.ShortFileName), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(FileTupleFields.LongFileName), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
@@ -34,9 +34,9 @@ namespace WixToolset.Data.Tuples
34
{
35
public enum FileTupleFields
36
{
37
- Component_,
38
- ShortFileName,
39
- LongFileName,
37
+ ComponentRef,
38
+ ShortName,
39
+ Name,
40
FileSize,
41
Version,
42
Language,
@@ -63,22 +63,22 @@ namespace WixToolset.Data.Tuples
63
64
public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
65
66
- public string Component_
66
+ public string ComponentRef
67
{
68
- get => (string)this.Fields[(int)FileTupleFields.Component_];
69
- set => this.Set((int)FileTupleFields.Component_, value);
68
+ get => (string)this.Fields[(int)FileTupleFields.ComponentRef];
69
+ set => this.Set((int)FileTupleFields.ComponentRef, value);
70
}
71
72
- public string ShortFileName
72
+ public string ShortName
73
{
74
- get => (string)this.Fields[(int)FileTupleFields.ShortFileName];
75
- set => this.Set((int)FileTupleFields.ShortFileName, value);
74
+ get => (string)this.Fields[(int)FileTupleFields.ShortName];
75
+ set => this.Set((int)FileTupleFields.ShortName, value);
76
}
77
78
- public string LongFileName
78
+ public string Name
79
{
80
- get => (string)this.Fields[(int)FileTupleFields.LongFileName];
81
- set => this.Set((int)FileTupleFields.LongFileName, value);
80
+ get => (string)this.Fields[(int)FileTupleFields.Name];
81
+ set => this.Set((int)FileTupleFields.Name, value);
82
}
83
84
public int FileSize
src/WixToolset.Data/Tuples/IniFileTuple.cs
+5
-5
@@ -16,7 +16,7 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(IniFileTupleFields.Key), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(IniFileTupleFields.Value), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(IniFileTupleFields.Action), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(IniFileTupleFields.Component_), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(IniFileTupleFields.ComponentRef), IntermediateFieldType.String),
20
},
21
typeof(IniFileTuple));
22
}
@@ -32,7 +32,7 @@ namespace WixToolset.Data.Tuples
32
Key,
33
Value,
34
Action,
35
- Component_,
35
+ ComponentRef,
36
}
37
38
public class IniFileTuple : IntermediateTuple
@@ -83,10 +83,10 @@ namespace WixToolset.Data.Tuples
83
set => this.Set((int)IniFileTupleFields.Action, (int)value);
84
}
85
86
- public string Component_
86
+ public string ComponentRef
87
{
88
- get => (string)this.Fields[(int)IniFileTupleFields.Component_];
89
- set => this.Set((int)IniFileTupleFields.Component_, value);
88
+ get => (string)this.Fields[(int)IniFileTupleFields.ComponentRef];
89
+ set => this.Set((int)IniFileTupleFields.ComponentRef, value);
90
}
91
}
92
}
\ No newline at end of file
src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.IniLocator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Signature_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.FileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Section), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Key), IntermediateFieldType.String),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum IniLocatorTupleFields
27
{
28
- Signature_,
28
+ SignatureRef,
29
FileName,
30
Section,
31
Key,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[IniLocatorTupleFields index] => this.Fields[(int)index];
47
48
- public string Signature_
48
+ public string SignatureRef
49
{
50
- get => (string)this.Fields[(int)IniLocatorTupleFields.Signature_];
51
- set => this.Set((int)IniLocatorTupleFields.Signature_, value);
50
+ get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
51
+ set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
52
}
53
54
public string FileName
src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.IsolatedComponent,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Shared), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Application), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.SharedComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.ApplicationComponentRef), IntermediateFieldType.String),
15
},
16
typeof(IsolatedComponentTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum IsolatedComponentTupleFields
23
{
24
- Component_Shared,
25
- Component_Application,
24
+ SharedComponentRef,
25
+ ApplicationComponentRef,
26
}
27
28
public class IsolatedComponentTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[IsolatedComponentTupleFields index] => this.Fields[(int)index];
39
40
- public string Component_Shared
40
+ public string SharedComponentRef
41
{
42
- get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Shared];
43
- set => this.Set((int)IsolatedComponentTupleFields.Component_Shared, value);
42
+ get => (string)this.Fields[(int)IsolatedComponentTupleFields.SharedComponentRef];
43
+ set => this.Set((int)IsolatedComponentTupleFields.SharedComponentRef, value);
44
}
45
46
- public string Component_Application
46
+ public string ApplicationComponentRef
47
{
48
- get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Application];
49
- set => this.Set((int)IsolatedComponentTupleFields.Component_Application, value);
48
+ get => (string)this.Fields[(int)IsolatedComponentTupleFields.ApplicationComponentRef];
49
+ set => this.Set((int)IsolatedComponentTupleFields.ApplicationComponentRef, value);
50
}
51
}
52
}
src/WixToolset.Data/Tuples/ListViewTuple.cs
+5
-5
@@ -14,7 +14,7 @@ namespace WixToolset.Data
14
new IntermediateFieldDefinition(nameof(ListViewTupleFields.Order), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(ListViewTupleFields.Value), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ListViewTupleFields.Text), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(ListViewTupleFields.Binary_), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(ListViewTupleFields.BinaryRef), IntermediateFieldType.String),
18
},
19
typeof(ListViewTuple));
20
}
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
28
Order,
29
Value,
30
Text,
31
- Binary_,
31
+ BinaryRef,
32
}
33
34
public class ListViewTuple : IntermediateTuple
@@ -67,10 +67,10 @@ namespace WixToolset.Data.Tuples
67
set => this.Set((int)ListViewTupleFields.Text, value);
68
}
69
70
- public string Binary_
70
+ public string BinaryRef
71
{
72
- get => (string)this.Fields[(int)ListViewTupleFields.Binary_];
73
- set => this.Set((int)ListViewTupleFields.Binary_, value);
72
+ get => (string)this.Fields[(int)ListViewTupleFields.BinaryRef];
73
+ set => this.Set((int)ListViewTupleFields.BinaryRef, value);
74
}
75
}
76
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MIMETuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(MIMETupleFields.ContentType), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(MIMETupleFields.Extension_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(MIMETupleFields.ExtensionRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MIMETupleFields.CLSID), IntermediateFieldType.String),
16
},
17
typeof(MIMETuple));
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
public enum MIMETupleFields
24
{
25
ContentType,
26
- Extension_,
26
+ ExtensionRef,
27
CLSID,
28
}
29
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
45
set => this.Set((int)MIMETupleFields.ContentType, value);
46
}
47
48
- public string Extension_
48
+ public string ExtensionRef
49
{
50
- get => (string)this.Fields[(int)MIMETupleFields.Extension_];
51
- set => this.Set((int)MIMETupleFields.Extension_, value);
50
+ get => (string)this.Fields[(int)MIMETupleFields.ExtensionRef];
51
+ set => this.Set((int)MIMETupleFields.ExtensionRef, value);
52
}
53
54
public string CLSID
src/WixToolset.Data/Tuples/MoveFileTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.MoveFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestName), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceFolder), IntermediateFieldType.String),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum MoveFileTupleFields
27
{
28
- Component_,
28
+ ComponentRef,
29
SourceName,
30
DestName,
31
SourceFolder,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
47
48
- public string Component_
48
+ public string ComponentRef
49
{
50
- get => (string)this.Fields[(int)MoveFileTupleFields.Component_];
51
- set => this.Set((int)MoveFileTupleFields.Component_, value);
50
+ get => (string)this.Fields[(int)MoveFileTupleFields.ComponentRef];
51
+ set => this.Set((int)MoveFileTupleFields.ComponentRef, value);
52
}
53
54
public string SourceName
src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiAssemblyName,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Name), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Value), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum MsiAssemblyNameTupleFields
24
{
25
- Component_,
25
+ ComponentRef,
26
Name,
27
Value,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[MsiAssemblyNameTupleFields index] => this.Fields[(int)index];
41
42
- public string Component_
42
+ public string ComponentRef
43
{
44
- get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Component_];
45
- set => this.Set((int)MsiAssemblyNameTupleFields.Component_, value);
44
+ get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.ComponentRef];
45
+ set => this.Set((int)MsiAssemblyNameTupleFields.ComponentRef, value);
46
}
47
48
public string Name
src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
+20
-20
@@ -10,10 +10,10 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiAssembly,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Component_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Feature_), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Manifest), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Application), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.FeatureRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number),
18
},
19
typeof(MsiAssemblyTuple));
@@ -24,10 +24,10 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum MsiAssemblyTupleFields
26
{
27
- Component_,
28
- Feature_,
29
- File_Manifest,
30
- File_Application,
27
+ ComponentRef,
28
+ FeatureRef,
29
+ ManifestFileRef,
30
+ ApplicationFileRef,
31
Attributes,
32
}
33
@@ -43,28 +43,28 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[MsiAssemblyTupleFields index] => this.Fields[(int)index];
45
46
- public string Component_
46
+ public string ComponentRef
47
{
48
- get => (string)this.Fields[(int)MsiAssemblyTupleFields.Component_];
49
- set => this.Set((int)MsiAssemblyTupleFields.Component_, value);
48
+ get => (string)this.Fields[(int)MsiAssemblyTupleFields.ComponentRef];
49
+ set => this.Set((int)MsiAssemblyTupleFields.ComponentRef, value);
50
}
51
52
- public string Feature_
52
+ public string FeatureRef
53
{
54
- get => (string)this.Fields[(int)MsiAssemblyTupleFields.Feature_];
55
- set => this.Set((int)MsiAssemblyTupleFields.Feature_, value);
54
+ get => (string)this.Fields[(int)MsiAssemblyTupleFields.FeatureRef];
55
+ set => this.Set((int)MsiAssemblyTupleFields.FeatureRef, value);
56
}
57
58
- public string File_Manifest
58
+ public string ManifestFileRef
59
{
60
- get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Manifest];
61
- set => this.Set((int)MsiAssemblyTupleFields.File_Manifest, value);
60
+ get => (string)this.Fields[(int)MsiAssemblyTupleFields.ManifestFileRef];
61
+ set => this.Set((int)MsiAssemblyTupleFields.ManifestFileRef, value);
62
}
63
64
- public string File_Application
64
+ public string ApplicationFileRef
65
{
66
- get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Application];
67
- set => this.Set((int)MsiAssemblyTupleFields.File_Application, value);
66
+ get => (string)this.Fields[(int)MsiAssemblyTupleFields.ApplicationFileRef];
67
+ set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value);
68
}
69
70
public FileAssemblyType Type
src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
+5
-5
@@ -12,7 +12,7 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Table), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.SignObject), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificate_), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Hash), IntermediateFieldType.Path),
17
},
18
typeof(MsiDigitalSignatureTuple));
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
25
{
26
Table,
27
SignObject,
28
- DigitalCertificate_,
28
+ DigitalCertificateRef,
29
Hash,
30
}
31
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
53
set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
54
}
55
56
- public string DigitalCertificate_
56
+ public string DigitalCertificateRef
57
{
58
- get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificate_];
59
- set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificate_, value);
58
+ get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificateRef];
59
+ set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificateRef, value);
60
}
61
62
public string Hash
src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiFileHash,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.File_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.FileRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.Options), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart1), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart2), IntermediateFieldType.Number),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum MsiFileHashTupleFields
27
{
28
- File_,
28
+ FileRef,
29
Options,
30
HashPart1,
31
HashPart2,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[MsiFileHashTupleFields index] => this.Fields[(int)index];
47
48
- public string File_
48
+ public string FileRef
49
{
50
- get => (string)this.Fields[(int)MsiFileHashTupleFields.File_];
51
- set => this.Set((int)MsiFileHashTupleFields.File_, value);
50
+ get => (string)this.Fields[(int)MsiFileHashTupleFields.FileRef];
51
+ set => this.Set((int)MsiFileHashTupleFields.FileRef, value);
52
}
53
54
public int Options
src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.PackageCertificate), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
15
},
16
typeof(MsiPackageCertificateTuple));
17
}
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
public enum MsiPackageCertificateTupleFields
23
{
24
PackageCertificate,
25
- DigitalCertificate_,
25
+ DigitalCertificateRef,
26
}
27
28
public class MsiPackageCertificateTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
44
}
45
46
- public string DigitalCertificate_
46
+ public string DigitalCertificateRef
47
{
48
- get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificate_];
49
- set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificate_, value);
48
+ get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificateRef];
49
+ set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificateRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.PatchCertificate), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
15
},
16
typeof(MsiPatchCertificateTuple));
17
}
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
public enum MsiPatchCertificateTupleFields
23
{
24
PatchCertificate,
25
- DigitalCertificate_,
25
+ DigitalCertificateRef,
26
}
27
28
public class MsiPatchCertificateTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
44
}
45
46
- public string DigitalCertificate_
46
+ public string DigitalCertificateRef
47
{
48
- get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificate_];
49
- set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificate_, value);
48
+ get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificateRef];
49
+ set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificateRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiPatchOldAssemblyFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.File_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.Assembly_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.FileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.AssemblyRef), IntermediateFieldType.String),
15
},
16
typeof(MsiPatchOldAssemblyFileTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum MsiPatchOldAssemblyFileTupleFields
23
{
24
- File_,
25
- Assembly_,
24
+ FileRef,
25
+ AssemblyRef,
26
}
27
28
public class MsiPatchOldAssemblyFileTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[MsiPatchOldAssemblyFileTupleFields index] => this.Fields[(int)index];
39
40
- public string File_
40
+ public string FileRef
41
{
42
- get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.File_];
43
- set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.File_, value);
42
+ get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.FileRef];
43
+ set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.FileRef, value);
44
}
45
46
- public string Assembly_
46
+ public string AssemblyRef
47
{
48
- get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.Assembly_];
49
- set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.Assembly_, value);
48
+ get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef];
49
+ set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+5
-5
@@ -19,7 +19,7 @@ namespace WixToolset.Data
19
new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Command), IntermediateFieldType.String),
20
new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Actions), IntermediateFieldType.String),
21
new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.DelayActions), IntermediateFieldType.String),
22
- new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Component_), IntermediateFieldType.String),
22
+ new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ComponentRef), IntermediateFieldType.String),
23
},
24
typeof(MsiServiceConfigFailureActionsTuple));
25
}
@@ -38,7 +38,7 @@ namespace WixToolset.Data.Tuples
38
Command,
39
Actions,
40
DelayActions,
41
- Component_,
41
+ ComponentRef,
42
}
43
44
public class MsiServiceConfigFailureActionsTuple : IntermediateTuple
@@ -107,10 +107,10 @@ namespace WixToolset.Data.Tuples
107
set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
108
}
109
110
- public string Component_
110
+ public string ComponentRef
111
{
112
- get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Component_];
113
- set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Component_, value);
112
+ get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ComponentRef];
113
+ set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ComponentRef, value);
114
}
115
}
116
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
+5
-5
@@ -16,7 +16,7 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
17
new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ConfigType), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Argument), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Component_), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
20
},
21
typeof(MsiServiceConfigTuple));
22
}
@@ -33,7 +33,7 @@ namespace WixToolset.Data.Tuples
33
OnUninstall,
34
ConfigType,
35
Argument,
36
- Component_,
36
+ ComponentRef,
37
}
38
39
public enum MsiServiceConfigType
@@ -93,10 +93,10 @@ namespace WixToolset.Data.Tuples
93
set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
94
}
95
96
- public string Component_
96
+ public string ComponentRef
97
{
98
- get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Component_];
99
- set => this.Set((int)MsiServiceConfigTupleFields.Component_, value);
98
+ get => (string)this.Fields[(int)MsiServiceConfigTupleFields.ComponentRef];
99
+ set => this.Set((int)MsiServiceConfigTupleFields.ComponentRef, value);
100
}
101
}
102
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiShortcutProperty,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.Shortcut_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.ShortcutRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum MsiShortcutPropertyTupleFields
24
{
25
- Shortcut_,
25
+ ShortcutRef,
26
PropertyKey,
27
PropVariantValue,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
41
42
- public string Shortcut_
42
+ public string ShortcutRef
43
{
44
- get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_];
45
- set => this.Set((int)MsiShortcutPropertyTupleFields.Shortcut_, value);
44
+ get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.ShortcutRef];
45
+ set => this.Set((int)MsiShortcutPropertyTupleFields.ShortcutRef, value);
46
}
47
48
public string PropertyKey
src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCAttribute,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Driver_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.DriverRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Attribute), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Value), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum ODBCAttributeTupleFields
24
{
25
- Driver_,
25
+ DriverRef,
26
Attribute,
27
Value,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[ODBCAttributeTupleFields index] => this.Fields[(int)index];
41
42
- public string Driver_
42
+ public string DriverRef
43
{
44
- get => (string)this.Fields[(int)ODBCAttributeTupleFields.Driver_];
45
- set => this.Set((int)ODBCAttributeTupleFields.Driver_, value);
44
+ get => (string)this.Fields[(int)ODBCAttributeTupleFields.DriverRef];
45
+ set => this.Set((int)ODBCAttributeTupleFields.DriverRef, value);
46
}
47
48
public string Attribute
src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCDataSource,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Registration), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCDataSourceTupleFields
25
{
26
- Component_,
26
+ ComponentRef,
27
Description,
28
DriverDescription,
29
Registration,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
43
44
- public string Component_
44
+ public string ComponentRef
45
{
46
- get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_];
47
- set => this.Set((int)ODBCDataSourceTupleFields.Component_, value);
46
+ get => (string)this.Fields[(int)ODBCDataSourceTupleFields.ComponentRef];
47
+ set => this.Set((int)ODBCDataSourceTupleFields.ComponentRef, value);
48
}
49
50
public string Description
src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+15
-15
@@ -10,10 +10,10 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCDriver,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_Setup), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.FileRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.SetupFileRef), IntermediateFieldType.String),
17
},
18
typeof(ODBCDriverTuple));
19
}
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCDriverTupleFields
25
{
26
- Component_,
26
+ ComponentRef,
27
Description,
28
- File_,
29
- File_Setup,
28
+ FileRef,
29
+ SetupFileRef,
30
}
31
32
public class ODBCDriverTuple : IntermediateTuple
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
43
44
- public string Component_
44
+ public string ComponentRef
45
{
46
- get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_];
47
- set => this.Set((int)ODBCDriverTupleFields.Component_, value);
46
+ get => (string)this.Fields[(int)ODBCDriverTupleFields.ComponentRef];
47
+ set => this.Set((int)ODBCDriverTupleFields.ComponentRef, value);
48
}
49
50
public string Description
@@ -53,16 +53,16 @@ namespace WixToolset.Data.Tuples
53
set => this.Set((int)ODBCDriverTupleFields.Description, value);
54
}
55
56
- public string File_
56
+ public string FileRef
57
{
58
- get => (string)this.Fields[(int)ODBCDriverTupleFields.File_];
59
- set => this.Set((int)ODBCDriverTupleFields.File_, value);
58
+ get => (string)this.Fields[(int)ODBCDriverTupleFields.FileRef];
59
+ set => this.Set((int)ODBCDriverTupleFields.FileRef, value);
60
}
61
62
- public string File_Setup
62
+ public string SetupFileRef
63
{
64
- get => (string)this.Fields[(int)ODBCDriverTupleFields.File_Setup];
65
- set => this.Set((int)ODBCDriverTupleFields.File_Setup, value);
64
+ get => (string)this.Fields[(int)ODBCDriverTupleFields.SetupFileRef];
65
+ set => this.Set((int)ODBCDriverTupleFields.SetupFileRef, value);
66
}
67
}
68
}
src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCSourceAttribute,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSource_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSourceRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Attribute), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Value), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum ODBCSourceAttributeTupleFields
24
{
25
- DataSource_,
25
+ DataSourceRef,
26
Attribute,
27
Value,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[ODBCSourceAttributeTupleFields index] => this.Fields[(int)index];
41
42
- public string DataSource_
42
+ public string DataSourceRef
43
{
44
- get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSource_];
45
- set => this.Set((int)ODBCSourceAttributeTupleFields.DataSource_, value);
44
+ get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSourceRef];
45
+ set => this.Set((int)ODBCSourceAttributeTupleFields.DataSourceRef, value);
46
}
47
48
public string Attribute
src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+15
-15
@@ -10,10 +10,10 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCTranslator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_Setup), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.FileRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.SetupFileRef), IntermediateFieldType.String),
17
},
18
typeof(ODBCTranslatorTuple));
19
}
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCTranslatorTupleFields
25
{
26
- Component_,
26
+ ComponentRef,
27
Description,
28
- File_,
29
- File_Setup,
28
+ FileRef,
29
+ SetupFileRef,
30
}
31
32
public class ODBCTranslatorTuple : IntermediateTuple
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
43
44
- public string Component_
44
+ public string ComponentRef
45
{
46
- get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_];
47
- set => this.Set((int)ODBCTranslatorTupleFields.Component_, value);
46
+ get => (string)this.Fields[(int)ODBCTranslatorTupleFields.ComponentRef];
47
+ set => this.Set((int)ODBCTranslatorTupleFields.ComponentRef, value);
48
}
49
50
public string Description
@@ -53,16 +53,16 @@ namespace WixToolset.Data.Tuples
53
set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
54
}
55
56
- public string File_
56
+ public string FileRef
57
{
58
- get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_];
59
- set => this.Set((int)ODBCTranslatorTupleFields.File_, value);
58
+ get => (string)this.Fields[(int)ODBCTranslatorTupleFields.FileRef];
59
+ set => this.Set((int)ODBCTranslatorTupleFields.FileRef, value);
60
}
61
62
- public string File_Setup
62
+ public string SetupFileRef
63
{
64
- get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_Setup];
65
- set => this.Set((int)ODBCTranslatorTupleFields.File_Setup, value);
64
+ get => (string)this.Fields[(int)ODBCTranslatorTupleFields.SetupFileRef];
65
+ set => this.Set((int)ODBCTranslatorTupleFields.SetupFileRef, value);
66
}
67
}
68
}
src/WixToolset.Data/Tuples/PatchPackageTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.PatchId), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.Media_), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.MediaDiskIdRef), IntermediateFieldType.Number),
15
},
16
typeof(PatchPackageTuple));
17
}
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
public enum PatchPackageTupleFields
23
{
24
PatchId,
25
- Media_,
25
+ MediaDiskIdRef,
26
}
27
28
public class PatchPackageTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)PatchPackageTupleFields.PatchId, value);
44
}
45
46
- public int Media_
46
+ public int MediaDiskIdRef
47
{
48
- get => (int)this.Fields[(int)PatchPackageTupleFields.Media_];
49
- set => this.Set((int)PatchPackageTupleFields.Media_, value);
48
+ get => (int)this.Fields[(int)PatchPackageTupleFields.MediaDiskIdRef];
49
+ set => this.Set((int)PatchPackageTupleFields.MediaDiskIdRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/PatchTuple.cs
+10
-10
@@ -10,12 +10,12 @@ namespace WixToolset.Data
10
TupleDefinitionType.Patch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(PatchTupleFields.File_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(PatchTupleFields.FileRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(PatchTupleFields.Sequence), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(PatchTupleFields.PatchSize), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(PatchTupleFields.Attributes), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(PatchTupleFields.Header), IntermediateFieldType.Path),
18
- new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef_), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef), IntermediateFieldType.String),
19
},
20
typeof(PatchTuple));
21
}
@@ -25,12 +25,12 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum PatchTupleFields
27
{
28
- File_,
28
+ FileRef,
29
Sequence,
30
PatchSize,
31
Attributes,
32
Header,
33
- StreamRef_,
33
+ StreamRef,
34
}
35
36
public class PatchTuple : IntermediateTuple
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[PatchTupleFields index] => this.Fields[(int)index];
47
48
- public string File_
48
+ public string FileRef
49
{
50
- get => (string)this.Fields[(int)PatchTupleFields.File_];
51
- set => this.Set((int)PatchTupleFields.File_, value);
50
+ get => (string)this.Fields[(int)PatchTupleFields.FileRef];
51
+ set => this.Set((int)PatchTupleFields.FileRef, value);
52
}
53
54
public int Sequence
@@ -75,10 +75,10 @@ namespace WixToolset.Data.Tuples
75
set => this.Set((int)PatchTupleFields.Header, value);
76
}
77
78
- public string StreamRef_
78
+ public string StreamRef
79
{
80
- get => (string)this.Fields[(int)PatchTupleFields.StreamRef_];
81
- set => this.Set((int)PatchTupleFields.StreamRef_, value);
80
+ get => (string)this.Fields[(int)PatchTupleFields.StreamRef];
81
+ set => this.Set((int)PatchTupleFields.StreamRef, value);
82
}
83
}
84
}
\ No newline at end of file
src/WixToolset.Data/Tuples/ProgIdTuple.cs
+15
-15
@@ -11,10 +11,10 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId_Parent), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Class_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ParentProgIdRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ClassRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Description), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Icon_), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconRef), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconIndex), IntermediateFieldType.Number),
19
},
20
typeof(ProgIdTuple));
@@ -26,10 +26,10 @@ namespace WixToolset.Data.Tuples
26
public enum ProgIdTupleFields
27
{
28
ProgId,
29
- ProgId_Parent,
30
- Class_,
29
+ ParentProgIdRef,
30
+ ClassRef,
31
Description,
32
- Icon_,
32
+ IconRef,
33
IconIndex,
34
}
35
@@ -51,16 +51,16 @@ namespace WixToolset.Data.Tuples
51
set => this.Set((int)ProgIdTupleFields.ProgId, value);
52
}
53
54
- public string ProgId_Parent
54
+ public string ParentProgIdRef
55
{
56
- get => (string)this.Fields[(int)ProgIdTupleFields.ProgId_Parent];
57
- set => this.Set((int)ProgIdTupleFields.ProgId_Parent, value);
56
+ get => (string)this.Fields[(int)ProgIdTupleFields.ParentProgIdRef];
57
+ set => this.Set((int)ProgIdTupleFields.ParentProgIdRef, value);
58
}
59
60
- public string Class_
60
+ public string ClassRef
61
{
62
- get => (string)this.Fields[(int)ProgIdTupleFields.Class_];
63
- set => this.Set((int)ProgIdTupleFields.Class_, value);
62
+ get => (string)this.Fields[(int)ProgIdTupleFields.ClassRef];
63
+ set => this.Set((int)ProgIdTupleFields.ClassRef, value);
64
}
65
66
public string Description
@@ -69,10 +69,10 @@ namespace WixToolset.Data.Tuples
69
set => this.Set((int)ProgIdTupleFields.Description, value);
70
}
71
72
- public string Icon_
72
+ public string IconRef
73
{
74
- get => (string)this.Fields[(int)ProgIdTupleFields.Icon_];
75
- set => this.Set((int)ProgIdTupleFields.Icon_, value);
74
+ get => (string)this.Fields[(int)ProgIdTupleFields.IconRef];
75
+ set => this.Set((int)ProgIdTupleFields.IconRef, value);
76
}
77
78
public int? IconIndex
src/WixToolset.Data/Tuples/PublishComponentTuple.cs
+10
-10
@@ -12,9 +12,9 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Qualifier), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Component_), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.AppData), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Feature_), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.FeatureRef), IntermediateFieldType.String),
18
},
19
typeof(PublishComponentTuple));
20
}
@@ -26,9 +26,9 @@ namespace WixToolset.Data.Tuples
26
{
27
ComponentId,
28
Qualifier,
29
- Component_,
29
+ ComponentRef,
30
AppData,
31
- Feature_,
31
+ FeatureRef,
32
}
33
34
public class PublishComponentTuple : IntermediateTuple
@@ -55,10 +55,10 @@ namespace WixToolset.Data.Tuples
55
set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
56
}
57
58
- public string Component_
58
+ public string ComponentRef
59
{
60
- get => (string)this.Fields[(int)PublishComponentTupleFields.Component_];
61
- set => this.Set((int)PublishComponentTupleFields.Component_, value);
60
+ get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentRef];
61
+ set => this.Set((int)PublishComponentTupleFields.ComponentRef, value);
62
}
63
64
public string AppData
@@ -67,10 +67,10 @@ namespace WixToolset.Data.Tuples
67
set => this.Set((int)PublishComponentTupleFields.AppData, value);
68
}
69
70
- public string Feature_
70
+ public string FeatureRef
71
{
72
- get => (string)this.Fields[(int)PublishComponentTupleFields.Feature_];
73
- set => this.Set((int)PublishComponentTupleFields.Feature_, value);
72
+ get => (string)this.Fields[(int)PublishComponentTupleFields.FeatureRef];
73
+ set => this.Set((int)PublishComponentTupleFields.FeatureRef, value);
74
}
75
}
76
}
\ No newline at end of file
src/WixToolset.Data/Tuples/RegistryTuple.cs
+5
-5
@@ -16,7 +16,7 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(RegistryTupleFields.Value), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueType), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueAction), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(RegistryTupleFields.Component_), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(RegistryTupleFields.ComponentRef), IntermediateFieldType.String),
20
},
21
typeof(RegistryTuple));
22
}
@@ -32,7 +32,7 @@ namespace WixToolset.Data.Tuples
32
Value,
33
ValueType,
34
ValueAction,
35
- Component_,
35
+ ComponentRef,
36
}
37
38
public enum RegistryValueType
@@ -99,10 +99,10 @@ namespace WixToolset.Data.Tuples
99
set => this.Set((int)RegistryTupleFields.ValueAction, (int)value);
100
}
101
102
- public string Component_
102
+ public string ComponentRef
103
{
104
- get => (string)this.Fields[(int)RegistryTupleFields.Component_];
105
- set => this.Set((int)RegistryTupleFields.Component_, value);
104
+ get => (string)this.Fields[(int)RegistryTupleFields.ComponentRef];
105
+ set => this.Set((int)RegistryTupleFields.ComponentRef, value);
106
}
107
}
108
}
\ No newline at end of file
src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.RemoveFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnInstall), IntermediateFieldType.Bool),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum RemoveFileTupleFields
26
{
27
- Component_,
27
+ ComponentRef,
28
FileName,
29
DirProperty,
30
OnInstall,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
45
46
- public string Component_
46
+ public string ComponentRef
47
{
48
- get => (string)this.Fields[(int)RemoveFileTupleFields.Component_];
49
- set => this.Set((int)RemoveFileTupleFields.Component_, value);
48
+ get => (string)this.Fields[(int)RemoveFileTupleFields.ComponentRef];
49
+ set => this.Set((int)RemoveFileTupleFields.ComponentRef, value);
50
}
51
52
public string FileName
src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
+5
-5
@@ -17,7 +17,7 @@ namespace WixToolset.Data
17
new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Key), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Value), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Action), IntermediateFieldType.Number),
20
- new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Component_), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.ComponentRef), IntermediateFieldType.String),
21
},
22
typeof(RemoveIniFileTuple));
23
}
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
34
Key,
35
Value,
36
Action,
37
- Component_,
37
+ ComponentRef,
38
}
39
40
public class RemoveIniFileTuple : IntermediateTuple
@@ -91,10 +91,10 @@ namespace WixToolset.Data.Tuples
91
set => this.Set((int)RemoveIniFileTupleFields.Action, value);
92
}
93
94
- public string Component_
94
+ public string ComponentRef
95
{
96
- get => (string)this.Fields[(int)RemoveIniFileTupleFields.Component_];
97
- set => this.Set((int)RemoveIniFileTupleFields.Component_, value);
96
+ get => (string)this.Fields[(int)RemoveIniFileTupleFields.ComponentRef];
97
+ set => this.Set((int)RemoveIniFileTupleFields.ComponentRef, value);
98
}
99
}
100
}
\ No newline at end of file
src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+5
-5
@@ -14,7 +14,7 @@ namespace WixToolset.Data
14
new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Action), IntermediateFieldType.Number),
17
- new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Component_), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.ComponentRef), IntermediateFieldType.String),
18
},
19
typeof(RemoveRegistryTuple));
20
}
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
28
Key,
29
Name,
30
Action,
31
- Component_,
31
+ ComponentRef,
32
}
33
34
public enum RemoveRegistryActionType
@@ -73,10 +73,10 @@ namespace WixToolset.Data.Tuples
73
set => this.Set((int)RemoveRegistryTupleFields.Action, (int)value);
74
}
75
76
- public string Component_
76
+ public string ComponentRef
77
{
78
- get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_];
79
- set => this.Set((int)RemoveRegistryTupleFields.Component_, value);
78
+ get => (string)this.Fields[(int)RemoveRegistryTupleFields.ComponentRef];
79
+ set => this.Set((int)RemoveRegistryTupleFields.ComponentRef, value);
80
}
81
}
82
}
\ No newline at end of file
src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.ReserveCost,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ComponentRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveSource), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ReserveCostTupleFields
25
{
26
- Component_,
26
+ ComponentRef,
27
ReserveFolder,
28
ReserveLocal,
29
ReserveSource,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
43
44
- public string Component_
44
+ public string ComponentRef
45
{
46
- get => (string)this.Fields[(int)ReserveCostTupleFields.Component_];
47
- set => this.Set((int)ReserveCostTupleFields.Component_, value);
46
+ get => (string)this.Fields[(int)ReserveCostTupleFields.ComponentRef];
47
+ set => this.Set((int)ReserveCostTupleFields.ComponentRef, value);
48
}
49
50
public string ReserveFolder
src/WixToolset.Data/Tuples/ServiceControlTuple.cs
+5
-5
@@ -20,7 +20,7 @@ namespace WixToolset.Data
20
new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStop), IntermediateFieldType.Bool),
21
new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Arguments), IntermediateFieldType.String),
22
new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Wait), IntermediateFieldType.Bool),
23
- new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Component_), IntermediateFieldType.String),
23
+ new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.ComponentRef), IntermediateFieldType.String),
24
},
25
typeof(ServiceControlTuple));
26
}
@@ -40,7 +40,7 @@ namespace WixToolset.Data.Tuples
40
UninstallStop,
41
Arguments,
42
Wait,
43
- Component_,
43
+ ComponentRef,
44
}
45
46
public class ServiceControlTuple : IntermediateTuple
@@ -115,10 +115,10 @@ namespace WixToolset.Data.Tuples
115
set => this.Set((int)ServiceControlTupleFields.Wait, value);
116
}
117
118
- public string Component_
118
+ public string ComponentRef
119
{
120
- get => (string)this.Fields[(int)ServiceControlTupleFields.Component_];
121
- set => this.Set((int)ServiceControlTupleFields.Component_, value);
120
+ get => (string)this.Fields[(int)ServiceControlTupleFields.ComponentRef];
121
+ set => this.Set((int)ServiceControlTupleFields.ComponentRef, value);
122
}
123
}
124
}
\ No newline at end of file
src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+5
-5
@@ -20,7 +20,7 @@ namespace WixToolset.Data
20
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartName), IntermediateFieldType.String),
21
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Password), IntermediateFieldType.String),
22
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
23
- new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Component_), IntermediateFieldType.String),
23
+ new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ComponentRef), IntermediateFieldType.String),
24
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
25
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Interactive), IntermediateFieldType.Bool),
26
new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Vital), IntermediateFieldType.Bool),
@@ -43,7 +43,7 @@ namespace WixToolset.Data.Tuples
43
StartName,
44
Password,
45
Arguments,
46
- Component_,
46
+ ComponentRef,
47
Description,
48
Interactive,
49
Vital,
@@ -146,10 +146,10 @@ namespace WixToolset.Data.Tuples
146
set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
147
}
148
149
- public string Component_
149
+ public string ComponentRef
150
{
151
- get => (string)this.Fields[(int)ServiceInstallTupleFields.Component_];
152
- set => this.Set((int)ServiceInstallTupleFields.Component_, value);
151
+ get => (string)this.Fields[(int)ServiceInstallTupleFields.ComponentRef];
152
+ set => this.Set((int)ServiceInstallTupleFields.ComponentRef, value);
153
}
154
155
public string Description
src/WixToolset.Data/Tuples/ShortcutTuple.cs
+15
-15
@@ -10,14 +10,14 @@ namespace WixToolset.Data
10
TupleDefinitionType.Shortcut,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Directory_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Component_), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Description), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Hotkey), IntermediateFieldType.Number),
20
- new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Icon_), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconRef), IntermediateFieldType.String),
21
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
22
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Show), IntermediateFieldType.Number),
23
new IntermediateFieldDefinition(nameof(ShortcutTupleFields.WkDir), IntermediateFieldType.String),
@@ -34,14 +34,14 @@ namespace WixToolset.Data.Tuples
34
{
35
public enum ShortcutTupleFields
36
{
37
- Directory_,
37
+ DirectoryRef,
38
Name,
39
- Component_,
39
+ ComponentRef,
40
Target,
41
Arguments,
42
Description,
43
Hotkey,
44
- Icon_,
44
+ IconRef,
45
IconIndex,
46
Show,
47
WkDir,
@@ -70,10 +70,10 @@ namespace WixToolset.Data.Tuples
70
71
public IntermediateField this[ShortcutTupleFields index] => this.Fields[(int)index];
72
73
- public string Directory_
73
+ public string DirectoryRef
74
{
75
- get => (string)this.Fields[(int)ShortcutTupleFields.Directory_];
76
- set => this.Set((int)ShortcutTupleFields.Directory_, value);
75
+ get => (string)this.Fields[(int)ShortcutTupleFields.DirectoryRef];
76
+ set => this.Set((int)ShortcutTupleFields.DirectoryRef, value);
77
}
78
79
public string Name
@@ -82,10 +82,10 @@ namespace WixToolset.Data.Tuples
82
set => this.Set((int)ShortcutTupleFields.Name, value);
83
}
84
85
- public string Component_
85
+ public string ComponentRef
86
{
87
- get => (string)this.Fields[(int)ShortcutTupleFields.Component_];
88
- set => this.Set((int)ShortcutTupleFields.Component_, value);
87
+ get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
88
+ set => this.Set((int)ShortcutTupleFields.ComponentRef, value);
89
}
90
91
public string Target
@@ -112,10 +112,10 @@ namespace WixToolset.Data.Tuples
112
set => this.Set((int)ShortcutTupleFields.Hotkey, value);
113
}
114
115
- public string Icon_
115
+ public string IconRef
116
{
117
- get => (string)this.Fields[(int)ShortcutTupleFields.Icon_];
118
- set => this.Set((int)ShortcutTupleFields.Icon_, value);
117
+ get => (string)this.Fields[(int)ShortcutTupleFields.IconRef];
118
+ set => this.Set((int)ShortcutTupleFields.IconRef, value);
119
}
120
121
public int? IconIndex
src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
new
+84
@@ -0,0 +1,84 @@
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.Data
4
+{
5
+ using WixToolset.Data.Tuples;
6
+
7
+ public static partial class TupleDefinitions
8
+ {
9
+ public static readonly IntermediateTupleDefinition TargetFilesOptionalData = new IntermediateTupleDefinition(
10
+ TupleDefinitionType.TargetFilesOptionalData,
11
+ new[]
12
+ {
13
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.Target), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
19
+ },
20
+ typeof(TargetFilesOptionalDataTuple));
21
+ }
22
+}
23
+
24
+namespace WixToolset.Data.Tuples
25
+{
26
+ public enum TargetFilesOptionalDataTupleFields
27
+ {
28
+ Target,
29
+ FTK,
30
+ SymbolPaths,
31
+ IgnoreOffsets,
32
+ IgnoreLengths,
33
+ RetainOffsets,
34
+ }
35
+
36
+ public class TargetFilesOptionalDataTuple : IntermediateTuple
37
+ {
38
+ public TargetFilesOptionalDataTuple() : base(TupleDefinitions.TargetFilesOptionalData, null, null)
39
+ {
40
+ }
41
+
42
+ public TargetFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
43
+ {
44
+ }
45
+
46
+ public IntermediateField this[TargetFilesOptionalDataTupleFields index] => this.Fields[(int)index];
47
+
48
+ public string Target
49
+ {
50
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.Target];
51
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.Target, value);
52
+ }
53
+
54
+ public string FTK
55
+ {
56
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.FTK];
57
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.FTK, value);
58
+ }
59
+
60
+ public string SymbolPaths
61
+ {
62
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.SymbolPaths];
63
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.SymbolPaths, value);
64
+ }
65
+
66
+ public string IgnoreOffsets
67
+ {
68
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreOffsets];
69
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreOffsets, value);
70
+ }
71
+
72
+ public string IgnoreLengths
73
+ {
74
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreLengths];
75
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreLengths, value);
76
+ }
77
+
78
+ public string RetainOffsets
79
+ {
80
+ get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.RetainOffsets];
81
+ set => this.Set((int)TargetFilesOptionalDataTupleFields.RetainOffsets, value);
82
+ }
83
+ }
84
+}
\ No newline at end of file
src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
deleted
-84
@@ -1,84 +0,0 @@
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.Data
4
-{
5
- using WixToolset.Data.Tuples;
6
-
7
- public static partial class TupleDefinitions
8
- {
9
- public static readonly IntermediateTupleDefinition TargetFiles_OptionalData = new IntermediateTupleDefinition(
10
- TupleDefinitionType.TargetFiles_OptionalData,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.Target), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
19
- },
20
- typeof(TargetFiles_OptionalDataTuple));
21
- }
22
-}
23
-
24
-namespace WixToolset.Data.Tuples
25
-{
26
- public enum TargetFiles_OptionalDataTupleFields
27
- {
28
- Target,
29
- FTK,
30
- SymbolPaths,
31
- IgnoreOffsets,
32
- IgnoreLengths,
33
- RetainOffsets,
34
- }
35
-
36
- public class TargetFiles_OptionalDataTuple : IntermediateTuple
37
- {
38
- public TargetFiles_OptionalDataTuple() : base(TupleDefinitions.TargetFiles_OptionalData, null, null)
39
- {
40
- }
41
-
42
- public TargetFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFiles_OptionalData, sourceLineNumber, id)
43
- {
44
- }
45
-
46
- public IntermediateField this[TargetFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
47
-
48
- public string Target
49
- {
50
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.Target];
51
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.Target, value);
52
- }
53
-
54
- public string FTK
55
- {
56
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.FTK];
57
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.FTK, value);
58
- }
59
-
60
- public string SymbolPaths
61
- {
62
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.SymbolPaths];
63
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.SymbolPaths, value);
64
- }
65
-
66
- public string IgnoreOffsets
67
- {
68
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets];
69
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets, value);
70
- }
71
-
72
- public string IgnoreLengths
73
- {
74
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreLengths];
75
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreLengths, value);
76
- }
77
-
78
- public string RetainOffsets
79
- {
80
- get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.RetainOffsets];
81
- set => this.Set((int)TargetFiles_OptionalDataTupleFields.RetainOffsets, value);
82
- }
83
- }
84
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/TupleDefinitions.cs
+6
-6
@@ -113,13 +113,13 @@ namespace WixToolset.Data
113
SFPCatalog,
114
Shortcut,
115
Signature,
116
- TargetFiles_OptionalData,
116
+ TargetFilesOptionalData,
117
TargetImages,
118
TextStyle,
119
TypeLib,
120
UIText,
121
Upgrade,
122
- UpgradedFiles_OptionalData,
122
+ UpgradedFilesOptionalData,
123
UpgradedFilesToIgnore,
124
UpgradedImages,
125
Verb,
@@ -531,8 +531,8 @@ namespace WixToolset.Data
531
case TupleDefinitionType.Signature:
532
return TupleDefinitions.Signature;
533
534
- case TupleDefinitionType.TargetFiles_OptionalData:
535
- return TupleDefinitions.TargetFiles_OptionalData;
534
+ case TupleDefinitionType.TargetFilesOptionalData:
535
+ return TupleDefinitions.TargetFilesOptionalData;
536
537
case TupleDefinitionType.TargetImages:
538
return TupleDefinitions.TargetImages;
@@ -549,8 +549,8 @@ namespace WixToolset.Data
549
case TupleDefinitionType.Upgrade:
550
return TupleDefinitions.Upgrade;
551
552
- case TupleDefinitionType.UpgradedFiles_OptionalData:
553
- return TupleDefinitions.UpgradedFiles_OptionalData;
552
+ case TupleDefinitionType.UpgradedFilesOptionalData:
553
+ return TupleDefinitions.UpgradedFilesOptionalData;
554
555
case TupleDefinitionType.UpgradedFilesToIgnore:
556
return TupleDefinitions.UpgradedFilesToIgnore;
src/WixToolset.Data/Tuples/TypeLibTuple.cs
+15
-15
@@ -12,11 +12,11 @@ namespace WixToolset.Data
12
{
13
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
15
- new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Component_), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(TypeLibTupleFields.ComponentRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Description), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Directory_), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Feature_), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(TypeLibTupleFields.DirectoryRef), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(TypeLibTupleFields.FeatureRef), IntermediateFieldType.String),
20
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Cost), IntermediateFieldType.Number),
21
},
22
typeof(TypeLibTuple));
@@ -29,11 +29,11 @@ namespace WixToolset.Data.Tuples
29
{
30
LibId,
31
Language,
32
- Component_,
32
+ ComponentRef,
33
Version,
34
Description,
35
- Directory_,
36
- Feature_,
35
+ DirectoryRef,
36
+ FeatureRef,
37
Cost,
38
}
39
@@ -61,10 +61,10 @@ namespace WixToolset.Data.Tuples
61
set => this.Set((int)TypeLibTupleFields.Language, value);
62
}
63
64
- public string Component_
64
+ public string ComponentRef
65
{
66
- get => (string)this.Fields[(int)TypeLibTupleFields.Component_];
67
- set => this.Set((int)TypeLibTupleFields.Component_, value);
66
+ get => (string)this.Fields[(int)TypeLibTupleFields.ComponentRef];
67
+ set => this.Set((int)TypeLibTupleFields.ComponentRef, value);
68
}
69
70
public int Version
@@ -79,16 +79,16 @@ namespace WixToolset.Data.Tuples
79
set => this.Set((int)TypeLibTupleFields.Description, value);
80
}
81
82
- public string Directory_
82
+ public string DirectoryRef
83
{
84
- get => (string)this.Fields[(int)TypeLibTupleFields.Directory_];
85
- set => this.Set((int)TypeLibTupleFields.Directory_, value);
84
+ get => (string)this.Fields[(int)TypeLibTupleFields.DirectoryRef];
85
+ set => this.Set((int)TypeLibTupleFields.DirectoryRef, value);
86
}
87
88
- public string Feature_
88
+ public string FeatureRef
89
{
90
- get => (string)this.Fields[(int)TypeLibTupleFields.Feature_];
91
- set => this.Set((int)TypeLibTupleFields.Feature_, value);
90
+ get => (string)this.Fields[(int)TypeLibTupleFields.FeatureRef];
91
+ set => this.Set((int)TypeLibTupleFields.FeatureRef, value);
92
}
93
94
public int Cost
src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
new
+76
@@ -0,0 +1,76 @@
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.Data
4
+{
5
+ using WixToolset.Data.Tuples;
6
+
7
+ public static partial class TupleDefinitions
8
+ {
9
+ public static readonly IntermediateTupleDefinition UpgradedFilesOptionalData = new IntermediateTupleDefinition(
10
+ TupleDefinitionType.UpgradedFilesOptionalData,
11
+ new[]
12
+ {
13
+ new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
17
+ new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
18
+ },
19
+ typeof(UpgradedFilesOptionalDataTuple));
20
+ }
21
+}
22
+
23
+namespace WixToolset.Data.Tuples
24
+{
25
+ public enum UpgradedFilesOptionalDataTupleFields
26
+ {
27
+ Upgraded,
28
+ FTK,
29
+ SymbolPaths,
30
+ AllowIgnoreOnPatchError,
31
+ IncludeWholeFile,
32
+ }
33
+
34
+ public class UpgradedFilesOptionalDataTuple : IntermediateTuple
35
+ {
36
+ public UpgradedFilesOptionalDataTuple() : base(TupleDefinitions.UpgradedFilesOptionalData, null, null)
37
+ {
38
+ }
39
+
40
+ public UpgradedFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
41
+ {
42
+ }
43
+
44
+ public IntermediateField this[UpgradedFilesOptionalDataTupleFields index] => this.Fields[(int)index];
45
+
46
+ public string Upgraded
47
+ {
48
+ get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.Upgraded];
49
+ set => this.Set((int)UpgradedFilesOptionalDataTupleFields.Upgraded, value);
50
+ }
51
+
52
+ public string FTK
53
+ {
54
+ get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.FTK];
55
+ set => this.Set((int)UpgradedFilesOptionalDataTupleFields.FTK, value);
56
+ }
57
+
58
+ public string SymbolPaths
59
+ {
60
+ get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.SymbolPaths];
61
+ set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value);
62
+ }
63
+
64
+ public bool AllowIgnoreOnPatchError
65
+ {
66
+ get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
67
+ set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value);
68
+ }
69
+
70
+ public bool IncludeWholeFile
71
+ {
72
+ get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
73
+ set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value);
74
+ }
75
+ }
76
+}
src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
deleted
-76
@@ -1,76 +0,0 @@
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.Data
4
-{
5
- using WixToolset.Data.Tuples;
6
-
7
- public static partial class TupleDefinitions
8
- {
9
- public static readonly IntermediateTupleDefinition UpgradedFiles_OptionalData = new IntermediateTupleDefinition(
10
- TupleDefinitionType.UpgradedFiles_OptionalData,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
17
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
18
- },
19
- typeof(UpgradedFiles_OptionalDataTuple));
20
- }
21
-}
22
-
23
-namespace WixToolset.Data.Tuples
24
-{
25
- public enum UpgradedFiles_OptionalDataTupleFields
26
- {
27
- Upgraded,
28
- FTK,
29
- SymbolPaths,
30
- AllowIgnoreOnPatchError,
31
- IncludeWholeFile,
32
- }
33
-
34
- public class UpgradedFiles_OptionalDataTuple : IntermediateTuple
35
- {
36
- public UpgradedFiles_OptionalDataTuple() : base(TupleDefinitions.UpgradedFiles_OptionalData, null, null)
37
- {
38
- }
39
-
40
- public UpgradedFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFiles_OptionalData, sourceLineNumber, id)
41
- {
42
- }
43
-
44
- public IntermediateField this[UpgradedFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
45
-
46
- public string Upgraded
47
- {
48
- get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.Upgraded];
49
- set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.Upgraded, value);
50
- }
51
-
52
- public string FTK
53
- {
54
- get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.FTK];
55
- set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.FTK, value);
56
- }
57
-
58
- public string SymbolPaths
59
- {
60
- get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths];
61
- set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths, value);
62
- }
63
-
64
- public bool AllowIgnoreOnPatchError
65
- {
66
- get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError];
67
- set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError, value);
68
- }
69
-
70
- public bool IncludeWholeFile
71
- {
72
- get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile];
73
- set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile, value);
74
- }
75
- }
76
-}
src/WixToolset.Data/Tuples/VerbTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.Verb,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(VerbTupleFields.Extension_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(VerbTupleFields.ExtensionRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(VerbTupleFields.Verb), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(VerbTupleFields.Sequence), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(VerbTupleFields.Command), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum VerbTupleFields
26
{
27
- Extension_,
27
+ ExtensionRef,
28
Verb,
29
Sequence,
30
Command,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[VerbTupleFields index] => this.Fields[(int)index];
45
46
- public string Extension_
46
+ public string ExtensionRef
47
{
48
- get => (string)this.Fields[(int)VerbTupleFields.Extension_];
49
- set => this.Set((int)VerbTupleFields.Extension_, value);
48
+ get => (string)this.Fields[(int)VerbTupleFields.ExtensionRef];
49
+ set => this.Set((int)VerbTupleFields.ExtensionRef, value);
50
}
51
52
public string Verb
src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBindUpdatedFiles,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.File_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.FileRef), IntermediateFieldType.String),
14
},
15
typeof(WixBindUpdatedFilesTuple));
16
}
@@ -20,7 +20,7 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum WixBindUpdatedFilesTupleFields
22
{
23
- File_,
23
+ FileRef,
24
}
25
26
public class WixBindUpdatedFilesTuple : IntermediateTuple
@@ -35,10 +35,10 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[WixBindUpdatedFilesTupleFields index] => this.Fields[(int)index];
37
38
- public string File_
38
+ public string FileRef
39
{
40
- get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.File_];
41
- set => this.Set((int)WixBindUpdatedFilesTupleFields.File_, value);
40
+ get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.FileRef];
41
+ set => this.Set((int)WixBindUpdatedFilesTupleFields.FileRef, value);
42
}
43
}
44
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
+5
-5
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.WixBundleCatalog), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.Payload_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.PayloadRef), IntermediateFieldType.String),
15
},
16
typeof(WixBundleCatalogTuple));
17
}
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
public enum WixBundleCatalogTupleFields
23
{
24
WixBundleCatalog,
25
- Payload_,
25
+ PayloadRef,
26
}
27
28
public class WixBundleCatalogTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)WixBundleCatalogTupleFields.WixBundleCatalog, value);
44
}
45
46
- public string Payload_
46
+ public string PayloadRef
47
{
48
- get => (string)this.Fields[(int)WixBundleCatalogTupleFields.Payload_];
49
- set => this.Set((int)WixBundleCatalogTupleFields.Payload_, value);
48
+ get => (string)this.Fields[(int)WixBundleCatalogTupleFields.PayloadRef];
49
+ set => this.Set((int)WixBundleCatalogTupleFields.PayloadRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleExePackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.Attributes), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.DetectCondition), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.InstallCommand), IntermediateFieldType.String),
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
28
29
public enum WixBundleExePackageTupleFields
30
{
31
- WixBundlePackage_,
31
+ WixBundlePackageRef,
32
Attributes,
33
DetectCondition,
34
InstallCommand,
@@ -55,10 +55,10 @@ namespace WixToolset.Data.Tuples
55
56
public IntermediateField this[WixBundleExePackageTupleFields index] => this.Fields[(int)index];
57
58
- public string WixBundlePackage_
58
+ public string WixBundlePackageRef
59
{
60
- get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackage_];
61
- set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackage_, value);
60
+ get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackageRef];
61
+ set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackageRef, value);
62
}
63
64
public WixBundleExePackageAttributes Attributes
src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleMsiFeature,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Name), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Size), IntermediateFieldType.Number),
16
new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Parent), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
29
{
30
public enum WixBundleMsiFeatureTupleFields
31
{
32
- WixBundlePackage_,
32
+ WixBundlePackageRef,
33
Name,
34
Size,
35
Parent,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
53
54
public IntermediateField this[WixBundleMsiFeatureTupleFields index] => this.Fields[(int)index];
55
56
- public string WixBundlePackage_
56
+ public string WixBundlePackageRef
57
{
58
- get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackage_];
59
- set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackage_, value);
58
+ get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackageRef];
59
+ set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackageRef, value);
60
}
61
62
public string Name
src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleMsiPackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Attributes), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductCode), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.UpgradeCode), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
29
30
public enum WixBundleMsiPackageTupleFields
31
{
32
- WixBundlePackage_,
32
+ WixBundlePackageRef,
33
Attributes,
34
ProductCode,
35
UpgradeCode,
@@ -60,10 +60,10 @@ namespace WixToolset.Data.Tuples
60
61
public IntermediateField this[WixBundleMsiPackageTupleFields index] => this.Fields[(int)index];
62
63
- public string WixBundlePackage_
63
+ public string WixBundlePackageRef
64
{
65
- get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackage_];
66
- set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackage_, value);
65
+ get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackageRef];
66
+ set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackageRef, value);
67
}
68
69
public WixBundleMsiPackageAttributes Attributes
src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleMsiProperty,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Name), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Value), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Condition), IntermediateFieldType.String),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum WixBundleMsiPropertyTupleFields
25
{
26
- WixBundlePackage_,
26
+ WixBundlePackageRef,
27
Name,
28
Value,
29
Condition,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixBundleMsiPropertyTupleFields index] => this.Fields[(int)index];
43
44
- public string WixBundlePackage_
44
+ public string WixBundlePackageRef
45
{
46
- get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackage_];
47
- set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackage_, value);
46
+ get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackageRef];
47
+ set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackageRef, value);
48
}
49
50
public string Name
src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleMspPackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Attributes), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchCode), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Manufacturer), IntermediateFieldType.String),
@@ -26,7 +26,7 @@ namespace WixToolset.Data.Tuples
26
27
public enum WixBundleMspPackageTupleFields
28
{
29
- WixBundlePackage_,
29
+ WixBundlePackageRef,
30
Attributes,
31
PatchCode,
32
Manufacturer,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
53
54
public IntermediateField this[WixBundleMspPackageTupleFields index] => this.Fields[(int)index];
55
56
- public string WixBundlePackage_
56
+ public string WixBundlePackageRef
57
{
58
- get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackage_];
59
- set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackage_, value);
58
+ get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackageRef];
59
+ set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackageRef, value);
60
}
61
62
public WixBundleMspPackageAttributes Attributes
src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleMsuPackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.DetectCondition), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.MsuKB), IntermediateFieldType.String),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum WixBundleMsuPackageTupleFields
24
{
25
- WixBundlePackage_,
25
+ WixBundlePackageRef,
26
DetectCondition,
27
MsuKB,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[WixBundleMsuPackageTupleFields index] => this.Fields[(int)index];
41
42
- public string WixBundlePackage_
42
+ public string WixBundlePackageRef
43
{
44
- get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackage_];
45
- set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackage_, value);
44
+ get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackageRef];
45
+ set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackageRef, value);
46
}
47
48
public string DetectCondition
src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundlePackageCommandLine,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackage_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.InstallArgument), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.UninstallArgument), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.RepairArgument), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum WixBundlePackageCommandLineTupleFields
26
{
27
- WixBundlePackage_,
27
+ WixBundlePackageRef,
28
InstallArgument,
29
UninstallArgument,
30
RepairArgument,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[WixBundlePackageCommandLineTupleFields index] => this.Fields[(int)index];
45
46
- public string WixBundlePackage_
46
+ public string WixBundlePackageRef
47
{
48
- get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_];
49
- set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_, value);
48
+ get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef];
49
+ set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef, value);
50
}
51
52
public string InstallArgument
src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+25
-25
@@ -10,9 +10,9 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundlePackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.WixChainItem_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.WixChainItemRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Type), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Payload_), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PayloadRef), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Attributes), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallCondition), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Cache), IntermediateFieldType.String),
@@ -27,9 +27,9 @@ namespace WixToolset.Data
27
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Language), IntermediateFieldType.Number),
28
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.DisplayName), IntermediateFieldType.String),
29
new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Description), IntermediateFieldType.String),
30
- new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundary_), IntermediateFieldType.String),
31
- new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackward_), IntermediateFieldType.String),
32
- new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.x64), IntermediateFieldType.Number),
30
+ new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryRef), IntermediateFieldType.String),
31
+ new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
32
+ new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Win64), IntermediateFieldType.Number),
33
},
34
typeof(WixBundlePackageTuple));
35
}
@@ -41,9 +41,9 @@ namespace WixToolset.Data.Tuples
41
42
public enum WixBundlePackageTupleFields
43
{
44
- WixChainItem_,
44
+ WixChainItemRef,
45
Type,
46
- Payload_,
46
+ PayloadRef,
47
Attributes,
48
InstallCondition,
49
Cache,
@@ -58,9 +58,9 @@ namespace WixToolset.Data.Tuples
58
Language,
59
DisplayName,
60
Description,
61
- RollbackBoundary_,
62
- RollbackBoundaryBackward_,
63
- x64,
61
+ RollbackBoundaryRef,
62
+ RollbackBoundaryBackwardRef,
63
+ Win64,
64
}
65
66
/// <summary>
@@ -93,10 +93,10 @@ namespace WixToolset.Data.Tuples
93
94
public IntermediateField this[WixBundlePackageTupleFields index] => this.Fields[(int)index];
95
96
- public string WixChainItem_
96
+ public string WixChainItemRef
97
{
98
- get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItem_];
99
- set => this.Set((int)WixBundlePackageTupleFields.WixChainItem_, value);
98
+ get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItemRef];
99
+ set => this.Set((int)WixBundlePackageTupleFields.WixChainItemRef, value);
100
}
101
102
public WixBundlePackageType Type
@@ -105,10 +105,10 @@ namespace WixToolset.Data.Tuples
105
set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
106
}
107
108
- public string Payload_
108
+ public string PayloadRef
109
{
110
- get => (string)this.Fields[(int)WixBundlePackageTupleFields.Payload_];
111
- set => this.Set((int)WixBundlePackageTupleFields.Payload_, value);
110
+ get => (string)this.Fields[(int)WixBundlePackageTupleFields.PayloadRef];
111
+ set => this.Set((int)WixBundlePackageTupleFields.PayloadRef, value);
112
}
113
114
public WixBundlePackageAttributes Attributes
@@ -195,22 +195,22 @@ namespace WixToolset.Data.Tuples
195
set => this.Set((int)WixBundlePackageTupleFields.Description, value);
196
}
197
198
- public string RollbackBoundary_
198
+ public string RollbackBoundaryRef
199
{
200
- get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundary_];
201
- set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundary_, value);
200
+ get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryRef];
201
+ set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryRef, value);
202
}
203
204
- public string RollbackBoundaryBackward_
204
+ public string RollbackBoundaryBackwardRef
205
{
206
- get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackward_];
207
- set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackward_, value);
206
+ get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef];
207
+ set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef, value);
208
}
209
210
- public int x64
210
+ public int Win64
211
{
212
- get => (int)this.Fields[(int)WixBundlePackageTupleFields.x64];
213
- set => this.Set((int)WixBundlePackageTupleFields.x64, value);
212
+ get => (int)this.Fields[(int)WixBundlePackageTupleFields.Win64];
213
+ set => this.Set((int)WixBundlePackageTupleFields.Win64, value);
214
}
215
}
216
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+15
-15
@@ -24,14 +24,14 @@ namespace WixToolset.Data
24
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Hash), IntermediateFieldType.String),
25
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PublicKey), IntermediateFieldType.String),
26
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Thumbprint), IntermediateFieldType.String),
27
- new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Catalog_), IntermediateFieldType.String),
28
- new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Container_), IntermediateFieldType.String),
27
+ new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.CatalogRef), IntermediateFieldType.String),
28
+ new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContainerRef), IntermediateFieldType.String),
29
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Package), IntermediateFieldType.String),
30
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContentFile), IntermediateFieldType.Bool),
31
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EmbeddedId), IntermediateFieldType.String),
32
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.LayoutOnly), IntermediateFieldType.Number),
33
new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Packaging), IntermediateFieldType.Number),
34
- new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayload_), IntermediateFieldType.String),
34
+ new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayloadRef), IntermediateFieldType.String),
35
},
36
typeof(WixBundlePayloadTuple));
37
}
@@ -57,14 +57,14 @@ namespace WixToolset.Data.Tuples
57
Hash,
58
PublicKey,
59
Thumbprint,
60
- Catalog_,
61
- Container_,
60
+ CatalogRef,
61
+ ContainerRef,
62
Package,
63
ContentFile,
64
EmbeddedId,
65
LayoutOnly,
66
Packaging,
67
- ParentPackagePayload_,
67
+ ParentPackagePayloadRef,
68
}
69
70
public class WixBundlePayloadTuple : IntermediateTuple
@@ -163,16 +163,16 @@ namespace WixToolset.Data.Tuples
163
set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
164
}
165
166
- public string Catalog_
166
+ public string CatalogRef
167
{
168
- get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Catalog_];
169
- set => this.Set((int)WixBundlePayloadTupleFields.Catalog_, value);
168
+ get => (string)this.Fields[(int)WixBundlePayloadTupleFields.CatalogRef];
169
+ set => this.Set((int)WixBundlePayloadTupleFields.CatalogRef, value);
170
}
171
172
- public string Container_
172
+ public string ContainerRef
173
{
174
- get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Container_];
175
- set => this.Set((int)WixBundlePayloadTupleFields.Container_, value);
174
+ get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ContainerRef];
175
+ set => this.Set((int)WixBundlePayloadTupleFields.ContainerRef, value);
176
}
177
178
public string Package
@@ -205,10 +205,10 @@ namespace WixToolset.Data.Tuples
205
set => this.Set((int)WixBundlePayloadTupleFields.Packaging, value);
206
}
207
208
- public string ParentPackagePayload_
208
+ public string ParentPackagePayloadRef
209
{
210
- get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayload_];
211
- set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayload_, value);
210
+ get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayloadRef];
211
+ set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayloadRef, value);
212
}
213
}
214
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleRollbackBoundary,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.WixChainItem_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.WixChainItemRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Vital), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Transaction), IntermediateFieldType.Number),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum WixBundleRollbackBoundaryTupleFields
24
{
25
- WixChainItem_,
25
+ WixChainItemRef,
26
Vital,
27
Transaction,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[WixBundleRollbackBoundaryTupleFields index] => this.Fields[(int)index];
41
42
- public string WixChainItem_
42
+ public string WixChainItemRef
43
{
44
- get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItem_];
45
- set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItem_, value);
44
+ get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItemRef];
45
+ set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItemRef, value);
46
}
47
48
public bool? Vital
src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleSlipstreamMsp,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef), IntermediateFieldType.String),
15
},
16
typeof(WixBundleSlipstreamMspTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum WixBundleSlipstreamMspTupleFields
23
{
24
- WixBundlePackage_,
25
- WixBundlePackage_Msp,
24
+ WixBundlePackageRef,
25
+ MspWixBundlePackageRef,
26
}
27
28
public class WixBundleSlipstreamMspTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[WixBundleSlipstreamMspTupleFields index] => this.Fields[(int)index];
39
40
- public string WixBundlePackage_
40
+ public string WixBundlePackageRef
41
{
42
- get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_];
43
- set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_, value);
42
+ get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackageRef];
43
+ set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackageRef, value);
44
}
45
46
- public string WixBundlePackage_Msp
46
+ public string MspWixBundlePackageRef
47
{
48
- get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp];
49
- set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp, value);
48
+ get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef];
49
+ set => this.Set((int)WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixComponentSearch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.WixSearch_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Guid), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.ProductCode), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Attributes), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum WixComponentSearchTupleFields
25
{
26
- WixSearch_,
26
+ WixSearchRef,
27
Guid,
28
ProductCode,
29
Attributes,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixComponentSearchTupleFields index] => this.Fields[(int)index];
43
44
- public string WixSearch_
44
+ public string WixSearchRef
45
{
46
- get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_];
47
- set => this.Set((int)WixComponentSearchTupleFields.WixSearch_, value);
46
+ get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearchRef];
47
+ set => this.Set((int)WixComponentSearchTupleFields.WixSearchRef, value);
48
}
49
50
public string Guid
src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixFeatureModules,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.Feature_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMerge_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.FeatureRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMergeRef), IntermediateFieldType.String),
15
},
16
typeof(WixFeatureModulesTuple));
17
}
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum WixFeatureModulesTupleFields
23
{
24
- Feature_,
25
- WixMerge_,
24
+ FeatureRef,
25
+ WixMergeRef,
26
}
27
28
public class WixFeatureModulesTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[WixFeatureModulesTupleFields index] => this.Fields[(int)index];
39
40
- public string Feature_
40
+ public string FeatureRef
41
{
42
- get => (string)this.Fields[(int)WixFeatureModulesTupleFields.Feature_];
43
- set => this.Set((int)WixFeatureModulesTupleFields.Feature_, value);
42
+ get => (string)this.Fields[(int)WixFeatureModulesTupleFields.FeatureRef];
43
+ set => this.Set((int)WixFeatureModulesTupleFields.FeatureRef, value);
44
}
45
46
- public string WixMerge_
46
+ public string WixMergeRef
47
{
48
- get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMerge_];
49
- set => this.Set((int)WixFeatureModulesTupleFields.WixMerge_, value);
48
+ get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMergeRef];
49
+ set => this.Set((int)WixFeatureModulesTupleFields.WixMergeRef, value);
50
}
51
}
52
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixFileSearch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.WixSearch_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Path), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinVersion), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxVersion), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
29
{
30
public enum WixFileSearchTupleFields
31
{
32
- WixSearch_,
32
+ WixSearchRef,
33
Path,
34
MinVersion,
35
MaxVersion,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
53
54
public IntermediateField this[WixFileSearchTupleFields index] => this.Fields[(int)index];
55
56
- public string WixSearch_
56
+ public string WixSearchRef
57
{
58
- get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearch_];
59
- set => this.Set((int)WixFileSearchTupleFields.WixSearch_, value);
58
+ get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearchRef];
59
+ set => this.Set((int)WixFileSearchTupleFields.WixSearchRef, value);
60
}
61
62
public string Path
src/WixToolset.Data/Tuples/WixFileTuple.cs
+15
-15
@@ -11,9 +11,9 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyType), IntermediateFieldType.Number),
14
- new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyManifest), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyApplication), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixFileTupleFields.Directory_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyManifestFileRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyApplicationFileRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixFileTupleFields.DirectoryRef), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixFileTupleFields.DiskId), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(WixFileTupleFields.Source), IntermediateFieldType.Path),
19
new IntermediateFieldDefinition(nameof(WixFileTupleFields.ProcessorArchitecture), IntermediateFieldType.String),
@@ -33,9 +33,9 @@ namespace WixToolset.Data.Tuples
33
public enum WixFileTupleFields
34
{
35
AssemblyType,
36
- File_AssemblyManifest,
37
- File_AssemblyApplication,
38
- Directory_,
36
+ AssemblyManifestFileRef,
37
+ AssemblyApplicationFileRef,
38
+ DirectoryRef,
39
DiskId,
40
Source,
41
ProcessorArchitecture,
@@ -99,22 +99,22 @@ namespace WixToolset.Data.Tuples
99
set => this.Set((int)WixFileTupleFields.AssemblyType, (int)value);
100
}
101
102
- public string File_AssemblyManifest
102
+ public string AssemblyManifestFileRef
103
{
104
- get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyManifest];
105
- set => this.Set((int)WixFileTupleFields.File_AssemblyManifest, value);
104
+ get => (string)this.Fields[(int)WixFileTupleFields.AssemblyManifestFileRef];
105
+ set => this.Set((int)WixFileTupleFields.AssemblyManifestFileRef, value);
106
}
107
108
- public string File_AssemblyApplication
108
+ public string AssemblyApplicationFileRef
109
{
110
- get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyApplication];
111
- set => this.Set((int)WixFileTupleFields.File_AssemblyApplication, value);
110
+ get => (string)this.Fields[(int)WixFileTupleFields.AssemblyApplicationFileRef];
111
+ set => this.Set((int)WixFileTupleFields.AssemblyApplicationFileRef, value);
112
}
113
114
- public string Directory_
114
+ public string DirectoryRef
115
{
116
- get => (string)this.Fields[(int)WixFileTupleFields.Directory_];
117
- set => this.Set((int)WixFileTupleFields.Directory_, value);
116
+ get => (string)this.Fields[(int)WixFileTupleFields.DirectoryRef];
117
+ set => this.Set((int)WixFileTupleFields.DirectoryRef, value);
118
}
119
120
public int DiskId
src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixInstanceComponent,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.Component_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.ComponentRef), IntermediateFieldType.String),
14
},
15
typeof(WixInstanceComponentTuple));
16
}
@@ -20,7 +20,7 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum WixInstanceComponentTupleFields
22
{
23
- Component_,
23
+ ComponentRef,
24
}
25
26
public class WixInstanceComponentTuple : IntermediateTuple
@@ -35,10 +35,10 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[WixInstanceComponentTupleFields index] => this.Fields[(int)index];
37
38
- public string Component_
38
+ public string ComponentRef
39
{
40
- get => (string)this.Fields[(int)WixInstanceComponentTupleFields.Component_];
41
- set => this.Set((int)WixInstanceComponentTupleFields.Component_, value);
40
+ get => (string)this.Fields[(int)WixInstanceComponentTupleFields.ComponentRef];
41
+ set => this.Set((int)WixInstanceComponentTupleFields.ComponentRef, value);
42
}
43
}
44
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixMergeTuple.cs
+10
-10
@@ -11,12 +11,12 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
14
- new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DirectoryRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
16
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
17
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Bool),
18
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Feature_), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FeatureRef), IntermediateFieldType.String),
20
},
21
typeof(WixMergeTuple));
22
}
@@ -27,12 +27,12 @@ namespace WixToolset.Data.Tuples
27
public enum WixMergeTupleFields
28
{
29
Language,
30
- Directory_,
30
+ DirectoryRef,
31
SourceFile,
32
DiskId,
33
FileCompression,
34
ConfigurationData,
35
- Feature_,
35
+ FeatureRef,
36
}
37
38
public class WixMergeTuple : IntermediateTuple
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
53
set => this.Set((int)WixMergeTupleFields.Language, value);
54
}
55
56
- public string Directory_
56
+ public string DirectoryRef
57
{
58
- get => (string)this.Fields[(int)WixMergeTupleFields.Directory_];
59
- set => this.Set((int)WixMergeTupleFields.Directory_, value);
58
+ get => (string)this.Fields[(int)WixMergeTupleFields.DirectoryRef];
59
+ set => this.Set((int)WixMergeTupleFields.DirectoryRef, value);
60
}
61
62
public string SourceFile
@@ -83,10 +83,10 @@ namespace WixToolset.Data.Tuples
83
set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
84
}
85
86
- public string Feature_
86
+ public string FeatureRef
87
{
88
- get => (string)this.Fields[(int)WixMergeTupleFields.Feature_];
89
- set => this.Set((int)WixMergeTupleFields.Feature_, value);
88
+ get => (string)this.Fields[(int)WixMergeTupleFields.FeatureRef];
89
+ set => this.Set((int)WixMergeTupleFields.FeatureRef, value);
90
}
91
}
92
}
src/WixToolset.Data/Tuples/WixOrderingTuple.cs
+10
-10
@@ -11,9 +11,9 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemType), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemId_), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemIdRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnType), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnId_), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnIdRef), IntermediateFieldType.String),
17
},
18
typeof(WixOrderingTuple));
19
}
@@ -24,9 +24,9 @@ namespace WixToolset.Data.Tuples
24
public enum WixOrderingTupleFields
25
{
26
ItemType,
27
- ItemId_,
27
+ ItemIdRef,
28
DependsOnType,
29
- DependsOnId_,
29
+ DependsOnIdRef,
30
}
31
32
public class WixOrderingTuple : IntermediateTuple
@@ -47,10 +47,10 @@ namespace WixToolset.Data.Tuples
47
set => this.Set((int)WixOrderingTupleFields.ItemType, (int)value);
48
}
49
50
- public string ItemId_
50
+ public string ItemIdRef
51
{
52
- get => (string)this.Fields[(int)WixOrderingTupleFields.ItemId_];
53
- set => this.Set((int)WixOrderingTupleFields.ItemId_, value);
52
+ get => (string)this.Fields[(int)WixOrderingTupleFields.ItemIdRef];
53
+ set => this.Set((int)WixOrderingTupleFields.ItemIdRef, value);
54
}
55
56
public ComplexReferenceChildType DependsOnType
@@ -59,10 +59,10 @@ namespace WixToolset.Data.Tuples
59
set => this.Set((int)WixOrderingTupleFields.DependsOnType, (int)value);
60
}
61
62
- public string DependsOnId_
62
+ public string DependsOnIdRef
63
{
64
- get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnId_];
65
- set => this.Set((int)WixOrderingTupleFields.DependsOnId_, value);
64
+ get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnIdRef];
65
+ set => this.Set((int)WixOrderingTupleFields.DependsOnIdRef, value);
66
}
67
}
68
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixProductSearch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.WixSearch_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Guid), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Attributes), IntermediateFieldType.Number),
16
},
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum WixProductSearchTupleFields
24
{
25
- WixSearch_,
25
+ WixSearchRef,
26
Guid,
27
Attributes,
28
}
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[WixProductSearchTupleFields index] => this.Fields[(int)index];
41
42
- public string WixSearch_
42
+ public string WixSearchRef
43
{
44
- get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearch_];
45
- set => this.Set((int)WixProductSearchTupleFields.WixSearch_, value);
44
+ get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearchRef];
45
+ set => this.Set((int)WixProductSearchTupleFields.WixSearchRef, value);
46
}
47
48
public string Guid
src/WixToolset.Data/Tuples/WixPropertyTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixProperty,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Property_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.PropertyRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Admin), IntermediateFieldType.Bool),
15
new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Hidden), IntermediateFieldType.Bool),
16
new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Secure), IntermediateFieldType.Bool),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum WixPropertyTupleFields
25
{
26
- Property_,
26
+ PropertyRef,
27
Admin,
28
Hidden,
29
Secure,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixPropertyTupleFields index] => this.Fields[(int)index];
43
44
- public string Property_
44
+ public string PropertyRef
45
{
46
- get => (string)this.Fields[(int)WixPropertyTupleFields.Property_];
47
- set => this.Set((int)WixPropertyTupleFields.Property_, value);
46
+ get => (string)this.Fields[(int)WixPropertyTupleFields.PropertyRef];
47
+ set => this.Set((int)WixPropertyTupleFields.PropertyRef, value);
48
}
49
50
public bool Admin
src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixRegistrySearch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.WixSearch_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.WixSearchRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Root), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Key), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Value), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum WixRegistrySearchTupleFields
26
{
27
- WixSearch_,
27
+ WixSearchRef,
28
Root,
29
Key,
30
Value,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[WixRegistrySearchTupleFields index] => this.Fields[(int)index];
45
46
- public string WixSearch_
46
+ public string WixSearchRef
47
{
48
- get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearch_];
49
- set => this.Set((int)WixRegistrySearchTupleFields.WixSearch_, value);
48
+ get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearchRef];
49
+ set => this.Set((int)WixRegistrySearchTupleFields.WixSearchRef, value);
50
}
51
52
public int Root
src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
+10
-10
@@ -10,8 +10,8 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixSearchRelation,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearch_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentId_), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearchRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number),
16
},
17
typeof(WixSearchRelationTuple));
@@ -22,8 +22,8 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum WixSearchRelationTupleFields
24
{
25
- WixSearch_,
26
- ParentId_,
25
+ WixSearchRef,
26
+ ParentSearchRef,
27
Attributes,
28
}
29
@@ -39,16 +39,16 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index];
41
42
- public string WixSearch_
42
+ public string WixSearchRef
43
{
44
- get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearch_];
45
- set => this.Set((int)WixSearchRelationTupleFields.WixSearch_, value);
44
+ get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearchRef];
45
+ set => this.Set((int)WixSearchRelationTupleFields.WixSearchRef, value);
46
}
47
48
- public string ParentId_
48
+ public string ParentSearchRef
49
{
50
- get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentId_];
51
- set => this.Set((int)WixSearchRelationTupleFields.ParentId_, value);
50
+ get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef];
51
+ set => this.Set((int)WixSearchRelationTupleFields.ParentSearchRef, value);
52
}
53
54
public int Attributes
src/test/WixToolsetTest.Data/SerializeFixture.cs
+3
-3
@@ -22,7 +22,7 @@ namespace WixToolsetTest.Data
22
section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
23
{
24
ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
25
- Directory_ = "TestFolder",
25
+ DirectoryRef = "TestFolder",
26
Location = ComponentLocation.Either,
27
});
28
@@ -37,7 +37,7 @@ namespace WixToolsetTest.Data
37
38
Assert.Equal("TestComponent", tuple.Id.Id);
39
Assert.Equal(AccessModifier.Public, tuple.Id.Access);
40
- Assert.Equal("TestFolder", tuple.Directory_);
40
+ Assert.Equal("TestFolder", tuple.DirectoryRef);
41
Assert.Equal(ComponentLocation.Either, tuple.Location);
42
}
43
@@ -192,7 +192,7 @@ namespace WixToolsetTest.Data
192
section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
193
{
194
ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
195
- Directory_ = "TestFolder",
195
+ DirectoryRef = "TestFolder",
196
Location = ComponentLocation.Either,
197
});
198
src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+15
-15
@@ -35,8 +35,8 @@ namespace WixToolsetTest.Data
35
public void CanSetComponentFieldInFileTupleByCasting()
36
{
37
var fileTuple = (FileTuple)TupleDefinitions.File.CreateTuple();
38
- fileTuple.Component_ = "Foo";
39
- Assert.Equal("Foo", fileTuple.Component_);
38
+ fileTuple.ComponentRef = "Foo";
39
+ Assert.Equal("Foo", fileTuple.ComponentRef);
40
}
41
42
[Fact]
@@ -45,7 +45,7 @@ namespace WixToolsetTest.Data
45
var fileTuple = new FileTuple();
46
Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[0].Name);
47
Assert.Null(fileTuple.Fields[0]);
48
- fileTuple.Component_ = "Foo";
48
+ fileTuple.ComponentRef = "Foo";
49
Assert.Equal("Component_", fileTuple.Fields[0].Name);
50
Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
51
}
@@ -54,8 +54,8 @@ namespace WixToolsetTest.Data
54
public void CanSetComponentFieldInFileTupleByNew()
55
{
56
var fileTuple = new FileTuple();
57
- fileTuple.Component_ = "Foo";
58
- Assert.Equal("Foo", fileTuple.Component_);
57
+ fileTuple.ComponentRef = "Foo";
58
+ Assert.Equal("Foo", fileTuple.ComponentRef);
59
}
60
61
[Fact]
@@ -64,9 +64,9 @@ namespace WixToolsetTest.Data
64
using (new IntermediateFieldContext("bar"))
65
{
66
var fileTuple = new FileTuple();
67
- fileTuple.Component_ = "Foo";
67
+ fileTuple.ComponentRef = "Foo";
68
69
- var field = fileTuple[FileTupleFields.Component_];
69
+ var field = fileTuple[FileTupleFields.ComponentRef];
70
Assert.Equal("Foo", field.AsString());
71
Assert.Equal("bar", field.Context);
72
}
@@ -79,17 +79,17 @@ namespace WixToolsetTest.Data
79
80
using (new IntermediateFieldContext("bar"))
81
{
82
- fileTuple.Component_ = "Foo";
82
+ fileTuple.ComponentRef = "Foo";
83
84
- var field = fileTuple[FileTupleFields.Component_];
84
+ var field = fileTuple[FileTupleFields.ComponentRef];
85
Assert.Equal("Foo", field.AsString());
86
Assert.Equal("bar", field.Context);
87
88
using (new IntermediateFieldContext("baz"))
89
{
90
- fileTuple.Component_ = "Foo2";
90
+ fileTuple.ComponentRef = "Foo2";
91
92
- field = fileTuple[FileTupleFields.Component_];
92
+ field = fileTuple[FileTupleFields.ComponentRef];
93
Assert.Equal("Foo2", field.AsString());
94
Assert.Equal("baz", field.Context);
95
@@ -97,9 +97,9 @@ namespace WixToolsetTest.Data
97
Assert.Equal("bar", field.PreviousValue.Context);
98
}
99
100
- fileTuple.Component_ = "Foo3";
100
+ fileTuple.ComponentRef = "Foo3";
101
102
- field = fileTuple[FileTupleFields.Component_];
102
+ field = fileTuple[FileTupleFields.ComponentRef];
103
Assert.Equal("Foo3", field.AsString());
104
Assert.Equal("bar", field.Context);
105
@@ -110,9 +110,9 @@ namespace WixToolsetTest.Data
110
Assert.Equal("bar", field.PreviousValue.PreviousValue.Context);
111
}
112
113
- fileTuple.Component_ = "Foo4";
113
+ fileTuple.ComponentRef = "Foo4";
114
115
- var fieldOutside = fileTuple[FileTupleFields.Component_];
115
+ var fieldOutside = fileTuple[FileTupleFields.ComponentRef];
116
Assert.Equal("Foo4", fieldOutside.AsString());
117
Assert.Null(fieldOutside.Context);
118
}