diff --git a/.gitmodules b/.gitmodules
index 6f499e11ac..6526061429 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "modules/BasicMiddleware"]
-	path = modules/BasicMiddleware
-	url = https://github.com/aspnet/BasicMiddleware.git
-	branch = release/2.1
 [submodule "modules/EntityFrameworkCore"]
 	path = modules/EntityFrameworkCore
 	url = https://github.com/aspnet/EntityFrameworkCore.git
diff --git a/Directory.Build.props b/Directory.Build.props
index 1999dba76d..5454304e42 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,7 +26,7 @@
     <IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
     <IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
     <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
-    <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('samples'))">true</IsSampleProject>
+    <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
 
     <IncludeSource>false</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index eea5ccac3a..6f505f9875 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,7 +5,7 @@
     <IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' ) ">false</IsPackable>
   </PropertyGroup>
 
-  <Import Project="eng\Baseline.props" />
+  <Import Project="eng\Baseline.Designer.props" />
 
   <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
     <!-- Always include framework metapackages in patch updates. -->
diff --git a/build/artifacts.props b/build/artifacts.props
index 562dce567f..63d8d11c9b 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -51,7 +51,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 5c986b99ca..799bbea1c6 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -10,7 +10,6 @@
     <RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
     <RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
-    <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
     <RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
     <RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
     <RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
diff --git a/build/submodules.props b/build/submodules.props
index 926dd6cc07..f473c4b63a 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -51,7 +51,6 @@
     <ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <ShippedRepository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
     <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
-    <ShippedRepository Include="BasicMiddleware" />
     <ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
     <ShippedRepository Include="EntityFrameworkCore" />
     <ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
diff --git a/eng/Baseline.props b/eng/Baseline.Designer.props
similarity index 87%
rename from eng/Baseline.props
rename to eng/Baseline.Designer.props
index cfffc5ac37..a5779d6cef 100644
--- a/eng/Baseline.props
+++ b/eng/Baseline.Designer.props
@@ -154,6 +154,16 @@
     <BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
     <BaselinePackageReference Include="System.Reflection.Metadata" Version="[1.6.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.HostFiltering-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Hosting.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.Abstractions' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -244,6 +254,26 @@
     <BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.HttpOverrides-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.HttpsPolicy-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.JsonPatch-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -268,6 +298,30 @@
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.ResponseCompression-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'net461' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Rewrite-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
     <BaselinePackageVersion>2.1.3</BaselinePackageVersion>
diff --git a/eng/tools/BaselineGenerator/baseline.xml b/eng/Baseline.xml
similarity index 89%
rename from eng/tools/BaselineGenerator/baseline.xml
rename to eng/Baseline.xml
index a80c37073f..584a0b82b2 100644
--- a/eng/tools/BaselineGenerator/baseline.xml
+++ b/eng/Baseline.xml
@@ -18,6 +18,7 @@
   <Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.HostFiltering" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.1" />
@@ -27,9 +28,13 @@
   <Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 26682cf318..c90d06dd27 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -31,6 +31,7 @@
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Process.Sources" Version="$(MicrosoftExtensionsProcessSourcesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(MicrosoftExtensionsRazorViewsSourcesPackageVersion)" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 6ca71ee0f7..90805872f6 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -42,7 +42,12 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.HostFiltering" ProjectPath="$(RepositoryRoot)src\Middleware\HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpOverrides" ProjectPath="$(RepositoryRoot)src\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpsPolicy" ProjectPath="$(RepositoryRoot)src\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
   </ItemGroup>
 </Project>
diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
index 625777dbd2..8e7d5913a6 100644
--- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj
+++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <StartArguments>-o "$(MSBuildThisFileDirectory)../../Baseline.props"</StartArguments>
-    <StartWorkingDirectory>$(MSBuildProjectDirectory)</StartWorkingDirectory>
+    <StartArguments>-o "$(MSBuildThisFileDirectory)../../Baseline.Designer.props"</StartArguments>
+    <StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index d3d753a5ba..7b28b83ae0 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -48,11 +48,11 @@ namespace PackageBaselineGenerator
             var tempDir = Path.Combine(Directory.GetCurrentDirectory(), "obj", "tmp");
             Directory.CreateDirectory(tempDir);
 
-            var input = XDocument.Load(Path.Combine(Directory.GetCurrentDirectory(), "baseline.xml"));
+            var input = XDocument.Load(Path.Combine(Directory.GetCurrentDirectory(), "Baseline.xml"));
 
             var output = _output.HasValue()
                 ? _output.Value()
-                : Path.Combine(Directory.GetCurrentDirectory(), "Baseline.props");
+                : Path.Combine(Directory.GetCurrentDirectory(), "Baseline.Designer.props");
 
             var baselineVersion = input.Root.Attribute("Version").Value;
 
diff --git a/eng/tools/BaselineGenerator/README.md b/eng/tools/BaselineGenerator/README.md
index 1afd97d1b5..1fd73b17f7 100644
--- a/eng/tools/BaselineGenerator/README.md
+++ b/eng/tools/BaselineGenerator/README.md
@@ -5,6 +5,6 @@ This tool is used to generate an MSBuild file which sets the "baseline" against
 
 ## Usage
 
-1. Add to the [baseline.xml](./baseline.xml) a list of package ID's and their latest released versions. The source of this information can typically
+1. Add to the [Baseline.xml](/eng/Baseline.xml) a list of package ID's and their latest released versions. The source of this information can typically
   be found in the build.xml file generated during ProdCon builds. See https://github.com/dotnet/versions/blob/master/build-info/dotnet/product/cli/release/2.1.6/build.xml for example.
 2. Run `dotnet run` on this project.
diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware
deleted file mode 160000
index 1de636cd18..0000000000
--- a/modules/BasicMiddleware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1de636cd18309070792b68888ca29c8b85fac98b
diff --git a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj
index a430a2df23..dfe8ded9f5 100644
--- a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj
+++ b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.HostFiltering" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
   </ItemGroup>
 
diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
index 880dffd329..eeef37e17e 100644
--- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
+++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.HttpOverrides" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
   </ItemGroup>
 
diff --git a/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj
index 097990a99a..c93a869b78 100644
--- a/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj
+++ b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj
@@ -8,5 +8,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln
index cf3146fbd5..ffb9489843 100644
--- a/src/Middleware/Middleware.sln
+++ b/src/Middleware/Middleware.sln
@@ -67,6 +67,46 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Middle
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "MiddlewareAnalysis\test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj", "{009E3DE7-AFC7-4C66-852D-29BF73257176}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostFiltering", "HostFiltering", "{9298FDED-65F9-4022-A747-FAEC3ADF3AD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostFilteringSample", "HostFiltering\sample\HostFilteringSample.csproj", "{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HostFiltering", "HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj", "{E5DAC3F7-A648-489C-9064-7C744423C68B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HostFiltering.Tests", "HostFiltering\test\Microsoft.AspNetCore.HostFiltering.Tests.csproj", "{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpOverrides", "HttpOverrides", "{09F7106F-2C85-4356-8944-921564A7A7B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpOverridesSample", "HttpOverrides\sample\HttpOverridesSample.csproj", "{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HttpOverrides", "HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{B9BFF064-0B38-4177-893E-BF813D7AE5A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HttpOverrides.Tests", "HttpOverrides\test\Microsoft.AspNetCore.HttpOverrides.Tests.csproj", "{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpsPolicy", "HttpsPolicy", "{3C781334-F0FA-4AD1-B72D-EA6028AA079D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpsPolicySample", "HttpsPolicy\sample\HttpsPolicySample.csproj", "{F897DB9B-AB2A-4074-9EEF-954FF9982407}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HttpsPolicy", "HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.HttpsPolicy.Tests", "HttpsPolicy\test\Microsoft.AspNetCore.HttpsPolicy.Tests.csproj", "{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCompression", "ResponseCompression", "{AE0E9F81-00BE-4A07-9C7D-C17E2B050C5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResponseCompressionSample", "ResponseCompression\sample\ResponseCompressionSample.csproj", "{AB153240-3F22-4C3C-AD4D-283419617B54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCompression", "ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj", "{4B880213-14C2-49CA-8B89-FB8A362085B2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCompression.Tests", "ResponseCompression\test\Microsoft.AspNetCore.ResponseCompression.Tests.csproj", "{1E9519F2-30D2-4119-85EA-5F473BF744CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rewrite", "Rewrite", "{4150EBDB-57AB-4C69-A4F1-068152F4EFF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RewriteSample", "Rewrite\sample\RewriteSample.csproj", "{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Rewrite", "Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{37E12A04-E80E-4C8C-A9EA-2C44AD340884}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Rewrite.Tests", "Rewrite\test\Microsoft.AspNetCore.Rewrite.Tests.csproj", "{11F435FE-0264-4465-A208-885ECBFADABF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -341,6 +381,186 @@ Global
 		{009E3DE7-AFC7-4C66-852D-29BF73257176}.Release|x64.Build.0 = Release|Any CPU
 		{009E3DE7-AFC7-4C66-852D-29BF73257176}.Release|x86.ActiveCfg = Release|Any CPU
 		{009E3DE7-AFC7-4C66-852D-29BF73257176}.Release|x86.Build.0 = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|x64.Build.0 = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Debug|x86.Build.0 = Debug|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|x64.ActiveCfg = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|x64.Build.0 = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|x86.ActiveCfg = Release|Any CPU
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C}.Release|x86.Build.0 = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|x64.Build.0 = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5DAC3F7-A648-489C-9064-7C744423C68B}.Release|x86.Build.0 = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|x64.Build.0 = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728}.Release|x86.Build.0 = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|x64.Build.0 = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Debug|x86.Build.0 = Debug|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|x64.ActiveCfg = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|x64.Build.0 = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|x86.ActiveCfg = Release|Any CPU
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2}.Release|x86.Build.0 = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Debug|x86.Build.0 = Debug|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|x64.Build.0 = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5}.Release|x86.Build.0 = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|x64.Build.0 = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781}.Release|x86.Build.0 = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|x64.Build.0 = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Debug|x86.Build.0 = Debug|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|x64.ActiveCfg = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|x64.Build.0 = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|x86.ActiveCfg = Release|Any CPU
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407}.Release|x86.Build.0 = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|x64.Build.0 = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8}.Release|x86.Build.0 = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|x64.Build.0 = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|x64.ActiveCfg = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|x64.Build.0 = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D}.Release|x86.Build.0 = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|x64.Build.0 = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Debug|x86.Build.0 = Debug|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|x64.ActiveCfg = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|x64.Build.0 = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|x86.ActiveCfg = Release|Any CPU
+		{AB153240-3F22-4C3C-AD4D-283419617B54}.Release|x86.Build.0 = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|x64.Build.0 = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{4B880213-14C2-49CA-8B89-FB8A362085B2}.Release|x86.Build.0 = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|x64.Build.0 = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE}.Release|x86.Build.0 = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|x64.Build.0 = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Debug|x86.Build.0 = Debug|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|x64.ActiveCfg = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|x64.Build.0 = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|x86.ActiveCfg = Release|Any CPU
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D}.Release|x86.Build.0 = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|x64.Build.0 = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Debug|x86.Build.0 = Debug|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|x64.ActiveCfg = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|x64.Build.0 = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|x86.ActiveCfg = Release|Any CPU
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884}.Release|x86.Build.0 = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|x64.Build.0 = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Debug|x86.Build.0 = Debug|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x64.ActiveCfg = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x64.Build.0 = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x86.ActiveCfg = Release|Any CPU
+		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -373,6 +593,21 @@ Global
 		{18F82832-9164-434E-BAEF-6579B3CFCDF3} = {8989BEC1-6D0A-4E11-A09C-B31FD6222748}
 		{7E00616F-9D5C-4318-99CB-8F6ECFA82515} = {91CFB5DE-CE68-4156-9153-6C597D9F524E}
 		{009E3DE7-AFC7-4C66-852D-29BF73257176} = {91CFB5DE-CE68-4156-9153-6C597D9F524E}
+		{9475AF28-CFBD-4C8E-A8E3-80646C514E4C} = {9298FDED-65F9-4022-A747-FAEC3ADF3AD3}
+		{E5DAC3F7-A648-489C-9064-7C744423C68B} = {9298FDED-65F9-4022-A747-FAEC3ADF3AD3}
+		{B5EC74C6-B242-4EDB-B5FC-DB43C0A47728} = {9298FDED-65F9-4022-A747-FAEC3ADF3AD3}
+		{59A0E5E6-B133-4D27-A07B-BF440A4B45C2} = {09F7106F-2C85-4356-8944-921564A7A7B4}
+		{B9BFF064-0B38-4177-893E-BF813D7AE5A5} = {09F7106F-2C85-4356-8944-921564A7A7B4}
+		{8F80CE33-5770-455C-8A0F-D3C1D9CBC781} = {09F7106F-2C85-4356-8944-921564A7A7B4}
+		{F897DB9B-AB2A-4074-9EEF-954FF9982407} = {3C781334-F0FA-4AD1-B72D-EA6028AA079D}
+		{3A9C4E2E-57A0-41EE-8F94-441E6A98F7E8} = {3C781334-F0FA-4AD1-B72D-EA6028AA079D}
+		{A397501E-0FDE-4409-B14C-C6CC55C2DC4D} = {3C781334-F0FA-4AD1-B72D-EA6028AA079D}
+		{AB153240-3F22-4C3C-AD4D-283419617B54} = {AE0E9F81-00BE-4A07-9C7D-C17E2B050C5F}
+		{4B880213-14C2-49CA-8B89-FB8A362085B2} = {AE0E9F81-00BE-4A07-9C7D-C17E2B050C5F}
+		{1E9519F2-30D2-4119-85EA-5F473BF744CE} = {AE0E9F81-00BE-4A07-9C7D-C17E2B050C5F}
+		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
+		{37E12A04-E80E-4C8C-A9EA-2C44AD340884} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
+		{11F435FE-0264-4465-A208-885ECBFADABF} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA}
diff --git a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
index 47cadb7eeb..762a9a1ddd 100644
--- a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
+++ b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
@@ -9,10 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
     <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.Net.Http.Headers" />
-    <Reference Include="Moq" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj
index 1593497c61..87bf4497b5 100644
--- a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj
+++ b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Rewrite" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
 </Project>