Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -32,14 +32,10 @@
using System.ComponentModel;
using System.Data;
#if NET_2_0
using System.Transactions;
#endif
#if NET_4_5
using System.Threading;
using System.Threading.Tasks;
#endif
namespace System.Data.Common {
public abstract class DbConnection : Component, IDbConnection, IDisposable
@@ -97,14 +93,11 @@ namespace System.Data.Common {
protected abstract DbCommand CreateDbCommand ();
#if NET_2_0
public virtual void EnlistTransaction (Transaction transaction)
{
throw new NotSupportedException ();
}
#endif
#if NET_2_0
static class DataTypes
{
static readonly ColumnInfo [] columns = {
@@ -723,7 +716,6 @@ namespace System.Data.Common {
return null;
}
}
#endif
IDbTransaction IDbConnection.BeginTransaction ()
{
@@ -748,7 +740,6 @@ namespace System.Data.Common {
StateChange (this, stateChange);
}
#if NET_4_5
public Task OpenAsync ()
{
return OpenAsync (CancellationToken.None);
@@ -767,7 +758,6 @@ namespace System.Data.Common {
return TaskHelper.CreateExceptionTask (e);
}
}
#endif
#endregion // Methods