Fix IISIntegration folder structure (#6063)

eng/ProjectReferences.props

@@ -37,7 +37,7 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />

src/Servers/IIS/.gitignore

@@ -45,17 +45,12 @@ x64/
 *.pdb
 *.lib
 *.idb
-src/*/AspNetCore/aspnetcoremodule.h
-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
+AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.h
+AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h
+AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc
+AspNetCoreModuleV1/AspNetCore/version.h
 test/*/Debug
 test/*/Release
-test/gtest-1.8.0/msvc/Debug
-test/gtest-1.8.0/msvc/Release
 .build
 *.VC.*db
 global.json

src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\Build\Build.Settings" />
+  <Import Project="..\..\build\Build.Settings" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -268,7 +268,7 @@
       <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" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj

@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" PackagePath="contentFiles/any/any/x86"/>
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86"/>
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64"/>
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64"/>
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath=""/>
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" PackagePath="contentFiles/any/any/x86"/>
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86"/>
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64"/>
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64"/>
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath=""/>
     <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props" PackagePath="build\" />
   </ItemGroup>
 

src/Servers/IIS/IISIntegration.sln

@@ -3,37 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		NuGet.Config = NuGet.Config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}"
 	ProjectSection(SolutionItems) = preProject
 		build\applicationhost.config = build\applicationhost.config
@@ -44,15 +13,38 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IISIntegration", "IISIntegration", "{DFD791BE-650D-4D28-B433-0F7F3396E504}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{07A39A11-7E87-48E5-8BFB-CC525DC3E338}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2130E0FD-A21F-47E9-8207-06B6A122CB4A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{996147E5-A4D4-40B8-A5B9-18E1B0F6A432}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{0C044E38-3640-4F91-8A62-3F54DC7E7F34}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "IISIntegration\samples\IISSample\IISSample.csproj", "{CDE1208E-198D-4E07-80C8-AB1E0B662A60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "IISIntegration\test\FunctionalTests\IISIntegration.FunctionalTests.csproj", "{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "IISIntegration\test\Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{E27133AD-4B60-4EC9-9DE9-56762ADA16D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "IISIntegration\test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{80BFE548-9DFF-49C4-94A7-1754C3D4C339}"
+	ProjectSection(SolutionItems) = preProject
+		tools\SetupTestEnvironment.ps1 = tools\SetupTestEnvironment.ps1
+		tools\update_schema.ps1 = tools\update_schema.ps1
+		tools\UpdateIISExpressCertificate.ps1 = tools\UpdateIISExpressCertificate.ps1
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,74 +56,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU
-		{4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.ActiveCfg = Debug|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.Build.0 = Debug|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.ActiveCfg = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.Build.0 = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.ActiveCfg = Release|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.ActiveCfg = Release|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.Build.0 = Release|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.ActiveCfg = Release|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.Build.0 = Release|x86
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.Build.0 = Release|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.ActiveCfg = Release|Any CPU
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.Build.0 = Release|Any CPU
-		{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
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Debug|x64
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64
@@ -142,20 +66,90 @@ Global
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.ActiveCfg = Release|Win32
 		{439824F9-1455-4CC4-BD79-B44FA0A16552}.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
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x64.Build.0 = Release|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x86.Build.0 = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x86.Build.0 = Debug|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x64.Build.0 = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x86.Build.0 = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x86.Build.0 = Debug|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x64.Build.0 = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x86.Build.0 = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x64.Build.0 = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x86.Build.0 = Release|Any CPU
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x64.ActiveCfg = Debug|x64
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x64.Build.0 = Debug|x64
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x86.ActiveCfg = Debug|x86
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x86.Build.0 = Debug|x86
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|Any CPU.ActiveCfg = Release|x86
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x64.ActiveCfg = Release|x64
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x64.Build.0 = Release|x64
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x86.ActiveCfg = Release|x86
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{F54715C3-88D8-49E3-A291-C13570FE81FC} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {16E521CE-77F1-4B1C-A183-520A41C4F372}
-		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {16E521CE-77F1-4B1C-A183-520A41C4F372}
+		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824}
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824}
+		{07A39A11-7E87-48E5-8BFB-CC525DC3E338} = {DFD791BE-650D-4D28-B433-0F7F3396E504}
+		{2130E0FD-A21F-47E9-8207-06B6A122CB4A} = {DFD791BE-650D-4D28-B433-0F7F3396E504}
+		{996147E5-A4D4-40B8-A5B9-18E1B0F6A432} = {DFD791BE-650D-4D28-B433-0F7F3396E504}
+		{0C044E38-3640-4F91-8A62-3F54DC7E7F34} = {2130E0FD-A21F-47E9-8207-06B6A122CB4A}
+		{CDE1208E-198D-4E07-80C8-AB1E0B662A60} = {07A39A11-7E87-48E5-8BFB-CC525DC3E338}
+		{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432}
+		{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432}
+		{E27133AD-4B60-4EC9-9DE9-56762ADA16D7} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432}
+		{3BFEF549-2F58-4449-A9FF-DAB1206C07BC} = {E27133AD-4B60-4EC9-9DE9-56762ADA16D7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}

src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj

@@ -15,10 +15,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(VCTargetsPath)' != ''">
-    <ProjectReference Include="..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" SetPlatform="Platform=x64">
+    <ProjectReference Include="..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" SetPlatform="Platform=x64">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" SetPlatform="Platform=x86">
+    <ProjectReference Include="..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" SetPlatform="Platform=x86">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>