#190 - Swap Http and Http.Core package names. Remove Http.Core namespace.

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

src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>bcf0f967-8753-4438-bd07-aadca9ce509a</ProjectGuid>
+    <ProjectGuid>22071333-15ba-4d16-a1d5-4d5b1a83fbdd</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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.Collections": "4.0.10-beta-*",
-                "System.Text.Encoding": "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-*"
             }
         }
     }

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-*" },

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
 {
     /// <summary>
     /// Contains the parsed form values.

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<IFormFile>, IFormFileCollection
     {

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
 {
     /// <summary>
     /// Represents a wrapper for owin.RequestHeaders and owin.ResponseHeaders.

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<object, object>
     {

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
 {
     /// <summary>
     /// Accessors for query, forms, etc.

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
     {

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
 {
     /// <summary>
     /// A wrapper for the response Set-Cookie header

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
     {

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
     {

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.Collections;
-using Microsoft.AspNet.Http.Core.Collections;
+using Microsoft.AspNet.Http.Infrastructure;
-using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public class DefaultHttpContext : HttpContext
     {

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.Collections;
-using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.AspNet.Http.Infrastructure;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public class DefaultHttpRequest : HttpRequest
     {

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.Collections;
-using Microsoft.AspNet.Http.Core.Collections;
+using Microsoft.AspNet.Http.Infrastructure;
-using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public class DefaultHttpResponse : HttpResponse
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
-
-namespace Microsoft.AspNet.Http.Core
 {
     public interface IQueryFeature
     {

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
-
-namespace Microsoft.AspNet.Http.Core
 {
     public interface IRequestCookiesFeature
     {

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;
+namespace Microsoft.AspNet.Http
-using Microsoft.AspNet.Http.Core.Collections;
-
-namespace Microsoft.AspNet.Http.Core
 {
     public interface IResponseCookiesFeature
     {

src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public interface IServiceProvidersFeature
     {

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<T>
     {

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<HeaderSegment>
     {

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
     {

src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>22071333-15ba-4d16-a1d5-4d5b1a83fbdd</ProjectGuid>
+    <ProjectGuid>bcf0f967-8753-4438-bd07-aadca9ce509a</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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.Collections;
-using Microsoft.AspNet.Http.Core.Infrastructure;
+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
     {

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
 {
     /// <summary>
     /// A Stream that wraps another stream starting at a certain offset and reading for the given length.

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.Collections;
-using Microsoft.AspNet.Http.Core.Infrastructure;
+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
     {

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.Collections;
-using Microsoft.AspNet.Http.Core.Infrastructure;
+using Microsoft.AspNet.Http.Infrastructure;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public class ResponseCookiesFeature : IResponseCookiesFeature
     {

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
     {

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
-
-namespace Microsoft.AspNet.Http.Core
 {
     public class WebSocketAcceptContext : IWebSocketAcceptContext
     {

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.Debug": "4.0.10-beta-*",
-                "System.Diagnostics.Tools": "4.0.0-beta-*",
+                "System.Text.Encoding": "4.0.10-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-*"
             }
         }
     }

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
 {

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
 {

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": {

test/Microsoft.AspNet.FeatureModel.Tests/project.json

@@ -1,8 +1,6 @@
 {
   "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/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

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;
 

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

test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>aa99af26-f7b1-4a6b-a922-5c25539f6391</ProjectGuid>
+    <ProjectGuid>f16692b8-9f38-4dca-a582-e43172b989c6</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

test/Microsoft.AspNet.Http.Core.Tests/project.json

@@ -1,22 +1,17 @@
 {
-    "dependencies": {
+  "dependencies": {
-        "Microsoft.AspNet.FeatureModel": "1.0.0-*",
+    "Microsoft.AspNet.Http": "1.0.0-*",
-        "Microsoft.AspNet.Http": "1.0.0-*",
+    "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
-        "Microsoft.AspNet.Http.Core": "1.0.0-*",
+  },
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
+  "commands": {
-    },
+    "test": "xunit.runner.aspnet"
-    "commands": {
+  },
-        "test": "xunit.runner.aspnet"
+  "frameworks": {
-    },
+    "dnx451": {
-    "frameworks": {
+      "dependencies": {
-        "dnx451": {
+        "Shouldly": "1.1.1.1"
-            "dependencies": {
+      }
-                "Moq": "4.2.1312.1622"
-            },
-            "frameworkAssemblies": {
-                "System.Net.Http": ""
-            }
-        }
     }
+  }
 }

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;
 

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

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

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;
 

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-*"
   },

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>f16692b8-9f38-4dca-a582-e43172b989c6</ProjectGuid>
+    <ProjectGuid>aa99af26-f7b1-4a6b-a922-5c25539f6391</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>