Merge CheckPacket

Author: edwardneal

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

@@ -400,8 +400,6 @@ public void ReadAsyncCallback(IntPtr key, PacketHandle packet, uint error)
             }
         }
 
-        protected abstract bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source);
-
         public void WriteAsyncCallback(PacketHandle packet, uint sniError) =>
             WriteAsyncCallback(IntPtr.Zero, packet, sniError);
 

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

@@ -460,13 +460,6 @@ public void ReadAsyncCallback(IntPtr key, PacketHandle packet, uint error)
             }
         }
 
-        private bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source)
-        {
-            Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");
-            IntPtr ptr = packet.NativePointer;
-            return IntPtr.Zero == ptr || IntPtr.Zero != ptr && source != null;
-        }
-
 #pragma warning disable 420 // a reference to a volatile field will not be treated as volatile
 
         public void WriteAsyncCallback(IntPtr key, PacketHandle packet, uint sniError)

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

@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 using Interop.Windows.Sni;
 using Microsoft.Data.Common;
 
@@ -39,6 +40,13 @@ protected override uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, re
             return SniNativeWrapper.SniPacketGetData(packet.NativePointer, _inBuff, ref dataSize);
         }
 
+        protected override bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source)
+        {
+            Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");
+            IntPtr ptr = packet.NativePointer;
+            return IntPtr.Zero == ptr || IntPtr.Zero != ptr && source != null;
+        }
+
         internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS;
 
         internal override bool IsPacketEmpty(PacketHandle readPacket)

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

@@ -485,6 +485,8 @@ internal long TimeoutTime
 
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);
 
+        protected abstract bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source);
+
         internal abstract bool IsFailedHandle();
 
         internal abstract bool IsPacketEmpty(PacketHandle readPacket);