Merge EmptyReadPacket

Also reorder member in TdsParserStateObjectNative to simplify later merge

Author: edwardneal

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

@@ -859,7 +859,5 @@ private void SniWriteStatisticsAndTracing()
                 statistics.RequestNetworkServerTimer();
             }
         }
-
-        protected abstract PacketHandle EmptyReadPacket { get; }
     }
 }

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

@@ -54,12 +54,20 @@ internal TdsParserStateObjectNative(TdsParser parser, TdsParserStateObject physi
         {
         }
 
+        ////////////////
+        // Properties //
+        ////////////////
+
         internal SNIHandle Handle => _sessionHandle;
 
         internal override uint Status => _sessionHandle != null ? _sessionHandle.Status : TdsEnums.SNI_UNINITIALIZED;
 
         internal override SessionHandle SessionHandle => SessionHandle.FromNativeHandle(_sessionHandle);
 
+        protected override PacketHandle EmptyReadPacket => PacketHandle.FromNativePointer(default);
+
+        internal override Guid? SessionId => default;
+
         protected override void CreateSessionHandle(TdsParserStateObject physicalConnection, bool async)
         {
             Debug.Assert(physicalConnection is TdsParserStateObjectNative, "Expected a stateObject of type " + this.GetType());
@@ -254,10 +262,6 @@ protected override void FreeGcHandle(int remaining, bool release)
             }
         }
 
-        protected override PacketHandle EmptyReadPacket => PacketHandle.FromNativePointer(default);
-
-        internal override Guid? SessionId => default;
-
         internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS;
 
         internal override bool IsPacketEmpty(PacketHandle readPacket)

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

@@ -1036,7 +1036,5 @@ private void SniWriteStatisticsAndTracing()
             }
             SqlClientEventSource.Log.TryAdvancedTraceBinEvent("TdsParser.WritePacket | INFO | ADV | State Object Id {0}, Packet sent. Out buffer: {1}, Out Bytes Used: {2}", ObjectID, _outBuff, _outBytesUsed);
         }
-
-        protected PacketHandle EmptyReadPacket => PacketHandle.FromNativePointer(default);
     }
 }

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

@@ -29,6 +29,8 @@ internal TdsParserStateObjectNative(TdsParser parser)
 
         internal override SessionHandle SessionHandle => SessionHandle.FromNativeHandle(_sessionHandle);
 
+        protected override PacketHandle EmptyReadPacket => PacketHandle.FromNativePointer(default);
+
         internal override Guid? SessionId => default;
 
         protected override uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize)

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

@@ -481,6 +481,8 @@ internal long TimeoutTime
 
         internal abstract SessionHandle SessionHandle { get; }
 
+        protected abstract PacketHandle EmptyReadPacket { get; }
+
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);
 
         internal abstract bool IsFailedHandle();