Skip to content

Commit c37026f

Browse files
lextmlextm
authored
[Reopen] Fix ANCM installer on ARM64 (#59483)
1 parent 73655ef commit c37026f

File tree

12 files changed

+237
-61
lines changed

12 files changed

+237
-61
lines changed

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,8 @@
9494
'$(PackageIconFullPath)' ^
9595
'$(PackageLicenseExpression)' " />
9696
</Target>
97+
98+
<Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'">
99+
<MSBuild Projects="..\Forwarders\build.proj" />
100+
</Target>
97101
</Project>

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,80 @@
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"
172+
Name="aspnetcorev2.dll"
173+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
174+
DiskId="1"
175+
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>
182+
</Component>
183+
<Component Id="AspNetCoreModuleV2.x64"
184+
Guid="1962b1b0-6345-4b37-97b3-a8f2c9e82bee"
185+
Win64="$(var.IsWin64)">
186+
<File Id="AspNetCoreModuleV2Dll.x64"
187+
Name="aspnetcorev2_x64.dll"
188+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\x64\$(var.Configuration)\aspnetcorev2.dll"
189+
DiskId="1"
190+
Vital="yes"/>
191+
<RegistryKey Root="HKLM"
192+
Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
193+
<RegistryValue Name="EventMessageFile" Type="expandable"
194+
Value="[#AspNetCoreModuleV2Dll.x64]" />
195+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
196+
</RegistryKey>
197+
</Component>
198+
<Component Id="AspNetCoreModuleV2.arm64"
199+
Guid="22f16c6c-7c53-422c-8ad5-831e4870a44e"
200+
Win64="$(var.IsWin64)">
201+
<File Id="AspNetCoreModuleV2Dll.arm64"
202+
Name="aspnetcorev2_arm64.dll"
203+
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
204+
DiskId="1"
205+
Vital="yes"/>
206+
<RegistryKey Root="HKLM"
207+
Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
208+
<RegistryValue Name="EventMessageFile" Type="expandable"
209+
Value="[#AspNetCoreModuleV2Dll.arm64]" />
210+
<RegistryValue Name="TypesSupported" Type="integer" Value="7" />
211+
</RegistryKey>
212+
</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 ?>
167241
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
168242
<File Id="AspNetCoreModuleDll"
169243
Name="aspnetcorev2.dll"
@@ -186,6 +260,7 @@
186260
</File>
187261
</Component>
188262
</Directory>
263+
<?endif ?>
189264
</Directory>
190265
</Directory>
191266
<Directory Id="IISConfigDir" Name="config">
@@ -249,8 +324,17 @@
249324

250325
<!-- Feature Definition -->
251326
<Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
327+
<?if $(var.Platform) = "arm64" ?>
328+
<ComponentRef Id="AspNetCoreModuleV2.forwarder" />
329+
<ComponentRef Id="AspNetCoreModuleHandler.forwarder" />
330+
<ComponentRef Id="AspNetCoreModuleV2.x64" />
331+
<ComponentRef Id="AspNetCoreModuleHandler.x64" />
332+
<ComponentRef Id="AspNetCoreModuleV2.arm64" />
333+
<ComponentRef Id="AspNetCoreModuleHandler.arm64" />
334+
<?else ?>
252335
<ComponentRef Id="AspNetCoreModule"/>
253336
<ComponentRef Id="AspNetCoreModuleHandler"/>
337+
<?endif ?>
254338
<ComponentRef Id="AspNetCoreSchema"/>
255339
<?if $(var.Platform) != "x86" ?>
256340
<ComponentRef Id="AspNetCoreModule.wow"/>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,8 @@
8181
'$(PackageIconFullPath)' ^
8282
'$(PackageLicenseExpression)' " />
8383
</Target>
84+
85+
<Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'">
86+
<MSBuild Projects="..\Forwarders\build.proj" />
87+
</Target>
8488
</Project>

0 commit comments

Comments
 (0)