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

Keep Platform targets

This commit is contained in:
Justin Kotalik 2019-01-02 11:50:36 -08:00
parent 9ab501e3b1
commit 68067b8aca
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
View File

@ -1,2 +0,0 @@
LANGUAGE 0x9,0x1
1 11 "MSG00001.bin"

3
src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
View File

@ -25,7 +25,8 @@
</Target> </Target>
<ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''"> <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
View File

@ -27,9 +27,13 @@
</Target> </Target>
<ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''"> <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64"/>
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64"/>
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
</ItemGroup> </ItemGroup>
<Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(OS)' == 'Windows_NT'"> <Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(OS)' == 'Windows_NT'">

13
src/Servers/IIS/ResolveIisReferences.targets
View File

@ -10,14 +10,19 @@ with the right MSBuild incantations to get output copied to the right place.
<When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' "> <When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">
<ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' "> <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' ">
<Reference Remove="AspNetCoreModule" /> <Reference Remove="AspNetCoreModule" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' "> <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
<Reference Remove="AspNetCoreModuleV2" /> <Reference Remove="AspNetCoreModuleV2" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" /> <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="@(NativeProjectReference->Count()) != 0 AND '$(BuildNative)' != 'false' "> <ItemGroup Condition="@(NativeProjectReference->Count()) != 0 AND '$(BuildNative)' != 'false' ">