porting 7.6-rc1 into 8

2017-05-12 14:49:44 +02:00
parent ade6c2f057
commit 8561d85f7a
1148 changed files with 41983 additions and 17045 deletions
--- a/src/Umbraco.Core/Components/BootLoader.cs
+++ b/src/Umbraco.Core/Components/BootLoader.cs
@@ -7,6 +7,7 @@ using LightInject;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Components
 {
@@ -49,9 +50,10 @@ namespace Umbraco.Core.Components
            InstanciateComponents(orderedComponentTypes);
            ComposeComponents(level);

-            using (_container.GetInstance<IUmbracoDatabaseFactory>().CreateScope())
+            using (var scope = _container.GetInstance<IScopeProvider>().CreateScope())
            {
                InitializeComponents();
+                scope.Complete();
            }

            // rejoice!