Address PR feedback on System.Transactions

stephentoub · stephentoub · commit d2a27b5fd1dd · 2016-07-19T15:30:24.000-07:00
And fix project.json versions
diff --git a/src/System.Transactions/pkg/System.Transactions.pkgproj b/src/System.Transactions/pkg/System.Transactions.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Transactions.builds">
-      <SupportedFramework>net461;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net461;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <InboxOnTargetFramework Include="net461">
diff --git a/src/System.Transactions/ref/System.Transactions.cs b/src/System.Transactions/ref/System.Transactions.cs
@@ -50,7 +50,7 @@ public enum EnterpriseServicesInteropOption
         None = 0,
     }
     public delegate System.Transactions.Transaction HostCurrentTransactionCallback();
-    //[System.Runtime.InteropServices.InterfaceTypeAttribute((System.Runtime.InteropServices.ComInterfaceType)(1))]
+    //[System.Runtime.InteropServices.InterfaceTypeAttribute((System.Runtime.InteropServices.ComInterfaceType)(1))] // TODO: Put back when available
     public partial interface IDtcTransaction
     {
         void Abort(System.IntPtr reason, int retaining, int async);
@@ -121,14 +121,10 @@ internal Transaction() { }
         public System.Guid PromoterType { get; }
         public System.Transactions.TransactionInformation TransactionInformation { get { return default(System.Transactions.TransactionInformation); } }
         public event System.Transactions.TransactionCompletedEventHandler TransactionCompleted { add { } remove { } }
-        //protected System.IAsyncResult BeginCommitInternal(System.AsyncCallback callback) { return default(System.IAsyncResult); }
         public System.Transactions.Transaction Clone() { return default(System.Transactions.Transaction); }
         public System.Transactions.DependentTransaction DependentClone(System.Transactions.DependentCloneOption cloneOption) { return default(System.Transactions.DependentTransaction); }
         public void Dispose() { }
-        //protected void EndCommitInternal(System.IAsyncResult ar) { }
-        //[System.Security.Permissions.PermissionSetAttribute(System.Security.Permissions.SecurityAction.LinkDemand)]
         public System.Transactions.Enlistment EnlistDurable(System.Guid resourceManagerIdentifier, System.Transactions.IEnlistmentNotification enlistmentNotification, System.Transactions.EnlistmentOptions enlistmentOptions) { return default(System.Transactions.Enlistment); }
-        //[System.Security.Permissions.PermissionSetAttribute(System.Security.Permissions.SecurityAction.LinkDemand)]
         public System.Transactions.Enlistment EnlistDurable(System.Guid resourceManagerIdentifier, System.Transactions.ISinglePhaseNotification singlePhaseNotification, System.Transactions.EnlistmentOptions enlistmentOptions) { return default(System.Transactions.Enlistment); }
         public bool EnlistPromotableSinglePhase(System.Transactions.IPromotableSinglePhaseNotification promotableSinglePhaseNotification) { return default(bool); }
         public bool EnlistPromotableSinglePhase(System.Transactions.IPromotableSinglePhaseNotification promotableSinglePhaseNotification, System.Guid promoterType) { return default(bool); }
@@ -158,7 +154,7 @@ public partial class TransactionEventArgs : System.EventArgs
         public TransactionEventArgs() { }
         public System.Transactions.Transaction Transaction { get { return default(System.Transactions.Transaction); } }
     }
-    public partial class TransactionException : System.Exception //System.SystemException
+    public partial class TransactionException : System.Exception //System.SystemException  // TODO: Put back when available
     {
         protected TransactionException() { }
         protected TransactionException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
diff --git a/src/System.Transactions/ref/project.json b/src/System.Transactions/ref/project.json
@@ -1,12 +1,14 @@
 {
   "dependencies": {
-    "System.Runtime": "4.0.1",
+    "System.Runtime": "4.0.10",
     "System.Runtime.Serialization.Primitives": "4.1.1",
-	"System.Runtime.Serialization.Formatters": "4.0.1-beta-24222-03"
+    "System.Runtime.Serialization.Formatters": "4.0.1-beta-24318-03"
   },
   "frameworks": {
     "netstandard1.4": {
-      "imports": [ "dotnet5.4" ]
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
diff --git a/src/System.Transactions/src/System.Transactions.csproj b/src/System.Transactions/src/System.Transactions.csproj
@@ -27,7 +27,6 @@
     <Compile Include="System\Transactions\ISinglePhaseNotification.cs" />
     <Compile Include="System\Transactions\ITransactionPromoter.cs" />
     <Compile Include="System\Transactions\PreparingEnlistment.cs" />
-    <Compile Include="System\Transactions\SafeIUnknown.cs" />
     <Compile Include="System\Transactions\SinglePhaseEnlistment.cs" />
     <Compile Include="System\Transactions\SubordinateTransaction.cs" />
     <Compile Include="System\Transactions\TemporaryStubs.cs" /> <!-- TODO: Remove this when proper formatter support is available -->
diff --git a/src/System.Transactions/src/System/Transactions/Configuration/AppSettings.cs b/src/System.Transactions/src/System/Transactions/Configuration/AppSettings.cs
@@ -18,6 +18,7 @@ private static void EnsureSettingsLoaded()
                 {
                     if (!s_settingsInitalized)
                     {
+                        // TODO: Determine how to handle configuration.
                         // This uses System.Configuration on desktop to load:
                         // Transactions:IncludeDistributedTransactionIdInExceptionMessage
                         s_includeDistributedTxIdInExceptionMessage = false;
diff --git a/src/System.Transactions/src/System/Transactions/SafeIUnknown.cs b/src/System.Transactions/src/System/Transactions/SafeIUnknown.cs
diff --git a/src/System.Transactions/src/System/Transactions/Transaction.cs b/src/System.Transactions/src/System/Transactions/Transaction.cs
@@ -276,10 +276,10 @@ internal Transaction(IsolationLevel isoLevel, InternalTransaction internalTransa
             }
         }
 
-        internal Transaction(DistributedTransaction oleTransaction)
+        internal Transaction(DistributedTransaction distributedTransaction)
         {
-            _isoLevel = oleTransaction.IsolationLevel;
-            _internalTransaction = new InternalTransaction(this, oleTransaction);
+            _isoLevel = distributedTransaction.IsolationLevel;
+            _internalTransaction = new InternalTransaction(this, distributedTransaction);
             _cloneId = Interlocked.Increment(ref _internalTransaction._cloneCount);
         }
 
diff --git a/src/System.Transactions/src/System/Transactions/TransactionInterop.cs b/src/System.Transactions/src/System/Transactions/TransactionInterop.cs
@@ -39,12 +39,12 @@ internal static DistributedTransaction ConvertToDistributedTransaction(Transacti
                 throw TransactionException.CreateTransactionCompletedException(SR.TraceSourceLtm, transaction.DistributedTxId);
             }
 
-            DistributedTransaction oletxTx = transaction.Promote();
-            if (oletxTx == null)
+            DistributedTransaction distributedTx = transaction.Promote();
+            if (distributedTx == null)
             {
                 throw DistributedTransaction.NotSupported();
             }
-            return oletxTx;
+            return distributedTx;
         }
 
         /// <summary>
diff --git a/src/System.Transactions/src/System/Transactions/TransactionManager.cs b/src/System.Transactions/src/System/Transactions/TransactionManager.cs
@@ -557,7 +557,7 @@ internal static Transaction FindOrCreatePromotedTransaction(Guid transactionIden
                     tx = weakRef.Target as Transaction;
                     if (null != tx)
                     {
-                        // If we found a transaction then dispose the oletx
+                        // If we found a transaction then dispose it
                         dtx.Dispose();
                         return tx.InternalClone();
                     }
diff --git a/src/System.Transactions/src/System/Transactions/TransactionScope.cs b/src/System.Transactions/src/System/Transactions/TransactionScope.cs
@@ -923,7 +923,7 @@ private void Timeout()
                 }
                 catch (TransactionException txEx)
                 {
-                    // Tolerate transaction exceptions - VSWhidbey 466868.
+                    // Tolerate transaction exceptions
                     if (DiagnosticTrace.Verbose)
                     {
                         ExceptionConsumedTraceRecord.Trace(SR.TraceSourceBase,
diff --git a/src/System.Transactions/src/System/Transactions/TransactionState.cs b/src/System.Transactions/src/System/Transactions/TransactionState.cs
@@ -2871,7 +2871,7 @@ protected bool PromotePhaseVolatiles(
                     volatiles.VolatileDemux = new Phase1VolatileDemultiplexer(tx);
                 }
 
-                volatiles.VolatileDemux._oletxEnlistment = tx.PromotedTransaction.EnlistVolatile(volatiles.VolatileDemux,
+                volatiles.VolatileDemux._promotedEnlistment = tx.PromotedTransaction.EnlistVolatile(volatiles.VolatileDemux,
                     phase0 ? EnlistmentOptions.EnlistDuringPrepareRequired : EnlistmentOptions.None);
             }
 
@@ -2886,15 +2886,15 @@ internal virtual bool PromoteDurable(InternalTransaction tx)
             {
                 // Directly enlist the durable enlistment with the resource manager.
                 InternalEnlistment enlistment = tx._durableEnlistment;
-                IPromotedEnlistment oletxEnlistment = tx.PromotedTransaction.EnlistDurable(
+                IPromotedEnlistment promotedEnlistment = tx.PromotedTransaction.EnlistDurable(
                     enlistment.ResourceManagerIdentifier,
                     (DurableInternalEnlistment)enlistment,
                     enlistment.SinglePhaseNotification != null,
                     EnlistmentOptions.None
                     );
 
                 // Promote the enlistment.
-                tx._durableEnlistment.State.ChangeStatePromoted(tx._durableEnlistment, oletxEnlistment);
+                tx._durableEnlistment.State.ChangeStatePromoted(tx._durableEnlistment, promotedEnlistment);
             }
 
             return true;
@@ -2910,7 +2910,7 @@ internal virtual void PromoteEnlistmentsAndOutcome(InternalTransaction tx)
 
             bool enlistmentsPromoted = false;
 
-            // Tell the RealOletxTransaction that we want a callback for the outcome.
+            // Tell the real transaction that we want a callback for the outcome.
             tx.PromotedTransaction.RealTransaction.InternalTransaction = tx;
 
             // Promote Phase 0 Volatiles
@@ -3160,7 +3160,7 @@ internal override void Phase0VolatilePrepareDone(InternalTransaction tx)
             try
             {
                 // Tell the distributed TM that the volatile enlistments are prepared
-                tx._phase0Volatiles.VolatileDemux._oletxEnlistment.Prepared();
+                tx._phase0Volatiles.VolatileDemux._promotedEnlistment.Prepared();
             }
             finally
             {
@@ -3273,7 +3273,7 @@ internal override void Phase1VolatilePrepareDone(InternalTransaction tx)
             try
             {
                 // Tell the distributed TM that the volatile enlistments are prepared
-                tx._phase1Volatiles.VolatileDemux._oletxEnlistment.Prepared();
+                tx._phase1Volatiles.VolatileDemux._promotedEnlistment.Prepared();
             }
             finally
             {
@@ -3389,7 +3389,7 @@ internal override void EnterState(InternalTransaction tx)
                 try
                 {
                     // Tell the distributed TM that the tx aborted.
-                    tx._phase0Volatiles.VolatileDemux._oletxEnlistment.ForceRollback();
+                    tx._phase0Volatiles.VolatileDemux._promotedEnlistment.ForceRollback();
                 }
                 finally
                 {
@@ -3429,7 +3429,7 @@ internal override void EnterState(InternalTransaction tx)
             try
             {
                 // Tell the distributed TM that the tx aborted.
-                tx._phase1Volatiles.VolatileDemux._oletxEnlistment.ForceRollback();
+                tx._phase1Volatiles.VolatileDemux._promotedEnlistment.ForceRollback();
             }
             finally
             {
@@ -5012,8 +5012,8 @@ internal override void ChangeStatePromotedPhase1(InternalTransaction tx)
 
     // TransactionStatePSPEOperation
     //
-    // Someone is trying to enlist for promotable single phase.  Don't allow them to do anything
-    // stupid.
+    // Someone is trying to enlist for promotable single phase.
+    // Don't allow anything that is not supported.
     internal class TransactionStatePSPEOperation : TransactionState
     {
         internal override void EnterState(InternalTransaction tx)
diff --git a/src/System.Transactions/src/System/Transactions/VolatileEnlistmentMultiplexing.cs b/src/System.Transactions/src/System/Transactions/VolatileEnlistmentMultiplexing.cs
@@ -20,7 +20,7 @@ internal abstract class VolatileDemultiplexer : IEnlistmentNotificationInternal
         protected InternalTransaction _transaction;
         
         // Store the IVolatileEnlistment interface to call back to the Distributed TM
-        internal IPromotedEnlistment _oletxEnlistment;
+        internal IPromotedEnlistment _promotedEnlistment;
         internal IPromotedEnlistment _preparingEnlistment;
 
         public VolatileDemultiplexer(InternalTransaction transaction)
@@ -338,7 +338,7 @@ protected override void InternalPrepare()
             }
             catch (TransactionAbortedException e)
             {
-                _oletxEnlistment.ForceRollback(e);
+                _promotedEnlistment.ForceRollback(e);
                 if (DiagnosticTrace.Verbose)
                 {
                     ExceptionConsumedTraceRecord.Trace(SR.TraceSourceLtm,
@@ -347,7 +347,7 @@ protected override void InternalPrepare()
             }
             catch (TransactionInDoubtException e)
             {
-                _oletxEnlistment.EnlistmentDone();
+                _promotedEnlistment.EnlistmentDone();
                 if (DiagnosticTrace.Verbose)
                 {
                     ExceptionConsumedTraceRecord.Trace(SR.TraceSourceLtm,
@@ -359,15 +359,15 @@ protected override void InternalPrepare()
         protected override void InternalCommit()
         {
             // Respond immediately to the TM
-            _oletxEnlistment.EnlistmentDone();
+            _promotedEnlistment.EnlistmentDone();
 
             _transaction.State.ChangeStatePromotedCommitted(_transaction);
         }
 
         protected override void InternalRollback()
         {
             // Respond immediately to the TM
-            _oletxEnlistment.EnlistmentDone();
+            _promotedEnlistment.EnlistmentDone();
 
             _transaction.State.ChangeStatePromotedAborted(_transaction);
         }
@@ -389,21 +389,21 @@ public override void Prepare(IPromotedEnlistment en)
 
         public override void Commit(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableCommit(this);
         }
 
 
         public override void Rollback(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableRollback(this);
         }
 
 
         public override void InDoubt(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableInDoubt(this);
         }
 
@@ -423,7 +423,7 @@ protected override void InternalPrepare()
             }
             catch (TransactionAbortedException e)
             {
-                _oletxEnlistment.ForceRollback(e);
+                _promotedEnlistment.ForceRollback(e);
                 if (DiagnosticTrace.Verbose)
                 {
                     ExceptionConsumedTraceRecord.Trace(SR.TraceSourceLtm,
@@ -432,7 +432,7 @@ protected override void InternalPrepare()
             }
             catch (TransactionInDoubtException e)
             {
-                _oletxEnlistment.EnlistmentDone();
+                _promotedEnlistment.EnlistmentDone();
                 if (DiagnosticTrace.Verbose)
                 {
                     ExceptionConsumedTraceRecord.Trace(SR.TraceSourceLtm,
@@ -445,7 +445,7 @@ protected override void InternalPrepare()
         protected override void InternalCommit()
         {
             // Respond immediately to the TM
-            _oletxEnlistment.EnlistmentDone();
+            _promotedEnlistment.EnlistmentDone();
 
             _transaction.State.ChangeStatePromotedCommitted(_transaction);
         }
@@ -454,7 +454,7 @@ protected override void InternalCommit()
         protected override void InternalRollback()
         {
             // Respond immediately to the TM
-            _oletxEnlistment.EnlistmentDone();
+            _promotedEnlistment.EnlistmentDone();
 
             _transaction.State.ChangeStatePromotedAborted(_transaction);
         }
@@ -476,21 +476,21 @@ public override void Prepare(IPromotedEnlistment en)
 
         public override void Commit(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableCommit(this);
         }
 
 
         public override void Rollback(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableRollback(this);
         }
 
 
         public override void InDoubt(IPromotedEnlistment en)
         {
-            _oletxEnlistment = en;
+            _promotedEnlistment = en;
             PoolableInDoubt(this);
         }
     }
diff --git a/src/System.Transactions/src/project.json b/src/System.Transactions/src/project.json
@@ -8,18 +8,18 @@
         "System.Collections.Specialized": "4.0.0",
         "System.Collections.NonGeneric": "4.0.0",
         "System.Diagnostics.Debug": "4.0.10",
-        "System.Diagnostics.Process": "4.0.0",
+        "System.Diagnostics.Process": "4.1.0",
         "System.Diagnostics.TraceSource": "4.0.0",
         "System.IO": "4.0.10",
         "System.Resources.ResourceManager": "4.0.0",
         "System.Runtime": "4.0.20",
         "System.Runtime.Extensions": "4.0.10",
-		"System.Runtime.Serialization.Formatters": "4.0.1-beta-24222-03",
+        "System.Runtime.Serialization.Formatters": "4.0.1-beta-24318-03",
         "System.Runtime.InteropServices": "4.0.20",
         "System.Threading": "4.0.10",
         "System.Threading.Tasks": "4.0.10",
         "System.Threading.Thread": "4.0.0",
-        "System.Threading.ThreadPool": "4.0.0",
+        "System.Threading.ThreadPool": "4.0.10",
         "System.Threading.Timer": "4.0.0",
         "System.Xml.XPath": "4.0.0"
       },
diff --git a/src/System.Transactions/tests/EnlistTest.cs b/src/System.Transactions/tests/EnlistTest.cs
diff --git a/src/System.Transactions/tests/IntResourceManager.cs b/src/System.Transactions/tests/IntResourceManager.cs
diff --git a/src/System.Transactions/tests/project.json b/src/System.Transactions/tests/project.json

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "System.Runtime": "4.0.1",`
	`3`	`+ "System.Runtime": "4.0.10",`
`4`	`4`	`"System.Runtime.Serialization.Primitives": "4.1.1",`
`5`		`- "System.Runtime.Serialization.Formatters": "4.0.1-beta-24222-03"`
	`5`	`+ "System.Runtime.Serialization.Formatters": "4.0.1-beta-24318-03"`
`6`	`6`	`},`
`7`	`7`	`"frameworks": {`
`8`	`8`	`"netstandard1.4": {`
`9`		`- "imports": [ "dotnet5.4" ]`
	`9`	`+ "imports": [`
	`10`	`+ "dotnet5.4"`
	`11`	`+ ]`
`10`	`12`	`}`
`11`	`13`	`}`
`12`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ private static void EnsureSettingsLoaded()`
`18`	`18`	`{`
`19`	`19`	`if (!s_settingsInitalized)`
`20`	`20`	`{`
	`21`	`+ // TODO: Determine how to handle configuration.`
`21`	`22`	`// This uses System.Configuration on desktop to load:`
`22`	`23`	`// Transactions:IncludeDistributedTransactionIdInExceptionMessage`
`23`	`24`	`s_includeDistributedTxIdInExceptionMessage = false;`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,10 @@ internal Transaction(IsolationLevel isoLevel, InternalTransaction internalTransa`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
`279`		`- internal Transaction(DistributedTransaction oleTransaction)`
	`279`	`+ internal Transaction(DistributedTransaction distributedTransaction)`
`280`	`280`	`{`
`281`		`- _isoLevel = oleTransaction.IsolationLevel;`
`282`		`- _internalTransaction = new InternalTransaction(this, oleTransaction);`
	`281`	`+ _isoLevel = distributedTransaction.IsolationLevel;`
	`282`	`+ _internalTransaction = new InternalTransaction(this, distributedTransaction);`
`283`	`283`	`_cloneId = Interlocked.Increment(ref _internalTransaction._cloneCount);`
`284`	`284`	`}`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ internal static DistributedTransaction ConvertToDistributedTransaction(Transacti`
`39`	`39`	`throw TransactionException.CreateTransactionCompletedException(SR.TraceSourceLtm, transaction.DistributedTxId);`
`40`	`40`	`}`
`41`	`41`
`42`		`- DistributedTransaction oletxTx = transaction.Promote();`
`43`		`- if (oletxTx == null)`
	`42`	`+ DistributedTransaction distributedTx = transaction.Promote();`
	`43`	`+ if (distributedTx == null)`
`44`	`44`	`{`
`45`	`45`	`throw DistributedTransaction.NotSupported();`
`46`	`46`	`}`
`47`		`- return oletxTx;`
	`47`	`+ return distributedTx;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ internal static Transaction FindOrCreatePromotedTransaction(Guid transactionIden`
`557`	`557`	`tx = weakRef.Target as Transaction;`
`558`	`558`	`if (null != tx)`
`559`	`559`	`{`
`560`		`- // If we found a transaction then dispose the oletx`
	`560`	`+ // If we found a transaction then dispose it`
`561`	`561`	`dtx.Dispose();`
`562`	`562`	`return tx.InternalClone();`
`563`	`563`	`}`
Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ private void Timeout()`
`923`	`923`	`}`
`924`	`924`	`catch (TransactionException txEx)`
`925`	`925`	`{`
`926`		`- // Tolerate transaction exceptions - VSWhidbey 466868.`
	`926`	`+ // Tolerate transaction exceptions`
`927`	`927`	`if (DiagnosticTrace.Verbose)`
`928`	`928`	`{`
`929`	`929`	`ExceptionConsumedTraceRecord.Trace(SR.TraceSourceBase,`