From d111e24da71abdcaa0a60a2c4a057926759d5d8c Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 16 Apr 2015 12:07:50 -0700 Subject: [PATCH] #190 - Swap Http and Http.Core package names. Remove Http.Core namespace. --- HttpAbstractions.sln | 10 +++--- .../Authentication/AuthenticateResult.cs | 0 .../AuthenticationDescription.cs | 0 .../AuthenticationProperties.cs | 0 .../ConnectionInfo.cs | 0 .../CookieOptions.cs | 0 .../Extensions/MapExtensions.cs | 0 .../Extensions/MapMiddleware.cs | 0 .../Extensions/MapOptions.cs | 0 .../Extensions/MapWhenExtensions.cs | 0 .../Extensions/MapWhenMiddleware.cs | 0 .../Extensions/MapWhenOptions.cs | 0 .../Extensions/RunExtensions.cs | 0 .../Extensions/UseExtensions.cs | 0 .../FragmentString.cs | 0 .../HostString.cs | 0 .../HttpContext.cs | 0 .../HttpRequest.cs | 0 .../HttpResponse.cs | 0 .../HttpResponseWritingExtensions.cs | 0 .../IApplicationBuilder.cs | 0 .../IFormCollection.cs | 0 .../IFormFile.cs | 0 .../IFormFileCollection.cs | 0 .../IHeaderDictionary.cs | 0 .../IReadableStringCollection.cs | 0 .../IResponseCookies.cs | 0 .../ISessionCollection.cs | 0 .../Microsoft.AspNet.Http.Core.xproj | 2 +- .../PathString.cs | 0 .../QueryString.cs | 0 .../RequestDelegate.cs | 0 src/Microsoft.AspNet.Http.Core/project.json | 23 ++++++++----- .../project.json | 2 +- .../ApplicationBuilder.cs | 0 .../Authentication/AuthenticateContext.cs | 4 +-- .../Authentication/ChallengeContext.cs | 4 +-- .../Authentication/DescribeSchemesContext.cs | 5 ++- .../HttpAuthenticationFeature.cs | 3 +- .../Authentication/SignInContext.cs | 3 +- .../Authentication/SignOutContext.cs | 3 +- .../BufferingHelper.cs | 2 +- .../Collections/FormCollection.cs | 2 +- .../Collections/FormFileCollection.cs | 3 +- .../Collections/HeaderDictionary.cs | 4 +-- .../Collections/ItemsDictionary.cs | 2 +- .../Collections/ReadableStringCollection.cs | 2 +- .../Collections/RequestCookiesCollection.cs | 2 +- .../Collections/ResponseCookies.cs | 2 +- .../Collections/SessionCollection.cs | 2 +- .../DefaultConnectionInfo.cs | 4 +-- .../DefaultHttpContext.cs | 7 ++-- .../DefaultHttpRequest.cs | 5 ++- .../DefaultHttpResponse.cs | 7 ++-- .../FormFeature.cs | 4 +-- .../FormFile.cs | 3 +- .../HttpClientCertificateFeature.cs | 2 +- .../HttpConnectionFeature.cs | 2 +- .../HttpRequestFeature.cs | 3 +- .../HttpResponseFeature.cs | 3 +- .../IFormFeature.cs | 2 +- .../IItemsFeature.cs | 2 +- .../IQueryFeature.cs | 4 +-- .../IRequestCookiesFeature.cs | 4 +-- .../IResponseCookiesFeature.cs | 5 +-- .../IServiceProvidersFeature.cs | 2 +- .../Infrastructure/Constants.cs | 0 .../Infrastructure/FeatureReference.cs | 2 +- .../Infrastructure/ParsingHelpers.cs | 2 +- .../ItemsFeature.cs | 2 +- .../Microsoft.AspNet.Http.xproj | 2 +- .../QueryFeature.cs | 6 ++-- .../ReferenceReadStream.cs | 2 +- .../RequestCookiesFeature.cs | 6 ++-- .../ResponseCookiesFeature.cs | 6 ++-- .../ServiceProvidersFeature.cs | 2 +- .../WebSocketAcceptContext.cs | 4 +-- src/Microsoft.AspNet.Http/project.json | 23 +++++-------- src/Microsoft.AspNet.Owin/OwinEnvironment.cs | 1 - src/Microsoft.AspNet.Owin/OwinExtensions.cs | 1 - src/Microsoft.AspNet.Owin/project.json | 2 -- .../project.json | 4 +-- .../HttpResponseWritingExtensionsTests.cs | 1 - .../MapPathMiddlewareTests.cs | 1 - .../MapPredicateMiddlewareTests.cs | 1 - .../Microsoft.AspNet.Http.Core.Tests.xproj | 2 +- .../PathStringTests.cs | 0 .../project.json | 33 ++++++++----------- .../HeaderDictionaryTypeExtensionsTest.cs | 2 +- .../HttpResponseSendingExtensionsTests.cs | 1 - .../SendFileResponseExtensionsTests.cs | 1 - .../UseWithServicesTests.cs | 1 - .../project.json | 2 -- .../ApplicationBuilderTests.cs | 2 +- .../BufferingHelperTests.cs | 2 +- .../DefaultHttpContextTests.cs | 3 +- .../DefaultHttpRequestTests.cs | 3 +- .../FormFeatureTests.cs | 2 +- .../HeaderDictionaryTests.cs | 4 +-- .../Microsoft.AspNet.Http.Tests.xproj | 2 +- .../QueryFeatureTests.cs | 3 +- test/Microsoft.AspNet.Http.Tests/project.json | 32 +++++++++--------- .../OwinEnvironmentTests.cs | 1 - test/Microsoft.AspNet.Owin.Tests/project.json | 3 -- 104 files changed, 129 insertions(+), 177 deletions(-) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Authentication/AuthenticateResult.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Authentication/AuthenticationDescription.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Authentication/AuthenticationProperties.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/ConnectionInfo.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/CookieOptions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapExtensions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapMiddleware.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapOptions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapWhenExtensions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapWhenMiddleware.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/MapWhenOptions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/RunExtensions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/Extensions/UseExtensions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/FragmentString.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/HostString.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/HttpContext.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/HttpRequest.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/HttpResponse.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/HttpResponseWritingExtensions.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IApplicationBuilder.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IFormCollection.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IFormFile.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IFormFileCollection.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IHeaderDictionary.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IReadableStringCollection.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/IResponseCookies.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/ISessionCollection.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/PathString.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/QueryString.cs (100%) rename src/{Microsoft.AspNet.Http => Microsoft.AspNet.Http.Core}/RequestDelegate.cs (100%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/ApplicationBuilder.cs (100%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/AuthenticateContext.cs (92%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/ChallengeContext.cs (91%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/DescribeSchemesContext.cs (87%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/HttpAuthenticationFeature.cs (85%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/SignInContext.cs (92%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Authentication/SignOutContext.cs (90%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/BufferingHelper.cs (97%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/FormCollection.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/FormFileCollection.cs (93%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/HeaderDictionary.cs (99%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/ItemsDictionary.cs (98%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/ReadableStringCollection.cs (98%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/RequestCookiesCollection.cs (98%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/ResponseCookies.cs (99%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Collections/SessionCollection.cs (97%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/DefaultConnectionInfo.cs (96%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/DefaultHttpContext.cs (98%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/DefaultHttpRequest.cs (97%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/DefaultHttpResponse.cs (97%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/FormFeature.cs (99%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/FormFile.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/HttpClientCertificateFeature.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/HttpConnectionFeature.cs (93%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/HttpRequestFeature.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/HttpResponseFeature.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IFormFeature.cs (96%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IItemsFeature.cs (89%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IQueryFeature.cs (80%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IRequestCookiesFeature.cs (81%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IResponseCookiesFeature.cs (71%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/IServiceProvidersFeature.cs (90%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Infrastructure/Constants.cs (100%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Infrastructure/FeatureReference.cs (95%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/Infrastructure/ParsingHelpers.cs (99%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/ItemsFeature.cs (92%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/QueryFeature.cs (92%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/ReferenceReadStream.cs (99%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/RequestCookiesFeature.cs (94%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/ResponseCookiesFeature.cs (88%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/ServiceProvidersFeature.cs (91%) rename src/{Microsoft.AspNet.Http.Core => Microsoft.AspNet.Http}/WebSocketAcceptContext.cs (82%) rename test/{Microsoft.AspNet.Http.Tests => Microsoft.AspNet.Http.Core.Tests}/HttpResponseWritingExtensionsTests.cs (97%) rename test/{Microsoft.AspNet.Http.Tests => Microsoft.AspNet.Http.Core.Tests}/MapPathMiddlewareTests.cs (99%) rename test/{Microsoft.AspNet.Http.Tests => Microsoft.AspNet.Http.Core.Tests}/MapPredicateMiddlewareTests.cs (99%) rename test/{Microsoft.AspNet.Http.Tests => Microsoft.AspNet.Http.Core.Tests}/PathStringTests.cs (100%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/ApplicationBuilderTests.cs (95%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/BufferingHelperTests.cs (92%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/DefaultHttpContextTests.cs (98%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/DefaultHttpRequestTests.cs (98%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/FormFeatureTests.cs (99%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/HeaderDictionaryTests.cs (91%) rename test/{Microsoft.AspNet.Http.Core.Tests => Microsoft.AspNet.Http.Tests}/QueryFeatureTests.cs (93%) diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln index dbc423e462..18c4d05c9f 100644 --- a/HttpAbstractions.sln +++ b/HttpAbstractions.sln @@ -1,25 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22710.0 +VisualStudioVersion = 14.0.22807.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5A15F1C-885A-452A-A731-B0173DDBD913}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F31FF137-390C-49BF-A3BD-7C6ED3597C21}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core", "src\Microsoft.AspNet.Http.Core\Microsoft.AspNet.Http.Core.xproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http", "src\Microsoft.AspNet.Http\Microsoft.AspNet.Http.xproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http", "src\Microsoft.AspNet.Http\Microsoft.AspNet.Http.xproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core", "src\Microsoft.AspNet.Http.Core\Microsoft.AspNet.Http.Core.xproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Interfaces", "src\Microsoft.AspNet.Http.Interfaces\Microsoft.AspNet.Http.Interfaces.xproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel", "src\Microsoft.AspNet.FeatureModel\Microsoft.AspNet.FeatureModel.xproj", "{32A4C918-30EE-41DB-8E26-8A3BB88ED231}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core.Tests", "test\Microsoft.AspNet.Http.Core.Tests\Microsoft.AspNet.Http.Core.Tests.xproj", "{AA99AF26-F7B1-4A6B-A922-5C25539F6391}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Tests", "test\Microsoft.AspNet.Http.Tests\Microsoft.AspNet.Http.Tests.xproj", "{AA99AF26-F7B1-4A6B-A922-5C25539F6391}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel.Tests", "test\Microsoft.AspNet.FeatureModel.Tests\Microsoft.AspNet.FeatureModel.Tests.xproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Tests", "test\Microsoft.AspNet.Http.Tests\Microsoft.AspNet.Http.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core.Tests", "test\Microsoft.AspNet.Http.Core.Tests\Microsoft.AspNet.Http.Core.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Owin", "src\Microsoft.AspNet.Owin\Microsoft.AspNet.Owin.xproj", "{59BED991-F207-48ED-B24C-0A1D9C986C01}" EndProject diff --git a/src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateResult.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs rename to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateResult.cs diff --git a/src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs rename to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs diff --git a/src/Microsoft.AspNet.Http/Authentication/AuthenticationProperties.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Authentication/AuthenticationProperties.cs rename to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs diff --git a/src/Microsoft.AspNet.Http/ConnectionInfo.cs b/src/Microsoft.AspNet.Http.Core/ConnectionInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Http/ConnectionInfo.cs rename to src/Microsoft.AspNet.Http.Core/ConnectionInfo.cs diff --git a/src/Microsoft.AspNet.Http/CookieOptions.cs b/src/Microsoft.AspNet.Http.Core/CookieOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/CookieOptions.cs rename to src/Microsoft.AspNet.Http.Core/CookieOptions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapExtensions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapMiddleware.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapOptions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapOptions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenExtensions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenMiddleware.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenOptions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/RunExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/RunExtensions.cs diff --git a/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs b/src/Microsoft.AspNet.Http.Core/Extensions/UseExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs rename to src/Microsoft.AspNet.Http.Core/Extensions/UseExtensions.cs diff --git a/src/Microsoft.AspNet.Http/FragmentString.cs b/src/Microsoft.AspNet.Http.Core/FragmentString.cs similarity index 100% rename from src/Microsoft.AspNet.Http/FragmentString.cs rename to src/Microsoft.AspNet.Http.Core/FragmentString.cs diff --git a/src/Microsoft.AspNet.Http/HostString.cs b/src/Microsoft.AspNet.Http.Core/HostString.cs similarity index 100% rename from src/Microsoft.AspNet.Http/HostString.cs rename to src/Microsoft.AspNet.Http.Core/HostString.cs diff --git a/src/Microsoft.AspNet.Http/HttpContext.cs b/src/Microsoft.AspNet.Http.Core/HttpContext.cs similarity index 100% rename from src/Microsoft.AspNet.Http/HttpContext.cs rename to src/Microsoft.AspNet.Http.Core/HttpContext.cs diff --git a/src/Microsoft.AspNet.Http/HttpRequest.cs b/src/Microsoft.AspNet.Http.Core/HttpRequest.cs similarity index 100% rename from src/Microsoft.AspNet.Http/HttpRequest.cs rename to src/Microsoft.AspNet.Http.Core/HttpRequest.cs diff --git a/src/Microsoft.AspNet.Http/HttpResponse.cs b/src/Microsoft.AspNet.Http.Core/HttpResponse.cs similarity index 100% rename from src/Microsoft.AspNet.Http/HttpResponse.cs rename to src/Microsoft.AspNet.Http.Core/HttpResponse.cs diff --git a/src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs b/src/Microsoft.AspNet.Http.Core/HttpResponseWritingExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs rename to src/Microsoft.AspNet.Http.Core/HttpResponseWritingExtensions.cs diff --git a/src/Microsoft.AspNet.Http/IApplicationBuilder.cs b/src/Microsoft.AspNet.Http.Core/IApplicationBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IApplicationBuilder.cs rename to src/Microsoft.AspNet.Http.Core/IApplicationBuilder.cs diff --git a/src/Microsoft.AspNet.Http/IFormCollection.cs b/src/Microsoft.AspNet.Http.Core/IFormCollection.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IFormCollection.cs rename to src/Microsoft.AspNet.Http.Core/IFormCollection.cs diff --git a/src/Microsoft.AspNet.Http/IFormFile.cs b/src/Microsoft.AspNet.Http.Core/IFormFile.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IFormFile.cs rename to src/Microsoft.AspNet.Http.Core/IFormFile.cs diff --git a/src/Microsoft.AspNet.Http/IFormFileCollection.cs b/src/Microsoft.AspNet.Http.Core/IFormFileCollection.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IFormFileCollection.cs rename to src/Microsoft.AspNet.Http.Core/IFormFileCollection.cs diff --git a/src/Microsoft.AspNet.Http/IHeaderDictionary.cs b/src/Microsoft.AspNet.Http.Core/IHeaderDictionary.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IHeaderDictionary.cs rename to src/Microsoft.AspNet.Http.Core/IHeaderDictionary.cs diff --git a/src/Microsoft.AspNet.Http/IReadableStringCollection.cs b/src/Microsoft.AspNet.Http.Core/IReadableStringCollection.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IReadableStringCollection.cs rename to src/Microsoft.AspNet.Http.Core/IReadableStringCollection.cs diff --git a/src/Microsoft.AspNet.Http/IResponseCookies.cs b/src/Microsoft.AspNet.Http.Core/IResponseCookies.cs similarity index 100% rename from src/Microsoft.AspNet.Http/IResponseCookies.cs rename to src/Microsoft.AspNet.Http.Core/IResponseCookies.cs diff --git a/src/Microsoft.AspNet.Http/ISessionCollection.cs b/src/Microsoft.AspNet.Http.Core/ISessionCollection.cs similarity index 100% rename from src/Microsoft.AspNet.Http/ISessionCollection.cs rename to src/Microsoft.AspNet.Http.Core/ISessionCollection.cs diff --git a/src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj b/src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj index 447e54485b..67db5d869b 100644 --- a/src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj +++ b/src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj @@ -6,7 +6,7 @@ - bcf0f967-8753-4438-bd07-aadca9ce509a + 22071333-15ba-4d16-a1d5-4d5b1a83fbdd ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNet.Http/PathString.cs b/src/Microsoft.AspNet.Http.Core/PathString.cs similarity index 100% rename from src/Microsoft.AspNet.Http/PathString.cs rename to src/Microsoft.AspNet.Http.Core/PathString.cs diff --git a/src/Microsoft.AspNet.Http/QueryString.cs b/src/Microsoft.AspNet.Http.Core/QueryString.cs similarity index 100% rename from src/Microsoft.AspNet.Http/QueryString.cs rename to src/Microsoft.AspNet.Http.Core/QueryString.cs diff --git a/src/Microsoft.AspNet.Http/RequestDelegate.cs b/src/Microsoft.AspNet.Http.Core/RequestDelegate.cs similarity index 100% rename from src/Microsoft.AspNet.Http/RequestDelegate.cs rename to src/Microsoft.AspNet.Http.Core/RequestDelegate.cs diff --git a/src/Microsoft.AspNet.Http.Core/project.json b/src/Microsoft.AspNet.Http.Core/project.json index a241a92cfb..4f562544c9 100644 --- a/src/Microsoft.AspNet.Http.Core/project.json +++ b/src/Microsoft.AspNet.Http.Core/project.json @@ -1,20 +1,27 @@ { "version": "1.0.0-*", - "description": "ASP.NET 5 HTTP feature implementations.", + "description": "ASP.NET 5 HTTP object model. HttpContext and family.", "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", - "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.Net.Http.Headers": "1.0.0-*" + "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" }, "frameworks": { "dnx451": { }, "dnxcore50": { "dependencies": { - "System.Diagnostics.Debug": "4.0.10-beta-*", - "System.Text.Encoding": "4.0.10-beta-*" + "System.Collections": "4.0.10-beta-*", + "System.Diagnostics.Tools": "4.0.0-beta-*", + "System.Globalization": "4.0.10-beta-*", + "System.Globalization.Extensions": "4.0.0-beta-*", + "System.Linq": "4.0.0-beta-*", + "System.Net.Primitives": "4.0.10-beta-*", + "System.Net.WebSockets" : "4.0.0-beta-*", + "System.Runtime": "4.0.20-beta-*", + "System.Runtime.InteropServices": "4.0.20-beta-*", + "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", + "System.Security.Claims": "4.0.0-beta-*", + "System.Security.Principal": "4.0.0-beta-*", + "System.Threading.Tasks": "4.0.10-beta-*" } } } diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json index 415597b029..4055d3b43d 100644 --- a/src/Microsoft.AspNet.Http.Extensions/project.json +++ b/src/Microsoft.AspNet.Http.Extensions/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.Framework.DependencyInjection.Interfaces": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, diff --git a/src/Microsoft.AspNet.Http.Core/ApplicationBuilder.cs b/src/Microsoft.AspNet.Http/ApplicationBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Http.Core/ApplicationBuilder.cs rename to src/Microsoft.AspNet.Http/ApplicationBuilder.cs diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs b/src/Microsoft.AspNet.Http/Authentication/AuthenticateContext.cs similarity index 92% rename from src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs rename to src/Microsoft.AspNet.Http/Authentication/AuthenticateContext.cs index ed0dd55eb7..91d530dfad 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs +++ b/src/Microsoft.AspNet.Http/Authentication/AuthenticateContext.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.Security.Claims; -using Microsoft.AspNet.Http.Authentication; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class AuthenticateContext : IAuthenticateContext { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs b/src/Microsoft.AspNet.Http/Authentication/ChallengeContext.cs similarity index 91% rename from src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs rename to src/Microsoft.AspNet.Http/Authentication/ChallengeContext.cs index b47feedf45..0a137bb645 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs +++ b/src/Microsoft.AspNet.Http/Authentication/ChallengeContext.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class ChallengeContext : IChallengeContext { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/DescribeSchemesContext.cs b/src/Microsoft.AspNet.Http/Authentication/DescribeSchemesContext.cs similarity index 87% rename from src/Microsoft.AspNet.Http.Core/Authentication/DescribeSchemesContext.cs rename to src/Microsoft.AspNet.Http/Authentication/DescribeSchemesContext.cs index 6da55ce724..6e4907949d 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/DescribeSchemesContext.cs +++ b/src/Microsoft.AspNet.Http/Authentication/DescribeSchemesContext.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Http.Authentication; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class DescribeSchemesContext : IDescribeSchemesContext { @@ -19,7 +18,7 @@ namespace Microsoft.AspNet.Http.Core.Authentication { get { return _results; } } - + public void Accept(IDictionary description) { _results.Add(new AuthenticationDescription(description)); diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/HttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs similarity index 85% rename from src/Microsoft.AspNet.Http.Core/Authentication/HttpAuthenticationFeature.cs rename to src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs index f67075e371..0a56cf4eaf 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/HttpAuthenticationFeature.cs +++ b/src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Security.Claims; -using Microsoft.AspNet.Http.Authentication; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class HttpAuthenticationFeature : IHttpAuthenticationFeature { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs b/src/Microsoft.AspNet.Http/Authentication/SignInContext.cs similarity index 92% rename from src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs rename to src/Microsoft.AspNet.Http/Authentication/SignInContext.cs index 6d067c3919..1a77db412b 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs +++ b/src/Microsoft.AspNet.Http/Authentication/SignInContext.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; using System.Security.Claims; -using Microsoft.AspNet.Http.Authentication; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class SignInContext : ISignInContext { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs b/src/Microsoft.AspNet.Http/Authentication/SignOutContext.cs similarity index 90% rename from src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs rename to src/Microsoft.AspNet.Http/Authentication/SignOutContext.cs index 318be62c70..d78820980e 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs +++ b/src/Microsoft.AspNet.Http/Authentication/SignOutContext.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http.Authentication; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Authentication +namespace Microsoft.AspNet.Http.Authentication { public class SignOutContext : ISignOutContext { diff --git a/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs b/src/Microsoft.AspNet.Http/BufferingHelper.cs similarity index 97% rename from src/Microsoft.AspNet.Http.Core/BufferingHelper.cs rename to src/Microsoft.AspNet.Http/BufferingHelper.cs index 3c0120f725..37c93d8392 100644 --- a/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs +++ b/src/Microsoft.AspNet.Http/BufferingHelper.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public static class BufferingHelper { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs b/src/Microsoft.AspNet.Http/Collections/FormCollection.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs rename to src/Microsoft.AspNet.Http/Collections/FormCollection.cs index ffef8fcaa2..fed0bb1b1c 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs +++ b/src/Microsoft.AspNet.Http/Collections/FormCollection.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { /// /// Contains the parsed form values. diff --git a/src/Microsoft.AspNet.Http.Core/Collections/FormFileCollection.cs b/src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs similarity index 93% rename from src/Microsoft.AspNet.Http.Core/Collections/FormFileCollection.cs rename to src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs index d33992bff8..2844d1c60d 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/FormFileCollection.cs +++ b/src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Http; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { public class FormFileCollection : List, IFormFileCollection { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs b/src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs similarity index 99% rename from src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs rename to src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs index 487f1c4190..ffff7d724f 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs +++ b/src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs @@ -5,10 +5,10 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { /// /// Represents a wrapper for owin.RequestHeaders and owin.ResponseHeaders. diff --git a/src/Microsoft.AspNet.Http.Core/Collections/ItemsDictionary.cs b/src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs similarity index 98% rename from src/Microsoft.AspNet.Http.Core/Collections/ItemsDictionary.cs rename to src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs index 06c27fbc1e..ead480bdf1 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/ItemsDictionary.cs +++ b/src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs @@ -4,7 +4,7 @@ using System.Collections; using System.Collections.Generic; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class ItemsDictionary : IDictionary { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs b/src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs similarity index 98% rename from src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs rename to src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs index 38aa497e12..4977d04e08 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs +++ b/src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { /// /// Accessors for query, forms, etc. diff --git a/src/Microsoft.AspNet.Http.Core/Collections/RequestCookiesCollection.cs b/src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs similarity index 98% rename from src/Microsoft.AspNet.Http.Core/Collections/RequestCookiesCollection.cs rename to src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs index 6f43aa3d07..0610faa880 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/RequestCookiesCollection.cs +++ b/src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { public class RequestCookiesCollection : IReadableStringCollection { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs b/src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs similarity index 99% rename from src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs rename to src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs index 45da572ccb..1636d4e739 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs +++ b/src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs @@ -8,7 +8,7 @@ using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { /// /// A wrapper for the response Set-Cookie header diff --git a/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs b/src/Microsoft.AspNet.Http/Collections/SessionCollection.cs similarity index 97% rename from src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs rename to src/Microsoft.AspNet.Http/Collections/SessionCollection.cs index df58e4a63f..d2147c6c4b 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs +++ b/src/Microsoft.AspNet.Http/Collections/SessionCollection.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Microsoft.AspNet.Http.Core.Collections +namespace Microsoft.AspNet.Http.Collections { public class SessionCollection : ISessionCollection { diff --git a/src/Microsoft.AspNet.Http.Core/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs similarity index 96% rename from src/Microsoft.AspNet.Http.Core/DefaultConnectionInfo.cs rename to src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs index 4cd327a9fe..f400f6aaff 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultConnectionInfo.cs +++ b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs @@ -6,9 +6,9 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Infrastructure; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class DefaultConnectionInfo : ConnectionInfo { diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs similarity index 98% rename from src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs rename to src/Microsoft.AspNet.Http/DefaultHttpContext.cs index e8382c0022..81aef590ff 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs @@ -9,13 +9,12 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Http.Core.Authentication; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class DefaultHttpContext : HttpContext { diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs similarity index 97% rename from src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs rename to src/Microsoft.AspNet.Http/DefaultHttpRequest.cs index 3e5e95e03a..8f2a20e55c 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs @@ -6,12 +6,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; using Microsoft.AspNet.Http.Infrastructure; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class DefaultHttpRequest : HttpRequest { diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs similarity index 97% rename from src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs rename to src/Microsoft.AspNet.Http/DefaultHttpResponse.cs index 1c91cd5a0c..a5a3e9a438 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs @@ -8,13 +8,12 @@ using System.Linq; using System.Security.Claims; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Http.Core.Authentication; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class DefaultHttpResponse : HttpResponse { diff --git a/src/Microsoft.AspNet.Http.Core/FormFeature.cs b/src/Microsoft.AspNet.Http/FormFeature.cs similarity index 99% rename from src/Microsoft.AspNet.Http.Core/FormFeature.cs rename to src/Microsoft.AspNet.Http/FormFeature.cs index 3be19c7ebb..a8c490100f 100644 --- a/src/Microsoft.AspNet.Http.Core/FormFeature.cs +++ b/src/Microsoft.AspNet.Http/FormFeature.cs @@ -7,12 +7,12 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Core.Collections; +using Microsoft.AspNet.Http.Collections; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class FormFeature : IFormFeature { diff --git a/src/Microsoft.AspNet.Http.Core/FormFile.cs b/src/Microsoft.AspNet.Http/FormFile.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/FormFile.cs rename to src/Microsoft.AspNet.Http/FormFile.cs index bbf0a52699..25e1081b2a 100644 --- a/src/Microsoft.AspNet.Http.Core/FormFile.cs +++ b/src/Microsoft.AspNet.Http/FormFile.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; -using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class FormFile : IFormFile { diff --git a/src/Microsoft.AspNet.Http.Core/HttpClientCertificateFeature.cs b/src/Microsoft.AspNet.Http/HttpClientCertificateFeature.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/HttpClientCertificateFeature.cs rename to src/Microsoft.AspNet.Http/HttpClientCertificateFeature.cs index dbdc0f14a9..22ef21f704 100644 --- a/src/Microsoft.AspNet.Http.Core/HttpClientCertificateFeature.cs +++ b/src/Microsoft.AspNet.Http/HttpClientCertificateFeature.cs @@ -5,7 +5,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class HttpClientCertificateFeature : IHttpClientCertificateFeature { diff --git a/src/Microsoft.AspNet.Http.Core/HttpConnectionFeature.cs b/src/Microsoft.AspNet.Http/HttpConnectionFeature.cs similarity index 93% rename from src/Microsoft.AspNet.Http.Core/HttpConnectionFeature.cs rename to src/Microsoft.AspNet.Http/HttpConnectionFeature.cs index efe3e3aee6..8f1a7c0123 100644 --- a/src/Microsoft.AspNet.Http.Core/HttpConnectionFeature.cs +++ b/src/Microsoft.AspNet.Http/HttpConnectionFeature.cs @@ -3,7 +3,7 @@ using System.Net; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class HttpConnectionFeature : IHttpConnectionFeature { diff --git a/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs b/src/Microsoft.AspNet.Http/HttpRequestFeature.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs rename to src/Microsoft.AspNet.Http/HttpRequestFeature.cs index cefd16584c..e17746cc7d 100644 --- a/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs +++ b/src/Microsoft.AspNet.Http/HttpRequestFeature.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class HttpRequestFeature : IHttpRequestFeature { diff --git a/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs b/src/Microsoft.AspNet.Http/HttpResponseFeature.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs rename to src/Microsoft.AspNet.Http/HttpResponseFeature.cs index 509677f4a7..f0b9c7faeb 100644 --- a/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs +++ b/src/Microsoft.AspNet.Http/HttpResponseFeature.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class HttpResponseFeature : IHttpResponseFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IFormFeature.cs b/src/Microsoft.AspNet.Http/IFormFeature.cs similarity index 96% rename from src/Microsoft.AspNet.Http.Core/IFormFeature.cs rename to src/Microsoft.AspNet.Http/IFormFeature.cs index 2447a8a3fe..0f8e97eb67 100644 --- a/src/Microsoft.AspNet.Http.Core/IFormFeature.cs +++ b/src/Microsoft.AspNet.Http/IFormFeature.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IFormFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IItemsFeature.cs b/src/Microsoft.AspNet.Http/IItemsFeature.cs similarity index 89% rename from src/Microsoft.AspNet.Http.Core/IItemsFeature.cs rename to src/Microsoft.AspNet.Http/IItemsFeature.cs index a38a9cb720..876580ef79 100644 --- a/src/Microsoft.AspNet.Http.Core/IItemsFeature.cs +++ b/src/Microsoft.AspNet.Http/IItemsFeature.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IItemsFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IQueryFeature.cs b/src/Microsoft.AspNet.Http/IQueryFeature.cs similarity index 80% rename from src/Microsoft.AspNet.Http.Core/IQueryFeature.cs rename to src/Microsoft.AspNet.Http/IQueryFeature.cs index 545200b3c5..086e9f189b 100644 --- a/src/Microsoft.AspNet.Http.Core/IQueryFeature.cs +++ b/src/Microsoft.AspNet.Http/IQueryFeature.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; - -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IQueryFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IRequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs similarity index 81% rename from src/Microsoft.AspNet.Http.Core/IRequestCookiesFeature.cs rename to src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs index d52e714c71..5ba34bb9a0 100644 --- a/src/Microsoft.AspNet.Http.Core/IRequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; - -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IRequestCookiesFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs similarity index 71% rename from src/Microsoft.AspNet.Http.Core/IResponseCookiesFeature.cs rename to src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs index f33a15361b..b10b1c40c9 100644 --- a/src/Microsoft.AspNet.Http.Core/IResponseCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs @@ -1,10 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core.Collections; - -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IResponseCookiesFeature { diff --git a/src/Microsoft.AspNet.Http.Core/IServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs similarity index 90% rename from src/Microsoft.AspNet.Http.Core/IServiceProvidersFeature.cs rename to src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs index 3435e53972..d2bb79b6c8 100644 --- a/src/Microsoft.AspNet.Http.Core/IServiceProvidersFeature.cs +++ b/src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public interface IServiceProvidersFeature { diff --git a/src/Microsoft.AspNet.Http.Core/Infrastructure/Constants.cs b/src/Microsoft.AspNet.Http/Infrastructure/Constants.cs similarity index 100% rename from src/Microsoft.AspNet.Http.Core/Infrastructure/Constants.cs rename to src/Microsoft.AspNet.Http/Infrastructure/Constants.cs diff --git a/src/Microsoft.AspNet.Http.Core/Infrastructure/FeatureReference.cs b/src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs similarity index 95% rename from src/Microsoft.AspNet.Http.Core/Infrastructure/FeatureReference.cs rename to src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs index f6db6e4fef..cea473a4ef 100644 --- a/src/Microsoft.AspNet.Http.Core/Infrastructure/FeatureReference.cs +++ b/src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.FeatureModel; -namespace Microsoft.AspNet.Http.Core.Infrastructure +namespace Microsoft.AspNet.Http.Infrastructure { internal struct FeatureReference { diff --git a/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs b/src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs similarity index 99% rename from src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs rename to src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs index cf6a955d86..549bf51777 100644 --- a/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs +++ b/src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs @@ -9,7 +9,7 @@ using System.Linq; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core.Infrastructure +namespace Microsoft.AspNet.Http.Infrastructure { internal struct HeaderSegment : IEquatable { diff --git a/src/Microsoft.AspNet.Http.Core/ItemsFeature.cs b/src/Microsoft.AspNet.Http/ItemsFeature.cs similarity index 92% rename from src/Microsoft.AspNet.Http.Core/ItemsFeature.cs rename to src/Microsoft.AspNet.Http/ItemsFeature.cs index 50b32711a3..bb9d94ae15 100644 --- a/src/Microsoft.AspNet.Http.Core/ItemsFeature.cs +++ b/src/Microsoft.AspNet.Http/ItemsFeature.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class ItemsFeature : IItemsFeature { diff --git a/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj b/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj index 67db5d869b..447e54485b 100644 --- a/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj +++ b/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj @@ -6,7 +6,7 @@ - 22071333-15ba-4d16-a1d5-4d5b1a83fbdd + bcf0f967-8753-4438-bd07-aadca9ce509a ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs b/src/Microsoft.AspNet.Http/QueryFeature.cs similarity index 92% rename from src/Microsoft.AspNet.Http.Core/QueryFeature.cs rename to src/Microsoft.AspNet.Http/QueryFeature.cs index bda0ab5fc4..34643cf128 100644 --- a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs +++ b/src/Microsoft.AspNet.Http/QueryFeature.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class QueryFeature : IQueryFeature { diff --git a/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs b/src/Microsoft.AspNet.Http/ReferenceReadStream.cs similarity index 99% rename from src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs rename to src/Microsoft.AspNet.Http/ReferenceReadStream.cs index 4b1093a66a..5030e59ef3 100644 --- a/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs +++ b/src/Microsoft.AspNet.Http/ReferenceReadStream.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { /// /// A Stream that wraps another stream starting at a certain offset and reading for the given length. diff --git a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/RequestCookiesFeature.cs similarity index 94% rename from src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs rename to src/Microsoft.AspNet.Http/RequestCookiesFeature.cs index 4a22b22a93..eb5e95ec79 100644 --- a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/RequestCookiesFeature.cs @@ -5,12 +5,12 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class RequestCookiesFeature : IRequestCookiesFeature { diff --git a/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs similarity index 88% rename from src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs rename to src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs index 11e3c098fa..651beded8d 100644 --- a/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Collections; -using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.AspNet.Http.Collections; +using Microsoft.AspNet.Http.Infrastructure; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class ResponseCookiesFeature : IResponseCookiesFeature { diff --git a/src/Microsoft.AspNet.Http.Core/ServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs similarity index 91% rename from src/Microsoft.AspNet.Http.Core/ServiceProvidersFeature.cs rename to src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs index 9f218d9bbb..8a8c4b1551 100644 --- a/src/Microsoft.AspNet.Http.Core/ServiceProvidersFeature.cs +++ b/src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class ServiceProvidersFeature : IServiceProvidersFeature { diff --git a/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http/WebSocketAcceptContext.cs similarity index 82% rename from src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs rename to src/Microsoft.AspNet.Http/WebSocketAcceptContext.cs index aa857b1205..34747f900f 100644 --- a/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs +++ b/src/Microsoft.AspNet.Http/WebSocketAcceptContext.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; - -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class WebSocketAcceptContext : IWebSocketAcceptContext { diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json index 0a94666c50..b554c9eabe 100644 --- a/src/Microsoft.AspNet.Http/project.json +++ b/src/Microsoft.AspNet.Http/project.json @@ -1,27 +1,20 @@ { "version": "1.0.0-*", - "description": "ASP.NET 5 HTTP object model. HttpContext and family.", + "description": "ASP.NET 5 HTTP feature implementations.", "dependencies": { + "Microsoft.AspNet.FeatureModel": "1.0.0-*", + "Microsoft.AspNet.Http.Core": "1.0.0-*", + "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", + "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" + "Microsoft.Net.Http.Headers": "1.0.0-*" }, "frameworks": { "dnx451": { }, "dnxcore50": { "dependencies": { - "System.Collections": "4.0.10-beta-*", - "System.Diagnostics.Tools": "4.0.0-beta-*", - "System.Globalization": "4.0.10-beta-*", - "System.Globalization.Extensions": "4.0.0-beta-*", - "System.Linq": "4.0.0-beta-*", - "System.Net.Primitives": "4.0.10-beta-*", - "System.Net.WebSockets" : "4.0.0-beta-*", - "System.Runtime": "4.0.20-beta-*", - "System.Runtime.InteropServices": "4.0.20-beta-*", - "System.Security.Claims": "4.0.0-beta-*", - "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", - "System.Security.Principal": "4.0.0-beta-*", - "System.Threading.Tasks": "4.0.10-beta-*" + "System.Diagnostics.Debug": "4.0.10-beta-*", + "System.Text.Encoding": "4.0.10-beta-*" } } } diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs index 4e37f6b218..75b1c88067 100644 --- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs +++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs @@ -15,7 +15,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Http.Core.Authentication; namespace Microsoft.AspNet.Owin { diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs index fe4b17d1ac..cfb647d88a 100644 --- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs +++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Owin; -using Microsoft.AspNet.Http.Core; namespace Microsoft.AspNet.Builder { diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNet.Owin/project.json index e7274c329b..2fa0fca43b 100644 --- a/src/Microsoft.AspNet.Owin/project.json +++ b/src/Microsoft.AspNet.Owin/project.json @@ -3,8 +3,6 @@ "description": "ASP.NET 5 component for running OWIN middleware.", "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } }, "frameworks": { diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/project.json b/test/Microsoft.AspNet.FeatureModel.Tests/project.json index 3b35b808af..320d7f0186 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/project.json +++ b/test/Microsoft.AspNet.FeatureModel.Tests/project.json @@ -1,15 +1,13 @@ { "dependencies": { "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": { "test": "xunit.runner.aspnet" }, "frameworks": { - "dnx451": { + "dnx451": { "dependencies": { "Shouldly": "1.1.1.1" } diff --git a/test/Microsoft.AspNet.Http.Tests/HttpResponseWritingExtensionsTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/HttpResponseWritingExtensionsTests.cs similarity index 97% rename from test/Microsoft.AspNet.Http.Tests/HttpResponseWritingExtensionsTests.cs rename to test/Microsoft.AspNet.Http.Core.Tests/HttpResponseWritingExtensionsTests.cs index c9692254f1..2388da9973 100644 --- a/test/Microsoft.AspNet.Http.Tests/HttpResponseWritingExtensionsTests.cs +++ b/test/Microsoft.AspNet.Http.Core.Tests/HttpResponseWritingExtensionsTests.cs @@ -3,7 +3,6 @@ using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Http diff --git a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/MapPathMiddlewareTests.cs similarity index 99% rename from test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs rename to test/Microsoft.AspNet.Http.Core.Tests/MapPathMiddlewareTests.cs index 9bf4faaab6..e0d7b30689 100644 --- a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Http.Core.Tests/MapPathMiddlewareTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core; using Shouldly; using Xunit; diff --git a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/MapPredicateMiddlewareTests.cs similarity index 99% rename from test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs rename to test/Microsoft.AspNet.Http.Core.Tests/MapPredicateMiddlewareTests.cs index 1c0537beda..fef12361fd 100644 --- a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Http.Core.Tests/MapPredicateMiddlewareTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Builder.Extensions diff --git a/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj b/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj index c438cb7050..424d3a7f9b 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj +++ b/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj @@ -6,7 +6,7 @@ - aa99af26-f7b1-4a6b-a922-5c25539f6391 + f16692b8-9f38-4dca-a582-e43172b989c6 ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNet.Http.Tests/PathStringTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/PathStringTests.cs similarity index 100% rename from test/Microsoft.AspNet.Http.Tests/PathStringTests.cs rename to test/Microsoft.AspNet.Http.Core.Tests/PathStringTests.cs diff --git a/test/Microsoft.AspNet.Http.Core.Tests/project.json b/test/Microsoft.AspNet.Http.Core.Tests/project.json index f943dd78c7..7faf925aae 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/project.json +++ b/test/Microsoft.AspNet.Http.Core.Tests/project.json @@ -1,22 +1,17 @@ { - "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "commands": { - "test": "xunit.runner.aspnet" - }, - "frameworks": { - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622" - }, - "frameworkAssemblies": { - "System.Net.Http": "" - } - } + "dependencies": { + "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.Testing": "1.0.0-*", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "dependencies": { + "Shouldly": "1.1.1.1" + } } + } } diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs index a7e15c1844..ccd20be196 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs +++ b/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http.Core.Collections; +using Microsoft.AspNet.Http.Collections; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/HttpResponseSendingExtensionsTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/HttpResponseSendingExtensionsTests.cs index ce046ba3e7..6f30bc053a 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/HttpResponseSendingExtensionsTests.cs +++ b/test/Microsoft.AspNet.Http.Extensions.Tests/HttpResponseSendingExtensionsTests.cs @@ -4,7 +4,6 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Http.Extensions diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs index f42fec5efa..07b6ed7163 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs +++ b/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs @@ -3,7 +3,6 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Http.Extensions.Tests diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs index 66b5bb0ef4..0fa5e071cc 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs +++ b/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http.Core; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json index a5bc898aaa..4287829625 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json +++ b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json @@ -2,8 +2,6 @@ "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, diff --git a/test/Microsoft.AspNet.Http.Core.Tests/ApplicationBuilderTests.cs b/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs similarity index 95% rename from test/Microsoft.AspNet.Http.Core.Tests/ApplicationBuilderTests.cs rename to test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs index 755eee5f76..21c1bd640d 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/ApplicationBuilderTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Http; using Xunit; -namespace Microsoft.AspNet.Builder.Tests +namespace Microsoft.AspNet.Builder { public class ApplicationBuilderTests { diff --git a/test/Microsoft.AspNet.Http.Core.Tests/BufferingHelperTests.cs b/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs similarity index 92% rename from test/Microsoft.AspNet.Http.Core.Tests/BufferingHelperTests.cs rename to test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs index 362849193c..7f35d274db 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/BufferingHelperTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs @@ -4,7 +4,7 @@ using System.IO; using Xunit; -namespace Microsoft.AspNet.Http.Core.Tests +namespace Microsoft.AspNet.Http { public class BufferingHelperTests { diff --git a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs similarity index 98% rename from test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs rename to test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs index 02b040af69..d46ff5d6e7 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs @@ -7,11 +7,10 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http.Core.Authentication; using Microsoft.AspNet.Http.Authentication; using Xunit; -namespace Microsoft.AspNet.Http.Core.Tests +namespace Microsoft.AspNet.Http { public class DefaultHttpContextTests { diff --git a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs similarity index 98% rename from test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs rename to test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs index 4ec7dff00f..69c0ea85e8 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; using System.Globalization; -using Microsoft.AspNet.Http; using Xunit; -namespace Microsoft.AspNet.Http.Core.Tests +namespace Microsoft.AspNet.Http { public class DefaultHttpRequestTests { diff --git a/test/Microsoft.AspNet.Http.Core.Tests/FormFeatureTests.cs b/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs similarity index 99% rename from test/Microsoft.AspNet.Http.Core.Tests/FormFeatureTests.cs rename to test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs index 254a6800ea..270c364301 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/FormFeatureTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.WebUtilities; using Xunit; -namespace Microsoft.AspNet.Http.Core +namespace Microsoft.AspNet.Http { public class FormFeatureTests { diff --git a/test/Microsoft.AspNet.Http.Core.Tests/HeaderDictionaryTests.cs b/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs similarity index 91% rename from test/Microsoft.AspNet.Http.Core.Tests/HeaderDictionaryTests.cs rename to test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs index 4bee6e446d..02082c9ec3 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/HeaderDictionaryTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http.Core.Collections; +using Microsoft.AspNet.Http.Collections; using Xunit; -namespace Microsoft.AspNet.Http.Core.Tests +namespace Microsoft.AspNet.Http { public class HeaderDictionaryTests { diff --git a/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj b/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj index 424d3a7f9b..c438cb7050 100644 --- a/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj +++ b/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj @@ -6,7 +6,7 @@ - f16692b8-9f38-4dca-a582-e43172b989c6 + aa99af26-f7b1-4a6b-a922-5c25539f6391 ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs similarity index 93% rename from test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs rename to test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs index 0fd91f5cd4..4a53e6205b 100644 --- a/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.FeatureModel; -using Microsoft.AspNet.Http; using Moq; using Xunit; -namespace Microsoft.AspNet.Http.Core.Tests +namespace Microsoft.AspNet.Http { public class QueryFeatureTests { diff --git a/test/Microsoft.AspNet.Http.Tests/project.json b/test/Microsoft.AspNet.Http.Tests/project.json index 5c51fc5e3f..42315e13eb 100644 --- a/test/Microsoft.AspNet.Http.Tests/project.json +++ b/test/Microsoft.AspNet.Http.Tests/project.json @@ -1,19 +1,19 @@ { - "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "commands": { - "test": "xunit.runner.aspnet" - }, - "frameworks": { - "dnx451": { - "dependencies": { - "Shouldly": "1.1.1.1" - } + "dependencies": { + "Microsoft.AspNet.Http": "1.0.0-*", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "dependencies": { + "Moq": "4.2.1312.1622" + }, + "frameworkAssemblies": { + "System.Net.Http": "" + } + } } - } } diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs index b98e99cfc1..68f7d7a103 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Security.Claims; using System.Threading; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Owin diff --git a/test/Microsoft.AspNet.Owin.Tests/project.json b/test/Microsoft.AspNet.Owin.Tests/project.json index 3dbc5de4e6..79f1cafd16 100644 --- a/test/Microsoft.AspNet.Owin.Tests/project.json +++ b/test/Microsoft.AspNet.Owin.Tests/project.json @@ -1,10 +1,7 @@ { "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.AspNet.Owin": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": {