diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-07-03 17:59:12 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-07-03 18:29:32 +0300 |
| commit | 7e70a4e9236104c350e7d9ca3505225755065569 (patch) | |
| tree | ac2d3c9604216d770200d4370f2613182bcd5312 /src/System.Transactions.Local | |
| parent | e9e1fb251df4be19b142f0cef2c7dcc13b84f2f2 (diff) | |
| parent | 4bf51c870ec075d89c809ea1dd7449d609187b7a (diff) | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryException.cs
# src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs
# src/System.Drawing.Common/src/System/Drawing/SystemBrushes.cs
# src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
# src/System.Net.WebHeaderCollection/tests/WebHeaderCollectionTest.cs
# src/System.Runtime.CompilerServices.VisualC/src/System/Runtime/CompilerServices/Attributes.cs
Diffstat (limited to 'src/System.Transactions.Local')
| -rw-r--r-- | src/System.Transactions.Local/tests/TransactionScopeTest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/System.Transactions.Local/tests/TransactionScopeTest.cs b/src/System.Transactions.Local/tests/TransactionScopeTest.cs index 72dadc1a7c..1838ba4961 100644 --- a/src/System.Transactions.Local/tests/TransactionScopeTest.cs +++ b/src/System.Transactions.Local/tests/TransactionScopeTest.cs @@ -999,7 +999,7 @@ namespace System.Transactions.Tests [Fact] public void ExplicitTransaction12() { - Assert.Throws<ArgumentException>(() => + AssertExtensions.Throws<ArgumentException>("asyncResult", () => { CommittableTransaction ct = new CommittableTransaction(); |