Merge WritePacket, IsValidPacket

Author: edwardneal

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

@@ -705,10 +705,6 @@ private Task SNIWritePacket(PacketHandle packet, out uint sniError, bool canAccu
             return task;
         }
 
-        internal abstract bool IsValidPacket(PacketHandle packetPointer);
-
-        internal abstract uint WritePacket(PacketHandle packet, bool sync);
-
         // Sends an attention signal - executing thread will consume attn.
         internal void SendAttention(bool mustTakeWriteLock = false, bool asyncClose = false)
         {

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

@@ -675,8 +675,7 @@ private Task SNIWritePacket(PacketHandle packet, out uint sniError, bool canAccu
             }
             finally
             {
-                Debug.Assert(packet.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePacket");
-                sniError = SniNativeWrapper.SniWritePacket(Handle, packet.NativePacket, sync);
+                sniError = WritePacket(packet, sync);
             }
 
             if (sniError == TdsEnums.SNI_SUCCESS_IO_PENDING)
@@ -770,16 +769,6 @@ private Task SNIWritePacket(PacketHandle packet, out uint sniError, bool canAccu
 
 #pragma warning restore 420
 
-        internal bool IsValidPacket(PacketHandle packetPointer)
-        {
-            Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType || packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");
-            return (
-                (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
-                ||
-                (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)
-            );
-        }
-
         // Sends an attention signal - executing thread will consume attn.
         internal void SendAttention(bool mustTakeWriteLock = false, bool asyncClose = false)
         {

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

@@ -76,6 +76,22 @@ internal override PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint
             return PacketHandle.FromNativePointer(readPacketPtr);
         }
 
+        internal override uint WritePacket(PacketHandle packet, bool sync)
+        {
+            Debug.Assert(packet.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePacket");
+            return SniNativeWrapper.SniWritePacket(Handle, packet.NativePacket, sync);
+        }
+
+        internal override bool IsValidPacket(PacketHandle packetPointer)
+        {
+            Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType || packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");
+            return (
+                (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
+                ||
+                (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)
+            );
+        }
+
         internal override uint SniGetConnectionId(ref Guid clientConnectionId)
             => SniNativeWrapper.SniGetConnectionId(Handle, ref clientConnectionId);
 

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

@@ -495,6 +495,10 @@ internal long TimeoutTime
 
         internal abstract PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error);
 
+        internal abstract uint WritePacket(PacketHandle packet, bool sync);
+
+        internal abstract bool IsValidPacket(PacketHandle packetPointer);
+
         internal abstract PacketHandle ReadAsync(SessionHandle handle, out uint error);
 
         internal abstract uint SniGetConnectionId(ref Guid clientConnectionId);