Skip to content

Commit 4e13cab

Browse files
authored
Fix one more hit
1 parent 067aa38 commit 4e13cab

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,45 +40,52 @@
4040
</DefineConstants>
4141
</PropertyGroup>
4242

43+
<!-- Only build the target platform for product build (DotNetBuild=true). -->
4344
<ItemGroup Condition="'$(BuildNative)' == 'true'">
4445
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
4546
<Name>AspNetCoreV2</Name>
4647
<Private>True</Private>
4748
<DoNotHarvest>True</DoNotHarvest>
4849
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
49-
<SetPlatform>Platform=x64</SetPlatform>
50+
<SetPlatform Condition="'$(DotNetBuild)' != 'true'">Platform=x64</SetPlatform>
51+
<SetPlatform Condition="'$(DotNetBuild)' == 'true'">Platform=$(NativePlatform)</SetPlatform>
5052
</ProjectReference>
5153
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
5254
<Name>AspNetCoreV2Handler</Name>
5355
<Private>True</Private>
5456
<DoNotHarvest>True</DoNotHarvest>
5557
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
56-
<SetPlatform>Platform=x64</SetPlatform>
58+
<SetPlatform Condition="'$(DotNetBuild)' != 'true'">Platform=x64</SetPlatform>
59+
<SetPlatform Condition="'$(DotNetBuild)' == 'true'">Platform=$(NativePlatform)</SetPlatform>
5760
</ProjectReference>
5861

59-
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
62+
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
63+
Condition="'$(DotNetBuild)' != 'true'">
6064
<Name>AspNetCoreV2WoW64</Name>
6165
<Private>True</Private>
6266
<DoNotHarvest>True</DoNotHarvest>
6367
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6468
<SetPlatform>Platform=Win32</SetPlatform>
6569
</ProjectReference>
66-
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
70+
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
71+
Condition="'$(DotNetBuild)' != 'true'">
6772
<Name>AspNetCoreV2HandlerWoW64</Name>
6873
<Private>True</Private>
6974
<DoNotHarvest>True</DoNotHarvest>
7075
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
7176
<SetPlatform>Platform=Win32</SetPlatform>
7277
</ProjectReference>
73-
74-
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
78+
79+
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
80+
Condition="'$(DotNetBuild)' != 'true'">
7581
<Name>AspNetCoreV2ARM64</Name>
7682
<Private>True</Private>
7783
<DoNotHarvest>True</DoNotHarvest>
7884
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
7985
<SetPlatform>Platform=ARM64</SetPlatform>
8086
</ProjectReference>
81-
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
87+
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
88+
Condition="'$(DotNetBuild)' != 'true'">
8289
<Name>AspNetCoreV2HandlerARM64</Name>
8390
<Private>True</Private>
8491
<DoNotHarvest>True</DoNotHarvest>

src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
Condition="!Exists('$(AspNetCoreModuleV2ShimDll)') OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" />
3636
</Target>
3737

38+
<!-- Only build the target platform for product build (DotNetBuild=true). -->
3839
<ItemGroup Condition="'$(UseIisNativeAssets)' == 'true' AND '$(TestGroupName)' != 'IISNewHandler.FunctionalTests'">
3940
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64" Condition="'$(DotNetBuild)' != 'true'" />
4041
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="x64" Condition="'$(DotNetBuild)' != 'true'" />

0 commit comments

Comments
 (0)