Merge Status, SessionId, SessionHandle properties

Author: edwardneal

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

@@ -63,22 +63,6 @@ internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCon
             _lastSuccessfulIOTimer = parser._physicalStateObj._lastSuccessfulIOTimer;
         }
 
-        ////////////////
-        // Properties //
-        ////////////////
-
-        internal abstract uint Status
-        {
-            get;
-        }
-
-        internal abstract Guid? SessionId { get; }
-
-        internal abstract SessionHandle SessionHandle
-        {
-            get;
-        }
-
         /////////////////////
         // General methods //
         /////////////////////

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Data.SqlClient
 
     internal partial class TdsParserStateObject
     {
-        private SNIHandle _sessionHandle = null;              // the SNI handle we're to work on
+        protected SNIHandle _sessionHandle = null;              // the SNI handle we're to work on
 
         // SNI variables                                                     // multiple resultsets in one batch.
         private SNIPacket _sniPacket = null;                // Will have to re-vamp this for MARS
@@ -90,23 +90,6 @@ internal SNIHandle Handle
             }
         }
 
-        internal uint Status
-        {
-            get
-            {
-                if (_sessionHandle != null)
-                {
-                    return _sessionHandle.Status;
-                }
-                else
-                { // SQL BU DT 395431.
-                    return TdsEnums.SNI_UNINITIALIZED;
-                }
-            }
-        }
-
-        internal SessionHandle SessionHandle => SessionHandle.FromNativeHandle(Handle);
-
         /////////////////////
         // General methods //
         /////////////////////

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

@@ -19,6 +19,16 @@ internal TdsParserStateObjectNative(TdsParser parser)
         {
         }
 
+        ////////////////
+        // Properties //
+        ////////////////
+
+        internal override uint Status => _sessionHandle != null ? _sessionHandle.Status : TdsEnums.SNI_UNINITIALIZED;
+
+        internal override SessionHandle SessionHandle => SessionHandle.FromNativeHandle(_sessionHandle);
+
+        internal override Guid? SessionId => default;
+
         internal override uint SniGetConnectionId(ref Guid clientConnectionId)
             => SniNativeWrapper.SniGetConnectionId(Handle, ref clientConnectionId);
 

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

@@ -472,6 +472,16 @@ internal long TimeoutTime
             }
         }
 
+        ////////////////
+        // Properties //
+        ////////////////
+
+        internal abstract uint Status { get; }
+
+        internal abstract Guid? SessionId { get; }
+
+        internal abstract SessionHandle SessionHandle { get; }
+
         internal abstract uint SniGetConnectionId(ref Guid clientConnectionId);
 
         internal abstract uint DisableSsl();