Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@@ -200,9 +200,9 @@ namespace System.Transactions
public TransactionManagerCommunicationException(string message) { }
public TransactionManagerCommunicationException(string message, System.Exception innerException) { }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public partial struct TransactionOptions
{
private int _dummy;
public System.Transactions.IsolationLevel IsolationLevel { get { throw null; } set { } }
public System.TimeSpan Timeout { get { throw null; } set { } }
public override bool Equals(object obj) { throw null; }

View File

@@ -10,7 +10,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.Transactions.cs" />
<Compile Include="System.Transactions.Local.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />

View File

@@ -9,7 +9,7 @@ namespace System.Transactions
/// enlistments. This identifier is only unique within
/// a given AppDomain.
/// </summary>
internal struct EnlistmentTraceIdentifier : IEquatable<EnlistmentTraceIdentifier>
internal readonly struct EnlistmentTraceIdentifier : IEquatable<EnlistmentTraceIdentifier>
{
public static readonly EnlistmentTraceIdentifier Empty = new EnlistmentTraceIdentifier();

View File

@@ -11,6 +11,9 @@ namespace System.Transactions
/// Summary description for TransactionException.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TransactionException : SystemException
{
internal static bool IncludeDistributedTxId(Guid distributedTxId)
@@ -100,7 +103,6 @@ namespace System.Transactions
/// <param name="context"></param>
protected TransactionException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
internal static TransactionException Create(string message, Guid distributedTxId)
@@ -174,6 +176,9 @@ namespace System.Transactions
/// Summary description for TransactionAbortedException.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TransactionAbortedException : TransactionException
{
internal static new TransactionAbortedException Create(string message, Exception innerException, Guid distributedTxId)
@@ -242,7 +247,6 @@ namespace System.Transactions
/// <param name="context"></param>
protected TransactionAbortedException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
@@ -250,6 +254,9 @@ namespace System.Transactions
/// Summary description for TransactionInDoubtException.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TransactionInDoubtException : TransactionException
{
internal static new TransactionInDoubtException Create(TraceSourceType traceSource, string message, Exception innerException, Guid distributedTxId)
@@ -303,7 +310,6 @@ namespace System.Transactions
/// <param name="context"></param>
protected TransactionInDoubtException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
@@ -311,6 +317,9 @@ namespace System.Transactions
/// Summary description for TransactionManagerCommunicationException.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TransactionManagerCommunicationException : TransactionException
{
internal static new TransactionManagerCommunicationException Create(string message, Exception innerException)
@@ -363,12 +372,13 @@ namespace System.Transactions
/// <param name="context"></param>
protected TransactionManagerCommunicationException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TransactionPromotionException : TransactionException
{
/// <summary>
@@ -402,7 +412,6 @@ namespace System.Transactions
/// <param name="context"></param>
protected TransactionPromotionException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
}

View File

@@ -9,7 +9,7 @@ namespace System.Transactions
/// of transaction objects. This identifier is only unique within
/// a given AppDomain.
/// </summary>
internal struct TransactionTraceIdentifier : IEquatable<TransactionTraceIdentifier>
internal readonly struct TransactionTraceIdentifier : IEquatable<TransactionTraceIdentifier>
{
public static readonly TransactionTraceIdentifier Empty = new TransactionTraceIdentifier();

View File

@@ -1,4 +1,8 @@
using System;
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;