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

Isolate message compiler output files (#8197)

This commit is contained in:
Pavel Krymets 2019-03-05 11:27:09 -08:00 committed by GitHub
parent 414d8a514f
commit 2665f6d238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
View File

@ -298,6 +298,9 @@
<ItemGroup>
<Xml Include="aspnetcore_schema_v2.xml" />
</ItemGroup>
<ItemGroup>
<MessageFile Include="..\CommonLib\aspnetcore_msg.mc" />
</ItemGroup>
<Import Project="..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

2
src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
View File

@ -2,7 +2,7 @@
//
#include <windows.h>
#include "version.h"
#include "..\CommonLib\Aspnetcore_msg.rc"
#include "Aspnetcore_msg.rc"
#include "..\CommonLib\resources.h"
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

17
src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
View File

@ -273,23 +273,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="aspnetcore_msg.mc">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc %(FullPath)</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling Event Messages ...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).rc;%(Filename).h;MSG0409.bin</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling Event Messages ...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).rc;%(Filename).h;MSG0409.bin</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc %(FullPath)</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling Event Messages ...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).rc;%(Filename).h;MSG0409.bin</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling Event Messages ...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).rc;%(Filename).h;MSG0409.bin</Outputs>
</CustomBuild>
<MessageFile Include="aspnetcore_msg.mc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="..\..\build\native.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

2
src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
View File

@ -48,8 +48,6 @@
#include "iapplication.h"
#include "debugutil.h"
#include "requesthandler.h"
#include "resources.h"
#include "aspnetcore_msg.h"
#include "Helpers.h"
#include "GlobalVersionUtility.h"

3
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
View File

@ -269,6 +269,9 @@
</None>
<None Include="Source.def" />
</ItemGroup>
<ItemGroup>
<MessageFile Include="..\CommonLib\aspnetcore_msg.mc" />
</ItemGroup>
<Import Project="..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

3
src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
View File

@ -278,6 +278,9 @@
</None>
<None Include="Source.def" />
</ItemGroup>
<ItemGroup>
<MessageFile Include="..\CommonLib\aspnetcore_msg.mc" />
</ItemGroup>
<Import Project="..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

4
src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
View File

@ -214,6 +214,10 @@
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<MessageFile Include="..\CommonLib\aspnetcore_msg.mc" />
</ItemGroup>
<Import Project="..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

16
src/Servers/IIS/build/native.targets
View File

@ -1,4 +1,20 @@
<Project>
<PropertyGroup>
<IncludePath>$(IncludePath);$(IntDir)</IncludePath>
</PropertyGroup>
<ItemGroup Condition="@(MessageFile->Count()) != 0">
<CustomBuild Include="@(MessageFile)">
<FileType>Document</FileType>
<Command>mc %(FullPath) -h $(IntDir) -r $(IntDir)</Command>
<Message>Compiling Event Messages ...</Message>
<Outputs>$(IntDir)\%(Filename).rc;$(IntDir)\%(Filename).h;$(IntDir)\MSG0409.bin</Outputs>
</CustomBuild>
<MessageFile Remove="@(MessageFile)" />
</ItemGroup>
<Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
<ItemGroup>
<VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />