From ca44b4adfc6ffdae99c34091cd317d07baa9cc1e Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Wed, 11 Apr 2018 20:23:48 -0700
Subject: [PATCH] Moved kestrel specific features into transport abstractions
 (#2482)

---
 src/Connections.Abstractions/DefaultConnectionContext.cs        | 2 --
 src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs           | 1 +
 .../Internal}/IApplicationTransportFeature.cs                   | 2 +-
 .../Internal}/ITransportSchedulerFeature.cs                     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/{Connections.Abstractions/Features => Kestrel.Transport.Abstractions/Internal}/IApplicationTransportFeature.cs (81%)
 rename src/{Connections.Abstractions/Features => Kestrel.Transport.Abstractions/Internal}/ITransportSchedulerFeature.cs (84%)

diff --git a/src/Connections.Abstractions/DefaultConnectionContext.cs b/src/Connections.Abstractions/DefaultConnectionContext.cs
index 33607c0a5c..4b3377350d 100644
--- a/src/Connections.Abstractions/DefaultConnectionContext.cs
+++ b/src/Connections.Abstractions/DefaultConnectionContext.cs
@@ -17,7 +17,6 @@ namespace Microsoft.AspNetCore.Connections
                                             IConnectionIdFeature,
                                             IConnectionItemsFeature,
                                             IConnectionTransportFeature,
-                                            IApplicationTransportFeature,
                                             IConnectionUserFeature
     {
         public DefaultConnectionContext() :
@@ -39,7 +38,6 @@ namespace Microsoft.AspNetCore.Connections
             Features.Set<IConnectionItemsFeature>(this);
             Features.Set<IConnectionIdFeature>(this);
             Features.Set<IConnectionTransportFeature>(this);
-            Features.Set<IApplicationTransportFeature>(this);
         }
 
         public DefaultConnectionContext(string id, IDuplexPipe transport, IDuplexPipe application)
diff --git a/src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs b/src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs
index fad29ae0db..598dae82d8 100644
--- a/src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs
+++ b/src/Kestrel.Core/Internal/HttpConnectionMiddleware.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
 {
diff --git a/src/Connections.Abstractions/Features/IApplicationTransportFeature.cs b/src/Kestrel.Transport.Abstractions/Internal/IApplicationTransportFeature.cs
similarity index 81%
rename from src/Connections.Abstractions/Features/IApplicationTransportFeature.cs
rename to src/Kestrel.Transport.Abstractions/Internal/IApplicationTransportFeature.cs
index e4955996c0..490cb7f065 100644
--- a/src/Connections.Abstractions/Features/IApplicationTransportFeature.cs
+++ b/src/Kestrel.Transport.Abstractions/Internal/IApplicationTransportFeature.cs
@@ -5,7 +5,7 @@ using System.Buffers;
 using System.IO.Pipelines;
 using System.Threading;
 
-namespace Microsoft.AspNetCore.Connections.Features
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal
 {
     public interface IApplicationTransportFeature
     {
diff --git a/src/Connections.Abstractions/Features/ITransportSchedulerFeature.cs b/src/Kestrel.Transport.Abstractions/Internal/ITransportSchedulerFeature.cs
similarity index 84%
rename from src/Connections.Abstractions/Features/ITransportSchedulerFeature.cs
rename to src/Kestrel.Transport.Abstractions/Internal/ITransportSchedulerFeature.cs
index e5d3a8e8d0..be113bbe10 100644
--- a/src/Connections.Abstractions/Features/ITransportSchedulerFeature.cs
+++ b/src/Kestrel.Transport.Abstractions/Internal/ITransportSchedulerFeature.cs
@@ -5,7 +5,7 @@ using System.Buffers;
 using System.IO.Pipelines;
 using System.Threading;
 
-namespace Microsoft.AspNetCore.Connections.Features
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal
 {
     public interface ITransportSchedulerFeature
     {