NH-3807 - CoreClr no longer has SqlCommendSet to reflect on, so default to NonBatchingBatcherFactory on CoreClr.

ngbrown · hazzik · commit 12407dc9a450 · 2017-03-16T22:52:29.000+13:00
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -43,7 +43,7 @@
     <OutputPath>bin\Debug-2.0\</OutputPath>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
-    <DefineConstants>NET_4_0,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
+    <DefineConstants>NET_4_0,FEATURE_ADONET_SQLCOMMANDSET,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -58,7 +58,7 @@
     <OutputPath>bin\Release-2.0\</OutputPath>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_4_0,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0,FEATURE_ADONET_SQLCOMMANDSET,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
diff --git a/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs b/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs
@@ -1,3 +1,5 @@
+#if FEATURE_ADONET_SQLCOMMANDSET
+
 using System;
 using System.Data.Common;
 using System.Text;
@@ -118,4 +120,6 @@ private SqlClientSqlCommandSet CreateConfiguredBatch()
 			return result;
 		}
 	}
-}
+}
+
+#endif
diff --git a/src/NHibernate/AdoNet/SqlClientBatchingBatcherFactory.cs b/src/NHibernate/AdoNet/SqlClientBatchingBatcherFactory.cs
@@ -1,3 +1,5 @@
+#if FEATURE_ADONET_SQLCOMMANDSET
+
 using NHibernate.Engine;
 
 namespace NHibernate.AdoNet
@@ -9,4 +11,6 @@ public virtual IBatcher CreateBatcher(ConnectionManager connectionManager, IInte
 			return new SqlClientBatchingBatcher(connectionManager, interceptor);
 		}
 	}
-}
+}
+
+#endif
diff --git a/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs b/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs
@@ -1,3 +1,5 @@
+#if FEATURE_ADONET_SQLCOMMANDSET
+
 using System;
 using System.Data.SqlClient;
 using System.Diagnostics;
@@ -135,3 +137,5 @@ public void Dispose()
 		}
 	}
 }
+
+#endif
diff --git a/src/NHibernate/Driver/SqlClientDriver.cs b/src/NHibernate/Driver/SqlClientDriver.cs
@@ -187,7 +187,11 @@ protected static bool IsBlob(DbParameter dbParam, SqlType sqlType)
 
 		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass
 		{
+#if FEATURE_ADONET_SQLCOMMANDSET
 			get { return typeof(SqlClientBatchingBatcherFactory); }
+#else
+			get { return typeof(NonBatchingBatcherFactory); }
+#endif
 		}
 
 		#endregion
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -45,6 +45,7 @@
     <DefineConstants>NET_4_0,FEATURE_ADONET_SQLCOMMANDSET,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
     <DefineConstants>NET_4_0,FEATURE_SERIALIZATION,FEATURE_LEGACY_REFLECTION_API,FEATURE_REFLECTEDTYPE</DefineConstants>
     <DefineConstants>NET_4_0,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
+    <DefineConstants>NET_4_0,FEATURE_ADONET_SQLCOMMANDSET,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
@@ -59,7 +60,7 @@
     <OutputPath>bin\Release-2.0\</OutputPath>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_4_0,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0,FEATURE_ADONET_SQLCOMMANDSET,FEATURE_APPDOMAIN,FEATURE_ASSEMBLYBUILDER_SAVE,FEATURE_BINDINGLIST,FEATURE_CODEDOM,FEATURE_DATA_CLOSE,FEATURE_DATA_GETSCHEMATABLE,FEATURE_DBPROVIDERFACTORIES,FEATURE_LEGACY_REFLECTION_API,FEATURE_ODBC_OLEDB,FEATURE_REFLECTEDTYPE,FEATURE_REMOTING,FEATURE_SECURITY_PERMISSIONS,FEATURE_SERIALIZATION,FEATURE_STRING_INTERN,FEATURE_SYSTEM_CONFIGURATION,FEATURE_SYSTEM_SERVICEMODEL,FEATURE_SYSTEM_TRANSACTIONS,FEATURE_WEB_SESSION_CONTEXT,FEATURE_XML_SCHEMAS,FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>1591;3001;3002;3003;3004;3005</NoWarn>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#if FEATURE_ADONET_SQLCOMMANDSET`
	`2`	`+`
`1`	`3`	`using System;`
`2`	`4`	`using System.Data.Common;`
`3`	`5`	`using System.Text;`
`@@ -118,4 +120,6 @@ private SqlClientSqlCommandSet CreateConfiguredBatch()`
`118`	`120`	`return result;`
`119`	`121`	`}`
`120`	`122`	`}`
`121`		`-}`
	`123`	`+}`
	`124`	`+`
	`125`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#if FEATURE_ADONET_SQLCOMMANDSET`
	`2`	`+`
`1`	`3`	`using NHibernate.Engine;`
`2`	`4`
`3`	`5`	`namespace NHibernate.AdoNet`
`@@ -9,4 +11,6 @@ public virtual IBatcher CreateBatcher(ConnectionManager connectionManager, IInte`
`9`	`11`	`return new SqlClientBatchingBatcher(connectionManager, interceptor);`
`10`	`12`	`}`
`11`	`13`	`}`
`12`		`-}`
	`14`	`+}`
	`15`	`+`
	`16`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,11 @@ protected static bool IsBlob(DbParameter dbParam, SqlType sqlType)`
`187`	`187`
`188`	`188`	`System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass`
`189`	`189`	`{`
	`190`	`+#if FEATURE_ADONET_SQLCOMMANDSET`
`190`	`191`	`get { return typeof(SqlClientBatchingBatcherFactory); }`
	`192`	`+#else`
	`193`	`+ get { return typeof(NonBatchingBatcherFactory); }`
	`194`	`+#endif`
`191`	`195`	`}`
`192`	`196`
`193`	`197`	`#endregion`