Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs
@ -71,11 +71,9 @@ namespace System.Data.OracleClient
 			return new OracleConnectionStringBuilder ();
 		}

-#if !TARGET_JVM
 		public override CodeAccessPermission CreatePermission (PermissionState state) {
 			return new OraclePermission (state);
 		}
-#endif

 		public override DbDataAdapter CreateDataAdapter () {
 			return new OracleDataAdapter ();