Skip to content

Commit 4479321

Browse files
wtgodbewtgodbe
committed
Some formatting
1 parent d3fd491 commit 4479321

File tree

1 file changed

+77
-79
lines changed

1 file changed

+77
-79
lines changed

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

Lines changed: 77 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -131,101 +131,99 @@
131131
<SetProperty Id="INSTALLDIR32" Value="[IISEXPRESS_INSTALL_PATH32]" After="CostInitialize" />
132132
<?endif?>
133133

134-
135-
136134
<!-- Directory Structure and Component Definitions -->
137-
<DirectoryRef Id="INSTALLDIR">
138-
<Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)">
139-
<Directory Id="VersionDir" Name="$(var.ProductVersionString)">
140-
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Bitness="$(var.Bitness)">
141-
<?if $(InstallerPlatform) = "arm64" ?>
142-
<File Id="AspNetCoreModuleDll" Name="aspnetcorev2.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll" DiskId="1" Vital="yes" />
143-
<?else?>
144-
<File Id="AspNetCoreModuleDll" Name="aspnetcorev2.dll" Source="$(var.AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" />
145-
<?endif?>
146-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
147-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]" />
148-
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
149-
</RegistryKey>
150-
</Component>
151-
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)">
152-
<Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Bitness="$(var.Bitness)">
153-
<?if $(InstallerPlatform) = "arm64" ?>
154-
<File Id="AspNetCoreModuleHandlerDll" Name="aspnetcorev2_outofprocess.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes" />
155-
<?else?>
156-
<File Id="AspNetCoreModuleHandlerDll" Name="aspnetcorev2_outofprocess.dll" Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes">
157-
</File>
158-
<?endif?>
135+
<DirectoryRef Id="INSTALLDIR">
136+
<Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)">
137+
<Directory Id="VersionDir" Name="$(var.ProductVersionString)">
138+
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Bitness="$(var.Bitness)">
139+
<?if $(InstallerPlatform) = "arm64" ?>
140+
<File Id="AspNetCoreModuleDll" Name="aspnetcorev2.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll" DiskId="1" Vital="yes" />
141+
<?else?>
142+
<File Id="AspNetCoreModuleDll" Name="aspnetcorev2.dll" Source="$(var.AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" />
143+
<?endif?>
144+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
145+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]" />
146+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
147+
</RegistryKey>
159148
</Component>
160-
<?if $(InstallerPlatform) = "arm64" ?>
161-
<Component Id="AspNetCoreModuleHandler.x64" Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb" Bitness="$(var.Bitness)">
162-
<File Id="AspNetCoreModuleHandlerDll.x64" Name="aspnetcorev2_outofprocess_x64.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes" />
149+
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)">
150+
<Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Bitness="$(var.Bitness)">
151+
<?if $(InstallerPlatform) = "arm64" ?>
152+
<File Id="AspNetCoreModuleHandlerDll" Name="aspnetcorev2_outofprocess.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes" />
153+
<?else?>
154+
<File Id="AspNetCoreModuleHandlerDll" Name="aspnetcorev2_outofprocess.dll" Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes">
155+
</File>
156+
<?endif?>
163157
</Component>
164-
<Component Id="AspNetCoreModuleHandler.arm64" Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Bitness="$(var.Bitness)">
158+
<?if $(InstallerPlatform) = "arm64" ?>
159+
<Component Id="AspNetCoreModuleHandler.x64" Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb" Bitness="$(var.Bitness)">
160+
<File Id="AspNetCoreModuleHandlerDll.x64" Name="aspnetcorev2_outofprocess_x64.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes" />
161+
</Component>
162+
<Component Id="AspNetCoreModuleHandler.arm64" Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Bitness="$(var.Bitness)">
165163
<File Id="AspNetCoreModuleHandlerDll.arm64" Name="aspnetcorev2_outofprocess_arm64.dll" Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes" />
166-
</Component>
164+
</Component>
165+
<?endif?>
166+
</Directory>
167+
<?if $(InstallerPlatform) = "arm64" ?>
168+
<Component Id="AspNetCoreModuleV2.x64" Guid="1962b1b0-6345-4b37-97b3-a8f2c9e82bee" Bitness="$(var.Bitness)">
169+
<File Id="AspNetCoreModuleV2Dll.x64" Name="aspnetcorev2_x64.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\x64\$(var.Configuration)\aspnetcorev2.dll" DiskId="1" Vital="yes" />
170+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
171+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.x64]" />
172+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
173+
</RegistryKey>
174+
</Component>
175+
<Component Id="AspNetCoreModuleV2.arm64" Guid="22f16c6c-7c53-422c-8ad5-831e4870a44e" Bitness="$(var.Bitness)">
176+
<File Id="AspNetCoreModuleV2Dll.arm64" Name="aspnetcorev2_arm64.dll" Source="$(var.AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" />
177+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
178+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]" />
179+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
180+
</RegistryKey>
181+
</Component>
167182
<?endif?>
168183
</Directory>
169-
<?if $(InstallerPlatform) = "arm64" ?>
170-
<Component Id="AspNetCoreModuleV2.x64" Guid="1962b1b0-6345-4b37-97b3-a8f2c9e82bee" Bitness="$(var.Bitness)">
171-
<File Id="AspNetCoreModuleV2Dll.x64" Name="aspnetcorev2_x64.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\x64\$(var.Configuration)\aspnetcorev2.dll" DiskId="1" Vital="yes" />
172-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
173-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.x64]" />
174-
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
175-
</RegistryKey>
176-
</Component>
177-
<Component Id="AspNetCoreModuleV2.arm64" Guid="22f16c6c-7c53-422c-8ad5-831e4870a44e" Bitness="$(var.Bitness)">
178-
<File Id="AspNetCoreModuleV2Dll.arm64" Name="aspnetcorev2_arm64.dll" Source="$(var.AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" />
179-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
180-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]" />
181-
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
182-
</RegistryKey>
183-
</Component>
184-
<?endif?>
185184
</Directory>
186-
</Directory>
187-
<Directory Id="IISConfigDir" Name="config">
188-
<Directory Id="IISSchemaDir" Name="schema">
189-
<Component Id="AspNetCoreSchema" Guid="$(var.SchemaGuid)" Bitness="$(var.Bitness)">
190-
<File Id="AspNetCoreSchemaFile" Name="aspnetcore_schema_v2.xml" Source="$(var.AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
191-
</Component>
185+
<Directory Id="IISConfigDir" Name="config">
186+
<Directory Id="IISSchemaDir" Name="schema">
187+
<Component Id="AspNetCoreSchema" Guid="$(var.SchemaGuid)" Bitness="$(var.Bitness)">
188+
<File Id="AspNetCoreSchemaFile" Name="aspnetcore_schema_v2.xml" Source="$(var.AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
189+
</Component>
190+
</Directory>
192191
</Directory>
193-
</Directory>
194192

195-
<!-- WOW64 Support -->
196-
<?if $(InstallerPlatform) != "x86" ?>
197-
<Directory Id="ProgramFilesFolder">
198-
<Directory Id="INSTALLDIR32" Name="IIS Express">
199-
<Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="$(var.ProductName)">
200-
<Directory Id="VersionDir32" Name="$(var.ProductVersionString)">
201-
<!-- Originally created with same component GUID as IIS installer. Must remain the same so upgrade doesn't remove this file -->
202-
<Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Bitness="always32">
203-
<File Id="AspNetCoreModuleDll.wow" Name="aspnetcorev2.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll" DiskId="1" Vital="yes">
204-
</File>
205-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
206-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll.wow]" />
207-
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
208-
</RegistryKey>
209-
</Component>
210-
<Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)">
211-
<Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Bitness="always32">
212-
<File Id="AspNetCoreModuleHandlerDll.wow" Name="aspnetcorev2_outofprocess.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes">
193+
<!-- WOW64 Support -->
194+
<?if $(InstallerPlatform) != "x86" ?>
195+
<Directory Id="ProgramFilesFolder">
196+
<Directory Id="INSTALLDIR32" Name="IIS Express">
197+
<Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="$(var.ProductName)">
198+
<Directory Id="VersionDir32" Name="$(var.ProductVersionString)">
199+
<!-- Originally created with same component GUID as IIS installer. Must remain the same so upgrade doesn't remove this file -->
200+
<Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Bitness="always32">
201+
<File Id="AspNetCoreModuleDll.wow" Name="aspnetcorev2.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll" DiskId="1" Vital="yes">
213202
</File>
203+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
204+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll.wow]" />
205+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
206+
</RegistryKey>
214207
</Component>
208+
<Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)">
209+
<Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Bitness="always32">
210+
<File Id="AspNetCoreModuleHandlerDll.wow" Name="aspnetcorev2_outofprocess.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll" DiskId="1" Vital="yes">
211+
</File>
212+
</Component>
213+
</Directory>
215214
</Directory>
216215
</Directory>
217-
</Directory>
218-
<Directory Id="IISConfigDir.wow" Name="config">
219-
<Directory Id="IISSchemaDir.wow" Name="schema">
220-
<Component Id="AspNetCoreSchema.wow" Guid="$(var.SchemaGuid32)" Bitness="always32">
221-
<File Id="AspNetCoreSchemaFile.wow" Name="aspnetcore_schema_v2.xml" Source="$(var.AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
222-
</Component>
216+
<Directory Id="IISConfigDir.wow" Name="config">
217+
<Directory Id="IISSchemaDir.wow" Name="schema">
218+
<Component Id="AspNetCoreSchema.wow" Guid="$(var.SchemaGuid32)" Bitness="always32">
219+
<File Id="AspNetCoreSchemaFile.wow" Name="aspnetcore_schema_v2.xml" Source="$(var.AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
220+
</Component>
221+
</Directory>
223222
</Directory>
224223
</Directory>
225224
</Directory>
226-
</Directory>
227-
<?endif?>
228-
</DirectoryRef>
225+
<?endif?>
226+
</DirectoryRef>
229227

230228
<!-- Feature Definition -->
231229
<Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">

0 commit comments

Comments
 (0)