aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-12 06:51:37 -0700
committerRob Mensching <rob@firegiant.com>2020-06-12 08:20:50 -0700
commit49ce77951ca980848b275cef082309c49b117f47 (patch)
treea57e22fef0451b65edf6744440b84af04704c9e7 /src/WixToolset.Core.WindowsInstaller
parenta82e58ab8a47f4b5d189213da4d7c1dea8437972 (diff)
downloadwix-49ce77951ca980848b275cef082309c49b117f47.tar.gz
wix-49ce77951ca980848b275cef082309c49b117f47.tar.bz2
wix-49ce77951ca980848b275cef082309c49b117f47.zip
Fix custom table column values case in compiler and decompiler
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs53
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs52
2 files changed, 53 insertions, 52 deletions
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
87 var category = ColumnCategory.Unknown; 87 var category = ColumnCategory.Unknown;
88 switch (column.Category) 88 switch (column.Category)
89 { 89 {
90 case "Text": 90 case WixCustomTableColumnCategoryType.Text:
91 category = ColumnCategory.Text; 91 category = ColumnCategory.Text;
92 break; 92 break;
93 case "UpperCase": 93 case WixCustomTableColumnCategoryType.UpperCase:
94 category = ColumnCategory.UpperCase; 94 category = ColumnCategory.UpperCase;
95 break; 95 break;
96 case "LowerCase": 96 case WixCustomTableColumnCategoryType.LowerCase:
97 category = ColumnCategory.LowerCase; 97 category = ColumnCategory.LowerCase;
98 break; 98 break;
99 case "Integer": 99 case WixCustomTableColumnCategoryType.Integer:
100 category = ColumnCategory.Integer; 100 category = ColumnCategory.Integer;
101 break; 101 break;
102 case "DoubleInteger": 102 case WixCustomTableColumnCategoryType.DoubleInteger:
103 category = ColumnCategory.DoubleInteger; 103 category = ColumnCategory.DoubleInteger;
104 break; 104 break;
105 case "TimeDate": 105 case WixCustomTableColumnCategoryType.TimeDate:
106 category = ColumnCategory.TimeDate; 106 category = ColumnCategory.TimeDate;
107 break; 107 break;
108 case "Identifier": 108 case WixCustomTableColumnCategoryType.Identifier:
109 category = ColumnCategory.Identifier; 109 category = ColumnCategory.Identifier;
110 break; 110 break;
111 case "Property": 111 case WixCustomTableColumnCategoryType.Property:
112 category = ColumnCategory.Property; 112 category = ColumnCategory.Property;
113 break; 113 break;
114 case "Filename": 114 case WixCustomTableColumnCategoryType.Filename:
115 category = ColumnCategory.Filename; 115 category = ColumnCategory.Filename;
116 break; 116 break;
117 case "WildCardFilename": 117 case WixCustomTableColumnCategoryType.WildCardFilename:
118 category = ColumnCategory.WildCardFilename; 118 category = ColumnCategory.WildCardFilename;
119 break; 119 break;
120 case "Path": 120 case WixCustomTableColumnCategoryType.Path:
121 category = ColumnCategory.Path; 121 category = ColumnCategory.Path;
122 break; 122 break;
123 case "Paths": 123 case WixCustomTableColumnCategoryType.Paths:
124 category = ColumnCategory.Paths; 124 category = ColumnCategory.Paths;
125 break; 125 break;
126 case "AnyPath": 126 case WixCustomTableColumnCategoryType.AnyPath:
127 category = ColumnCategory.AnyPath; 127 category = ColumnCategory.AnyPath;
128 break; 128 break;
129 case "DefaultDir": 129 case WixCustomTableColumnCategoryType.DefaultDir:
130 category = ColumnCategory.DefaultDir; 130 category = ColumnCategory.DefaultDir;
131 break; 131 break;
132 case "RegPath": 132 case WixCustomTableColumnCategoryType.RegPath:
133 category = ColumnCategory.RegPath; 133 category = ColumnCategory.RegPath;
134 break; 134 break;
135 case "Formatted": 135 case WixCustomTableColumnCategoryType.Formatted:
136 category = ColumnCategory.Formatted; 136 category = ColumnCategory.Formatted;
137 break; 137 break;
138 case "FormattedSddl": 138 case WixCustomTableColumnCategoryType.FormattedSddl:
139 category = ColumnCategory.FormattedSDDLText; 139 category = ColumnCategory.FormattedSDDLText;
140 break; 140 break;
141 case "Template": 141 case WixCustomTableColumnCategoryType.Template:
142 category = ColumnCategory.Template; 142 category = ColumnCategory.Template;
143 break; 143 break;
144 case "Condition": 144 case WixCustomTableColumnCategoryType.Condition:
145 category = ColumnCategory.Condition; 145 category = ColumnCategory.Condition;
146 break; 146 break;
147 case "Guid": 147 case WixCustomTableColumnCategoryType.Guid:
148 category = ColumnCategory.Guid; 148 category = ColumnCategory.Guid;
149 break; 149 break;
150 case "Version": 150 case WixCustomTableColumnCategoryType.Version:
151 category = ColumnCategory.Version; 151 category = ColumnCategory.Version;
152 break; 152 break;
153 case "Language": 153 case WixCustomTableColumnCategoryType.Language:
154 category = ColumnCategory.Language; 154 category = ColumnCategory.Language;
155 break; 155 break;
156 case "Binary": 156 case WixCustomTableColumnCategoryType.Binary:
157 category = ColumnCategory.Binary; 157 category = ColumnCategory.Binary;
158 break; 158 break;
159 case "CustomSource": 159 case WixCustomTableColumnCategoryType.CustomSource:
160 category = ColumnCategory.CustomSource; 160 category = ColumnCategory.CustomSource;
161 break; 161 break;
162 case "Cabinet": 162 case WixCustomTableColumnCategoryType.Cabinet:
163 category = ColumnCategory.Cabinet; 163 category = ColumnCategory.Cabinet;
164 break; 164 break;
165 case "Shortcut": 165 case WixCustomTableColumnCategoryType.Shortcut:
166 category = ColumnCategory.Shortcut; 166 category = ColumnCategory.Shortcut;
167 break; 167 break;
168 case null:
168 default: 169 default:
169 break; 170 break;
170 } 171 }
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
4481 switch (columnDefinition.Category) 4481 switch (columnDefinition.Category)
4482 { 4482 {
4483 case ColumnCategory.Text: 4483 case ColumnCategory.Text:
4484 column.Category = Wix.Column.CategoryType.Text; 4484 column.Category = Wix.Column.CategoryType.text;
4485 break; 4485 break;
4486 case ColumnCategory.UpperCase: 4486 case ColumnCategory.UpperCase:
4487 column.Category = Wix.Column.CategoryType.UpperCase; 4487 column.Category = Wix.Column.CategoryType.upperCase;
4488 break; 4488 break;
4489 case ColumnCategory.LowerCase: 4489 case ColumnCategory.LowerCase:
4490 column.Category = Wix.Column.CategoryType.LowerCase; 4490 column.Category = Wix.Column.CategoryType.lowerCase;
4491 break; 4491 break;
4492 case ColumnCategory.Integer: 4492 case ColumnCategory.Integer:
4493 column.Category = Wix.Column.CategoryType.Integer; 4493 column.Category = Wix.Column.CategoryType.integer;
4494 break; 4494 break;
4495 case ColumnCategory.DoubleInteger: 4495 case ColumnCategory.DoubleInteger:
4496 column.Category = Wix.Column.CategoryType.DoubleInteger; 4496 column.Category = Wix.Column.CategoryType.doubleInteger;
4497 break; 4497 break;
4498 case ColumnCategory.TimeDate: 4498 case ColumnCategory.TimeDate:
4499 column.Category = Wix.Column.CategoryType.TimeDate; 4499 column.Category = Wix.Column.CategoryType.timeDate;
4500 break; 4500 break;
4501 case ColumnCategory.Identifier: 4501 case ColumnCategory.Identifier:
4502 column.Category = Wix.Column.CategoryType.Identifier; 4502 column.Category = Wix.Column.CategoryType.identifier;
4503 break; 4503 break;
4504 case ColumnCategory.Property: 4504 case ColumnCategory.Property:
4505 column.Category = Wix.Column.CategoryType.Property; 4505 column.Category = Wix.Column.CategoryType.property;
4506 break; 4506 break;
4507 case ColumnCategory.Filename: 4507 case ColumnCategory.Filename:
4508 column.Category = Wix.Column.CategoryType.Filename; 4508 column.Category = Wix.Column.CategoryType.filename;
4509 break; 4509 break;
4510 case ColumnCategory.WildCardFilename: 4510 case ColumnCategory.WildCardFilename:
4511 column.Category = Wix.Column.CategoryType.WildCardFilename; 4511 column.Category = Wix.Column.CategoryType.wildCardFilename;
4512 break; 4512 break;
4513 case ColumnCategory.Path: 4513 case ColumnCategory.Path:
4514 column.Category = Wix.Column.CategoryType.Path; 4514 column.Category = Wix.Column.CategoryType.path;
4515 break; 4515 break;
4516 case ColumnCategory.Paths: 4516 case ColumnCategory.Paths:
4517 column.Category = Wix.Column.CategoryType.Paths; 4517 column.Category = Wix.Column.CategoryType.paths;
4518 break; 4518 break;
4519 case ColumnCategory.AnyPath: 4519 case ColumnCategory.AnyPath:
4520 column.Category = Wix.Column.CategoryType.AnyPath; 4520 column.Category = Wix.Column.CategoryType.anyPath;
4521 break; 4521 break;
4522 case ColumnCategory.DefaultDir: 4522 case ColumnCategory.DefaultDir:
4523 column.Category = Wix.Column.CategoryType.DefaultDir; 4523 column.Category = Wix.Column.CategoryType.defaultDir;
4524 break; 4524 break;
4525 case ColumnCategory.RegPath: 4525 case ColumnCategory.RegPath:
4526 column.Category = Wix.Column.CategoryType.RegPath; 4526 column.Category = Wix.Column.CategoryType.regPath;
4527 break; 4527 break;
4528 case ColumnCategory.Formatted: 4528 case ColumnCategory.Formatted:
4529 column.Category = Wix.Column.CategoryType.Formatted; 4529 column.Category = Wix.Column.CategoryType.formatted;
4530 break; 4530 break;
4531 case ColumnCategory.FormattedSDDLText: 4531 case ColumnCategory.FormattedSDDLText:
4532 column.Category = Wix.Column.CategoryType.FormattedSddl; 4532 column.Category = Wix.Column.CategoryType.formattedSddl;
4533 break; 4533 break;
4534 case ColumnCategory.Template: 4534 case ColumnCategory.Template:
4535 column.Category = Wix.Column.CategoryType.Template; 4535 column.Category = Wix.Column.CategoryType.template;
4536 break; 4536 break;
4537 case ColumnCategory.Condition: 4537 case ColumnCategory.Condition:
4538 column.Category = Wix.Column.CategoryType.Condition; 4538 column.Category = Wix.Column.CategoryType.condition;
4539 break; 4539 break;
4540 case ColumnCategory.Guid: 4540 case ColumnCategory.Guid:
4541 column.Category = Wix.Column.CategoryType.Guid; 4541 column.Category = Wix.Column.CategoryType.guid;
4542 break; 4542 break;
4543 case ColumnCategory.Version: 4543 case ColumnCategory.Version:
4544 column.Category = Wix.Column.CategoryType.Version; 4544 column.Category = Wix.Column.CategoryType.version;
4545 break; 4545 break;
4546 case ColumnCategory.Language: 4546 case ColumnCategory.Language:
4547 column.Category = Wix.Column.CategoryType.Language; 4547 column.Category = Wix.Column.CategoryType.language;
4548 break; 4548 break;
4549 case ColumnCategory.Binary: 4549 case ColumnCategory.Binary:
4550 column.Category = Wix.Column.CategoryType.Binary; 4550 column.Category = Wix.Column.CategoryType.binary;
4551 break; 4551 break;
4552 case ColumnCategory.CustomSource: 4552 case ColumnCategory.CustomSource:
4553 column.Category = Wix.Column.CategoryType.CustomSource; 4553 column.Category = Wix.Column.CategoryType.customSource;
4554 break; 4554 break;
4555 case ColumnCategory.Cabinet: 4555 case ColumnCategory.Cabinet:
4556 column.Category = Wix.Column.CategoryType.Cabinet; 4556 column.Category = Wix.Column.CategoryType.cabinet;
4557 break; 4557 break;
4558 case ColumnCategory.Shortcut: 4558 case ColumnCategory.Shortcut:
4559 column.Category = Wix.Column.CategoryType.Shortcut; 4559 column.Category = Wix.Column.CategoryType.shortcut;
4560 break; 4560 break;
4561 default: 4561 default:
4562 throw new InvalidOperationException($"Unknown custom column category '{columnDefinition.Category.ToString()}'."); 4562 throw new InvalidOperationException($"Unknown custom column category '{columnDefinition.Category.ToString()}'.");
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-30 22:55:09 +0000