From f5fa92287ca84ca91c6a2cd7eb021147f882821e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 26 Jul 2017 20:27:14 +0300
Subject: [PATCH] Temporary use BuildServiceProviderFromFactory in Startup.

---
 src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs        |  8 ++++++--
 src/Volo.Abp.Identity.HttpApi.Host/Startup.cs | 11 ++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
index 536aa14f96..ec1a55362c 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,7 +19,7 @@ namespace AbpDesk.Web.Mvc
             _env = env;
         }
 
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             services.AddApplication<AbpDeskWebMvcModule>(options =>
             {
@@ -34,6 +35,9 @@ namespace AbpDesk.Web.Mvc
                         @"../Web_PlugIns/")
                 );
             });
+
+            //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory!
+            return services.BuildServiceProviderFromFactory();
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IApplicationLifetime appLifetime)
diff --git a/src/Volo.Abp.Identity.HttpApi.Host/Startup.cs b/src/Volo.Abp.Identity.HttpApi.Host/Startup.cs
index bbde97e61a..d569060be0 100644
--- a/src/Volo.Abp.Identity.HttpApi.Host/Startup.cs
+++ b/src/Volo.Abp.Identity.HttpApi.Host/Startup.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Builder;
+using System;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -7,14 +8,14 @@ namespace Volo.Abp.Identity.HttpApi.Host
 {
     public class Startup
     {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             services.AddApplication<AbpIdentityHttpApiHostModule>();
+
+            //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory!
+            return services.BuildServiceProviderFromFactory();
         }
 
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             app.InitializeApplication();