From 5151e7b1edf9a9294d5af8b3c0dc54f4b59c9deb Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 11 Dec 2018 14:05:21 -0800
Subject: [PATCH] Workaround problems when opening solution files in Visual
Studio (#4569)
Changes:
* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
---
Microsoft.AspNetCore.sln | 39 -----
build/repo.props | 7 +
build/repo.targets | 15 ++
docs/BuildFromSource.md | 91 ++++++++---
eng/Baseline.xml | 1 -
eng/targets/CSharp.Common.targets | 6 +
eng/targets/ResolveReferences.targets | 8 +-
src/DataProtection/startvs.cmd | 3 +
src/Http/HttpAbstractions.sln | 153 +++++++++++++++---
src/Http/Routing.sln | 137 ----------------
.../src/Microsoft.AspNetCore.Routing.csproj | 1 +
src/Http/startvs.cmd | 3 +
.../CorsMiddlewareFunctionalTest.cs | 0
.../CorsMiddlewareTests.cs | 0
.../{Test => UnitTests}/CorsOptionsTest.cs | 0
.../CorsPolicyBuilderTests.cs | 0
.../CorsPolicyExtensionsTests.cs | 0
.../{Test => UnitTests}/CorsPolicyTests.cs | 0
.../{Test => UnitTests}/CorsResultTests.cs | 0
.../{Test => UnitTests}/CorsServiceTests.cs | 0
.../{Test => UnitTests}/CorsTestFixtureOfT.cs | 0
.../DefaultCorsPolicyProviderTests.cs | 0
.../Microsoft.AspNetCore.Cors.Test.csproj | 0
.../{Test => UnitTests}/TestCorsOptions.cs | 0
.../{Test => UnitTests}/UriHelpersTests.cs | 0
src/Middleware/Middleware.sln | 141 ++++++++++++++--
.../Microsoft.AspNetCore.StaticFiles.csproj | 2 +-
...AspNetCore.RangeHelper.Sources.Test.csproj | 17 --
.../{Tests => UnitTests}/CacheHeaderTests.cs | 0
.../DefaultContentTypeProviderTests.cs | 0
.../DefaultFilesMiddlewareTests.cs | 0
.../DirectoryBrowserMiddlewareTests.cs | 0
...rosoft.AspNetCore.StaticFiles.Tests.csproj | 1 -
.../{Tests => UnitTests}/RangeHeaderTests.cs | 0
.../RangeHelperTests.cs | 0
.../StaticFileContextTest.cs | 0
.../StaticFileMiddlewareTests.cs | 0
.../StaticFilesTestServer.cs | 0
.../{Tests => UnitTests}/SubFolder/Empty.txt | 0
.../SubFolder/SingleByte.txt | 0
.../SubFolder/default.html | 0
.../{Tests => UnitTests}/SubFolder/extra.xml | 0
.../{Tests => UnitTests}/SubFolder/ranges.txt | 0
.../{Tests => UnitTests}/TestDocument.txt | 0
src/Middleware/startvs.cmd | 3 +
src/Servers/Directory.Build.props | 4 +-
src/Servers/Kestrel.sln | 80 +++++++++
.../FunctionalTests/GeneratedCodeTests.cs | 8 +-
src/Servers/startvs.cmd | 3 +
startvs.cmd | 32 ++++
50 files changed, 492 insertions(+), 263 deletions(-)
delete mode 100644 Microsoft.AspNetCore.sln
create mode 100644 src/DataProtection/startvs.cmd
delete mode 100644 src/Http/Routing.sln
create mode 100644 src/Http/startvs.cmd
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsMiddlewareFunctionalTest.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsMiddlewareTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsOptionsTest.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsPolicyBuilderTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsPolicyExtensionsTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsPolicyTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsResultTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsServiceTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/CorsTestFixtureOfT.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/DefaultCorsPolicyProviderTests.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/Microsoft.AspNetCore.Cors.Test.csproj (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/TestCorsOptions.cs (100%)
rename src/Middleware/CORS/test/{Test => UnitTests}/UriHelpersTests.cs (100%)
delete mode 100644 src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/CacheHeaderTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/DefaultContentTypeProviderTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/DefaultFilesMiddlewareTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/DirectoryBrowserMiddlewareTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/Microsoft.AspNetCore.StaticFiles.Tests.csproj (89%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/RangeHeaderTests.cs (100%)
rename src/Middleware/StaticFiles/test/{RangeHelper.Sources.Test => UnitTests}/RangeHelperTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/StaticFileContextTest.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/StaticFileMiddlewareTests.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/StaticFilesTestServer.cs (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/SubFolder/Empty.txt (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/SubFolder/SingleByte.txt (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/SubFolder/default.html (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/SubFolder/extra.xml (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/SubFolder/ranges.txt (100%)
rename src/Middleware/StaticFiles/test/{Tests => UnitTests}/TestDocument.txt (100%)
create mode 100644 src/Middleware/startvs.cmd
create mode 100644 src/Servers/startvs.cmd
create mode 100644 startvs.cmd
diff --git a/Microsoft.AspNetCore.sln b/Microsoft.AspNetCore.sln
deleted file mode 100644
index 809b017e25f..00000000000
--- a/Microsoft.AspNetCore.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedFx.UnitTests", "test\SharedFx.UnitTests\SharedFx.UnitTests.csproj", "{99CC38EC-902B-4B3F-AD33-177018110199}"
-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(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.ActiveCfg = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.Build.0 = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.ActiveCfg = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.Build.0 = Debug|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.Build.0 = Release|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.ActiveCfg = Release|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.Build.0 = Release|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.ActiveCfg = Release|Any CPU
- {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {99CC38EC-902B-4B3F-AD33-177018110199} = {EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE}
- EndGlobalSection
-EndGlobal
diff --git a/build/repo.props b/build/repo.props
index ff0120ce5a0..35e1ed077b7 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -51,6 +51,13 @@
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
+ <!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
+ <ProjectToExclude Include="
+ $(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
+ $(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
+ "
+ Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
+
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
diff --git a/build/repo.targets b/build/repo.targets
index 340b8ff9a6b..1bb8d78971f 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -27,6 +27,21 @@
<GetArtifactInfoDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(GetArtifactInfoDependsOn);ResolveRepoInfo</GetArtifactInfoDependsOn>
</PropertyGroup>
+ <PropertyGroup>
+ <RestoreDependsOn Condition=" '$(SkipNpm)' != 'true' ">$(RestoreDependsOn);RestoreNpm</RestoreDependsOn>
+ </PropertyGroup>
+
+ <Target Name="RestoreNpm" Condition="@(NpmProjectDirectory->Count()) != 0">
+ <Message Text="Restoring NPM modules" Importance="high" />
+
+ <PropertyGroup>
+ <NpmInstallCommand Condition=" '$(CI)' != 'true' ">install --no-optional</NpmInstallCommand>
+ <NpmInstallCommand Condition=" '$(CI)' == 'true' ">ci</NpmInstallCommand>
+ </PropertyGroup>
+
+ <Exec Command="npm $(NpmInstallCommand)" WorkingDirectory="%(NpmProjectDirectory.Identity)" Condition=" '%(NpmProjectDirectory.Identity)' != '' " />
+ </Target>
+
<Target Name="PrepareOutputPaths">
<MakeDir Directories="$(ArtifactsDir);$(BuildDir)" />
</Target>
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index aee68a11f06..0a95e6cd55e 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -1,16 +1,11 @@
Build ASP.NET Core from Source
==============================
-Building ASP.NET Core from source allows you tweak and customize ASP.NET Core, and
-to contribute your improvements back to the project.
+Building ASP.NET Core from source allows you tweak and customize ASP.NET Core, and to contribute your improvements back to the project.
-## :warning: Temporary instructions
+:warning: We are currently in the middle of restructing our source code. These instructions will likely change rapidly during November and December 2018.
-We are currently in the middle of restructing our repositories. While this work is being done, the following instructions will help you be more productive while working on this repo.
-
-1. Before opening a solution, run `build.cmd /p:_ProjectsOnly=true /p:SkipTests=true`. This will only build the projects which have merged into this repo, not the git submodules.
-2. Use (or create) a solution which is scoped to your project file. The build system does not use .sln files. These only exist for developer productivity in Visual Studio, so feel free to adjust the projects in .sln files to match your workload.
-3. Questions? Contact @aspnet for help.
+See https://github.com/aspnet/AspNetCore/labels/area-infrastructure for known issues and to track ongoing work.
## Install pre-requistes
@@ -58,22 +53,66 @@ git submodule update --init --recursive
## Building in Visual Studio / Code
-Before opening our .sln files in Visual Studio or VS Code, executing the following on command-line:
-```
-.\build.cmd /t:Restore
-```
-This will download required tools.
+Before opening our .sln files in Visual Studio or VS Code, you need to perform the following actions.
+
+1. Executing the following on command-line:
+ ```
+ .\build.cmd /p:SkipTests=true /p:_ProjectsOnly=true
+ ```
+ This will download required tools and build the entire repository once. At that point, you should be able to open .sln files to work on the projects you care about.
+
+2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables.
+
+> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. Visual Studio will only build projects in a solution file, and makes a best effort to use other files on disk. If you pull many changes, the files on disk may be stale and will need to re-build.
+
+### Solution files
+
+We don't have a single .sln file for all of ASP.NET Core because Visual Studio doesn't currently handle projects of this scale.
+Instead, we have many .sln files which include a sub-set of projects. These principles guide how we create and manage .slns:
+
+1. Solution files are not used by CI or command line build scripts. They are for meant for use by developers only.
+2. Solution files group together projects which are frequently edited at the same time.
+3. Can't find a solution that has the projects you care about? Feel free to make a PR to add a new .sln file.
+
+> :bulb: Pro tip: `dotnet new sln` and `dotnet sln` are one of the easiest ways to create and modify solutions.
+
+### Known issue: NU1105
+
+Opening solution files may produce an error code NU1105 with a message such
+
+> Unable to find project information for 'C:\src\AspNetCore\src\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj'. Inside Visual Studio, this may be because the project is unloaded or not part of current solution. Otherwise the project file may be invalid or missing targets required for restore.
+
+This is a known issue in NuGet (<https://github.com/NuGet/Home/issues/5820>) and we are working with them for a solution. See also <https://github.com/aspnet/AspNetCore/issues/4183> to track progress on this.
+
+**The workaround** for now is to add all projects to the solution.
+
+ dotnet sln add C:\src\AspNetCore\src\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj
+
#### PATH
-For VS Code and Visual Studio to work correctly, you must place the following location in your PATH.
+For VS Code and Visual Studio and `dotnet` commands to work correctly, you must place the following location in your PATH.
+Use the following commands to update the PATH variable in a command line window.
+
+Windows (Command Prompt)
+
+```batch
+set PATH=%USERPROFILE%\.dotnet\x64;%PATH%
+```
+
+Windows (Powershell)
+
+```ps1
+$env:PATH="$env:USERPROFILE\.dotnet\x64;$env:PATH"
```
-Windows: %USERPROFILE%\.dotnet\x64
-Linux/macOS: $HOME/.dotnet
+
+Linux/macOS:
+
+```sh
+export PATH="$HOME/.dotnet:$PATH"
```
-This must come **before** any other installation of `dotnet`. In Windows, we recommend removing `C:\Program Files\dotnet` from PATH in system variables and adding `%USERPROFILE%\.dotnet\x64` to PATH in user variables.
-<img src="http://i.imgur.com/Tm2PAfy.png" width="400" />
+On Windows, we recommend using the `startvs.cmd` command to launch Visual Studio.
## Building on command-line
@@ -89,6 +128,14 @@ On macOS/Linux:
./build.sh
```
+### Building a subset of the code
+
+This repository is large. Look for `build.cmd`/`.sh` scripts in subfolders. These scripts can be used to invoke build and test on a smaller set of projects.
+
+#### Known issue: not every subfolder has a build.cmd script
+
+We'll be adding more. See https://github.com/aspnet/AspNetCore/issues/4247.
+
#### Build properties
Additional properties can be added as an argument in the form `/property:$name=$value`, or `/p:$name=$value` for short. For example:
@@ -99,8 +146,8 @@ Additional properties can be added as an argument in the form `/property:$name=$
Common properties include:
Property | Description
--------------------------|---------------------------------------------------------
-BuildNumber | (string). A specific build number, typically from a CI counter
+-------------------------|-------------------------------------------------------------------------------------------------------------
+BuildNumberSuffix | (string). A specific build number, typically from a CI counter, which is appended to the pre-release label.
Configuration | `Debug` or `Release`. Default = `Debug`.
SkipTests | `true` or `false`. When true, builds without running tests.
NoBuild | `true` or `false`. Runs tests without rebuilding.
@@ -109,7 +156,7 @@ NoBuild | `true` or `false`. Runs tests without rebuilding.
After building ASP.NET Core from source, you will need to install and use your local version of ASP.NET Core.
-- Run the installers produced in `artifacts/installers/` for your platform.
+- Run the installers produced in `artifacts/{Debug, Release}/installers/` for your platform.
- Add a NuGet.Config to your project directory with the following content:
```xml
@@ -128,7 +175,7 @@ After building ASP.NET Core from source, you will need to install and use your l
- Update the versions on `PackageReference` items in your .csproj project file to point to the version from your local build.
```xml
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="3.0.0-alpha1-t000" />
+ <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.0.0-preview-0" />
</ItemGroup>
```
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 689906d3cfb..1a1f29b2515 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -55,5 +55,4 @@
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
-
</Baseline>
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index a7f7b610b6e..8df4213c629 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -1,5 +1,11 @@
<Project>
+ <!-- For 'legacy' .csproj files, set map TargetFrameworkVersion back to TargetFramework -->
+ <PropertyGroup Condition=" '$(TargetFramework)' == '' AND '$(TargetFrameworks)' == '' ">
+ <TargetFramework>net$(TargetFrameworkVersion.Substring(1).Replace('.',''))</TargetFramework>
+ <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+ </PropertyGroup>
+
<Import Project="Packaging.targets" />
<Import Project="ResolveReferences.targets" />
</Project>
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index caf44207ee3..7ff54b7d33b 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -45,12 +45,18 @@
<ProjectReference Include="@(_ProjectReferenceByAssemblyName->'%(ProjectPath)')" />
<Reference Remove="@(_ProjectReferenceByAssemblyName)" />
+
+ <!-- Use _ReferenceTemp to workaround issues in Visual Studio which causes a conflict between Reference, packages, and projects. -->
+ <_ReferenceTemp Include="@(Reference)" />
+ <Reference Remove="@(Reference)" />
</ItemGroup>
<Target Name="ResolveCustomReferences" BeforeTargets="CollectPackageReferences;ResolveAssemblyReferencesDesignTime;ResolveAssemblyReferences" Condition=" '$(TargetFramework)' != '' ">
<ItemGroup>
- <UnusedBaselinePackageReference Include="@(BaselinePackageReference)" Exclude="@(Reference);@(_ProjectReferenceByAssemblyName)" />
+ <Reference Include="@(_ReferenceTemp)" />
+ <_ReferenceTemp Remove="@(_ReferenceTemp)" />
+ <UnusedBaselinePackageReference Include="@(BaselinePackageReference)" Exclude="@(Reference);@(_ProjectReferenceByAssemblyName)" />
<!--
MSBuild does not provide a way to join on matching identities in a Condition,
but you can do a cartesian product of two item groups and filter out mismatched id's in a second pass.
diff --git a/src/DataProtection/startvs.cmd b/src/DataProtection/startvs.cmd
new file mode 100644
index 00000000000..c2fc65d8732
--- /dev/null
+++ b/src/DataProtection/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0DataProtection.sln
diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln
index 7a70d0015d0..2e963df3d2b 100644
--- a/src/Http/HttpAbstractions.sln
+++ b/src/Http/HttpAbstractions.sln
@@ -5,59 +5,77 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{587C3D55-6092-4B86-99F5-E9772C9C1ADB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.Abstractions", "Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{565B7B00-96A1-49B8-9753-9E045C6527A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{565B7B00-96A1-49B8-9753-9E045C6527A2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Core", "Authentication.Core", "{B51F45A6-428F-40F4-897F-7C62C29EC39A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.Core", "Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{A3DEE5E8-FC9D-4135-8CDB-24E5BF954F96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{A3DEE5E8-FC9D-4135-8CDB-24E5BF954F96}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.Core.Test", "Authentication.Core\test\Microsoft.AspNetCore.Authentication.Core.Test.csproj", "{21071749-4361-4CD0-B5ED-541C72326800}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core.Test", "Authentication.Core\test\Microsoft.AspNetCore.Authentication.Core.Test.csproj", "{21071749-4361-4CD0-B5ED-541C72326800}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Headers", "Headers", "{FF334B62-1AE2-477C-B91B-B28F898DFC3A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.Http.Headers", "Headers\src\Microsoft.Net.Http.Headers.csproj", "{D2B2E73E-A3A4-4996-906C-6647CD7D2634}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "Headers\src\Microsoft.Net.Http.Headers.csproj", "{D2B2E73E-A3A4-4996-906C-6647CD7D2634}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.Http.Headers.Tests", "Headers\test\Microsoft.Net.Http.Headers.Tests.csproj", "{9CE486B4-0BC6-4C71-AA7C-BD66E78E11CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers.Tests", "Headers\test\Microsoft.Net.Http.Headers.Tests.csproj", "{9CE486B4-0BC6-4C71-AA7C-BD66E78E11CF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{FB2DCA0F-EB9E-425B-ABBC-D543DBEC090F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http", "Http\src\Microsoft.AspNetCore.Http.csproj", "{E35F0A95-0016-4B4D-BB85-ADB4CFAD857F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "Http\src\Microsoft.AspNetCore.Http.csproj", "{E35F0A95-0016-4B4D-BB85-ADB4CFAD857F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Tests", "Http\test\Microsoft.AspNetCore.Http.Tests.csproj", "{D9155D31-0844-4ED6-AC7B-6C4C9DA6E891}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Tests", "Http\test\Microsoft.AspNetCore.Http.Tests.csproj", "{D9155D31-0844-4ED6-AC7B-6C4C9DA6E891}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Abstractions", "Http.Abstractions", "{28F3D5CC-1F8E-4E15-94C8-E432DFA0A702}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Abstractions", "Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{D079CD1C-A18F-4457-91BC-432577D2FD37}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{D079CD1C-A18F-4457-91BC-432577D2FD37}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Abstractions.Tests", "Http.Abstractions\test\Microsoft.AspNetCore.Http.Abstractions.Tests.csproj", "{C28045AC-FF16-468C-A1E8-EC192DA2EF19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions.Tests", "Http.Abstractions\test\Microsoft.AspNetCore.Http.Abstractions.Tests.csproj", "{C28045AC-FF16-468C-A1E8-EC192DA2EF19}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Extensions", "Http.Extensions", "{CCC61332-7D63-4DDB-B604-884670157624}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Extensions", "Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{C06F2A33-B887-46BB-8F51-2666EDBE5D38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{C06F2A33-B887-46BB-8F51-2666EDBE5D38}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "Http.Extensions\test\Microsoft.AspNetCore.Http.Extensions.Tests.csproj", "{BC50C116-2F25-4BC9-BDDC-7B3BA4A0BA07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "Http.Extensions\test\Microsoft.AspNetCore.Http.Extensions.Tests.csproj", "{BC50C116-2F25-4BC9-BDDC-7B3BA4A0BA07}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Features", "Http.Features", "{0B1B3E58-DA37-46D6-B791-47739EF27790}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Features", "Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{F6DEA0F5-79D0-4BC9-BFC9-CA6360B8B4E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{F6DEA0F5-79D0-4BC9-BFC9-CA6360B8B4E6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.Features.Tests", "Http.Features\test\Microsoft.AspNetCore.Http.Features.Tests.csproj", "{5A64C915-7045-4100-B2CB-3A50BD854D2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features.Tests", "Http.Features\test\Microsoft.AspNetCore.Http.Features.Tests.csproj", "{5A64C915-7045-4100-B2CB-3A50BD854D2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Owin", "Owin", "{4D5C4F16-5DC5-4244-A10F-08545126F61B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Owin", "Owin\src\Microsoft.AspNetCore.Owin.csproj", "{21624719-422E-4621-A17A-C6F10436F1FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin", "Owin\src\Microsoft.AspNetCore.Owin.csproj", "{21624719-422E-4621-A17A-C6F10436F1FE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Owin.Tests", "Owin\test\Microsoft.AspNetCore.Owin.Tests.csproj", "{38EA14B3-17BB-44F4-A9EA-A8675E9BF1E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin.Tests", "Owin\test\Microsoft.AspNetCore.Owin.Tests.csproj", "{38EA14B3-17BB-44F4-A9EA-A8675E9BF1E4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{391FBA36-BEEB-411A-A588-3F83901C0C1A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{2378049E-ABE9-4843-AAC7-A6C9E704463D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{2378049E-ABE9-4843-AAC7-A6C9E704463D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebUtilities", "WebUtilities", "{80A090C8-ED02-4DE3-875A-30DCCDBD84BA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.WebUtilities", "WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{1A866315-5FD5-4F96-BFAC-1447E3CB4514}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{1A866315-5FD5-4F96-BFAC-1447E3CB4514}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.WebUtilities.Tests", "WebUtilities\test\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Tests", "WebUtilities\test\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing", "Routing", "{14A7B3DE-46C8-4245-B0BD-9AFF3795C163}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "Routing\perf\Microsoft.AspNetCore.Routing.Performance.csproj", "{1A74D674-5D19-4575-B443-8B7ED433EF2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "Routing\src\Microsoft.AspNetCore.Routing.csproj", "{B8812D83-0F76-48F4-B716-C7356DB51E72}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "Routing\test\FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{215E7408-A123-4B5F-B625-59ED22031109}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Tests", "Routing\test\UnitTests\Microsoft.AspNetCore.Routing.Tests.csproj", "{8B64326C-A87F-4157-8337-22B5C4D7A4B7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing.Abstractions", "Routing.Abstractions", "{24D19E8E-25FD-4C0B-8865-697878B67BE0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "Routing.Abstractions\test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,9 +86,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{565B7B00-96A1-49B8-9753-9E045C6527A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{565B7B00-96A1-49B8-9753-9E045C6527A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -288,6 +303,93 @@ Global
{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8}.Release|x64.Build.0 = Release|Any CPU
{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8}.Release|x86.ActiveCfg = Release|Any CPU
{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8}.Release|x86.Build.0 = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|x64.Build.0 = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Debug|x86.Build.0 = Debug|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|x64.ActiveCfg = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|x64.Build.0 = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|x86.ActiveCfg = Release|Any CPU
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B}.Release|x86.Build.0 = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|x64.Build.0 = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Debug|x86.Build.0 = Debug|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|x64.ActiveCfg = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|x64.Build.0 = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|x86.ActiveCfg = Release|Any CPU
+ {B8812D83-0F76-48F4-B716-C7356DB51E72}.Release|x86.Build.0 = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|x64.Build.0 = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Debug|x86.Build.0 = Debug|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|Any CPU.Build.0 = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|x64.ActiveCfg = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|x64.Build.0 = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|x86.ActiveCfg = Release|Any CPU
+ {215E7408-A123-4B5F-B625-59ED22031109}.Release|x86.Build.0 = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|x64.Build.0 = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Debug|x86.Build.0 = Debug|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|x64.ActiveCfg = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|x64.Build.0 = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|x86.ActiveCfg = Release|Any CPU
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7}.Release|x86.Build.0 = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|x64.Build.0 = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Debug|x86.Build.0 = Debug|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|x64.ActiveCfg = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|x64.Build.0 = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|x86.ActiveCfg = Release|Any CPU
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F}.Release|x86.Build.0 = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|x64.Build.0 = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Debug|x86.Build.0 = Debug|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|x64.ActiveCfg = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|x64.Build.0 = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|x86.ActiveCfg = Release|Any CPU
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F}.Release|x86.Build.0 = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|x64.Build.0 = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Debug|x86.Build.0 = Debug|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|x64.ActiveCfg = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|x64.Build.0 = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|x86.ActiveCfg = Release|Any CPU
+ {BF8DC0FF-96F9-4705-8CFA-F42BE989AB6A}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{565B7B00-96A1-49B8-9753-9E045C6527A2} = {587C3D55-6092-4B86-99F5-E9772C9C1ADB}
@@ -308,5 +410,14 @@ Global
{2378049E-ABE9-4843-AAC7-A6C9E704463D} = {391FBA36-BEEB-411A-A588-3F83901C0C1A}
{1A866315-5FD5-4F96-BFAC-1447E3CB4514} = {80A090C8-ED02-4DE3-875A-30DCCDBD84BA}
{068A1DA0-C7DF-4E3C-9933-4E79A141EFF8} = {80A090C8-ED02-4DE3-875A-30DCCDBD84BA}
+ {1A74D674-5D19-4575-B443-8B7ED433EF2B} = {14A7B3DE-46C8-4245-B0BD-9AFF3795C163}
+ {B8812D83-0F76-48F4-B716-C7356DB51E72} = {14A7B3DE-46C8-4245-B0BD-9AFF3795C163}
+ {215E7408-A123-4B5F-B625-59ED22031109} = {14A7B3DE-46C8-4245-B0BD-9AFF3795C163}
+ {8B64326C-A87F-4157-8337-22B5C4D7A4B7} = {14A7B3DE-46C8-4245-B0BD-9AFF3795C163}
+ {3E8E6EAC-4C92-46C5-AED0-5F3C0745D34F} = {24D19E8E-25FD-4C0B-8865-697878B67BE0}
+ {E4AC79A3-625B-421B-9F91-EFCBD9BEB37F} = {24D19E8E-25FD-4C0B-8865-697878B67BE0}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {85B5E151-2E9D-419C-83DD-0DDCF446C83A}
EndGlobalSection
EndGlobal
diff --git a/src/Http/Routing.sln b/src/Http/Routing.sln
deleted file mode 100644
index 12dd032b935..00000000000
--- a/src/Http/Routing.sln
+++ /dev/null
@@ -1,137 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing", "Routing", "{240298B6-6729-4844-9B30-B8BC0CD12772}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Performance", "Routing\perf\Microsoft.AspNetCore.Routing.Performance.csproj", "{D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing", "Routing\src\Microsoft.AspNetCore.Routing.csproj", "{A69248B5-2ACE-4B52-B0B0-63AD54D52543}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B2D195B-4997-4CCE-9846-4A848A6F258D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "Routing\test\FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web", "Routing\test\testassets\RoutingSample.Web\RoutingSample.Web.csproj", "{D411FC83-9EE6-401D-8242-47CD7347E42E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Tests", "Routing\test\UnitTests\Microsoft.AspNetCore.Routing.Tests.csproj", "{3F9CEBB1-A50D-4869-B555-81E572E62D18}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing.Abstractions", "Routing.Abstractions", "{485B8E11-FC7C-464F-8CB2-A164DAB30D58}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Abstractions", "Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "Routing.Abstractions\test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{32C5C558-E104-4DC4-9311-890697DE8D65}"
-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(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.Build.0 = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.Build.0 = Debug|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.Build.0 = Release|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.ActiveCfg = Release|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.Build.0 = Release|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.ActiveCfg = Release|Any CPU
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.Build.0 = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.Build.0 = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.Build.0 = Debug|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.Build.0 = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.ActiveCfg = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.Build.0 = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.ActiveCfg = Release|Any CPU
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.Build.0 = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.ActiveCfg = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.Build.0 = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.Build.0 = Debug|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.Build.0 = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.ActiveCfg = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.Build.0 = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.ActiveCfg = Release|Any CPU
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.Build.0 = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.Build.0 = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.Build.0 = Debug|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.Build.0 = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.ActiveCfg = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.Build.0 = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.ActiveCfg = Release|Any CPU
- {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.Build.0 = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.Build.0 = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.Build.0 = Debug|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.Build.0 = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.ActiveCfg = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.Build.0 = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.ActiveCfg = Release|Any CPU
- {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.Build.0 = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.Build.0 = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.Build.0 = Debug|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.Build.0 = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.ActiveCfg = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.Build.0 = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.ActiveCfg = Release|Any CPU
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.Build.0 = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.ActiveCfg = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.Build.0 = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.ActiveCfg = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.Build.0 = Debug|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.Build.0 = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.ActiveCfg = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.Build.0 = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.ActiveCfg = Release|Any CPU
- {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F} = {240298B6-6729-4844-9B30-B8BC0CD12772}
- {A69248B5-2ACE-4B52-B0B0-63AD54D52543} = {240298B6-6729-4844-9B30-B8BC0CD12772}
- {8B2D195B-4997-4CCE-9846-4A848A6F258D} = {240298B6-6729-4844-9B30-B8BC0CD12772}
- {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22} = {8B2D195B-4997-4CCE-9846-4A848A6F258D}
- {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5} = {8B2D195B-4997-4CCE-9846-4A848A6F258D}
- {D411FC83-9EE6-401D-8242-47CD7347E42E} = {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5}
- {3F9CEBB1-A50D-4869-B555-81E572E62D18} = {8B2D195B-4997-4CCE-9846-4A848A6F258D}
- {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58}
- {32C5C558-E104-4DC4-9311-890697DE8D65} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58}
- EndGlobalSection
-EndGlobal
diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
index a244399882b..cc8684caf40 100644
--- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
+
<PropertyGroup>
<Description>ASP.NET Core middleware for routing requests to application logic and for generating links.
Commonly used types:
diff --git a/src/Http/startvs.cmd b/src/Http/startvs.cmd
new file mode 100644
index 00000000000..fcb2bda2711
--- /dev/null
+++ b/src/Http/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0HttpAbstractions.sln
diff --git a/src/Middleware/CORS/test/Test/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/UnitTests/CorsMiddlewareFunctionalTest.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsMiddlewareFunctionalTest.cs
rename to src/Middleware/CORS/test/UnitTests/CorsMiddlewareFunctionalTest.cs
diff --git a/src/Middleware/CORS/test/Test/CorsMiddlewareTests.cs b/src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsMiddlewareTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsOptionsTest.cs b/src/Middleware/CORS/test/UnitTests/CorsOptionsTest.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsOptionsTest.cs
rename to src/Middleware/CORS/test/UnitTests/CorsOptionsTest.cs
diff --git a/src/Middleware/CORS/test/Test/CorsPolicyBuilderTests.cs b/src/Middleware/CORS/test/UnitTests/CorsPolicyBuilderTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsPolicyBuilderTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsPolicyBuilderTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsPolicyExtensionsTests.cs b/src/Middleware/CORS/test/UnitTests/CorsPolicyExtensionsTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsPolicyExtensionsTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsPolicyExtensionsTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsPolicyTests.cs b/src/Middleware/CORS/test/UnitTests/CorsPolicyTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsPolicyTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsPolicyTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsResultTests.cs b/src/Middleware/CORS/test/UnitTests/CorsResultTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsResultTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsResultTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsServiceTests.cs b/src/Middleware/CORS/test/UnitTests/CorsServiceTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsServiceTests.cs
rename to src/Middleware/CORS/test/UnitTests/CorsServiceTests.cs
diff --git a/src/Middleware/CORS/test/Test/CorsTestFixtureOfT.cs b/src/Middleware/CORS/test/UnitTests/CorsTestFixtureOfT.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/CorsTestFixtureOfT.cs
rename to src/Middleware/CORS/test/UnitTests/CorsTestFixtureOfT.cs
diff --git a/src/Middleware/CORS/test/Test/DefaultCorsPolicyProviderTests.cs b/src/Middleware/CORS/test/UnitTests/DefaultCorsPolicyProviderTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/DefaultCorsPolicyProviderTests.cs
rename to src/Middleware/CORS/test/UnitTests/DefaultCorsPolicyProviderTests.cs
diff --git a/src/Middleware/CORS/test/Test/Microsoft.AspNetCore.Cors.Test.csproj b/src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj
similarity index 100%
rename from src/Middleware/CORS/test/Test/Microsoft.AspNetCore.Cors.Test.csproj
rename to src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj
diff --git a/src/Middleware/CORS/test/Test/TestCorsOptions.cs b/src/Middleware/CORS/test/UnitTests/TestCorsOptions.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/TestCorsOptions.cs
rename to src/Middleware/CORS/test/UnitTests/TestCorsOptions.cs
diff --git a/src/Middleware/CORS/test/Test/UriHelpersTests.cs b/src/Middleware/CORS/test/UnitTests/UriHelpersTests.cs
similarity index 100%
rename from src/Middleware/CORS/test/Test/UriHelpersTests.cs
rename to src/Middleware/CORS/test/UnitTests/UriHelpersTests.cs
diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln
index 1cf54bf06d1..4967def70b4 100644
--- a/src/Middleware/Middleware.sln
+++ b/src/Middleware/Middleware.sln
@@ -135,7 +135,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cors", "Cors", "{7CF63806-4C4F-4C48-8922-A75113975308}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "CORS\test\Test\Microsoft.AspNetCore.Cors.Test.csproj", "{12AC0566-2B11-433D-81D7-7116C939FAFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "CORS\test\UnitTests\Microsoft.AspNetCore.Cors.Test.csproj", "{12AC0566-2B11-433D-81D7-7116C939FAFE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4967DE1B-FEC2-4C2B-8F7F-6262D67C9434}"
EndProject
@@ -151,9 +151,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticFileSample", "StaticF
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.FunctionalTests", "StaticFiles\test\FunctionalTests\Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj", "{7EE15C68-E49B-4362-A53D-A71193B0A3D1}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.Tests", "StaticFiles\test\Tests\Microsoft.AspNetCore.StaticFiles.Tests.csproj", "{112CDD7E-8DEE-407B-A52F-E436CD748F0F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RangeHelper.Sources.Test", "StaticFiles\test\RangeHelper.Sources.Test\Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj", "{E949DA91-9023-4B2A-B16E-F8CFE85F3074}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.Tests", "StaticFiles\test\UnitTests\Microsoft.AspNetCore.StaticFiles.Tests.csproj", "{112CDD7E-8DEE-407B-A52F-E436CD748F0F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCaching", "ResponseCaching", "{EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}"
EndProject
@@ -167,6 +165,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{D0204B45-8528-4504-9FC1-D229F3A33896}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FD1C2473-5485-4105-87CB-617158F90FCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\http\http\src\Microsoft.AspNetCore.Http.csproj", "{9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{03EA49FF-EF19-476C-8FCF-C426860751A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{0186A5D0-6D05-4C19-BB81-E49A51745FFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{17B7BFF6-4E72-410C-B690-02741505500A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "..\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{260E77CB-800F-4A13-BE92-9CAA097705C2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{ACA6DDB9-7592-47CE-A740-D15BF307E9E0}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -801,18 +817,6 @@ Global
{112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x64.Build.0 = Release|Any CPU
{112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x86.ActiveCfg = Release|Any CPU
{112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x86.Build.0 = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x64.Build.0 = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x86.Build.0 = Debug|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|Any CPU.Build.0 = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x64.ActiveCfg = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x64.Build.0 = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x86.ActiveCfg = Release|Any CPU
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x86.Build.0 = Release|Any CPU
{7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -861,6 +865,102 @@ Global
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x64.Build.0 = Release|Any CPU
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.ActiveCfg = Release|Any CPU
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.Build.0 = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x64.Build.0 = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x86.Build.0 = Debug|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|x64.ActiveCfg = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|x64.Build.0 = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|x86.ActiveCfg = Release|Any CPU
+ {FD1C2473-5485-4105-87CB-617158F90FCA}.Release|x86.Build.0 = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|x64.Build.0 = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Debug|x86.Build.0 = Debug|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|x64.ActiveCfg = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|x64.Build.0 = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|x86.ActiveCfg = Release|Any CPU
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}.Release|x86.Build.0 = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|x64.Build.0 = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Debug|x86.Build.0 = Debug|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|x64.ActiveCfg = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|x64.Build.0 = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|x86.ActiveCfg = Release|Any CPU
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5}.Release|x86.Build.0 = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|x64.Build.0 = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Debug|x86.Build.0 = Debug|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|x64.ActiveCfg = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|x64.Build.0 = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|x86.ActiveCfg = Release|Any CPU
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0}.Release|x86.Build.0 = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|x64.Build.0 = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Debug|x86.Build.0 = Debug|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|x64.ActiveCfg = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|x64.Build.0 = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|x86.ActiveCfg = Release|Any CPU
+ {03EA49FF-EF19-476C-8FCF-C426860751A8}.Release|x86.Build.0 = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|x64.Build.0 = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Debug|x86.Build.0 = Debug|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|x64.ActiveCfg = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|x64.Build.0 = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|x86.ActiveCfg = Release|Any CPU
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF}.Release|x86.Build.0 = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|x64.Build.0 = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Debug|x86.Build.0 = Debug|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|x64.ActiveCfg = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|x64.Build.0 = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|x86.ActiveCfg = Release|Any CPU
+ {17B7BFF6-4E72-410C-B690-02741505500A}.Release|x86.Build.0 = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|x64.Build.0 = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Debug|x86.Build.0 = Debug|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|x64.ActiveCfg = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|x64.Build.0 = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|x86.ActiveCfg = Release|Any CPU
+ {260E77CB-800F-4A13-BE92-9CAA097705C2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -927,11 +1027,18 @@ Global
{85E30300-8205-4E1F-A141-0642CE146B65} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B}
{7EE15C68-E49B-4362-A53D-A71193B0A3D1} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B}
{112CDD7E-8DEE-407B-A52F-E436CD748F0F} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B}
- {E949DA91-9023-4B2A-B16E-F8CFE85F3074} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B}
{7583CA2C-249C-44A2-8499-8D4C1AB35ADE} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}
{D8239A8C-F692-460A-B204-5CF05502BEE2} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}
{9F973483-5D32-4093-88F0-761C9BEAEE04} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}
{D0204B45-8528-4504-9FC1-D229F3A33896} = {7A493DEA-32F2-4AB1-9113-828D44F5DDA2}
+ {FD1C2473-5485-4105-87CB-617158F90FCA} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {CB8AD0DF-00CE-443B-AAC4-3A5CCEDC6AD0} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {03EA49FF-EF19-476C-8FCF-C426860751A8} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {0186A5D0-6D05-4C19-BB81-E49A51745FFF} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {17B7BFF6-4E72-410C-B690-02741505500A} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
+ {260E77CB-800F-4A13-BE92-9CAA097705C2} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA}
diff --git a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
index e6961063b6d..27034051b3b 100644
--- a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
+++ b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="$(RepositoryRoot)\src\Shared\RangeHelper\**\*.cs" />
+ <Compile Include="$(SharedSourceRoot)RangeHelper\**\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj b/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj
deleted file mode 100644
index eb5eb09b537..00000000000
--- a/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- </PropertyGroup>
-
- <ItemGroup>
- <Compile Include="$(SharedSourceRoot)RangeHelper\**\*.cs" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="Microsoft.AspNetCore.Http" />
- <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
- <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
- </ItemGroup>
-
-</Project>
diff --git a/src/Middleware/StaticFiles/test/Tests/CacheHeaderTests.cs b/src/Middleware/StaticFiles/test/UnitTests/CacheHeaderTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/CacheHeaderTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/CacheHeaderTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/DefaultContentTypeProviderTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DefaultContentTypeProviderTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/DefaultContentTypeProviderTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/DefaultContentTypeProviderTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/DefaultFilesMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/DefaultFilesMiddlewareTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/DirectoryBrowserMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/DirectoryBrowserMiddlewareTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/src/Middleware/StaticFiles/test/UnitTests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
similarity index 89%
rename from src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
rename to src/Middleware/StaticFiles/test/UnitTests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
index d680844342e..b60ccd07ed0 100644
--- a/src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
+++ b/src/Middleware/StaticFiles/test/UnitTests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
@@ -5,7 +5,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)RangeHelper\**\*.cs" />
<Content Include="SubFolder\**\*;TestDocument.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
diff --git a/src/Middleware/StaticFiles/test/Tests/RangeHeaderTests.cs b/src/Middleware/StaticFiles/test/UnitTests/RangeHeaderTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/RangeHeaderTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/RangeHeaderTests.cs
diff --git a/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/RangeHelperTests.cs b/src/Middleware/StaticFiles/test/UnitTests/RangeHelperTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/RangeHelperTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/RangeHelperTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/StaticFileContextTest.cs b/src/Middleware/StaticFiles/test/UnitTests/StaticFileContextTest.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/StaticFileContextTest.cs
rename to src/Middleware/StaticFiles/test/UnitTests/StaticFileContextTest.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/StaticFileMiddlewareTests.cs
rename to src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/StaticFilesTestServer.cs b/src/Middleware/StaticFiles/test/UnitTests/StaticFilesTestServer.cs
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/StaticFilesTestServer.cs
rename to src/Middleware/StaticFiles/test/UnitTests/StaticFilesTestServer.cs
diff --git a/src/Middleware/StaticFiles/test/Tests/SubFolder/Empty.txt b/src/Middleware/StaticFiles/test/UnitTests/SubFolder/Empty.txt
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/SubFolder/Empty.txt
rename to src/Middleware/StaticFiles/test/UnitTests/SubFolder/Empty.txt
diff --git a/src/Middleware/StaticFiles/test/Tests/SubFolder/SingleByte.txt b/src/Middleware/StaticFiles/test/UnitTests/SubFolder/SingleByte.txt
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/SubFolder/SingleByte.txt
rename to src/Middleware/StaticFiles/test/UnitTests/SubFolder/SingleByte.txt
diff --git a/src/Middleware/StaticFiles/test/Tests/SubFolder/default.html b/src/Middleware/StaticFiles/test/UnitTests/SubFolder/default.html
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/SubFolder/default.html
rename to src/Middleware/StaticFiles/test/UnitTests/SubFolder/default.html
diff --git a/src/Middleware/StaticFiles/test/Tests/SubFolder/extra.xml b/src/Middleware/StaticFiles/test/UnitTests/SubFolder/extra.xml
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/SubFolder/extra.xml
rename to src/Middleware/StaticFiles/test/UnitTests/SubFolder/extra.xml
diff --git a/src/Middleware/StaticFiles/test/Tests/SubFolder/ranges.txt b/src/Middleware/StaticFiles/test/UnitTests/SubFolder/ranges.txt
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/SubFolder/ranges.txt
rename to src/Middleware/StaticFiles/test/UnitTests/SubFolder/ranges.txt
diff --git a/src/Middleware/StaticFiles/test/Tests/TestDocument.txt b/src/Middleware/StaticFiles/test/UnitTests/TestDocument.txt
similarity index 100%
rename from src/Middleware/StaticFiles/test/Tests/TestDocument.txt
rename to src/Middleware/StaticFiles/test/UnitTests/TestDocument.txt
diff --git a/src/Middleware/startvs.cmd b/src/Middleware/startvs.cmd
new file mode 100644
index 00000000000..9f52f3b9297
--- /dev/null
+++ b/src/Middleware/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Middleware.sln
diff --git a/src/Servers/Directory.Build.props b/src/Servers/Directory.Build.props
index 6b358026891..7e9f2b815b9 100644
--- a/src/Servers/Directory.Build.props
+++ b/src/Servers/Directory.Build.props
@@ -2,8 +2,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <BaseIntermediateOutputPath>$(RepositoryRoot)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
- <BaseOutputPath>$(RepositoryRoot)bin\$(MSBuildProjectName)\</BaseOutputPath>
+ <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+ <BaseOutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\</BaseOutputPath>
</PropertyGroup>
</Project>
diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln
index 48fc57dd11b..fd42a5e6660 100644
--- a/src/Servers/Kestrel.sln
+++ b/src/Servers/Kestrel.sln
@@ -53,6 +53,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libuv.BindTests", "Kestrel\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.BindTests", "Kestrel\test\Sockets.BindTests\Sockets.BindTests.csproj", "{94135813-EBCC-4E4E-8B12-8E5BD58E1350}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2B456D08-F72B-4EB8-B663-B6D78FC04BF8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0968A626-BA09-4B0D-B45F-855CD0F16F6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{CE32EDC9-F78C-45C6-A298-C437DA5EA438}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\http\src\Microsoft.AspNetCore.Http.csproj", "{52EBE728-0F8E-4159-B420-338CE38C4281}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{F0A1281A-B512-49D2-8362-21EE32B3674F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -327,11 +341,65 @@ Global
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x64.Build.0 = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.ActiveCfg = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.Build.0 = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|x64.Build.0 = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Debug|x86.Build.0 = Debug|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|x64.ActiveCfg = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|x64.Build.0 = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|x86.ActiveCfg = Release|Any CPU
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438}.Release|x86.Build.0 = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|x64.Build.0 = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Debug|x86.Build.0 = Debug|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|x64.ActiveCfg = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|x64.Build.0 = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|x86.ActiveCfg = Release|Any CPU
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E}.Release|x86.Build.0 = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|x64.Build.0 = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Debug|x86.Build.0 = Debug|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|Any CPU.Build.0 = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|x64.ActiveCfg = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|x64.Build.0 = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|x86.ActiveCfg = Release|Any CPU
+ {52EBE728-0F8E-4159-B420-338CE38C4281}.Release|x86.Build.0 = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|x64.Build.0 = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Debug|x86.Build.0 = Debug|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|x64.ActiveCfg = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|x64.Build.0 = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|x86.ActiveCfg = Release|Any CPU
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
+ {710E0641-FFF4-4994-A7FA-B22A550A8F20} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {5F6D1661-652E-4DF3-8A81-6EBE4208CE1A} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {AA10418F-3291-4011-8BF5-84F315F472B5} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
+ {1C342888-3514-4ECE-9820-1C7BD59EA29F} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {051BE5E3-073C-4CD2-92AB-7742B2931409} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {B46DA84E-8442-4988-9B43-6A83812A35B7} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
{0730A71E-CC07-4445-AC56-606B59BBF51F} = {40FEAA2F-DDF0-4FA3-942A-0D39B722DDE7}
{4641895A-5E44-4158-91C9-B3718398229E} = {40FEAA2F-DDF0-4FA3-942A-0D39B722DDE7}
{B5C4C2EA-5439-457D-9487-924A42E4D74D} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
@@ -339,7 +407,19 @@ Global
{0710F560-A741-4139-BC1F-BFF1895F1274} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
{F9D090D2-0568-403D-ADBA-9E079397B584} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
{01D031FC-61A5-45BD-BE11-57FA00BE1BCD} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
+ {3CCA24C1-04AC-48C0-A60A-D43FE7479529} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
+ {28DD5565-0546-48B0-973A-B27E1C9AD032} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
{3615A580-A595-4B64-A8C7-FD361E712BEA} = {0256853E-1FDA-45C6-9641-87306D378508}
+ {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {551F655B-F33C-4CD6-851F-4DFB89FA96A0} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {6716895A-A00E-4BAC-92DF-4F8C859BC51E} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
+ {C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8}
+ {B211AEE8-F28F-45A4-9C71-81691D7C99E1} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
+ {94135813-EBCC-4E4E-8B12-8E5BD58E1350} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C}
+ {CE32EDC9-F78C-45C6-A298-C437DA5EA438} = {F0A1281A-B512-49D2-8362-21EE32B3674F}
+ {6BAE8654-7D3D-4E29-8314-9AB28E81CC1E} = {F0A1281A-B512-49D2-8362-21EE32B3674F}
+ {52EBE728-0F8E-4159-B420-338CE38C4281} = {F0A1281A-B512-49D2-8362-21EE32B3674F}
+ {5FAEC63D-FF6B-4228-8883-7F1FAC6EAF61} = {F0A1281A-B512-49D2-8362-21EE32B3674F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {48207B50-7D05-4B10-B585-890FE0F4FCE1}
diff --git a/src/Servers/Kestrel/test/FunctionalTests/GeneratedCodeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/GeneratedCodeTests.cs
index 862890542f5..8f5405c6dd8 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/GeneratedCodeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/GeneratedCodeTests.cs
@@ -13,11 +13,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[Fact]
public void GeneratedCodeIsUpToDate()
{
- var repositoryRoot = TestPathUtilities.GetSolutionRootDirectory("Microsoft.AspNetCore");
+ var kestrelSlnDir = TestPathUtilities.GetSolutionRootDirectory("Kestrel");
- var httpHeadersGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs");
- var httpProtocolGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs");
- var httpUtilitiesGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs");
+ var httpHeadersGeneratedPath = Path.Combine(kestrelSlnDir, "Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs");
+ var httpProtocolGeneratedPath = Path.Combine(kestrelSlnDir, "Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs");
+ var httpUtilitiesGeneratedPath = Path.Combine(kestrelSlnDir, "Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs");
var testHttpHeadersGeneratedPath = Path.GetTempFileName();
var testHttpProtocolGeneratedPath = Path.GetTempFileName();
diff --git a/src/Servers/startvs.cmd b/src/Servers/startvs.cmd
new file mode 100644
index 00000000000..d4c18e9bcdc
--- /dev/null
+++ b/src/Servers/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Kestrel.sln
diff --git a/startvs.cmd b/startvs.cmd
new file mode 100644
index 00000000000..05cd3ebfda0
--- /dev/null
+++ b/startvs.cmd
@@ -0,0 +1,32 @@
+@ECHO OFF
+
+:: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK.
+
+IF "%DOTNET_HOME%"=="" (
+ set DOTNET_HOME=%USERPROFILE%\.dotnet\x64
+)
+
+:: This tells .NET Core to use the same dotnet.exe that build scripts use
+SET DOTNET_ROOT=%DOTNET_HOME%
+
+:: This tells .NET Core not to go looking for .NET Core in other places
+SET DOTNET_MULTILEVEL_LOOKUP=0
+
+:: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
+SET PATH=%DOTNET_ROOT%;%PATH%
+
+SET sln=%1
+
+IF NOT EXIST %DOTNET_ROOT%\dotnet.exe (
+ echo .NET Core has not yet been installed. Run `build.cmd -restore` to install tools
+ exit /b 1
+)
+
+IF "%sln%"=="" (
+ echo Error^: Expected argument ^<SLN_FILE^>
+ echo Usage^: startvs.cmd ^<SLN_FILE^>
+
+ exit /b 1
+)
+
+start %sln%
--
GitLab