Revert TableSelectionSet and IDbContextTransactionManager breaking ch…

…anges.

Part of dotnet#10545

src/EFCore.InMemory/Diagnostics/InMemoryEventId.cs

@@ -35,7 +35,7 @@ private enum Id
 
         /// <summary>
         ///     <para>
-        ///         Changes were saved to the database.
+        ///         A transaction operation was requested, but ignored because in-memory does not support transactions.
         ///     </para>
         ///     <para>
         ///         This event is in the <see cref="DbLoggerCategory.Database.Transaction" /> category.
@@ -51,7 +51,7 @@ private enum Id
 
         /// <summary>
         ///     <para>
-        ///         A transaction operation was requested, but ignored because in-memory does not support transactions.
+        ///         Changes were saved to the database.
         ///     </para>
         ///     <para>
         ///         This event is in the <see cref="DbLoggerCategory.Update" /> category.

src/EFCore.InMemory/Storage/Internal/InMemoryTransactionManager.cs

@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class InMemoryTransactionManager : IDbContextTransactionManager
+    public class InMemoryTransactionManager : IDbContextTransactionManager, ITransactionEnlistmentManager
     {
         private static readonly InMemoryTransaction _stubTransaction = new InMemoryTransaction();
 
@@ -86,6 +86,7 @@ public virtual Task<IDbContextTransaction> BeginTransactionAsync(
         /// </summary>
         public virtual void EnlistTransaction(Transaction transaction)
         {
+            _logger.TransactionIgnoredWarning();
         }
 
         /// <summary>

src/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj

@@ -10,7 +10,7 @@
     <EnableApiCheck>false</EnableApiCheck>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(FunctionalTests_PackageVersion)' == '2.0.0'">
    <DefineConstants>$(DefineConstants);Test20</DefineConstants>
   </PropertyGroup>

src/EFCore.Relational/Scaffolding/Internal/TableSelectionSet.cs

@@ -0,0 +1,98 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Utilities;
+
+namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
+{
+    /// <summary>
+    ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+    ///     directly from your code. This API may change or be removed in future releases.
+    /// </summary>
+    [Obsolete("This is just to provide backward compatibility for 2.0 providers")]
+    public class TableSelectionSet
+    {
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public static readonly TableSelectionSet All = new TableSelectionSet();
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public TableSelectionSet()
+            : this(Enumerable.Empty<string>(), Enumerable.Empty<string>())
+        {
+        }
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public TableSelectionSet([NotNull] IEnumerable<string> tables)
+            : this(tables, Enumerable.Empty<string>())
+        {
+        }
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public TableSelectionSet([NotNull] IEnumerable<string> tables, [NotNull] IEnumerable<string> schemas)
+        {
+            Check.NotNull(tables, nameof(tables));
+            Check.NotNull(schemas, nameof(schemas));
+
+            Schemas = schemas.Select(schema => new Selection(schema)).ToList();
+            Tables = tables.Select(table => new Selection(table)).ToList();
+        }
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public virtual IReadOnlyList<Selection> Schemas { get; }
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public virtual IReadOnlyList<Selection> Tables { get; }
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public class Selection
+        {
+            /// <summary>
+            ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+            ///     directly from your code. This API may change or be removed in future releases.
+            /// </summary>
+            public Selection([NotNull] string selectionText)
+            {
+                Check.NotEmpty(selectionText, nameof(selectionText));
+
+                Text = selectionText;
+            }
+
+            /// <summary>
+            ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+            ///     directly from your code. This API may change or be removed in future releases.
+            /// </summary>
+            public virtual string Text { get; }
+
+            /// <summary>
+            ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+            ///     directly from your code. This API may change or be removed in future releases.
+            /// </summary>
+            public virtual bool IsMatched { get; set; }
+        }
+    }
+}

src/EFCore.Relational/Storage/RelationalConnection.cs

@@ -27,7 +27,7 @@ namespace Microsoft.EntityFrameworkCore.Storage
     ///         not used in application code.
     ///     </para>
     /// </summary>
-    public abstract class RelationalConnection : IRelationalConnection
+    public abstract class RelationalConnection : IRelationalConnection, ITransactionEnlistmentManager
     {
         private readonly string _connectionString;
         private readonly LazyRef<DbConnection> _connection;

src/EFCore.Relational/Update/Internal/BatchExecutor.cs

@@ -59,7 +59,7 @@ private int Execute(DbContext _, (IEnumerable<ModificationCommandBatch>, IRelati
             try
             {
                 if (connection.CurrentTransaction == null
-                    && connection.EnlistedTransaction == null
+                    && (connection as ITransactionEnlistmentManager)?.EnlistedTransaction == null
                     && Transaction.Current == null
                     && CurrentContext.Context.Database.AutoTransactionsEnabled)
                 {
@@ -117,7 +117,7 @@ private async Task<int> ExecuteAsync(
             try
             {
                 if (connection.CurrentTransaction == null
-                    && connection.EnlistedTransaction == null
+                    && (connection as ITransactionEnlistmentManager)?.EnlistedTransaction == null
                     && Transaction.Current == null
                     && CurrentContext.Context.Database.AutoTransactionsEnabled)
                 {

src/EFCore.Specification.Tests/UpdatesTestBase.cs

@@ -167,7 +167,6 @@ public virtual void Remove_partial_on_concurrency_token_original_value_mismatch_
                                 () => context.SaveChanges()).Message);
                     });
         }
-#endif
 
         [Fact]
         public virtual void Save_replaced_principal()
@@ -195,6 +194,7 @@ public virtual void Save_replaced_principal()
                         Assert.Equal(2, products.Count);
                     });
         }
+#endif
 
         [Fact]
         public virtual void SaveChanges_processes_all_tracked_entities()

src/EFCore.Sqlite.Core/Infrastructure/SqliteServiceCollectionExtensions.cs

@@ -45,7 +45,7 @@ public static class SqliteServiceCollectionExtensions
         ///          public void ConfigureServices(IServiceCollection services)
         ///          {
         ///              var connectionString = "connection string to database";
-        /// 
+        ///
         ///              services
         ///                  .AddEntityFrameworkSqlite()
         ///                  .AddDbContext<MyContext>((serviceProvider, options) =>
@@ -79,8 +79,7 @@ public static IServiceCollection AddEntityFrameworkSqlite([NotNull] this IServic
                 .TryAdd<ICompositeMethodCallTranslator, SqliteCompositeMethodCallTranslator>()
                 .TryAdd<IQuerySqlGeneratorFactory, SqliteQuerySqlGeneratorFactory>()
                 .TryAddProviderSpecificServices(
-                    b => b
-                        .TryAddScoped<ISqliteRelationalConnection, SqliteRelationalConnection>());
+                    b => b.TryAddScoped<ISqliteRelationalConnection, SqliteRelationalConnection>());
 
             builder.TryAddCoreServices();
 

src/EFCore/Extensions/TransactionsDatabaseFacadeExtensions.cs

@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
 
@@ -22,14 +23,34 @@ public static class TransactionsDatabaseFacadeExtensions
         /// <param name="databaseFacade"> The <see cref="DatabaseFacade" /> for the context.</param>
         /// <param name="transaction"> The transaction to be used. </param>
         public static void EnlistTransaction([NotNull] this DatabaseFacade databaseFacade, [CanBeNull] Transaction transaction)
-            => Check.NotNull(databaseFacade, nameof(databaseFacade)).GetService<IDbContextTransactionManager>().EnlistTransaction(transaction);
+        {
+            Check.NotNull(databaseFacade, nameof(databaseFacade));
+            if (databaseFacade.GetService<IDbContextTransactionManager>() is ITransactionEnlistmentManager transactionManager)
+            {
+                transactionManager.EnlistTransaction(transaction);
+            }
+            else
+            {
+                throw new NotSupportedException(CoreStrings.TransactionsNotSupported);
+            }
+        }
 
         /// <summary>
         ///     Returns the currently enlisted transaction.
         /// </summary>
         /// <param name="databaseFacade"> The <see cref="DatabaseFacade" /> for the context.</param>
         /// <returns> The currently enlisted transaction. </returns>
         public static Transaction GetEnlistedTransaction([NotNull] this DatabaseFacade databaseFacade)
-            => Check.NotNull(databaseFacade, nameof(databaseFacade)).GetService<IDbContextTransactionManager>().EnlistedTransaction;
+        {
+            Check.NotNull(databaseFacade, nameof(databaseFacade));
+            if (databaseFacade.GetService<IDbContextTransactionManager>() is ITransactionEnlistmentManager transactionManager)
+            {
+                return transactionManager.EnlistedTransaction;
+            }
+            else
+            {
+                throw new NotSupportedException(CoreStrings.TransactionsNotSupported);
+            }
+        }
     }
 }

src/EFCore/Properties/CoreStrings.resx

@@ -829,4 +829,7 @@
   <data name="ClashingNonOwnedEntityType" xml:space="preserve">
     <value>The type '{entityType}' cannot be marked as owned because a non-owned entity type with the same name already exists.</value>
   </data>
+  <data name="TransactionsNotSupported" xml:space="preserve">
+    <value>Current provider doesn't support System.Transaction.</value>
+  </data>
 </root>

src/EFCore/Storage/IDbContextTransactionManager.cs

@@ -3,8 +3,6 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using System.Transactions;
-using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Microsoft.EntityFrameworkCore.Storage
@@ -49,17 +47,5 @@ public interface IDbContextTransactionManager : IResettableService
         ///     Gets the current transaction.
         /// </summary>
         IDbContextTransaction CurrentTransaction { get; }
-
-        /// <summary>
-        ///     The currently enlisted transaction.
-        /// </summary>
-        Transaction EnlistedTransaction { get; }
-
-        /// <summary>
-        ///     Specifies an existing <see cref="Transaction" /> to be used for database operations.
-        /// </summary>
-        /// <param name="transaction"> The transaction to be used. </param>
-        void EnlistTransaction([CanBeNull] Transaction transaction);
-
     }
 }

src/EFCore/Storage/ITransactionEnlistmentManager.cs

@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Transactions;
+using JetBrains.Annotations;
+
+namespace Microsoft.EntityFrameworkCore.Storage
+{
+    /// <summary>
+    ///     <para>
+    ///         Manages the current <see cref="Transaction" />.
+    ///     </para>
+    ///     <para>
+    ///         This interface is typically used by database providers (and other extensions). It is generally
+    ///         not used in application code.
+    ///     </para>
+    /// </summary>
+    public interface ITransactionEnlistmentManager
+    {
+        /// <summary>
+        ///     The currently enlisted transaction.
+        /// </summary>
+        Transaction EnlistedTransaction { get; }
+
+        /// <summary>
+        ///     Specifies an existing <see cref="Transaction" /> to be used for database operations.
+        /// </summary>
+        /// <param name="transaction"> The transaction to be used. </param>
+        void EnlistTransaction([CanBeNull] Transaction transaction);
+    }
+}

src/EFCore/breakingchanges.netcore.json

@@ -19,16 +19,6 @@
     "MemberId": "public const System.Int32 RelationalBaseId = 200000",
     "Kind": "Removal"
   },
-  {
-    "TypeId": "public interface Microsoft.EntityFrameworkCore.Storage.IDbContextTransactionManager : Microsoft.EntityFrameworkCore.Infrastructure.IResettableService",
-    "MemberId": "System.Transactions.Transaction get_EnlistedTransaction()",
-    "Kind": "Addition"
-  },
-  {
-    "TypeId": "public interface Microsoft.EntityFrameworkCore.Storage.IDbContextTransactionManager : Microsoft.EntityFrameworkCore.Infrastructure.IResettableService",
-    "MemberId": "System.Void EnlistTransaction(System.Transactions.Transaction transaction)",
-    "Kind": "Addition"
-  },
   {
     "TypeId": "public class Microsoft.EntityFrameworkCore.ChangeTracking.ChangeTracker : Microsoft.EntityFrameworkCore.Infrastructure.IInfrastructure<Microsoft.EntityFrameworkCore.ChangeTracking.Internal.IStateManager>",
     "MemberId": "public .ctor(Microsoft.EntityFrameworkCore.DbContext context)",

test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj

@@ -11,19 +11,23 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  
+
   <PropertyGroup Condition="'$(FunctionalTests_PackageVersion)' == '2.0.0'">
    <DefineConstants>$(DefineConstants);Test20</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(FunctionalTests_PackageVersion)' == '0.0.0'">
     <ProjectReference Include="..\..\src\EFCore.InMemory\EFCore.InMemory.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup Condition="'$(FunctionalTests_PackageVersion)' != '0.0.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(FunctionalTests_PackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj" />
   </ItemGroup>