Try to be more accurate in the tuples with nullable fields.
Sean Hall committed
Apr 13, 2020 at 16:39 UTC
ddb4161e3d9d13703b0df2915e68b5b4ef47e71b
21 files changed
+62
-62
src/WixToolset.Data/Tuples/BillboardTuple.cs
+2
-2
@@ -51,9 +51,9 @@ namespace WixToolset.Data.Tuples
51
set => this.Set((int)BillboardTupleFields.Action, value);
52
}
53
54
- public int Ordering
54
+ public int? Ordering
55
{
56
- get => (int)this.Fields[(int)BillboardTupleFields.Ordering];
56
+ get => (int?)this.Fields[(int)BillboardTupleFields.Ordering];
57
set => this.Set((int)BillboardTupleFields.Ordering, value);
58
}
59
}
src/WixToolset.Data/Tuples/ComplusTuple.cs
+2
-2
@@ -43,9 +43,9 @@ namespace WixToolset.Data.Tuples
43
set => this.Set((int)ComplusTupleFields.ComponentRef, value);
44
}
45
46
- public int ExpType
46
+ public int? ExpType
47
{
48
- get => (int)this.Fields[(int)ComplusTupleFields.ExpType];
48
+ get => (int?)this.Fields[(int)ComplusTupleFields.ExpType];
49
set => this.Set((int)ComplusTupleFields.ExpType, value);
50
}
51
}
src/WixToolset.Data/Tuples/ControlEventTuple.cs
+2
-2
@@ -75,9 +75,9 @@ namespace WixToolset.Data.Tuples
75
set => this.Set((int)ControlEventTupleFields.Condition, value);
76
}
77
78
- public int Ordering
78
+ public int? Ordering
79
{
80
- get => (int)this.Fields[(int)ControlEventTupleFields.Ordering];
80
+ get => (int?)this.Fields[(int)ControlEventTupleFields.Ordering];
81
set => this.Set((int)ControlEventTupleFields.Ordering, value);
82
}
83
}
src/WixToolset.Data/Tuples/ControlTuple.cs
+2
-2
@@ -119,9 +119,9 @@ namespace WixToolset.Data.Tuples
119
set => this.Set((int)ControlTupleFields.Height, value);
120
}
121
122
- public int Attributes
122
+ public int? Attributes
123
{
124
- get => this.Fields[(int)ControlTupleFields.Attributes].AsNumber();
124
+ get => (int?)this.Fields[(int)ControlTupleFields.Attributes];
125
set => this.Set((int)ControlTupleFields.Attributes, value);
126
}
127
src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+2
-2
@@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples
59
set => this.Set((int)DrLocatorTupleFields.Path, value);
60
}
61
62
- public int Depth
62
+ public int? Depth
63
{
64
- get => (int)this.Fields[(int)DrLocatorTupleFields.Depth];
64
+ get => (int?)this.Fields[(int)DrLocatorTupleFields.Depth];
65
set => this.Set((int)DrLocatorTupleFields.Depth, value);
66
}
67
}
src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
+2
-2
@@ -57,9 +57,9 @@ namespace WixToolset.Data.Tuples
57
set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value);
58
}
59
60
- public int MediaDiskId
60
+ public int? MediaDiskId
61
{
62
- get => (int)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId];
62
+ get => (int?)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId];
63
set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
64
}
65
src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+1
-1
@@ -77,7 +77,7 @@ namespace WixToolset.Data.Tuples
77
78
public int? Type
79
{
80
- get => this.Fields[(int)IniLocatorTupleFields.Type].AsNullableNumber();
80
+ get => (int?)this.Fields[(int)IniLocatorTupleFields.Type];
81
set => this.Set((int)IniLocatorTupleFields.Type, value);
82
}
83
}
src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
+2
-2
@@ -61,9 +61,9 @@ namespace WixToolset.Data.Tuples
61
set => this.Set((int)MsiEmbeddedUITupleFields.SupportsBasicUI, value);
62
}
63
64
- public int MessageFilter
64
+ public int? MessageFilter
65
{
66
- get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter];
66
+ get => (int?)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter];
67
set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value);
68
}
69
src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
+2
-2
@@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples
59
set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value);
60
}
61
62
- public int Attributes
62
+ public int? Attributes
63
{
64
- get => (int)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes];
64
+ get => (int?)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes];
65
set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value);
66
}
67
}
src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+1
-1
@@ -79,7 +79,7 @@ namespace WixToolset.Data.Tuples
79
80
public int? ResetPeriod
81
{
82
- get => (int)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod].AsNullableNumber();
82
+ get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod];
83
set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod, value);
84
}
85
src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
+2
-2
@@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples
59
set => this.Set((int)PatchSequenceTupleFields.Sequence, value);
60
}
61
62
- public int Supersede
62
+ public int? Supersede
63
{
64
- get => (int)this.Fields[(int)PatchSequenceTupleFields.Supersede];
64
+ get => (int?)this.Fields[(int)PatchSequenceTupleFields.Supersede];
65
set => this.Set((int)PatchSequenceTupleFields.Supersede, value);
66
}
67
}
src/WixToolset.Data/Tuples/SignatureTuple.cs
+8
-8
@@ -67,27 +67,27 @@ namespace WixToolset.Data.Tuples
67
set => this.Set((int)SignatureTupleFields.MaxVersion, value);
68
}
69
70
- public int MinSize
70
+ public int? MinSize
71
{
72
- get => (int)this.Fields[(int)SignatureTupleFields.MinSize];
72
+ get => (int?)this.Fields[(int)SignatureTupleFields.MinSize];
73
set => this.Set((int)SignatureTupleFields.MinSize, value);
74
}
75
76
- public int MaxSize
76
+ public int? MaxSize
77
{
78
- get => (int)this.Fields[(int)SignatureTupleFields.MaxSize];
78
+ get => (int?)this.Fields[(int)SignatureTupleFields.MaxSize];
79
set => this.Set((int)SignatureTupleFields.MaxSize, value);
80
}
81
82
- public int MinDate
82
+ public int? MinDate
83
{
84
- get => (int)this.Fields[(int)SignatureTupleFields.MinDate];
84
+ get => (int?)this.Fields[(int)SignatureTupleFields.MinDate];
85
set => this.Set((int)SignatureTupleFields.MinDate, value);
86
}
87
88
- public int MaxDate
88
+ public int? MaxDate
89
{
90
- get => (int)this.Fields[(int)SignatureTupleFields.MaxDate];
90
+ get => (int?)this.Fields[(int)SignatureTupleFields.MaxDate];
91
set => this.Set((int)SignatureTupleFields.MaxDate, value);
92
}
93
src/WixToolset.Data/Tuples/TypeLibTuple.cs
+4
-4
@@ -67,9 +67,9 @@ namespace WixToolset.Data.Tuples
67
set => this.Set((int)TypeLibTupleFields.ComponentRef, value);
68
}
69
70
- public int Version
70
+ public int? Version
71
{
72
- get => (int)this.Fields[(int)TypeLibTupleFields.Version];
72
+ get => (int?)this.Fields[(int)TypeLibTupleFields.Version];
73
set => this.Set((int)TypeLibTupleFields.Version, value);
74
}
75
@@ -91,9 +91,9 @@ namespace WixToolset.Data.Tuples
91
set => this.Set((int)TypeLibTupleFields.FeatureRef, value);
92
}
93
94
- public int Cost
94
+ public int? Cost
95
{
96
- get => (int)this.Fields[(int)TypeLibTupleFields.Cost];
96
+ get => (int?)this.Fields[(int)TypeLibTupleFields.Cost];
97
set => this.Set((int)TypeLibTupleFields.Cost, value);
98
}
99
}
src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
+4
-4
@@ -61,15 +61,15 @@ namespace WixToolset.Data.Tuples
61
set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value);
62
}
63
64
- public bool AllowIgnoreOnPatchError
64
+ public bool? AllowIgnoreOnPatchError
65
{
66
- get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
66
+ get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
67
set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value);
68
}
69
70
- public bool IncludeWholeFile
70
+ public bool? IncludeWholeFile
71
{
72
- get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
72
+ get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
73
set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value);
74
}
75
}
src/WixToolset.Data/Tuples/VerbTuple.cs
+2
-2
@@ -55,9 +55,9 @@ namespace WixToolset.Data.Tuples
55
set => this.Set((int)VerbTupleFields.Verb, value);
56
}
57
58
- public int Sequence
58
+ public int? Sequence
59
{
60
- get => (int)this.Fields[(int)VerbTupleFields.Sequence];
60
+ get => (int?)this.Fields[(int)VerbTupleFields.Sequence];
61
set => this.Set((int)VerbTupleFields.Sequence, value);
62
}
63
src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
+4
-4
@@ -76,9 +76,9 @@ namespace WixToolset.Data.Tuples
76
set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
77
}
78
79
- public long Size
79
+ public long? Size
80
{
81
- get => (long)this.Fields[(int)WixBundleContainerTupleFields.Size];
81
+ get => (long?)this.Fields[(int)WixBundleContainerTupleFields.Size];
82
set => this.Set((int)WixBundleContainerTupleFields.Size, value);
83
}
84
@@ -88,9 +88,9 @@ namespace WixToolset.Data.Tuples
88
set => this.Set((int)WixBundleContainerTupleFields.Hash, value);
89
}
90
91
- public int AttachedContainerIndex
91
+ public int? AttachedContainerIndex
92
{
93
- get => (int)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex];
93
+ get => (int?)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex];
94
set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value);
95
}
96
src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+2
-2
@@ -171,9 +171,9 @@ namespace WixToolset.Data.Tuples
171
set => this.Set((int)WixBundlePackageTupleFields.Version, value);
172
}
173
174
- public int Language
174
+ public int? Language
175
{
176
- get => (int)this.Fields[(int)WixBundlePackageTupleFields.Language];
176
+ get => (int?)this.Fields[(int)WixBundlePackageTupleFields.Language];
177
set => this.Set((int)WixBundlePackageTupleFields.Language, value);
178
}
179
src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+5
-5
@@ -125,9 +125,9 @@ namespace WixToolset.Data.Tuples
125
set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value);
126
}
127
128
- public int FileSize
128
+ public int? FileSize
129
{
130
- get => (int)this.Fields[(int)WixBundlePayloadTupleFields.FileSize];
130
+ get => (int?)this.Fields[(int)WixBundlePayloadTupleFields.FileSize];
131
set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value);
132
}
133
@@ -191,10 +191,10 @@ namespace WixToolset.Data.Tuples
191
set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value);
192
}
193
194
- public PackagingType Packaging
194
+ public PackagingType? Packaging
195
{
196
- get => (PackagingType)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber();
197
- set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int)value);
196
+ get => (PackagingType?)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber();
197
+ set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int?)value);
198
}
199
200
public string ParentPackagePayloadRef
src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+8
-8
@@ -86,27 +86,27 @@ namespace WixToolset.Data.Tuples
86
set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value);
87
}
88
89
- public int MinSize
89
+ public int? MinSize
90
{
91
- get => (int)this.Fields[(int)WixFileSearchTupleFields.MinSize];
91
+ get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinSize];
92
set => this.Set((int)WixFileSearchTupleFields.MinSize, value);
93
}
94
95
- public int MaxSize
95
+ public int? MaxSize
96
{
97
- get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxSize];
97
+ get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxSize];
98
set => this.Set((int)WixFileSearchTupleFields.MaxSize, value);
99
}
100
101
- public int MinDate
101
+ public int? MinDate
102
{
103
- get => (int)this.Fields[(int)WixFileSearchTupleFields.MinDate];
103
+ get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinDate];
104
set => this.Set((int)WixFileSearchTupleFields.MinDate, value);
105
}
106
107
- public int MaxDate
107
+ public int? MaxDate
108
{
109
- get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxDate];
109
+ get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxDate];
110
set => this.Set((int)WixFileSearchTupleFields.MaxDate, value);
111
}
112
src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
+4
-4
@@ -45,15 +45,15 @@ namespace WixToolset.Data.Tuples
45
set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
46
}
47
48
- public bool OptimizePatchSizeForLargeFiles
48
+ public bool? OptimizePatchSizeForLargeFiles
49
{
50
- get => (bool)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles];
50
+ get => (bool?)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles];
51
set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
52
}
53
54
- public int ApiPatchingSymbolFlags
54
+ public int? ApiPatchingSymbolFlags
55
{
56
- get => (int)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags];
56
+ get => (int?)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags];
57
set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value);
58
}
59
}
src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+1
-1
@@ -1663,7 +1663,7 @@ namespace WixToolset.Data.WindowsInstaller
1663
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown),
1664
new ColumnDefinition("Before", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown),
1665
new ColumnDefinition("After", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown),
1666
- new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown),
1666
+ new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown),
1667
},
1668
unreal: true,
1669
tupleIdIsPrimaryKey: false