From 348b982f65b272afcd08879ac342dd079e0e7529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 5 Dec 2016 23:17:10 +0300 Subject: [PATCH] Remove IAbpApplication for now. --- .../Abp/AspNetCore/AbpApplicationBuilderExtensions.cs | 2 +- src/Volo.Abp/Abp/AbpApplication.cs | 4 ++-- src/Volo.Abp/Abp/IAbpApplication.cs | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 src/Volo.Abp/Abp/IAbpApplication.cs diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs index ec4abe08e3..d256406f69 100644 --- a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs +++ b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Builder { public static void InitializeAbpApplication(this IApplicationBuilder app) //TODO: Simply rename to InitializeApplication? { - var abpApplication = app.ApplicationServices.GetRequiredService(); + var abpApplication = app.ApplicationServices.GetRequiredService(); app.ApplicationServices.GetRequiredService().App = app; diff --git a/src/Volo.Abp/Abp/AbpApplication.cs b/src/Volo.Abp/Abp/AbpApplication.cs index 3174426c1c..edf67e8dfb 100644 --- a/src/Volo.Abp/Abp/AbpApplication.cs +++ b/src/Volo.Abp/Abp/AbpApplication.cs @@ -4,7 +4,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp { - public class AbpApplication : IAbpApplication + public class AbpApplication : IDisposable { public Type StartupModuleType { get; } @@ -14,7 +14,7 @@ namespace Volo.Abp { StartupModuleType = startupModuleType; - services.AddSingleton(this); + services.AddSingleton(this); services.AddCoreAbpServices(); services.GetSingletonInstance().LoadAll(services, StartupModuleType); diff --git a/src/Volo.Abp/Abp/IAbpApplication.cs b/src/Volo.Abp/Abp/IAbpApplication.cs deleted file mode 100644 index e68154d127..0000000000 --- a/src/Volo.Abp/Abp/IAbpApplication.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Volo.Abp -{ - public interface IAbpApplication : IDisposable - { - Type StartupModuleType { get; } - - void Initialize(IServiceProvider serviceProvider); - } -} \ No newline at end of file