diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj index 7ec3846531..a468d4cfd6 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj @@ -19,6 +19,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs index ae238f3694..d1881b0cbd 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.TestBase { @@ -20,31 +22,36 @@ namespace Volo.Abp.AspNetCore.TestBase protected AbpAspNetCoreIntegratedTestBase() { - var builder = CreateWebHostBuilder(); - Server = CreateTestServer(builder); - Client = Server.CreateClient(); - ServiceProvider = Server.Host.Services; + var builder = CreateHostBuilder(); + + var host = builder.Build(); + host.Start(); + + Server = host.GetTestServer(); + Client = host.GetTestClient(); + + ServiceProvider = Server.Services; ServiceProvider.GetRequiredService().Server = Server; } - protected virtual IWebHostBuilder CreateWebHostBuilder() + protected virtual IHostBuilder CreateHostBuilder() { - return new WebHostBuilder() - .UseStartup() + return Host.CreateDefaultBuilder() + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + webBuilder.UseTestServer(); + }) + .UseAutofac() .ConfigureServices(ConfigureServices); } - protected virtual void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services) { } - protected virtual TestServer CreateTestServer(IWebHostBuilder builder) - { - return new TestServer(builder); - } - #region GetUrl /// diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs index c107444ba1..8b63f85853 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Shouldly; using Volo.Abp.MultiTenancy; @@ -23,9 +24,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy _options = ServiceProvider.GetRequiredService>().Value; } - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder().ConfigureServices(services => + return base.CreateHostBuilder().ConfigureServices(services => { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs index 98a7e92ef1..70f730d4b3 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using Shouldly; @@ -24,9 +25,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy _options = ServiceProvider.GetRequiredService>().Value; } - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder().ConfigureServices(services => + return base.CreateHostBuilder().ConfigureServices(services => { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs index cde2871e1b..e3bfa36ae6 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs @@ -1,12 +1,13 @@ using System.IO; using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.Mvc { public abstract class AspNetCoreMvcTestBase : AbpAspNetCoreTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { var contentRootPath = CalculateContentRootPath( "Volo.Abp.AspNetCore.Mvc.Tests.csproj", @@ -16,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc ) ); - return base.CreateWebHostBuilder() + return base.CreateHostBuilder() .UseContentRoot(contentRootPath); } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs index 508ac04ce2..3e365cde3e 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Shouldly; using Volo.Abp.Json; using Xunit; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json { public class JsonResultController_Tests : AspNetCoreMvcTestBase { - protected override void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs index f621a8733a..d911850919 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs @@ -1,6 +1,7 @@ using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Shouldly; using Volo.Abp.Json; using Xunit; @@ -16,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json _jsonSerializer = ServiceProvider.GetRequiredService(); } - protected override void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs index 9ae46be82f..b7079c7686 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs index 9ced6317ec..15473df986 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs @@ -2,14 +2,15 @@ using System.IO; using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public abstract class AbpAspNetCoreMvcUiBootstrapDemoTestBase : AbpAspNetCoreTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder() + return base.CreateHostBuilder() .UseContentRoot(CalculateContentRootPath()); } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs index 3a140e35d4..3e39ba0f36 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public class TestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs index 0941475418..fd9b64308f 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs @@ -21,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Build().Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -35,20 +35,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo } } - //internal static IWebHost BuildWebHostInternal(string[] args) => - // new WebHostBuilder() - // .UseKestrel() - // .UseContentRoot(Directory.GetCurrentDirectory()) - // .UseIISIntegration() - // .UseStartup() - // .UseSerilog() - // .Build(); - internal static IHostBuilder BuildWebHostInternal(string[] args) => + internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs index 0497fe5216..086c20c365 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs @@ -9,12 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index 455708a1d2..f798e90627 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -9,7 +9,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs index 124a103da2..8cc84075a4 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs @@ -8,15 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs index 79985de769..5092f91a81 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs @@ -8,15 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs index 7f95713274..de4f55dc47 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs index 4704128d9d..c9ac8ba611 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs @@ -6,15 +6,9 @@ namespace Volo.Abp.Http { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/modules/blogging/app/Volo.BloggingTestApp/Program.cs b/modules/blogging/app/Volo.BloggingTestApp/Program.cs index b184a68b4e..739850817f 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Program.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Volo.BloggingTestApp try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Volo.BloggingTestApp } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/Startup.cs b/modules/blogging/app/Volo.BloggingTestApp/Startup.cs index e4ccc31b60..fc53298f38 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Startup.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/Startup.cs @@ -9,19 +9,13 @@ namespace Volo.BloggingTestApp { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { - app.InitializeApplication(); } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index a0712e66f1..82bc4ff372 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs index 86dc8569c7..6478e0cced 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Volo.ClientSimulation.Demo try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Volo.ClientSimulation.Demo } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs index 5b1f1debce..eb82e10e43 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs @@ -7,14 +7,9 @@ namespace Volo.ClientSimulation.Demo { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj index 6cfdef4205..9b681aeaa3 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs index c4fd5ecb66..8ae314ab05 100644 --- a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs +++ b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -9,10 +10,8 @@ namespace VoloDocs.Web.Branding [Dependency(ReplaceServices = true)] public class VoloDocsBrandingProvider : DefaultBrandingProvider { - public VoloDocsBrandingProvider(IConfigurationAccessor configurationAccessor, IStringLocalizer localizer) + public VoloDocsBrandingProvider(IConfiguration configuration, IStringLocalizer localizer) { - var configuration = configurationAccessor.Configuration; - AppName = localizer["DocsTitle"]; if (configuration["LogoUrl"] != null) diff --git a/modules/docs/app/VoloDocs.Web/Program.cs b/modules/docs/app/VoloDocs.Web/Program.cs index 26959f112f..b40fa6b4f7 100644 --- a/modules/docs/app/VoloDocs.Web/Program.cs +++ b/modules/docs/app/VoloDocs.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace VoloDocs.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace VoloDocs.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/docs/app/VoloDocs.Web/Startup.cs b/modules/docs/app/VoloDocs.Web/Startup.cs index a05cf9e2c0..22d7b980c5 100644 --- a/modules/docs/app/VoloDocs.Web/Startup.cs +++ b/modules/docs/app/VoloDocs.Web/Startup.cs @@ -9,17 +9,12 @@ namespace VoloDocs.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index f7b0567f4c..a041d78e1a 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -14,7 +14,7 @@ - + diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj index 95fd323708..c6017e498b 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs index fe3e5c1bf9..6bde2c5812 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace BasicAspNetCoreApplication { @@ -7,12 +8,15 @@ namespace BasicAspNetCoreApplication { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac(); } } diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs index fcf3161267..0b5dff5449 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs @@ -7,14 +7,9 @@ namespace BasicAspNetCoreApplication { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 3458a965ac..e3b4ce770e 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj index 60caedd837..d4edadc61a 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs index 5d04ef8371..5cc5d48721 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore try { Log.Information("Starting Acme.BookStore.HttpApi.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs index e93e05fa0d..af5a330272 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs @@ -9,14 +9,9 @@ namespace Acme.BookStore { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj index 67f470cb4f..190f9a7d1a 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj index 2b6b7d6767..5e21476d33 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj index 8617e64521..29f8d542a2 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj @@ -26,7 +26,7 @@ - + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index d3f6b670fd..d3b63d7393 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 3458a965ac..e3b4ce770e 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj index 44135e6782..9d501a9855 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj index d1bfba752f..d31eddc92d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 6ecfde3589..e6eaf01e82 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ - + @@ -45,13 +45,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs index f7845a5726..f528641ac4 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs index 13db155180..06130a1d25 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj index c53dd5953f..3413d5e52c 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj index 15383e87c0..9796562462 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj index 1da47d7609..d018c3fee9 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs index 2e93483e70..446c1ef2dc 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace Acme.BookStore { public abstract class BookStoreWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs index 6e5452bde2..5e8c314a95 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore { public class BookStoreWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj index 77d59c25ce..4b457b1b03 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,18 +10,18 @@ - + - - - - - - + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs index 1c70f94c38..7997f56d32 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj index f4fe52af5d..e216e9c938 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -8,33 +8,33 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 9ea7ae1435..73bd75a826 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -21,7 +22,7 @@ namespace Acme.BookStore.BookManagement.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace Acme.BookStore.BookManagement.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace Acme.BookStore.BookManagement.IdentityServer "BookManagement" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookManagement_Web:ClientId"]; diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs index 1f1e1a5beb..8a81aa4d3c 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj index 3966fbf009..105dfc89db 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,22 +10,22 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs index 9f7b1944ce..3af47039d6 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj index 133f92e897..2045d72aeb 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj @@ -1,4 +1,4 @@ - + @@ -10,25 +10,25 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs index b59c3d6fd8..58f024875b 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs index 699e10861a..bfc65cdb03 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj index 1202c0c631..4c1d84fa66 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj index f729fcd185..45097c877b 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj index c189f99eb0..377f6df9b3 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj index ff1dedce3f..05176a1c2a 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj index 79fbb46c07..5d0a8647fe 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj index 01419cdf03..85fca348ed 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj index 52c4dfd35d..bd8500a89d 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj index db8af62817..0a1123f59c 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj index da42d3d6e6..bbd69db06d 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj @@ -1,4 +1,4 @@ - + @@ -11,8 +11,8 @@ - - + + diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj index e656bb7639..a8d6b266fb 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,7 +7,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index 4cda56da1e..c931f18716 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using IdentityModel.Client; using Acme.BookStore.BookManagement.Books; using Acme.BookStore.BookManagement.Samples; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -15,18 +16,18 @@ namespace Acme.BookStore.BookManagement { private readonly ISampleAppService _sampleAppService; private readonly IIdentityModelAuthenticationService _authenticationService; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; private readonly IBookAppService _bookAppService; public ClientDemoService( ISampleAppService sampleAppService, IIdentityModelAuthenticationService authenticationService, - IConfigurationAccessor configurationAccessor, + IConfiguration configuration, IBookAppService bookAppService) { _sampleAppService = sampleAppService; _authenticationService = authenticationService; - _configurationAccessor = configurationAccessor; + _configuration = configuration; _bookAppService = bookAppService; } @@ -71,13 +72,13 @@ namespace Acme.BookStore.BookManagement var accessToken = await _authenticationService.GetAccessTokenAsync( new IdentityClientConfiguration( - _configurationAccessor.Configuration["IdentityClients:Default:Authority"], - _configurationAccessor.Configuration["IdentityClients:Default:Scope"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - _configurationAccessor.Configuration["IdentityClients:Default:GrantType"], - _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"] + _configuration["IdentityClients:Default:Authority"], + _configuration["IdentityClients:Default:Scope"], + _configuration["IdentityClients:Default:ClientId"], + _configuration["IdentityClients:Default:ClientSecret"], + _configuration["IdentityClients:Default:GrantType"], + _configuration["IdentityClients:Default:UserName"], + _configuration["IdentityClients:Default:UserPassword"] ) ); @@ -87,7 +88,7 @@ namespace Acme.BookStore.BookManagement { httpClient.SetBearerToken(accessToken); - var url = _configurationAccessor.Configuration["RemoteServices:BookManagement:BaseUrl"] + + var url = _configuration["RemoteServices:BookManagement:BaseUrl"] + "api/BookManagement/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); @@ -116,7 +117,7 @@ namespace Acme.BookStore.BookManagement // discover endpoints from metadata var client = new HttpClient(); - var disco = await client.GetDiscoveryDocumentAsync(_configurationAccessor.Configuration["IdentityClients:Default:Authority"]); + var disco = await client.GetDiscoveryDocumentAsync(_configuration["IdentityClients:Default:Authority"]); if (disco.IsError) { Console.WriteLine(disco.Error); @@ -127,11 +128,11 @@ namespace Acme.BookStore.BookManagement var tokenResponse = await client.RequestPasswordTokenAsync(new PasswordTokenRequest { Address = disco.TokenEndpoint, - ClientId = _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - ClientSecret = _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - UserName = _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - Password = _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"], - Scope = _configurationAccessor.Configuration["IdentityClients:Default:Scope"] + ClientId = _configuration["IdentityClients:Default:ClientId"], + ClientSecret = _configuration["IdentityClients:Default:ClientSecret"], + UserName = _configuration["IdentityClients:Default:UserName"], + Password = _configuration["IdentityClients:Default:UserPassword"], + Scope = _configuration["IdentityClients:Default:Scope"] }); if (tokenResponse.IsError) @@ -148,7 +149,7 @@ namespace Acme.BookStore.BookManagement { httpClient.SetBearerToken(tokenResponse.AccessToken); - var url = _configurationAccessor.Configuration["RemoteServices:BookManagement:BaseUrl"] + + var url = _configuration["RemoteServices:BookManagement:BaseUrl"] + "api/BookManagement/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); diff --git a/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj b/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj index 6330e87867..ba56e3b6b0 100644 --- a/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj +++ b/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj index 7ed9e72b19..3811eb7cfb 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj +++ b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj @@ -13,10 +13,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj b/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj index 7a2aa7a7f3..9a341e86bd 100644 --- a/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj +++ b/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj @@ -29,7 +29,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj b/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj index 5ffec7bf7d..d9a183a46f 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj +++ b/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj @@ -8,14 +8,14 @@ - - - - - - - - + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index 0ab6ca3f72..3e09243254 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 45c2420501..77a77ba398 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -21,7 +22,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj index 5066a6854f..5e7a422b35 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj b/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj index 4a72b8b8bb..3e837e1aeb 100644 --- a/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj +++ b/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj b/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj index ce416b23f7..27e8664735 100644 --- a/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj +++ b/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 5dab7d1cfe..74b19458ed 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -23,7 +23,7 @@ - + @@ -36,13 +36,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Web/Program.cs b/samples/BookStore/src/Acme.BookStore.Web/Program.cs index 6eadd00f78..0d888f989c 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Program.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore/src/Acme.BookStore.Web/Startup.cs b/samples/BookStore/src/Acme.BookStore.Web/Startup.cs index 7cafe1a4c0..9dd0bdcaec 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Startup.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/Startup.cs @@ -9,14 +9,9 @@ namespace Acme.BookStore.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj index b1196024d8..4a329ed935 100644 --- a/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj b/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj index ef1fdc1d69..39857b562b 100644 --- a/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj +++ b/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj index 7be27ff1a0..6f47d7fa6a 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs index 2e93483e70..446c1ef2dc 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace Acme.BookStore { public abstract class BookStoreWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs index 6e5452bde2..5e8c314a95 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore { public class BookStoreWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index c434777402..2cadd545db 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace DashboardDemo.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace DashboardDemo.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace DashboardDemo.IdentityServer "DashboardDemo" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["DashboardDemo_Web:ClientId"]; diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj index 56a3fa2209..36610ffdb3 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj @@ -31,7 +31,7 @@ - + diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs index 354ec3f60a..6d71693b20 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs @@ -1,6 +1,8 @@ using System; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +26,7 @@ namespace DashboardDemo.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +40,13 @@ namespace DashboardDemo.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs index 62c4705931..04b9dbd4bc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs @@ -8,14 +8,9 @@ namespace DashboardDemo.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs index b81ae13794..2602485b00 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace DashboardDemo { public abstract class DashboardDemoWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs index 1ab2b1d5d9..562a9a206f 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs @@ -8,14 +8,9 @@ namespace DashboardDemo { public class DashboardDemoWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj index 0c6538bf57..40451442a0 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs index 34e6b74443..ab4c2ba330 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs @@ -1,7 +1,9 @@ using System; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +39,7 @@ namespace AuthServer.Host try { Log.Information("Starting AuthServer.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +53,13 @@ namespace AuthServer.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs index f9d963021c..0af0b32973 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs @@ -9,17 +9,12 @@ namespace AuthServer.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj index 96ff8bb1dc..a82b7724de 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs index 2b1cfb9230..4b001972e4 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BackendAdminApp.Host try { Log.Information("Starting BackendAdminApp.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BackendAdminApp.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs index 15edcb704c..d394c50028 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs @@ -9,17 +9,12 @@ namespace BackendAdminApp.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs index fab8c9f2b3..75435b7a9f 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace PublicWebSite.Host try { Log.Information("Starting PublicWebSite.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace PublicWebSite.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj index 1475311f4b..b6871999f1 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs index 4195a62daa..6b4fd36063 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs @@ -9,17 +9,12 @@ namespace PublicWebSite.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj index cc8cd37351..e35318bdee 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs index 95ddd89b2c..4eeaab28f3 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BackendAdminAppGateway.Host try { Log.Information("Starting BackendAdminAppGateway.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BackendAdminAppGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs index 4b41be9ad3..602ddc20be 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace BackendAdminAppGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj index ae9b1d5dd1..38e86ded7c 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs index 8cd13725ad..88432ac54d 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace InternalGateway.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace InternalGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs index aed7ebbf4f..fb00700915 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace InternalGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs index 23d419b91d..f41a11e156 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace PublicWebSiteGateway.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace PublicWebSiteGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj index f9bc566169..5b55baf619 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs index ab6a066e3e..df156b9755 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace PublicWebSiteGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj index 51f991da3f..c59551a3a6 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs index 61bcf82104..4a2f3d30c2 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BloggingService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BloggingService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs index c0510c52de..e3ad346cb7 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace BloggingService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj index 684f1bd4f1..04fbe9f82a 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs index 44fb949f87..6b64284bc8 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace IdentityService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace IdentityService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs index f472affe55..f3a24f8a26 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace IdentityService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj index 80d2a33bd6..8173d49fdb 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs index 3b9cfb6630..4f8998937e 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace ProductService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace ProductService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs index 7734e291e6..9124b5e413 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace ProductService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index b8ee88b061..e64ae510c5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer "MyProjectName" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["MyProjectName_Web:ClientId"]; diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs index 9b194b2203..ec29900d07 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace MyCompanyName.MyProjectName { public abstract class MyProjectNameWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs index 846ccc5031..eefa272f9e 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs @@ -8,14 +8,9 @@ namespace MyCompanyName.MyProjectName { public class MyProjectNameWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs index dc9807e4a0..51efdce5bc 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs @@ -13,7 +13,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 0c6a66bcb3..45c3c50340 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Extensions.Configuration; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Authorization.Permissions; @@ -21,7 +22,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer "MyProjectName" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["MyProjectName_Web:ClientId"]; diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs index 5efb1ca00d..df50584cb5 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs @@ -13,7 +13,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs index e052534eb7..e48fe56fbc 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs @@ -12,7 +12,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index cb4dbd347d..ac7f4fc7df 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using IdentityModel.Client; +using Microsoft.Extensions.Configuration; using MyCompanyName.MyProjectName.Samples; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -13,16 +14,16 @@ namespace MyCompanyName.MyProjectName { private readonly ISampleAppService _sampleAppService; private readonly IIdentityModelAuthenticationService _authenticationService; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public ClientDemoService( ISampleAppService sampleAppService, IIdentityModelAuthenticationService authenticationService, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _sampleAppService = sampleAppService; _authenticationService = authenticationService; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } public async Task RunAsync() @@ -60,13 +61,13 @@ namespace MyCompanyName.MyProjectName var accessToken = await _authenticationService.GetAccessTokenAsync( new IdentityClientConfiguration( - _configurationAccessor.Configuration["IdentityClients:Default:Authority"], - _configurationAccessor.Configuration["IdentityClients:Default:Scope"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - _configurationAccessor.Configuration["IdentityClients:Default:GrantType"], - _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"] + _configuration["IdentityClients:Default:Authority"], + _configuration["IdentityClients:Default:Scope"], + _configuration["IdentityClients:Default:ClientId"], + _configuration["IdentityClients:Default:ClientSecret"], + _configuration["IdentityClients:Default:GrantType"], + _configuration["IdentityClients:Default:UserName"], + _configuration["IdentityClients:Default:UserPassword"] ) ); @@ -76,7 +77,7 @@ namespace MyCompanyName.MyProjectName { httpClient.SetBearerToken(accessToken); - var url = _configurationAccessor.Configuration["RemoteServices:MyProjectName:BaseUrl"] + + var url = _configuration["RemoteServices:MyProjectName:BaseUrl"] + "api/MyProjectName/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); @@ -105,7 +106,7 @@ namespace MyCompanyName.MyProjectName // discover endpoints from metadata var client = new HttpClient(); - var disco = await client.GetDiscoveryDocumentAsync(_configurationAccessor.Configuration["IdentityClients:Default:Authority"]); + var disco = await client.GetDiscoveryDocumentAsync(_configuration["IdentityClients:Default:Authority"]); if (disco.IsError) { Console.WriteLine(disco.Error); @@ -116,11 +117,11 @@ namespace MyCompanyName.MyProjectName var tokenResponse = await client.RequestPasswordTokenAsync(new PasswordTokenRequest { Address = disco.TokenEndpoint, - ClientId = _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - ClientSecret = _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - UserName = _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - Password = _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"], - Scope = _configurationAccessor.Configuration["IdentityClients:Default:Scope"] + ClientId = _configuration["IdentityClients:Default:ClientId"], + ClientSecret = _configuration["IdentityClients:Default:ClientSecret"], + UserName = _configuration["IdentityClients:Default:UserName"], + Password = _configuration["IdentityClients:Default:UserPassword"], + Scope = _configuration["IdentityClients:Default:Scope"] }); if (tokenResponse.IsError) @@ -137,7 +138,7 @@ namespace MyCompanyName.MyProjectName { httpClient.SetBearerToken(tokenResponse.AccessToken); - var url = _configurationAccessor.Configuration["RemoteServices:MyProjectName:BaseUrl"] + + var url = _configuration["RemoteServices:MyProjectName:BaseUrl"] + "api/MyProjectName/sample/authorized"; var responseMessage = await httpClient.GetAsync(url);