diff --git a/Template/Domain/Domain.csproj b/Template/Domain/Domain.csproj index 4cbd396..5fa3e2e 100644 --- a/Template/Domain/Domain.csproj +++ b/Template/Domain/Domain.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1 @@ -10,19 +10,19 @@ - + - + - - - + + + - + diff --git a/Template/M#/Model/#Model.csproj b/Template/M#/Model/#Model.csproj index ea73f5b..be0841e 100644 --- a/Template/M#/Model/#Model.csproj +++ b/Template/M#/Model/#Model.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Template/M#/UI/#UI.csproj b/Template/M#/UI/#UI.csproj index 41796f2..e9c542e 100644 --- a/Template/M#/UI/#UI.csproj +++ b/Template/M#/UI/#UI.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/Template/Website/Website.csproj b/Template/Website/Website.csproj index 16f8cc9..5867ae6 100644 --- a/Template/Website/Website.csproj +++ b/Template/Website/Website.csproj @@ -26,33 +26,33 @@ <_ContentIncludedByDefault Remove="wwwroot\styles\FrontEnd-Modal.css" /> - - - - - + + + + + - + - - - - + + + + - + - - - + + + @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/Template/Website/app_Start/Startup.cs b/Template/Website/app_Start/Startup.cs index 7a69565..bd28ccf 100644 --- a/Template/Website/app_Start/Startup.cs +++ b/Template/Website/app_Start/Startup.cs @@ -5,6 +5,7 @@ using Domain; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; + using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Olive; using Olive.Entities.Data; @@ -13,6 +14,8 @@ public class Startup : Olive.Mvc.Startup { + public Startup(IHostingEnvironment env, IConfiguration config) : base(env, config) { } + protected override CultureInfo GetRequestCulture() => new CultureInfo("en-GB"); public override void ConfigureServices(IServiceCollection services) @@ -24,19 +27,19 @@ public override void ConfigureServices(IServiceCollection services) services.AddScheduledTasks(); } - public override void Configure(IApplicationBuilder app, IHostingEnvironment env) + public override void Configure(IApplicationBuilder app) { - if (env.IsDevelopment()) app.UseWebTest(config => config.AddTasks()); + if (Environment.IsDevelopment()) app.UseWebTest(config => config.AddTasks()); - base.Configure(app, env); + base.Configure(app); if (Config.Get("Automated.Tasks:Enabled")) app.UseScheduledTasks(TaskManager.Run); } - public override async Task OnStartUpAsync(IApplicationBuilder app, IHostingEnvironment env) + public override async Task OnStartUpAsync(IApplicationBuilder app) { - if (env.IsDevelopment()) + if (Environment.IsDevelopment()) await app.InitializeTempDatabase(() => ReferenceData.Create()); // Add any other initialization logic that needs the database to be ready here.