diff --git a/.gitignore b/.gitignore index 65556df299..588d3402c3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,10 +37,10 @@ project.lock.json *.CppClean.log *msbuild.log -src/*/Debug/ -src/*/x64/Debug/ -src/*/Release/ -src/*/x64/Release/ +src/*/*/Debug/ +src/*/*/x64/Debug/ +src/*/*/Release/ +src/*/*/x64/Release/ x64/ *vcxproj.filters @@ -49,12 +49,12 @@ x64/ *.lib *.idb -src/AspNetCore/aspnetcore_msg.h -src/AspNetCore/aspnetcore_msg.rc -src/AspNetCore/version.h -src/RequestHandler/version.h -src/CommonLib/aspnetcore_msg.h -src/CommonLib/aspnetcore_msg.rc +src/*/AspNetCore/aspnetcore_msg.h +src/*/AspNetCore/aspnetcore_msg.rc +src/*/*/version.h +src/*/RequestHandler/version.h +src/*/CommonLib/aspnetcore_msg.h +src/*/CommonLib/aspnetcore_msg.rc test/*/Debug test/*/Release test/gtest-1.8.0/msvc/Debug diff --git a/IISIntegration.sln b/IISIntegration.sln index 50f854a0d6..2cd32d88d2 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -228,6 +228,26 @@ Global {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.Build.0 = Release|x86 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x64.ActiveCfg = Debug|x64 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x64.Build.0 = Debug|x64 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x86.ActiveCfg = Debug|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x86.Build.0 = Debug|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|Any CPU.ActiveCfg = Release|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x64.ActiveCfg = Release|x64 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x64.Build.0 = Release|x64 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x86.ActiveCfg = Release|Win32 + {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x86.Build.0 = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 diff --git a/build/repo.targets b/build/repo.targets index 70d2652c57..e3bbad394a 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -46,12 +46,12 @@ - - - - - - + + + + + + @@ -63,22 +63,24 @@ - - - - - + + + + + - - - - - - + + + + + + - - + + + + - - + + /config:"$(IISExpressAppHostConfig)" -h "$(IISAppHostConfig)" - $(NativePlatform)\aspnetcoreV2.dll + $(NativePlatform)\aspnetcore.dll $(NativePlatform)\aspnetcorerh.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe diff --git a/nuget/AspNetCore.nuspec b/nuget/AspNetCore.nuspec index d26cd5d6e8..401001b588 100644 --- a/nuget/AspNetCore.nuspec +++ b/nuget/AspNetCore.nuspec @@ -19,12 +19,12 @@ - - - - - - + + + + + + diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj index da99641c12..2b8e6678e0 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj @@ -210,12 +210,6 @@ ..\Commonlib - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - false - - @@ -272,6 +266,11 @@ + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + diff --git a/src/AspNetCoreModuleV1/AspNetCore/Debug/AspNetCore.log b/src/AspNetCoreModuleV1/AspNetCore/Debug/AspNetCore.log deleted file mode 100644 index b6f7f04874..0000000000 --- a/src/AspNetCoreModuleV1/AspNetCore/Debug/AspNetCore.log +++ /dev/null @@ -1,225 +0,0 @@ - application.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - applicationmanager.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - aspnetcoreconfig.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - filewatcher.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - forwarderconnection.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - forwardinghandler.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - main.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(8): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(9): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(10): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(152): error C2065: 'CProxyModuleFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(152): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(220): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(220): error C2061: syntax error: identifier 'CProxyModuleFactory' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(221): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(228): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(236): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(270): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): error C2065: 'pFactory': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): error C2227: left of '->Terminate' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(273): error C2065: 'pFactory': undeclared identifier - path.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - processmanager.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - protocolconfig.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - proxymodule.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(9): error C2653: 'CProxyModuleFactory': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2065: 'CProxyModule': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2065: 'pModule': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2061: syntax error: identifier 'CProxyModule' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(15): error C2065: 'pModule': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(20): error C2065: 'pModule': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(26): error C2653: 'CProxyModuleFactory': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(58): error C2355: 'this': can only be referenced inside non-static member functions or non-static data member initializers -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(61): error C2653: 'CProxyModule': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(62): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(63): error C2550: 'CProxyModule': constructor initializer lists are only allowed on constructor definitions -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(64): warning C4508: 'CProxyModule': function should return a value; 'void' return type assumed -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(66): error C2653: 'CProxyModule': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(67): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(67): error C2084: function 'int CProxyModule(void)' already has a body - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(61): note: see previous definition of 'CProxyModule' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(68): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): error C2227: left of '->DereferenceForwardingHandler' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(75): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(81): error C2653: 'CProxyModule': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(86): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(87): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): error C2227: left of '->OnExecuteRequestHandler' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(98): error C2653: 'CProxyModule': is not a class or namespace name -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): error C2065: 'm_pHandler': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): error C2227: left of '->OnAsyncCompletion' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): note: type is 'unknown-type' - responseheaderhash.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' - serverprocess.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(836): error C4839: non-standard use of class 'STRU' as an argument to a variadic function - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(836): note: the constructor and destructor will not be called; a bitwise copy of the class will be passed as the argument - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(839): error C2248: 'STRU::STRU': cannot access private member declared in class 'STRU' - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(365): note: see declaration of 'STRU::STRU' - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1075): error C4839: non-standard use of class 'STRU' as an argument to a variadic function - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1075): note: the constructor and destructor will not be called; a bitwise copy of the class will be passed as the argument - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1077): error C2248: 'STRU::STRU': cannot access private member declared in class 'STRU' - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(365): note: see declaration of 'STRU::STRU' - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU' - websockethandler.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(40): error C2614: 'WEBSOCKET_HANDLER': illegal member initialization: '_pWebSocketContext' is not a base or member -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2065: 'IWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2059: syntax error: ')' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(294): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): error C2227: left of '->ReadFragment' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): error C2227: left of '->SendConnectionClose' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): error C2227: left of '->WriteFragment' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): note: type is 'unknown-type' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): error C2065: '_pWebSocketContext': undeclared identifier -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): error C2227: left of '->GetCloseStatus' must point to class/struct/union/generic type - c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): note: type is 'unknown-type' - winhttphelper.cxx -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*' -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int -c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';' diff --git a/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa19324 b/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa19324 deleted file mode 100644 index 3b98b503cd..0000000000 Binary files a/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa19324 and /dev/null differ diff --git a/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa25980 b/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa25980 deleted file mode 100644 index 3b98b503cd..0000000000 Binary files a/src/AspNetCoreModuleV1/AspNetCore/Debug/RCa25980 and /dev/null differ diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h index 22bf5610ab..1adbcffae8 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h +++ b/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h @@ -1,4 +1,3 @@ - // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV1/AspNetCore/src/applicationinfo.cpp deleted file mode 100644 index 4e14e33a8a..0000000000 --- a/src/AspNetCoreModuleV1/AspNetCore/src/applicationinfo.cpp +++ /dev/null @@ -1,622 +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 "precomp.hxx" - -APPLICATION_INFO::~APPLICATION_INFO() -{ - if (m_pAppOfflineHtm != NULL) - { - m_pAppOfflineHtm->DereferenceAppOfflineHtm(); - m_pAppOfflineHtm = NULL; - } - - if (m_pFileWatcherEntry != NULL) - { - // Mark the entry as invalid, - // StopMonitor will close the file handle and trigger a FCN - // the entry will delete itself when processing this FCN - m_pFileWatcherEntry->MarkEntryInValid(); - m_pFileWatcherEntry->StopMonitor(); - m_pFileWatcherEntry = NULL; - } - - if (m_pApplication != NULL) - { - // shutdown the application - m_pApplication->ShutDown(); - m_pApplication->DereferenceApplication(); - m_pApplication = NULL; - } - - // configuration should be dereferenced after application shutdown - // since the former will use it during shutdown - if (m_pConfiguration != NULL) - { - // Need to dereference the configuration instance - m_pConfiguration->DereferenceConfiguration(); - m_pConfiguration = NULL; - } -} - -HRESULT -APPLICATION_INFO::Initialize( - _In_ ASPNETCORE_CONFIG *pConfiguration, - _In_ FILE_WATCHER *pFileWatcher -) -{ - HRESULT hr = S_OK; - - DBG_ASSERT(pConfiguration); - DBG_ASSERT(pFileWatcher); - - m_pConfiguration = pConfiguration; - - // reference the configuration instance to prevent it will be not release - // earlier in case of configuration change and shutdown - m_pConfiguration->ReferenceConfiguration(); - - hr = m_applicationInfoKey.Initialize(pConfiguration->QueryConfigPath()->QueryStr()); - if (FAILED(hr)) - { - goto Finished; - } - - if (m_pFileWatcherEntry == NULL) - { - m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher); - if (m_pFileWatcherEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - } - - UpdateAppOfflineFileHandle(); - -Finished: - return hr; -} - -HRESULT -APPLICATION_INFO::StartMonitoringAppOffline() -{ - HRESULT hr = S_OK; - if (m_pFileWatcherEntry != NULL) - { - hr = m_pFileWatcherEntry->Create(m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), L"app_offline.htm", this, NULL); - } - return hr; -} - -// -// Called by the file watcher when the app_offline.htm's file status has been changed. -// If it finds it, we will call recycle on the application. -// -VOID -APPLICATION_INFO::UpdateAppOfflineFileHandle() -{ - STRU strFilePath; - UTILITY::ConvertPathToFullPath(L".\\app_offline.htm", - m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), - &strFilePath); - APP_OFFLINE_HTM *pOldAppOfflineHtm = NULL; - APP_OFFLINE_HTM *pNewAppOfflineHtm = NULL; - - ReferenceApplicationInfo(); - - if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(strFilePath.QueryStr()) && - GetLastError() == ERROR_FILE_NOT_FOUND) - { - // Check if app offline was originally present. - // if it was, log that app_offline has been dropped. - if (m_fAppOfflineFound) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED_MSG); - } - - m_fAppOfflineFound = FALSE; - } - else - { - pNewAppOfflineHtm = new APP_OFFLINE_HTM(strFilePath.QueryStr()); - - if (pNewAppOfflineHtm != NULL) - { - if (pNewAppOfflineHtm->Load()) - { - // - // loaded the new app_offline.htm - // - pOldAppOfflineHtm = (APP_OFFLINE_HTM *)InterlockedExchangePointer((VOID**)&m_pAppOfflineHtm, pNewAppOfflineHtm); - - if (pOldAppOfflineHtm != NULL) - { - pOldAppOfflineHtm->DereferenceAppOfflineHtm(); - pOldAppOfflineHtm = NULL; - } - } - else - { - // ignored the new app_offline file because the file does not exist. - pNewAppOfflineHtm->DereferenceAppOfflineHtm(); - pNewAppOfflineHtm = NULL; - } - } - - m_fAppOfflineFound = TRUE; - - // recycle the application - if (m_pApplication != NULL) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, - m_pApplication->QueryConfig()->QueryApplicationPath()->QueryStr()); - - RecycleApplication(); - } - } - - DereferenceApplicationInfo(); -} - -HRESULT -APPLICATION_INFO::EnsureApplicationCreated() -{ - HRESULT hr = S_OK; - BOOL fLocked = FALSE; - APPLICATION* pApplication = NULL; - STACK_STRU(struFileName, 300); // >MAX_PATH - STRU struHostFxrDllLocation; - - if (m_pApplication != NULL) - { - goto Finished; - } - - if (m_pApplication == NULL) - { - AcquireSRWLockExclusive(&m_srwLock); - fLocked = TRUE; - if (m_pApplication != NULL) - { - goto Finished; - } - - // - // in case of app offline, we don't want to create a new application now - // - if (!m_fAppOfflineFound) - { - - // Move the request handler check inside of the lock - // such that only one request finds and loads it. - // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, - // there is a period where we could call - - hr = FindRequestHandlerAssembly(); - if (FAILED(hr)) - { - goto Finished; - } - - if (m_pfnAspNetCoreCreateApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION); - goto Finished; - } - - hr = m_pfnAspNetCoreCreateApplication(m_pServer, m_pConfiguration, &pApplication); - if (FAILED(hr)) - { - goto Finished; - } - m_pApplication = pApplication; - } - } - -Finished: - if (fLocked) - { - ReleaseSRWLockExclusive(&m_srwLock); - } - return hr; -} - -HRESULT -APPLICATION_INFO::FindRequestHandlerAssembly() -{ - HRESULT hr = S_OK; - BOOL fLocked = FALSE; - STACK_STRU(struFileName, 256); - - if (g_fAspnetcoreRHLoadedError) - { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; - } - else if (!g_fAspnetcoreRHAssemblyLoaded) - { - AcquireSRWLockExclusive(&g_srwLock); - fLocked = TRUE; - if (g_fAspnetcoreRHLoadedError) - { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; - } - if (g_fAspnetcoreRHAssemblyLoaded) - { - goto Finished; - } - - if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - if (FAILED(hr = FindNativeAssemblyFromHostfxr(&struFileName))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG); - } - } - else - { - if (FAILED(hr = FindNativeAssemblyFromGlobalLocation(&struFileName))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG); - - goto Finished; - } - } - - g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); - if (g_hAspnetCoreRH == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - g_pfnAspNetCoreCreateApplication = (PFN_ASPNETCORE_CREATE_APPLICATION) - GetProcAddress(g_hAspnetCoreRH, "CreateApplication"); - if (g_pfnAspNetCoreCreateApplication == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - g_pfnAspNetCoreCreateRequestHandler = (PFN_ASPNETCORE_CREATE_REQUEST_HANDLER) - GetProcAddress(g_hAspnetCoreRH, "CreateRequestHandler"); - if (g_pfnAspNetCoreCreateRequestHandler == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - g_fAspnetcoreRHAssemblyLoaded = TRUE; - } - -Finished: - // - // Question: we remember the load failure so that we will not try again. - // User needs to check whether the fuction pointer is NULL - // - m_pfnAspNetCoreCreateApplication = g_pfnAspNetCoreCreateApplication; - m_pfnAspNetCoreCreateRequestHandler = g_pfnAspNetCoreCreateRequestHandler; - if (!g_fAspnetcoreRHLoadedError && FAILED(hr)) - { - g_fAspnetcoreRHLoadedError = TRUE; - } - - if (fLocked) - { - ReleaseSRWLockExclusive(&g_srwLock); - } - return hr; -} - -HRESULT -APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) -{ - HRESULT hr = S_OK; - DWORD dwSize = MAX_PATH; - BOOL fDone = FALSE; - DWORD dwPosition = 0; - - // Though we could call LoadLibrary(L"aspnetcorerh.dll") relying the OS to solve - // the path (the targeted dll is the same folder of w3wp.exe/iisexpress) - // let's still load with full path to avoid security issue - if (FAILED(hr = struFilename->Resize(dwSize + 20))) - { - goto Finished; - } - - while (!fDone) - { - DWORD dwReturnedSize = GetModuleFileNameW(g_hModule, struFilename->QueryStr(), dwSize); - if (dwReturnedSize == 0) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - fDone = TRUE; - goto Finished; - } - else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) - { - dwSize *= 2; // smaller buffer. increase the buffer and retry - if (FAILED(hr = struFilename->Resize(dwSize + 20))) // + 20 for aspnetcorerh.dll - { - goto Finished; - } - } - else - { - fDone = TRUE; - } - } - - if (FAILED(hr = struFilename->SyncWithBuffer())) - { - goto Finished; - } - dwPosition = struFilename->LastIndexOf(L'\\', 0); - struFilename->QueryStr()[dwPosition] = L'\0'; - - if (FAILED(hr = struFilename->SyncWithBuffer()) || - FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(g_pwzAspnetcoreRequestHandlerName))) - { - goto Finished; - } - -Finished: - return hr; -} - -// -// Tries to find aspnetcorerh.dll from the application -// Calls into hostfxr.dll to find it. -// Will leave hostfxr.dll loaded as it will be used again to call hostfxr_main. -// -HRESULT -APPLICATION_INFO::FindNativeAssemblyFromHostfxr( - STRU* struFilename -) -{ - HRESULT hr = S_OK; - STRU struApplicationFullPath; - STRU struNativeSearchPaths; - STRU struNativeDllLocation; - HMODULE hmHostFxrDll = NULL; - INT intHostFxrExitCode = 0; - INT intIndex = -1; - INT intPrevIndex = 0; - BOOL fFound = FALSE; - DWORD dwBufferSize = 1024 * 10; - DWORD dwRequiredBufferSize = 0; - - DBG_ASSERT(struFileName != NULL); - - hmHostFxrDll = LoadLibraryW(m_pConfiguration->QueryHostFxrFullPath()); - - if (hmHostFxrDll == NULL) - { - // Could not load hostfxr - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - hostfxr_get_native_search_directories_fn pFnHostFxrSearchDirectories = (hostfxr_get_native_search_directories_fn) - GetProcAddress(hmHostFxrDll, "hostfxr_get_native_search_directories"); - - if (pFnHostFxrSearchDirectories == NULL) - { - // Host fxr version is incorrect (need a higher version). - // TODO log error - hr = E_FAIL; - goto Finished; - } - - if (FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize))) - { - goto Finished; - } - - while (TRUE) - { - intHostFxrExitCode = pFnHostFxrSearchDirectories( - m_pConfiguration->QueryHostFxrArgCount(), - m_pConfiguration->QueryHostFxrArguments(), - struNativeSearchPaths.QueryStr(), - dwBufferSize, - &dwRequiredBufferSize - ); - - if (intHostFxrExitCode == 0) - { - break; - } - else if (dwRequiredBufferSize > dwBufferSize) - { - dwBufferSize = dwRequiredBufferSize + 1; // for null terminator - - if (FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize))) - { - goto Finished; - } - } - else - { - hr = E_FAIL; - // Log "Error finding native search directories from aspnetcore application. - goto Finished; - } - } - - if (FAILED(hr = struNativeSearchPaths.SyncWithBuffer())) - { - goto Finished; - } - - fFound = FALSE; - - // The native search directories are semicolon delimited. - // Split on semicolons, append aspnetcorerh.dll, and check if the file exists. - while ((intIndex = struNativeSearchPaths.IndexOf(L";", intPrevIndex)) != -1) - { - if (FAILED(hr = struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex))) - { - goto Finished; - } - - if (!struNativeDllLocation.EndsWith(L"\\")) - { - if (FAILED(hr = struNativeDllLocation.Append(L"\\"))) - { - goto Finished; - } - } - - if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreRequestHandlerName))) - { - goto Finished; - } - - if (UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) - { - if (FAILED(hr = struFilename->Copy(struNativeDllLocation))) - { - goto Finished; - } - fFound = TRUE; - break; - } - - intPrevIndex = intIndex + 1; - } - - if (!fFound) - { - hr = E_FAIL; - goto Finished; - } - -Finished: - if (FAILED(hr) && hmHostFxrDll != NULL) - { - FreeLibrary(hmHostFxrDll); - } - return hr; -} - -VOID -APPLICATION_INFO::RecycleApplication() -{ - APPLICATION* pApplication = NULL; - HANDLE hThread = INVALID_HANDLE_VALUE; - BOOL fLockAcquired = FALSE; - - if (m_pApplication != NULL) - { - AcquireSRWLockExclusive(&m_srwLock); - fLockAcquired = TRUE; - if (m_pApplication != NULL) - { - pApplication = m_pApplication; - if (pApplication->QueryConfig()->QueryHostingModel() == HOSTING_OUT_PROCESS) - { - // - // For inprocess, need to set m_pApplication to NULL first to - // avoid mapping new request to the recycled application. - // Outofprocess application instance will be created for new request - // For inprocess, as recycle will lead to shutdown later, leave m_pApplication - // to not block incoming requests till worker process shutdown - // - m_pApplication = NULL; - } - else - { - // - // For inprocess, need hold the application till shutdown is called - // Bump the reference counter as DoRecycleApplication will do dereference - // - pApplication->ReferenceApplication(); - } - - hThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)DoRecycleApplication, - pApplication, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - } - - if (hThread == NULL) - { - if (!g_fRecycleProcessCalled) - { - g_fRecycleProcessCalled = TRUE; - g_pHttpServer->RecycleProcess(L"On Demand by AspNetCore Module for recycle application failure"); - } - } - - if (fLockAcquired) - { - ReleaseSRWLockExclusive(&m_srwLock); - } - } -} - - -VOID -APPLICATION_INFO::DoRecycleApplication( - LPVOID lpParam) -{ - APPLICATION* pApplication = static_cast(lpParam); - - // No lock required - - if (pApplication != NULL) - { - // Recycle will call shutdown for out of process - pApplication->Recycle(); - - // Decrement the ref count as we reference it in RecycleApplication. - pApplication->DereferenceApplication(); - } -} - - -VOID -APPLICATION_INFO::ShutDownApplication() -{ - APPLICATION* pApplication = NULL; - BOOL fLockAcquired = FALSE; - - // pApplication can be NULL due to app_offline - if (m_pApplication != NULL) - { - AcquireSRWLockExclusive(&m_srwLock); - fLockAcquired = TRUE; - if (m_pApplication != NULL) - { - pApplication = m_pApplication; - - // Set m_pApplication to NULL first to prevent anyone from using it - m_pApplication = NULL; - pApplication->ShutDown(); - pApplication->DereferenceApplication(); - } - - if (fLockAcquired) - { - ReleaseSRWLockExclusive(&m_srwLock); - } - } -} diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV1/AspNetCore/src/dllmain.cpp deleted file mode 100644 index 454dc193b2..0000000000 --- a/src/AspNetCoreModuleV1/AspNetCore/src/dllmain.cpp +++ /dev/null @@ -1,248 +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 "precomp.hxx" -#include - -HTTP_MODULE_ID g_pModuleId = NULL; -IHttpServer * g_pHttpServer = NULL; -HANDLE g_hEventLog = NULL; -BOOL g_fRecycleProcessCalled = FALSE; -PCWSTR g_pszModuleName = NULL; -HINSTANCE g_hModule; -HMODULE g_hAspnetCoreRH = NULL; -BOOL g_fAspnetcoreRHAssemblyLoaded = FALSE; -BOOL g_fAspnetcoreRHLoadedError = FALSE; -BOOL g_fInShutdown = FALSE; -DWORD g_dwAspNetCoreDebugFlags = 0; -DWORD g_dwActiveServerProcesses = 0; -SRWLOCK g_srwLock; -DWORD g_dwDebugFlags = 0; -PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; -PCWSTR g_pwzAspnetcoreRequestHandlerName = L"aspnetcorerh.dll"; -PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -PFN_ASPNETCORE_CREATE_REQUEST_HANDLER g_pfnAspNetCoreCreateRequestHandler; - -VOID -StaticCleanup() -{ - APPLICATION_MANAGER::Cleanup(); - if (g_hEventLog != NULL) - { - DeregisterEventSource(g_hEventLog); - g_hEventLog = NULL; - } -} - -BOOL WINAPI DllMain(HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - UNREFERENCED_PARAMETER(lpReserved); - - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - g_hModule = hModule; - DisableThreadLibraryCalls(hModule); - break; - case DLL_PROCESS_DETACH: - // IIS can cause dll detach to occur before we receive global notifications - // For example, when we switch the bitness of the worker process, - // this is a bug in IIS. To try to avoid AVs, we will set a global flag - g_fInShutdown = TRUE; - StaticCleanup(); - default: - break; - } - - return TRUE; -} - -HRESULT -__stdcall -RegisterModule( -DWORD dwServerVersion, -IHttpModuleRegistrationInfo * pModuleInfo, -IHttpServer * pHttpServer -) -/*++ - -Routine description: - -Function called by IIS immediately after loading the module, used to let -IIS know what notifications the module is interested in - -Arguments: - -dwServerVersion - IIS version the module is being loaded on -pModuleInfo - info regarding this module -pHttpServer - callback functions which can be used by the module at -any point - -Return value: - -HRESULT - ---*/ -{ - HRESULT hr = S_OK; - HKEY hKey; - BOOL fDisableANCM = FALSE; - ASPNET_CORE_PROXY_MODULE_FACTORY * pFactory = NULL; - ASPNET_CORE_GLOBAL_MODULE * pGlobalModule = NULL; - APPLICATION_MANAGER * pApplicationManager = NULL; - - UNREFERENCED_PARAMETER(dwServerVersion); - -#ifdef DEBUG - CREATE_DEBUG_PRINT_OBJECT("Asp.Net Core Module"); - g_dwDebugFlags = DEBUG_FLAGS_ANY; -#endif // DEBUG - - CREATE_DEBUG_PRINT_OBJECT; - - //LoadGlobalConfiguration(); - - InitializeSRWLock(&g_srwLock); - - g_pModuleId = pModuleInfo->GetId(); - g_pszModuleName = pModuleInfo->GetName(); - g_pHttpServer = pHttpServer; - - if (g_pHttpServer->IsCommandLineLaunch()) - { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); - } - else - { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); - } - - // check whether the feature is disabled due to security reason - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", - 0, - KEY_READ, - &hKey) == NO_ERROR) - { - DWORD dwType; - DWORD dwData; - DWORD cbData; - - cbData = sizeof(dwData); - if ((RegQueryValueEx(hKey, - L"DisableANCM", - NULL, - &dwType, - (LPBYTE)&dwData, - &cbData) == NO_ERROR) && - (dwType == REG_DWORD)) - { - fDisableANCM = (dwData != 0); - } - - cbData = sizeof(dwData); - if ((RegQueryValueEx(hKey, - L"DebugFlags", - NULL, - &dwType, - (LPBYTE)&dwData, - &cbData) == NO_ERROR) && - (dwType == REG_DWORD)) - { - g_dwAspNetCoreDebugFlags = dwData; - } - - RegCloseKey(hKey); - } - - if (fDisableANCM) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_WARNING_TYPE, - ASPNETCORE_EVENT_MODULE_DISABLED, - ASPNETCORE_EVENT_MODULE_DISABLED_MSG); - // this will return 500 error to client - // as we did not register the module - goto Finished; - } - - // - // Create the factory before any static initialization. - // The ASPNET_CORE_PROXY_MODULE_FACTORY::Terminate method will clean any - // static object initialized. - // - pFactory = new ASPNET_CORE_PROXY_MODULE_FACTORY; - - if (pFactory == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = pModuleInfo->SetRequestNotifications( - pFactory, - RQ_EXECUTE_REQUEST_HANDLER, - 0); - if (FAILED(hr)) - { - goto Finished; - } - - pFactory = NULL; - pApplicationManager = APPLICATION_MANAGER::GetInstance(); - if(pApplicationManager == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = pApplicationManager->Initialize(); - if(FAILED(hr)) - { - goto Finished; - } - pGlobalModule = NULL; - - pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(pApplicationManager); - if (pGlobalModule == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = pModuleInfo->SetGlobalNotifications( - pGlobalModule, - GL_CONFIGURATION_CHANGE | // Configuration change trigers IIS application stop - GL_STOP_LISTENING); // worker process stop or recycle - - if (FAILED(hr)) - { - goto Finished; - } - pGlobalModule = NULL; - - hr = ALLOC_CACHE_HANDLER::StaticInitialize(); - if (FAILED(hr)) - { - goto Finished; - } - -Finished: - if (pGlobalModule != NULL) - { - delete pGlobalModule; - pGlobalModule = NULL; - } - - if (pFactory != NULL) - { - pFactory->Terminate(); - pFactory = NULL; - } - - return hr; -} - diff --git a/src/AspNetCoreModuleV1/AspNetCore/version.h b/src/AspNetCoreModuleV1/AspNetCore/version.h deleted file mode 100644 index 76d6276160..0000000000 --- a/src/AspNetCoreModuleV1/AspNetCore/version.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - - -// This file is auto-generated - - -#define FileVersion 8,1,18099,0 -#define FileVersionStr "8.1.18099.0\0" -#define ProductVersion 8,1,18099,0 -#define ProductVersionStr "8.1.18099.0\0" -#define PlatformToolset "v141\0" -#define CommitHash "1394ac939d3418b2610b5e2caf152b33767f0560\0" diff --git a/src/AspNetCoreModuleV1/IISLib/Debug/IISLib.log b/src/AspNetCoreModuleV1/IISLib/Debug/IISLib.log deleted file mode 100644 index 038ee2642a..0000000000 --- a/src/AspNetCoreModuleV1/IISLib/Debug/IISLib.log +++ /dev/null @@ -1,13 +0,0 @@ - acache.cxx - ahutil.cpp - base64.cpp - multisz.cpp - multisza.cpp - stringa.cpp - stringu.cpp - util.cxx - Generating Code... - reftrace.c - tracelog.c - Generating Code... - IISLib.vcxproj -> C:\Users\jukotali\code\IISIntegration\Debug\IISLib.lib diff --git a/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj index 296d1afc1c..bb8795992b 100644 --- a/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj @@ -68,7 +68,18 @@ - + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index dfb9f1534b..4660054b0b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -24,7 +24,7 @@ Win32Proj AspNetCoreModule AspNetCore - aspnetcoreV2 + aspnetcore false 10.0.15063.0 @@ -232,8 +232,7 @@ {55494e58-e061-4c4c-a0a8-837008e72f85} - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - false + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} diff --git a/src/AspNetCoreModuleV2/AspNetCore/Debug/aspnetcoremodule.res b/src/AspNetCoreModuleV2/AspNetCore/Debug/aspnetcoremodule.res deleted file mode 100644 index a76e222b1e..0000000000 Binary files a/src/AspNetCoreModuleV2/AspNetCore/Debug/aspnetcoremodule.res and /dev/null differ diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc index abfbebfb71..9d0dfa7f83 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc @@ -81,7 +81,7 @@ BEGIN VALUE "FileVersion", FileVersionStr VALUE "InternalName", "aspnetcore" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" - VALUE "OriginalFilename", "aspnetcoreV2.dll" + VALUE "OriginalFilename", "aspnetcore.dll" VALUE "ProductName", "ASP.NET Core Module" VALUE "ProductVersion", ProductVersionStr END diff --git a/src/AspNetCoreModuleV2/AspNetCore/version.h b/src/AspNetCoreModuleV2/AspNetCore/version.h deleted file mode 100644 index ac697ef700..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/version.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - - -// This file is auto-generated - - -#define FileVersion 8,1,18099,0 -#define FileVersionStr "8.1.18099.0\0" -#define ProductVersion 8,1,18099,0 -#define ProductVersionStr "8.1.18099.0\0" -#define PlatformToolset "v141\0" -#define CommitHash "8679fdf3558d67abc7b51ddadff02a390e5d7670\0" diff --git a/src/AspNetCoreModuleV2/CommonLib/Debug/CommonLib.pch b/src/AspNetCoreModuleV2/CommonLib/Debug/CommonLib.pch deleted file mode 100644 index 52e31134c2..0000000000 Binary files a/src/AspNetCoreModuleV2/CommonLib/Debug/CommonLib.pch and /dev/null differ diff --git a/src/AspNetCoreModuleV2/IISLib/Debug/IISLib.log b/src/AspNetCoreModuleV2/IISLib/Debug/IISLib.log new file mode 100644 index 0000000000..f33106cbee --- /dev/null +++ b/src/AspNetCoreModuleV2/IISLib/Debug/IISLib.log @@ -0,0 +1 @@ + IISLib.vcxproj -> C:\Users\jukotali\code\IISIntegration\Debug\IISLib.lib diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index a807c09d66..7c0cca6626 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -23,7 +23,7 @@ Win32Proj IISLib IISLib - 8.1 + 10.0.15063.0 @@ -68,7 +68,18 @@ - + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + diff --git a/src/AspNetCoreModuleV2/RequestHandler/Debug/requesthandler.res b/src/AspNetCoreModuleV2/RequestHandler/Debug/requesthandler.res deleted file mode 100644 index 3b34e7c8bd..0000000000 Binary files a/src/AspNetCoreModuleV2/RequestHandler/Debug/requesthandler.res and /dev/null differ diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx index b5e7ca3791..3cfdef0798 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx @@ -160,7 +160,7 @@ EnsureOutOfProcessInitializtion() g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll")); - g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcoreV2.dll")); + g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcore.dll")); hr = WINHTTP_HELPER::StaticInitialize(); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/RequestHandler/version.h b/src/AspNetCoreModuleV2/RequestHandler/version.h deleted file mode 100644 index ac697ef700..0000000000 --- a/src/AspNetCoreModuleV2/RequestHandler/version.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - - -// This file is auto-generated - - -#define FileVersion 8,1,18099,0 -#define FileVersionStr "8.1.18099.0\0" -#define ProductVersion 8,1,18099,0 -#define ProductVersionStr "8.1.18099.0\0" -#define PlatformToolset "v141\0" -#define CommitHash "8679fdf3558d67abc7b51ddadff02a390e5d7670\0" diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 90ecc876b3..c68f83af6d 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -47,11 +47,11 @@ - + {55494e58-e061-4c4c-a0a8-837008e72f85} - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} {2af210a9-5bdc-45e8-95dd-07b5a2616493} @@ -69,7 +69,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -91,7 +91,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -111,7 +111,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -133,7 +133,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" diff --git a/tools/update_schema.ps1 b/tools/update_schema.ps1 index a5dc6c7c03..b299c91e6a 100644 --- a/tools/update_schema.ps1 +++ b/tools/update_schema.ps1 @@ -9,7 +9,7 @@ param() $ErrorActionPreference = 'Stop' Set-StrictMode -Version 1 -$schemaSource = Resolve-Path "$PSScriptRoot\..\src\AspNetCore\aspnetcore_schema.xml" +$schemaSource = Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema.xml" [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator") if (-not $isAdmin -and -not $WhatIfPreference) {