Skip to content

Commit 4e715d2

Browse files
committed
Build via ProjectRefs
1 parent 287d986 commit 4e715d2

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

eng/Build.props

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@
264264
<_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
265265
</PropertyGroup>
266266

267+
<!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
267268
<ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
268269
<!-- Build the ANCM custom action -->
269270
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
@@ -282,14 +283,6 @@
282283
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
283284
</ItemGroup>
284285

285-
<!--
286-
In a vertical build, only build the MSIs for the current vertical that aren't used in the hosting bundle in the first pass
287-
and build the hosting bundle and its dependencies in the second pass.
288-
-->
289-
<ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') and '$(_BuildWindowsInstallers)' == 'true' and '$(TargetArchitecture)' == 'x86'" >
290-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
291-
</ItemGroup>
292-
293286
<ItemGroup>
294287
<ProjectToBuild Condition=" '$(BuildInstallers)' == 'true'" Include="@(InstallerProject)" BuildStep="installer" />
295288
</ItemGroup>

src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@
7272
</ItemGroup>
7373

7474
<ItemGroup Condition="'$(DotNetBuild)' == 'true'" >
75+
<ProjectReference Include="..\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj">
76+
<SetPlatform>Platform=x86</SetPlatform>
77+
<Name>AspNetCoreModuleV2IISExpress_x86</Name>
78+
<Private>True</Private>
79+
<DoNotHarvest>true</DoNotHarvest>
80+
</ProjectReference>
7581
<ProjectReference Include="..\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj">
7682
<SetPlatform>Platform=x64</SetPlatform>
7783
<Name>AspNetCoreModuleV2IISExpress_x64</Name>

0 commit comments

Comments
 (0)