From 486f344881ddb3f8c5eeb15c142ec1adeea98df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 14 Dec 2016 21:08:54 +0300
Subject: [PATCH] Make AbpApplication.Create internal.

---
 .../AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs    | 4 +---
 src/Volo.Abp.TestBase/AbpIntegratedTest.cs                | 8 ++++++--
 src/Volo.Abp/Volo/Abp/AbpApplication.cs                   | 8 ++++----
 .../Volo/Abp/AbpApplication_Initialize_Tests.cs           | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs
index e47b9ef42e..7d6ca73396 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
 
 namespace AbpDesk.ConsoleDemo
 {
@@ -9,8 +8,7 @@ namespace AbpDesk.ConsoleDemo
         public static void Main(string[] args)
         {
             var services = new ServiceCollection();
-            var application = AbpApplication.Create<AbpDeskConsoleDemoModule>(services);
-
+            var application = services.AddApplication<AbpDeskConsoleDemoModule>();
             using (var scope = services.BuildServiceProvider().CreateScope())
             {
                 application.Initialize(scope.ServiceProvider);
diff --git a/src/Volo.Abp.TestBase/AbpIntegratedTest.cs b/src/Volo.Abp.TestBase/AbpIntegratedTest.cs
index 447ea0be31..89d6218167 100644
--- a/src/Volo.Abp.TestBase/AbpIntegratedTest.cs
+++ b/src/Volo.Abp.TestBase/AbpIntegratedTest.cs
@@ -11,11 +11,13 @@ namespace Volo.Abp.TestBase
 
         protected IServiceProvider ServiceProvider => Application.ServiceProvider;
 
+        protected IServiceScope MainServiceScope { get; private set; }
+
         public AbpIntegratedTest()
         {
             var services = CreateServiceCollection();
 
-            Application = AbpApplication.Create<TStartupModule>(services);
+            Application = services.AddApplication<TStartupModule>();
 
             var serviceProvider = CreateServiceProvider(services);
 
@@ -29,12 +31,14 @@ namespace Volo.Abp.TestBase
 
         protected virtual IServiceProvider CreateServiceProvider(IServiceCollection services)
         {
-            return services.BuildServiceProvider();
+            MainServiceScope = services.BuildServiceProvider().CreateScope();
+            return MainServiceScope.ServiceProvider;
         }
 
         public void Dispose()
         {
             Application.Shutdown();
+            MainServiceScope.Dispose();
         }
     }
 }
diff --git a/src/Volo.Abp/Volo/Abp/AbpApplication.cs b/src/Volo.Abp/Volo/Abp/AbpApplication.cs
index d18316057a..be7213a169 100644
--- a/src/Volo.Abp/Volo/Abp/AbpApplication.cs
+++ b/src/Volo.Abp/Volo/Abp/AbpApplication.cs
@@ -29,13 +29,13 @@ namespace Volo.Abp
             LoadModules(services, options);
         }
 
-        public static AbpApplication Create<TStartupModule>([NotNull] IServiceCollection services)
+        internal static AbpApplication Create<TStartupModule>([NotNull] IServiceCollection services)
             where TStartupModule : IAbpModule
         {
             return Create<TStartupModule>(services, null);
         }
 
-        public static AbpApplication Create<TStartupModule>(
+        internal static AbpApplication Create<TStartupModule>(
             [NotNull] IServiceCollection services,
             [CanBeNull] Action<AbpApplicationCreationOptions> optionsAction)
             where TStartupModule : IAbpModule
@@ -43,14 +43,14 @@ namespace Volo.Abp
             return new AbpApplication(typeof(TStartupModule), services, optionsAction);
         }
 
-        public static AbpApplication Create(
+        internal static AbpApplication Create(
             [NotNull] Type startupModuleType, 
             [NotNull] IServiceCollection services)
         {
             return Create(startupModuleType, services, null);
         }
 
-        public static AbpApplication Create(
+        internal static AbpApplication Create(
             [NotNull] Type startupModuleType,
             [NotNull] IServiceCollection services,
             [CanBeNull] Action<AbpApplicationCreationOptions> optionsAction)
diff --git a/test/Volo.Abp.Tests/Volo/Abp/AbpApplication_Initialize_Tests.cs b/test/Volo.Abp.Tests/Volo/Abp/AbpApplication_Initialize_Tests.cs
index cbf0e68bab..37eb1c4919 100644
--- a/test/Volo.Abp.Tests/Volo/Abp/AbpApplication_Initialize_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/AbpApplication_Initialize_Tests.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp
 
             var services = new ServiceCollection();
 
-            var application = AbpApplication.Create<IndependentEmptyModule>(services);
+            var application = services.AddApplication<IndependentEmptyModule>();
 
             using (var scope = services.BuildServiceProvider().CreateScope())
             {