Imported Upstream version 4.8.0.472

Former-commit-id: 1fce58ff6397a8cf9d2fca6564b434613689c418

mcs/class/System.Transactions/System.Transactions/Delegates.cs

@@ -11,9 +11,9 @@
 namespace System.Transactions
 {
 	public delegate Transaction HostCurrentTransactionCallback ();
-	public delegate void TransactionCompletedEventHandler (object o,
+	public delegate void TransactionCompletedEventHandler (object sender,
 		TransactionEventArgs e);
-	public delegate void TransactionStartedEventHandler (object o,
+	public delegate void TransactionStartedEventHandler (object sender,
 		TransactionEventArgs e);
 }
 

mcs/class/System.Transactions/System.Transactions/Transaction.cs

@@ -189,6 +189,26 @@ namespace System.Transactions
 			return true;
 		}
 
+		public void SetDistributedTransactionIdentifier (IPromotableSinglePhaseNotification promotableNotification, Guid distributedTransactionIdentifier)
+		{
+			throw new NotImplementedException ();
+		}
+
+ 		public bool EnlistPromotableSinglePhase (IPromotableSinglePhaseNotification promotableSinglePhaseNotification, Guid promoterType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public byte[] GetPromotedToken ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Guid PromoterType
+		{
+			get { throw new NotImplementedException (); }
+		}
+
 		[MonoTODO ("EnlistmentOptions being ignored")]
 		public Enlistment EnlistVolatile (
 			IEnlistmentNotification notification,
@@ -218,6 +238,17 @@ namespace System.Transactions
 			return new Enlistment ();
 		}
 
+		[MonoTODO ("Only Local Transaction Manager supported. Cannot have more than 1 durable resource per transaction.")]
+		[PermissionSetAttribute (SecurityAction.LinkDemand)]
+		public Enlistment PromoteAndEnlistDurable (
+			Guid manager,
+			IPromotableSinglePhaseNotification promotableNotification,
+			ISinglePhaseNotification notification,
+			EnlistmentOptions options)
+		{
+			throw new NotImplementedException ("DTC unsupported, multiple durable resource managers aren't supported.");
+		}
+
 		public override bool Equals (object obj)
 		{
 			return Equals (obj as Transaction);

mcs/class/System.Transactions/System.Transactions/TransactionException.cs

@@ -14,7 +14,7 @@ namespace System.Transactions
 	[Serializable]
 	public class TransactionException : SystemException
 	{
-		protected TransactionException ()
+		public TransactionException ()
 		{
 		}
 

mcs/class/System.Transactions/System.Transactions/TransactionInDoubtException.cs

@@ -14,7 +14,7 @@ namespace System.Transactions
 	[Serializable]
 	public class TransactionInDoubtException : TransactionException
 	{
-		protected TransactionInDoubtException ()
+		public TransactionInDoubtException ()
 		{
 		}
 

mcs/class/System.Transactions/System.Transactions/TransactionInterop.cs

@@ -15,6 +15,8 @@ namespace System.Transactions
 	[MonoTODO]
 	public static class TransactionInterop
 	{
+		public static readonly Guid PromoterTypeDtc = new Guid ("14229753-FFE1-428D-82B7-DF73045CB8DA");
+
 		[MonoTODO]
 		public static IDtcTransaction GetDtcTransaction (Transaction transaction)
 		{

mcs/class/System.Transactions/System.Transactions/TransactionManagerCommunicationException.cs

@@ -14,7 +14,7 @@ namespace System.Transactions
 	[Serializable]
 	public class TransactionManagerCommunicationException : TransactionException
 	{
-		protected TransactionManagerCommunicationException ()
+		public TransactionManagerCommunicationException ()
 		{
 		}
 

mcs/class/System.Transactions/System.Transactions/TransactionPromotionException.cs

@@ -14,7 +14,7 @@ namespace System.Transactions
 	[Serializable]
 	public class TransactionPromotionException : TransactionException
 	{
-		protected TransactionPromotionException ()
+		public TransactionPromotionException ()
 		{
 		}
 

mcs/class/System.Transactions/System.Transactions/TransactionScope.cs

@@ -102,6 +102,26 @@ namespace System.Transactions
 				TransactionManager.DefaultTimeout, TransactionScopeAsyncFlowOption.Suppress);
 		}
 
+		public TransactionScope (Transaction transactionToUse,
+			TransactionScopeAsyncFlowOption asyncFlowOption)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public TransactionScope (Transaction transactionToUse,
+			TimeSpan scopeTimeout,
+			TransactionScopeAsyncFlowOption asyncFlowOption)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public TransactionScope (TransactionScopeOption scopeOption,
+			TransactionOptions transactionOptions,
+			TransactionScopeAsyncFlowOption asyncFlowOption)
+		{
+			throw new NotImplementedException ();
+		}
+
 		void Initialize (TransactionScopeOption scopeOption,
 			Transaction tx, TransactionOptions options,
 			DTCOption interop, TimeSpan timeout, TransactionScopeAsyncFlowOption asyncFlow)

mcs/class/corlib/Makefile

@@ -20,6 +20,10 @@ $(error Unknown framework version)
 endif
 endif
 
+ifeq ($(PROFILE),build)
+CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/build/csc.aotprofile
+endif
+
 RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
 
 LIBRARY_COMPILE = $(BOOT_COMPILE)