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

Author: Tratcher

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/Authentication/AuthenticateResult.cs renamed to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateResult.cs

@@ -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/Authentication/AuthenticationDescription.cs renamed to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs

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

src/Microsoft.AspNet.Http/Authentication/AuthenticationProperties.cs renamed to src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs

@@ -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/ConnectionInfo.cs renamed to src/Microsoft.AspNet.Http.Core/ConnectionInfo.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/CookieOptions.cs renamed to src/Microsoft.AspNet.Http.Core/CookieOptions.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/Extensions/MapExtensions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapExtensions.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 @@ public IEnumerable<AuthenticationDescription> Results
         {
             get { return _results; }
         }
-                
+
         public void Accept(IDictionary<string, object> description)
         {
             _results.Add(new AuthenticationDescription(description));

src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapMiddleware.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/Extensions/MapOptions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapOptions.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/Extensions/MapWhenExtensions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenExtensions.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/Extensions/MapWhenMiddleware.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenMiddleware.cs

@@ -6,7 +6,7 @@
 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/Extensions/MapWhenOptions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/MapWhenOptions.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/Extensions/RunExtensions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/RunExtensions.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/Extensions/UseExtensions.cs renamed to src/Microsoft.AspNet.Http.Core/Extensions/UseExtensions.cs

@@ -5,10 +5,10 @@
 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/FragmentString.cs renamed to src/Microsoft.AspNet.Http.Core/FragmentString.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/HostString.cs renamed to src/Microsoft.AspNet.Http.Core/HostString.cs

@@ -5,7 +5,7 @@
 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/HttpContext.cs renamed to src/Microsoft.AspNet.Http.Core/HttpContext.cs

@@ -6,7 +6,7 @@
 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/HttpRequest.cs renamed to src/Microsoft.AspNet.Http.Core/HttpRequest.cs

@@ -8,7 +8,7 @@
 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/HttpResponse.cs renamed to src/Microsoft.AspNet.Http.Core/HttpResponse.cs

@@ -5,7 +5,7 @@
 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/HttpResponseWritingExtensions.cs renamed to src/Microsoft.AspNet.Http.Core/HttpResponseWritingExtensions.cs

@@ -6,9 +6,9 @@
 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/IApplicationBuilder.cs renamed to src/Microsoft.AspNet.Http.Core/IApplicationBuilder.cs

@@ -9,13 +9,12 @@
 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
     {

src/Microsoft.AspNet.Http/IFormCollection.cs renamed to src/Microsoft.AspNet.Http.Core/IFormCollection.cs

@@ -6,12 +6,11 @@
 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
     {

src/Microsoft.AspNet.Http/IFormFile.cs renamed to src/Microsoft.AspNet.Http.Core/IFormFile.cs

@@ -8,13 +8,12 @@
 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
     {

src/Microsoft.AspNet.Http/IFormFileCollection.cs renamed to src/Microsoft.AspNet.Http.Core/IFormFileCollection.cs

@@ -7,12 +7,12 @@
 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/IHeaderDictionary.cs renamed to src/Microsoft.AspNet.Http.Core/IHeaderDictionary.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/IReadableStringCollection.cs renamed to src/Microsoft.AspNet.Http.Core/IReadableStringCollection.cs

@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http.Core
+namespace Microsoft.AspNet.Http
 {
     public class HttpClientCertificateFeature : IHttpClientCertificateFeature
     {

src/Microsoft.AspNet.Http/IResponseCookies.cs renamed to src/Microsoft.AspNet.Http.Core/IResponseCookies.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/ISessionCollection.cs renamed to src/Microsoft.AspNet.Http.Core/ISessionCollection.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.Core/Microsoft.AspNet.Http.Core.xproj

@@ -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/PathString.cs renamed to src/Microsoft.AspNet.Http.Core/PathString.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/QueryString.cs renamed to src/Microsoft.AspNet.Http.Core/QueryString.cs

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