Use WebApplicationBuilder

NuGet.config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="aspnet-contrib" value="https://www.myget.org/F/aspnet-contrib/api/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.5.21302.13",
+    "version": "6.0.100-preview.6.21324.1",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

src/TodoApp/Program.cs

@@ -1,18 +1,73 @@
 // Copyright (c) Martin Costello, 2021. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System.IO;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using NodaTime;
+using TodoApp;
+using TodoApp.Data;
+using TodoApp.Services;
 
-namespace TodoApp
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddSingleton<IClock>((_) => SystemClock.Instance);
+builder.Services.AddScoped<ITodoRepository, TodoRepository>();
+builder.Services.AddScoped<ITodoService, TodoService>();
+
+builder.Services.AddRouting();
+
+builder.Services.AddGitHubAuthentication();
+
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<TodoContext>((serviceProvider, builder) =>
 {
-    public static class Program
-    {
-        public static void Main(string[] args)
-            => CreateHostBuilder(args).Build().Run();
+    var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+    var environment = serviceProvider.GetRequiredService<IHostEnvironment>();
+    var dataDirectory = configuration["DataDirectory"];
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults((p) => p.UseStartup<Startup>());
+    if (string.IsNullOrEmpty(dataDirectory) || !Path.IsPathRooted(dataDirectory))
+    {
+        dataDirectory = Path.Combine(environment.ContentRootPath, "App_Data");
     }
+
+    var databaseFile = Path.Combine(dataDirectory, "TodoApp.db");
+
+    builder.UseSqlite("Data Source=" + databaseFile);
+});
+
+builder.Services.AddHttpClient();
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
 }
+else
+{
+    app.UseStatusCodePages();
+}
+
+app.UseHsts();
+app.UseHttpsRedirection();
+
+app.UseStaticFiles();
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.UseEndpoints((endpoints) =>
+{
+    endpoints.MapApiRoutes();
+    endpoints.MapAuthenticationRoutes();
+    endpoints.MapRazorPages();
+});
+
+app.Run();

src/TodoApp/TodoApp.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.0-preview.5.21319.40" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.5.21301.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.6.21324.1" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.3.2" PrivateAssets="all" />
     <PackageReference Include="NodaTime" Version="3.0.5" />
   </ItemGroup>

tests/TodoApp.Tests/HttpServerFixture.cs

@@ -21,7 +21,7 @@
 
 namespace TodoApp
 {
-    public sealed class HttpServerFixture : WebApplicationFactory<Startup>, IAsyncLifetime, ITestOutputHelperAccessor
+    public sealed class HttpServerFixture : WebApplicationFactory<Services.ITodoService>, IAsyncLifetime, ITestOutputHelperAccessor
     {
         private IHost? _host;
         private bool _disposed;
@@ -40,7 +40,7 @@ public HttpServerFixture()
 
         public string ServerAddress => ClientOptions.BaseAddress.ToString();
 
-        public override IServiceProvider? Services => _host?.Services;
+        public override IServiceProvider Services => _host?.Services!;
 
         public void ClearOutputHelper()
             => OutputHelper = null;
@@ -162,7 +162,7 @@ private async Task EnsureHttpServerAsync()
 
         private async Task CreateHttpServer()
         {
-            var builder = CreateHostBuilder().ConfigureWebHost(ConfigureWebHost);
+            var builder = CreateHostBuilder()!.ConfigureWebHost(ConfigureWebHost);
 
             _host = builder.Build();
 

tests/TodoApp.Tests/TodoApp.Tests.csproj

@@ -8,7 +8,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JustEat.HttpClientInterception" Version="3.1.0" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-preview.5.21301.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-preview.6.21323.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Microsoft.Playwright" Version="1.12.2" />
     <PackageReference Include="Shouldly" Version="4.0.3" />