Fix IsConfigured to return true only when a provider is configured

As opposed to any extension Fixes #13228
dotnet · Oct 8, 2018 · 188dbf4 · 188dbf4
1 parent efdcf46
commit 188dbf4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/EFCore/DbContextOptionsBuilder.cs b/src/EFCore/DbContextOptionsBuilder.cs
@@ -68,7 +68,7 @@ public DbContextOptionsBuilder([NotNull] DbContextOptions options)
         ///         <see cref="DbContext.OnConfiguring(DbContextOptionsBuilder)" />.
         ///     </para>
         /// </summary>
-        public virtual bool IsConfigured => _options.Extensions.Any();
+        public virtual bool IsConfigured => _options.Extensions.Any(e => e.ApplyServices(new ServiceCollection()));
 
         /// <summary>
         ///     Sets the model to be used for the context. If the model is set, then <see cref="DbContext.OnModelCreating(ModelBuilder)" />

diff --git a/test/EFCore.Tests/DbContextOptionsTest.cs b/test/EFCore.Tests/DbContextOptionsTest.cs
@@ -94,7 +94,7 @@ public void Can_update_an_existing_extension()
         }
 
         [Fact]
-        public void IsConfigured_returns_true_if_any_extensions_have_been_added()
+        public void IsConfigured_returns_true_if_any_provider_extensions_have_been_added()
         {
             var optionsBuilder = new DbContextOptionsBuilder();
 
@@ -105,6 +105,18 @@ public void IsConfigured_returns_true_if_any_extensions_have_been_added()
             Assert.True(optionsBuilder.IsConfigured);
         }
 
+        [Fact]
+        public void IsConfigured_returns_false_if_only_non_provider_extensions_have_been_added()
+        {
+            var optionsBuilder = new DbContextOptionsBuilder();
+
+            Assert.False(optionsBuilder.IsConfigured);
+
+            ((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(new FakeDbContextOptionsExtension1());
+
+            Assert.False(optionsBuilder.IsConfigured);
+        }
+
         private class FakeDbContextOptionsExtension1 : IDbContextOptionsExtension
         {
             public string Something { get; set; }
@@ -122,7 +134,7 @@ public virtual void Validate(IDbContextOptions options)
 
         private class FakeDbContextOptionsExtension2 : IDbContextOptionsExtension
         {
-            public virtual bool ApplyServices(IServiceCollection services) => false;
+            public virtual bool ApplyServices(IServiceCollection services) => true;
 
             public virtual long GetServiceProviderHashCode() => 0;