From 49ce77951ca980848b275cef082309c49b117f47 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 12 Jun 2020 06:51:37 -0700 Subject: Fix custom table column values case in compiler and decompiler --- .../Bind/LoadTableDefinitionsCommand.cs | 53 +++++++++++----------- .../Decompile/Decompiler.cs | 52 ++++++++++----------- 2 files changed, 53 insertions(+), 52 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs index d7809034..0312ab44 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs @@ -87,84 +87,85 @@ namespace WixToolset.Core.WindowsInstaller.Bind var category = ColumnCategory.Unknown; switch (column.Category) { - case "Text": + case WixCustomTableColumnCategoryType.Text: category = ColumnCategory.Text; break; - case "UpperCase": + case WixCustomTableColumnCategoryType.UpperCase: category = ColumnCategory.UpperCase; break; - case "LowerCase": + case WixCustomTableColumnCategoryType.LowerCase: category = ColumnCategory.LowerCase; break; - case "Integer": + case WixCustomTableColumnCategoryType.Integer: category = ColumnCategory.Integer; break; - case "DoubleInteger": + case WixCustomTableColumnCategoryType.DoubleInteger: category = ColumnCategory.DoubleInteger; break; - case "TimeDate": + case WixCustomTableColumnCategoryType.TimeDate: category = ColumnCategory.TimeDate; break; - case "Identifier": + case WixCustomTableColumnCategoryType.Identifier: category = ColumnCategory.Identifier; break; - case "Property": + case WixCustomTableColumnCategoryType.Property: category = ColumnCategory.Property; break; - case "Filename": + case WixCustomTableColumnCategoryType.Filename: category = ColumnCategory.Filename; break; - case "WildCardFilename": + case WixCustomTableColumnCategoryType.WildCardFilename: category = ColumnCategory.WildCardFilename; break; - case "Path": + case WixCustomTableColumnCategoryType.Path: category = ColumnCategory.Path; break; - case "Paths": + case WixCustomTableColumnCategoryType.Paths: category = ColumnCategory.Paths; break; - case "AnyPath": + case WixCustomTableColumnCategoryType.AnyPath: category = ColumnCategory.AnyPath; break; - case "DefaultDir": + case WixCustomTableColumnCategoryType.DefaultDir: category = ColumnCategory.DefaultDir; break; - case "RegPath": + case WixCustomTableColumnCategoryType.RegPath: category = ColumnCategory.RegPath; break; - case "Formatted": + case WixCustomTableColumnCategoryType.Formatted: category = ColumnCategory.Formatted; break; - case "FormattedSddl": + case WixCustomTableColumnCategoryType.FormattedSddl: category = ColumnCategory.FormattedSDDLText; break; - case "Template": + case WixCustomTableColumnCategoryType.Template: category = ColumnCategory.Template; break; - case "Condition": + case WixCustomTableColumnCategoryType.Condition: category = ColumnCategory.Condition; break; - case "Guid": + case WixCustomTableColumnCategoryType.Guid: category = ColumnCategory.Guid; break; - case "Version": + case WixCustomTableColumnCategoryType.Version: category = ColumnCategory.Version; break; - case "Language": + case WixCustomTableColumnCategoryType.Language: category = ColumnCategory.Language; break; - case "Binary": + case WixCustomTableColumnCategoryType.Binary: category = ColumnCategory.Binary; break; - case "CustomSource": + case WixCustomTableColumnCategoryType.CustomSource: category = ColumnCategory.CustomSource; break; - case "Cabinet": + case WixCustomTableColumnCategoryType.Cabinet: category = ColumnCategory.Cabinet; break; - case "Shortcut": + case WixCustomTableColumnCategoryType.Shortcut: category = ColumnCategory.Shortcut; break; + case null: default: break; } diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index 560b5437..54a92f3c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -4481,82 +4481,82 @@ namespace WixToolset.Core.WindowsInstaller switch (columnDefinition.Category) { case ColumnCategory.Text: - column.Category = Wix.Column.CategoryType.Text; + column.Category = Wix.Column.CategoryType.text; break; case ColumnCategory.UpperCase: - column.Category = Wix.Column.CategoryType.UpperCase; + column.Category = Wix.Column.CategoryType.upperCase; break; case ColumnCategory.LowerCase: - column.Category = Wix.Column.CategoryType.LowerCase; + column.Category = Wix.Column.CategoryType.lowerCase; break; case ColumnCategory.Integer: - column.Category = Wix.Column.CategoryType.Integer; + column.Category = Wix.Column.CategoryType.integer; break; case ColumnCategory.DoubleInteger: - column.Category = Wix.Column.CategoryType.DoubleInteger; + column.Category = Wix.Column.CategoryType.doubleInteger; break; case ColumnCategory.TimeDate: - column.Category = Wix.Column.CategoryType.TimeDate; + column.Category = Wix.Column.CategoryType.timeDate; break; case ColumnCategory.Identifier: - column.Category = Wix.Column.CategoryType.Identifier; + column.Category = Wix.Column.CategoryType.identifier; break; case ColumnCategory.Property: - column.Category = Wix.Column.CategoryType.Property; + column.Category = Wix.Column.CategoryType.property; break; case ColumnCategory.Filename: - column.Category = Wix.Column.CategoryType.Filename; + column.Category = Wix.Column.CategoryType.filename; break; case ColumnCategory.WildCardFilename: - column.Category = Wix.Column.CategoryType.WildCardFilename; + column.Category = Wix.Column.CategoryType.wildCardFilename; break; case ColumnCategory.Path: - column.Category = Wix.Column.CategoryType.Path; + column.Category = Wix.Column.CategoryType.path; break; case ColumnCategory.Paths: - column.Category = Wix.Column.CategoryType.Paths; + column.Category = Wix.Column.CategoryType.paths; break; case ColumnCategory.AnyPath: - column.Category = Wix.Column.CategoryType.AnyPath; + column.Category = Wix.Column.CategoryType.anyPath; break; case ColumnCategory.DefaultDir: - column.Category = Wix.Column.CategoryType.DefaultDir; + column.Category = Wix.Column.CategoryType.defaultDir; break; case ColumnCategory.RegPath: - column.Category = Wix.Column.CategoryType.RegPath; + column.Category = Wix.Column.CategoryType.regPath; break; case ColumnCategory.Formatted: - column.Category = Wix.Column.CategoryType.Formatted; + column.Category = Wix.Column.CategoryType.formatted; break; case ColumnCategory.FormattedSDDLText: - column.Category = Wix.Column.CategoryType.FormattedSddl; + column.Category = Wix.Column.CategoryType.formattedSddl; break; case ColumnCategory.Template: - column.Category = Wix.Column.CategoryType.Template; + column.Category = Wix.Column.CategoryType.template; break; case ColumnCategory.Condition: - column.Category = Wix.Column.CategoryType.Condition; + column.Category = Wix.Column.CategoryType.condition; break; case ColumnCategory.Guid: - column.Category = Wix.Column.CategoryType.Guid; + column.Category = Wix.Column.CategoryType.guid; break; case ColumnCategory.Version: - column.Category = Wix.Column.CategoryType.Version; + column.Category = Wix.Column.CategoryType.version; break; case ColumnCategory.Language: - column.Category = Wix.Column.CategoryType.Language; + column.Category = Wix.Column.CategoryType.language; break; case ColumnCategory.Binary: - column.Category = Wix.Column.CategoryType.Binary; + column.Category = Wix.Column.CategoryType.binary; break; case ColumnCategory.CustomSource: - column.Category = Wix.Column.CategoryType.CustomSource; + column.Category = Wix.Column.CategoryType.customSource; break; case ColumnCategory.Cabinet: - column.Category = Wix.Column.CategoryType.Cabinet; + column.Category = Wix.Column.CategoryType.cabinet; break; case ColumnCategory.Shortcut: - column.Category = Wix.Column.CategoryType.Shortcut; + column.Category = Wix.Column.CategoryType.shortcut; break; default: throw new InvalidOperationException($"Unknown custom column category '{columnDefinition.Category.ToString()}'."); -- cgit v1.2.3-55-g6feb