diff --git a/src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetCustomizer.cs b/src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetPlugin.cs similarity index 97% rename from src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetCustomizer.cs rename to src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetPlugin.cs index 503504b9900..2a0f7eb9650 100644 --- a/src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetCustomizer.cs +++ b/src/EFCore.Proxies/Proxies/Internal/ProxiesConventionSetPlugin.cs @@ -25,7 +25,7 @@ namespace Microsoft.EntityFrameworkCore.Proxies.Internal /// The implementations do not need to be thread-safe. /// /// - public class ProxiesConventionSetCustomizer : IConventionSetCustomizer + public class ProxiesConventionSetPlugin : IConventionSetPlugin { private readonly IDbContextOptions _options; private readonly IProxyFactory _proxyFactory; @@ -38,7 +38,7 @@ public class ProxiesConventionSetCustomizer : IConventionSetCustomizer /// 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. /// - public ProxiesConventionSetCustomizer( + public ProxiesConventionSetPlugin( [NotNull] IProxyFactory proxyFactory, [NotNull] IDbContextOptions options, [NotNull] LazyLoaderParameterBindingFactoryDependencies lazyLoaderParameterBindingFactoryDependencies, diff --git a/src/EFCore.Proxies/Proxies/Internal/ProxiesOptionsExtension.cs b/src/EFCore.Proxies/Proxies/Internal/ProxiesOptionsExtension.cs index f92e4a29a4f..e7829f946c7 100644 --- a/src/EFCore.Proxies/Proxies/Internal/ProxiesOptionsExtension.cs +++ b/src/EFCore.Proxies/Proxies/Internal/ProxiesOptionsExtension.cs @@ -101,8 +101,8 @@ public virtual void Validate(IDbContextOptions options) using (var scope = internalServiceProvider.CreateScope()) { if (scope.ServiceProvider - .GetService>() - ?.Any(s => s is ProxiesConventionSetCustomizer) == false) + .GetService>() + ?.Any(s => s is ProxiesConventionSetPlugin) == false) { throw new InvalidOperationException(ProxiesStrings.ProxyServicesMissing); } diff --git a/src/EFCore.Proxies/ProxiesServiceCollectionExtensions.cs b/src/EFCore.Proxies/ProxiesServiceCollectionExtensions.cs index d6a9f69965d..b34600e3052 100644 --- a/src/EFCore.Proxies/ProxiesServiceCollectionExtensions.cs +++ b/src/EFCore.Proxies/ProxiesServiceCollectionExtensions.cs @@ -37,7 +37,7 @@ public static IServiceCollection AddEntityFrameworkProxies( Check.NotNull(serviceCollection, nameof(serviceCollection)); new EntityFrameworkServicesBuilder(serviceCollection) - .TryAdd() + .TryAdd() .TryAddProviderSpecificServices( b => b.TryAddSingleton()); diff --git a/src/EFCore.Relational/Metadata/Conventions/Infrastructure/RelationalConventionSetBuilder.cs b/src/EFCore.Relational/Metadata/Conventions/Infrastructure/RelationalConventionSetBuilder.cs index f0b7ddd88b2..c1a32df0f21 100644 --- a/src/EFCore.Relational/Metadata/Conventions/Infrastructure/RelationalConventionSetBuilder.cs +++ b/src/EFCore.Relational/Metadata/Conventions/Infrastructure/RelationalConventionSetBuilder.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure /// /// /// A service on the EF internal service provider that creates the - /// for the current relational database provider. This is combined with + /// for the current relational database provider. This is combined with /// instances to produce the full convention set exposed by the /// service. /// diff --git a/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs b/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs index e2cbcf94b12..cc5495610bc 100644 --- a/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs +++ b/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs @@ -128,7 +128,7 @@ public static readonly IDictionary CoreServices { typeof(IParameterBindingFactory), new ServiceCharacteristics(ServiceLifetime.Singleton, multipleRegistrations: true) }, { typeof(ITypeMappingSourcePlugin), new ServiceCharacteristics(ServiceLifetime.Singleton, multipleRegistrations: true) }, { typeof(ISingletonOptions), new ServiceCharacteristics(ServiceLifetime.Singleton, multipleRegistrations: true) }, - { typeof(IConventionSetCustomizer), new ServiceCharacteristics(ServiceLifetime.Scoped, multipleRegistrations: true) }, + { typeof(IConventionSetPlugin), new ServiceCharacteristics(ServiceLifetime.Scoped, multipleRegistrations: true) }, { typeof(IResettableService), new ServiceCharacteristics(ServiceLifetime.Scoped, multipleRegistrations: true) }, // New Query related services diff --git a/src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetCustomizer.cs b/src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetPlugin.cs similarity index 94% rename from src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetCustomizer.cs rename to src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetPlugin.cs index b1edf1a6f98..6c816d46d27 100644 --- a/src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetCustomizer.cs +++ b/src/EFCore/Metadata/Conventions/Infrastructure/IConventionSetPlugin.cs @@ -20,13 +20,13 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure /// /// /// The service lifetime is and multiple registrations - /// are allowed. This means that each instance will use its own + /// are allowed. This means that each instance will use its own /// set of instances of this service. /// The implementations may depend on other services registered with any lifetime. /// The implementations do not need to be thread-safe. /// /// - public interface IConventionSetCustomizer + public interface IConventionSetPlugin { /// /// Called to customize or otherwise modify the given convention set. diff --git a/src/EFCore/Metadata/Conventions/Infrastructure/IProviderConventionSetBuilder.cs b/src/EFCore/Metadata/Conventions/Infrastructure/IProviderConventionSetBuilder.cs index 13278e82a62..504aee8901c 100644 --- a/src/EFCore/Metadata/Conventions/Infrastructure/IProviderConventionSetBuilder.cs +++ b/src/EFCore/Metadata/Conventions/Infrastructure/IProviderConventionSetBuilder.cs @@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure /// /// /// A service on the EF internal service provider that creates the - /// for the current database provider. This is combined with + /// for the current database provider. This is combined with /// instances to produce the full convention set exposed by the /// service. /// diff --git a/src/EFCore/Metadata/Conventions/Infrastructure/ProviderConventionSetBuilder.cs b/src/EFCore/Metadata/Conventions/Infrastructure/ProviderConventionSetBuilder.cs index adfca84ccf4..5faed428dab 100644 --- a/src/EFCore/Metadata/Conventions/Infrastructure/ProviderConventionSetBuilder.cs +++ b/src/EFCore/Metadata/Conventions/Infrastructure/ProviderConventionSetBuilder.cs @@ -11,7 +11,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure /// /// /// A service on the EF internal service provider that creates the - /// for the current database provider. This is combined with + /// for the current database provider. This is combined with /// instances to produce the full convention set exposed by the /// service. /// diff --git a/src/EFCore/Metadata/Conventions/Internal/RuntimeConventionSetBuilder.cs b/src/EFCore/Metadata/Conventions/Internal/RuntimeConventionSetBuilder.cs index be4e065732a..daf67df0aee 100644 --- a/src/EFCore/Metadata/Conventions/Internal/RuntimeConventionSetBuilder.cs +++ b/src/EFCore/Metadata/Conventions/Internal/RuntimeConventionSetBuilder.cs @@ -27,7 +27,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal public class RuntimeConventionSetBuilder : IConventionSetBuilder { private readonly IProviderConventionSetBuilder _conventionSetBuilder; - private readonly IList _customizers; + private readonly IList _plugins; /// /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to @@ -37,10 +37,10 @@ public class RuntimeConventionSetBuilder : IConventionSetBuilder /// public RuntimeConventionSetBuilder( [NotNull] IProviderConventionSetBuilder providerConventionSetBuilder, - [NotNull] IEnumerable customizers) + [NotNull] IEnumerable plugins) { _conventionSetBuilder = providerConventionSetBuilder; - _customizers = customizers.ToList(); + _plugins = plugins.ToList(); } /// @@ -53,9 +53,9 @@ public virtual ConventionSet CreateConventionSet() { var conventionSet = _conventionSetBuilder.CreateConventionSet(); - foreach (var customizer in _customizers) + foreach (var plugin in _plugins) { - conventionSet = customizer.ModifyConventions(conventionSet); + conventionSet = plugin.ModifyConventions(conventionSet); } return conventionSet; diff --git a/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs index dd1c588f21c..b8f5c8f4ee2 100644 --- a/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs +++ b/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs @@ -889,7 +889,7 @@ private ModelBuilder CreateModelBuilder() return new ModelBuilder( new RuntimeConventionSetBuilder( new InMemoryConventionSetBuilder(dependencies), - Enumerable.Empty()) + Enumerable.Empty()) .CreateConventionSet()); } diff --git a/test/EFCore.Tests/Metadata/Conventions/NonNullableNavigationConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/NonNullableNavigationConventionTest.cs index a1cdaf07385..29d5a03c0e3 100644 --- a/test/EFCore.Tests/Metadata/Conventions/NonNullableNavigationConventionTest.cs +++ b/test/EFCore.Tests/Metadata/Conventions/NonNullableNavigationConventionTest.cs @@ -204,7 +204,7 @@ private ModelBuilder CreateModelBuilder() return new ModelBuilder( new RuntimeConventionSetBuilder( new ProviderConventionSetBuilder(dependencies), - Enumerable.Empty()) + Enumerable.Empty()) .CreateConventionSet()); } diff --git a/test/EFCore.Tests/ModelSourceTest.cs b/test/EFCore.Tests/ModelSourceTest.cs index bffe570a43f..3d01927920c 100644 --- a/test/EFCore.Tests/ModelSourceTest.cs +++ b/test/EFCore.Tests/ModelSourceTest.cs @@ -80,7 +80,7 @@ public void Adds_all_entities_based_on_all_distinct_entity_types_found() InMemoryTestHelpers.Instance.CreateContext(), new RuntimeConventionSetBuilder(new ProviderConventionSetBuilder( InMemoryTestHelpers.Instance.CreateContextServices().GetRequiredService() - .With(setFinder)), new List())); + .With(setFinder)), new List())); Assert.Equal( new[] { typeof(SetA).DisplayName(), typeof(SetB).DisplayName() },