diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj index 842a7700e4..fca101d6b6 100644 --- a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj +++ b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj @@ -3,5 +3,12 @@ net5.0 + + + + + + + diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs new file mode 100644 index 0000000000..a15202495e --- /dev/null +++ b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs @@ -0,0 +1,51 @@ +using AbpBlazorServerDemo.Data; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Autofac; +using Volo.Abp.Modularity; + +namespace AbpBlazorServerDemo +{ + [DependsOn( + typeof(AbpAutofacModule), + typeof(AbpAspNetCoreMvcModule) + )] + public class AbpBlazorServerDemoModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddServerSideBlazor(); + context.Services.AddSingleton(); + } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var env = context.GetEnvironment(); + var app = context.GetApplicationBuilder(); + + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + app.UseExceptionHandler("/Error"); + app.UseHsts(); + } + + app.UseHttpsRedirection(); + app.UseStaticFiles(); + + app.UseRouting(); + + app.UseConfiguredEndpoints(endpoints => + { + endpoints.MapBlazorHub(); + endpoints.MapFallbackToPage("/_Host"); + }); + } + } +} \ No newline at end of file diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/Program.cs b/test/BlazorServerSide/AbpBlazorServerDemo/Program.cs index 0138a10736..885591e4dd 100644 --- a/test/BlazorServerSide/AbpBlazorServerDemo/Program.cs +++ b/test/BlazorServerSide/AbpBlazorServerDemo/Program.cs @@ -1,11 +1,5 @@ using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace AbpBlazorServerDemo { @@ -21,6 +15,7 @@ namespace AbpBlazorServerDemo .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); - }); + }) + .UseAutofac(); } } diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/Startup.cs b/test/BlazorServerSide/AbpBlazorServerDemo/Startup.cs index 140a596ca3..24f2042fcc 100644 --- a/test/BlazorServerSide/AbpBlazorServerDemo/Startup.cs +++ b/test/BlazorServerSide/AbpBlazorServerDemo/Startup.cs @@ -1,60 +1,19 @@ -using AbpBlazorServerDemo.Data; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpsPolicy; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace AbpBlazorServerDemo { public class Startup { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { - services.AddRazorPages(); - services.AddServerSideBlazor(); - services.AddSingleton(); + services.AddApplication(); } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - - app.UseHttpsRedirection(); - app.UseStaticFiles(); - - app.UseRouting(); - - app.UseEndpoints(endpoints => - { - endpoints.MapBlazorHub(); - endpoints.MapFallbackToPage("/_Host"); - }); + app.InitializeApplication(); } } }