From 7a93d693542a1940782c6eb391c51310cf931407 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 14 Jun 2018 15:51:24 -0700 Subject: [PATCH] Adds shared request handler lib project (#916) --- IISIntegration.sln | 13 ++ .../CommonLib/CommonLib.vcxproj | 33 +-- src/AspNetCoreModuleV2/CommonLib/stdafx.cpp | 4 - src/AspNetCoreModuleV2/CommonLib/stdafx.h | 6 - .../InProcessRequestHandler.vcxproj | 11 +- .../OutOfProcessRequestHandler.vcxproj | 11 +- .../FileOutputManager.cpp | 0 .../FileOutputManager.h | 0 .../IOutputManager.h | 0 .../LoggingHelpers.cpp | 0 .../LoggingHelpers.h | 0 .../NullOutputManager.h | 0 .../PipeOutputManager.cpp | 0 .../PipeOutputManager.h | 0 .../RequestHandlerLib.vcxproj | 218 ++++++++++++++++++ .../RequestHandlerLib/aspnetcore_msg.rc | 2 + .../environmentvariablehash.h | 0 .../environmentvariablehelpers.h | 0 .../requesthandler_config.cpp | 0 .../requesthandler_config.h | 0 .../RequestHandlerLib/stdafx.h | 32 +++ .../AspNetCoreModuleTests.vcxproj | 6 - test/CommonLibTests/CommonLibTests.vcxproj | 37 +-- .../inprocess_application_tests.cpp | 7 + test/CommonLibTests/stdafx.cpp | 4 - test/CommonLibTests/stdafx.h | 7 +- 26 files changed, 318 insertions(+), 73 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/CommonLib/stdafx.cpp rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/FileOutputManager.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/FileOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/IOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/LoggingHelpers.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/LoggingHelpers.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/NullOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/PipeOutputManager.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/PipeOutputManager.h (100%) create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/environmentvariablehash.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/environmentvariablehelpers.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/requesthandler_config.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/requesthandler_config.h (100%) create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h delete mode 100644 test/CommonLibTests/stdafx.cpp diff --git a/IISIntegration.sln b/IISIntegration.sln index 93242a80b1..86393ab4b7 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -114,6 +114,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -368,6 +370,16 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -398,6 +410,7 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 353c0b8b9f..a8e8a60937 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -85,12 +85,14 @@ - Use + NotUsing Level4 true Disabled false WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true MultiThreadedDebug false @@ -106,12 +108,14 @@ - Use + NotUsing Level4 true Disabled false _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true ProgramDatabase false @@ -128,7 +132,7 @@ - Use + NotUsing Level4 true MaxSpeed @@ -136,6 +140,8 @@ true false WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true MultiThreaded false @@ -152,7 +158,7 @@ - Use + NotUsing Level4 true MaxSpeed @@ -160,6 +166,8 @@ true false NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true ..\iislib; true @@ -183,21 +191,14 @@ - - - - - - - @@ -205,21 +206,11 @@ - - - - - - Create - Create - Create - Create - diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp deleted file mode 100644 index 0351feb240..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "stdafx.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index b75217ae4d..129de31a5c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -32,7 +32,6 @@ #include "iapplication.h" #include "application.h" #include "SRWLockWrapper.h" -#include "environmentvariablehash.h" #include "fx_ver.h" #include "utility.h" #include "GlobalVersionUtility.h" @@ -40,9 +39,4 @@ #include "aspnetcore_msg.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" -#include "IOutputManager.h" -#include "FileOutputManager.h" -#include "PipeOutputManager.h" -#include "NullOutputManager.h" -#include "LoggingHelpers.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 4d7de9cf3a..99a40ce218 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -91,7 +91,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -122,7 +122,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -153,7 +153,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -186,7 +186,7 @@ NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -228,6 +228,9 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + {1533e271-f61b-441b-8b74-59fb61df0552} + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 3667f51481..3778b906c6 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -91,7 +91,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -123,7 +123,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -155,7 +155,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -189,7 +189,7 @@ NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -247,6 +247,9 @@ {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + {1533e271-f61b-441b-8b74-59fb61df0552} + diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/IOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj new file mode 100644 index 0000000000..844328640e --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -0,0 +1,218 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {1533E271-F61B-441B-8B74-59FB61DF0552} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + + + + NotUsing + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreaded + false + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + true + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ..\iislib;..\CommonLib; + true + + + MultiThreaded + false + stdcpp17 + + + Windows + true + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc b/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc new file mode 100644 index 0000000000..0abcb0fa2c --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc @@ -0,0 +1,2 @@ +LANGUAGE 0x9,0x1 +1 11 "MSG00001.bin" diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h new file mode 100644 index 0000000000..094c71d0cd --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h @@ -0,0 +1,32 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Shlwapi.h" +#include +#include "hashtable.h" +#include "stringu.h" +#include "stringa.h" +#include "multisz.h" +#include "dbgutil.h" +#include "ahutil.h" +#include "hashfn.h" +#include "environmentvariablehash.h" +#include "IOutputManager.h" +#include "FileOutputManager.h" +#include "PipeOutputManager.h" +#include "NullOutputManager.h" +#include "LoggingHelpers.h" + diff --git a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj index 8f12548e9f..fe6851d189 100644 --- a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj +++ b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj @@ -160,12 +160,6 @@ - - Create - Create - Create - Create - diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 2a21ef619e..6844054804 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -58,12 +58,6 @@ - - Create - Create - Create - Create - @@ -76,6 +70,9 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + {1533e271-f61b-441b-8b74-59fb61df0552} + {cac1267b-8778-4257-aac6-caf481723b01} @@ -87,15 +84,16 @@ - Use - stdafx.h + NotUsing Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -112,15 +110,16 @@ - Use - stdafx.h + NotUsing Disabled X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -137,13 +136,14 @@ - Use - stdafx.h + NotUsing WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -162,13 +162,14 @@ - Use - stdafx.h + NotUsing X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 42ca949749..da3a2c1271 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -5,6 +5,13 @@ #include "inprocessapplication.h" #include "fakeclasses.h" +// Externals defined in inprocess +BOOL g_fProcessDetach; +HANDLE g_hEventLog; +DWORD g_dwAspNetCoreDebugFlags; +PCSTR g_szDebugLabel; +DWORD g_dwDebugFlags; + namespace InprocessTests { TEST(InProcessTest, NoNullRefForExePath) diff --git a/test/CommonLibTests/stdafx.cpp b/test/CommonLibTests/stdafx.cpp deleted file mode 100644 index bd7a85614c..0000000000 --- a/test/CommonLibTests/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 47095a9fee..74af866aa7 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -58,10 +58,5 @@ #include "gtest/gtest.h" #include "fakeclasses.h" -// Externals defined in inprocess -BOOL g_fProcessDetach; -HANDLE g_hEventLog; -DWORD g_dwAspNetCoreDebugFlags; -PCSTR g_szDebugLabel; -DWORD g_dwDebugFlags; +\