Ensure container has IServiceProvider/IServiceScopeFactory

src/StructureMap.Microsoft.DependencyInjection/ContainerExtensions.cs

@@ -95,14 +95,6 @@ public static void Populate(this Registry registry, IEnumerable<ServiceDescripto
 
             registry.Policies.ConstructorSelector<AspNetConstructorSelector>();
 
-            registry.For<IServiceProvider>()
-                .LifecycleIs(Lifecycles.Container)
-                .Use<StructureMapServiceProvider>();
-
-            registry.For<IServiceScopeFactory>()
-                .LifecycleIs(Lifecycles.Container)
-                .Use<StructureMapServiceScopeFactory>();
-
             registry.Register(descriptors);
         }
 
@@ -135,6 +127,16 @@ public static void Configure(this IProfileRegistry registry, Func<IServiceCollec
         /// <param name="descriptors">The service descriptors.</param>
         public static void Register(this IProfileRegistry registry, IEnumerable<ServiceDescriptor> descriptors)
         {
+            // Required for factory service descriptors
+            registry.For<IServiceProvider>()
+                .LifecycleIs(Lifecycles.Container)
+                .UseIfNone<StructureMapServiceProvider>();
+
+            // Required for scoped service descriptors
+            registry.For<IServiceScopeFactory>()
+                .LifecycleIs(Lifecycles.Container)
+                .UseIfNone<StructureMapServiceScopeFactory>();
+
             foreach (var descriptor in descriptors)
             {
                 registry.Register(descriptor);

test/StructureMap.Microsoft.DependencyInjection.Tests/StructureMapContainerTests.cs

@@ -61,6 +61,41 @@ public void ConfigureAndRegisterDoNotPreventPopulate()
             Assert.NotNull(container.GetInstance<IFakeScopedService>());
         }
 
+        [Fact]
+        public void ConfigureDoesNotRequirePopulate()
+        {
+            var container = new Container();
+            container.Configure(config =>
+            {
+                config.Configure(services => services
+                    .AddScoped<IFakeScopedService>(_ => new FakeService())
+                );
+            });
+
+            Assert.NotNull(container.GetInstance<IFakeScopedService>());
+
+            Assert.NotNull(container.GetInstance<IServiceProvider>());
+            Assert.NotNull(container.GetInstance<IServiceScopeFactory>());
+        }
+
+        [Fact]
+        public void RegisterDoesNotRequirePopulate()
+        {
+            var container = new Container();
+            container.Configure(config =>
+            {
+                var services = new ServiceCollection()
+                    .AddScoped<IFakeScopedService>(_ => new FakeService());
+
+                config.Register(services);
+            });
+
+            Assert.NotNull(container.GetInstance<IFakeScopedService>());
+
+            Assert.NotNull(container.GetInstance<IServiceProvider>());
+            Assert.NotNull(container.GetInstance<IServiceScopeFactory>());
+        }
+
         [Theory]
         [InlineData(true)]
         [InlineData(false)]