diff --git a/Hosting.sln b/Hosting.sln index 2fdc130573..a017111513 100644 --- a/Hosting.sln +++ b/Hosting.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26913.0 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 15.0.26730.03 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0497F39-AFFB-4819-A116-E39E361915AB}" ProjectSection(SolutionItems) = preProject @@ -65,6 +65,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hostin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildWebHostPatternTestSite", "test\TestAssets\BuildWebHostPatternTestSite\BuildWebHostPatternTestSite.csproj", "{37C4BD55-CD39-4C4E-BA01-0AEAFCE128F1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F9074486-EAE4-4171-BC9E-1557C2A56DDE}" + ProjectSection(SolutionItems) = preProject + build\dependencies.props = build\dependencies.props + build\repo.props = build\repo.props + build\sources.props = build\sources.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -333,6 +340,7 @@ Global {45E296BB-7628-49AF-B5A5-04CD9A89CAD3} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0} {3834E274-3AF5-4751-8857-5B67BBE607DD} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0} {37C4BD55-CD39-4C4E-BA01-0AEAFCE128F1} = {FA7D2012-C1B4-4AF7-9ADD-381B2004EA16} + {F9074486-EAE4-4171-BC9E-1557C2A56DDE} = {A7270417-6BC6-4E3F-A96A-79193D16BB82} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AABD536D-E05F-409B-A716-535E0C478076} diff --git a/build/dependencies.props b/build/dependencies.props index 029e5b183b..6268a57dd7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,44 +4,44 @@ 2.1.0-preview2-15721 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 - 2.1.0-preview2-30187 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 + 2.1.0-preview2-30220 2.0.0 - 2.1.0-preview2-26130-04 + 2.1.0-preview2-26225-03 1.0.1 15.6.0 4.7.49 1.4.0 3.2.0 - 4.5.0-preview2-26130-01 + 4.5.0-preview2-26224-02 1.6.0-preview2-26126-03 - 4.5.0-preview2-26130-01 + 4.5.0-preview2-26224-02 2.3.1 2.4.0-beta.1.build3945 diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs index 21da6919b5..75250206d0 100644 --- a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs +++ b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs @@ -28,7 +28,13 @@ namespace Microsoft.AspNetCore.TestHost var handler = new ClientHandler(new PathString("/A/Path/"), new DummyApplication(context => { // TODO: Assert.True(context.RequestAborted.CanBeCanceled); +#if NETCOREAPP2_1 + Assert.Equal("HTTP/2.0", context.Request.Protocol); +#elif NET461 || NETCOREAPP2_0 Assert.Equal("HTTP/1.1", context.Request.Protocol); +#else + Unspecified Framework +#endif Assert.Equal("GET", context.Request.Method); Assert.Equal("https", context.Request.Scheme); Assert.Equal("/A/Path", context.Request.PathBase.Value); @@ -54,7 +60,13 @@ namespace Microsoft.AspNetCore.TestHost var handler = new ClientHandler(new PathString("/A/Path/"), new InspectingApplication(features => { // TODO: Assert.True(context.RequestAborted.CanBeCanceled); +#if NETCOREAPP2_1 + Assert.Equal("HTTP/2.0", features.Get().Protocol); +#elif NET461 || NETCOREAPP2_0 Assert.Equal("HTTP/1.1", features.Get().Protocol); +#else + Unspecified Framework +#endif Assert.Equal("GET", features.Get().Method); Assert.Equal("https", features.Get().Scheme); Assert.Equal("/A/Path", features.Get().PathBase);