Skip to content

Commit

Permalink
Merge pull request #1143 from rockfordlhotka/1138-transaction
Browse files Browse the repository at this point in the history
Reorder enum values so compiler directive has no x-plat effect, closes #1138
  • Loading branch information
rockfordlhotka committed May 13, 2019
2 parents 8ed31b3 + e6f3686 commit 8319c99
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions Source/Csla.Shared/TransactionalTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,30 @@ namespace Csla
/// </summary>
public enum TransactionalTypes
{
#if !(ANDROID || IOS) && !NETFX_CORE
#if !NETSTANDARD2_0
/// <summary>
/// Causes the server-side DataPortal to
/// use Enterprise Services (COM+) transactions.
/// use no explicit transactional technology.
/// </summary>
EnterpriseServices,
#endif
/// <remarks>
/// This option allows the business developer to
/// implement their own transactions. Common options
/// include ADO.NET transactions and System.Transactions
/// TransactionScope.
/// </remarks>
Manual,
/// <summary>
/// Causes the server-side DataPortal to
/// use System.Transactions TransactionScope
/// style transactions.
/// </summary>
TransactionScope,
#endif
TransactionScope
#if !NETSTANDARD2_0
,
/// <summary>
/// Causes the server-side DataPortal to
/// use no explicit transactional technology.
/// use Enterprise Services (COM+) transactions.
/// </summary>
/// <remarks>
/// This option allows the business developer to
/// implement their own transactions. Common options
/// include ADO.NET transactions and System.Transactions
/// TransactionScope.
/// </remarks>
Manual
EnterpriseServices
#endif
}
}

0 comments on commit 8319c99

Please sign in to comment.