Skip to content

Commit a367cef

Browse files
lextmhalter73
lextm
authored and
halter73
committed
Revised ARM64 installation folder contents (#47115).
1 parent 97d1829 commit a367cef

File tree

10 files changed

+137
-47
lines changed

10 files changed

+137
-47
lines changed

‎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">
86+
<MSBuild Projects="..\Forwarders\build.proj" />
87+
</Target>
8488
</Project>

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

Lines changed: 83 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
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) = "x86" OR $(var.Platform) = "x64" ?>
147148
<Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
148149
<File Id="AspNetCoreModuleV2Dll"
149150
Name="aspnetcorev2.dll"
@@ -167,13 +168,80 @@
167168
</File>
168169
</Component>
169170
</Directory>
171+
<?else ?>
172+
<Component Id="AspNetCoreModuleV2.forwarder" Guid="4b6bb33a-01f0-48c7-bce9-5a5514ac0431" Win64="$(var.IsWin64)">
173+
<File Id="AspNetCoreModuleV2Dll.forwarder"
174+
Name="aspnetcorev2.dll"
175+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
176+
DiskId="1"
177+
Vital="yes">
178+
</File>
179+
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove.forwarder" Name="aspnetcorev2.dll" On="install" />
180+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
181+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.forwarder]"/>
182+
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
183+
</RegistryKey>
184+
</Component>
185+
<Component Id="AspNetCoreModuleV2.x64" Guid="325cf239-162d-4de8-97e7-642e6c66181c" 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+
</File>
192+
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove.x64" Name="aspnetcorev2.dll" On="install" />
193+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
194+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.x64]"/>
195+
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
196+
</RegistryKey>
197+
</Component>
198+
<Component Id="AspNetCoreModuleV2.arm64" Guid="923f1be7-5a83-46b3-8be7-cd3eeb2d1c48" Win64="$(var.IsWin64)">
199+
<File Id="AspNetCoreModuleV2Dll.arm64"
200+
Name="aspnetcorev2_arm64.dll"
201+
Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
202+
DiskId="1"
203+
Vital="yes">
204+
</File>
205+
<RemoveFile Id="AspNetCoreModuleV2Dll_Remove.arm64" Name="aspnetcorev2.dll" On="install" />
206+
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
207+
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]"/>
208+
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
209+
</RegistryKey>
210+
</Component>
211+
<Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
212+
<Component Id="AspNetCoreModuleHandler.forwarder" Guid="4862728c-e943-49f0-901a-cd96e4bf03ef" Win64="$(var.IsWin64)">
213+
<File Id="AspNetCoreModuleHandlerDll.forwarder"
214+
Name="aspnetcorev2_outofprocess.dll"
215+
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
216+
DiskId="1"
217+
Vital="yes">
218+
</File>
219+
</Component>
220+
<Component Id="AspNetCoreModuleHandler.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Win64="$(var.IsWin64)">
221+
<File Id="AspNetCoreModuleHandlerDll.x64"
222+
Name="aspnetcorev2_outofprocess_x64.dll"
223+
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
224+
DiskId="1"
225+
Vital="yes">
226+
</File>
227+
</Component>
228+
<Component Id="AspNetCoreModuleHandler.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Win64="$(var.IsWin64)">
229+
<File Id="AspNetCoreModuleHandlerDll.arm64"
230+
Name="aspnetcorev2_outofprocess_arm64.dll"
231+
Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
232+
DiskId="1"
233+
Vital="yes">
234+
</File>
235+
</Component>
236+
</Directory>
237+
<?endif ?>
170238
</Directory>
171239
</Directory>
172240
</Directory>
173241
</Directory>
174242

175243
<!-- WOW64 Support -->
176-
<?if $(var.Platform) = "x64" ?>
244+
<?if $(var.Platform) = "x64" OR $(var.Platform) = "arm64" ?>
177245
<Component Id="C_DiscoverabilityKeyWow" Guid="2eeb90e8-28d0-4543-9c2f-843b03bd6d05" Win64="no">
178246
<RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
179247
<RegistryKey Key="$(var.ProductShortName)">
@@ -216,64 +284,26 @@
216284
</Directory>
217285
<?endif ?>
218286

219-
<!-- ARM64 Support -->
220-
<?if $(var.Platform) = "arm64" ?>
221-
<Component Id="C_DiscoverabilityKeyARM64" Guid="2eeb90e8-28d0-4543-9c2f-843b03bd6d05" Win64="no">
222-
<RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
223-
<RegistryKey Key="$(var.ProductShortName)">
224-
<RegistryValue Type="integer" Name="Install" Value="1" />
225-
<RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
226-
</RegistryKey>
227-
</RegistryKey>
228-
</Component>
229-
230-
<Directory Id="$(var.ProgramFilesFolder32)">
231-
<Directory Id="IISModuleDirectory32" Name="IIS">
232-
<Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="Asp.Net Core Module">
233-
<Directory Id="VersionDir32" Name="$(var.ProductVersionString)" SourceName="Arm64Only" >
234-
<Component Id="AspNetCoreModuleV2.arm64" Guid="1b8ecba0-c002-442a-92c0-0fa9c0f21df4" Win64="no">
235-
<File Id="AspNetCoreModuleV2Dll.arm64"
236-
Name="aspnetcorev2.dll"
237-
Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\arm64\Release\aspnetcorev2.dll"
238-
DiskId="1"
239-
Vital="yes">
240-
</File>
241-
<RemoveFile Id="AspNetCoreModuleV2Dll.arm64_Remove" Name="aspnetcorev2.dll" On="install" />
242-
<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
243-
<RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]"/>
244-
<RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
245-
</RegistryKey>
246-
</Component>
247-
<Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)" SourceName="Arm64Only">
248-
<Component Id="AspNetCoreModuleHandler.arm64" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
249-
<File Id="AspNetCoreModuleHandlerDll.arm64"
250-
Name="aspnetcorev2_outofprocess.dll"
251-
Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\arm64\Release\aspnetcorev2_outofprocess.dll"
252-
DiskId="1"
253-
Vital="yes">
254-
</File>
255-
</Component>
256-
</Directory>
257-
</Directory>
258-
</Directory>
259-
</Directory>
260-
</Directory>
261-
<?endif ?>
262287
</Directory>
263288

264289
<!-- Feature Definition -->
265290
<Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
266291
<ComponentRef Id="C_DiscoverabilityKey"/>
292+
<ComponentRef Id="AspNetCoreSchemaV2"/>
293+
<?if $(var.Platform) = "x86" OR $(var.Platform) = "x64" ?>
267294
<ComponentRef Id="AspNetCoreModuleV2"/>
268295
<ComponentRef Id="AspNetCoreModuleHandler"/>
269-
<ComponentRef Id="AspNetCoreSchemaV2"/>
270-
<?if $(var.Platform) = "x64" ?>
296+
<?endif ?>
297+
<?if $(var.Platform) = "x64" OR $(var.Platform) = "arm64" ?>
271298
<ComponentRef Id="C_DiscoverabilityKeyWow"/>
272299
<ComponentRef Id="AspNetCoreModuleV2.wow"/>
273300
<ComponentRef Id="AspNetCoreModuleHandler.wow"/>
274301
<?endif ?>
275302
<?if $(var.Platform) = "arm64" ?>
276-
<ComponentRef Id="C_DiscoverabilityKeyARM64"/>
303+
<ComponentRef Id="AspNetCoreModuleV2.forwarder"/>
304+
<ComponentRef Id="AspNetCoreModuleHandler.forwarder"/>
305+
<ComponentRef Id="AspNetCoreModuleV2.x64"/>
306+
<ComponentRef Id="AspNetCoreModuleHandler.x64"/>
277307
<ComponentRef Id="AspNetCoreModuleV2.arm64"/>
278308
<ComponentRef Id="AspNetCoreModuleHandler.arm64"/>
279309
<?endif ?>
@@ -297,7 +327,11 @@
297327
<CustomTable Id="IISGlobalModule">
298328
<Row>
299329
<Data Column="Name">AspNetCoreModuleV2</Data>
330+
<?if $(var.Platform) = "x86" OR $(var.Platform) = "x64" ?>
300331
<Data Column="File_">AspNetCoreModuleV2Dll</Data>
332+
<?else ?>
333+
<Data Column="File_">AspNetCoreModuleV2Dll.forwarder</Data>
334+
<?endif ?>
301335
</Row>
302336
</CustomTable>
303337

@@ -309,6 +343,7 @@
309343
</Row>
310344
</CustomTable>
311345

346+
<!-- <?if $(var.Platform) = "x86" OR $(var.Platform) = "x64" ?> -->
312347
<CustomTable Id="IISTraceArea">
313348
<Row>
314349
<Data Column="ProviderName">WWW Server</Data>
@@ -319,6 +354,7 @@
319354
<Data Column="Component_">AspNetCoreModuleV2</Data>
320355
</Row>
321356
</CustomTable>
357+
<!-- <?endif ?> -->
322358

323359
<!-- All this magic just to set the handlers section OverrideModeDefault=allow -->
324360
<CustomAction Id="CA_UNLOCk_HANDLER_PROPERTY"

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
call %1 -host_arch=x64 -arch=arm64
2+
call build.cmd %2 %3

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_arm64.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXPORTS
2+
RegisterModule = aspnetcorev2_arm64.RegisterModule

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_arm64.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXPORTS
2+
CreateApplication = aspnetcorev2_outofprocess_arm64.CreateApplication

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_x64.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXPORTS
2+
CreateApplication = aspnetcorev2_outofprocess_x64.CreateApplication

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_x64.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXPORTS
2+
RegisterModule = aspnetcorev2_x64.RegisterModule

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
SET objDir=%1
2+
SET binDir=%2
3+
4+
cl /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp
5+
cl /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
6+
7+
link /lib /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
8+
link /lib /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
9+
10+
link /dll /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
11+
12+
cl /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
13+
cl /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
14+
15+
link /lib /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
16+
link /lib /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
17+
18+
link /dll /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0" DefaultTargets="Build">
2+
<PropertyGroup Label="Globals">
3+
<VCProjectVersion>17.0</VCProjectVersion>
4+
<RootNamespace>aspnetcorev2</RootNamespace>
5+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
6+
<PlatformToolset>v143</PlatformToolset>
7+
<CharacterSet>Unicode</CharacterSet>
8+
<IsTestProject>false</IsTestProject>
9+
</PropertyGroup>
10+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
11+
<PropertyGroup>
12+
<ObjDir>$(ArtifactsObjDir)\AspNetCoreModuleForwarders</ObjDir>
13+
<BinDir>$(ArtifactsBinDir)\AspNetCoreModuleForwarders</BinDir>
14+
</PropertyGroup>
15+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
16+
<PropertyGroup>
17+
<Prompt>&quot;$(DevEnvDir)\..\Tools\VsDevCmd&quot;</Prompt>
18+
</PropertyGroup>
19+
<Target Name="Build">
20+
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir)" />
21+
</Target>
22+
</Project>

‎src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp

Whitespace-only changes.

0 commit comments

Comments
 (0)