Move runtime service registration

aspnet · Dec 15, 2015 · ab5de9b · ab5de9b
1 parent e535777
commit ab5de9b
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/Microsoft.AspNet.Hosting/WebApplicationBuilder.cs b/src/Microsoft.AspNet.Hosting/WebApplicationBuilder.cs
@@ -214,19 +214,23 @@ private IServiceCollection BuildHostingServices()
             // Conjure up a RequestServices
             services.AddTransient<IStartupFilter, AutoRequestServicesStartupFilter>();
 
-            if (_configureServices != null)
+            var defaultPlatformServices = PlatformServices.Default;
+            if (defaultPlatformServices != null)
             {
-                _configureServices(services);
+                if (defaultPlatformServices.Application != null)
+                {
+                    services.TryAdd(ServiceDescriptor.Instance(defaultPlatformServices.Application));
+                }
+
+                if (defaultPlatformServices.Runtime != null)
+                {
+                    services.TryAdd(ServiceDescriptor.Instance(defaultPlatformServices.Runtime));
+                }
             }
 
-            if (PlatformServices.Default?.Application != null)
-            {
-                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Application));
-            }
-
-            if (PlatformServices.Default?.Runtime != null)
+            if (_configureServices != null)
             {
-                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Runtime));
+                _configureServices(services);
             }
 
             return services;