Skip to content

Commit c1bd159

Browse files
wtgodbewtgodbe
committed
Modularize it
1 parent 382e24c commit c1bd159

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- Define a table to hold Handler registration parameters -->
2525
<CustomTable Id="IISGlobalHandler">
2626
<Column Id="Name" Type="string" PrimaryKey="yes" />
27-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
27+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
2828
<Column Id="Path" Type="string" Nullable="no" />
2929
<Column Id="Verb" Type="string" Nullable="no" />
3030
<Column Id="Type" Type="string" Nullable="yes" />
@@ -39,7 +39,7 @@
3939
<!-- Define a table to hold Module registration parameters -->
4040
<CustomTable Id="IISGlobalModule">
4141
<Column Id="Name" Type="string" PrimaryKey="yes" />
42-
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Width="72" />
42+
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
4343
<Column Id="PreCondition" Type="string" Nullable="yes" />
4444
<Column Id="TypeName" Type="string" Nullable="yes" />
4545
</CustomTable>
@@ -49,13 +49,13 @@
4949
<Column Id="ProviderGuid" Type="string" Nullable="yes" />
5050
<Column Id="AreaName" Type="string" />
5151
<Column Id="AreaValue" Type="string" Nullable="yes" />
52-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
53-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
52+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
53+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
5454
</CustomTable>
5555
<!-- Define a table to hold Section Schema registration parameters -->
5656
<CustomTable Id="IISConfigSections">
5757
<Column Id="Name" Type="string" PrimaryKey="yes" />
58-
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Width="72" />
58+
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
5959
<Column Id="OverrideModeDefault" Type="string" />
6060
<Column Id="AllowDefinition" Type="string" Nullable="yes" />
6161
<Column Id="Type" Type="string" Nullable="yes" />
@@ -65,29 +65,29 @@
6565
<CustomTable Id="IISConfigSectionDefaults">
6666
<Column Id="Name" Type="string" PrimaryKey="yes" />
6767
<Column Id="SectionName" Type="string" Nullable="no" />
68-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
69-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
68+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
69+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
7070
</CustomTable>
7171
<!-- Define a table to hold Section additions registration parameters -->
7272
<CustomTable Id="IISConfigSectionAdditions">
7373
<Column Id="Name" Type="string" PrimaryKey="yes" />
7474
<Column Id="SectionName" Type="string" Nullable="no" />
75-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
76-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
75+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
76+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
7777
</CustomTable>
7878
<!-- Define a table to hold UI Module registration parameters -->
7979
<CustomTable Id="IISUIModule">
8080
<Column Id="Name" Type="string" PrimaryKey="yes" />
81-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
82-
<Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" Nullable="yes" />
81+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
82+
<Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" Modularize="Column" Nullable="yes" />
8383
<Column Id="TypeName" Type="string" />
8484
<Column Id="RegisterInModulesSection" Type="string" Nullable="yes" />
8585
<Column Id="PrependToList" Type="string" Nullable="yes" />
8686
</CustomTable>
8787
<!-- Define a table to hold CGI Restriction registration parameters -->
8888
<CustomTable Id="IISCgiRestriction">
8989
<Column Id="Name" Type="string" PrimaryKey="yes" />
90-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
90+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
9191
<Column Id="Path" Type="string" Nullable="no" />
9292
<Column Id="Allowed" Type="string" Nullable="no" />
9393
<Column Id="GroupId" Type="string" Nullable="no" />
@@ -108,7 +108,7 @@
108108

109109
<CustomTable Id="IISWindowsHotfix">
110110
<Column Id="Name" Type="string" PrimaryKey="yes" />
111-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
111+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
112112
<Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes" />
113113
<Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes" />
114114
<Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes" />
@@ -130,7 +130,7 @@
130130

131131
<CustomTable Id="IISElevatedShortcut">
132132
<!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
133-
<Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Width="72" />
133+
<Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
134134
</CustomTable>
135135

136136
<InstallExecuteSequence>
@@ -146,7 +146,7 @@
146146

147147
<CustomTable Id="IISShortcutConsoleProperties">
148148
<!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
149-
<Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Width="72" />
149+
<Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
150150
<Column Id="QuickEdit" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
151151
<Column Id="InsertMode" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
152152
<Column Id="WindowWidth" Type="int" Width="2" Nullable="no" />
@@ -176,7 +176,7 @@
176176
<!-- Define a table to hold registration parameters -->
177177
<CustomTable Id="IISHttpListener">
178178
<Column Id="Name" Type="string" PrimaryKey="yes" />
179-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
179+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
180180
<Column Id="Account" Type="string" />
181181
<Column Id="Prefix" Type="string" />
182182
</CustomTable>

‎src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!-- Define a table to hold Handler registration parameters -->
2424
<CustomTable Id="IISGlobalHandler">
2525
<Column Id="Name" Type="string" PrimaryKey="yes" />
26-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
26+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
2727
<Column Id="Path" Type="string" Nullable="no" />
2828
<Column Id="Verb" Type="string" Nullable="no" />
2929
<Column Id="Type" Type="string" Nullable="yes" />
@@ -38,7 +38,7 @@
3838
<!-- Define a table to hold Module registration parameters -->
3939
<CustomTable Id="IISGlobalModule">
4040
<Column Id="Name" Type="string" PrimaryKey="yes" />
41-
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Width="72" />
41+
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
4242
<Column Id="PreCondition" Type="string" Nullable="yes" />
4343
<Column Id="TypeName" Type="string" Nullable="yes" />
4444
</CustomTable>
@@ -48,13 +48,13 @@
4848
<Column Id="ProviderGuid" Type="string" Nullable="yes" />
4949
<Column Id="AreaName" Type="string" />
5050
<Column Id="AreaValue" Type="string" Nullable="yes" />
51-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Nullable="yes" Width="72" />
52-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
51+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Nullable="yes" Width="72" />
52+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
5353
</CustomTable>
5454
<!-- Define a table to hold Section Schema registration parameters -->
5555
<CustomTable Id="IISConfigSections">
5656
<Column Id="Name" Type="string" PrimaryKey="yes" />
57-
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Width="72" />
57+
<Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
5858
<Column Id="OverrideModeDefault" Type="string" />
5959
<Column Id="AllowDefinition" Type="string" Nullable="yes" />
6060
<Column Id="Type" Type="string" Nullable="yes" />
@@ -64,29 +64,29 @@
6464
<CustomTable Id="IISConfigSectionDefaults">
6565
<Column Id="Name" Type="string" PrimaryKey="yes" />
6666
<Column Id="SectionName" Type="string" Nullable="no" />
67-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
68-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
67+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
68+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
6969
</CustomTable>
7070
<!-- Define a table to hold Section additions registration parameters -->
7171
<CustomTable Id="IISConfigSectionAdditions">
7272
<Column Id="Name" Type="string" PrimaryKey="yes" />
7373
<Column Id="SectionName" Type="string" Nullable="no" />
74-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
75-
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
74+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
75+
<Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
7676
</CustomTable>
7777
<!-- Define a table to hold UI Module registration parameters -->
7878
<CustomTable Id="IISUIModule">
7979
<Column Id="Name" Type="string" PrimaryKey="yes" />
80-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
81-
<Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" Nullable="yes" />
80+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
81+
<Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" Nullable="yes" />
8282
<Column Id="TypeName" Type="string" />
8383
<Column Id="RegisterInModulesSection" Type="string" Nullable="yes" />
8484
<Column Id="PrependToList" Type="string" Nullable="yes" />
8585
</CustomTable>
8686
<!-- Define a table to hold CGI Restriction registration parameters -->
8787
<CustomTable Id="IISCgiRestriction">
8888
<Column Id="Name" Type="string" PrimaryKey="yes" />
89-
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
89+
<Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="Column" Width="72" />
9090
<Column Id="Path" Type="string" Nullable="no" />
9191
<Column Id="Allowed" Type="string" Nullable="no" />
9292
<Column Id="GroupId" Type="string" Nullable="no" />

0 commit comments

Comments
 (0)