From 2665f6d238ecdf34e343ebdaa67d7f3ece5c7b3b Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Tue, 5 Mar 2019 11:27:09 -0800
Subject: [PATCH] Isolate message compiler output files (#8197)

---
 .../AspNetCore/AspNetCore.vcxproj               |  3 +++
 .../AspNetCore/aspnetcoremodule.rc              |  2 +-
 .../CommonLib/CommonLib.vcxproj                 | 17 ++---------------
 .../AspNetCoreModuleV2/CommonLibTests/stdafx.h  |  2 --
 .../InProcessRequestHandler.vcxproj             |  3 +++
 .../OutOfProcessRequestHandler.vcxproj          |  3 +++
 .../RequestHandlerLib/RequestHandlerLib.vcxproj |  4 ++++
 src/Servers/IIS/build/native.targets            | 16 ++++++++++++++++
 8 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
index 57fd8b5e24..eff3e6d1b9 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
@@ -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">
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
index 9a110e2920..fc95f57bf0 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
@@ -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
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
index e972198d7e..b73d0978ad 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
@@ -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>
\ No newline at end of file
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
index 9cf10dc7c6..e1db921d05 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
@@ -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"
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
index c63bf5fba8..91a0290afc 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
@@ -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">
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
index 7e76849b7a..f303165e9e 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
@@ -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">
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
index aba5ae3528..d74177acc3 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
@@ -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>
diff --git a/src/Servers/IIS/build/native.targets b/src/Servers/IIS/build/native.targets
index c8006e6d76..9628729c05 100644
--- a/src/Servers/IIS/build/native.targets
+++ b/src/Servers/IIS/build/native.targets
@@ -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." />