Addressed PR feedback!

Author: ShreyasJejurkar

src/Servers/Connections.Abstractions/src/BaseConnectionContext.cs

@@ -46,11 +46,6 @@ public abstract class BaseConnectionContext : IAsyncDisposable
         /// </summary>
         public virtual EndPoint? RemoteEndPoint { get; set; }
 
-        /// <summary>
-        /// Gets or sets the socket for this connection.
-        /// </summary>
-        public virtual Socket? Socket { get; set; }
-
         /// <summary>
         /// Aborts the underlying connection.
         /// </summary>

src/Servers/Connections.Abstractions/src/DefaultConnectionContext.cs

@@ -23,8 +23,7 @@ public class DefaultConnectionContext : ConnectionContext,
                                             IConnectionTransportFeature,
                                             IConnectionUserFeature,
                                             IConnectionLifetimeFeature,
-                                            IConnectionEndPointFeature,
-                                            IConnectionSocketFeature
+                                            IConnectionEndPointFeature
     {
         private CancellationTokenSource _connectionClosedTokenSource = new CancellationTokenSource();
 
@@ -53,7 +52,6 @@ public DefaultConnectionContext(string id)
             Features.Set<IConnectionTransportFeature>(this);
             Features.Set<IConnectionLifetimeFeature>(this);
             Features.Set<IConnectionEndPointFeature>(this);
-            Features.Set<IConnectionSocketFeature>(this);
 
             ConnectionClosed = _connectionClosedTokenSource.Token;
         }
@@ -99,9 +97,6 @@ public DefaultConnectionContext(string id, IDuplexPipe transport, IDuplexPipe ap
         /// <inheritdoc />
         public override EndPoint? RemoteEndPoint { get; set; }
 
-        /// <inheritdoc />
-        public override Socket? Socket { get; set; }
-
         /// <inheritdoc />
         public override void Abort(ConnectionAbortedException abortReason)
         {

src/Servers/Connections.Abstractions/src/PublicAPI.Unshipped.txt

@@ -25,7 +25,3 @@ Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.Multi
 Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionDelegate
 abstract Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.ConnectionContext?>
 abstract Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.ConnectAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.ConnectionContext!>
-override Microsoft.AspNetCore.Connections.DefaultConnectionContext.Socket.get -> System.Net.Sockets.Socket?
-override Microsoft.AspNetCore.Connections.DefaultConnectionContext.Socket.set -> void
-virtual Microsoft.AspNetCore.Connections.BaseConnectionContext.Socket.get -> System.Net.Sockets.Socket?
-virtual Microsoft.AspNetCore.Connections.BaseConnectionContext.Socket.set -> void

src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs

@@ -48,7 +48,6 @@ internal SocketConnection(Socket socket,
             MemoryPool = memoryPool;
             _trace = trace;
             _waitForData = waitForData;
-            Socket = _socket;
 
             LocalEndPoint = _socket.LocalEndPoint;
             RemoteEndPoint = _socket.RemoteEndPoint;

src/Servers/Kestrel/shared/TransportConnection.FeatureCollection.cs

@@ -16,8 +16,7 @@ internal partial class TransportConnection : IConnectionIdFeature,
                                                  IConnectionTransportFeature,
                                                  IConnectionItemsFeature,
                                                  IMemoryPoolFeature,
-                                                 IConnectionLifetimeFeature,
-                                                 IConnectionSocketFeature
+                                                 IConnectionLifetimeFeature
     {
         // NOTE: When feature interfaces are added to or removed from this TransportConnection class implementation,
         // then the list of `features` in the generated code project MUST also be updated.
@@ -43,11 +42,6 @@ CancellationToken IConnectionLifetimeFeature.ConnectionClosed
             set => ConnectionClosed = value;
         }
 
-        Socket? IConnectionSocketFeature.Socket
-        {
-            get => Socket;
-        }
-
         void IConnectionLifetimeFeature.Abort() => Abort(new ConnectionAbortedException("The connection was aborted by the application via IConnectionLifetimeFeature.Abort()."));
     }
 }

src/Servers/Kestrel/shared/TransportConnection.Generated.cs

@@ -19,6 +19,7 @@ internal partial class TransportConnection : IFeatureCollection
         private object? _currentIConnectionItemsFeature;
         private object? _currentIMemoryPoolFeature;
         private object? _currentIConnectionLifetimeFeature;
+        private object? _currentIConnectionSocketFeature;
 
         private int _featureRevision;
 
@@ -31,7 +32,7 @@ private void FastReset()
             _currentIConnectionItemsFeature = this;
             _currentIMemoryPoolFeature = this;
             _currentIConnectionLifetimeFeature = this;
-
+            _currentIConnectionSocketFeature = this;
         }
 
         // Internal for testing
@@ -123,6 +124,10 @@ private void ExtraFeatureSet(Type key, object? value)
                 {
                     feature = _currentIConnectionLifetimeFeature;
                 }
+                else if (key == typeof(IConnectionSocketFeature))
+                {
+                    feature = _currentIConnectionSocketFeature;
+                }
                 else if (MaybeExtra != null)
                 {
                     feature = ExtraFeatureGet(key);
@@ -155,6 +160,10 @@ private void ExtraFeatureSet(Type key, object? value)
                 {
                     _currentIConnectionLifetimeFeature = value;
                 }
+                else if (key == typeof(IConnectionSocketFeature))
+                {
+                    _currentIConnectionSocketFeature = value;
+                }
                 else
                 {
                     ExtraFeatureSet(key, value);
@@ -185,6 +194,10 @@ private void ExtraFeatureSet(Type key, object? value)
             {
                 feature = (TFeature?)_currentIConnectionLifetimeFeature;
             }
+            else if (typeof(TFeature) == typeof(IConnectionSocketFeature))
+            {
+                feature = (TFeature?)_currentIConnectionSocketFeature;
+            }
             else if (MaybeExtra != null)
             {
                 feature = (TFeature?)(ExtraFeatureGet(typeof(TFeature)));
@@ -216,6 +229,10 @@ private void ExtraFeatureSet(Type key, object? value)
             {
                 _currentIConnectionLifetimeFeature = feature;
             }
+            else if (typeof(TFeature) == typeof(IConnectionSocketFeature))
+            {
+                _currentIConnectionSocketFeature = feature;
+            }
             else
             {
                 ExtraFeatureSet(typeof(TFeature), feature);
@@ -244,6 +261,10 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             {
                 yield return new KeyValuePair<Type, object>(typeof(IConnectionLifetimeFeature), _currentIConnectionLifetimeFeature);
             }
+            if (_currentIConnectionSocketFeature != null)
+            {
+                yield return new KeyValuePair<Type, object>(typeof(IConnectionSocketFeature), _currentIConnectionSocketFeature);
+            }
 
             if (MaybeExtra != null)
             {

src/Servers/Kestrel/shared/TransportConnection.cs

@@ -65,8 +65,6 @@ public override string ConnectionId
             }
         }
 
-        public override Socket? Socket { get; set; }
-
         public override CancellationToken ConnectionClosed { get; set; }
 
         // DO NOT remove this override to ConnectionContext.Abort. Doing so would cause