Skip to content

Commit

Permalink
MarimerLLC#1138 Backport TransactionTypes enum fix to 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
rockfordlhotka committed Jun 7, 2019
1 parent f08361d commit 435f2da
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions Source/Csla.Shared/TransactionalTypes.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//-----------------------------------------------------------------------
// <copyright file="TransactionalTypes.cs" company="Marimer LLC">
// Copyright (c) Marimer LLC. All rights reserved.
// Website: http://www.lhotka.net/cslanet/
// Website: https://cslanet.com
// </copyright>
// <summary>Provides a list of possible transactional</summary>
//-----------------------------------------------------------------------
Expand All @@ -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 435f2da

Please sign in to comment.