diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-13 18:13:23 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-13 18:13:23 +1000 |
commit | 89bbda630ba953e202289aa8a8dd0dad47c9c994 (patch) | |
tree | bdbbbe9caba1b621fb4d29dde524dc526c08006c /src/wixext | |
parent | 7ad398d455c42bae61f5196c3f2f66aecf9f9a1a (diff) | |
download | wix-89bbda630ba953e202289aa8a8dd0dad47c9c994.tar.gz wix-89bbda630ba953e202289aa8a8dd0dad47c9c994.tar.bz2 wix-89bbda630ba953e202289aa8a8dd0dad47c9c994.zip |
Update dependencies.
Diffstat (limited to 'src/wixext')
-rw-r--r-- | src/wixext/Tuples/HelpFileTuple.cs | 4 | ||||
-rw-r--r-- | src/wixext/VSTableDefinitions.cs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/wixext/Tuples/HelpFileTuple.cs b/src/wixext/Tuples/HelpFileTuple.cs index 9ea5e8e3..49d3bc44 100644 --- a/src/wixext/Tuples/HelpFileTuple.cs +++ b/src/wixext/Tuples/HelpFileTuple.cs | |||
@@ -56,9 +56,9 @@ namespace WixToolset.VisualStudio.Tuples | |||
56 | set => this.Set((int)HelpFileTupleFields.HelpFileName, value); | 56 | set => this.Set((int)HelpFileTupleFields.HelpFileName, value); |
57 | } | 57 | } |
58 | 58 | ||
59 | public int LangID | 59 | public int? LangID |
60 | { | 60 | { |
61 | get => this.Fields[(int)HelpFileTupleFields.LangID].AsNumber(); | 61 | get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber(); |
62 | set => this.Set((int)HelpFileTupleFields.LangID, value); | 62 | set => this.Set((int)HelpFileTupleFields.LangID, value); |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/src/wixext/VSTableDefinitions.cs b/src/wixext/VSTableDefinitions.cs index f630f138..bbc74b96 100644 --- a/src/wixext/VSTableDefinitions.cs +++ b/src/wixext/VSTableDefinitions.cs | |||
@@ -8,6 +8,7 @@ namespace WixToolset.VisualStudio | |||
8 | { | 8 | { |
9 | public static readonly TableDefinition HelpFile = new TableDefinition( | 9 | public static readonly TableDefinition HelpFile = new TableDefinition( |
10 | "HelpFile", | 10 | "HelpFile", |
11 | VSTupleDefinitions.HelpFile, | ||
11 | new[] | 12 | new[] |
12 | { | 13 | { |
13 | new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column), | 14 | new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column), |
@@ -19,46 +20,46 @@ namespace WixToolset.VisualStudio | |||
19 | new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column), | 20 | new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column), |
20 | new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column), | 21 | new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column), |
21 | }, | 22 | }, |
22 | tupleDefinitionName: VSTupleDefinitions.HelpFile.Name, | ||
23 | tupleIdIsPrimaryKey: true | 23 | tupleIdIsPrimaryKey: true |
24 | ); | 24 | ); |
25 | 25 | ||
26 | public static readonly TableDefinition HelpFileToNamespace = new TableDefinition( | 26 | public static readonly TableDefinition HelpFileToNamespace = new TableDefinition( |
27 | "HelpFileToNamespace", | 27 | "HelpFileToNamespace", |
28 | VSTupleDefinitions.HelpFileToNamespace, | ||
28 | new[] | 29 | new[] |
29 | { | 30 | { |
30 | new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column), | 31 | new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column), |
31 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), | 32 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), |
32 | }, | 33 | }, |
33 | tupleDefinitionName: VSTupleDefinitions.HelpFileToNamespace.Name, | ||
34 | tupleIdIsPrimaryKey: false | 34 | tupleIdIsPrimaryKey: false |
35 | ); | 35 | ); |
36 | 36 | ||
37 | public static readonly TableDefinition HelpFilter = new TableDefinition( | 37 | public static readonly TableDefinition HelpFilter = new TableDefinition( |
38 | "HelpFilter", | 38 | "HelpFilter", |
39 | VSTupleDefinitions.HelpFilter, | ||
39 | new[] | 40 | new[] |
40 | { | 41 | { |
41 | new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column), | 42 | new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column), |
42 | new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."), | 43 | new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."), |
43 | new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."), | 44 | new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."), |
44 | }, | 45 | }, |
45 | tupleDefinitionName: VSTupleDefinitions.HelpFilter.Name, | ||
46 | tupleIdIsPrimaryKey: true | 46 | tupleIdIsPrimaryKey: true |
47 | ); | 47 | ); |
48 | 48 | ||
49 | public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition( | 49 | public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition( |
50 | "HelpFilterToNamespace", | 50 | "HelpFilterToNamespace", |
51 | VSTupleDefinitions.HelpFilterToNamespace, | ||
51 | new[] | 52 | new[] |
52 | { | 53 | { |
53 | new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column), | 54 | new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column), |
54 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), | 55 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), |
55 | }, | 56 | }, |
56 | tupleDefinitionName: VSTupleDefinitions.HelpFilterToNamespace.Name, | ||
57 | tupleIdIsPrimaryKey: false | 57 | tupleIdIsPrimaryKey: false |
58 | ); | 58 | ); |
59 | 59 | ||
60 | public static readonly TableDefinition HelpNamespace = new TableDefinition( | 60 | public static readonly TableDefinition HelpNamespace = new TableDefinition( |
61 | "HelpNamespace", | 61 | "HelpNamespace", |
62 | VSTupleDefinitions.HelpNamespace, | ||
62 | new[] | 63 | new[] |
63 | { | 64 | { |
64 | new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."), | 65 | new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."), |
@@ -66,12 +67,12 @@ namespace WixToolset.VisualStudio | |||
66 | new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column), | 67 | new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column), |
67 | new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."), | 68 | new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."), |
68 | }, | 69 | }, |
69 | tupleDefinitionName: VSTupleDefinitions.HelpNamespace.Name, | ||
70 | tupleIdIsPrimaryKey: true | 70 | tupleIdIsPrimaryKey: true |
71 | ); | 71 | ); |
72 | 72 | ||
73 | public static readonly TableDefinition HelpPlugin = new TableDefinition( | 73 | public static readonly TableDefinition HelpPlugin = new TableDefinition( |
74 | "HelpPlugin", | 74 | "HelpPlugin", |
75 | VSTupleDefinitions.HelpPlugin, | ||
75 | new[] | 76 | new[] |
76 | { | 77 | { |
77 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."), | 78 | new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."), |
@@ -80,7 +81,6 @@ namespace WixToolset.VisualStudio | |||
80 | new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column), | 81 | new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column), |
81 | new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column), | 82 | new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column), |
82 | }, | 83 | }, |
83 | tupleDefinitionName: VSTupleDefinitions.HelpPlugin.Name, | ||
84 | tupleIdIsPrimaryKey: false | 84 | tupleIdIsPrimaryKey: false |
85 | ); | 85 | ); |
86 | 86 | ||