diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln index c7f07227ab..c4043ac0a1 100644 --- a/HttpAbstractions.sln +++ b/HttpAbstractions.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30401.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.21628.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5A15F1C-885A-452A-A731-B0173DDBD913}" EndProject @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F31FF137-3 EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PipelineCore", "src\Microsoft.AspNet.PipelineCore\Microsoft.AspNet.PipelineCore.kproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Abstractions", "src\Microsoft.AspNet.Abstractions\Microsoft.AspNet.Abstractions.kproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http", "src\Microsoft.AspNet.Http\Microsoft.AspNet.Http.kproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.HttpFeature", "src\Microsoft.AspNet.HttpFeature\Microsoft.AspNet.HttpFeature.kproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}" EndProject @@ -19,7 +19,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PipelineCo EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel.Tests", "test\Microsoft.AspNet.FeatureModel.Tests\Microsoft.AspNet.FeatureModel.Tests.kproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Abstractions.Tests", "test\Microsoft.AspNet.Abstractions.Tests\Microsoft.AspNet.Abstractions.Tests.kproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Tests", "test\Microsoft.AspNet.Http.Tests\Microsoft.AspNet.Http.Tests.kproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Owin", "src\Microsoft.AspNet.Owin\Microsoft.AspNet.Owin.kproj", "{59BED991-F207-48ED-B24C-0A1D9C986C01}" EndProject diff --git a/src/Microsoft.AspNet.Abstractions/CookieOptions.cs b/src/Microsoft.AspNet.Http/CookieOptions.cs similarity index 98% rename from src/Microsoft.AspNet.Abstractions/CookieOptions.cs rename to src/Microsoft.AspNet.Http/CookieOptions.cs index b7c0690cdd..5a479f8967 100644 --- a/src/Microsoft.AspNet.Abstractions/CookieOptions.cs +++ b/src/Microsoft.AspNet.Http/CookieOptions.cs @@ -17,7 +17,7 @@ using System; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Options used to create a new cookie. diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs similarity index 96% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapExtensions.cs rename to src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs index 2ecaa2898f..fa071712da 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs @@ -16,8 +16,8 @@ // permissions and limitations under the License. using System; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Extensions; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Extensions; namespace Microsoft.AspNet { diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapMiddleware.cs rename to src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs index d1bd14ecbb..b8bf99c9a8 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapMiddleware.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { public class MapMiddleware { diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapOptions.cs b/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapOptions.cs rename to src/Microsoft.AspNet.Http/Extensions/MapOptions.cs index 4a9dcf1c90..d0611b9aa7 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapOptions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { /// /// Options for the Map middleware diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapWhenExtensions.cs rename to src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs index 2c088737a9..d6201678c5 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs @@ -17,8 +17,8 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Extensions; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Extensions; namespace Microsoft.AspNet { diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapWhenMiddleware.cs rename to src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs index 02ed400c42..d9cf89dc10 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenMiddleware.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { public class MapWhenMiddleware { diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenOptions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs similarity index 96% rename from src/Microsoft.AspNet.Abstractions/Extensions/MapWhenOptions.cs rename to src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs index 56bd141044..914d9ee56a 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/MapWhenOptions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs @@ -18,7 +18,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { /// /// Options for the MapWhen middleware diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs similarity index 96% rename from src/Microsoft.AspNet.Abstractions/Extensions/RunExtensions.cs rename to src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs index ae4082221a..5d1b9d1a1a 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/RunExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet { diff --git a/src/Microsoft.AspNet.Abstractions/Extensions/UseExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/Extensions/UseExtensions.cs rename to src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs index ed90dc1ec7..95fcbb6bbe 100644 --- a/src/Microsoft.AspNet.Abstractions/Extensions/UseExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs @@ -17,7 +17,7 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet { diff --git a/src/Microsoft.AspNet.Abstractions/HostString.cs b/src/Microsoft.AspNet.Http/HostString.cs similarity index 99% rename from src/Microsoft.AspNet.Abstractions/HostString.cs rename to src/Microsoft.AspNet.Http/HostString.cs index 246553a1d5..78483f7ce9 100644 --- a/src/Microsoft.AspNet.Abstractions/HostString.cs +++ b/src/Microsoft.AspNet.Http/HostString.cs @@ -19,7 +19,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Represents the host portion of a Uri can be used to construct Uri's properly formatted and encoded for use in diff --git a/src/Microsoft.AspNet.Abstractions/HttpContext.cs b/src/Microsoft.AspNet.Http/HttpContext.cs similarity index 96% rename from src/Microsoft.AspNet.Abstractions/HttpContext.cs rename to src/Microsoft.AspNet.Http/HttpContext.cs index 43690fe366..eb5a5dc12f 100644 --- a/src/Microsoft.AspNet.Abstractions/HttpContext.cs +++ b/src/Microsoft.AspNet.Http/HttpContext.cs @@ -21,9 +21,9 @@ using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http.Security; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public abstract class HttpContext : IDisposable { diff --git a/src/Microsoft.AspNet.Abstractions/HttpRequest.cs b/src/Microsoft.AspNet.Http/HttpRequest.cs similarity index 99% rename from src/Microsoft.AspNet.Abstractions/HttpRequest.cs rename to src/Microsoft.AspNet.Http/HttpRequest.cs index 452c4600c8..488f3ea85c 100644 --- a/src/Microsoft.AspNet.Abstractions/HttpRequest.cs +++ b/src/Microsoft.AspNet.Http/HttpRequest.cs @@ -20,7 +20,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public abstract class HttpRequest { diff --git a/src/Microsoft.AspNet.Abstractions/HttpResponse.cs b/src/Microsoft.AspNet.Http/HttpResponse.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/HttpResponse.cs rename to src/Microsoft.AspNet.Http/HttpResponse.cs index 3766e872c7..4cbd853465 100644 --- a/src/Microsoft.AspNet.Abstractions/HttpResponse.cs +++ b/src/Microsoft.AspNet.Http/HttpResponse.cs @@ -20,9 +20,9 @@ using System.Collections.Generic; using System.IO; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http.Security; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public abstract class HttpResponse { diff --git a/src/Microsoft.AspNet.Abstractions/IBuilder.cs b/src/Microsoft.AspNet.Http/IBuilder.cs similarity index 96% rename from src/Microsoft.AspNet.Abstractions/IBuilder.cs rename to src/Microsoft.AspNet.Http/IBuilder.cs index 7f913c4988..8a5331e903 100644 --- a/src/Microsoft.AspNet.Abstractions/IBuilder.cs +++ b/src/Microsoft.AspNet.Http/IBuilder.cs @@ -17,7 +17,7 @@ using System; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public interface IBuilder { diff --git a/src/Microsoft.AspNet.Abstractions/IFormCollection.cs b/src/Microsoft.AspNet.Http/IFormCollection.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/IFormCollection.cs rename to src/Microsoft.AspNet.Http/IFormCollection.cs index 444436049a..fa27a142c0 100644 --- a/src/Microsoft.AspNet.Abstractions/IFormCollection.cs +++ b/src/Microsoft.AspNet.Http/IFormCollection.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Contains the parsed form values. diff --git a/src/Microsoft.AspNet.Abstractions/IHeaderDictionary.cs b/src/Microsoft.AspNet.Http/IHeaderDictionary.cs similarity index 98% rename from src/Microsoft.AspNet.Abstractions/IHeaderDictionary.cs rename to src/Microsoft.AspNet.Http/IHeaderDictionary.cs index 8f38346e36..58e0fd7c78 100644 --- a/src/Microsoft.AspNet.Abstractions/IHeaderDictionary.cs +++ b/src/Microsoft.AspNet.Http/IHeaderDictionary.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Represents request and response headers diff --git a/src/Microsoft.AspNet.Abstractions/IReadableStringCollection.cs b/src/Microsoft.AspNet.Http/IReadableStringCollection.cs similarity index 98% rename from src/Microsoft.AspNet.Abstractions/IReadableStringCollection.cs rename to src/Microsoft.AspNet.Http/IReadableStringCollection.cs index 4aeb854c30..4e4e99ee75 100644 --- a/src/Microsoft.AspNet.Abstractions/IReadableStringCollection.cs +++ b/src/Microsoft.AspNet.Http/IReadableStringCollection.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Accessors for headers, query, forms, etc. diff --git a/src/Microsoft.AspNet.Abstractions/IResponseCookies.cs b/src/Microsoft.AspNet.Http/IResponseCookies.cs similarity index 97% rename from src/Microsoft.AspNet.Abstractions/IResponseCookies.cs rename to src/Microsoft.AspNet.Http/IResponseCookies.cs index 00a44ccaf0..f12023b4e8 100644 --- a/src/Microsoft.AspNet.Abstractions/IResponseCookies.cs +++ b/src/Microsoft.AspNet.Http/IResponseCookies.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// A wrapper for the response Set-Cookie header diff --git a/src/Microsoft.AspNet.Abstractions/IServerInformation.cs b/src/Microsoft.AspNet.Http/IServerInformation.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/IServerInformation.cs rename to src/Microsoft.AspNet.Http/IServerInformation.cs index 5db85fd9cf..48554d0a65 100644 --- a/src/Microsoft.AspNet.Abstractions/IServerInformation.cs +++ b/src/Microsoft.AspNet.Http/IServerInformation.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { // TODO: [AssemblyNeutral] public interface IServerInformation diff --git a/src/Microsoft.AspNet.Abstractions/Microsoft.AspNet.Abstractions.kproj b/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.kproj similarity index 100% rename from src/Microsoft.AspNet.Abstractions/Microsoft.AspNet.Abstractions.kproj rename to src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.kproj diff --git a/src/Microsoft.AspNet.Abstractions/NotNullAttribute.cs b/src/Microsoft.AspNet.Http/NotNullAttribute.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/NotNullAttribute.cs rename to src/Microsoft.AspNet.Http/NotNullAttribute.cs index 972c2e4aef..eb75fc366d 100644 --- a/src/Microsoft.AspNet.Abstractions/NotNullAttribute.cs +++ b/src/Microsoft.AspNet.Http/NotNullAttribute.cs @@ -17,7 +17,7 @@ using System; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] internal sealed class NotNullAttribute : Attribute diff --git a/src/Microsoft.AspNet.Abstractions/PathString.cs b/src/Microsoft.AspNet.Http/PathString.cs similarity index 99% rename from src/Microsoft.AspNet.Abstractions/PathString.cs rename to src/Microsoft.AspNet.Http/PathString.cs index b722e8baee..acb90717fa 100644 --- a/src/Microsoft.AspNet.Abstractions/PathString.cs +++ b/src/Microsoft.AspNet.Http/PathString.cs @@ -18,7 +18,7 @@ using System; using System.Linq; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Provides correct escaping for Path and PathBase values when needed to reconstruct a request or redirect URI string diff --git a/src/Microsoft.AspNet.Abstractions/QueryString.cs b/src/Microsoft.AspNet.Http/QueryString.cs similarity index 99% rename from src/Microsoft.AspNet.Abstractions/QueryString.cs rename to src/Microsoft.AspNet.Http/QueryString.cs index 1188530052..9e88c9c025 100644 --- a/src/Microsoft.AspNet.Abstractions/QueryString.cs +++ b/src/Microsoft.AspNet.Http/QueryString.cs @@ -17,7 +17,7 @@ using System; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { /// /// Provides correct handling for QueryString value when needed to reconstruct a request or redirect URI string diff --git a/src/Microsoft.AspNet.Abstractions/RequestDelegate.cs b/src/Microsoft.AspNet.Http/RequestDelegate.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/RequestDelegate.cs rename to src/Microsoft.AspNet.Http/RequestDelegate.cs index 951c668d9a..fbfdc584b5 100644 --- a/src/Microsoft.AspNet.Abstractions/RequestDelegate.cs +++ b/src/Microsoft.AspNet.Http/RequestDelegate.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public delegate Task RequestDelegate(HttpContext context); } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Abstractions/Security/AuthenticateResult.cs b/src/Microsoft.AspNet.Http/Security/AuthenticateResult.cs similarity index 98% rename from src/Microsoft.AspNet.Abstractions/Security/AuthenticateResult.cs rename to src/Microsoft.AspNet.Http/Security/AuthenticateResult.cs index 812895a631..a7055c919d 100644 --- a/src/Microsoft.AspNet.Abstractions/Security/AuthenticateResult.cs +++ b/src/Microsoft.AspNet.Http/Security/AuthenticateResult.cs @@ -19,7 +19,7 @@ using System; using System.Security.Claims; using System.Security.Principal; -namespace Microsoft.AspNet.Abstractions.Security +namespace Microsoft.AspNet.Http.Security { /// /// Acts as the return value from calls to the IAuthenticationManager's AuthenticeAsync methods. diff --git a/src/Microsoft.AspNet.Abstractions/Security/AuthenticationDescription.cs b/src/Microsoft.AspNet.Http/Security/AuthenticationDescription.cs similarity index 98% rename from src/Microsoft.AspNet.Abstractions/Security/AuthenticationDescription.cs rename to src/Microsoft.AspNet.Http/Security/AuthenticationDescription.cs index 8d3ad0c293..630b8a09cc 100644 --- a/src/Microsoft.AspNet.Abstractions/Security/AuthenticationDescription.cs +++ b/src/Microsoft.AspNet.Http/Security/AuthenticationDescription.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Globalization; -namespace Microsoft.AspNet.Abstractions.Security +namespace Microsoft.AspNet.Http.Security { /// /// Contains information describing an authentication provider. diff --git a/src/Microsoft.AspNet.Abstractions/Security/AuthenticationProperties.cs b/src/Microsoft.AspNet.Http/Security/AuthenticationProperties.cs similarity index 99% rename from src/Microsoft.AspNet.Abstractions/Security/AuthenticationProperties.cs rename to src/Microsoft.AspNet.Http/Security/AuthenticationProperties.cs index cc793057d0..a55f35ecd8 100644 --- a/src/Microsoft.AspNet.Abstractions/Security/AuthenticationProperties.cs +++ b/src/Microsoft.AspNet.Http/Security/AuthenticationProperties.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; -namespace Microsoft.AspNet.Abstractions.Security +namespace Microsoft.AspNet.Http.Security { /// /// Dictionary used to store state values about the authentication session. diff --git a/src/Microsoft.AspNet.Abstractions/project.json b/src/Microsoft.AspNet.Http/project.json similarity index 100% rename from src/Microsoft.AspNet.Abstractions/project.json rename to src/Microsoft.AspNet.Http/project.json diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs index 5ad850ead3..819f288991 100644 --- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs +++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs @@ -25,7 +25,7 @@ using System.Net; using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.HttpFeature; namespace Microsoft.AspNet.Owin diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs index 4a4d80d177..d6790b35b1 100644 --- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs +++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs @@ -18,7 +18,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Owin; using Microsoft.AspNet.PipelineCore; diff --git a/src/Microsoft.AspNet.Owin/Project.json b/src/Microsoft.AspNet.Owin/Project.json index 4a7ce42ba7..18e1116930 100644 --- a/src/Microsoft.AspNet.Owin/Project.json +++ b/src/Microsoft.AspNet.Owin/Project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.FeatureModel": "", "Microsoft.AspNet.PipelineCore": "", "Microsoft.AspNet.HttpFeature": "" diff --git a/src/Microsoft.AspNet.PipelineCore/Builder.cs b/src/Microsoft.AspNet.PipelineCore/Builder.cs index 2b775fc4c3..df93a7a3e3 100644 --- a/src/Microsoft.AspNet.PipelineCore/Builder.cs +++ b/src/Microsoft.AspNet.PipelineCore/Builder.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.PipelineCore { diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/FormCollection.cs b/src/Microsoft.AspNet.PipelineCore/Collections/FormCollection.cs index 7a9c41cbc3..2a93e7dde0 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/FormCollection.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/FormCollection.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using System.Collections.Generic; namespace Microsoft.AspNet.PipelineCore.Collections diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/HeaderDictionary.cs b/src/Microsoft.AspNet.PipelineCore/Collections/HeaderDictionary.cs index 620fddd26b..ab53ba639e 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/HeaderDictionary.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/HeaderDictionary.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Abstractions.Infrastructure; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.AspNet.Http; using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore.Collections diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/ItemsDictionary.cs b/src/Microsoft.AspNet.PipelineCore/Collections/ItemsDictionary.cs index 22e26e112c..2771932385 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/ItemsDictionary.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/ItemsDictionary.cs @@ -17,7 +17,7 @@ using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.PipelineCore { diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs b/src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs index b8e70872df..a18dcdeabb 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs @@ -18,8 +18,8 @@ using System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Abstractions.Infrastructure; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.AspNet.Http; using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore.Collections diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/RequestCookiesCollection.cs b/src/Microsoft.AspNet.PipelineCore/Collections/RequestCookiesCollection.cs index c2959cbe1d..056b3beda5 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/RequestCookiesCollection.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/RequestCookiesCollection.cs @@ -18,7 +18,7 @@ using System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore.Collections diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs b/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs index f70ef385cf..c3451dab58 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs @@ -19,8 +19,8 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Infrastructure; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Infrastructure; namespace Microsoft.AspNet.PipelineCore.Collections { diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs index ad4f3902a9..47fadff71d 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs @@ -21,8 +21,8 @@ using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.HttpFeature.Security; diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs index 602f6bebfb..719a3c2362 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs @@ -20,8 +20,8 @@ using System.Globalization; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Infrastructure; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore.Collections; diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs index 7075b69663..2caeec3851 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs @@ -22,9 +22,9 @@ using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Infrastructure; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.HttpFeature.Security; diff --git a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs index 9613162d6f..bcf0d46c67 100644 --- a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs @@ -18,7 +18,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore.Collections; diff --git a/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs index f80d2c2713..cef0c76d2d 100644 --- a/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.PipelineCore { diff --git a/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs b/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs index 6dcaa1836e..c17f61973e 100644 --- a/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.PipelineCore { diff --git a/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs b/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs index 8cfcd2cb40..af9a3bedec 100644 --- a/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.PipelineCore { diff --git a/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs b/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs index 02a10ff95a..b6e5bbc7e6 100644 --- a/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.PipelineCore.Collections; namespace Microsoft.AspNet.PipelineCore diff --git a/src/Microsoft.AspNet.PipelineCore/Infrastructure/Constants.cs b/src/Microsoft.AspNet.PipelineCore/Infrastructure/Constants.cs index 374c1af87d..5d2c5635f1 100644 --- a/src/Microsoft.AspNet.PipelineCore/Infrastructure/Constants.cs +++ b/src/Microsoft.AspNet.PipelineCore/Infrastructure/Constants.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -namespace Microsoft.AspNet.Abstractions.Infrastructure +namespace Microsoft.AspNet.Http.Infrastructure { internal static class Constants { diff --git a/src/Microsoft.AspNet.PipelineCore/Infrastructure/ParsingHelpers.cs b/src/Microsoft.AspNet.PipelineCore/Infrastructure/ParsingHelpers.cs index a750fe5359..afbf7116ea 100644 --- a/src/Microsoft.AspNet.PipelineCore/Infrastructure/ParsingHelpers.cs +++ b/src/Microsoft.AspNet.PipelineCore/Infrastructure/ParsingHelpers.cs @@ -20,8 +20,8 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Infrastructure; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.AspNet.PipelineCore.Collections; namespace Microsoft.AspNet.PipelineCore.Infrastructure diff --git a/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs b/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs index 994fa4b0e8..757a015d08 100644 --- a/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore.Collections; diff --git a/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs b/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs index 6d38678bbe..75ceae3ada 100644 --- a/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs @@ -16,8 +16,8 @@ // permissions and limitations under the License. using System; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Infrastructure; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Infrastructure; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore.Collections; diff --git a/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs index 0fa8afff85..7127a87684 100644 --- a/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore.Collections; diff --git a/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs index dcefd97e6e..476762aaee 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/AuthTypeContext.cs @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.HttpFeature.Security; namespace Microsoft.AspNet.PipelineCore.Security diff --git a/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs b/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs index 2ed6579ad8..36a6ce567d 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/AuthenticateContext.cs @@ -21,7 +21,7 @@ using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.HttpFeature.Security; namespace Microsoft.AspNet.PipelineCore.Security diff --git a/src/Microsoft.AspNet.PipelineCore/project.json b/src/Microsoft.AspNet.PipelineCore/project.json index e8e90fdd08..3af3011dda 100644 --- a/src/Microsoft.AspNet.PipelineCore/project.json +++ b/src/Microsoft.AspNet.PipelineCore/project.json @@ -3,7 +3,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.AspNet.FeatureModel": "", - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.HttpFeature": "" }, "configurations": { diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/project.json b/test/Microsoft.AspNet.FeatureModel.Tests/project.json index 25bbf54fa6..dfb641df68 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/project.json +++ b/test/Microsoft.AspNet.FeatureModel.Tests/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.AspNet.HttpFeature": "", - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.FeatureModel": "", "Xunit.KRunner": "0.1-alpha-*", "xunit.abstractions": "2.0.0-aspnet-*", diff --git a/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs b/test/Microsoft.AspNet.Http.Tests/Fakes.cs similarity index 96% rename from test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs rename to test/Microsoft.AspNet.Http.Tests/Fakes.cs index 8e65358410..04cce33960 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs +++ b/test/Microsoft.AspNet.Http.Tests/Fakes.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.IO; using Microsoft.AspNet.HttpFeature; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { public class FakeHttpRequestFeature : IHttpRequestFeature { diff --git a/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs similarity index 99% rename from test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs rename to test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs index c7faa83160..0096fe7b56 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs @@ -22,7 +22,7 @@ using Microsoft.AspNet.PipelineCore; using Shouldly; using Xunit; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { public class MapPathMiddlewareTests { diff --git a/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs similarity index 99% rename from test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs rename to test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs index 80fe6c0e88..d57293440b 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs @@ -22,7 +22,7 @@ using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; using Xunit; -namespace Microsoft.AspNet.Abstractions.Extensions +namespace Microsoft.AspNet.Http.Extensions { using AppFunc = Func, Task>; using Predicate = Func; diff --git a/test/Microsoft.AspNet.Abstractions.Tests/Microsoft.AspNet.Abstractions.Tests.kproj b/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.kproj similarity index 100% rename from test/Microsoft.AspNet.Abstractions.Tests/Microsoft.AspNet.Abstractions.Tests.kproj rename to test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.kproj diff --git a/test/Microsoft.AspNet.Abstractions.Tests/PathStringTests.cs b/test/Microsoft.AspNet.Http.Tests/PathStringTests.cs similarity index 98% rename from test/Microsoft.AspNet.Abstractions.Tests/PathStringTests.cs rename to test/Microsoft.AspNet.Http.Tests/PathStringTests.cs index 171fa1caca..0bc9dd09e3 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/PathStringTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/PathStringTests.cs @@ -18,7 +18,7 @@ using Microsoft.AspNet.Testing; using Xunit; -namespace Microsoft.AspNet.Abstractions +namespace Microsoft.AspNet.Http { public class PathStringTests { diff --git a/test/Microsoft.AspNet.Abstractions.Tests/project.json b/test/Microsoft.AspNet.Http.Tests/Project.json similarity index 93% rename from test/Microsoft.AspNet.Abstractions.Tests/project.json rename to test/Microsoft.AspNet.Http.Tests/Project.json index 5a3029b789..6d51c6c3da 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/project.json +++ b/test/Microsoft.AspNet.Http.Tests/Project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.PipelineCore": "", "Microsoft.AspNet.HttpFeature": "", "Microsoft.AspNet.Testing": "0.1-alpha-*", diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs index aa1f4a59e1..37a655632a 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs @@ -21,8 +21,8 @@ using System.IO; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; -using Microsoft.AspNet.Abstractions.Security; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.HttpFeature; using Xunit; diff --git a/test/Microsoft.AspNet.Owin.Tests/Project.json b/test/Microsoft.AspNet.Owin.Tests/Project.json index 3ba09cb57f..ea8857b6ba 100644 --- a/test/Microsoft.AspNet.Owin.Tests/Project.json +++ b/test/Microsoft.AspNet.Owin.Tests/Project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.AspNet.Owin": "", "Microsoft.AspNet.HttpFeature": "", - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.FeatureModel": "", "Microsoft.AspNet.PipelineCore": "", "Xunit.KRunner": "0.1-alpha-*", diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs index 13044c0a29..65a1e04edf 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Xunit; namespace Microsoft.AspNet.PipelineCore.Tests diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs index a2d913c9f8..37364386be 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs @@ -21,7 +21,7 @@ using System.IO; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Xunit; diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs index 9ec72f8a89..5b8986bccb 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs @@ -18,7 +18,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.HttpFeature; using Moq; diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/project.json b/test/Microsoft.AspNet.PipelineCore.Tests/project.json index ae27e76817..54bcce5f18 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/project.json +++ b/test/Microsoft.AspNet.PipelineCore.Tests/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.AspNet.HttpFeature": "", - "Microsoft.AspNet.Abstractions": "", + "Microsoft.AspNet.Http": "", "Microsoft.AspNet.FeatureModel": "", "Microsoft.AspNet.PipelineCore": "", "Xunit.KRunner": "0.1-alpha-*",