huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use SetPlatform in native project references (#7260) 

May fix https://github.com/aspnet/AspNetCore/issues/7250 

We were double building native projects in x86 and win32 platforms
This commit is contained in:
Pavel Krymets 2019-02-05 09:15:25 -08:00 committed by GitHub
parent 0bf063ec2c
commit 0605d162ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
View File

@ -44,6 +44,7 @@
<ItemGroup>
<ProjectReference Include="..\CustomAction\aspnetcoreCA.vcxproj">
<Name>aspnetcoreCA</Name>
<SetPlatform Condition="'$(Platform)' == 'x86'">Platform=Win32</SetPlatform>
<Project>{7c27e72f-54d0-4820-8cfa-5e4be640974b}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>

1
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
View File

@ -44,6 +44,7 @@
<ItemGroup>
<ProjectReference Include="..\CustomAction\aspnetcoreCA.vcxproj">
<Name>aspnetcoreCA</Name>
<SetPlatform Condition="'$(Platform)' == 'x86'">Platform=Win32</SetPlatform>
<Project>{7c27e72f-54d0-4820-8cfa-5e4be640974b}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>

12
src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
View File

@ -40,30 +40,34 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64">
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
<Name>AspNetCoreV2WoW64</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetPlatform>Platform=x64</SetPlatform>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="x64">
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
<Name>AspNetCoreV2HandlerWoW64</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetPlatform>Platform=x64</SetPlatform>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="Win32">
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
<Name>AspNetCoreV2</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetPlatform>Platform=Win32</SetPlatform>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="Win32">
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
<Name>AspNetCoreV2Handler</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetPlatform>Platform=Win32</SetPlatform>
</ProjectReference>
</ItemGroup>
</Project>