Merge | AssemblyCache

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -862,7 +862,6 @@
     <Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
     <Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
     <Compile Include="Microsoft\Data\Common\GreenMethods.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\assemblycache.cs" />
     <Compile Include="Microsoft\Data\SqlClient\BufferWriterExtensions.cs" />
     <Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.LoadType.cs" />
     <Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />

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

@@ -2725,7 +2725,7 @@ internal byte[] GetBytes(object o)
 
         internal byte[] GetBytes(object o, out Format format, out int maxSize)
         {
-            SqlUdtInfo attr = AssemblyCache.GetInfoFromType(o.GetType());
+            SqlUdtInfo attr = GetInfoFromType(o.GetType());
             maxSize = attr.MaxByteSize;
             format = attr.SerializationFormat;
 
@@ -2743,5 +2743,24 @@ internal byte[] GetBytes(object o, out Format format, out int maxSize)
             }
             return retval;
         }
+
+        private SqlUdtInfo GetInfoFromType(Type t)
+        {
+            Debug.Assert(t != null, "Type object can't be NULL");
+            Type orig = t;
+            do
+            {
+                SqlUdtInfo attr = SqlUdtInfo.TryGetFromType(t);
+                if (attr != null)
+                {
+                    return attr;
+                }
+
+                t = t.BaseType;
+            }
+            while (t != null);
+
+            throw SQL.UDTInvalidSqlType(orig.AssemblyQualifiedName);
+        }
     } // SqlConnection
 } // Microsoft.Data.SqlClient namespace

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs

@@ -1614,12 +1614,7 @@ internal int GetActualSize()
                         case SqlDbType.Udt:
                             if (!IsNull)
                             {
-#if NETFRAMEWORK
-                                //call the static function
-                                coercedSize = AssemblyCache.GetLength(val);
-#else
                                 coercedSize = SerializationHelperSql9.SizeInBytes(val);
-#endif
                             }
                             break;
                         case SqlDbType.Structured: