Updates

Author: DamianEdwards

src/BenchmarksApps/TodosApi/DataExtensions.cs

@@ -1,5 +1,7 @@
 using System.Data;
 using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Options;
+using TodosApi;
 
 namespace Npgsql;
 

src/BenchmarksApps/TodosApi/DatabaseConfiguration.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Options;
+using Npgsql;
+using TodosApi;
+
+namespace Microsoft.Extensions.Hosting;
+
+internal static class DatabaseConfiguration
+{
+    public static IServiceCollection AddDatabase(this IServiceCollection services)
+    {
+        services.AddSingleton(static sp =>
+        {
+            var appSettings = sp.GetRequiredService<IOptions<AppSettings>>().Value;
+            var db = appSettings.GeneratingOpenApiDoc
+                ? default!
+                : new NpgsqlSlimDataSourceBuilder(appSettings.ConnectionString).Build();
+
+            return db;
+        });
+        services.AddHostedService<DatabaseInitializer>();
+        return services;
+    }
+}

src/BenchmarksApps/TodosApi/DatabaseInitializer.cs

@@ -11,14 +11,11 @@ internal class DatabaseInitializer : IHostedService
     private readonly ILogger<DatabaseInitializer> _logger;
     private readonly bool _initDatabase;
 
-    public DatabaseInitializer(NpgsqlDataSource db, IOptions<AppSettings> appSettings, IServer server, ILogger<DatabaseInitializer> logger)
+    public DatabaseInitializer(NpgsqlDataSource db, IOptions<AppSettings> appSettings, ILogger<DatabaseInitializer> logger)
     {
         _db = db;
         _logger = logger;
-        _initDatabase = !appSettings.Value.SuppressDbInitialization
-            // Only run if this is an actual IServer implementation with addresses to listen on.
-            // Will not be the case for TestServer, NoopServer injected by the OpenAPI doc generator tool, etc.
-            && server.Features.Get<IServerAddressesFeature>() is { Addresses.Count: >0 };
+        _initDatabase = !appSettings.Value.SuppressDbInitialization && !appSettings.Value.GeneratingOpenApiDoc;
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
@@ -32,14 +29,12 @@ public Task StartAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("Database initialization disabled for connection string '{connectionString}'", _db?.ConnectionString);
         }
-        return Task.CompletedTask;
-    }
 
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
         return Task.CompletedTask;
     }
 
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
     private async Task Initialize(CancellationToken cancellationToken = default)
     {
         // NOTE: Npgsql removes the password from the connection string

src/BenchmarksApps/TodosApi/OpenApiExtensions.cs

@@ -0,0 +1,20 @@
+#if ENABLE_OPENAPI
+using Microsoft.OpenApi.Models;
+#endif
+
+namespace Microsoft.Extensions.Hosting;
+
+internal static class OpenApiExtensions
+{
+    public static IServiceCollection AddOpenApi(this IServiceCollection services)
+    {
+#if ENABLE_OPENAPI
+        services.AddEndpointsApiExplorer();
+        services.AddSwaggerGen(c =>
+        {
+            c.SwaggerDoc("v1", new OpenApiInfo { Title = "Todos API", Version = "v1" });
+        });
+#endif
+        return services;
+    }
+}

src/BenchmarksApps/TodosApi/Program.cs

@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Options;
-#if ENABLE_OPENAPI
-using Microsoft.OpenApi.Models;
-#endif
-using Npgsql;
 using TodosApi;
 
 var builder = WebApplication.CreateSlimBuilder(args);
@@ -20,14 +15,7 @@
 builder.Services.AddAuthorization();
 
 // Configure data access
-builder.Services.AddSingleton(sp =>
-{
-    var appSettings = sp.GetRequiredService<IOptions<AppSettings>>().Value;
-    return appSettings.GeneratingOpenApiDoc
-        ? default!
-        : new NpgsqlSlimDataSourceBuilder(appSettings.ConnectionString).Build();
-});
-builder.Services.AddHostedService<DatabaseInitializer>();
+builder.Services.AddDatabase();
 
 // Configure JSON serialization
 builder.Services.ConfigureHttpJsonOptions(options =>
@@ -43,14 +31,8 @@
 // Problem details
 builder.Services.AddProblemDetails();
 
-#if ENABLE_OPENAPI
-// Configure OpenAPI
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(c =>
-{
-    c.SwaggerDoc("v1", new OpenApiInfo { Title = "Todos API", Version = "v1" });
-});
-#endif
+// OpenAPI
+builder.Services.AddOpenApi();
 
 var app = builder.Build();
 
@@ -59,8 +41,7 @@
     app.UseExceptionHandler();
 }
 
-// Causes issue with native AOT currently: https://github.com/dotnet/aspnetcore/issues/47941
-//app.MapShortCircuit(StatusCodes.Status404NotFound, "/favicon.ico");
+app.MapShortCircuit(StatusCodes.Status404NotFound, "/favicon.ico");
 
 app.MapHealthChecks("/health");
 

src/BenchmarksApps/TodosApi/TodosApi.csproj

@@ -22,6 +22,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-preview.*" />
     <PackageReference Include="Npgsql" Version="8.0.0-preview.3" />
     <Content Update="appSettings.Development.json" CopyToPublishDirectory="false" />
+    <!-- Workaround for https://github.com/dotnet/aspnetcore/issues/47941 -->
+    <IlcArg Include="--nopreinitstatics" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(EnableOpenApi)' == 'true' ">

src/BenchmarksApps/TodosApi/TodosApi.http

@@ -1,6 +1,6 @@
 @TodosApi_HostAddress = http://localhost:5054
 # Uncomment following line if sending requests to published app
-#@TodosApi_HostAddress = http://localhost:5000
+@TodosApi_HostAddress = http://localhost:5000
 
 # For more info on HTTP files go to https://aka.ms/vs/httpfile