From ddb4161e3d9d13703b0df2915e68b5b4ef47e71b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 16:39:11 +1000 Subject: Try to be more accurate in the tuples with nullable fields. --- src/WixToolset.Data/Tuples/BillboardTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/ComplusTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/ControlEventTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/ControlTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/DrLocatorTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/IniLocatorTuple.cs | 2 +- src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs | 4 ++-- src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs | 4 ++-- .../Tuples/MsiServiceConfigFailureActionsTuple.cs | 2 +- src/WixToolset.Data/Tuples/PatchSequenceTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/SignatureTuple.cs | 16 ++++++++-------- src/WixToolset.Data/Tuples/TypeLibTuple.cs | 8 ++++---- .../Tuples/UpgradedFilesOptionalDataTuple.cs | 8 ++++---- src/WixToolset.Data/Tuples/VerbTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs | 8 ++++---- src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs | 4 ++-- src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs | 10 +++++----- src/WixToolset.Data/Tuples/WixFileSearchTuple.cs | 16 ++++++++-------- src/WixToolset.Data/Tuples/WixPatchIdTuple.cs | 8 ++++---- .../WindowsInstaller/WindowsInstallerTableDefinitions.cs | 2 +- 21 files changed, 62 insertions(+), 62 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/Tuples/BillboardTuple.cs b/src/WixToolset.Data/Tuples/BillboardTuple.cs index 9931d16a..c5242d33 100644 --- a/src/WixToolset.Data/Tuples/BillboardTuple.cs +++ b/src/WixToolset.Data/Tuples/BillboardTuple.cs @@ -51,9 +51,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)BillboardTupleFields.Action, value); } - public int Ordering + public int? Ordering { - get => (int)this.Fields[(int)BillboardTupleFields.Ordering]; + get => (int?)this.Fields[(int)BillboardTupleFields.Ordering]; set => this.Set((int)BillboardTupleFields.Ordering, value); } } diff --git a/src/WixToolset.Data/Tuples/ComplusTuple.cs b/src/WixToolset.Data/Tuples/ComplusTuple.cs index bd76c0d3..428f3a8e 100644 --- a/src/WixToolset.Data/Tuples/ComplusTuple.cs +++ b/src/WixToolset.Data/Tuples/ComplusTuple.cs @@ -43,9 +43,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)ComplusTupleFields.ComponentRef, value); } - public int ExpType + public int? ExpType { - get => (int)this.Fields[(int)ComplusTupleFields.ExpType]; + get => (int?)this.Fields[(int)ComplusTupleFields.ExpType]; set => this.Set((int)ComplusTupleFields.ExpType, value); } } diff --git a/src/WixToolset.Data/Tuples/ControlEventTuple.cs b/src/WixToolset.Data/Tuples/ControlEventTuple.cs index 96d0bcdc..9c460353 100644 --- a/src/WixToolset.Data/Tuples/ControlEventTuple.cs +++ b/src/WixToolset.Data/Tuples/ControlEventTuple.cs @@ -75,9 +75,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)ControlEventTupleFields.Condition, value); } - public int Ordering + public int? Ordering { - get => (int)this.Fields[(int)ControlEventTupleFields.Ordering]; + get => (int?)this.Fields[(int)ControlEventTupleFields.Ordering]; set => this.Set((int)ControlEventTupleFields.Ordering, value); } } diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs index f0fd92c1..ed61392e 100644 --- a/src/WixToolset.Data/Tuples/ControlTuple.cs +++ b/src/WixToolset.Data/Tuples/ControlTuple.cs @@ -119,9 +119,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)ControlTupleFields.Height, value); } - public int Attributes + public int? Attributes { - get => this.Fields[(int)ControlTupleFields.Attributes].AsNumber(); + get => (int?)this.Fields[(int)ControlTupleFields.Attributes]; set => this.Set((int)ControlTupleFields.Attributes, value); } diff --git a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs index 4f696b5c..667ffda1 100644 --- a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs +++ b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs @@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)DrLocatorTupleFields.Path, value); } - public int Depth + public int? Depth { - get => (int)this.Fields[(int)DrLocatorTupleFields.Depth]; + get => (int?)this.Fields[(int)DrLocatorTupleFields.Depth]; set => this.Set((int)DrLocatorTupleFields.Depth, value); } } diff --git a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs index b7052ee3..4538b88c 100644 --- a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs +++ b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs @@ -57,9 +57,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value); } - public int MediaDiskId + public int? MediaDiskId { - get => (int)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId]; + get => (int?)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId]; set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value); } diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs index 0bb670c6..1a52715d 100644 --- a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs +++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs @@ -77,7 +77,7 @@ namespace WixToolset.Data.Tuples public int? Type { - get => this.Fields[(int)IniLocatorTupleFields.Type].AsNullableNumber(); + get => (int?)this.Fields[(int)IniLocatorTupleFields.Type]; set => this.Set((int)IniLocatorTupleFields.Type, value); } } diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs index 83cfcc43..baedf56b 100644 --- a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs +++ b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs @@ -61,9 +61,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)MsiEmbeddedUITupleFields.SupportsBasicUI, value); } - public int MessageFilter + public int? MessageFilter { - get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter]; + get => (int?)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter]; set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value); } diff --git a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs index 1d5a5d90..143e58a0 100644 --- a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs +++ b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs @@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value); } - public int Attributes + public int? Attributes { - get => (int)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes]; + get => (int?)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes]; set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value); } } diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs index 8a0001ae..faf9069e 100644 --- a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs +++ b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs @@ -79,7 +79,7 @@ namespace WixToolset.Data.Tuples public int? ResetPeriod { - get => (int)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod].AsNullableNumber(); + get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod]; set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod, value); } diff --git a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs index 857e8d6e..f7036a05 100644 --- a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs +++ b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs @@ -59,9 +59,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)PatchSequenceTupleFields.Sequence, value); } - public int Supersede + public int? Supersede { - get => (int)this.Fields[(int)PatchSequenceTupleFields.Supersede]; + get => (int?)this.Fields[(int)PatchSequenceTupleFields.Supersede]; set => this.Set((int)PatchSequenceTupleFields.Supersede, value); } } diff --git a/src/WixToolset.Data/Tuples/SignatureTuple.cs b/src/WixToolset.Data/Tuples/SignatureTuple.cs index db380bb6..ed559f64 100644 --- a/src/WixToolset.Data/Tuples/SignatureTuple.cs +++ b/src/WixToolset.Data/Tuples/SignatureTuple.cs @@ -67,27 +67,27 @@ namespace WixToolset.Data.Tuples set => this.Set((int)SignatureTupleFields.MaxVersion, value); } - public int MinSize + public int? MinSize { - get => (int)this.Fields[(int)SignatureTupleFields.MinSize]; + get => (int?)this.Fields[(int)SignatureTupleFields.MinSize]; set => this.Set((int)SignatureTupleFields.MinSize, value); } - public int MaxSize + public int? MaxSize { - get => (int)this.Fields[(int)SignatureTupleFields.MaxSize]; + get => (int?)this.Fields[(int)SignatureTupleFields.MaxSize]; set => this.Set((int)SignatureTupleFields.MaxSize, value); } - public int MinDate + public int? MinDate { - get => (int)this.Fields[(int)SignatureTupleFields.MinDate]; + get => (int?)this.Fields[(int)SignatureTupleFields.MinDate]; set => this.Set((int)SignatureTupleFields.MinDate, value); } - public int MaxDate + public int? MaxDate { - get => (int)this.Fields[(int)SignatureTupleFields.MaxDate]; + get => (int?)this.Fields[(int)SignatureTupleFields.MaxDate]; set => this.Set((int)SignatureTupleFields.MaxDate, value); } diff --git a/src/WixToolset.Data/Tuples/TypeLibTuple.cs b/src/WixToolset.Data/Tuples/TypeLibTuple.cs index 14c69c1a..071fe593 100644 --- a/src/WixToolset.Data/Tuples/TypeLibTuple.cs +++ b/src/WixToolset.Data/Tuples/TypeLibTuple.cs @@ -67,9 +67,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)TypeLibTupleFields.ComponentRef, value); } - public int Version + public int? Version { - get => (int)this.Fields[(int)TypeLibTupleFields.Version]; + get => (int?)this.Fields[(int)TypeLibTupleFields.Version]; set => this.Set((int)TypeLibTupleFields.Version, value); } @@ -91,9 +91,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)TypeLibTupleFields.FeatureRef, value); } - public int Cost + public int? Cost { - get => (int)this.Fields[(int)TypeLibTupleFields.Cost]; + get => (int?)this.Fields[(int)TypeLibTupleFields.Cost]; set => this.Set((int)TypeLibTupleFields.Cost, value); } } diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs index 72dac43a..1b4769b3 100644 --- a/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs +++ b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs @@ -61,15 +61,15 @@ namespace WixToolset.Data.Tuples set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value); } - public bool AllowIgnoreOnPatchError + public bool? AllowIgnoreOnPatchError { - get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError]; + get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError]; set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value); } - public bool IncludeWholeFile + public bool? IncludeWholeFile { - get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile]; + get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile]; set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value); } } diff --git a/src/WixToolset.Data/Tuples/VerbTuple.cs b/src/WixToolset.Data/Tuples/VerbTuple.cs index 77df01e4..7a257a3e 100644 --- a/src/WixToolset.Data/Tuples/VerbTuple.cs +++ b/src/WixToolset.Data/Tuples/VerbTuple.cs @@ -55,9 +55,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)VerbTupleFields.Verb, value); } - public int Sequence + public int? Sequence { - get => (int)this.Fields[(int)VerbTupleFields.Sequence]; + get => (int?)this.Fields[(int)VerbTupleFields.Sequence]; set => this.Set((int)VerbTupleFields.Sequence, value); } diff --git a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs index ed12a804..a0f64611 100644 --- a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs +++ b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs @@ -76,9 +76,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value); } - public long Size + public long? Size { - get => (long)this.Fields[(int)WixBundleContainerTupleFields.Size]; + get => (long?)this.Fields[(int)WixBundleContainerTupleFields.Size]; set => this.Set((int)WixBundleContainerTupleFields.Size, value); } @@ -88,9 +88,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundleContainerTupleFields.Hash, value); } - public int AttachedContainerIndex + public int? AttachedContainerIndex { - get => (int)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex]; + get => (int?)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex]; set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value); } diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs index d61e12d0..03c7879d 100644 --- a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs +++ b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs @@ -171,9 +171,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundlePackageTupleFields.Version, value); } - public int Language + public int? Language { - get => (int)this.Fields[(int)WixBundlePackageTupleFields.Language]; + get => (int?)this.Fields[(int)WixBundlePackageTupleFields.Language]; set => this.Set((int)WixBundlePackageTupleFields.Language, value); } diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs index 049ac3b5..e0ef6fe1 100644 --- a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs +++ b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs @@ -125,9 +125,9 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value); } - public int FileSize + public int? FileSize { - get => (int)this.Fields[(int)WixBundlePayloadTupleFields.FileSize]; + get => (int?)this.Fields[(int)WixBundlePayloadTupleFields.FileSize]; set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value); } @@ -191,10 +191,10 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value); } - public PackagingType Packaging + public PackagingType? Packaging { - get => (PackagingType)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber(); - set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int)value); + get => (PackagingType?)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber(); + set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int?)value); } public string ParentPackagePayloadRef diff --git a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs index 4c0cedf3..033aca21 100644 --- a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs +++ b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs @@ -86,27 +86,27 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value); } - public int MinSize + public int? MinSize { - get => (int)this.Fields[(int)WixFileSearchTupleFields.MinSize]; + get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinSize]; set => this.Set((int)WixFileSearchTupleFields.MinSize, value); } - public int MaxSize + public int? MaxSize { - get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxSize]; + get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxSize]; set => this.Set((int)WixFileSearchTupleFields.MaxSize, value); } - public int MinDate + public int? MinDate { - get => (int)this.Fields[(int)WixFileSearchTupleFields.MinDate]; + get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinDate]; set => this.Set((int)WixFileSearchTupleFields.MinDate, value); } - public int MaxDate + public int? MaxDate { - get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxDate]; + get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxDate]; set => this.Set((int)WixFileSearchTupleFields.MaxDate, value); } diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs index 35c99493..6e6fb2ae 100644 --- a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs +++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs @@ -45,15 +45,15 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value); } - public bool OptimizePatchSizeForLargeFiles + public bool? OptimizePatchSizeForLargeFiles { - get => (bool)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]; + get => (bool?)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]; set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value); } - public int ApiPatchingSymbolFlags + public int? ApiPatchingSymbolFlags { - get => (int)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags]; + get => (int?)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags]; set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value); } } diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs index be59b844..ea1ecbbd 100644 --- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs +++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs @@ -1663,7 +1663,7 @@ namespace WixToolset.Data.WindowsInstaller new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown), new ColumnDefinition("Before", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown), new ColumnDefinition("After", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown), - new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown), + new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown), }, unreal: true, tupleIdIsPrimaryKey: false -- cgit v1.2.3-55-g6feb