Seperate register & execute Bootstrapper tasks

Src/Commons/BoC.csproj

@@ -162,6 +162,7 @@
     <Compile Include="Services\ModelQuery.cs" />
     <Compile Include="Services\DefaultSetupTasks\AutoRegisterModelServices.cs" />
     <Compile Include="Tasks\BaseBackgroundTask.cs" />
+    <Compile Include="Tasks\RegisterBootstrapTasks.cs" />
     <Compile Include="Tasks\RegisterBackgroundTasks.cs" />
     <Compile Include="Tasks\Bootstrapper.cs" />
     <Compile Include="Tasks\BaseThreadedBackgroundTask.cs" />

Src/Commons/Initializer.cs

@@ -54,7 +54,7 @@ public static void Execute(IDependencyResolver dependencyResolver, params IAppDo
                 if (Executed)
                     return;
                 IoC.InitializeWith(dependencyResolver, appDomainHelpers);
-                new Bootstrapper(dependencyResolver, appDomainHelpers).Run();
+                dependencyResolver.Resolve<Bootstrapper>().Run();
                 Executed = true;
             }
 

Src/Commons/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.6.0")]
-[assembly: AssemblyFileVersion("4.0.6.0")]
+[assembly: AssemblyVersion("4.0.7.0")]
+[assembly: AssemblyFileVersion("4.0.7.0")]
 
 [assembly: AssemblyKeyFileAttribute("../../BoC.snk")]

Src/Commons/Tasks/Bootstrapper.cs

@@ -1,51 +1,43 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using BoC.Helpers;
 using BoC.InversionOfControl;
 
 namespace BoC.Tasks
 {
     public class Bootstrapper
     {
         private readonly IDependencyResolver dependencyResolver;
-        private readonly IAppDomainHelper[] appDomainHelpers;
+        private static object bootstrapper_lock = new object();
+        public bool Executed { get; set; }
 
-        public Bootstrapper(IDependencyResolver dependencyResolver, IAppDomainHelper[] appDomainHelpers)
+        public Bootstrapper(IDependencyResolver dependencyResolver)
         {
             this.dependencyResolver = dependencyResolver;
-            this.appDomainHelpers = appDomainHelpers;
         }
 
-        ICollection<Func<Type, bool>> taskFilters = new List<Func<Type, bool>>() 
+        public static readonly ICollection<Func<Type, bool>> TaskFilters = new List<Func<Type, bool>>() 
             { 
                 type => typeof(IBootstrapperTask).IsAssignableFrom(type),
                 type => !type.IsAbstract,
                 type => type.IsClass
             };
 
-        private void RegisterAllTasks()
+        public virtual void Run()
         {
-            var tasks = appDomainHelpers.SelectMany(helper => helper.GetTypes(t => taskFilters.All(func => func(t))));
-            foreach (var t in tasks)
+            if (Executed)
+                return;
+            lock (bootstrapper_lock)
             {
-                dependencyResolver.RegisterType(typeof(IBootstrapperTask), t);
-            }
-        }
+                if (Executed)
+                    return;
 
-        private void ExecuteTasks()
-        {
-            var tasks = dependencyResolver.ResolveAll<IBootstrapperTask>();
-            foreach (var task in tasks)
-            {
-                task.Execute();
+                var tasks = dependencyResolver.ResolveAll<IBootstrapperTask>();
+                foreach (var task in tasks)
+                {
+                    task.Execute();
+                }
+                Executed = true;
             }
         }
-
-        public void Run()
-        {
-            RegisterAllTasks();
-            ExecuteTasks();
-        }
     }
 }

Src/Commons/Tasks/RegisterBootstrapTasks.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BoC.Helpers;
+using BoC.InversionOfControl;
+
+namespace BoC.Tasks
+{
+    public class RegisterBootstrapTasks: IContainerInitializer
+    {
+        private readonly IDependencyResolver dependencyResolver;
+        private readonly IAppDomainHelper[] appDomainHelpers;
+
+        public RegisterBootstrapTasks(IDependencyResolver dependencyResolver, IAppDomainHelper[] appDomainHelpers)
+        {
+            this.dependencyResolver = dependencyResolver;
+            this.appDomainHelpers = appDomainHelpers;
+        }
+
+        public void Execute()
+        {
+            var tasks = appDomainHelpers.SelectMany(helper => helper.GetTypes(t => Bootstrapper.TaskFilters.All(func => func(t))));
+            foreach (var t in tasks)
+            {
+                dependencyResolver.RegisterType(typeof(IBootstrapperTask), t);
+            }
+            dependencyResolver.RegisterSingleton<Bootstrapper, Bootstrapper>();
+        }
+    }
+}