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

Get build.cmd working and cleanup ignored files.

This commit is contained in:
Justin Kotalik 2018-04-09 14:53:16 -07:00
parent df9efa0770
commit da513bd8d8
27 changed files with 103 additions and 1208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitignore vendored
View File

@ -37,10 +37,10 @@ project.lock.json
*.CppClean.log *.CppClean.log
*msbuild.log *msbuild.log
src/*/Debug/ src/*/*/Debug/
src/*/x64/Debug/ src/*/*/x64/Debug/
src/*/Release/ src/*/*/Release/
src/*/x64/Release/ src/*/*/x64/Release/
x64/ x64/
*vcxproj.filters *vcxproj.filters
@ -49,12 +49,12 @@ x64/
*.lib *.lib
*.idb *.idb
src/AspNetCore/aspnetcore_msg.h src/*/AspNetCore/aspnetcore_msg.h
src/AspNetCore/aspnetcore_msg.rc src/*/AspNetCore/aspnetcore_msg.rc
src/AspNetCore/version.h src/*/*/version.h
src/RequestHandler/version.h src/*/RequestHandler/version.h
src/CommonLib/aspnetcore_msg.h src/*/CommonLib/aspnetcore_msg.h
src/CommonLib/aspnetcore_msg.rc src/*/CommonLib/aspnetcore_msg.rc
test/*/Debug test/*/Debug
test/*/Release test/*/Release
test/gtest-1.8.0/msvc/Debug test/gtest-1.8.0/msvc/Debug

20
IISIntegration.sln
View File

@ -228,6 +228,26 @@ Global
{FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 {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.ActiveCfg = Release|x86
{FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64

40
build/repo.targets
View File

@ -46,12 +46,12 @@
</ArtifactInfo> </ArtifactInfo>
<FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" /> <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
<FilesToSign Include="x64/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV1/x64/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
<FilesToSign Include="x86/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV1/x86/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
<FilesToSign Include="x64/aspnetcoreV2.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV2/x64/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
<FilesToSign Include="x86/aspnetcoreV2.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV2/x86/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
<FilesToSign Include="x64/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV2/x64/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
<FilesToSign Include="x86/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="AspNetCoreModuleV2/x86/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="PackageNativeProjects"> <Target Name="PackageNativeProjects">
@ -63,22 +63,24 @@
<ItemGroup> <ItemGroup>
<!-- x64 --> <!-- x64 -->
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" Link="x64\aspnetcore.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" Link="AspNetCoreModuleV1\x64\aspnetcore.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" Link="x64\aspnetcore.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" Link="AspNetCoreModuleV1\x64\aspnetcore.pdb" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcoreV2.dll" Link="x64\aspnetcoreV2.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" Link="AspNetCoreModuleV2\x64\aspnetcore.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcoreV2.pdb" Link="x64\aspnetcoreV2.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" Link="AspNetCoreModuleV2\x64\aspnetcore.pdb" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\x64\aspnetcorerh.dll" Link="x64\aspnetcorerh.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\x64\aspnetcorerh.dll" Link="AspNetCoreModuleV2\x64\aspnetcorerh.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\x64\aspnetcorerh.pdb" Link="x64\aspnetcorerh.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\x64\aspnetcorerh.pdb" Link="x64\aspnetcorerh.pdb" />
<!-- x86 --> <!-- x86 -->
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" Link="x86\aspnetcore.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" Link="AspNetCoreModuleV1\x86\aspnetcore.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" Link="x86\aspnetcore.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" Link="AspNetCoreModuleV1\x86\aspnetcore.pdb" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcoreV2.dll" Link="x86\aspnetcoreV2.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" Link="AspNetCoreModuleV2\x86\aspnetcore.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcoreV2.pdb" Link="x86\aspnetcoreV2.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" Link="AspNetCoreModuleV2\x86\aspnetcore.pdb" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.dll" Link="x86\aspnetcorerh.dll" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.dll" Link="AspNetCoreModuleV2\x86\aspnetcorerh.dll" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.pdb" Link="x86\aspnetcorerh.pdb" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.pdb" Link="AspNetCoreModuleV2\x86\aspnetcorerh.pdb" />
<!-- Schema--> <!-- Schema-->
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcore_schema.xml" Link="aspnetcore_schema.xml" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore_schema.xml" Link="AspNetCoreModuleV1\aspnetcore_schema.xml" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="ancm.mof" /> <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="AspNetCoreModuleV1\ancm.mof" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcore_schema.xml" Link="AspNetCoreModuleV2\aspnetcore_schema.xml" />
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="AspNetCoreModuleV2\ancm.mof" />
</ItemGroup> </ItemGroup>
<ZipArchive File="$(AncmZipOutputPath)" <ZipArchive File="$(AncmZipOutputPath)"

6
build/testsite.props
View File

@ -30,15 +30,15 @@
<ItemGroup Condition="'$(OS)' == 'Windows_NT'"> <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcoreV2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcoreV2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<IISExpressArguments>/config:"$(IISExpressAppHostConfig)"</IISExpressArguments> <IISExpressArguments>/config:"$(IISExpressAppHostConfig)"</IISExpressArguments>
<IISArguments>-h "$(IISAppHostConfig)"</IISArguments> <IISArguments>-h "$(IISAppHostConfig)"</IISArguments>
<AncmPath>$(NativePlatform)\aspnetcoreV2.dll</AncmPath> <AncmPath>$(NativePlatform)\aspnetcore.dll</AncmPath>
<AncmRHPath>$(NativePlatform)\aspnetcorerh.dll</AncmRHPath> <AncmRHPath>$(NativePlatform)\aspnetcorerh.dll</AncmRHPath>
<DotNetPath>$(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe</DotNetPath> <DotNetPath>$(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe</DotNetPath>
</PropertyGroup> </PropertyGroup>

12
nuget/AspNetCore.nuspec
View File

@ -19,12 +19,12 @@
</contentFiles> </contentFiles>
</metadata> </metadata>
<files> <files>
<file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\Win32\aspnetcore.dll" target="contentFiles\any\any\x86\aspnetcore.dll" /> <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\Win32\aspnetcore.dll" target="contentFiles\any\any\AspNetCoreModuleV1\x86\aspnetcore.dll" />
<file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\x64\aspnetcore.dll" /> <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\AspNetCoreModuleV1\x64\aspnetcore.dll" />
<file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\Win32\aspnetcoreV2.dll" target="contentFiles\any\any\x86\aspnetcoreV2.dll" /> <file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\Win32\aspnetcore.dll" target="contentFiles\any\any\AspNetCoreModuleV2\x86\aspnetcore.dll" />
<file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\x64\aspnetcoreV2.dll" target="contentFiles\any\any\x64\aspnetcoreV2.dll" /> <file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\AspNetCoreModuleV2\x64\aspnetcore.dll" />
<file src="src\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\Win32\aspnetcorerh.dll" target="contentFiles\any\any\x86\aspnetcorerh.dll" /> <file src="src\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\Win32\aspnetcorerh.dll" target="contentFiles\any\any\AspNetCoreModuleV2\x86\aspnetcorerh.dll" />
<file src="src\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\x64\aspnetcorerh.dll" target="contentFiles\any\any\x64\aspnetcorerh.dll" /> <file src="src\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\x64\aspnetcorerh.dll" target="contentFiles\any\any\AspNetCoreModuleV2\x64\aspnetcorerh.dll" />
<file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\x64\*.xml"/> <file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\x64\*.xml"/>
<file src="tools\installancm.ps1"/> <file src="tools\installancm.ps1"/>
<file src="LICENSE.txt"/> <file src="LICENSE.txt"/>

11
src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
View File

@ -210,12 +210,6 @@
<AdditionalIncludeDirectories>..\Commonlib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\Commonlib</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\IISLib\IISLib.vcxproj">
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="ancm.mof" /> <None Include="ancm.mof" />
<None Include="Source.def" /> <None Include="Source.def" />
@ -272,6 +266,11 @@
<ClInclude Include="Inc\winhttphelper.h" /> <ClInclude Include="Inc\winhttphelper.h" />
<ClInclude Include="src\precomp.hxx" /> <ClInclude Include="src\precomp.hxx" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IISLib\IISLib.vcxproj">
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\..\build\native.targets" /> <Import Project="..\..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

225
src/AspNetCoreModuleV1/AspNetCore/Debug/AspNetCore.log
View File

@ -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 ';'

BIN
src/AspNetCoreModuleV1/AspNetCore/Debug/RCa19324
View File

Binary file not shown.

BIN
src/AspNetCoreModuleV1/AspNetCore/Debug/RCa25980
View File

Binary file not shown.

1
src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
View File

@ -1,4 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.

622
src/AspNetCoreModuleV1/AspNetCore/src/applicationinfo.cpp
View File

@ -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<APPLICATION*>(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);
}
}
}

248
src/AspNetCoreModuleV1/AspNetCore/src/dllmain.cpp
View File

@ -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 <IPHlpApi.h>
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;
}

13
src/AspNetCoreModuleV1/AspNetCore/version.h
View File

@ -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"

13
src/AspNetCoreModuleV1/IISLib/Debug/IISLib.log
View File

@ -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

13
src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
View File

@ -68,7 +68,18 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>

5
src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
View File

@ -24,7 +24,7 @@
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>AspNetCoreModule</RootNamespace> <RootNamespace>AspNetCoreModule</RootNamespace>
<ProjectName>AspNetCore</ProjectName> <ProjectName>AspNetCore</ProjectName>
<TargetName>aspnetcoreV2</TargetName> <TargetName>aspnetcore</TargetName>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
@ -232,8 +232,7 @@
<Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project> <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\IISLib\IISLib.vcxproj"> <ProjectReference Include="..\IISLib\IISLib.vcxproj">
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project> <Project>{09d9d1d6-2951-4e14-bc35-76a23cf9391a}</Project>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

BIN
src/AspNetCoreModuleV2/AspNetCore/Debug/aspnetcoremodule.res
View File

Binary file not shown.

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

@ -81,7 +81,7 @@ BEGIN
VALUE "FileVersion", FileVersionStr VALUE "FileVersion", FileVersionStr
VALUE "InternalName", "aspnetcore" VALUE "InternalName", "aspnetcore"
VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
VALUE "OriginalFilename", "aspnetcoreV2.dll" VALUE "OriginalFilename", "aspnetcore.dll"
VALUE "ProductName", "ASP.NET Core Module" VALUE "ProductName", "ASP.NET Core Module"
VALUE "ProductVersion", ProductVersionStr VALUE "ProductVersion", ProductVersionStr
END END

13
src/AspNetCoreModuleV2/AspNetCore/version.h
View File

@ -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"

BIN
src/AspNetCoreModuleV2/CommonLib/Debug/CommonLib.pch
View File

Binary file not shown.

1
src/AspNetCoreModuleV2/IISLib/Debug/IISLib.log Normal file
View File

@ -0,0 +1 @@
 IISLib.vcxproj -> C:\Users\jukotali\code\IISIntegration\Debug\IISLib.lib

15
src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
View File

@ -23,7 +23,7 @@
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>IISLib</RootNamespace> <RootNamespace>IISLib</RootNamespace>
<ProjectName>IISLib</ProjectName> <ProjectName>IISLib</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -68,7 +68,18 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>

BIN
src/AspNetCoreModuleV2/RequestHandler/Debug/requesthandler.res
View File

Binary file not shown.

2
src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx
View File

@ -160,7 +160,7 @@ EnsureOutOfProcessInitializtion()
g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll")); g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll"));
g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcoreV2.dll")); g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcore.dll"));
hr = WINHTTP_HELPER::StaticInitialize(); hr = WINHTTP_HELPER::StaticInitialize();
if (FAILED(hr)) if (FAILED(hr))

13
src/AspNetCoreModuleV2/RequestHandler/version.h
View File

@ -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"

14
test/CommonLibTests/CommonLibTests.vcxproj
View File

@ -47,11 +47,11 @@
<ClCompile Include="utility_tests.cpp" /> <ClCompile Include="utility_tests.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\CommonLib\CommonLib.vcxproj"> <ProjectReference Include="..\..\src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj">
<Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project> <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\src\IISLib\IISLib.vcxproj"> <ProjectReference Include="..\..\src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj">
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project> <Project>{09d9d1d6-2951-4e14-bc35-76a23cf9391a}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\gtest-1.8.0\msvc\gtest.vcxproj"> <ProjectReference Include="..\gtest-1.8.0\msvc\gtest.vcxproj">
<Project>{2af210a9-5bdc-45e8-95dd-07b5a2616493}</Project> <Project>{2af210a9-5bdc-45e8-95dd-07b5a2616493}</Project>
@ -69,7 +69,7 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories>
<AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions> <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
@ -91,7 +91,7 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories>
<AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions> <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
@ -111,7 +111,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories>
<AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions> <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
@ -133,7 +133,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\IISLib;..\..\src\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include</AdditionalIncludeDirectories>
<AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions> <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>

2
tools/update_schema.ps1
View File

@ -9,7 +9,7 @@ param()
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
Set-StrictMode -Version 1 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") [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")
if (-not $isAdmin -and -not $WhatIfPreference) { if (-not $isAdmin -and -not $WhatIfPreference) {