Move remaining feature interfaces into Microsoft.AspNetCore.Http.Features package and namespace

src/Microsoft.AspNetCore.Http.Abstractions/project.json

@@ -29,13 +29,10 @@
     },
     "netstandard1.3": {
       "dependencies": {
-        "System.ComponentModel": "4.0.1-*",
         "System.Globalization.Extensions": "4.0.1-*",
         "System.Linq.Expressions": "4.0.11-*",
-        "System.Net.WebSockets": "4.0.0-*",
         "System.Reflection.TypeExtensions": "4.1.0-*",
-        "System.Runtime.InteropServices": "4.1.0-*",
-        "System.Security.Cryptography.X509Certificates": "4.0.0-*"
+        "System.Runtime.InteropServices": "4.1.0-*"
       },
       "imports": [
         "dotnet5.4"

src/Microsoft.AspNetCore.Http.Extensions/SessionExtensions.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Text;
-using Microsoft.AspNetCore.Http.Features;
 
 namespace Microsoft.AspNetCore.Http
 {

src/Microsoft.AspNetCore.Http.Abstractions/IFormCollection.cs → src/Microsoft.AspNetCore.Http.Features/IFormCollection.cs

@@ -18,9 +18,9 @@ public interface IFormCollection : IEnumerable<KeyValuePair<string, StringValues
         ///     The number of elements contained in the <see cref="T:Microsoft.AspNetCore.Http.IFormCollection" />.
         /// </returns>
         int Count { get; }
-        
+
         /// <summary>
-        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the 
+        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the
         ///     <see cref="T:Microsoft.AspNetCore.Http.IFormCollection" />.
         /// </summary>
         /// <returns>
@@ -79,7 +79,7 @@ public interface IFormCollection : IEnumerable<KeyValuePair<string, StringValues
         ///     key is null.
         /// </exception>
         /// <remarks>
-        ///     <see cref="T:Microsoft.AspNetCore.Http.IFormCollection" /> has a different indexer contract than 
+        ///     <see cref="T:Microsoft.AspNetCore.Http.IFormCollection" /> has a different indexer contract than
         ///     <see cref="T:System.Collections.Generic.IDictionary`2" />, as it will return StringValues.Empty for missing entries
         ///     rather than throwing an Exception.
         /// </remarks>

src/Microsoft.AspNetCore.Http/Features/IFormFeature.cs → src/Microsoft.AspNetCore.Http.Features/IFormFeature.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IFormFeature
     {

src/Microsoft.AspNetCore.Http/Features/IItemsFeature.cs → src/Microsoft.AspNetCore.Http.Features/IItemsFeature.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IItemsFeature
     {

src/Microsoft.AspNetCore.Http.Abstractions/IQueryCollection.cs → src/Microsoft.AspNetCore.Http.Features/IQueryCollection.cs

@@ -20,7 +20,7 @@ public interface IQueryCollection : IEnumerable<KeyValuePair<string, StringValue
         int Count { get; }
 
         /// <summary>
-        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the 
+        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the
         ///     <see cref="T:Microsoft.AspNetCore.Http.IQueryCollection" />.
         /// </summary>
         /// <returns>
@@ -73,13 +73,14 @@ public interface IQueryCollection : IEnumerable<KeyValuePair<string, StringValue
         ///     The key of the value to get.
         /// </param>
         /// <returns>
-        ///     The element with the specified key, or <see cref="T:Microsoft.Extensions.Primitives.StringValues" />.Empty if the key is not present.
+        ///     The element with the specified key, or <see cref="T:Microsoft.Extensions.Primitives.StringValues" />.
+        ///     Empty if the key is not present.
         /// </returns>
         /// <exception cref="T:System.ArgumentNullException">
         ///     key is null.
         /// </exception>
         /// <remarks>
-        ///     <see cref="T:Microsoft.AspNetCore.Http.IQueryCollection" /> has a different indexer contract than 
+        ///     <see cref="T:Microsoft.AspNetCore.Http.IQueryCollection" /> has a different indexer contract than
         ///     <see cref="T:System.Collections.Generic.IDictionary`2" />, as it will return StringValues.Empty for missing entries
         ///     rather than throwing an Exception.
         /// </remarks>

src/Microsoft.AspNetCore.Http/Features/IQueryFeature.cs → src/Microsoft.AspNetCore.Http.Features/IQueryFeature.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IQueryFeature
     {

src/Microsoft.AspNetCore.Http.Abstractions/IRequestCookieCollection.cs → src/Microsoft.AspNetCore.Http.Features/IRequestCookieCollection.cs

@@ -17,17 +17,17 @@ public interface IRequestCookieCollection : IEnumerable<KeyValuePair<string, str
         ///     The number of elements contained in the <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" />.
         /// </returns>
         int Count { get; }
-        
+
         /// <summary>
-        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the 
+        ///     Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the
         ///     <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" />.
         /// </summary>
         /// <returns>
         ///     An <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the object
         ///     that implements <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" />.
         /// </returns>
         ICollection<string> Keys { get; }
-        
+
         /// <summary>
         ///     Determines whether the <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" /> contains an element
         ///     with the specified key.
@@ -78,7 +78,7 @@ public interface IRequestCookieCollection : IEnumerable<KeyValuePair<string, str
         ///     key is null.
         /// </exception>
         /// <remarks>
-        ///     <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" /> has a different indexer contract than 
+        ///     <see cref="T:Microsoft.AspNetCore.Http.IRequestCookieCollection" /> has a different indexer contract than
         ///     <see cref="T:System.Collections.Generic.IDictionary`2" />, as it will return String.Empty for missing entries
         ///     rather than throwing an Exception.
         /// </remarks>

src/Microsoft.AspNetCore.Http/Features/IRequestCookiesFeature.cs → src/Microsoft.AspNetCore.Http.Features/IRequestCookiesFeature.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IRequestCookiesFeature
     {

src/Microsoft.AspNetCore.Http/Features/IResponseCookiesFeature.cs → src/Microsoft.AspNetCore.Http.Features/IResponseCookiesFeature.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IResponseCookiesFeature
     {

src/Microsoft.AspNetCore.Http/Features/IServiceProvidersFeature.cs → src/Microsoft.AspNetCore.Http.Features/IServiceProvidersFeature.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Http.Features.Internal
+namespace Microsoft.AspNetCore.Http.Features
 {
     public interface IServiceProvidersFeature
     {

src/Microsoft.AspNetCore.Http.Features/ISession.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Http.Features
+namespace Microsoft.AspNetCore.Http
 {
     public interface ISession
     {

src/Microsoft.AspNetCore.Http.Features/WebSocketAcceptContext.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Http.Features
+namespace Microsoft.AspNetCore.Http
 {
     public class WebSocketAcceptContext
     {

src/Microsoft.AspNetCore.Http.Features/project.json

@@ -21,6 +21,7 @@
     "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.11-*",
+        "System.ComponentModel": "4.0.1-*",
         "System.Linq": "4.1.0-*",
         "System.Net.Primitives": "4.0.11-*",
         "System.Net.WebSockets": "4.0.0-*",

src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs

@@ -16,9 +16,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Http.Features.Internal;
 using Microsoft.AspNetCore.Http.Features.Authentication;
 using Microsoft.AspNetCore.Http.Features.Authentication.Internal;
+using Microsoft.AspNetCore.Http.Features.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {

src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Owin
 {

src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptContext.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Owin
 {

src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAcceptAdapter.cs

@@ -6,7 +6,7 @@
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Owin
 {

test/Microsoft.AspNetCore.Http.Tests/DefaultHttpContextTests.cs

@@ -8,7 +8,6 @@
 using System.Reflection;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Authentication.Internal;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Internal;
 using Xunit;
@@ -204,7 +203,7 @@ void TestCachedFeaturesAreNull(object value, IFeatureCollection features)
 
             var field = type
                 .GetFields(BindingFlags.NonPublic | BindingFlags.Instance)
-                .Single(f => 
+                .Single(f =>
                     f.FieldType.GetTypeInfo().IsGenericType &&
                     f.FieldType.GetGenericTypeDefinition() == typeof(FeatureReferences<>));