Move CreateConsumerInfo and _gcHandle to TdsParserStateObjectNative

Author: edwardneal

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

@@ -26,9 +26,6 @@ internal partial class TdsParserStateObject
         protected SNIPacket _sniPacket = null;                // Will have to re-vamp this for MARS
         internal SNIPacket _sniAsyncAttnPacket = null;                // Packet to use to send Attn
 
-        // Async variables
-        protected GCHandle _gcHandle;                                    // keeps this object alive until we're closed.
-
         // Used for blanking out password in trace.
         internal int _tracePasswordOffset = 0;
         internal int _tracePasswordLength = 0;
@@ -86,24 +83,6 @@ internal SNIHandle Handle
         // General methods //
         /////////////////////
 
-        protected ConsumerInfo CreateConsumerInfo(bool async)
-        {
-            ConsumerInfo myInfo = new ConsumerInfo();
-
-            Debug.Assert(_outBuff.Length == _inBuff.Length, "Unexpected unequal buffers.");
-
-            myInfo.defaultBufferSize = _outBuff.Length; // Obtain packet size from outBuff size.
-
-            if (async)
-            {
-                myInfo.readDelegate = SNILoadHandle.SingletonInstance.ReadAsyncCallbackDispatcher;
-                myInfo.writeDelegate = SNILoadHandle.SingletonInstance.WriteAsyncCallbackDispatcher;
-                _gcHandle = GCHandle.Alloc(this, GCHandleType.Normal);
-                myInfo.key = (IntPtr)_gcHandle;
-            }
-            return myInfo;
-        }
-
         internal uint CheckConnection() => SniNativeWrapper.SniCheckConnection(Handle);
 
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]

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

@@ -20,6 +20,8 @@ internal class TdsParserStateObjectNative : TdsParserStateObject
     {
         private readonly WritePacketCache _writePacketCache = new WritePacketCache(); // Store write packets that are ready to be re-used
 
+        private GCHandle _gcHandle;                                    // keeps this object alive until we're closed.
+
         private readonly Dictionary<IntPtr, SNIPacket> _pendingWritePackets = new Dictionary<IntPtr, SNIPacket>(); // Stores write packets that have been sent to SNI, but have not yet finished writing (i.e. we are waiting for SNI's callback)
 
         internal TdsParserStateObjectNative(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
@@ -109,6 +111,24 @@ internal override void AssignPendingDNSInfo(string userProtocol, string DNSCache
             }
         }
 
+        private ConsumerInfo CreateConsumerInfo(bool async)
+        {
+            ConsumerInfo myInfo = new ConsumerInfo();
+
+            Debug.Assert(_outBuff.Length == _inBuff.Length, "Unexpected unequal buffers.");
+
+            myInfo.defaultBufferSize = _outBuff.Length; // Obtain packet size from outBuff size.
+
+            if (async)
+            {
+                myInfo.readDelegate = SNILoadHandle.SingletonInstance.ReadAsyncCallbackDispatcher;
+                myInfo.writeDelegate = SNILoadHandle.SingletonInstance.WriteAsyncCallbackDispatcher;
+                _gcHandle = GCHandle.Alloc(this, GCHandleType.Normal);
+                myInfo.key = (IntPtr)_gcHandle;
+            }
+            return myInfo;
+        }
+
         internal override void CreatePhysicalSNIHandle(
             string serverName,
             TimeoutTimer timeout,