From c81f379045b8b93974c154d977e68b00e3c472fa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 12 Jul 2018 09:30:50 -0700 Subject: [PATCH] Normalize file extensions and project structures (#1038) --- .../AspNetCore/AspNetCore.vcxproj | 42 ++++++------ .../AspNetCore/{src => }/applicationinfo.cpp | 0 .../AspNetCore/{Inc => }/applicationinfo.h | 0 ...tionmanager.cxx => applicationmanager.cpp} | 0 .../AspNetCore/{Inc => }/applicationmanager.h | 0 .../{src => }/aspnetcore_shim_config.cpp | 0 .../{Inc => }/aspnetcore_shim_config.h | 0 .../AspNetCore/{src => }/dllmain.cpp | 0 .../AspNetCore/{src => }/globalmodule.cpp | 0 .../AspNetCore/{Inc => }/globalmodule.h | 0 .../{src/proxymodule.cxx => proxymodule.cpp} | 0 .../AspNetCore/{Inc => }/proxymodule.h | 0 .../{src/precomp.cpp => stdafx.cpp} | 0 .../AspNetCore/{Inc/precomp.hxx => stdafx.h} | 0 .../CommonLib/CommonLib.vcxproj | 4 +- .../CommonLib/{fx_ver.cxx => fx_ver.cpp} | 0 .../CommonLib/{utility.cxx => utility.cpp} | 0 src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 4 +- .../IISLib/{acache.cxx => acache.cpp} | 0 .../IISLib/{util.cxx => util.cpp} | 0 .../InProcessRequestHandler.vcxproj | 24 +++---- .../{dllmain.cxx => dllmain.cpp} | 0 ...{managedexports.cxx => managedexports.cpp} | 0 .../{precomp.cpp => stdafx.cpp} | 0 .../{precomp.hxx => stdafx.h} | 0 .../OutOfProcessRequestHandler.vcxproj | 66 +++++++++++-------- .../{dllmain.cxx => dllmain.cpp} | 2 +- ...connection.cxx => forwarderconnection.cpp} | 4 +- .../{outofprocess => }/forwarderconnection.h | 0 .../{outofprocess => }/forwardinghandler.cpp | 5 +- .../{outofprocess => }/forwardinghandler.h | 0 .../outprocessapplication.cpp | 6 +- .../outprocessapplication.h | 0 .../processmanager.cxx => processmanager.cpp} | 2 +- .../{outofprocess => }/processmanager.h | 0 .../protocolconfig.cxx => protocolconfig.cpp} | 4 +- .../{outofprocess => }/protocolconfig.h | 0 ...eheaderhash.cxx => responseheaderhash.cpp} | 2 +- .../{outofprocess => }/responseheaderhash.h | 0 .../serverprocess.cxx => serverprocess.cpp} | 3 +- .../{outofprocess => }/serverprocess.h | 0 .../OutOfProcessRequestHandler/stdafx.cpp | 4 ++ .../{precomp.hxx => stdafx.h} | 18 ++--- ...sockethandler.cxx => websockethandler.cpp} | 2 +- .../{outofprocess => }/websockethandler.h | 0 .../winhttphelper.cxx => winhttphelper.cpp} | 2 +- .../{outofprocess => }/winhttphelper.h | 0 .../environmentvariablehelpers.h | 2 - test/CommonLibTests/CommonLibTests.vcxproj | 12 ++-- 49 files changed, 116 insertions(+), 92 deletions(-) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/applicationinfo.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/applicationinfo.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/applicationmanager.cxx => applicationmanager.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/applicationmanager.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/aspnetcore_shim_config.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/aspnetcore_shim_config.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/dllmain.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/globalmodule.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/globalmodule.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/proxymodule.cxx => proxymodule.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/proxymodule.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/precomp.cpp => stdafx.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc/precomp.hxx => stdafx.h} (100%) rename src/AspNetCoreModuleV2/CommonLib/{fx_ver.cxx => fx_ver.cpp} (100%) rename src/AspNetCoreModuleV2/CommonLib/{utility.cxx => utility.cpp} (100%) rename src/AspNetCoreModuleV2/IISLib/{acache.cxx => acache.cpp} (100%) rename src/AspNetCoreModuleV2/IISLib/{util.cxx => util.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{dllmain.cxx => dllmain.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{managedexports.cxx => managedexports.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{precomp.cpp => stdafx.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{precomp.hxx => stdafx.h} (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{dllmain.cxx => dllmain.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/forwarderconnection.cxx => forwarderconnection.cpp} (97%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwarderconnection.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwardinghandler.cpp (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwardinghandler.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/outprocessapplication.cpp (93%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/outprocessapplication.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/processmanager.cxx => processmanager.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/processmanager.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/protocolconfig.cxx => protocolconfig.cpp} (97%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/protocolconfig.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/responseheaderhash.cxx => responseheaderhash.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/responseheaderhash.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/serverprocess.cxx => serverprocess.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/serverprocess.h (100%) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{precomp.hxx => stdafx.h} (86%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/websockethandler.cxx => websockethandler.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/websockethandler.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/winhttphelper.cxx => winhttphelper.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/winhttphelper.h (100%) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 1a80711d26..c0d926bd35 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -79,7 +79,7 @@ Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ..\IISLib;.\Inc;..\CommonLib ProgramDatabase @@ -97,7 +97,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -115,7 +115,7 @@ Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ..\IISLib;.\Inc;..\CommonLib ProgramDatabase @@ -133,7 +133,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -155,7 +155,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) ..\IISLib;.\Inc;..\CommonLib - precomp.hxx + stdafx.h MultiThreaded true true @@ -170,7 +170,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -193,7 +193,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h ..\IISLib;.\Inc;..\CommonLib MultiThreaded true @@ -209,7 +209,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -225,26 +225,26 @@ - - - - - - + + + + + + - - - - - - + + + + + + Create Create Create Create - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp rename to src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h rename to src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx rename to src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h rename to src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp rename to src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h rename to src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp rename to src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp rename to src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h rename to src/AspNetCoreModuleV2/AspNetCore/globalmodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx rename to src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h rename to src/AspNetCoreModuleV2/AspNetCore/proxymodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp b/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp rename to src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx rename to src/AspNetCoreModuleV2/AspNetCore/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index efeb7f1ddc..2be58bcc5c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -217,7 +217,7 @@ - + @@ -231,7 +231,7 @@ Create Create - + diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx b/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx rename to src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/utility.cxx rename to src/AspNetCoreModuleV2/CommonLib/utility.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 6d947fcb58..96b722d328 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -187,7 +187,7 @@ - + @@ -196,7 +196,7 @@ - + diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cxx b/src/AspNetCoreModuleV2/IISLib/acache.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.cxx rename to src/AspNetCoreModuleV2/IISLib/acache.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/util.cxx b/src/AspNetCoreModuleV2/IISLib/util.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/util.cxx rename to src/AspNetCoreModuleV2/IISLib/util.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index c96aaa7000..6531befa35 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -87,7 +87,7 @@ Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -104,7 +104,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -121,7 +121,7 @@ Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -138,7 +138,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -157,7 +157,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -172,7 +172,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -193,7 +193,7 @@ true true NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -208,7 +208,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -226,17 +226,17 @@ - + - + - - + + Create Create Create diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 41f2612683..c34aa8d3a3 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -83,11 +83,11 @@ - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -105,6 +105,7 @@ true true stdcpp17 + stdafx.h Windows @@ -116,11 +117,11 @@ - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -138,6 +139,7 @@ true true stdcpp17 + stdafx.h Windows @@ -150,12 +152,12 @@ Level4 - NotUsing + Use MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -171,6 +173,7 @@ true true stdcpp17 + stdafx.h Windows @@ -185,12 +188,12 @@ Level4 - NotUsing + Use MaxSpeed true true NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -206,6 +209,7 @@ true true stdcpp17 + stdafx.h Windows @@ -221,28 +225,34 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + Create + Create + Create + Create + + + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index e2d5c1ec3c..710be75262 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -1,5 +1,5 @@ // dllmain.cpp : Defines the entry point for the DLL application. -#include "precomp.hxx" + #include #include diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp similarity index 97% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp index 99990f938c..0369edcce9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "forwarderconnection.h" FORWARDER_CONNECTION::FORWARDER_CONNECTION( VOID @@ -49,4 +49,4 @@ FORWARDER_CONNECTION::Initialize( Finished: return hr; -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index bfe689fe58..8b41b72ee4 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -1,4 +1,7 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "forwardinghandler.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp similarity index 93% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index ce29fd4745..90d75b2991 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -1,4 +1,8 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "outprocessapplication.h" + #include "SRWExclusiveLock.h" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp index 85160dc55b..5619319c22 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "processmanager.h" volatile BOOL PROCESS_MANAGER::sm_fWSAStartupDone = FALSE; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp similarity index 97% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp index bb59a5ff3d..0f75a9d072 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "protocolconfig.h" HRESULT PROTOCOL_CONFIG::Initialize() @@ -45,4 +45,4 @@ PROTOCOL_CONFIG::OverrideConfig( ) { m_msTimeout = pAspNetCoreConfig->QueryRequestTimeoutInMS(); -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp index f2fae274d5..d8c77eccb0 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "responseheaderhash.h" HEADER_RECORD RESPONSE_HEADER_HASH::sm_rgHeaders[] = { diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index cedbd0ba12..12be084681 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -1,7 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "serverprocess.h" + #include //#include diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp new file mode 100644 index 0000000000..12fcb1d436 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp @@ -0,0 +1,4 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +// Do not remove this file. It is used for precompiled header generation diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h similarity index 86% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h index e77b603820..7cdcfa0146 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h @@ -64,15 +64,15 @@ #include "requesthandler_config.h" #include "sttimer.h" -#include ".\outofprocess\websockethandler.h" -#include ".\outofprocess\responseheaderhash.h" -#include ".\outofprocess\protocolconfig.h" -#include ".\outofprocess\forwarderconnection.h" -#include ".\outofprocess\serverprocess.h" -#include ".\outofprocess\processmanager.h" -#include ".\outofprocess\forwardinghandler.h" -#include ".\outofprocess\outprocessapplication.h" -#include ".\outofprocess\winhttphelper.h" +#include "websockethandler.h" +#include "responseheaderhash.h" +#include "protocolconfig.h" +#include "forwarderconnection.h" +#include "serverprocess.h" +#include "processmanager.h" +#include "forwardinghandler.h" +#include "outprocessapplication.h" +#include "winhttphelper.h" #include "environmentvariablehelpers.h" diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp index 4d86fe592e..f58d599f98 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp @@ -27,7 +27,7 @@ This prevents the need for data buffering at the Asp.Net Core Module level. --*/ -#include "..\precomp.hxx" +#include "websockethandler.h" SRWLOCK WEBSOCKET_HANDLER::sm_RequestsListLock; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp index 1796e63081..8d14ffc417 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "winhttphelper.h" PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE WINHTTP_HELPER::sm_pfnWinHttpWebSocketCompleteUpgrade; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h index 35155faedf..b65c32ee29 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h @@ -3,8 +3,6 @@ #pragma once -#include "precomp.hxx" - class ENVIRONMENT_VAR_HELPERS { diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 85cc1d39be..c3947b45b3 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,8 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -127,7 +128,8 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -153,7 +155,8 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -179,7 +182,8 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration