Merge GetResetWritePacket

Author: edwardneal

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

@@ -100,8 +100,6 @@ internal abstract void CreatePhysicalSNIHandle(
 
         internal abstract uint CheckConnection();
 
-        internal abstract PacketHandle GetResetWritePacket(int dataSize);
-
         internal abstract void ClearAllWritePackets();
 
         internal abstract PacketHandle AddPacketToPendingList(PacketHandle packet);

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

@@ -853,7 +853,7 @@ internal PacketHandle CreateAndSetAttentionPacket()
         private Task WriteSni(bool canAccumulate)
         {
             // Prepare packet, and write to packet.
-            PacketHandle packet = GetResetWritePacket();
+            PacketHandle packet = GetResetWritePacket(_outBytesUsed);
             SNIPacket nativePacket = packet.NativePacket;
             SniNativeWrapper.SniPacketSetData(nativePacket, _outBuff, _outBytesUsed, _securePasswords, _securePasswordOffsetsInBuffer);
 
@@ -906,22 +906,6 @@ private Task WriteSni(bool canAccumulate)
             return task;
         }
 
-        internal PacketHandle GetResetWritePacket()
-        {
-            if (_sniPacket != null)
-            {
-                SniNativeWrapper.SniPacketReset(Handle, IoType.WRITE, _sniPacket, ConsumerNumber.SNI_Consumer_SNI);
-            }
-            else
-            {
-                lock (_writePacketLockObject)
-                {
-                    _sniPacket = _writePacketCache.Take(Handle);
-                }
-            }
-            return PacketHandle.FromNativePacket(_sniPacket);
-        }
-
         internal void ClearAllWritePackets()
         {
             if (_sniPacket != null)

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

@@ -92,6 +92,22 @@ internal override bool IsValidPacket(PacketHandle packetPointer)
             );
         }
 
+        internal override PacketHandle GetResetWritePacket(int dataSize)
+        {
+            if (_sniPacket != null)
+            {
+                SniNativeWrapper.SniPacketReset(Handle, IoType.WRITE, _sniPacket, ConsumerNumber.SNI_Consumer_SNI);
+            }
+            else
+            {
+                lock (_writePacketLockObject)
+                {
+                    _sniPacket = _writePacketCache.Take(Handle);
+                }
+            }
+            return PacketHandle.FromNativePacket(_sniPacket);
+        }
+
         internal override uint SniGetConnectionId(ref Guid clientConnectionId)
             => SniNativeWrapper.SniGetConnectionId(Handle, ref clientConnectionId);
 

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

@@ -483,6 +483,8 @@ internal long TimeoutTime
 
         protected abstract PacketHandle EmptyReadPacket { get; }
 
+        internal abstract PacketHandle GetResetWritePacket(int dataSize);
+
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);
 
         protected abstract bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source);