Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation

# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs

src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs

@@ -1,4 +1,3 @@
-using System.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
@@ -10,20 +9,29 @@ using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
+
+
     public static class UmbracoBackOfficeServiceCollectionExtensions
     {
+
         public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services)
         {
             var serviceProvider = services.BuildServiceProvider();
             var configuration = serviceProvider.GetService<IConfiguration>();
+            if (configuration == null)
+                throw new InvalidOperationException($"Could not resolve {typeof(IConfiguration)} from the container");
+
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
 
             var configs = configsFactory.Create();
@@ -33,10 +41,83 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return services;
         }
 
-        public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
+
+        /// <summary>
+        ///  Adds the Umbraco Back Core requirements
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Must be called after all services are added to the application because we are cross-wiring the container (currently)
+        /// </remarks>
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services)
+        {
+            if (!UmbracoServiceProviderFactory.IsActive)
+                throw new InvalidOperationException("Ensure to add UseUmbraco() in your Program.cs after ConfigureWebHostDefaults to enable Umbraco's service provider factory");
+
+            var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
+
+            return services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
+        }
+
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
         {
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
+            CreateCompositionRoot(services);
+
+            // TODO: Get rid of this 'Current' requirement
+            var globalSettings = Current.Configs.Global();
+            var umbracoVersion = new UmbracoVersion(globalSettings);
+
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
+            var typeFinder = new TypeFinder(Current.Logger, new DefaultUmbracoAssemblyProvider(entryAssembly));
+
+            var coreRuntime = GetCoreRuntime(
+                Current.Configs,
+                umbracoVersion,
+                Current.IOHelper,
+                Current.Logger,
+                Current.Profiler,
+                Current.HostingEnvironment,
+                Current.BackOfficeInfo,
+                typeFinder);
+
+            var factory = coreRuntime.Boot(umbContainer);
+
+            return services;
+        }
+
+        private static IRuntime GetCoreRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger,
+            IProfiler profiler, Core.Hosting.IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo,
+            ITypeFinder typeFinder)
+        {
+            var connectionStringConfig = configs.ConnectionStrings()[Constants.System.UmbracoConnectionName];
+            var dbProviderFactoryCreator = new SqlServerDbProviderFactoryCreator(
+                connectionStringConfig?.ProviderName,
+                DbProviderFactories.GetFactory);
+
+            // Determine if we should use the sql main dom or the default
+            var globalSettings = configs.Global();
+            var connStrings = configs.ConnectionStrings();
+            var appSettingMainDomLock = globalSettings.MainDomLock;
+            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
+                ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator)
+                : new MainDomSemaphoreLock(logger, hostingEnvironment);
+
+            var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
+
+            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetCoreBootPermissionsChecker(),
+                hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, typeFinder);
+
+            return coreRuntime;
+        }
+
+        private static void CreateCompositionRoot(IServiceCollection services)
+        {
+            // TODO: This isn't the best to have to resolve the services now but to avoid this will
+            // require quite a lot of re-work.
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
@@ -45,12 +126,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var configuration = serviceProvider.GetService<IConfiguration>();
 
             var configs = serviceProvider.GetService<Configs>();
-
-            services.CreateCompositionRoot(
-                httpContextAccessor,
-                webHostEnvironment,
-                hostApplicationLifetime,
-                configs);
+            if (configs == null)
+                throw new InvalidOperationException($"Could not resolve type {typeof(Configs)} from the container, ensure {nameof(AddUmbracoConfiguration)} is called before calling {nameof(AddUmbracoCore)}");
 
             services.AddRuntimeMinifier(configuration);
 
@@ -69,11 +146,11 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
 
-            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment,
-                httpContextAccessor, hostApplicationLifetime);
+            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
+                // need to build a new service provider since the one already resolved above doesn't have the IRequestCache yet
                 () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
                 new AspNetCoreMarchal());
 
@@ -92,5 +169,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             return services;
         }
+
+        private class AspNetCoreBootPermissionsChecker : IUmbracoBootPermissionChecker
+        {
+            public void ThrowIfNotPermissions()
+            {
+                // nothing to check
+            }
+        }
     }
 }