Make IDbSetFinder public

src/EFCore.Design/Migrations/Design/MigrationsScaffolderDependencies.cs

@@ -132,6 +132,7 @@ public MigrationsScaffolderDependencies(
         /// <summary>
         ///     The operation reporter.
         /// </summary>
+        [EntityFrameworkInternal]
         public IOperationReporter OperationReporter { get; }
 
         /// <summary>
@@ -142,6 +143,7 @@ public MigrationsScaffolderDependencies(
         /// <summary>
         ///     The snapshot model processor.
         /// </summary>
+        [EntityFrameworkInternal]
         public ISnapshotModelProcessor SnapshotModelProcessor { get; }
 
         /// <summary>
@@ -287,6 +289,7 @@ public MigrationsScaffolderDependencies With([NotNull] IHistoryRepository histor
         /// </summary>
         /// <param name="operationReporter"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public MigrationsScaffolderDependencies With([NotNull] IOperationReporter operationReporter)
             => new MigrationsScaffolderDependencies(
                 CurrentContext,
@@ -325,6 +328,7 @@ public MigrationsScaffolderDependencies With([NotNull] IDatabaseProvider databas
         /// </summary>
         /// <param name="snapshotModelProcessor"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public MigrationsScaffolderDependencies With([NotNull] ISnapshotModelProcessor snapshotModelProcessor)
             => new MigrationsScaffolderDependencies(
                 CurrentContext,

src/EFCore.Relational/Storage/RelationalConnectionDependencies.cs

@@ -96,6 +96,7 @@ public RelationalConnectionDependencies(
         /// <summary>
         ///     A service for resolving a connection string from a name.
         /// </summary>
+        [EntityFrameworkInternal]
         public INamedConnectionStringResolver ConnectionStringResolver { get; }
 
         /// <summary>
@@ -155,6 +156,7 @@ public RelationalConnectionDependencies With([NotNull] IDiagnosticsLogger<DbLogg
         /// </summary>
         /// <param name="connectionStringResolver"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public RelationalConnectionDependencies With([NotNull] INamedConnectionStringResolver connectionStringResolver)
             => new RelationalConnectionDependencies(
                 ContextOptions,

src/EFCore/ChangeTracking/Internal/StateManagerDependencies.cs

@@ -167,6 +167,7 @@ public StateManagerDependencies(
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
+        [EntityFrameworkInternal]
         public IDbSetSource SetSource { get; }
 
         /// <summary>
@@ -175,6 +176,7 @@ public StateManagerDependencies(
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
+        [EntityFrameworkInternal]
         public IEntityFinderSource EntityFinderSource { get; }
 
         /// <summary>
@@ -406,6 +408,7 @@ public StateManagerDependencies With([NotNull] ICurrentDbContext currentContext)
         /// </summary>
         /// <param name="entityFinderSource"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public StateManagerDependencies With([NotNull] IEntityFinderSource entityFinderSource)
             => new StateManagerDependencies(
                 InternalEntityEntryFactory,
@@ -429,6 +432,7 @@ public StateManagerDependencies With([NotNull] IEntityFinderSource entityFinderS
         /// </summary>
         /// <param name="setSource"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public StateManagerDependencies With([NotNull] IDbSetSource setSource)
             => new StateManagerDependencies(
                 InternalEntityEntryFactory,

src/EFCore/Infrastructure/DbSetFinderExtensions.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Infrastructure
 {

src/EFCore/Infrastructure/IDbSetFinder.cs

@@ -0,0 +1,30 @@
+// 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 JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.EntityFrameworkCore.Infrastructure
+{
+    /// <summary>
+    ///     <para>
+    ///         A service for finding <see cref="DbSet{TEntity}" /> properties on a type that inherits from <see cref="DbContext" />.
+    ///     </para>
+    ///     <para>
+    ///         The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
+    ///         is used by many <see cref="DbContext" /> instances. The implementation must be thread-safe.
+    ///         This service cannot depend on services registered as <see cref="ServiceLifetime.Scoped" />.
+    ///     </para>
+    /// </summary>
+    public interface IDbSetFinder
+    {
+        /// <summary>
+        ///     Finds <see cref="DbSet{TEntity}" /> properties on a type that inherits from <see cref="DbContext" />.
+        /// </summary>
+        /// <param name="contextType"> A type that inherits from <see cref="DbContext" /> </param>
+        /// <returns> A list of the found properties. </returns>
+        IReadOnlyList<DbSetProperty> FindSets([NotNull] Type contextType);
+    }
+}

src/EFCore/Infrastructure/ModelCustomizerDependencies.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 

src/EFCore/Infrastructure/ModelValidatorDependencies.cs

@@ -77,6 +77,7 @@ public ModelValidatorDependencies(
         /// <summary>
         ///     The member classifier.
         /// </summary>
+        [EntityFrameworkInternal]
         public IMemberClassifier MemberClassifier { get; }
 
         /// <summary>
@@ -92,6 +93,7 @@ public ModelValidatorDependencies With([NotNull] ITypeMappingSource typeMappingS
         /// </summary>
         /// <param name="memberClassifier"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public ModelValidatorDependencies With([NotNull] IMemberClassifier memberClassifier)
             => new ModelValidatorDependencies(TypeMappingSource, memberClassifier);
     }

src/EFCore/Internal/DbSetInitializer.cs

@@ -3,6 +3,7 @@
 
 using System.Linq;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Internal

src/EFCore/Metadata/Conventions/Infrastructure/ProviderConventionSetBuilderDependencies.cs

@@ -5,7 +5,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -116,6 +115,7 @@ public ProviderConventionSetBuilderDependencies(
         /// <summary>
         ///     The member classifier.
         /// </summary>
+        [EntityFrameworkInternal]
         public IMemberClassifier MemberClassifier { get; }
 
         /// <summary>
@@ -204,6 +204,7 @@ public ProviderConventionSetBuilderDependencies With([NotNull] IParameterBinding
         /// </summary>
         /// <param name="memberClassifier"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
+        [EntityFrameworkInternal]
         public ProviderConventionSetBuilderDependencies With([NotNull] IMemberClassifier memberClassifier)
             => new ProviderConventionSetBuilderDependencies(
                 TypeMappingSource, ConstructorBindingFactory, ParameterBindingFactories, memberClassifier, Logger, ValidationLogger,