Skip to content

Commit

Permalink
Migrated to the new web host builder and fixed a couple of issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
HeyJoel committed Jul 25, 2022
1 parent e536a00 commit ae8f20f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 49 deletions.
30 changes: 14 additions & 16 deletions src/Cofoundry.BasicTestSite/Program.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
namespace Cofoundry.BasicTestSite;
var builder = WebApplication.CreateBuilder(args);

public class Program
{
public static void Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
}
builder.WebHost.UseLocalConfigFile();
builder.Services
.AddControllersWithViews()
.AddCofoundry(builder.Configuration);

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(ConfigureWebHost);
var app = builder.Build();

public static void ConfigureWebHost(IWebHostBuilder webBuilder)
{
webBuilder
.UseStartup<Startup>()
.UseLocalConfigFile();
}
if (!app.Environment.IsDevelopment())
{
app.UseExceptionHandler("/Error");
}

app.UseHttpsRedirection();
app.UseCofoundry();

app.Run();
33 changes: 0 additions & 33 deletions src/Cofoundry.BasicTestSite/Startup.cs

This file was deleted.

5 changes: 5 additions & 0 deletions src/Cofoundry.Web/App_Start/AddCofoundryStartupExtension.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using Cofoundry.Core.DependencyInjection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;

namespace Cofoundry.Web;

Expand Down Expand Up @@ -51,6 +53,9 @@ private static void AddAdditionalTypes(IMvcBuilder mvcBuilder)
// Ensure IHttpContextAccessor is added, because it isn't by default
// see https://github.com/aspnet/Hosting/issues/793
mvcBuilder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();

// In the new hosting model, IHostEnvironment is no longer registered with the service container
mvcBuilder.Services.TryAddTransient<IHostEnvironment>(s => s.GetRequiredService<IWebHostEnvironment>());
}

private static void DiscoverAdditionalApplicationParts(IMvcBuilder mvcBuilder, AddCofoundryStartupConfiguration cofoundryConfig)
Expand Down

0 comments on commit ae8f20f

Please sign in to comment.