From f2e7c49c36f2172b90f8a905293365bcc175490c Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Thu, 22 Oct 2015 06:13:25 -0700
Subject: [PATCH] Don't add platforms services if no available

---
 .../WebHostBuilder.cs                         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
index d19ca7668b..8938b79333 100644
--- a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
@@ -92,13 +92,21 @@ namespace Microsoft.AspNet.Hosting
                 _configureServices(services);
             }
 
-            services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Application));
-            services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Runtime));
-            services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoadContextAccessor));
-            services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer));
-            services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager));
-            services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter));
-            services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider));
+            if (PlatformServices.Default != null)
+            {
+                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Application));
+                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Runtime));
+                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoadContextAccessor));
+                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer));
+                services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager));
+            }
+
+            // TODO: Remove this
+            if (CompilationServices.Default != null)
+            {
+                services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter));
+                services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider));
+            }
 
             return services;
         }