Skip to content

Commit 9b68a79

Browse files
lextmlextm
committed
Revised component/file relationship (#60764)
1 parent b9ed491 commit 9b68a79

File tree

2 files changed

+108
-137
lines changed

2 files changed

+108
-137
lines changed

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs

Lines changed: 54 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -164,22 +164,63 @@
164164
<DirectoryRef Id="INSTALLDIR">
165165
<Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)">
166166
<Directory Id="VersionDir" Name="$(var.ProductVersionString)">
167-
<?if $(var.Platform) = "arm64" ?>
168-
<Component Id="AspNetCoreModuleV2.forwarder"
169-
Guid="08968573-05c1-4bf1-8879-7b818ac9525b"
170-
Win64="$(var.IsWin64)">
171-
<File Id="AspNetCoreModuleV2Dll.forwarder"
167+
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
168+
<?if $(var.Platform) = "arm64" ?>
169+
<File Id="AspNetCoreModuleDll"
172170
Name="aspnetcorev2.dll"
173171
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
174172
DiskId="1"
175173
Vital="yes"/>
176-
<RegistryKey Root="HKLM"
177-
Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
178-
<RegistryValue Name="EventMessageFile" Type="expandable"
179-
Value="[#AspNetCoreModuleV2Dll.forwarder]" />
180-
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
181-
</RegistryKey>
174+
<?else ?>
175+
<File Id="AspNetCoreModuleDll"
176+
Name="aspnetcorev2.dll"
177+
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
178+
DiskId="1"
179+
Vital="yes"/>
180+
<?endif ?>
181+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
182+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]"/>
183+
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
184+
</RegistryKey>
182185
</Component>
186+
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
187+
<Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
188+
<?if $(var.Platform) = "arm64" ?>
189+
<File Id="AspNetCoreModuleHandlerDll"
190+
Name="aspnetcorev2_outofprocess.dll"
191+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
192+
DiskId="1"
193+
Vital="yes"/>
194+
<?else ?>
195+
<File Id="AspNetCoreModuleHandlerDll"
196+
Name="aspnetcorev2_outofprocess.dll"
197+
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
198+
DiskId="1"
199+
Vital="yes">
200+
</File>
201+
<?endif ?>
202+
</Component>
203+
<?if $(var.Platform) = "arm64" ?>
204+
<Component Id="AspNetCoreModuleHandler.x64"
205+
Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb"
206+
Win64="$(var.IsWin64)">
207+
<File Id="AspNetCoreModuleHandlerDll.x64"
208+
Name="aspnetcorev2_outofprocess_x64.dll"
209+
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
210+
DiskId="1"
211+
Vital="yes"/>
212+
</Component>
213+
<Component Id="AspNetCoreModuleHandler.arm64"
214+
Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Win64="$(var.IsWin64)">
215+
<File Id="AspNetCoreModuleHandlerDll.arm64"
216+
Name="aspnetcorev2_outofprocess_arm64.dll"
217+
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
218+
DiskId="1"
219+
Vital="yes"/>
220+
</Component>
221+
<?endif ?>
222+
</Directory>
223+
<?if $(var.Platform) = "arm64" ?>
183224
<Component Id="AspNetCoreModuleV2.x64"
184225
Guid="1962b1b0-6345-4b37-97b3-a8f2c9e82bee"
185226
Win64="$(var.IsWin64)">
@@ -210,56 +251,6 @@
210251
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
211252
</RegistryKey>
212253
</Component>
213-
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)">
214-
<Component Id="AspNetCoreModuleHandler.forwarder"
215-
Guid="51045d90-7231-480c-bac7-2969a2861ece" Win64="$(var.IsWin64)">
216-
<File Id="AspNetCoreModuleHandlerDll.forwarder"
217-
Name="aspnetcorev2_outofprocess.dll"
218-
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
219-
DiskId="1"
220-
Vital="yes"/>
221-
</Component>
222-
<Component Id="AspNetCoreModuleHandler.x64"
223-
Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb"
224-
Win64="$(var.IsWin64)">
225-
<File Id="AspNetCoreModuleHandlerDll.x64"
226-
Name="aspnetcorev2_outofprocess_x64.dll"
227-
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
228-
DiskId="1"
229-
Vital="yes"/>
230-
</Component>
231-
<Component Id="AspNetCoreModuleHandler.arm64"
232-
Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Win64="$(var.IsWin64)">
233-
<File Id="AspNetCoreModuleHandlerDll.arm64"
234-
Name="aspnetcorev2_outofprocess_arm64.dll"
235-
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
236-
DiskId="1"
237-
Vital="yes"/>
238-
</Component>
239-
</Directory>
240-
<?else ?>
241-
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
242-
<File Id="AspNetCoreModuleDll"
243-
Name="aspnetcorev2.dll"
244-
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
245-
DiskId="1"
246-
Vital="yes">
247-
</File>
248-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
249-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]"/>
250-
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
251-
</RegistryKey>
252-
</Component>
253-
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
254-
<Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
255-
<File Id="AspNetCoreModuleHandlerDll"
256-
Name="aspnetcorev2_outofprocess.dll"
257-
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
258-
DiskId="1"
259-
Vital="yes">
260-
</File>
261-
</Component>
262-
</Directory>
263254
<?endif ?>
264255
</Directory>
265256
</Directory>
@@ -324,16 +315,13 @@
324315

325316
<!-- Feature Definition -->
326317
<Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
318+
<ComponentRef Id="AspNetCoreModule"/>
319+
<ComponentRef Id="AspNetCoreModuleHandler"/>
327320
<?if $(var.Platform) = "arm64" ?>
328-
<ComponentRef Id="AspNetCoreModuleV2.forwarder" />
329-
<ComponentRef Id="AspNetCoreModuleHandler.forwarder" />
330321
<ComponentRef Id="AspNetCoreModuleV2.x64" />
331322
<ComponentRef Id="AspNetCoreModuleHandler.x64" />
332323
<ComponentRef Id="AspNetCoreModuleV2.arm64" />
333324
<ComponentRef Id="AspNetCoreModuleHandler.arm64" />
334-
<?else ?>
335-
<ComponentRef Id="AspNetCoreModule"/>
336-
<ComponentRef Id="AspNetCoreModuleHandler"/>
337325
<?endif ?>
338326
<ComponentRef Id="AspNetCoreSchema"/>
339327
<?if $(var.Platform) != "x86" ?>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs

Lines changed: 54 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,62 @@
144144
<Directory Id="IISModuleDirectory" Name="IIS">
145145
<Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="Asp.Net Core Module">
146146
<Directory Id="VersionDir" Name="$(var.ProductVersionString)">
147-
<?if $(var.Platform) = "arm64" ?>
148-
<Component Id="AspNetCoreModuleV2.forwarder" Guid="4b6bb33a-01f0-48c7-bce9-5a5514ac0431" Win64="$(var.IsWin64)">
149-
<File Id="AspNetCoreModuleV2Dll.forwarder"
147+
<Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
148+
<?if $(var.Platform) = "arm64" ?>
149+
<File Id="AspNetCoreModuleV2Dll"
150150
Name="aspnetcorev2.dll"
151151
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
152152
DiskId="1"
153-
Vital="yes">
154-
</File>
155-
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove.forwarder" Name="aspnetcorev2.dll" On="install" />
156-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
157-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.forwarder]"/>
158-
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
159-
</RegistryKey>
153+
Vital="yes"/>
154+
<?else ?>
155+
<File Id="AspNetCoreModuleV2Dll"
156+
Name="aspnetcorev2.dll"
157+
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
158+
DiskId="1"
159+
Vital="yes"/>
160+
<?endif ?>
161+
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="aspnetcorev2.dll" On="install" />
162+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
163+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]"/>
164+
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
165+
</RegistryKey>
160166
</Component>
167+
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
168+
<Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
169+
<?if $(var.Platform) = "arm64" ?>
170+
<File Id="AspNetCoreModuleHandlerDll"
171+
Name="aspnetcorev2_outofprocess.dll"
172+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
173+
DiskId="1"
174+
Vital="yes"/>
175+
<?else ?>
176+
<File Id="AspNetCoreModuleHandlerDll"
177+
Name="aspnetcorev2_outofprocess.dll"
178+
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
179+
DiskId="1"
180+
Vital="yes"/>
181+
<?endif ?>
182+
</Component>
183+
<?if $(var.Platform) = "arm64" ?>
184+
<Component Id="AspNetCoreModuleHandler.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Win64="$(var.IsWin64)">
185+
<File Id="AspNetCoreModuleHandlerDll.x64"
186+
Name="aspnetcorev2_outofprocess_x64.dll"
187+
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
188+
DiskId="1"
189+
Vital="yes">
190+
</File>
191+
</Component>
192+
<Component Id="AspNetCoreModuleHandler.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Win64="$(var.IsWin64)">
193+
<File Id="AspNetCoreModuleHandlerDll.arm64"
194+
Name="aspnetcorev2_outofprocess_arm64.dll"
195+
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
196+
DiskId="1"
197+
Vital="yes">
198+
</File>
199+
</Component>
200+
<?endif ?>
201+
</Directory>
202+
<?if $(var.Platform) = "arm64" ?>
161203
<Component Id="AspNetCoreModuleV2.x64" Guid="325cf239-162d-4de8-97e7-642e6c66181c" Win64="$(var.IsWin64)">
162204
<File Id="AspNetCoreModuleV2Dll.x64"
163205
Name="aspnetcorev2_x64.dll"
@@ -184,54 +226,6 @@
184226
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
185227
</RegistryKey>
186228
</Component>
187-
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
188-
<Component Id="AspNetCoreModuleHandler.forwarder" Guid="4862728c-e943-49f0-901a-cd96e4bf03ef" Win64="$(var.IsWin64)">
189-
<File Id="AspNetCoreModuleHandlerDll.forwarder"
190-
Name="aspnetcorev2_outofprocess.dll"
191-
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
192-
DiskId="1"
193-
Vital="yes">
194-
</File>
195-
</Component>
196-
<Component Id="AspNetCoreModuleHandler.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Win64="$(var.IsWin64)">
197-
<File Id="AspNetCoreModuleHandlerDll.x64"
198-
Name="aspnetcorev2_outofprocess_x64.dll"
199-
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
200-
DiskId="1"
201-
Vital="yes">
202-
</File>
203-
</Component>
204-
<Component Id="AspNetCoreModuleHandler.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Win64="$(var.IsWin64)">
205-
<File Id="AspNetCoreModuleHandlerDll.arm64"
206-
Name="aspnetcorev2_outofprocess_arm64.dll"
207-
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
208-
DiskId="1"
209-
Vital="yes">
210-
</File>
211-
</Component>
212-
</Directory>
213-
<?else ?>
214-
<Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
215-
<File Id="AspNetCoreModuleV2Dll"
216-
Name="aspnetcorev2.dll"
217-
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
218-
DiskId="1"
219-
Vital="yes"/>
220-
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="aspnetcorev2.dll" On="install" />
221-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
222-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]"/>
223-
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
224-
</RegistryKey>
225-
</Component>
226-
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
227-
<Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
228-
<File Id="AspNetCoreModuleHandlerDll"
229-
Name="aspnetcorev2_outofprocess.dll"
230-
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
231-
DiskId="1"
232-
Vital="yes"/>
233-
</Component>
234-
</Directory>
235229
<?endif ?>
236230
</Directory>
237231
</Directory>
@@ -287,16 +281,13 @@
287281
<Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
288282
<ComponentRef Id="C_DiscoverabilityKey"/>
289283
<ComponentRef Id="AspNetCoreSchemaV2"/>
284+
<ComponentRef Id="AspNetCoreModuleV2" />
285+
<ComponentRef Id="AspNetCoreModuleHandler" />
290286
<?if $(var.Platform) = "arm64"?>
291-
<ComponentRef Id="AspNetCoreModuleV2.forwarder"/>
292-
<ComponentRef Id="AspNetCoreModuleHandler.forwarder"/>
293287
<ComponentRef Id="AspNetCoreModuleV2.x64"/>
294288
<ComponentRef Id="AspNetCoreModuleHandler.x64"/>
295289
<ComponentRef Id="AspNetCoreModuleV2.arm64"/>
296290
<ComponentRef Id="AspNetCoreModuleHandler.arm64"/>
297-
<?else ?>
298-
<ComponentRef Id="AspNetCoreModuleV2" />
299-
<ComponentRef Id="AspNetCoreModuleHandler" />
300291
<?endif ?>
301292
<?if $(var.Platform) != "x86" ?>
302293
<ComponentRef Id="C_DiscoverabilityKeyWow"/>
@@ -323,11 +314,7 @@
323314
<CustomTable Id="IISGlobalModule">
324315
<Row>
325316
<Data Column="Name">AspNetCoreModuleV2</Data>
326-
<?if $(var.Platform) = "arm64" ?>
327-
<Data Column="File_">AspNetCoreModuleV2Dll.forwarder</Data>
328-
<?else ?>
329317
<Data Column="File_">AspNetCoreModuleV2Dll</Data>
330-
<?endif ?>
331318
</Row>
332319
</CustomTable>
333320

@@ -347,11 +334,7 @@
347334
<Data Column="AreaName">ANCM</Data>
348335
<Data Column="AreaValue">65536</Data>
349336
<Data Column="BinaryName_">AncmMofFile</Data>
350-
<?if $(var.Platform) = "arm64" ?>
351-
<Data Column="Component_">AspNetCoreModuleV2.forwarder</Data>
352-
<?else ?>
353337
<Data Column="Component_">AspNetCoreModuleV2</Data>
354-
<?endif ?>
355338
</Row>
356339
</CustomTable>
357340
<!-- <?endif ?> -->

0 commit comments

Comments
 (0)