Implement many more strong tuples
Also fixes several warnings.
Rob Mensching committed
May 22, 2019 at 00:19 UTC
54541ef517190f37d0625627b028834f0871a959
66 files changed
+391
-1047
src/WixToolset.Data/CompressionLevel.cs
+2
-2
@@ -1,4 +1,4 @@
1
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
1
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
namespace WixToolset.Data
4
{
@@ -22,4 +22,4 @@ namespace WixToolset.Data
22
/// <summary>Use ms-zip compression.</summary>
23
Mszip
24
}
25
-}
\ No newline at end of file
25
+}
src/WixToolset.Data/ErrorMessages.cs
+6
@@ -1954,6 +1954,11 @@ namespace WixToolset.Data
1954
return Message(null, Ids.UnableToGetAuthenticodeCertOfFileDownlevelOS, "Unable to get the authenticode certificate of '{0}'. The cryptography API has limitations on Windows XP and Windows Server 2003. More information: {1}", filePath, moreInformation);
1955
}
1956
1957
+ public static Message UnableToConvertFieldToNumber(string value)
1958
+ {
1959
+ return Message(null, Ids.UnableToConvertFieldToNumber, "Unable to convert intermediate tuple field value '{0}' to a number. This means the intermediate is corrupt or of an unsupported version.", value);
1960
+ }
1961
+
1962
public static Message UnableToOpenModule(SourceLineNumber sourceLineNumbers, string modulePath, string message)
1963
{
1964
return Message(sourceLineNumbers, Ids.UnableToOpenModule, "Unable to open merge module '{0}'. Check to make sure the module language is correct. '{1}'", modulePath, message);
@@ -2634,6 +2639,7 @@ namespace WixToolset.Data
2639
MsiTransactionX86BeforeX64 = 390,
2640
NoSourceFiles = 391,
2641
WixiplSourceFileIsExclusive = 392,
2642
+ UnableToConvertFieldToNumber = 393,
2643
}
2644
}
2645
}
src/WixToolset.Data/IntermediateFieldExtensions.cs
+6
-1
@@ -1,4 +1,4 @@
1
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
1
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
namespace WixToolset.Data
4
{
@@ -151,6 +151,11 @@ namespace WixToolset.Data
151
}
152
}
153
154
+ public static object AsObject(this IntermediateField field)
155
+ {
156
+ return field?.Value.Data;
157
+ }
158
+
159
public static IntermediateField Set(this IntermediateField field, bool value)
160
{
161
object data;
src/WixToolset.Data/IntermediateFieldValueExtensions.cs
+8
-1
@@ -71,7 +71,14 @@ namespace WixToolset.Data
71
}
72
else if (value.Data is string s)
73
{
74
- return Convert.ToInt32(s);
74
+ try
75
+ {
76
+ return Convert.ToInt32(s);
77
+ }
78
+ catch (FormatException)
79
+ {
80
+ throw new WixException(ErrorMessages.UnableToConvertFieldToNumber(s));
81
+ }
82
}
83
84
return (int)value.Data;
src/WixToolset.Data/Tuples/BillboardTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Billboard,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(BillboardTupleFields.Billboard), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(BillboardTupleFields.Feature_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
@@ -23,7 +22,6 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum BillboardTupleFields
24
{
26
- Billboard,
25
Feature_,
26
Action,
27
Ordering,
@@ -41,12 +39,6 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
41
44
- public string Billboard
45
- {
46
- get => (string)this.Fields[(int)BillboardTupleFields.Billboard];
47
- set => this.Set((int)BillboardTupleFields.Billboard, value);
48
- }
49
-
42
public string Feature_
43
{
44
get => (string)this.Fields[(int)BillboardTupleFields.Feature_];
src/WixToolset.Data/Tuples/BinaryTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Binary,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(BinaryTupleFields.Name), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(BinaryTupleFields.Data), IntermediateFieldType.Path),
14
},
15
typeof(BinaryTuple));
@@ -21,7 +20,6 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum BinaryTupleFields
22
{
24
- Name,
23
Data,
24
}
25
@@ -37,12 +35,6 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[BinaryTupleFields index] => this.Fields[(int)index];
37
40
- public string Name
41
- {
42
- get => (string)this.Fields[(int)BinaryTupleFields.Name];
43
- set => this.Set((int)BinaryTupleFields.Name, value);
44
- }
45
-
38
public string Data
39
{
40
get => (string)this.Fields[(int)BinaryTupleFields.Data];
src/WixToolset.Data/Tuples/BindImageTuple.cs
deleted
-52
@@ -1,52 +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 BindImage = new IntermediateTupleDefinition(
10
- TupleDefinitionType.BindImage,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(BindImageTupleFields.File_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(BindImageTupleFields.Path), IntermediateFieldType.String),
15
- },
16
- typeof(BindImageTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum BindImageTupleFields
23
- {
24
- File_,
25
- Path,
26
- }
27
-
28
- public class BindImageTuple : IntermediateTuple
29
- {
30
- public BindImageTuple() : base(TupleDefinitions.BindImage, null, null)
31
- {
32
- }
33
-
34
- public BindImageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.BindImage, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[BindImageTupleFields index] => this.Fields[(int)index];
39
-
40
- public string File_
41
- {
42
- get => (string)this.Fields[(int)BindImageTupleFields.File_];
43
- set => this.Set((int)BindImageTupleFields.File_, value);
44
- }
45
-
46
- public string Path
47
- {
48
- get => (string)this.Fields[(int)BindImageTupleFields.Path];
49
- set => this.Set((int)BindImageTupleFields.Path, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/CCPSearchTuple.cs
+1
-11
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition CCPSearch = new IntermediateTupleDefinition(
10
TupleDefinitionType.CCPSearch,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(CCPSearchTupleFields.Signature_), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(CCPSearchTuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum CCPSearchTupleFields
19
{
23
- Signature_,
20
}
21
22
public class CCPSearchTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[CCPSearchTupleFields index] => this.Fields[(int)index];
37
-
38
- public string Signature_
39
- {
40
- get => (string)this.Fields[(int)CCPSearchTupleFields.Signature_];
41
- set => this.Set((int)CCPSearchTupleFields.Signature_, value);
42
- }
33
}
34
}
\ No newline at end of file
src/WixToolset.Data/Tuples/ComponentTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Component,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ComponentTupleFields.Component), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ComponentTupleFields.Directory_), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ComponentTupleFields.Location), IntermediateFieldType.Number),
@@ -34,7 +33,6 @@ namespace WixToolset.Data.Tuples
33
{
34
public enum ComponentTupleFields
35
{
37
- Component,
36
ComponentId,
37
Directory_,
38
Location,
@@ -70,12 +68,6 @@ namespace WixToolset.Data.Tuples
68
69
public IntermediateField this[ComponentTupleFields index] => this.Fields[(int)index];
70
73
- public string Component
74
- {
75
- get => (string)this.Fields[(int)ComponentTupleFields.Component];
76
- set => this.Set((int)ComponentTupleFields.Component, value);
77
- }
78
-
71
public string ComponentId
72
{
73
get => (string)this.Fields[(int)ComponentTupleFields.ComponentId];
src/WixToolset.Data/Tuples/DirectoryTuple.cs
+10
-10
@@ -10,9 +10,9 @@ namespace WixToolset.Data
10
TupleDefinitionType.Directory,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory_Parent), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
16
},
17
typeof(DirectoryTuple));
18
}
@@ -22,9 +22,9 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum DirectoryTupleFields
24
{
25
- Directory,
25
Directory_Parent,
26
DefaultDir,
27
+ ComponentGuidGenerationSeed,
28
}
29
30
public class DirectoryTuple : IntermediateTuple
@@ -39,22 +39,22 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
41
42
- public string Directory
43
- {
44
- get => (string)this.Fields[(int)DirectoryTupleFields.Directory]?.Value;
45
- set => this.Set((int)DirectoryTupleFields.Directory, value);
46
- }
47
-
42
public string Directory_Parent
43
{
50
- get => (string)this.Fields[(int)DirectoryTupleFields.Directory_Parent]?.Value;
44
+ get => (string)this.Fields[(int)DirectoryTupleFields.Directory_Parent];
45
set => this.Set((int)DirectoryTupleFields.Directory_Parent, value);
46
}
47
48
public string DefaultDir
49
{
56
- get => (string)this.Fields[(int)DirectoryTupleFields.DefaultDir]?.Value;
50
+ get => (string)this.Fields[(int)DirectoryTupleFields.DefaultDir];
51
set => this.Set((int)DirectoryTupleFields.DefaultDir, value);
52
}
53
+
54
+ public string ComponentGuidGenerationSeed
55
+ {
56
+ get => (string)this.Fields[(int)DirectoryTupleFields.ComponentGuidGenerationSeed];
57
+ set => this.Set((int)DirectoryTupleFields.ComponentGuidGenerationSeed, value);
58
+ }
59
}
60
}
\ No newline at end of file
src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.DuplicateFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileKey), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.File_), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestName), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum DuplicateFileTupleFields
25
{
27
- FileKey,
26
Component_,
27
File_,
28
DestName,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
43
46
- public string FileKey
47
- {
48
- get => (string)this.Fields[(int)DuplicateFileTupleFields.FileKey];
49
- set => this.Set((int)DuplicateFileTupleFields.FileKey, value);
50
- }
51
-
44
public string Component_
45
{
46
get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_];
src/WixToolset.Data/Tuples/FileTuple.cs
+24
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.File,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(FileTupleFields.File), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(FileTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(FileTupleFields.ShortFileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(FileTupleFields.LongFileName), IntermediateFieldType.String),
@@ -23,6 +22,9 @@ namespace WixToolset.Data
22
new IntermediateFieldDefinition(nameof(FileTupleFields.Vital), IntermediateFieldType.Bool),
23
new IntermediateFieldDefinition(nameof(FileTupleFields.Checksum), IntermediateFieldType.Bool),
24
new IntermediateFieldDefinition(nameof(FileTupleFields.Compressed), IntermediateFieldType.Bool),
25
+ new IntermediateFieldDefinition(nameof(FileTupleFields.FontTitle), IntermediateFieldType.String),
26
+ new IntermediateFieldDefinition(nameof(FileTupleFields.SelfRegCost), IntermediateFieldType.Number),
27
+ new IntermediateFieldDefinition(nameof(FileTupleFields.BindPath), IntermediateFieldType.String),
28
},
29
typeof(FileTuple));
30
}
@@ -32,7 +34,6 @@ namespace WixToolset.Data.Tuples
34
{
35
public enum FileTupleFields
36
{
35
- File,
37
Component_,
38
ShortFileName,
39
LongFileName,
@@ -45,6 +46,9 @@ namespace WixToolset.Data.Tuples
46
Vital,
47
Checksum,
48
Compressed,
49
+ FontTitle,
50
+ SelfRegCost,
51
+ BindPath,
52
}
53
54
public class FileTuple : IntermediateTuple
@@ -59,12 +63,6 @@ namespace WixToolset.Data.Tuples
63
64
public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
65
62
- public string File
63
- {
64
- get => (string)this.Fields[(int)FileTupleFields.File];
65
- set => this.Set((int)FileTupleFields.File, value);
66
- }
67
-
66
public string Component_
67
{
68
get => (string)this.Fields[(int)FileTupleFields.Component_];
@@ -136,5 +134,23 @@ namespace WixToolset.Data.Tuples
134
get => (bool?)this.Fields[(int)FileTupleFields.Compressed];
135
set => this.Set((int)FileTupleFields.Compressed, value);
136
}
137
+
138
+ public string FontTitle
139
+ {
140
+ get => (string)this.Fields[(int)FileTupleFields.FontTitle];
141
+ set => this.Set((int)FileTupleFields.FontTitle, value);
142
+ }
143
+
144
+ public int? SelfRegCost
145
+ {
146
+ get => (int?)this.Fields[(int)FileTupleFields.SelfRegCost];
147
+ set => this.Set((int)FileTupleFields.SelfRegCost, value);
148
+ }
149
+
150
+ public string BindPath
151
+ {
152
+ get => (string)this.Fields[(int)FileTupleFields.BindPath];
153
+ set => this.Set((int)FileTupleFields.BindPath, value);
154
+ }
155
}
156
}
src/WixToolset.Data/Tuples/FontTuple.cs
deleted
-52
@@ -1,52 +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 Font = new IntermediateTupleDefinition(
10
- TupleDefinitionType.Font,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(FontTupleFields.File_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(FontTupleFields.FontTitle), IntermediateFieldType.String),
15
- },
16
- typeof(FontTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum FontTupleFields
23
- {
24
- File_,
25
- FontTitle,
26
- }
27
-
28
- public class FontTuple : IntermediateTuple
29
- {
30
- public FontTuple() : base(TupleDefinitions.Font, null, null)
31
- {
32
- }
33
-
34
- public FontTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Font, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[FontTupleFields index] => this.Fields[(int)index];
39
-
40
- public string File_
41
- {
42
- get => (string)this.Fields[(int)FontTupleFields.File_];
43
- set => this.Set((int)FontTupleFields.File_, value);
44
- }
45
-
46
- public string FontTitle
47
- {
48
- get => (string)this.Fields[(int)FontTupleFields.FontTitle];
49
- set => this.Set((int)FontTupleFields.FontTitle, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/IconTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Icon,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(IconTupleFields.Name), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(IconTupleFields.Data), IntermediateFieldType.Path),
14
},
15
typeof(IconTuple));
@@ -21,7 +20,6 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum IconTupleFields
22
{
24
- Name,
23
Data,
24
}
25
@@ -37,12 +35,6 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[IconTupleFields index] => this.Fields[(int)index];
37
40
- public string Name
41
- {
42
- get => (string)this.Fields[(int)IconTupleFields.Name];
43
- set => this.Set((int)IconTupleFields.Name, value);
44
- }
45
-
38
public string Data
39
{
40
get => (string)this.Fields[(int)IconTupleFields.Data];
src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
+2
-2
@@ -63,9 +63,9 @@ namespace WixToolset.Data.Tuples
63
set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
64
}
65
66
- public int FileSequenceStart
66
+ public int? FileSequenceStart
67
{
68
- get => (int)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart];
68
+ get => (int?)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart];
69
set => this.Set((int)ImageFamiliesTupleFields.FileSequenceStart, value);
70
}
71
src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+1
-1
@@ -49,4 +49,4 @@ namespace WixToolset.Data.Tuples
49
set => this.Set((int)IsolatedComponentTupleFields.Component_Application, value);
50
}
51
}
52
-}
\ No newline at end of file
52
+}
src/WixToolset.Data/Tuples/MediaTuple.cs
+17
-1
@@ -16,6 +16,8 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(MediaTupleFields.Cabinet), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(MediaTupleFields.VolumeLabel), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(MediaTupleFields.Source), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(MediaTupleFields.CompressionLevel), IntermediateFieldType.Number),
20
+ new IntermediateFieldDefinition(nameof(MediaTupleFields.Layout), IntermediateFieldType.String),
21
},
22
typeof(MediaTuple));
23
}
@@ -31,6 +33,8 @@ namespace WixToolset.Data.Tuples
33
Cabinet,
34
VolumeLabel,
35
Source,
36
+ CompressionLevel,
37
+ Layout,
38
}
39
40
public class MediaTuple : IntermediateTuple
@@ -80,5 +84,17 @@ namespace WixToolset.Data.Tuples
84
get => (string)this.Fields[(int)MediaTupleFields.Source];
85
set => this.Set((int)MediaTupleFields.Source, value);
86
}
87
+
88
+ public CompressionLevel? CompressionLevel
89
+ {
90
+ get => (CompressionLevel?)this.Fields[(int)MediaTupleFields.CompressionLevel].AsNullableNumber();
91
+ set => this.Set((int)MediaTupleFields.CompressionLevel, (int?)value);
92
+ }
93
+
94
+ public string Layout
95
+ {
96
+ get => (string)this.Fields[(int)MediaTupleFields.Layout];
97
+ set => this.Set((int)MediaTupleFields.Layout, value);
98
+ }
99
}
84
-}
\ No newline at end of file
100
+}
src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
+2
-12
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition ModuleIgnoreTable = new IntermediateTupleDefinition(
10
TupleDefinitionType.ModuleIgnoreTable,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(ModuleIgnoreTableTupleFields.Table), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(ModuleIgnoreTableTuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum ModuleIgnoreTableTupleFields
19
{
23
- Table,
20
}
21
22
public class ModuleIgnoreTableTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[ModuleIgnoreTableTupleFields index] => this.Fields[(int)index];
37
-
38
- public string Table
39
- {
40
- get => (string)this.Fields[(int)ModuleIgnoreTableTupleFields.Table];
41
- set => this.Set((int)ModuleIgnoreTableTupleFields.Table, value);
42
- }
43
- }
33
+ }
34
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MoveFileTuple.cs
+6
-14
@@ -10,13 +10,12 @@ namespace WixToolset.Data
10
TupleDefinitionType.MoveFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MoveFileTupleFields.FileKey), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Component_), 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),
17
new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestFolder), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Options), IntermediateFieldType.Number),
18
+ new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Delete), IntermediateFieldType.Bool),
19
},
20
typeof(MoveFileTuple));
21
}
@@ -26,13 +25,12 @@ namespace WixToolset.Data.Tuples
25
{
26
public enum MoveFileTupleFields
27
{
29
- FileKey,
28
Component_,
29
SourceName,
30
DestName,
31
SourceFolder,
32
DestFolder,
35
- Options,
33
+ Delete,
34
}
35
36
public class MoveFileTuple : IntermediateTuple
@@ -47,12 +45,6 @@ namespace WixToolset.Data.Tuples
45
46
public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
47
50
- public string FileKey
51
- {
52
- get => (string)this.Fields[(int)MoveFileTupleFields.FileKey];
53
- set => this.Set((int)MoveFileTupleFields.FileKey, value);
54
- }
55
-
48
public string Component_
49
{
50
get => (string)this.Fields[(int)MoveFileTupleFields.Component_];
@@ -83,10 +75,10 @@ namespace WixToolset.Data.Tuples
75
set => this.Set((int)MoveFileTupleFields.DestFolder, value);
76
}
77
86
- public int Options
78
+ public bool Delete
79
{
88
- get => (int)this.Fields[(int)MoveFileTupleFields.Options];
89
- set => this.Set((int)MoveFileTupleFields.Options, value);
80
+ get => (bool)this.Fields[(int)MoveFileTupleFields.Delete];
81
+ set => this.Set((int)MoveFileTupleFields.Delete, value);
82
}
83
}
92
-}
\ No newline at end of file
84
+}
src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
+3
-3
@@ -67,10 +67,10 @@ namespace WixToolset.Data.Tuples
67
set => this.Set((int)MsiAssemblyTupleFields.File_Application, value);
68
}
69
70
- public int Attributes
70
+ public FileAssemblyType Type
71
{
72
- get => (int)this.Fields[(int)MsiAssemblyTupleFields.Attributes];
73
- set => this.Set((int)MsiAssemblyTupleFields.Attributes, value);
72
+ get => (FileAssemblyType)this.Fields[(int)MsiAssemblyTupleFields.Attributes].AsNumber();
73
+ set => this.Set((int)MsiAssemblyTupleFields.Attributes, (int)value);
74
}
75
}
76
}
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiLockPermissionsEx,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.MsiLockPermissionsEx), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.LockObject), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Table), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.SDDLText), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum MsiLockPermissionsExTupleFields
25
{
27
- MsiLockPermissionsEx,
26
LockObject,
27
Table,
28
SDDLText,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[MsiLockPermissionsExTupleFields index] => this.Fields[(int)index];
43
46
- public string MsiLockPermissionsEx
47
- {
48
- get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx];
49
- set => this.Set((int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx, value);
50
- }
51
-
44
public string LockObject
45
{
46
get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject];
src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.MsiShortcutProperty,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.MsiShortcutProperty), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.Shortcut_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
@@ -23,7 +22,6 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum MsiShortcutPropertyTupleFields
24
{
26
- MsiShortcutProperty,
25
Shortcut_,
26
PropertyKey,
27
PropVariantValue,
@@ -41,12 +39,6 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
41
44
- public string MsiShortcutProperty
45
- {
46
- get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.MsiShortcutProperty];
47
- set => this.Set((int)MsiShortcutPropertyTupleFields.MsiShortcutProperty, value);
48
- }
49
-
42
public string Shortcut_
43
{
44
get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_];
src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCDataSource,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DataSource), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCDataSourceTupleFields
25
{
27
- DataSource,
26
Component_,
27
Description,
28
DriverDescription,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
43
46
- public string DataSource
47
- {
48
- get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DataSource];
49
- set => this.Set((int)ODBCDataSourceTupleFields.DataSource, value);
50
- }
51
-
44
public string Component_
45
{
46
get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)ODBCDataSourceTupleFields.Registration, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCDriver,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Driver), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCDriverTupleFields
25
{
27
- Driver,
26
Component_,
27
Description,
28
File_,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
43
46
- public string Driver
47
- {
48
- get => (string)this.Fields[(int)ODBCDriverTupleFields.Driver];
49
- set => this.Set((int)ODBCDriverTupleFields.Driver, value);
50
- }
51
-
44
public string Component_
45
{
46
get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)ODBCDriverTupleFields.File_Setup, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.ODBCTranslator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Translator), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ODBCTranslatorTupleFields
25
{
27
- Translator,
26
Component_,
27
Description,
28
File_,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
43
46
- public string Translator
47
- {
48
- get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Translator];
49
- set => this.Set((int)ODBCTranslatorTupleFields.Translator, value);
50
- }
51
-
44
public string Component_
45
{
46
get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)ODBCTranslatorTupleFields.File_Setup, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/ProgIdTuple.cs
+2
-2
@@ -75,9 +75,9 @@ namespace WixToolset.Data.Tuples
75
set => this.Set((int)ProgIdTupleFields.Icon_, value);
76
}
77
78
- public int IconIndex
78
+ public int? IconIndex
79
{
80
- get => (int)this.Fields[(int)ProgIdTupleFields.IconIndex];
80
+ get => (int?)this.Fields[(int)ProgIdTupleFields.IconIndex];
81
set => this.Set((int)ProgIdTupleFields.IconIndex, value);
82
}
83
}
src/WixToolset.Data/Tuples/PropertyTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Property,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(PropertyTupleFields.Property), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(PropertyTupleFields.Value), IntermediateFieldType.String),
14
},
15
typeof(PropertyTuple));
@@ -21,7 +20,6 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum PropertyTupleFields
22
{
24
- Property,
23
Value,
24
}
25
@@ -37,15 +35,9 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[PropertyTupleFields index] => this.Fields[(int)index];
37
40
- public string Property
41
- {
42
- get => (string)this.Fields[(int)PropertyTupleFields.Property]?.Value;
43
- set => this.Set((int)PropertyTupleFields.Property, value);
44
- }
45
-
38
public string Value
39
{
48
- get => (string)this.Fields[(int)PropertyTupleFields.Value]?.Value;
40
+ get => (string)this.Fields[(int)PropertyTupleFields.Value];
41
set => this.Set((int)PropertyTupleFields.Value, value);
42
}
43
}
src/WixToolset.Data/Tuples/RegLocatorTuple.cs
+22
-15
@@ -10,11 +10,11 @@ namespace WixToolset.Data
10
TupleDefinitionType.RegLocator,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Signature_), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Root), IntermediateFieldType.Number),
14
new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Key), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Name), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Type), IntermediateFieldType.Number),
17
+ new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Win64), IntermediateFieldType.Bool),
18
},
19
typeof(RegLocatorTuple));
20
}
@@ -24,13 +24,20 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum RegLocatorTupleFields
26
{
27
- Signature_,
27
Root,
28
Key,
29
Name,
30
Type,
31
+ Win64,
32
}
33
34
+ public enum RegLocatorType
35
+ {
36
+ Directory,
37
+ FileName,
38
+ Raw
39
+ };
40
+
41
public class RegLocatorTuple : IntermediateTuple
42
{
43
public RegLocatorTuple() : base(TupleDefinitions.RegLocator, null, null)
@@ -43,16 +50,10 @@ namespace WixToolset.Data.Tuples
50
51
public IntermediateField this[RegLocatorTupleFields index] => this.Fields[(int)index];
52
46
- public string Signature_
47
- {
48
- get => (string)this.Fields[(int)RegLocatorTupleFields.Signature_];
49
- set => this.Set((int)RegLocatorTupleFields.Signature_, value);
50
- }
51
-
52
- public int Root
53
+ public RegistryRootType Root
54
{
54
- get => (int)this.Fields[(int)RegLocatorTupleFields.Root];
55
- set => this.Set((int)RegLocatorTupleFields.Root, value);
55
+ get => (RegistryRootType)this.Fields[(int)RegLocatorTupleFields.Root].AsNumber();
56
+ set => this.Set((int)RegLocatorTupleFields.Root, (int)value);
57
}
58
59
public string Key
@@ -67,10 +68,16 @@ namespace WixToolset.Data.Tuples
68
set => this.Set((int)RegLocatorTupleFields.Name, value);
69
}
70
70
- public int Type
71
+ public RegLocatorType Type
72
{
72
- get => (int)this.Fields[(int)RegLocatorTupleFields.Type];
73
- set => this.Set((int)RegLocatorTupleFields.Type, value);
73
+ get => (RegLocatorType)this.Fields[(int)RegLocatorTupleFields.Type].AsNumber();
74
+ set => this.Set((int)RegLocatorTupleFields.Type, (int)value);
75
+ }
76
+
77
+ public bool Win64
78
+ {
79
+ get => this.Fields[(int)RegLocatorTupleFields.Win64].AsBool();
80
+ set => this.Set((int)RegLocatorTupleFields.Win64, value);
81
}
82
}
76
-}
\ No newline at end of file
83
+}
src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+13
-13
@@ -10,11 +10,11 @@ namespace WixToolset.Data
10
TupleDefinitionType.RemoveFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileKey), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.InstallMode), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnInstall), IntermediateFieldType.Bool),
17
+ new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnUninstall), IntermediateFieldType.Bool),
18
},
19
typeof(RemoveFileTuple));
20
}
@@ -24,11 +24,11 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum RemoveFileTupleFields
26
{
27
- FileKey,
27
Component_,
28
FileName,
29
DirProperty,
31
- InstallMode,
30
+ OnInstall,
31
+ OnUninstall,
32
}
33
34
public class RemoveFileTuple : IntermediateTuple
@@ -43,12 +43,6 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
45
46
- public string FileKey
47
- {
48
- get => (string)this.Fields[(int)RemoveFileTupleFields.FileKey];
49
- set => this.Set((int)RemoveFileTupleFields.FileKey, value);
50
- }
51
-
46
public string Component_
47
{
48
get => (string)this.Fields[(int)RemoveFileTupleFields.Component_];
@@ -67,10 +61,16 @@ namespace WixToolset.Data.Tuples
61
set => this.Set((int)RemoveFileTupleFields.DirProperty, value);
62
}
63
70
- public int InstallMode
64
+ public bool? OnInstall
65
+ {
66
+ get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnInstall];
67
+ set => this.Set((int)RemoveFileTupleFields.OnInstall, value);
68
+ }
69
+
70
+ public bool? OnUninstall
71
{
72
- get => (int)this.Fields[(int)RemoveFileTupleFields.InstallMode];
73
- set => this.Set((int)RemoveFileTupleFields.InstallMode, value);
72
+ get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnUninstall];
73
+ set => this.Set((int)RemoveFileTupleFields.OnUninstall, value);
74
}
75
}
76
}
\ No newline at end of file
src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.ReserveCost,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveKey), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.Component_), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum ReserveCostTupleFields
25
{
27
- ReserveKey,
26
Component_,
27
ReserveFolder,
28
ReserveLocal,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
43
46
- public string ReserveKey
47
- {
48
- get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveKey];
49
- set => this.Set((int)ReserveCostTupleFields.ReserveKey, value);
50
- }
51
-
44
public string Component_
45
{
46
get => (string)this.Fields[(int)ReserveCostTupleFields.Component_];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)ReserveCostTupleFields.ReserveSource, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/SelfRegTuple.cs
deleted
-52
@@ -1,52 +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 SelfReg = new IntermediateTupleDefinition(
10
- TupleDefinitionType.SelfReg,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(SelfRegTupleFields.File_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(SelfRegTupleFields.Cost), IntermediateFieldType.Number),
15
- },
16
- typeof(SelfRegTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum SelfRegTupleFields
23
- {
24
- File_,
25
- Cost,
26
- }
27
-
28
- public class SelfRegTuple : IntermediateTuple
29
- {
30
- public SelfRegTuple() : base(TupleDefinitions.SelfReg, null, null)
31
- {
32
- }
33
-
34
- public SelfRegTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SelfReg, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[SelfRegTupleFields index] => this.Fields[(int)index];
39
-
40
- public string File_
41
- {
42
- get => (string)this.Fields[(int)SelfRegTupleFields.File_];
43
- set => this.Set((int)SelfRegTupleFields.File_, value);
44
- }
45
-
46
- public int Cost
47
- {
48
- get => (int)this.Fields[(int)SelfRegTupleFields.Cost];
49
- set => this.Set((int)SelfRegTupleFields.Cost, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/SummaryInformationTuple.cs
new
+71
@@ -0,0 +1,71 @@
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 SummaryInformation = new IntermediateTupleDefinition(
10
+ TupleDefinitionType.SummaryInformation,
11
+ new[]
12
+ {
13
+ new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.PropertyId), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.Value), IntermediateFieldType.String),
15
+ },
16
+ typeof(SummaryInformationTuple));
17
+ }
18
+}
19
+
20
+namespace WixToolset.Data.Tuples
21
+{
22
+ public enum SummaryInformationTupleFields
23
+ {
24
+ PropertyId,
25
+ Value,
26
+ }
27
+
28
+ public enum SumaryInformationType
29
+ {
30
+ Codepage = 1,
31
+ Title,
32
+ Subject,
33
+ Author,
34
+ Keywords,
35
+ Comments,
36
+ PlatformAndLanguage,
37
+ TransformPlatformAndLanguageOrStorageNames,
38
+ PackageCode,
39
+ Created = 12,
40
+ LastSaved,
41
+ WindowsInstallerVersion,
42
+ WordCount,
43
+ CreatingApplication = 18,
44
+ Security
45
+ }
46
+
47
+ public class SummaryInformationTuple : IntermediateTuple
48
+ {
49
+ public SummaryInformationTuple() : base(TupleDefinitions.SummaryInformation, null, null)
50
+ {
51
+ }
52
+
53
+ public SummaryInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SummaryInformation, sourceLineNumber, id)
54
+ {
55
+ }
56
+
57
+ public IntermediateField this[SummaryInformationTupleFields index] => this.Fields[(int)index];
58
+
59
+ public SumaryInformationType PropertyId
60
+ {
61
+ get => (SumaryInformationType)this.Fields[(int)SummaryInformationTupleFields.PropertyId].AsNumber();
62
+ set => this.Set((int)SummaryInformationTupleFields.PropertyId, (int)value);
63
+ }
64
+
65
+ public string Value
66
+ {
67
+ get => (string)this.Fields[(int)SummaryInformationTupleFields.Value];
68
+ set => this.Set((int)SummaryInformationTupleFields.Value, value);
69
+ }
70
+ }
71
+}
src/WixToolset.Data/Tuples/TargetImagesTuple.cs
+3
-3
@@ -16,7 +16,7 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Upgraded), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Order), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.ProductValidateFlags), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.IgnoreMissingSrcFiles), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.IgnoreMissingSrcFiles), IntermediateFieldType.Bool),
20
},
21
typeof(TargetImagesTuple));
22
}
@@ -83,9 +83,9 @@ namespace WixToolset.Data.Tuples
83
set => this.Set((int)TargetImagesTupleFields.ProductValidateFlags, value);
84
}
85
86
- public int IgnoreMissingSrcFiles
86
+ public bool IgnoreMissingSrcFiles
87
{
88
- get => (int)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles];
88
+ get => (bool)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles];
89
set => this.Set((int)TargetImagesTupleFields.IgnoreMissingSrcFiles, value);
90
}
91
}
src/WixToolset.Data/Tuples/TransformsFlags.cs
new
+79
@@ -0,0 +1,79 @@
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.Tuples
4
+{
5
+ using System;
6
+
7
+ /// <summary>
8
+ /// Summary information values for the CharCount property in transforms.
9
+ /// </summary>
10
+ [Flags]
11
+ public enum TransformFlags
12
+ {
13
+ /// <summary>Ignore error when adding a row that exists.</summary>
14
+ ErrorAddExistingRow = 0x1,
15
+
16
+ /// <summary>Ignore error when deleting a row that does not exist.</summary>
17
+ ErrorDeleteMissingRow = 0x2,
18
+
19
+ /// <summary>Ignore error when adding a table that exists. </summary>
20
+ ErrorAddExistingTable = 0x4,
21
+
22
+ /// <summary>Ignore error when deleting a table that does not exist. </summary>
23
+ ErrorDeleteMissingTable = 0x8,
24
+
25
+ /// <summary>Ignore error when updating a row that does not exist. </summary>
26
+ ErrorUpdateMissingRow = 0x10,
27
+
28
+ /// <summary>Ignore error when transform and database code pages do not match, and their code pages are neutral.</summary>
29
+ ErrorChangeCodePage = 0x20,
30
+
31
+ /// <summary>Default language must match base database. </summary>
32
+ ValidateLanguage = 0x10000,
33
+
34
+ /// <summary>Product must match base database.</summary>
35
+ ValidateProduct = 0x20000,
36
+
37
+ /// <summary>Check major version only. </summary>
38
+ ValidateMajorVersion = 0x80000,
39
+
40
+ /// <summary>Check major and minor versions only. </summary>
41
+ ValidateMinorVersion = 0x100000,
42
+
43
+ /// <summary>Check major, minor, and update versions.</summary>
44
+ ValidateUpdateVersion = 0x200000,
45
+
46
+ /// <summary>Installed version lt base version. </summary>
47
+ ValidateNewLessBaseVersion = 0x400000,
48
+
49
+ /// <summary>Installed version lte base version. </summary>
50
+ ValidateNewLessEqualBaseVersion = 0x800000,
51
+
52
+ /// <summary>Installed version eq base version. </summary>
53
+ ValidateNewEqualBaseVersion = 0x1000000,
54
+
55
+ /// <summary>Installed version gte base version.</summary>
56
+ ValidateNewGreaterEqualBaseVersion = 0x2000000,
57
+
58
+ /// <summary>Installed version gt base version.</summary>
59
+ ValidateNewGreaterBaseVersion = 0x4000000,
60
+
61
+ /// <summary>UpgradeCode must match base database.</summary>
62
+ ValidateUpgradeCode = 0x8000000,
63
+
64
+ /// <summary>Masks all version checks on ProductVersion.</summary>
65
+ ProductVersionMask = ValidateMajorVersion | ValidateMinorVersion | ValidateUpdateVersion,
66
+
67
+ /// <summary>Masks all operations on ProductVersion.</summary>
68
+ ProductVersionOperatorMask = ValidateNewLessBaseVersion | ValidateNewLessEqualBaseVersion | ValidateNewEqualBaseVersion | ValidateNewGreaterEqualBaseVersion | ValidateNewGreaterBaseVersion,
69
+
70
+ /// <summary>Default value for instance transforms.</summary>
71
+ InstanceTransformDefault = ErrorAddExistingRow | ErrorDeleteMissingRow | ErrorAddExistingTable | ErrorDeleteMissingTable | ErrorUpdateMissingRow | ErrorChangeCodePage | ValidateProduct | ValidateUpdateVersion | ValidateNewGreaterEqualBaseVersion,
72
+
73
+ /// <summary>Default value for language transforms.</summary>
74
+ LanguageTransformDefault = ErrorAddExistingRow | ErrorDeleteMissingRow | ErrorAddExistingTable | ErrorDeleteMissingTable | ErrorUpdateMissingRow | ErrorChangeCodePage | ValidateProduct,
75
+
76
+ /// <summary>Default value for patch transforms.</summary>
77
+ PatchTransformDefault = ErrorAddExistingRow | ErrorDeleteMissingRow | ErrorAddExistingTable | ErrorDeleteMissingTable | ErrorUpdateMissingRow | ValidateProduct | ValidateUpdateVersion | ValidateNewEqualBaseVersion | ValidateUpgradeCode,
78
+ }
79
+}
src/WixToolset.Data/Tuples/TupleDefinitions.cs
+4
-36
@@ -3,14 +3,11 @@
3
namespace WixToolset.Data
4
{
5
using System;
6
- using WixToolset.Data.Tuples;
6
7
public enum TupleDefinitionType
8
{
10
- _Streams,
11
- _SummaryInformation,
12
- _TransformView,
13
- _Validation,
9
+ SummaryInformation,
10
+ Validation,
11
ActionText,
12
AdminExecuteSequence,
13
AdminUISequence,
@@ -20,7 +17,6 @@ namespace WixToolset.Data
17
BBControl,
18
Billboard,
19
Binary,
23
- BindImage,
20
CCPSearch,
21
CheckBox,
22
Class,
@@ -48,7 +44,6 @@ namespace WixToolset.Data
44
FeatureComponents,
45
File,
46
FileSFPCatalog,
51
- Font,
47
Icon,
48
ImageFamilies,
49
IniFile,
@@ -113,7 +108,6 @@ namespace WixToolset.Data
108
RemoveIniFile,
109
RemoveRegistry,
110
ReserveCost,
116
- SelfReg,
111
ServiceControl,
112
ServiceInstall,
113
SFPCatalog,
@@ -165,7 +159,6 @@ namespace WixToolset.Data
159
WixCustomTable,
160
WixDeltaPatchFile,
161
WixDeltaPatchSymbolPaths,
168
- WixDirectory,
162
WixEnsureTable,
163
WixFeatureGroup,
164
WixFeatureModules,
@@ -175,7 +168,6 @@ namespace WixToolset.Data
168
WixGroup,
169
WixInstanceComponent,
170
WixInstanceTransforms,
178
- WixMedia,
171
WixMediaTemplate,
172
WixMerge,
173
WixOrdering,
@@ -221,17 +213,8 @@ namespace WixToolset.Data
213
{
214
switch (type)
215
{
224
- case TupleDefinitionType._Streams:
225
- return TupleDefinitions._Streams;
226
-
227
- case TupleDefinitionType._SummaryInformation:
228
- return TupleDefinitions._SummaryInformation;
229
-
230
- case TupleDefinitionType._TransformView:
231
- return TupleDefinitions._TransformView;
232
-
233
- case TupleDefinitionType._Validation:
234
- return TupleDefinitions._Validation;
216
+ case TupleDefinitionType.SummaryInformation:
217
+ return TupleDefinitions.SummaryInformation;
218
219
case TupleDefinitionType.ActionText:
220
return TupleDefinitions.ActionText;
@@ -260,9 +243,6 @@ namespace WixToolset.Data
243
case TupleDefinitionType.Binary:
244
return TupleDefinitions.Binary;
245
263
- case TupleDefinitionType.BindImage:
264
- return TupleDefinitions.BindImage;
265
-
246
case TupleDefinitionType.CCPSearch:
247
return TupleDefinitions.CCPSearch;
248
@@ -344,9 +324,6 @@ namespace WixToolset.Data
324
case TupleDefinitionType.FileSFPCatalog:
325
return TupleDefinitions.FileSFPCatalog;
326
347
- case TupleDefinitionType.Font:
348
- return TupleDefinitions.Font;
349
-
327
case TupleDefinitionType.Icon:
328
return TupleDefinitions.Icon;
329
@@ -539,9 +516,6 @@ namespace WixToolset.Data
516
case TupleDefinitionType.ReserveCost:
517
return TupleDefinitions.ReserveCost;
518
542
- case TupleDefinitionType.SelfReg:
543
- return TupleDefinitions.SelfReg;
544
-
519
case TupleDefinitionType.ServiceControl:
520
return TupleDefinitions.ServiceControl;
521
@@ -695,9 +669,6 @@ namespace WixToolset.Data
669
case TupleDefinitionType.WixDeltaPatchSymbolPaths:
670
return TupleDefinitions.WixDeltaPatchSymbolPaths;
671
698
- case TupleDefinitionType.WixDirectory:
699
- return TupleDefinitions.WixDirectory;
700
-
672
case TupleDefinitionType.WixEnsureTable:
673
return TupleDefinitions.WixEnsureTable;
674
@@ -725,9 +696,6 @@ namespace WixToolset.Data
696
case TupleDefinitionType.WixInstanceTransforms:
697
return TupleDefinitions.WixInstanceTransforms;
698
728
- case TupleDefinitionType.WixMedia:
729
- return TupleDefinitions.WixMedia;
730
-
699
case TupleDefinitionType.WixMediaTemplate:
700
return TupleDefinitions.WixMediaTemplate;
701
src/WixToolset.Data/Tuples/TypeLibTuple.cs
+6
-6
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.TypeLib,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibID), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Component_), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
@@ -27,7 +27,7 @@ namespace WixToolset.Data.Tuples
27
{
28
public enum TypeLibTupleFields
29
{
30
- LibID,
30
+ LibId,
31
Language,
32
Component_,
33
Version,
@@ -49,10 +49,10 @@ namespace WixToolset.Data.Tuples
49
50
public IntermediateField this[TypeLibTupleFields index] => this.Fields[(int)index];
51
52
- public string LibID
52
+ public string LibId
53
{
54
- get => (string)this.Fields[(int)TypeLibTupleFields.LibID];
55
- set => this.Set((int)TypeLibTupleFields.LibID, value);
54
+ get => (string)this.Fields[(int)TypeLibTupleFields.LibId];
55
+ set => this.Set((int)TypeLibTupleFields.LibId, value);
56
}
57
58
public int Language
@@ -97,4 +97,4 @@ namespace WixToolset.Data.Tuples
97
set => this.Set((int)TypeLibTupleFields.Cost, value);
98
}
99
}
100
-}
\ No newline at end of file
100
+}
src/WixToolset.Data/Tuples/UITextTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.UIText,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(UITextTupleFields.Key), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(UITextTupleFields.Text), IntermediateFieldType.String),
14
},
15
typeof(UITextTuple));
@@ -21,7 +20,6 @@ namespace WixToolset.Data.Tuples
20
{
21
public enum UITextTupleFields
22
{
24
- Key,
23
Text,
24
}
25
@@ -37,16 +35,10 @@ namespace WixToolset.Data.Tuples
35
36
public IntermediateField this[UITextTupleFields index] => this.Fields[(int)index];
37
40
- public string Key
41
- {
42
- get => (string)this.Fields[(int)UITextTupleFields.Key];
43
- set => this.Set((int)UITextTupleFields.Key, value);
44
- }
45
-
38
public string Text
39
{
40
get => (string)this.Fields[(int)UITextTupleFields.Text];
41
set => this.Set((int)UITextTupleFields.Text, value);
42
}
43
}
52
-}
\ No newline at end of file
44
+}
src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
+7
-7
@@ -13,8 +13,8 @@ namespace WixToolset.Data
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.Number),
17
- new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
17
+ new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
18
},
19
typeof(UpgradedFiles_OptionalDataTuple));
20
}
@@ -61,16 +61,16 @@ namespace WixToolset.Data.Tuples
61
set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths, value);
62
}
63
64
- public int AllowIgnoreOnPatchError
64
+ public bool AllowIgnoreOnPatchError
65
{
66
- get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError];
66
+ get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError];
67
set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError, value);
68
}
69
70
- public int IncludeWholeFile
70
+ public bool IncludeWholeFile
71
{
72
- get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile];
72
+ get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile];
73
set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile, value);
74
}
75
}
76
-}
\ No newline at end of file
76
+}
src/WixToolset.Data/Tuples/WixActionTuple.cs
+6
-6
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixAction,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixActionTupleFields.SequenceTable), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixActionTupleFields.SequenceTable), IntermediateFieldType.Number),
14
new IntermediateFieldDefinition(nameof(WixActionTupleFields.Action), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixActionTupleFields.Condition), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixActionTupleFields.Sequence), IntermediateFieldType.Number),
@@ -41,7 +41,7 @@ namespace WixToolset.Data.Tuples
41
{
42
AdminUISequence,
43
AdminExecuteSequence,
44
- AdvtExecuteSequence,
44
+ AdvertiseExecuteSequence,
45
InstallUISequence,
46
InstallExecuteSequence
47
}
@@ -60,8 +60,8 @@ namespace WixToolset.Data.Tuples
60
61
public SequenceTable SequenceTable
62
{
63
- get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixActionTupleFields.SequenceTable]);
64
- set => this.Set((int)WixActionTupleFields.SequenceTable, value.ToString());
63
+ get => (SequenceTable)this.Fields[(int)WixActionTupleFields.SequenceTable].AsNumber();
64
+ set => this.Set((int)WixActionTupleFields.SequenceTable, (int)value);
65
}
66
67
public string Action
@@ -76,9 +76,9 @@ namespace WixToolset.Data.Tuples
76
set => this.Set((int)WixActionTupleFields.Condition, value);
77
}
78
79
- public int Sequence
79
+ public int? Sequence
80
{
81
- get => (int)this.Fields[(int)WixActionTupleFields.Sequence];
81
+ get => (int?)this.Fields[(int)WixActionTupleFields.Sequence];
82
set => this.Set((int)WixActionTupleFields.Sequence, value);
83
}
84
src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
+3
-11
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixApprovedExeForElevation,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Id), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Key), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Value), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Attributes), IntermediateFieldType.Number),
@@ -23,7 +22,6 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum WixApprovedExeForElevationTupleFields
24
{
26
- Id,
25
Key,
26
Value,
27
Attributes,
@@ -41,12 +39,6 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[WixApprovedExeForElevationTupleFields index] => this.Fields[(int)index];
41
44
- public string Id
45
- {
46
- get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Id];
47
- set => this.Set((int)WixApprovedExeForElevationTupleFields.Id, value);
48
- }
49
-
42
public string Key
43
{
44
get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key];
@@ -59,10 +51,10 @@ namespace WixToolset.Data.Tuples
51
set => this.Set((int)WixApprovedExeForElevationTupleFields.Value, value);
52
}
53
62
- public int Attributes
54
+ public BundleApprovedExeForElevationAttributes Attributes
55
{
64
- get => (int)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes];
65
- set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, value);
56
+ get => (BundleApprovedExeForElevationAttributes)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes].AsNumber();
57
+ set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, (int)value);
58
}
59
}
60
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
+3
-13
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition WixBootstrapperApplication = new IntermediateTupleDefinition(
10
TupleDefinitionType.WixBootstrapperApplication,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixBootstrapperApplicationTupleFields.Id), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(WixBootstrapperApplicationTuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum WixBootstrapperApplicationTupleFields
19
{
23
- Id,
20
}
21
22
public class WixBootstrapperApplicationTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[WixBootstrapperApplicationTupleFields index] => this.Fields[(int)index];
37
-
38
- public string Id
39
- {
40
- get => (string)this.Fields[(int)WixBootstrapperApplicationTupleFields.Id];
41
- set => this.Set((int)WixBootstrapperApplicationTupleFields.Id, value);
42
- }
43
- }
44
-}
\ No newline at end of file
33
+ }
34
+}
src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
+6
-14
@@ -10,11 +10,10 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleContainer,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WixBundleContainer), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Name), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Type), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.DownloadUrl), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Size), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Size), IntermediateFieldType.LargeNumber),
17
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Hash), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.AttachedContainerIndex), IntermediateFieldType.Number),
19
new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WorkingPath), IntermediateFieldType.String),
@@ -29,7 +28,6 @@ namespace WixToolset.Data.Tuples
28
29
public enum WixBundleContainerTupleFields
30
{
32
- WixBundleContainer,
31
Name,
32
Type,
33
DownloadUrl,
@@ -60,12 +58,6 @@ namespace WixToolset.Data.Tuples
58
59
public IntermediateField this[WixBundleContainerTupleFields index] => this.Fields[(int)index];
60
63
- public string WixBundleContainer
64
- {
65
- get => (string)this.Fields[(int)WixBundleContainerTupleFields.WixBundleContainer];
66
- set => this.Set((int)WixBundleContainerTupleFields.WixBundleContainer, value);
67
- }
68
-
61
public string Name
62
{
63
get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name];
@@ -74,8 +66,8 @@ namespace WixToolset.Data.Tuples
66
67
public ContainerType Type
68
{
77
- get => (ContainerType)Enum.Parse(typeof(ContainerType), (string)this.Fields[(int)WixBundleContainerTupleFields.Type], true);
78
- set => this.Set((int)WixBundleContainerTupleFields.Type, value.ToString());
69
+ get => (ContainerType)this.Fields[(int)WixBundleContainerTupleFields.Type].AsNumber();
70
+ set => this.Set((int)WixBundleContainerTupleFields.Type, (int)value);
71
}
72
73
public string DownloadUrl
@@ -84,9 +76,9 @@ namespace WixToolset.Data.Tuples
76
set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
77
}
78
87
- public int Size
79
+ public long Size
80
{
89
- get => (int)this.Fields[(int)WixBundleContainerTupleFields.Size];
81
+ get => (long)this.Fields[(int)WixBundleContainerTupleFields.Size];
82
set => this.Set((int)WixBundleContainerTupleFields.Size, value);
83
}
84
@@ -108,4 +100,4 @@ namespace WixToolset.Data.Tuples
100
set => this.Set((int)WixBundleContainerTupleFields.WorkingPath, value);
101
}
102
}
111
-}
\ No newline at end of file
103
+}
src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
+5
-5
@@ -13,7 +13,7 @@ namespace WixToolset.Data
13
new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.DisplayName), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.LogPathVariable), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.Compressed), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.Id), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.BundleId), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.UpgradeCode), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.PerMachine), IntermediateFieldType.String),
19
},
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
28
DisplayName,
29
LogPathVariable,
30
Compressed,
31
- Id,
31
+ BundleId,
32
UpgradeCode,
33
PerMachine,
34
}
@@ -63,10 +63,10 @@ namespace WixToolset.Data.Tuples
63
set => this.Set((int)WixBundlePropertiesTupleFields.Compressed, value);
64
}
65
66
- public string Id
66
+ public string BundleId
67
{
68
- get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Id];
69
- set => this.Set((int)WixBundlePropertiesTupleFields.Id, value);
68
+ get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.BundleId];
69
+ set => this.Set((int)WixBundlePropertiesTupleFields.BundleId, value);
70
}
71
72
public string UpgradeCode
src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
+5
-13
@@ -10,8 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleRelatedPackage,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Id), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.RelatedId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MinVersion), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MaxVersion), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Languages), IntermediateFieldType.String),
@@ -28,8 +27,7 @@ namespace WixToolset.Data.Tuples
27
{
28
public enum WixBundleRelatedPackageTupleFields
29
{
31
- WixBundlePackage_,
32
- Id,
30
+ RelatedId,
31
MinVersion,
32
MaxVersion,
33
Languages,
@@ -51,16 +49,10 @@ namespace WixToolset.Data.Tuples
49
50
public IntermediateField this[WixBundleRelatedPackageTupleFields index] => this.Fields[(int)index];
51
54
- public string WixBundlePackage_
52
+ public string RelatedId
53
{
56
- get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.WixBundlePackage_];
57
- set => this.Set((int)WixBundleRelatedPackageTupleFields.WixBundlePackage_, value);
58
- }
59
-
60
- public string Id
61
- {
62
- get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Id];
63
- set => this.Set((int)WixBundleRelatedPackageTupleFields.Id, value);
54
+ get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.RelatedId];
55
+ set => this.Set((int)WixBundleRelatedPackageTupleFields.RelatedId, value);
56
}
57
58
public string MinVersion
src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixBundleVariable,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.WixBundleVariable), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Value), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Type), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Hidden), IntermediateFieldType.Bool),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum WixBundleVariableTupleFields
25
{
27
- WixBundleVariable,
26
Value,
27
Type,
28
Hidden,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixBundleVariableTupleFields index] => this.Fields[(int)index];
43
46
- public string WixBundleVariable
47
- {
48
- get => (string)this.Fields[(int)WixBundleVariableTupleFields.WixBundleVariable];
49
- set => this.Set((int)WixBundleVariableTupleFields.WixBundleVariable, value);
50
- }
51
-
44
public string Value
45
{
46
get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)WixBundleVariableTupleFields.Persisted, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/WixChainItemTuple.cs
+1
-11
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition WixChainItem = new IntermediateTupleDefinition(
10
TupleDefinitionType.WixChainItem,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixChainItemTupleFields.Id), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(WixChainItemTuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum WixChainItemTupleFields
19
{
23
- Id,
20
}
21
22
public class WixChainItemTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[WixChainItemTupleFields index] => this.Fields[(int)index];
37
-
38
- public string Id
39
- {
40
- get => (string)this.Fields[(int)WixChainItemTupleFields.Id];
41
- set => this.Set((int)WixChainItemTupleFields.Id, value);
42
- }
33
}
34
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
+3
-11
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixCustomTable,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Table), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnCount), IntermediateFieldType.Number),
14
new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnNames), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnTypes), IntermediateFieldType.String),
@@ -33,7 +32,6 @@ namespace WixToolset.Data.Tuples
32
{
33
public enum WixCustomTableTupleFields
34
{
36
- Table,
35
ColumnCount,
36
ColumnNames,
37
ColumnTypes,
@@ -61,12 +59,6 @@ namespace WixToolset.Data.Tuples
59
60
public IntermediateField this[WixCustomTableTupleFields index] => this.Fields[(int)index];
61
64
- public string Table
65
- {
66
- get => (string)this.Fields[(int)WixCustomTableTupleFields.Table];
67
- set => this.Set((int)WixCustomTableTupleFields.Table, value);
68
- }
69
-
62
public int ColumnCount
63
{
64
get => (int)this.Fields[(int)WixCustomTableTupleFields.ColumnCount];
@@ -139,10 +131,10 @@ namespace WixToolset.Data.Tuples
131
set => this.Set((int)WixCustomTableTupleFields.Modularizations, value);
132
}
133
142
- public int BootstrapperApplicationData
134
+ public bool BootstrapperApplicationData
135
{
144
- get => (int)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData];
136
+ get => (bool)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData];
137
set => this.Set((int)WixCustomTableTupleFields.BootstrapperApplicationData, value);
138
}
139
}
148
-}
\ No newline at end of file
140
+}
src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixDeltaPatchFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.File_), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainLengths), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreLengths), IntermediateFieldType.String),
@@ -25,7 +24,6 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum WixDeltaPatchFileTupleFields
26
{
28
- File_,
27
RetainLengths,
28
IgnoreOffsets,
29
IgnoreLengths,
@@ -45,12 +43,6 @@ namespace WixToolset.Data.Tuples
43
44
public IntermediateField this[WixDeltaPatchFileTupleFields index] => this.Fields[(int)index];
45
48
- public string File_
49
- {
50
- get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.File_];
51
- set => this.Set((int)WixDeltaPatchFileTupleFields.File_, value);
52
- }
53
-
46
public string RetainLengths
47
{
48
get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths];
src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+11
-11
@@ -12,8 +12,8 @@ namespace WixToolset.Data
12
TupleDefinitionType.WixDeltaPatchSymbolPaths,
13
new[]
14
{
15
- new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.Id), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.Type), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolType), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolId), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolPaths), IntermediateFieldType.String),
18
},
19
typeof(WixDeltaPatchSymbolPathsTuple));
@@ -24,8 +24,8 @@ namespace WixToolset.Data.Tuples
24
{
25
public enum WixDeltaPatchSymbolPathsTupleFields
26
{
27
- Id,
28
- Type,
27
+ SymbolType,
28
+ SymbolId,
29
SymbolPaths,
30
}
31
@@ -48,22 +48,22 @@ namespace WixToolset.Data.Tuples
48
{
49
}
50
51
- public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
51
+ public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, null)
52
{
53
}
54
55
public IntermediateField this[WixDeltaPatchSymbolPathsTupleFields index] => this.Fields[(int)index];
56
57
- public string Id
57
+ public SymbolPathType SymbolType
58
{
59
- get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Id];
60
- set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Id, value);
59
+ get => (SymbolPathType)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolType].AsNumber();
60
+ set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolType, (int)value);
61
}
62
63
- public SymbolPathType Type
63
+ public string SymbolId
64
{
65
- get => (SymbolPathType)Enum.Parse(typeof(SymbolPathType), (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Type], true);
66
- set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Type, value.ToString());
65
+ get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolId];
66
+ set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolId, value);
67
}
68
69
public string SymbolPaths
src/WixToolset.Data/Tuples/WixDirectoryTuple.cs
deleted
-52
@@ -1,52 +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 WixDirectory = new IntermediateTupleDefinition(
10
- TupleDefinitionType.WixDirectory,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixDirectoryTupleFields.Directory_), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixDirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
15
- },
16
- typeof(WixDirectoryTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum WixDirectoryTupleFields
23
- {
24
- Directory_,
25
- ComponentGuidGenerationSeed,
26
- }
27
-
28
- public class WixDirectoryTuple : IntermediateTuple
29
- {
30
- public WixDirectoryTuple() : base(TupleDefinitions.WixDirectory, null, null)
31
- {
32
- }
33
-
34
- public WixDirectoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDirectory, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[WixDirectoryTupleFields index] => this.Fields[(int)index];
39
-
40
- public string Directory_
41
- {
42
- get => (string)this.Fields[(int)WixDirectoryTupleFields.Directory_]?.Value;
43
- set => this.Set((int)WixDirectoryTupleFields.Directory_, value);
44
- }
45
-
46
- public string ComponentGuidGenerationSeed
47
- {
48
- get => (string)this.Fields[(int)WixDirectoryTupleFields.ComponentGuidGenerationSeed]?.Value;
49
- set => this.Set((int)WixDirectoryTupleFields.ComponentGuidGenerationSeed, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixFileTuple.cs
+3
-11
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixFile,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_), IntermediateFieldType.String),
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),
@@ -33,7 +32,6 @@ namespace WixToolset.Data.Tuples
32
33
public enum WixFileTupleFields
34
{
36
- File_,
35
AssemblyType,
36
File_AssemblyManifest,
37
File_AssemblyApplication,
@@ -95,12 +93,6 @@ namespace WixToolset.Data.Tuples
93
94
public IntermediateField this[WixFileTupleFields index] => this.Fields[(int)index];
95
98
- public string File_
99
- {
100
- get => (string)this.Fields[(int)WixFileTupleFields.File_];
101
- set => this.Set((int)WixFileTupleFields.File_, value);
102
- }
103
-
96
public FileAssemblyType AssemblyType
97
{
98
get => (FileAssemblyType)(int)this.Fields[(int)WixFileTupleFields.AssemblyType];
@@ -155,10 +147,10 @@ namespace WixToolset.Data.Tuples
147
set => this.Set((int)WixFileTupleFields.Attributes, value);
148
}
149
158
- public PatchAttributeType PatchAttributes
150
+ public PatchAttributeType? PatchAttributes
151
{
160
- get => (PatchAttributeType)(int)this.Fields[(int)WixFileTupleFields.PatchAttributes];
161
- set => this.Set((int)WixFileTupleFields.PatchAttributes, (int)value);
152
+ get => (PatchAttributeType?)this.Fields[(int)WixFileTupleFields.PatchAttributes].AsNullableNumber();
153
+ set => this.Set((int)WixFileTupleFields.PatchAttributes, (int?)value);
154
}
155
156
public string DeltaPatchHeaderSource
src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixInstanceTransforms,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.Id), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.PropertyId), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductCode), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductName), IntermediateFieldType.String),
@@ -24,7 +23,6 @@ namespace WixToolset.Data.Tuples
23
{
24
public enum WixInstanceTransformsTupleFields
25
{
27
- Id,
26
PropertyId,
27
ProductCode,
28
ProductName,
@@ -43,12 +41,6 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixInstanceTransformsTupleFields index] => this.Fields[(int)index];
43
46
- public string Id
47
- {
48
- get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.Id];
49
- set => this.Set((int)WixInstanceTransformsTupleFields.Id, value);
50
- }
51
-
44
public string PropertyId
45
{
46
get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId];
@@ -73,4 +65,4 @@ namespace WixToolset.Data.Tuples
65
set => this.Set((int)WixInstanceTransformsTupleFields.UpgradeCode, value);
66
}
67
}
76
-}
\ No newline at end of file
68
+}
src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
+7
-12
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11
new[]
12
{
13
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CabinetTemplate), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.Number),
15
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.DiskPrompt), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.VolumeLabel), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
@@ -55,13 +55,8 @@ namespace WixToolset.Data.Tuples
55
56
public CompressionLevel? CompressionLevel
57
{
58
- get
59
- {
60
- var value = (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel];
61
- return String.IsNullOrEmpty(value) ? null : (CompressionLevel?)Enum.Parse(typeof(CompressionLevel), value, true);
62
- }
63
-
64
- set => this.Set((int)WixMediaTupleFields.CompressionLevel, value?.ToString());
58
+ get => (CompressionLevel?)this.Fields[(int)WixMediaTemplateTupleFields.CompressionLevel].AsNullableNumber();
59
+ set => this.Set((int)WixMediaTemplateTupleFields.CompressionLevel, (int?)value);
60
}
61
62
public string DiskPrompt
@@ -76,15 +71,15 @@ namespace WixToolset.Data.Tuples
71
set => this.Set((int)WixMediaTemplateTupleFields.VolumeLabel, value);
72
}
73
79
- public int MaximumUncompressedMediaSize
74
+ public int? MaximumUncompressedMediaSize
75
{
81
- get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize];
76
+ get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize];
77
set => this.Set((int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize, value);
78
}
79
85
- public int MaximumCabinetSizeForLargeFileSplitting
80
+ public int? MaximumCabinetSizeForLargeFileSplitting
81
{
87
- get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting];
82
+ get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting];
83
set => this.Set((int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting, value);
84
}
85
}
src/WixToolset.Data/Tuples/WixMediaTuple.cs
deleted
-62
@@ -1,62 +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 WixMedia = new IntermediateTupleDefinition(
10
- TupleDefinitionType.WixMedia,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixMediaTupleFields.DiskId_), IntermediateFieldType.Number),
14
- new IntermediateFieldDefinition(nameof(WixMediaTupleFields.CompressionLevel), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixMediaTupleFields.Layout), IntermediateFieldType.String),
16
- },
17
- typeof(WixMediaTuple));
18
- }
19
-}
20
-
21
-namespace WixToolset.Data.Tuples
22
-{
23
- using System;
24
-
25
- public enum WixMediaTupleFields
26
- {
27
- DiskId_,
28
- CompressionLevel,
29
- Layout,
30
- }
31
-
32
- public class WixMediaTuple : IntermediateTuple
33
- {
34
- public WixMediaTuple() : base(TupleDefinitions.WixMedia, null, null)
35
- {
36
- }
37
-
38
- public WixMediaTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMedia, sourceLineNumber, id)
39
- {
40
- }
41
-
42
- public IntermediateField this[WixMediaTupleFields index] => this.Fields[(int)index];
43
-
44
- public int DiskId_
45
- {
46
- get => (int)this.Fields[(int)WixMediaTupleFields.DiskId_];
47
- set => this.Set((int)WixMediaTupleFields.DiskId_, value);
48
- }
49
-
50
- public CompressionLevel? CompressionLevel
51
- {
52
- get => Enum.TryParse((string)this.Fields[(int)WixMediaTupleFields.CompressionLevel], true, out CompressionLevel value) ? value : (CompressionLevel?)null;
53
- set => this.Set((int)WixMediaTupleFields.CompressionLevel, value?.ToString());
54
- }
55
-
56
- public string Layout
57
- {
58
- get => (string)this.Fields[(int)WixMediaTupleFields.Layout];
59
- set => this.Set((int)WixMediaTupleFields.Layout, value);
60
- }
61
- }
62
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixMergeTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixMerge,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixMergeTupleFields.WixMerge), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
14
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
@@ -27,7 +26,6 @@ namespace WixToolset.Data.Tuples
26
{
27
public enum WixMergeTupleFields
28
{
30
- WixMerge,
29
Language,
30
Directory_,
31
SourceFile,
@@ -49,12 +47,6 @@ namespace WixToolset.Data.Tuples
47
48
public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index];
49
52
- public string WixMerge
53
- {
54
- get => (string)this.Fields[(int)WixMergeTupleFields.WixMerge];
55
- set => this.Set((int)WixMergeTupleFields.WixMerge, value);
56
- }
57
-
50
public int Language
51
{
52
get => (int)this.Fields[(int)WixMergeTupleFields.Language];
@@ -97,4 +89,4 @@ namespace WixToolset.Data.Tuples
89
set => this.Set((int)WixMergeTupleFields.Feature_, value);
90
}
91
}
100
-}
\ No newline at end of file
92
+}
src/WixToolset.Data/Tuples/WixOrderingTuple.cs
+8
-8
@@ -41,27 +41,27 @@ namespace WixToolset.Data.Tuples
41
42
public IntermediateField this[WixOrderingTupleFields index] => this.Fields[(int)index];
43
44
- public string ItemType
44
+ public ComplexReferenceChildType ItemType
45
{
46
- get => (string)this.Fields[(int)WixOrderingTupleFields.ItemType]?.Value;
47
- set => this.Set((int)WixOrderingTupleFields.ItemType, value);
46
+ get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.ItemType].AsNumber();
47
+ set => this.Set((int)WixOrderingTupleFields.ItemType, (int)value);
48
}
49
50
public string ItemId_
51
{
52
- get => (string)this.Fields[(int)WixOrderingTupleFields.ItemId_]?.Value;
52
+ get => (string)this.Fields[(int)WixOrderingTupleFields.ItemId_];
53
set => this.Set((int)WixOrderingTupleFields.ItemId_, value);
54
}
55
56
- public string DependsOnType
56
+ public ComplexReferenceChildType DependsOnType
57
{
58
- get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnType]?.Value;
59
- set => this.Set((int)WixOrderingTupleFields.DependsOnType, value);
58
+ get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.DependsOnType].AsNumber();
59
+ set => this.Set((int)WixOrderingTupleFields.DependsOnType, (int)value);
60
}
61
62
public string DependsOnId_
63
{
64
- get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnId_]?.Value;
64
+ get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnId_];
65
set => this.Set((int)WixOrderingTupleFields.DependsOnId_, value);
66
}
67
}
src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
+4
-12
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixPatchBaseline,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.WixPatchBaseline), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.DiskId), IntermediateFieldType.Number),
14
new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.ValidationFlags), IntermediateFieldType.Number),
15
},
@@ -22,7 +21,6 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum WixPatchBaselineTupleFields
23
{
25
- WixPatchBaseline,
24
DiskId,
25
ValidationFlags,
26
}
@@ -39,22 +37,16 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[WixPatchBaselineTupleFields index] => this.Fields[(int)index];
39
42
- public string WixPatchBaseline
43
- {
44
- get => (string)this.Fields[(int)WixPatchBaselineTupleFields.WixPatchBaseline];
45
- set => this.Set((int)WixPatchBaselineTupleFields.WixPatchBaseline, value);
46
- }
47
-
40
public int DiskId
41
{
42
get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId];
43
set => this.Set((int)WixPatchBaselineTupleFields.DiskId, value);
44
}
45
54
- public int ValidationFlags
46
+ public TransformFlags ValidationFlags
47
{
56
- get => (int)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags];
57
- set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, value);
48
+ get => (TransformFlags)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags].AsNumber();
49
+ set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, (int)value);
50
}
51
}
60
-}
\ No newline at end of file
52
+}
src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
+1
-11
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition WixSuppressModularization = new IntermediateTupleDefinition(
10
TupleDefinitionType.WixSuppressModularization,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixSuppressModularizationTupleFields.WixSuppressModularization), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(WixSuppressModularizationTuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum WixSuppressModularizationTupleFields
19
{
23
- WixSuppressModularization,
20
}
21
22
public class WixSuppressModularizationTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[WixSuppressModularizationTupleFields index] => this.Fields[(int)index];
37
-
38
- public string WixSuppressModularization
39
- {
40
- get => (string)this.Fields[(int)WixSuppressModularizationTupleFields.WixSuppressModularization];
41
- set => this.Set((int)WixSuppressModularizationTupleFields.WixSuppressModularization, value);
42
- }
33
}
34
}
\ No newline at end of file
src/WixToolset.Data/Tuples/WixUITuple.cs
+3
-13
@@ -8,10 +8,7 @@ namespace WixToolset.Data
8
{
9
public static readonly IntermediateTupleDefinition WixUI = new IntermediateTupleDefinition(
10
TupleDefinitionType.WixUI,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixUITupleFields.WixUI), IntermediateFieldType.String),
14
- },
11
+ new IntermediateFieldDefinition[0],
12
typeof(WixUITuple));
13
}
14
}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
17
{
18
public enum WixUITupleFields
19
{
23
- WixUI,
20
}
21
22
public class WixUITuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
30
}
31
32
public IntermediateField this[WixUITupleFields index] => this.Fields[(int)index];
37
-
38
- public string WixUI
39
- {
40
- get => (string)this.Fields[(int)WixUITupleFields.WixUI]?.Value;
41
- set => this.Set((int)WixUITupleFields.WixUI, value);
42
- }
43
- }
44
-}
\ No newline at end of file
33
+ }
34
+}
src/WixToolset.Data/Tuples/WixVariableTuple.cs
+1
-9
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.WixVariable,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(WixVariableTupleFields.WixVariable), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Value), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Overridable), IntermediateFieldType.Bool),
15
},
@@ -22,7 +21,6 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum WixVariableTupleFields
23
{
25
- WixVariable,
24
Value,
25
Overridable,
26
}
@@ -39,12 +37,6 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[WixVariableTupleFields index] => this.Fields[(int)index];
39
42
- public string WixVariable
43
- {
44
- get => (string)this.Fields[(int)WixVariableTupleFields.WixVariable];
45
- set => this.Set((int)WixVariableTupleFields.WixVariable, value);
46
- }
47
-
40
public string Value
41
{
42
get => (string)this.Fields[(int)WixVariableTupleFields.Value];
@@ -57,4 +49,4 @@ namespace WixToolset.Data.Tuples
49
set => this.Set((int)WixVariableTupleFields.Overridable, value);
50
}
51
}
60
-}
\ No newline at end of file
52
+}
src/WixToolset.Data/Tuples/_StreamsTuple.cs
deleted
-52
@@ -1,52 +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 _Streams = new IntermediateTupleDefinition(
10
- TupleDefinitionType._Streams,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(_StreamsTupleFields.Name), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(_StreamsTupleFields.Data), IntermediateFieldType.Path),
15
- },
16
- typeof(_StreamsTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum _StreamsTupleFields
23
- {
24
- Name,
25
- Data,
26
- }
27
-
28
- public class _StreamsTuple : IntermediateTuple
29
- {
30
- public _StreamsTuple() : base(TupleDefinitions._Streams, null, null)
31
- {
32
- }
33
-
34
- public _StreamsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._Streams, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[_StreamsTupleFields index] => this.Fields[(int)index];
39
-
40
- public string Name
41
- {
42
- get => (string)this.Fields[(int)_StreamsTupleFields.Name];
43
- set => this.Set((int)_StreamsTupleFields.Name, value);
44
- }
45
-
46
- public string Data
47
- {
48
- get => (string)this.Fields[(int)_StreamsTupleFields.Data];
49
- set => this.Set((int)_StreamsTupleFields.Data, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
deleted
-52
@@ -1,52 +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 _SummaryInformation = new IntermediateTupleDefinition(
10
- TupleDefinitionType._SummaryInformation,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(_SummaryInformationTupleFields.PropertyId), IntermediateFieldType.Number),
14
- new IntermediateFieldDefinition(nameof(_SummaryInformationTupleFields.Value), IntermediateFieldType.String),
15
- },
16
- typeof(_SummaryInformationTuple));
17
- }
18
-}
19
-
20
-namespace WixToolset.Data.Tuples
21
-{
22
- public enum _SummaryInformationTupleFields
23
- {
24
- PropertyId,
25
- Value,
26
- }
27
-
28
- public class _SummaryInformationTuple : IntermediateTuple
29
- {
30
- public _SummaryInformationTuple() : base(TupleDefinitions._SummaryInformation, null, null)
31
- {
32
- }
33
-
34
- public _SummaryInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._SummaryInformation, sourceLineNumber, id)
35
- {
36
- }
37
-
38
- public IntermediateField this[_SummaryInformationTupleFields index] => this.Fields[(int)index];
39
-
40
- public int PropertyId
41
- {
42
- get => (int)this.Fields[(int)_SummaryInformationTupleFields.PropertyId];
43
- set => this.Set((int)_SummaryInformationTupleFields.PropertyId, value);
44
- }
45
-
46
- public string Value
47
- {
48
- get => (string)this.Fields[(int)_SummaryInformationTupleFields.Value];
49
- set => this.Set((int)_SummaryInformationTupleFields.Value, value);
50
- }
51
- }
52
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/_TransformViewTuple.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 _TransformView = new IntermediateTupleDefinition(
10
- TupleDefinitionType._TransformView,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Table), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Column), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Row), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Data), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Current), IntermediateFieldType.String),
18
- },
19
- typeof(_TransformViewTuple));
20
- }
21
-}
22
-
23
-namespace WixToolset.Data.Tuples
24
-{
25
- public enum _TransformViewTupleFields
26
- {
27
- Table,
28
- Column,
29
- Row,
30
- Data,
31
- Current,
32
- }
33
-
34
- public class _TransformViewTuple : IntermediateTuple
35
- {
36
- public _TransformViewTuple() : base(TupleDefinitions._TransformView, null, null)
37
- {
38
- }
39
-
40
- public _TransformViewTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._TransformView, sourceLineNumber, id)
41
- {
42
- }
43
-
44
- public IntermediateField this[_TransformViewTupleFields index] => this.Fields[(int)index];
45
-
46
- public string Table
47
- {
48
- get => (string)this.Fields[(int)_TransformViewTupleFields.Table];
49
- set => this.Set((int)_TransformViewTupleFields.Table, value);
50
- }
51
-
52
- public string Column
53
- {
54
- get => (string)this.Fields[(int)_TransformViewTupleFields.Column];
55
- set => this.Set((int)_TransformViewTupleFields.Column, value);
56
- }
57
-
58
- public string Row
59
- {
60
- get => (string)this.Fields[(int)_TransformViewTupleFields.Row];
61
- set => this.Set((int)_TransformViewTupleFields.Row, value);
62
- }
63
-
64
- public string Data
65
- {
66
- get => (string)this.Fields[(int)_TransformViewTupleFields.Data];
67
- set => this.Set((int)_TransformViewTupleFields.Data, value);
68
- }
69
-
70
- public string Current
71
- {
72
- get => (string)this.Fields[(int)_TransformViewTupleFields.Current];
73
- set => this.Set((int)_TransformViewTupleFields.Current, value);
74
- }
75
- }
76
-}
\ No newline at end of file
src/WixToolset.Data/Tuples/_ValidationTuple.cs
deleted
-116
@@ -1,116 +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 _Validation = new IntermediateTupleDefinition(
10
- TupleDefinitionType._Validation,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Table), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Column), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Nullable), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.MinValue), IntermediateFieldType.Number),
17
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.MaxValue), IntermediateFieldType.Number),
18
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.KeyTable), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.KeyColumn), IntermediateFieldType.Number),
20
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Category), IntermediateFieldType.String),
21
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Set), IntermediateFieldType.String),
22
- new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Description), IntermediateFieldType.String),
23
- },
24
- typeof(_ValidationTuple));
25
- }
26
-}
27
-
28
-namespace WixToolset.Data.Tuples
29
-{
30
- public enum _ValidationTupleFields
31
- {
32
- Table,
33
- Column,
34
- Nullable,
35
- MinValue,
36
- MaxValue,
37
- KeyTable,
38
- KeyColumn,
39
- Category,
40
- Set,
41
- Description,
42
- }
43
-
44
- public class _ValidationTuple : IntermediateTuple
45
- {
46
- public _ValidationTuple() : base(TupleDefinitions._Validation, null, null)
47
- {
48
- }
49
-
50
- public _ValidationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._Validation, sourceLineNumber, id)
51
- {
52
- }
53
-
54
- public IntermediateField this[_ValidationTupleFields index] => this.Fields[(int)index];
55
-
56
- public string Table
57
- {
58
- get => (string)this.Fields[(int)_ValidationTupleFields.Table];
59
- set => this.Set((int)_ValidationTupleFields.Table, value);
60
- }
61
-
62
- public string Column
63
- {
64
- get => (string)this.Fields[(int)_ValidationTupleFields.Column];
65
- set => this.Set((int)_ValidationTupleFields.Column, value);
66
- }
67
-
68
- public string Nullable
69
- {
70
- get => (string)this.Fields[(int)_ValidationTupleFields.Nullable];
71
- set => this.Set((int)_ValidationTupleFields.Nullable, value);
72
- }
73
-
74
- public int MinValue
75
- {
76
- get => (int)this.Fields[(int)_ValidationTupleFields.MinValue];
77
- set => this.Set((int)_ValidationTupleFields.MinValue, value);
78
- }
79
-
80
- public int MaxValue
81
- {
82
- get => (int)this.Fields[(int)_ValidationTupleFields.MaxValue];
83
- set => this.Set((int)_ValidationTupleFields.MaxValue, value);
84
- }
85
-
86
- public string KeyTable
87
- {
88
- get => (string)this.Fields[(int)_ValidationTupleFields.KeyTable];
89
- set => this.Set((int)_ValidationTupleFields.KeyTable, value);
90
- }
91
-
92
- public int KeyColumn
93
- {
94
- get => (int)this.Fields[(int)_ValidationTupleFields.KeyColumn];
95
- set => this.Set((int)_ValidationTupleFields.KeyColumn, value);
96
- }
97
-
98
- public string Category
99
- {
100
- get => (string)this.Fields[(int)_ValidationTupleFields.Category];
101
- set => this.Set((int)_ValidationTupleFields.Category, value);
102
- }
103
-
104
- public string Set
105
- {
106
- get => (string)this.Fields[(int)_ValidationTupleFields.Set];
107
- set => this.Set((int)_ValidationTupleFields.Set, value);
108
- }
109
-
110
- public string Description
111
- {
112
- get => (string)this.Fields[(int)_ValidationTupleFields.Description];
113
- set => this.Set((int)_ValidationTupleFields.Description, value);
114
- }
115
- }
116
-}
\ No newline at end of file
src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
+14
-14
@@ -90,7 +90,7 @@ namespace WixToolset.Data.WindowsInstaller
90
private static readonly WixActionTuple[] standardActions = new[]
91
{
92
new WixActionTuple(null, new Identifier("AdminExecuteSequence/InstallInitialize", AccessModifier.Public)) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdminExecuteSequence },
93
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallInitialize", AccessModifier.Public)) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdvtExecuteSequence },
93
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallInitialize", AccessModifier.Public)) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
94
new WixActionTuple(null, new Identifier("InstallExecuteSequence/InstallInitialize", AccessModifier.Public)) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.InstallExecuteSequence },
95
96
new WixActionTuple(null, new Identifier("InstallExecuteSequence/InstallExecute", AccessModifier.Public)) { Action="InstallExecute", Sequence=6500, SequenceTable=SequenceTable.InstallExecuteSequence, Condition="NOT Installed" },
@@ -98,7 +98,7 @@ namespace WixToolset.Data.WindowsInstaller
98
new WixActionTuple(null, new Identifier("InstallExecuteSequence/InstallExecuteAgain", AccessModifier.Public)) { Action="InstallExecuteAgain", Sequence=6550, SequenceTable=SequenceTable.InstallExecuteSequence, Condition="NOT Installed" },
99
100
new WixActionTuple(null, new Identifier("AdminExecuteSequence/InstallFinalize", AccessModifier.Public)) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdminExecuteSequence },
101
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallFinalize", AccessModifier.Public)) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdvtExecuteSequence },
101
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallFinalize", AccessModifier.Public)) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
102
new WixActionTuple(null, new Identifier("InstallExecuteSequence/InstallFinalize", AccessModifier.Public)) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.InstallExecuteSequence },
103
104
new WixActionTuple(null, new Identifier("AdminExecuteSequence/InstallFiles", AccessModifier.Public)) { Action="InstallFiles", Sequence=4000, SequenceTable=SequenceTable.AdminExecuteSequence },
@@ -113,48 +113,48 @@ namespace WixToolset.Data.WindowsInstaller
113
114
new WixActionTuple(null, new Identifier("AdminExecuteSequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminExecuteSequence },
115
new WixActionTuple(null, new Identifier("AdminUISequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminUISequence },
116
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvtExecuteSequence },
116
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
117
new WixActionTuple(null, new Identifier("InstallExecuteSequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallExecuteSequence },
118
new WixActionTuple(null, new Identifier("InstallUISequence/CostInitialize", AccessModifier.Public)) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallUISequence },
119
120
new WixActionTuple(null, new Identifier("AdminExecuteSequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminExecuteSequence },
121
new WixActionTuple(null, new Identifier("AdminUISequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence },
122
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvtExecuteSequence },
122
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
123
new WixActionTuple(null, new Identifier("InstallExecuteSequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallExecuteSequence },
124
new WixActionTuple(null, new Identifier("InstallUISequence/CostFinalize", AccessModifier.Public)) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallUISequence },
125
126
new WixActionTuple(null, new Identifier("AdminExecuteSequence/InstallValidate", AccessModifier.Public)) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdminExecuteSequence },
127
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallValidate", AccessModifier.Public)) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdvtExecuteSequence },
127
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/InstallValidate", AccessModifier.Public)) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
128
new WixActionTuple(null, new Identifier("InstallExecuteSequence/InstallValidate", AccessModifier.Public)) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.InstallExecuteSequence },
129
130
new WixActionTuple(null, new Identifier("AdminUISequence/ExecuteAction", AccessModifier.Public)) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence },
131
new WixActionTuple(null, new Identifier("InstallUISequence/ExecuteAction", AccessModifier.Public)) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.InstallUISequence },
132
133
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CreateShortcuts", AccessModifier.Public)) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.AdvtExecuteSequence },
133
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/CreateShortcuts", AccessModifier.Public)) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
134
new WixActionTuple(null, new Identifier("InstallExecuteSequence/CreateShortcuts", AccessModifier.Public)) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.InstallExecuteSequence },
135
136
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/MsiPublishAssemblies", AccessModifier.Public)) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.AdvtExecuteSequence },
136
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/MsiPublishAssemblies", AccessModifier.Public)) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
137
new WixActionTuple(null, new Identifier("InstallExecuteSequence/MsiPublishAssemblies", AccessModifier.Public)) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.InstallExecuteSequence },
138
139
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishComponents", AccessModifier.Public)) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.AdvtExecuteSequence },
139
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishComponents", AccessModifier.Public)) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
140
new WixActionTuple(null, new Identifier("InstallExecuteSequence/PublishComponents", AccessModifier.Public)) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.InstallExecuteSequence },
141
142
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishFeatures", AccessModifier.Public)) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.AdvtExecuteSequence },
142
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishFeatures", AccessModifier.Public)) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
143
new WixActionTuple(null, new Identifier("InstallExecuteSequence/PublishFeatures", AccessModifier.Public)) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.InstallExecuteSequence },
144
145
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishProduct", AccessModifier.Public)) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.AdvtExecuteSequence },
145
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/PublishProduct", AccessModifier.Public)) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
146
new WixActionTuple(null, new Identifier("InstallExecuteSequence/PublishProduct", AccessModifier.Public)) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.InstallExecuteSequence },
147
148
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterClassInfo", AccessModifier.Public)) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.AdvtExecuteSequence },
148
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterClassInfo", AccessModifier.Public)) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
149
new WixActionTuple(null, new Identifier("InstallExecuteSequence/RegisterClassInfo", AccessModifier.Public)) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.InstallExecuteSequence },
150
151
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterExtensionInfo", AccessModifier.Public)) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.AdvtExecuteSequence },
151
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterExtensionInfo", AccessModifier.Public)) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
152
new WixActionTuple(null, new Identifier("InstallExecuteSequence/RegisterExtensionInfo", AccessModifier.Public)) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.InstallExecuteSequence },
153
154
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterMIMEInfo", AccessModifier.Public)) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.AdvtExecuteSequence },
154
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterMIMEInfo", AccessModifier.Public)) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
155
new WixActionTuple(null, new Identifier("InstallExecuteSequence/RegisterMIMEInfo", AccessModifier.Public)) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.InstallExecuteSequence },
156
157
- new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterProgIdInfo", AccessModifier.Public)) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.AdvtExecuteSequence },
157
+ new WixActionTuple(null, new Identifier("AdvtExecuteSequence/RegisterProgIdInfo", AccessModifier.Public)) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
158
new WixActionTuple(null, new Identifier("InstallExecuteSequence/RegisterProgIdInfo", AccessModifier.Public)) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.InstallExecuteSequence },
159
160
new WixActionTuple(null, new Identifier("InstallExecuteSequence/AllocateRegistrySpace", AccessModifier.Public)) { Action="AllocateRegistrySpace", Sequence=1550, SequenceTable=SequenceTable.InstallExecuteSequence },
src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+3
-3
@@ -43,11 +43,11 @@ namespace WixToolsetTest.Data
43
public void CanCheckNameofField()
44
{
45
var fileTuple = new FileTuple();
46
- Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[1].Name);
46
+ Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[0].Name);
47
Assert.Null(fileTuple.Fields[0]);
48
fileTuple.Component_ = "Foo";
49
- Assert.Equal("Component_", fileTuple.Fields[1].Name);
50
- Assert.Same(fileTuple.Definition.FieldDefinitions[1].Name, fileTuple.Fields[1].Name);
49
+ Assert.Equal("Component_", fileTuple.Fields[0].Name);
50
+ Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
51
}
52
53
[Fact]