Merge remote-tracking branch 'upstream/master'

3 files changed, 17 insertions, 8 deletions

diff --git a/src/System.Transactions.Local/src/System/Transactions/EnlistmentTraceIdentifier.cs b/src/System.Transactions.Local/src/System/Transactions/EnlistmentTraceIdentifier.cs
index 612214bcf8..ac07bcb02b 100644
--- a/src/System.Transactions.Local/src/System/Transactions/EnlistmentTraceIdentifier.cs
+++ b/src/System.Transactions.Local/src/System/Transactions/EnlistmentTraceIdentifier.cs
@@ -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();
 
diff --git a/src/System.Transactions.Local/src/System/Transactions/TransactionException.cs b/src/System.Transactions.Local/src/System/Transactions/TransactionException.cs
index 7cd2795043..261a4ef057 100644
--- a/src/System.Transactions.Local/src/System/Transactions/TransactionException.cs
+++ b/src/System.Transactions.Local/src/System/Transactions/TransactionException.cs
@@ -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();
         }
     }
 }
diff --git a/src/System.Transactions.Local/src/System/Transactions/TransactionTraceIdentifier.cs b/src/System.Transactions.Local/src/System/Transactions/TransactionTraceIdentifier.cs
index ccc1456356..130e381ca2 100644
--- a/src/System.Transactions.Local/src/System/Transactions/TransactionTraceIdentifier.cs
+++ b/src/System.Transactions.Local/src/System/Transactions/TransactionTraceIdentifier.cs
@@ -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();