Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport TransactionTypes enum fix to 4.x #1182

Merged
merged 1 commit into from
Jun 7, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
}
}