diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 02082f03bd..fff712994e 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -14,7 +14,7 @@ jobs: jobDisplayName: "Build and test: Windows" agentOs: Windows beforeBuild: - - powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1" + - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema - template: jobs/iisintegration-job.yml parameters: @@ -44,3 +44,4 @@ jobs: SkipIISExpressTests: true SkipIISForwardsCompatibilityTests: true SkipIISBackwardsCompatibilityTests: false + diff --git a/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml index 01ce2d0ebe..7d43e744f3 100644 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ b/.azure/pipelines/jobs/iisintegration-job.yml @@ -2,10 +2,10 @@ jobs: - template: default-build.yml parameters: beforeBuild: - - powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1; & ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Setup" + - powershell: "& ./src/servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/servers/IIS/tools/update_schema.ps1; & ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo afterBuild: - - powershell: "& ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Shutdown" + - powershell: "& ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown" displayName: Stop AppVerifier condition: always() - task: PublishBuildArtifacts@1 @@ -15,7 +15,7 @@ jobs: artifactName: logs artifactType: Container pathtoPublish: src/IISIntegration/artifacts/logs - buildDirectory: src/IISIntegration + buildDirectory: src/servers/IIS buildArgs: "/p:SkipIISBackwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }} /p:SkipIISTests=${{ parameters.SkipIISTests }} /p:SkipIISExpressTests=${{ parameters.SkipIISExpressTests }} /p:SkipIISForwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }}" jobName: IISIntegration_${{ parameters.TestGroupName }} jobDisplayName: IISIntegration_${{ parameters.TestGroupName }} diff --git a/.gitignore b/.gitignore index e42d7a17a5..800f7cf6da 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ scripts/tmp/ src/**/global.json launchSettings.json korebuild-lock.txt +.gradle/ diff --git a/build/artifacts.props b/build/artifacts.props index 001be27275..14ebbfd29c 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -126,6 +126,7 @@ + diff --git a/build/buildorder.props b/build/buildorder.props index 21999af70f..2338a88d73 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -9,7 +9,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 6e7291eae4..7ae5853c6c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -137,6 +137,8 @@ 1.10.0 1.7.3.4 2.1.1 + 2.2.0 + 2.2.0 2.2.1 5.2.6 1.7.1 diff --git a/build/repo.props b/build/repo.props index f96466ea7b..964b440da0 100644 --- a/build/repo.props +++ b/build/repo.props @@ -78,7 +78,8 @@ $(RepositoryRoot)src\Hosting\**\*.*proj; $(RepositoryRoot)src\Http\**\*.*proj; $(RepositoryRoot)src\Html\**\*.*proj; - $(RepositoryRoot)src\Servers\**\*.*proj; + $(RepositoryRoot)src\Servers\**\*.csproj; + $(RepositoryRoot)src\Servers\**\*.pkgproj; $(RepositoryRoot)src\Tools\**\*.*proj; $(RepositoryRoot)src\Middleware\**\*.*proj; " diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 8f5460b224..7e9891d457 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -421,6 +421,36 @@ + + + 2.2.0 + + + + + + + + + + + + + + + + + + + 2.2.0 + + + + + + + + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 97364fe67c..ba526a19e6 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -46,6 +46,8 @@ + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 1c132cfb36..56e79bbe40 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -38,6 +38,7 @@ + @@ -50,15 +51,22 @@ + + + - + + + + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index c02c9991e9..230f8a5417 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -17,6 +17,7 @@ + @@ -33,6 +34,8 @@ + + diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props index b6cc8ff0a3..ae186fbe66 100644 --- a/eng/dependencies.temp.props +++ b/eng/dependencies.temp.props @@ -4,6 +4,5 @@ This is required to provide dependencies for samples and tests. --> - diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets index f2cad0d8c0..3c347a4578 100644 --- a/eng/targets/Cpp.Common.targets +++ b/eng/targets/Cpp.Common.targets @@ -3,4 +3,7 @@ + + + diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props deleted file mode 100644 index 9b394c5bd7..0000000000 --- a/src/IISIntegration/Directory.Build.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - false - true - - false - - - diff --git a/src/IISIntegration/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln deleted file mode 100644 index 3cce79cd36..0000000000 --- a/src/IISIntegration/IISIntegration.sln +++ /dev/null @@ -1,739 +0,0 @@ - -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 - .appveyor.yml = .appveyor.yml - .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}" - ProjectSection(ProjectDependencies) = postProject - {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} - EndProjectSection -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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}" - ProjectSection(SolutionItems) = preProject - build\applicationhost.config = build\applicationhost.config - build\applicationhost.iis.config = build\applicationhost.iis.config - build\build.msbuild = build\build.msbuild - build\Build.Settings = build\Build.Settings - build\Config.Definitions.Props = build\Config.Definitions.Props - build\dependencies.props = build\dependencies.props - build\native.targets = build\native.targets - build\repo.props = build\repo.props - build\repo.targets = build\repo.targets - build\testsite.props = build\testsite.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" - ProjectSection(ProjectDependencies) = postProject - {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\WebSites\InProcessWebSite\InProcessWebSite.csproj", "{679FA2A2-898B-4320-884E-C2D294A97CE1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" - ProjectSection(ProjectDependencies) = postProject - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} - {55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85} - {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\WebSites\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}" - ProjectSection(ProjectDependencies) = postProject - {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks\TestTasks.csproj", "{064D860B-4D7C-4B1D-918F-E020F1B99E2A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{06CA2C2B-83B0-4D83-905A-E0C74790009E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" - ProjectSection(ProjectDependencies) = postProject - {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" - ProjectSection(ProjectDependencies) = postProject - {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{CE4FB142-91FB-4B34-BC96-A31120EF4009}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{A091777D-66B3-42E1-B95C-85322DE40706}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{28055B05-25D4-4F17-9F36-A1D09FDDA607}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessForwardsCompatWebSite", "test\WebSites\InProcessForwardsCompatWebSite\InProcessWebSite.csproj", "{980DAB60-6471-46EC-82EE-B457D91C3789}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - NativeDebug|Any CPU = NativeDebug|Any CPU - NativeDebug|x64 = NativeDebug|x64 - NativeDebug|x86 = NativeDebug|x86 - NativeRelease|Any CPU = NativeRelease|Any CPU - NativeRelease|x64 = NativeRelease|x64 - NativeRelease|x86 = NativeRelease|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - 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}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|x86.ActiveCfg = Release|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}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|x86.ActiveCfg = Release|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}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|x86.ActiveCfg = Release|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 - {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}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|x86.ActiveCfg = Release|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 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.ActiveCfg = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.Build.0 = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.ActiveCfg = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.Build.0 = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.ActiveCfg = Debug|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.Build.0 = Debug|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|Any CPU.Build.0 = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|x64.ActiveCfg = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|x86.ActiveCfg = Debug|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|Any CPU.Build.0 = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|x64.ActiveCfg = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|x86.ActiveCfg = Release|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.ActiveCfg = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|Any CPU.Build.0 = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|x64.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|x86.ActiveCfg = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|Any CPU.Build.0 = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|x64.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|x86.ActiveCfg = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.Build.0 = Release|x86 - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|Any CPU.Build.0 = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|x64.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|x86.ActiveCfg = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|Any CPU.Build.0 = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|x64.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|x86.ActiveCfg = Release|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.Build.0 = Release|x86 - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x64.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x64.Build.0 = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.Build.0 = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.Build.0 = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU - {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU - {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}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x64.ActiveCfg = Debug|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x64.Build.0 = Debug|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x86.Build.0 = Debug|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x64.ActiveCfg = Release|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x64.Build.0 = Release|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x86.ActiveCfg = Release|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x86.Build.0 = Release|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 - {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}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x64.ActiveCfg = Debug|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x64.Build.0 = Debug|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x86.Build.0 = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x64.ActiveCfg = Release|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x64.Build.0 = Release|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x86.ActiveCfg = Release|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x86.Build.0 = Release|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 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.ActiveCfg = Debug|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.Build.0 = Debug|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x64.ActiveCfg = Debug|x64 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x64.Build.0 = Debug|x64 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x86.Build.0 = Debug|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x64.ActiveCfg = Release|x64 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x64.Build.0 = Release|x64 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x86.ActiveCfg = Release|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x86.Build.0 = Release|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32 - {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64 - {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 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x64.ActiveCfg = Debug|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x64.Build.0 = Debug|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x86.Build.0 = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x64.ActiveCfg = Release|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x64.Build.0 = Release|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x86.ActiveCfg = Release|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x86.Build.0 = Release|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Build.0 = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x64.ActiveCfg = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x64.Build.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x86.Build.0 = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x64.ActiveCfg = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x64.Build.0 = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x86.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x86.Build.0 = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Build.0 = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.ActiveCfg = Debug|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x64.ActiveCfg = Debug|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x64.Build.0 = Debug|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x86.Build.0 = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x64.ActiveCfg = Release|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x64.Build.0 = Release|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x86.ActiveCfg = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x86.Build.0 = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|Any CPU.Build.0 = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|x64.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|x86.ActiveCfg = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|Any CPU.Build.0 = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|x64.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|x86.ActiveCfg = Release|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86 - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x64.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x64.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x86.Build.0 = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x64.ActiveCfg = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x64.Build.0 = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x86.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x86.Build.0 = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x64.ActiveCfg = Debug|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x64.Build.0 = Debug|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x86.Build.0 = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x64.ActiveCfg = Release|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x64.Build.0 = Release|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x86.ActiveCfg = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x86.Build.0 = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x64.ActiveCfg = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x64.Build.0 = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x86.Build.0 = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x64.ActiveCfg = Release|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x64.Build.0 = Release|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x86.ActiveCfg = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x86.Build.0 = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x64.ActiveCfg = Debug|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x64.Build.0 = Debug|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x86.ActiveCfg = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x86.Build.0 = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x64.ActiveCfg = Release|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x64.Build.0 = Release|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x86.ActiveCfg = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x86.Build.0 = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.Build.0 = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.Build.0 = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.Build.0 = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.ActiveCfg = Release|Any CPU - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.Build.0 = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x64.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x64.Build.0 = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.Build.0 = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.Build.0 = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.Build.0 = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.ActiveCfg = Release|Any CPU - {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.Build.0 = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x64.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x64.Build.0 = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.Build.0 = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.Build.0 = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x64.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x64.Build.0 = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x86.ActiveCfg = Release|Any CPU - {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x86.Build.0 = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x64.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x64.Build.0 = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.Build.0 = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.Build.0 = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.Build.0 = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.ActiveCfg = Release|Any CPU - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.Build.0 = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.Build.0 = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.Build.0 = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.Build.0 = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.Build.0 = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.ActiveCfg = Release|Any CPU - {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.Build.0 = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Debug|x64.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Debug|x86.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeDebug|x64.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeDebug|x86.ActiveCfg = Debug|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeRelease|Any CPU.Build.0 = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeRelease|x64.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.NativeRelease|x86.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|Any CPU.Build.0 = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|x64.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|x64.Build.0 = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|x86.ActiveCfg = Release|Any CPU - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F}.Release|x86.Build.0 = Release|Any CPU - {980DAB60-6471-46EC-82EE-B457D91C3789}.Debug|Any CPU.ActiveCfg = Debug|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Debug|x64.ActiveCfg = Debug|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Debug|x64.Build.0 = Debug|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Debug|x86.ActiveCfg = Debug|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Debug|x86.Build.0 = Debug|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeDebug|Any CPU.ActiveCfg = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeDebug|Any CPU.Build.0 = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeDebug|x64.ActiveCfg = Debug|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeDebug|x86.ActiveCfg = Debug|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeRelease|Any CPU.Build.0 = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeRelease|x64.ActiveCfg = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.NativeRelease|x86.ActiveCfg = Release|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Release|Any CPU.ActiveCfg = Release|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Release|x64.ActiveCfg = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Release|x64.Build.0 = Release|x64 - {980DAB60-6471-46EC-82EE-B457D91C3789}.Release|x86.ActiveCfg = Release|x86 - {980DAB60-6471-46EC-82EE-B457D91C3789}.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} - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} - {679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} - {46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} - {064D860B-4D7C-4B1D-918F-E020F1B99E2A} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {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} - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} - {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {A091777D-66B3-42E1-B95C-85322DE40706} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {A641A208-2974-4E48-BCFF-54E3AAFA4FB9} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {28055B05-25D4-4F17-9F36-A1D09FDDA607} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {F6FAA65F-AA29-4DDA-AA89-C16AF4A69F9F} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {980DAB60-6471-46EC-82EE-B457D91C3789} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} - EndGlobalSection -EndGlobal diff --git a/src/IISIntegration/build.cmd b/src/IISIntegration/build.cmd deleted file mode 100644 index f4169ea5e4..0000000000 --- a/src/IISIntegration/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* diff --git a/src/IISIntegration/build.sh b/src/IISIntegration/build.sh deleted file mode 100755 index d5bb0cf631..0000000000 --- a/src/IISIntegration/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -repo_root="$DIR/../.." -"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@" diff --git a/src/IISIntegration/build/build.msbuild b/src/IISIntegration/build/build.msbuild deleted file mode 100644 index 117ed59bec..0000000000 --- a/src/IISIntegration/build/build.msbuild +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/build/buildpipeline/pipeline.groovy b/src/IISIntegration/build/buildpipeline/pipeline.groovy deleted file mode 100644 index 13fd8d9add..0000000000 --- a/src/IISIntegration/build/buildpipeline/pipeline.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') - -def configurations = [ - 'Debug', - 'Release' -] - -configurations.each { configuration -> - - def params = [ - 'Configuration': configuration - ] - - windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) - windowsPipeline.triggerPipelineOnGithubPush(params) -} diff --git a/src/IISIntegration/build/buildpipeline/windows-appverif.groovy b/src/IISIntegration/build/buildpipeline/windows-appverif.groovy deleted file mode 100644 index 0c1a6affe8..0000000000 --- a/src/IISIntegration/build/buildpipeline/windows-appverif.groovy +++ /dev/null @@ -1,15 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - bat 'git submodule update --init --recursive' - } - stage ('Build') { - def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 Setup;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" - } -} diff --git a/src/IISIntegration/build/buildpipeline/windows.groovy b/src/IISIntegration/build/buildpipeline/windows.groovy deleted file mode 100644 index c482e84079..0000000000 --- a/src/IISIntegration/build/buildpipeline/windows.groovy +++ /dev/null @@ -1,15 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - bat 'git submodule update --init --recursive' - } - stage ('Build') { - def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" - } -} diff --git a/src/IISIntegration/build/launchSettings.json b/src/IISIntegration/build/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/build/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/dependencies.overrides.props b/src/IISIntegration/dependencies.overrides.props deleted file mode 100644 index 5fb926e6f8..0000000000 --- a/src/IISIntegration/dependencies.overrides.props +++ /dev/null @@ -1,20 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - 2.2.0-preview3-35497 - 2.2.0-preview3-35497 - 2.2.0-preview3-35497 - - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 - 4.5.2 - 4.5.0 - - - - diff --git a/src/IISIntegration/korebuild.json b/src/IISIntegration/korebuild.json deleted file mode 100644 index 2624779e51..0000000000 --- a/src/IISIntegration/korebuild.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", - "channel": "release/2.2", - "toolsets": { - "visualstudio": { - "required": ["Windows"], - "includePrerelease": true, - "minVersion": "15.0.26730.03", - "requiredWorkloads": [ - "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", - "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop" - ] - } - } - } diff --git a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec deleted file mode 100644 index f05fcbbdd8..0000000000 --- a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec +++ /dev/null @@ -1,33 +0,0 @@ - - - - Microsoft.AspNetCore.AspNetCoreModule - Microsoft ASP.NET Core Module - $VERSION$ - Microsoft - Microsoft - https://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm - © .NET Foundation. All rights reserved. - https://www.asp.net/ - https://go.microsoft.com/fwlink/?LinkID=288859 - true - ASP.NET Core Module - en-US - Microsoft.AspNetCore.AspNetCoreModule - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec deleted file mode 100644 index bc33d6121c..0000000000 --- a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec +++ /dev/null @@ -1,44 +0,0 @@ - - - - Microsoft.AspNetCore.AspNetCoreModuleV2 - Microsoft ASP.NET Core Module - $VERSION$ - Microsoft - Microsoft - https://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm - © .NET Foundation. All rights reserved. - https://www.asp.net/ - https://go.microsoft.com/fwlink/?LinkID=288859 - true - ASP.NET Core Module - en-US - Microsoft.AspNetCore.AspNetCoreModule - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/samples/IISSample/IISSample.csproj b/src/IISIntegration/samples/IISSample/IISSample.csproj deleted file mode 100644 index 556945519e..0000000000 --- a/src/IISIntegration/samples/IISSample/IISSample.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - diff --git a/src/IISIntegration/samples/IISSample/Properties/launchSettings.json b/src/IISIntegration/samples/IISSample/Properties/launchSettings.json deleted file mode 100644 index 009aa9ab89..0000000000 --- a/src/IISIntegration/samples/IISSample/Properties/launchSettings.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:25334/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "IISSample": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj deleted file mode 100644 index 5fcf5c96a8..0000000000 --- a/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - netcoreapp2.2 - true - - - - - - - - - - - - - - - inprocess - - diff --git a/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json b/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/src/Directory.Build.props b/src/IISIntegration/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/IISIntegration/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj deleted file mode 100644 index ac22e5fe84..0000000000 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - netstandard2.0 - Microsoft.AspNetCore.Server.IIS - Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. - $(NoWarn);CS1591 - true - aspnetcore;iis - true - true - netcoreapp2.2 - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj deleted file mode 100644 index faae91cdbf..0000000000 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - ASP.NET Core components for working with the IIS AspNetCoreModule. - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;iis - true - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/Common.Tests/Common.Tests.csproj b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj deleted file mode 100644 index ede80732ee..0000000000 --- a/src/IISIntegration/test/Common.Tests/Common.Tests.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netcoreapp2.2 - false - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/Directory.Build.props b/src/IISIntegration/test/Directory.Build.props deleted file mode 100644 index edfd666254..0000000000 --- a/src/IISIntegration/test/Directory.Build.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - $(StandardTestTfms) - $(StandardTestTfms);net461 - - - - - - diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj deleted file mode 100644 index c819a03ab1..0000000000 --- a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - netcoreapp2.2 - IISBackwardsCompatibility.FunctionalTests - True - - - - - - - - - - - False - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj deleted file mode 100644 index 929f6ec6b0..0000000000 --- a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - netcoreapp2.2 - IISForwardsCompatibility.FunctionalTests - True - - - - - - - - - - False - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj deleted file mode 100644 index 62dec62e60..0000000000 --- a/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - netcoreapp2.2 - IIS.FunctionalTests - True - - - - - - - - - - - False - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj deleted file mode 100644 index 3fdb2a5363..0000000000 --- a/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - netcoreapp2.2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj deleted file mode 100644 index 988c2d5943..0000000000 --- a/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - netcoreapp2.2 - True - - - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs deleted file mode 100644 index 772fbde2c3..0000000000 --- a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.TestHost; -using Microsoft.Extensions.DependencyInjection; -using Xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration -{ - public class IISExtensionTests - { - [Fact] - public void CallingUseIISIntegrationMultipleTimesWorks() - { - - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .UseIISIntegration() - .Configure(app => { }); - var server = new TestServer(builder); - - var filters = server.Host.Services.GetServices() - .OfType(); - - Assert.Single(filters); - } - } -} diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs deleted file mode 100644 index 0898b7ae21..0000000000 --- a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs +++ /dev/null @@ -1,420 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Net; -using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Features.Authentication; -using Microsoft.AspNetCore.TestHost; -using Microsoft.Extensions.DependencyInjection; -using Xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration -{ - public class IISMiddlewareTests - { - [Fact] - public async Task MiddlewareSkippedIfTokenIsMissing() - { - var assertsExecuted = false; - - var builder = new WebHostBuilder() - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - app.Run(context => - { - var auth = context.Features.Get(); - Assert.Null(auth); - assertsExecuted = true; - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var req = new HttpRequestMessage(HttpMethod.Get, ""); - req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - var response = await server.CreateClient().SendAsync(req); - Assert.True(assertsExecuted); - response.EnsureSuccessStatusCode(); - } - - [Fact] - public async Task MiddlewareRejectsRequestIfTokenHeaderIsMissing() - { - var assertsExecuted = false; - - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - app.Run(context => - { - var auth = context.Features.Get(); - Assert.Null(auth); - assertsExecuted = true; - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var req = new HttpRequestMessage(HttpMethod.Get, ""); - var response = await server.CreateClient().SendAsync(req); - Assert.False(assertsExecuted); - Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); - } - - [Theory] - [InlineData("/", "/iisintegration", "shutdown")] - [InlineData("/", "/iisintegration", "Shutdown")] - [InlineData("/pathBase", "/pathBase/iisintegration", "shutdown")] - [InlineData("/pathBase", "/pathBase/iisintegration", "Shutdown")] - public async Task MiddlewareShutsdownGivenANCMShutdown(string pathBase, string requestPath, string shutdownEvent) - { - var requestExecuted = new ManualResetEvent(false); - var applicationStoppingFired = new ManualResetEvent(false); - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", pathBase) - .UseIISIntegration() - .Configure(app => - { - var appLifetime = app.ApplicationServices.GetRequiredService(); - appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); - - app.Run(context => - { - requestExecuted.Set(); - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var request = new HttpRequestMessage(HttpMethod.Post, requestPath); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); - var response = await server.CreateClient().SendAsync(request); - - Assert.True(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(5))); - Assert.False(requestExecuted.WaitOne(0)); - Assert.Equal(HttpStatusCode.Accepted, response.StatusCode); - } - - public static TheoryData InvalidShutdownMethods - { - get - { - return new TheoryData - { - HttpMethod.Put, - HttpMethod.Trace, - HttpMethod.Head, - HttpMethod.Get, - HttpMethod.Delete, - HttpMethod.Options - }; - } - } - - [Theory] - [MemberData(nameof(InvalidShutdownMethods))] - public async Task MiddlewareIgnoresShutdownGivenWrongMethod(HttpMethod method) - { - var requestExecuted = new ManualResetEvent(false); - var applicationStoppingFired = new ManualResetEvent(false); - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - var appLifetime = app.ApplicationServices.GetRequiredService(); - appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); - - app.Run(context => - { - requestExecuted.Set(); - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var request = new HttpRequestMessage(method, "/iisintegration"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); - var response = await server.CreateClient().SendAsync(request); - - Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); - Assert.True(requestExecuted.WaitOne(0)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Theory] - [InlineData("/")] - [InlineData("/path")] - [InlineData("/path/iisintegration")] - public async Task MiddlewareIgnoresShutdownGivenWrongPath(string path) - { - var requestExecuted = new ManualResetEvent(false); - var applicationStoppingFired = new ManualResetEvent(false); - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - var appLifetime = app.ApplicationServices.GetRequiredService(); - appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); - - app.Run(context => - { - requestExecuted.Set(); - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var request = new HttpRequestMessage(HttpMethod.Post, path); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); - var response = await server.CreateClient().SendAsync(request); - - Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); - Assert.True(requestExecuted.WaitOne(0)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Theory] - [InlineData("event")] - [InlineData("")] - [InlineData(null)] - public async Task MiddlewareIgnoresShutdownGivenWrongEvent(string shutdownEvent) - { - var requestExecuted = new ManualResetEvent(false); - var applicationStoppingFired = new ManualResetEvent(false); - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - var appLifetime = app.ApplicationServices.GetRequiredService(); - appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); - - app.Run(context => - { - requestExecuted.Set(); - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var request = new HttpRequestMessage(HttpMethod.Post, "/iisintegration"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); - var response = await server.CreateClient().SendAsync(request); - - Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); - Assert.True(requestExecuted.WaitOne(0)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - - [Fact] - public void UrlDelayRegisteredAndPreferHostingUrlsSet() - { - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - app.Run(context => Task.FromResult(0)); - }); - - Assert.Null(builder.GetSetting(WebHostDefaults.ServerUrlsKey)); - Assert.Null(builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); - - // Adds a server and calls Build() - var server = new TestServer(builder); - - Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); - Assert.Equal("true", builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); - } - - [Fact] - public void PathBaseHiddenFromServer() - { - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/pathBase") - .UseIISIntegration() - .Configure(app => - { - app.Run(context => Task.FromResult(0)); - }); - new TestServer(builder); - - Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); - } - - [Fact] - public async Task AddsUsePathBaseMiddlewareWhenPathBaseSpecified() - { - var requestPathBase = string.Empty; - var requestPath = string.Empty; - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/pathbase") - .UseIISIntegration() - .Configure(app => - { - app.Run(context => - { - requestPathBase = context.Request.PathBase.Value; - requestPath = context.Request.Path.Value; - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var request = new HttpRequestMessage(HttpMethod.Get, "/PathBase/Path"); - request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - var response = await server.CreateClient().SendAsync(request); - - Assert.Equal("/PathBase", requestPathBase); - Assert.Equal("/Path", requestPath); - } - - [Fact] - public async Task AddsAuthenticationHandlerByDefault() - { - var assertsExecuted = false; - - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .Configure(app => - { - app.Run(async context => - { - var auth = context.RequestServices.GetRequiredService(); - var windows = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); - Assert.NotNull(windows); - Assert.Null(windows.DisplayName); - Assert.Equal("Microsoft.AspNetCore.Server.IISIntegration.AuthenticationHandler", windows.HandlerType.FullName); - assertsExecuted = true; - }); - }); - var server = new TestServer(builder); - - var req = new HttpRequestMessage(HttpMethod.Get, ""); - req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - await server.CreateClient().SendAsync(req); - - Assert.True(assertsExecuted); - } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public async Task OnlyAddAuthenticationHandlerIfForwardWindowsAuthentication(bool forward) - { - var assertsExecuted = false; - - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .ConfigureServices(services => - { - services.Configure(options => - { - options.ForwardWindowsAuthentication = forward; - }); - }) - .Configure(app => - { - app.Run(async context => - { - var auth = context.RequestServices.GetService(); - Assert.NotNull(auth); - var windowsAuth = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); - if (forward) - { - Assert.NotNull(windowsAuth); - Assert.Null(windowsAuth.DisplayName); - Assert.Equal("AuthenticationHandler", windowsAuth.HandlerType.Name); - } - else - { - Assert.Null(windowsAuth); - } - assertsExecuted = true; - }); - }); - var server = new TestServer(builder); - - var req = new HttpRequestMessage(HttpMethod.Get, ""); - req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - await server.CreateClient().SendAsync(req); - - Assert.True(assertsExecuted); - } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public async Task DoesNotBlowUpWithoutAuth(bool forward) - { - var assertsExecuted = false; - - var builder = new WebHostBuilder() - .UseSetting("TOKEN", "TestToken") - .UseSetting("PORT", "12345") - .UseSetting("APPL_PATH", "/") - .UseIISIntegration() - .ConfigureServices(services => - { - services.Configure(options => - { - options.ForwardWindowsAuthentication = forward; - }); - }) - .Configure(app => - { - app.Run(context => - { - assertsExecuted = true; - return Task.FromResult(0); - }); - }); - var server = new TestServer(builder); - - var req = new HttpRequestMessage(HttpMethod.Get, ""); - req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); - await server.CreateClient().SendAsync(req); - - Assert.True(assertsExecuted); - } - } -} diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj deleted file mode 100644 index ea19c2a1fc..0000000000 --- a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/WebSites/Directory.Build.props b/src/IISIntegration/test/WebSites/Directory.Build.props deleted file mode 100644 index 9b29d34f16..0000000000 --- a/src/IISIntegration/test/WebSites/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj deleted file mode 100644 index e08c2be69f..0000000000 --- a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - netcoreapp2.2 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj deleted file mode 100644 index d007d2daa1..0000000000 --- a/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - netcoreapp2.2 - true - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj deleted file mode 100644 index 14beb7394e..0000000000 --- a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs deleted file mode 100644 index 90895237d2..0000000000 --- a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Linq; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Logging; - -namespace TestSite -{ - public static class Program - { - public static int Main(string[] args) - { - var mode = args.FirstOrDefault(); - switch (mode) - { - case "CreateFile": - File.WriteAllText(args[1], ""); - return StartServer(); - } - - return StartServer(); - } - - private static int StartServer() - { - var host = new WebHostBuilder() - .ConfigureLogging( - (_, factory) => { - factory.AddConsole(); - factory.AddFilter("Console", level => level >= LogLevel.Information); - }) - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .UseKestrel() - .Build(); - - host.Run(); - return 0; - } - } -} - diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs deleted file mode 100644 index e8e5392c2c..0000000000 --- a/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Logging; - -namespace ANCMStressTestApp -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .ConfigureLogging((_, factory) => - { - factory.AddConsole(); - }) - .UseKestrel() - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json deleted file mode 100644 index 246b7a0b47..0000000000 --- a/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj deleted file mode 100644 index 25ae032221..0000000000 --- a/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(StandardTestTfms) - true - - - - - - - - - - - - - - - - - - diff --git a/src/IISIntegration/test/gtest/googletest b/src/IISIntegration/test/gtest/googletest deleted file mode 160000 index 4e4df226fc..0000000000 --- a/src/IISIntegration/test/gtest/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 diff --git a/src/Middleware/CORS/test/FunctionalTests/package-lock.json b/src/Middleware/CORS/test/FunctionalTests/package-lock.json index 274ad4731c..3db2468bdf 100644 --- a/src/Middleware/CORS/test/FunctionalTests/package-lock.json +++ b/src/Middleware/CORS/test/FunctionalTests/package-lock.json @@ -1682,23 +1682,21 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1711,20 +1709,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1765,7 +1760,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -1780,14 +1775,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -1796,12 +1791,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -1816,7 +1811,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -1825,7 +1820,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -1834,15 +1829,14 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1854,9 +1848,8 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -1869,25 +1862,22 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -1896,14 +1886,13 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -1920,9 +1909,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -1931,16 +1920,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -1949,8 +1938,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -1965,8 +1954,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -1975,17 +1964,16 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -1997,9 +1985,8 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -2020,8 +2007,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -2042,10 +2029,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -2062,13 +2049,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -2077,7 +2064,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -2119,11 +2106,10 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -2132,7 +2118,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -2140,7 +2126,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -2155,13 +2141,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -2176,7 +2162,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { diff --git a/src/ServerTests/test/aspnetcore_schema_v2.xml b/src/ServerTests/test/aspnetcore_schema_v2.xml index d65be07195..06ff983c32 100644 --- a/src/ServerTests/test/aspnetcore_schema_v2.xml +++ b/src/ServerTests/test/aspnetcore_schema_v2.xml @@ -1,11 +1,11 @@ diff --git a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs index b3ae85687a..47b02a3092 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys } } - private async Task SendRequestAsync(string uri, + private async Task SendRequestAsync(string uri, X509Certificate cert = null) { var handler = new WinHttpHandler(); diff --git a/src/IISIntegration/.gitignore b/src/Servers/IIS/.gitignore similarity index 98% rename from src/IISIntegration/.gitignore rename to src/Servers/IIS/.gitignore index c18e14397c..b5d62b3329 100644 --- a/src/IISIntegration/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -32,7 +32,6 @@ project.lock.json *.bin *.vs/ .testPublish/ - *.obj *.tlog *.CppClean.log @@ -44,7 +43,6 @@ src/*/*/x64/Debug/ src/*/*/Release/ src/*/*/x64/Release/ x64/ - *vcxproj.filters *.aps *.pdb @@ -63,7 +61,6 @@ src/*/CommonLib/aspnetcore_msg.rc test/*/Debug test/*/Release .build - *.VC.*db global.json -msbuild.binlog +msbuild.binlog \ No newline at end of file diff --git a/src/IISIntegration/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln similarity index 100% rename from src/IISIntegration/IISIntegration.NoV1.sln rename to src/Servers/IIS/IISIntegration.NoV1.sln diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln new file mode 100644 index 0000000000..4627298e8b --- /dev/null +++ b/src/Servers/IIS/IISIntegration.sln @@ -0,0 +1,373 @@ + +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}") = "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 + build\applicationhost.iis.config = build\applicationhost.iis.config + build\dependencies.props = build\dependencies.props + build\native.targets = build\native.targets + build\repo.props = build\repo.props + build\testsite.props = build\testsite.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{FF5339B2-071F-4881-B15B-F91BD1A01153}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{5180EB73-1100-4DBE-9563-94B0C183B0CA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{F47351C2-66E7-478D-A728-05A33768830A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{73552B7B-BFBB-457D-B718-E0BF5C631358}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{302F6BB2-AFEF-4A75-8B51-4A068607430E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{BB265F11-FB3F-45C6-A197-7F0468568C82}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{A112C374-B4CD-41CC-8D45-87E4357B7E22}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{7E5185FD-58B6-4F31-8600-00BDC0AFB514}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + 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 + {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 + {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 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.ActiveCfg = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.Build.0 = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64 + {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 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|Any CPU.ActiveCfg = Debug|x86 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x64.ActiveCfg = Debug|x64 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x64.Build.0 = Debug|x64 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x86.ActiveCfg = Debug|x86 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x86.Build.0 = Debug|x86 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|Any CPU.ActiveCfg = Release|x86 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x64.ActiveCfg = Release|x64 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x64.Build.0 = Release|x64 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x86.ActiveCfg = Release|x86 + {FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x86.Build.0 = Release|x86 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Build.0 = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Build.0 = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.ActiveCfg = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|x64.ActiveCfg = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|x64.Build.0 = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|x86.ActiveCfg = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Debug|x86.Build.0 = Debug|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|Any CPU.Build.0 = Release|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|x64.ActiveCfg = Release|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|x64.Build.0 = Release|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|x86.ActiveCfg = Release|Any CPU + {F47351C2-66E7-478D-A728-05A33768830A}.Release|x86.Build.0 = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x64.ActiveCfg = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x64.Build.0 = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x86.ActiveCfg = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x86.Build.0 = Debug|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|Any CPU.Build.0 = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x64.ActiveCfg = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x64.Build.0 = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x86.ActiveCfg = Release|Any CPU + {73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x86.Build.0 = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x64.ActiveCfg = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x64.Build.0 = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x86.Build.0 = Debug|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|Any CPU.Build.0 = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x64.ActiveCfg = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x64.Build.0 = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x86.ActiveCfg = Release|Any CPU + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x86.Build.0 = Release|Any CPU + {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 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x64.ActiveCfg = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x64.Build.0 = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x86.ActiveCfg = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x86.Build.0 = Debug|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|Any CPU.Build.0 = Release|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x64.ActiveCfg = Release|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x64.Build.0 = Release|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x86.ActiveCfg = Release|Any CPU + {302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x86.Build.0 = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x64.ActiveCfg = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x64.Build.0 = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x86.ActiveCfg = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x86.Build.0 = Debug|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|Any CPU.Build.0 = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x64.ActiveCfg = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x64.Build.0 = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x86.ActiveCfg = Release|Any CPU + {BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x86.Build.0 = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x64.ActiveCfg = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x64.Build.0 = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x86.ActiveCfg = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x86.Build.0 = Debug|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|Any CPU.Build.0 = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x64.ActiveCfg = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x64.Build.0 = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x86.ActiveCfg = Release|Any CPU + {A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x86.Build.0 = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x64.ActiveCfg = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x64.Build.0 = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x86.ActiveCfg = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x86.Build.0 = Debug|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|Any CPU.Build.0 = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x64.ActiveCfg = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x64.Build.0 = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x86.ActiveCfg = Release|Any CPU + {7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x86.Build.0 = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x64.ActiveCfg = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x64.Build.0 = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x86.ActiveCfg = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x86.Build.0 = Debug|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|Any CPU.Build.0 = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x64.ActiveCfg = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x64.Build.0 = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x86.ActiveCfg = Release|Any CPU + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x86.Build.0 = Release|Any CPU + 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} + {F54715C3-88D8-49E3-A291-C13570FE81FC} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {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} + {FF5339B2-071F-4881-B15B-F91BD1A01153} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {5180EB73-1100-4DBE-9563-94B0C183B0CA} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {55494E58-E061-4C4C-A0A8-837008E72F85} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {1533E271-F61B-441B-8B74-59FB61DF0552} = {5180EB73-1100-4DBE-9563-94B0C183B0CA} + {F47351C2-66E7-478D-A728-05A33768830A} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {73552B7B-BFBB-457D-B718-E0BF5C631358} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {DCF44144-8018-4F25-A5B8-EDE5ABAEDF26} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {302F6BB2-AFEF-4A75-8B51-4A068607430E} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {BB265F11-FB3F-45C6-A197-7F0468568C82} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {A112C374-B4CD-41CC-8D45-87E4357B7E22} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {7E5185FD-58B6-4F31-8600-00BDC0AFB514} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} + EndGlobalSection +EndGlobal diff --git a/src/IISIntegration/LICENSE.txt b/src/Servers/IIS/LICENSE.txt similarity index 100% rename from src/IISIntegration/LICENSE.txt rename to src/Servers/IIS/LICENSE.txt diff --git a/src/IISIntegration/NuGetPackageVerifier.json b/src/Servers/IIS/NuGetPackageVerifier.json similarity index 100% rename from src/IISIntegration/NuGetPackageVerifier.json rename to src/Servers/IIS/NuGetPackageVerifier.json diff --git a/src/IISIntegration/NuGetPackageVerifier.xplat.json b/src/Servers/IIS/NuGetPackageVerifier.xplat.json similarity index 100% rename from src/IISIntegration/NuGetPackageVerifier.xplat.json rename to src/Servers/IIS/NuGetPackageVerifier.xplat.json diff --git a/src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs b/src/Servers/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs similarity index 100% rename from src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs rename to src/Servers/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs diff --git a/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj similarity index 71% rename from src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj rename to src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index 6373cfdfa7..559c7029fb 100644 --- a/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -23,24 +23,21 @@ - + - + False - + False - + False - - - - - - + + + \ No newline at end of file diff --git a/src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/Servers/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs similarity index 100% rename from src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs rename to src/Servers/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs diff --git a/src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/Servers/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs similarity index 100% rename from src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs rename to src/Servers/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs diff --git a/src/IISIntegration/build/Build.Settings b/src/Servers/IIS/build/Build.Settings similarity index 93% rename from src/IISIntegration/build/Build.Settings rename to src/Servers/IIS/build/Build.Settings index d60b07c269..d2e897434c 100644 --- a/src/IISIntegration/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -4,19 +4,17 @@ $(MSBuildThisFileDirectory)..\ Debug Win32 - v120 - v140 - v120 + v141 $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ $(OutputPath) aspnetcore - + true false - + false true @@ -26,7 +24,7 @@ true $(RunCodeAnalysis) - + Use @@ -44,13 +42,13 @@ true - + Disabled - + MaxSpeed @@ -58,19 +56,19 @@ true - + WIN32;_DEBUG;%(PreprocessorDefinitions) - + _WIN64;_DEBUG;%(PreprocessorDefinitions) - + WIN32;NDEBUG;%(PreprocessorDefinitions) @@ -79,7 +77,7 @@ true - + _WIN64;NDEBUG;%(PreprocessorDefinitions) @@ -88,7 +86,7 @@ true - + <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000)) <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0')) diff --git a/src/IISIntegration/build/Config.Definitions.Props b/src/Servers/IIS/build/Config.Definitions.Props similarity index 100% rename from src/IISIntegration/build/Config.Definitions.Props rename to src/Servers/IIS/build/Config.Definitions.Props diff --git a/src/IISIntegration/build/applicationhost.config b/src/Servers/IIS/build/applicationhost.config similarity index 100% rename from src/IISIntegration/build/applicationhost.config rename to src/Servers/IIS/build/applicationhost.config diff --git a/src/IISIntegration/build/applicationhost.iis.config b/src/Servers/IIS/build/applicationhost.iis.config similarity index 100% rename from src/IISIntegration/build/applicationhost.iis.config rename to src/Servers/IIS/build/applicationhost.iis.config diff --git a/src/IISIntegration/build/assets.props b/src/Servers/IIS/build/assets.props similarity index 100% rename from src/IISIntegration/build/assets.props rename to src/Servers/IIS/build/assets.props diff --git a/src/Servers/IIS/build/build.msbuild b/src/Servers/IIS/build/build.msbuild new file mode 100644 index 0000000000..6b260d5bae --- /dev/null +++ b/src/Servers/IIS/build/build.msbuild @@ -0,0 +1,6 @@ + + + + + diff --git a/src/IISIntegration/build/functional-test-assets.targets b/src/Servers/IIS/build/functional-test-assets.targets similarity index 100% rename from src/IISIntegration/build/functional-test-assets.targets rename to src/Servers/IIS/build/functional-test-assets.targets diff --git a/src/IISIntegration/build/native.targets b/src/Servers/IIS/build/native.targets similarity index 99% rename from src/IISIntegration/build/native.targets rename to src/Servers/IIS/build/native.targets index 1c5a981691..6e4af1fe7e 100644 --- a/src/IISIntegration/build/native.targets +++ b/src/Servers/IIS/build/native.targets @@ -1,5 +1,4 @@ - diff --git a/src/IISIntegration/build/repo.props b/src/Servers/IIS/build/repo.props similarity index 100% rename from src/IISIntegration/build/repo.props rename to src/Servers/IIS/build/repo.props diff --git a/src/IISIntegration/build/repo.targets b/src/Servers/IIS/build/repo.targets similarity index 100% rename from src/IISIntegration/build/repo.targets rename to src/Servers/IIS/build/repo.targets diff --git a/src/IISIntegration/build/testsite.props b/src/Servers/IIS/build/testsite.props similarity index 95% rename from src/IISIntegration/build/testsite.props rename to src/Servers/IIS/build/testsite.props index 74f205b4cf..d650e87592 100644 --- a/src/IISIntegration/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -46,14 +46,14 @@ - + False - $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks + $(MSBuildThisFileDirectory)..\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks $(InjectDepsAssembly) "win7-$(NativePlatform)" "$(AncmInProcessRHPath)" diff --git a/src/Servers/IIS/samples/IISSample/IISSample.csproj b/src/Servers/IIS/samples/IISSample/IISSample.csproj new file mode 100644 index 0000000000..caa381c20d --- /dev/null +++ b/src/Servers/IIS/samples/IISSample/IISSample.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.2;net461 + + + + + + + + + + + diff --git a/src/IISIntegration/samples/IISSample/Startup.cs b/src/Servers/IIS/samples/IISSample/Startup.cs similarity index 100% rename from src/IISIntegration/samples/IISSample/Startup.cs rename to src/Servers/IIS/samples/IISSample/Startup.cs diff --git a/src/IISIntegration/samples/IISSample/web.config b/src/Servers/IIS/samples/IISSample/web.config similarity index 100% rename from src/IISIntegration/samples/IISSample/web.config rename to src/Servers/IIS/samples/IISSample/web.config diff --git a/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj new file mode 100644 index 0000000000..91edd87128 --- /dev/null +++ b/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -0,0 +1,21 @@ + + + + + + netcoreapp2.2 + true + + + + + + + + + + + + inprocess + + diff --git a/src/IISIntegration/samples/NativeIISSample/Startup.cs b/src/Servers/IIS/samples/NativeIISSample/Startup.cs similarity index 100% rename from src/IISIntegration/samples/NativeIISSample/Startup.cs rename to src/Servers/IIS/samples/NativeIISSample/Startup.cs diff --git a/src/IISIntegration/samples/NativeIISSample/web.config b/src/Servers/IIS/samples/NativeIISSample/web.config similarity index 100% rename from src/IISIntegration/samples/NativeIISSample/web.config rename to src/Servers/IIS/samples/NativeIISSample/web.config diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx rename to src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/Source.def similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/Source.def diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ancm.mof similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ancm.mof diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/resource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/resource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h b/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventTracing.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventTracing.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ResultException.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ResultException.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/application.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/application.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/config_utility.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/config_utility.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/iapplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/iapplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/requesthandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/requesthandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/resources.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/resources.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/sttimer.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/sttimer.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/targetver.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/targetver.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset b/src/Servers/IIS/src/AspNetCoreModuleV2/DefaultRules.ruleset similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset rename to src/Servers/IIS/src/AspNetCoreModuleV2/DefaultRules.ruleset diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/buffer.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/buffer.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/datetime.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/datetime.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/dbgutil.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/dbgutil.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashfn.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashfn.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashtable.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashtable.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/listentry.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/listentry.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/macros.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/macros.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ntassert.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ntassert.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/percpu.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/percpu.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/precomp.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/precomp.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/prime.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/prime.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.c similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.c diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/rwlock.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/rwlock.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.c similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.c diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/treehash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/treehash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/util.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/util.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h diff --git a/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h similarity index 100% rename from src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h rename to src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets new file mode 100644 index 0000000000..21ff857b22 --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets @@ -0,0 +1,34 @@ + + + + + + + false + + false + + false + + true + + true + + false + + false + + + + + + + NuGetPackage + $(PackageId) + $(PackageVersion) + + + + + + \ No newline at end of file diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj new file mode 100644 index 0000000000..521cb9907a --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj @@ -0,0 +1,36 @@ + + + + + false + netcoreapp2.2 + aspnetcore + Microsoft ASP.NET Core Module + true + content + true + ASP.NET Core Module + + + + + + + + + + + + + + True + lib + + + + + + + + + \ No newline at end of file diff --git a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props similarity index 96% rename from src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props index 7a761813b4..4e6fbe80e8 100644 --- a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props @@ -5,4 +5,4 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll - + \ No newline at end of file diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/lib/netcoreapp2.2/_._ similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/lib/netcoreapp2.2/_._ diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets new file mode 100644 index 0000000000..21ff857b22 --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets @@ -0,0 +1,34 @@ + + + + + + + false + + false + + false + + true + + true + + false + + false + + + + + + + NuGetPackage + $(PackageId) + $(PackageVersion) + + + + + + \ No newline at end of file diff --git a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in similarity index 99% rename from src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in index 09af105513..7b3be4a261 100644 --- a/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in @@ -10,4 +10,4 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll - + \ No newline at end of file diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj new file mode 100644 index 0000000000..fb862184f7 --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj @@ -0,0 +1,43 @@ + + + + + false + netcoreapp2.2 + aspnetcore + Microsoft ASP.NET Core Module + true + content + true + ASP.NET Core Module + + + + + + + + + + + + + + + + + + + + + True + lib + + + + + + + + + \ No newline at end of file diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/lib/netcoreapp2.2/_._ similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/lib/netcoreapp2.2/_._ diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj new file mode 100644 index 0000000000..bf6fd7dc54 --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -0,0 +1,98 @@ + + + + netstandard2.0 + Microsoft.AspNetCore.Server.IIS + Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. + $(NoWarn);CS1591 + true + aspnetcore;iis + true + true + netcoreapp2.2 + True + + + + + + + + + + + + + + + + + False + + + False + + + + False + + + + False + + + + False + + + False + + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/_._ similarity index 100% rename from src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/_._ diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj new file mode 100644 index 0000000000..5e3ef5bd6b --- /dev/null +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -0,0 +1,34 @@ + + + + + ASP.NET Core components for working with the IIS AspNetCoreModule. + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;iis + true + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs similarity index 92% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs index 02fc967f1a..4ecb5018a2 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Microsoft.AspNetCore.HttpSys.Internal; namespace Microsoft.AspNetCore.Server.IISIntegration { diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj similarity index 55% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 64577364d0..e62f4afd0a 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -20,22 +20,10 @@ - - - - - - - - - False - - - False - - - False - + + + + diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs similarity index 100% rename from src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs rename to src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config b/src/Servers/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config rename to src/Servers/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config diff --git a/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/AppOfflineTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/AppOfflineTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/BasicAuthTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/BasicAuthTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs rename to src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/Servers/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs rename to src/Servers/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/CommonStartupTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/CommonStartupTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/CompressionTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/CompressionTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/LogFileTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/LogFileTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs rename to src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/Servers/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs rename to src/Servers/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/Servers/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs rename to src/Servers/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs b/src/Servers/IIS/test/Common.FunctionalTests/RequiresNewShim.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs rename to src/Servers/IIS/test/Common.FunctionalTests/RequiresNewShim.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/ServerAbortTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/ServerAbortTests.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/Servers/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs rename to src/Servers/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/Servers/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs rename to src/Servers/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs rename to src/Servers/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs similarity index 100% rename from src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs rename to src/Servers/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs diff --git a/src/Servers/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/test/Common.Tests/Common.Tests.csproj new file mode 100644 index 0000000000..86ceaa68b6 --- /dev/null +++ b/src/Servers/IIS/test/Common.Tests/Common.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs b/src/Servers/IIS/test/Common.Tests/Utilities/DisposableList.cs similarity index 100% rename from src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs rename to src/Servers/IIS/test/Common.Tests/Utilities/DisposableList.cs diff --git a/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs b/src/Servers/IIS/test/Common.Tests/Utilities/TestConnections.cs similarity index 100% rename from src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs rename to src/Servers/IIS/test/Common.Tests/Utilities/TestConnections.cs diff --git a/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/Servers/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs similarity index 100% rename from src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs rename to src/Servers/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs diff --git a/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj similarity index 99% rename from src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj rename to src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj index 87dbd16675..99c7215983 100644 --- a/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp b/src/Servers/IIS/test/CommonLibTests/ConfigUtilityTests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp rename to src/Servers/IIS/test/CommonLibTests/ConfigUtilityTests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp b/src/Servers/IIS/test/CommonLibTests/FileOutputManagerTests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp rename to src/Servers/IIS/test/CommonLibTests/FileOutputManagerTests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp b/src/Servers/IIS/test/CommonLibTests/GlobalVersionTests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp rename to src/Servers/IIS/test/CommonLibTests/GlobalVersionTests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/Helpers.cpp b/src/Servers/IIS/test/CommonLibTests/Helpers.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/Helpers.cpp rename to src/Servers/IIS/test/CommonLibTests/Helpers.cpp diff --git a/src/IISIntegration/test/CommonLibTests/Helpers.h b/src/Servers/IIS/test/CommonLibTests/Helpers.h similarity index 100% rename from src/IISIntegration/test/CommonLibTests/Helpers.h rename to src/Servers/IIS/test/CommonLibTests/Helpers.h diff --git a/src/IISIntegration/test/CommonLibTests/NativeTests.targets b/src/Servers/IIS/test/CommonLibTests/NativeTests.targets similarity index 100% rename from src/IISIntegration/test/CommonLibTests/NativeTests.targets rename to src/Servers/IIS/test/CommonLibTests/NativeTests.targets diff --git a/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp b/src/Servers/IIS/test/CommonLibTests/PipeOutputManagerTests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp rename to src/Servers/IIS/test/CommonLibTests/PipeOutputManagerTests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp b/src/Servers/IIS/test/CommonLibTests/exception_handler_tests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp rename to src/Servers/IIS/test/CommonLibTests/exception_handler_tests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/fakeclasses.h b/src/Servers/IIS/test/CommonLibTests/fakeclasses.h similarity index 100% rename from src/IISIntegration/test/CommonLibTests/fakeclasses.h rename to src/Servers/IIS/test/CommonLibTests/fakeclasses.h diff --git a/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/Servers/IIS/test/CommonLibTests/hostfxr_utility_tests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp rename to src/Servers/IIS/test/CommonLibTests/hostfxr_utility_tests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp b/src/Servers/IIS/test/CommonLibTests/inprocess_application_tests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp rename to src/Servers/IIS/test/CommonLibTests/inprocess_application_tests.cpp diff --git a/src/IISIntegration/test/CommonLibTests/main.cpp b/src/Servers/IIS/test/CommonLibTests/main.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/main.cpp rename to src/Servers/IIS/test/CommonLibTests/main.cpp diff --git a/src/IISIntegration/test/CommonLibTests/stdafx.h b/src/Servers/IIS/test/CommonLibTests/stdafx.h similarity index 100% rename from src/IISIntegration/test/CommonLibTests/stdafx.h rename to src/Servers/IIS/test/CommonLibTests/stdafx.h diff --git a/src/IISIntegration/test/CommonLibTests/utility_tests.cpp b/src/Servers/IIS/test/CommonLibTests/utility_tests.cpp similarity index 100% rename from src/IISIntegration/test/CommonLibTests/utility_tests.cpp rename to src/Servers/IIS/test/CommonLibTests/utility_tests.cpp diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs rename to src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj new file mode 100644 index 0000000000..80fb3a4f43 --- /dev/null +++ b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -0,0 +1,37 @@ + + + + netcoreapp2.2 + IISBackwardsCompatibility.FunctionalTests + True + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs rename to src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj new file mode 100644 index 0000000000..451a396a8c --- /dev/null +++ b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -0,0 +1,36 @@ + + + + netcoreapp2.2 + IISForwardsCompatibility.FunctionalTests + True + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/test/IIS.FunctionalTests/DeployerSelector.cs similarity index 100% rename from src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs rename to src/Servers/IIS/test/IIS.FunctionalTests/DeployerSelector.cs diff --git a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj new file mode 100644 index 0000000000..3a276aa358 --- /dev/null +++ b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -0,0 +1,37 @@ + + + + netcoreapp2.2 + IIS.FunctionalTests + True + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/Servers/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs rename to src/Servers/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/Servers/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs rename to src/Servers/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs rename to src/Servers/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs rename to src/Servers/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/Servers/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs rename to src/Servers/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs diff --git a/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config b/src/Servers/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config similarity index 100% rename from src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config rename to src/Servers/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config diff --git a/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/test/IIS.Tests/ClientDisconnectTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs rename to src/Servers/IIS/test/IIS.Tests/ClientDisconnectTests.cs diff --git a/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs rename to src/Servers/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs diff --git a/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs rename to src/Servers/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs diff --git a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj new file mode 100644 index 0000000000..330b6a77a4 --- /dev/null +++ b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/test/IIS.Tests/ResponseAbortTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs rename to src/Servers/IIS/test/IIS.Tests/ResponseAbortTests.cs diff --git a/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs b/src/Servers/IIS/test/IIS.Tests/StrictTestServerTests.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs rename to src/Servers/IIS/test/IIS.Tests/StrictTestServerTests.cs diff --git a/src/IISIntegration/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/test/IIS.Tests/TestServerTest.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/TestServerTest.cs rename to src/Servers/IIS/test/IIS.Tests/TestServerTest.cs diff --git a/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/Servers/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs rename to src/Servers/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs diff --git a/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs b/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs similarity index 100% rename from src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs rename to src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj new file mode 100644 index 0000000000..2eba82046c --- /dev/null +++ b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -0,0 +1,36 @@ + + + + netcoreapp2.2 + True + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs similarity index 100% rename from src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs rename to src/Servers/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs diff --git a/src/IISIntegration/test/gtest/gtest.vcxproj b/src/Servers/IIS/test/gtest/gtest.vcxproj similarity index 99% rename from src/IISIntegration/test/gtest/gtest.vcxproj rename to src/Servers/IIS/test/gtest/gtest.vcxproj index 924f26337d..f78530ea12 100644 --- a/src/IISIntegration/test/gtest/gtest.vcxproj +++ b/src/Servers/IIS/test/gtest/gtest.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj new file mode 100644 index 0000000000..0dda2de217 --- /dev/null +++ b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -0,0 +1,30 @@ + + + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs b/src/Servers/IIS/test/testassets/InProcessWebSite/DummyServer.cs similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs rename to src/Servers/IIS/test/testassets/InProcessWebSite/DummyServer.cs diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj new file mode 100644 index 0000000000..695a6d0b5c --- /dev/null +++ b/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -0,0 +1,32 @@ + + + + + + netcoreapp2.2 + true + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs b/src/Servers/IIS/test/testassets/InProcessWebSite/Program.cs similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs rename to src/Servers/IIS/test/testassets/InProcessWebSite/Program.cs diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs rename to src/Servers/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs b/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs rename to src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/web.config b/src/Servers/IIS/test/testassets/InProcessWebSite/web.config similarity index 100% rename from src/IISIntegration/test/WebSites/InProcessWebSite/web.config rename to src/Servers/IIS/test/testassets/InProcessWebSite/web.config diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj new file mode 100644 index 0000000000..fc50dcd616 --- /dev/null +++ b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -0,0 +1,30 @@ + + + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs similarity index 98% rename from src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs rename to src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs index de54a85a8a..6556b5ac41 100644 --- a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs @@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IISIntegration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace TestSite { @@ -48,7 +47,6 @@ namespace TestSite { if (context.User.Identity.IsAuthenticated) { - Assert.IsType(context.User); return context.Response.WriteAsync(context.User.Identity.AuthenticationType); } else diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs b/src/Servers/IIS/test/testassets/StressTestWebSite/Startup.cs similarity index 100% rename from src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs rename to src/Servers/IIS/test/testassets/StressTestWebSite/Startup.cs diff --git a/src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj b/src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj new file mode 100644 index 0000000000..578fd81a4f --- /dev/null +++ b/src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj @@ -0,0 +1,25 @@ + + + + + + $(StandardTestTfms) + true + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs b/src/Servers/IIS/test/testassets/TestTasks/InjectRequestHandler.cs similarity index 100% rename from src/IISIntegration/test/TestTasks/InjectRequestHandler.cs rename to src/Servers/IIS/test/testassets/TestTasks/InjectRequestHandler.cs diff --git a/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/Servers/IIS/test/testassets/TestTasks/TestTasks.csproj similarity index 55% rename from src/IISIntegration/test/TestTasks/TestTasks.csproj rename to src/Servers/IIS/test/testassets/TestTasks/TestTasks.csproj index 3cf4f265bb..2f3ff3479f 100644 --- a/src/IISIntegration/test/TestTasks/TestTasks.csproj +++ b/src/Servers/IIS/test/testassets/TestTasks/TestTasks.csproj @@ -1,4 +1,4 @@ - + Exe @@ -6,7 +6,7 @@ - + diff --git a/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs b/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs similarity index 100% rename from src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs rename to src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs b/src/Servers/IIS/test/testassets/shared/WebSockets/Constants.cs similarity index 100% rename from src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs rename to src/Servers/IIS/test/testassets/shared/WebSockets/Constants.cs diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/src/Servers/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs similarity index 100% rename from src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs rename to src/Servers/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs b/src/Servers/IIS/test/testassets/shared/WebSockets/TestStartup.cs similarity index 100% rename from src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs rename to src/Servers/IIS/test/testassets/shared/WebSockets/TestStartup.cs diff --git a/src/IISIntegration/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 similarity index 100% rename from src/IISIntegration/tools/GenerateNativeAssets.ps1 rename to src/Servers/IIS/tools/GenerateNativeAssets.ps1 diff --git a/src/IISIntegration/tools/SetupTestEnvironment.ps1 b/src/Servers/IIS/tools/SetupTestEnvironment.ps1 similarity index 100% rename from src/IISIntegration/tools/SetupTestEnvironment.ps1 rename to src/Servers/IIS/tools/SetupTestEnvironment.ps1 diff --git a/src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 b/src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1 similarity index 100% rename from src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 rename to src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1 diff --git a/src/IISIntegration/tools/certificate.ps1 b/src/Servers/IIS/tools/certificate.ps1 similarity index 100% rename from src/IISIntegration/tools/certificate.ps1 rename to src/Servers/IIS/tools/certificate.ps1 diff --git a/src/IISIntegration/tools/httpsys.ps1 b/src/Servers/IIS/tools/httpsys.ps1 similarity index 100% rename from src/IISIntegration/tools/httpsys.ps1 rename to src/Servers/IIS/tools/httpsys.ps1 diff --git a/src/IISIntegration/tools/installancm.ps1 b/src/Servers/IIS/tools/installancm.ps1 similarity index 100% rename from src/IISIntegration/tools/installancm.ps1 rename to src/Servers/IIS/tools/installancm.ps1 diff --git a/src/Servers/IIS/tools/stresstest.ps1 b/src/Servers/IIS/tools/stresstest.ps1 new file mode 100644 index 0000000000..981c6fcf44 --- /dev/null +++ b/src/Servers/IIS/tools/stresstest.ps1 @@ -0,0 +1,96 @@ +########################################################## +# NOTE: +# For running test automation, following prerequisite required: +# +# 1. On Win7, powershell should be upgraded to 4.0 +# https://social.technet.microsoft.com/wiki/contents/articles/21016.how-to-install-windows-powershell-4-0.aspx +# 2. url-rewrite should be installed +# 3. makecert.exe tools should be available +########################################################## + +# Replace aspnetcore.dll with the latest version +copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll "C:\Program Files\IIS Express" +copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.pdb "C:\Program Files\IIS Express" + + +# Enable appverif for IISExpress.exe +appverif /verify iisexpress.exe + +# Set the AspNetCoreModuleTest environment variable with the following command +cd C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test +dotnet restore +dotnet build +$aspNetCoreModuleTest="C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test\bin\Debug\net46" + +if (Test-Path (Join-Path $aspNetCoreModuleTest aspnetcoremodule.test.dll)) +{ + # Clean up applicationhost.config of IISExpress + del $env:userprofile\documents\iisexpress\config\applicationhost.config -Confirm:$false -Force + Start-Process "C:\Program Files\IIS Express\iisexpress.exe" + Sleep 3 + Stop-Process -Name iisexpress + + # Create sites + (1..50) | foreach { md ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) 2> out-null } + (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\web.config ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } + (1..50) | foreach { + $path = ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) + $appPath = "/foo"+$_ + & "C:\Program Files\IIS Express\appcmd.exe" add app /site.name:"WebSite1" /path:$appPath /physicalPath:$path + } + + <#(1..50) | foreach { + $configpath = ("WebSite1/foo" + $_) + $value = "C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + ".exe" + & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value + } + (1..50) | foreach { copy C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo.exe ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ +".exe") } + (1..50) | foreach { + $configpath = ("WebSite1/foo" + $_) + $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\foo" + $_ + ".exe" + & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config + + $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\AutobahnTestServer.dll" + & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /arguments:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config + } + #> + + # Start IISExpress with running the below command + &"C:\Program Files\Debugging Tools for Windows (x64)\windbg.exe" /g /G "C:\Program Files\IIS Express\iisexpress.exe" + + + # 6. Start stress testing + (1..10000) | foreach { + if ($_ % 2 -eq 0) + { + ("Recycling backend only") + stop-process -name dotnet + (1..50) | foreach { del ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + "\app_offline.htm") -confirm:$false -Force 2> out-null } + stop-process -name dotnet + } + else + { + ("Recycling backedn + enabling appoffline ....") + stop-process -name dotnet + (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\app_offline.htm ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } + } + Sleep 1 + + (1..10) | foreach { + (1..50) | foreach { + invoke-webrequest ("http://localhost:8080/foo"+$_) > $null + } + } + } + + + # Stress test idea + # 1. Use Web Stress Tester + # 2. Run stop-process -name dotnet + # 3. Hit Q command to IISExpress console window + # 4. Use app_offline.htm + # 5. Save dummy web.config +} + +// bp aspnetcore!FORWARDING_HANDLER::FORWARDING_HANDLER +// bp aspnetcore!FORWARDING_HANDLER::~FORWARDING_HANDLER \ No newline at end of file diff --git a/src/IISIntegration/tools/update_schema.ps1 b/src/Servers/IIS/tools/update_schema.ps1 similarity index 100% rename from src/IISIntegration/tools/update_schema.ps1 rename to src/Servers/IIS/tools/update_schema.ps1 diff --git a/src/IISIntegration/version.props b/src/Servers/IIS/version.props similarity index 100% rename from src/IISIntegration/version.props rename to src/Servers/IIS/version.props diff --git a/version.props b/version.props index 1deb9905cf..8b3c0b4ccf 100644 --- a/version.props +++ b/version.props @@ -7,7 +7,15 @@ $([System.DateTime]::Now.ToString('yyMMdd'))-99 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) + 0.2.$(AspNetCorePatchVersion) + 1 + + + 1$(AspNetCoreMajorVersion) + $(AspNetCoreMinorVersion) + $(AspNetCorePatchVersion) + $(PreReleaseLabel)-$(BuildNumber) $(PreReleaseBrandingLabel) Build $(BuildNumber)