mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.6.0.89

Browse Source 
Former-commit-id: b39a328747c2f3414dc52e009fb6f0aa80ca2492
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-24 08:53:40 +00:00
parent cf815e07e0
commit 95fdb59ea6
2556 changed files with 138145 additions and 47453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs
View File

@@ -31,12 +31,14 @@ namespace System.Transactions
}
public CommittableTransaction (TimeSpan timeout)
: base (IsolationLevel.Serializable)
{
options = new TransactionOptions ();
options.Timeout = timeout;
}
public CommittableTransaction (TransactionOptions options)
: base (options.IsolationLevel)
{
this.options = options;
}

1
mcs/class/System.Transactions/System.Transactions/DependentTransaction.cs
View File

@@ -21,6 +21,7 @@ namespace System.Transactions
internal DependentTransaction (Transaction parent,
DependentCloneOption option)
: base(parent.IsolationLevel)
{
// this.parent = parent;
// this.option = option;

1
mcs/class/System.Transactions/System.Transactions/SubordinateTransaction.cs
View File

@@ -16,6 +16,7 @@ namespace System.Transactions
{
public SubordinateTransaction (IsolationLevel isoLevel,
ISimpleTransactionSuperior superior)
: base (isoLevel)
{
throw new NotImplementedException ();
}

4
mcs/class/System.Transactions/System.Transactions/Transaction.cs
View File

@@ -69,10 +69,10 @@ namespace System.Transactions
internal IPromotableSinglePhaseNotification Pspe { get { return pspe; } }
internal Transaction ()
internal Transaction (IsolationLevel isolationLevel)
{
info = new TransactionInformation ();
level = IsolationLevel.Serializable;
level = isolationLevel;
}
internal Transaction (Transaction other)

10
mcs/class/System.Transactions/System.Transactions/TransactionScope.cs
View File

@@ -138,14 +138,14 @@ namespace System.Transactions
oldTransaction = Transaction.CurrentInternal;
Transaction.CurrentInternal = transaction = InitTransaction (tx, scopeOption);
Transaction.CurrentInternal = transaction = InitTransaction (tx, scopeOption, options);
if (transaction != null)
transaction.InitScope (this);
if (parentScope != null)
parentScope.nested ++;
}
Transaction InitTransaction (Transaction tx, TransactionScopeOption scopeOption)
Transaction InitTransaction (Transaction tx, TransactionScopeOption scopeOption, TransactionOptions options)
{
if (tx != null)
return tx;
@@ -159,7 +159,7 @@ namespace System.Transactions
if (scopeOption == TransactionScopeOption.Required) {
if (Transaction.CurrentInternal == null) {
isRoot = true;
return new Transaction ();
return new Transaction (options.IsolationLevel);
}
parentScope = Transaction.CurrentInternal.Scope;
@@ -170,8 +170,8 @@ namespace System.Transactions
if (Transaction.CurrentInternal != null)
parentScope = Transaction.CurrentInternal.Scope;
isRoot = true;
return new Transaction ();
}
return new Transaction (options.IsolationLevel);
}
public void Complete ()
{

20
mcs/class/System.Transactions/Test/TransactionScopeTest.cs
View File

@@ -1094,6 +1094,26 @@ namespace MonoTests.System.Transactions
}
#endregion
[Test]
public void DefaultIsolationLevel()
{
using (TransactionScope transactionScope = new TransactionScope(TransactionScopeOption.Required))
{
Assert.AreEqual(IsolationLevel.Serializable, Transaction.Current.IsolationLevel);
}
}
[Test]
public void ExplicitIsolationLevel()
{
TransactionOptions transactionOptions = new TransactionOptions();
transactionOptions.IsolationLevel = IsolationLevel.ReadCommitted;
using (TransactionScope transactionScope = new TransactionScope(TransactionScopeOption.Required, transactionOptions))
{
Assert.AreEqual(IsolationLevel.ReadCommitted, Transaction.Current.IsolationLevel);
}
}
}
}