From d16d4c41c2b36e91707608cc3f973bf9beb56a79 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 15 Dec 2025 17:01:44 -0800
Subject: [PATCH 1/5] Update dependencies and clean up leftover warnings when
 building Benchmarks.csproj.

---
 build/dependencies.props         |  17 ++--
 src/Benchmarks/Benchmarks.csproj |  11 ++-
 src/Benchmarks/Data/World.cs     |   2 +
 src/Benchmarks/Program.cs        | 162 ++++++++++++++++---------------
 4 files changed, 104 insertions(+), 88 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index b79b7bbce..67833878f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,32 +3,32 @@
     <NpgsqlVersion60>6.0.13</NpgsqlVersion60>
     <NpgsqlVersion70>7.0.10</NpgsqlVersion70>
     <NpgsqlVersion80>8.0.7</NpgsqlVersion80>
-    <NpgsqlVersion90>9.0.3</NpgsqlVersion90>
+    <NpgsqlVersion90>9.0.4</NpgsqlVersion90>
+    <NpgsqlVersion100>10.0.0</NpgsqlVersion100>
 
     <MicrosoftDataSqlClientVersion60>5.2.2</MicrosoftDataSqlClientVersion60>
     <MicrosoftDataSqlClientVersion70>5.2.2</MicrosoftDataSqlClientVersion70>
     <MicrosoftDataSqlClientVersion80>5.2.2</MicrosoftDataSqlClientVersion80>
     <MicrosoftDataSqlClientVersion90>5.2.2</MicrosoftDataSqlClientVersion90>
+    <MicrosoftDataSqlClientVersion100>5.2.2</MicrosoftDataSqlClientVersion100>
 
     <NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.29</NpgsqlEntityFrameworkCorePostgreSQLVersion60>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion70>7.0.18</NpgsqlEntityFrameworkCorePostgreSQLVersion70>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion80>8.0.11</NpgsqlEntityFrameworkCorePostgreSQLVersion80>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion90>9.0.4</NpgsqlEntityFrameworkCorePostgreSQLVersion90>
-
-    <PomeloEntityFrameworkCoreMySqlVersion60>6.0.3</PomeloEntityFrameworkCoreMySqlVersion60>
-    <PomeloEntityFrameworkCoreMySqlVersion70>7.0.0</PomeloEntityFrameworkCoreMySqlVersion70>
-    <PomeloEntityFrameworkCoreMySqlVersion80>8.0.2</PomeloEntityFrameworkCoreMySqlVersion80>
-    <PomeloEntityFrameworkCoreMySqlVersion90>8.0.2</PomeloEntityFrameworkCoreMySqlVersion90>
+    <NpgsqlEntityFrameworkCorePostgreSQLVersion100>10.0.0</NpgsqlEntityFrameworkCorePostgreSQLVersion100>
 
     <MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.35</MicrosoftEntityFrameworkCoreSqlServerVersion60>
     <MicrosoftEntityFrameworkCoreSqlServerVersion70>7.0.20</MicrosoftEntityFrameworkCoreSqlServerVersion70>
     <MicrosoftEntityFrameworkCoreSqlServerVersion80>8.0.10</MicrosoftEntityFrameworkCoreSqlServerVersion80>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion90>9.0.0-rc.2.24474.1</MicrosoftEntityFrameworkCoreSqlServerVersion90>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion90>9.0.11</MicrosoftEntityFrameworkCoreSqlServerVersion90>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion100>10.0.1</MicrosoftEntityFrameworkCoreSqlServerVersion100>
 
     <MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.35</MicrosoftEntityFrameworkCoreSqliteVersion60>
     <MicrosoftEntityFrameworkCoreSqliteVersion70>7.0.20</MicrosoftEntityFrameworkCoreSqliteVersion70>
     <MicrosoftEntityFrameworkCoreSqliteVersion80>8.0.10</MicrosoftEntityFrameworkCoreSqliteVersion80>
-    <MicrosoftEntityFrameworkCoreSqliteVersion90>9.0.0-rc.2.24474.1</MicrosoftEntityFrameworkCoreSqliteVersion90>
+    <MicrosoftEntityFrameworkCoreSqliteVersion90>9.0.11</MicrosoftEntityFrameworkCoreSqliteVersion90>
+    <MicrosoftEntityFrameworkCoreSqliteVersion100>10.0.1</MicrosoftEntityFrameworkCoreSqliteVersion100>
 
     <!-- 
       Don't follow ASPNETCORE version for this package since it only exists as servicing builds 
@@ -40,6 +40,7 @@
     <MicrosoftIISTestingVersion80>8.0.0-*</MicrosoftIISTestingVersion80>
     <MicrosoftIISTestingVersion90>9.0.0-*</MicrosoftIISTestingVersion90>
     <MicrosoftIISTestingVersion100>10.0.0-*</MicrosoftIISTestingVersion100>
+    <MicrosoftIISTestingVersion110>11.0.0-*</MicrosoftIISTestingVersion110>
 
     <DapperVersion>2.1.66</DapperVersion>
     <DapperAotVersion>1.0.48</DapperAotVersion>
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
index a3e0d2085..ef11e094b 100644
--- a/src/Benchmarks/Benchmarks.csproj
+++ b/src/Benchmarks/Benchmarks.csproj
@@ -57,7 +57,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion80)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion90)" />
     <PackageReference Include="Npgsql" Version="$(NpgsqlVersion90)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion90)" />
@@ -66,6 +66,15 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion90)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net11.0'">
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion100)" />
+    <PackageReference Include="Npgsql" Version="$(NpgsqlVersion100)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion100)" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="$(MicrosoftDataSqlClientVersion100)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion100)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion100)" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="RazorSlices" Version="$(RazorSlicesVersion)" />
   </ItemGroup>
diff --git a/src/Benchmarks/Data/World.cs b/src/Benchmarks/Data/World.cs
index a506cc640..396e9b4ff 100644
--- a/src/Benchmarks/Data/World.cs
+++ b/src/Benchmarks/Data/World.cs
@@ -10,6 +10,7 @@ namespace Benchmarks.Data
     [Table("world")]
     public class World
     {
+        [UseColumnAttribute] // Fixes DAP043 warning
         [Column("id")]
         public int Id { get; set; }
 
@@ -17,6 +18,7 @@ public class World
         [NotMapped, DbValue(Ignore = true)]
         public int _Id { get; set; }
 
+        [UseColumnAttribute] // Fixes DAP043 warning
         [Column("randomnumber")]
         public int RandomNumber { get; set; }
     }
diff --git a/src/Benchmarks/Program.cs b/src/Benchmarks/Program.cs
index 98aaceb57..d2565cb16 100644
--- a/src/Benchmarks/Program.cs
+++ b/src/Benchmarks/Program.cs
@@ -55,100 +55,104 @@ public static void Main(string[] args)
 
             Protocol = config["protocol"] ?? "";
 
-            var webHostBuilder = new WebHostBuilder()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseConfiguration(config)
-                .UseStartup<Startup>()
-                .ConfigureLogging(loggerFactory =>
+            var hostBuilder = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
                 {
-                    if (Enum.TryParse(config["LogLevel"], out LogLevel logLevel))
-                    {
-                        Console.WriteLine($"Console Logging enabled with level '{logLevel}'");
-                        loggerFactory.AddConsole().SetMinimumLevel(logLevel);
-                    }
-                })
-                .ConfigureServices(services => services
-                    .AddSingleton(new ConsoleArgs(args))
-                    .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
-                    .AddSingleton<Scenarios>()
-                    .Configure<LoggerFilterOptions>(options =>
+                    webHostBuilder
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseConfiguration(config)
+                        .UseStartup<Startup>()
+                        .ConfigureLogging(loggerFactory =>
+                        {
+                            if (Enum.TryParse(config["LogLevel"], out LogLevel logLevel))
+                            {
+                                Console.WriteLine($"Console Logging enabled with level '{logLevel}'");
+                                loggerFactory.AddConsole().SetMinimumLevel(logLevel);
+                            }
+                        })
+                    .ConfigureServices(services => services
+                        .AddSingleton(new ConsoleArgs(args))
+                        .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
+                        .AddSingleton<Scenarios>()
+                        .Configure<LoggerFilterOptions>(options =>
+                        {
+                            if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
+                            {
+                                Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
+                                options.CaptureScopes = false;
+                            }
+                        })
+                    )
+                    .UseDefaultServiceProvider(
+                        (context, options) => options.ValidateScopes = context.HostingEnvironment.IsDevelopment());
+
+                    if (String.Equals(Server, "Kestrel", StringComparison.OrdinalIgnoreCase))
                     {
-                        if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
+                        webHostBuilder.UseKestrel(options =>
                         {
-                            Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
-                            options.CaptureScopes = false;
-                        }
-                    })
-                )
-                .UseDefaultServiceProvider(
-                    (context, options) => options.ValidateScopes = context.HostingEnvironment.IsDevelopment());
+                            var urls = config["urls"] ?? config["server.urls"];
+
+                            if (!string.IsNullOrEmpty(urls))
+                            {
+                                foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                                {
+                                    Listen(options, config, value);
+                                }
+                            }
+                            else
+                            {
+                                Listen(options, config, "http://localhost:5000/");
+                            }
+                        });
+
+                        var threadCount = GetThreadCount(config);
+
+                        webHostBuilder.UseSockets(socketOptions =>
+                        {
+                            if (threadCount > 0)
+                            {
+                                socketOptions.IOQueueCount = threadCount;
+                            }
 
-            if (String.Equals(Server, "Kestrel", StringComparison.OrdinalIgnoreCase))
-            {
-                webHostBuilder = webHostBuilder.UseKestrel(options =>
-                {
-                    var urls = config["urls"] ?? config["server.urls"];
+                            Console.WriteLine($"Using Sockets with {socketOptions.IOQueueCount} threads");
+                        });
 
-                    if (!string.IsNullOrEmpty(urls))
+                        webHostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
+                    }
+                    else if (String.Equals(Server, "HttpSys", StringComparison.OrdinalIgnoreCase))
                     {
-                        foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                        // Disable cross-platform warning
+#pragma warning disable CA1416
+                        webHostBuilder.UseHttpSys();
+#pragma warning restore CA1416
+                    }
+                    else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
+                    {
+#if NET9_0_OR_GREATER
+                        if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
                         {
-                            Listen(options, config, value);
+                            throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
                         }
+#endif
+                        webHostBuilder.UseKestrel().UseIIS();
                     }
-                    else
+                    else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
                     {
-                        Listen(options, config, "http://localhost:5000/");
+#if NET9_0_OR_GREATER
+                        if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
+                        {
+                            throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
+                        }
+#endif
+                        webHostBuilder.UseKestrel().UseIISIntegration();
                     }
-                });
-
-                var threadCount = GetThreadCount(config);
-
-                webHostBuilder.UseSockets(socketOptions =>
-                {
-                    if (threadCount > 0)
+                    else
                     {
-                        socketOptions.IOQueueCount = threadCount;
+                        throw new InvalidOperationException($"Unknown server value: {Server}");
                     }
-
-                    Console.WriteLine($"Using Sockets with {socketOptions.IOQueueCount} threads");
                 });
 
-                webHostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
-            }
-            else if (String.Equals(Server, "HttpSys", StringComparison.OrdinalIgnoreCase))
-            {
-                // Disable cross-platform warning
-#pragma warning disable CA1416
-                webHostBuilder = webHostBuilder.UseHttpSys();
-#pragma warning restore CA1416
-            }
-            else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
-            {
-#if NET9_0_OR_GREATER
-                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
-                {
-                    throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
-                }
-#endif
-                webHostBuilder = webHostBuilder.UseKestrel().UseIIS();
-            }
-            else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
-            {
-#if NET9_0_OR_GREATER
-                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
-                {
-                    throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
-                }
-#endif
-                webHostBuilder = webHostBuilder.UseKestrel().UseIISIntegration();
-            }
-            else
-            {
-                throw new InvalidOperationException($"Unknown server value: {Server}");
-            }
-
-            var webHost = webHostBuilder.Build();
+            var webHost = hostBuilder.Build();
 
             Console.WriteLine($"Using server {Server}");
             Console.WriteLine($"Server GC is currently {(GCSettings.IsServerGC ? "ENABLED" : "DISABLED")}");

From f1302b1adc4f4ea23ae9f8a108e8bb4d0e1ee0e7 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Tue, 16 Dec 2025 11:11:55 -0800
Subject: [PATCH 2/5] Fix UseStartup ordering to mitigate error:
 System.InvalidOperationException: Unable to resolve service for type
 'Benchmarks.Configuration.Scenarios' while attempting to activate
 'Benchmarks.Startup'.

---
 src/Benchmarks/Program.cs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Benchmarks/Program.cs b/src/Benchmarks/Program.cs
index d2565cb16..86b831da1 100644
--- a/src/Benchmarks/Program.cs
+++ b/src/Benchmarks/Program.cs
@@ -61,6 +61,19 @@ public static void Main(string[] args)
                     webHostBuilder
                         .UseContentRoot(Directory.GetCurrentDirectory())
                         .UseConfiguration(config)
+                        .ConfigureServices(services => services
+                            .AddSingleton(new ConsoleArgs(args))
+                            .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
+                            .AddSingleton<Scenarios>()
+                            .Configure<LoggerFilterOptions>(options =>
+                            {
+                                if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
+                                {
+                                    Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
+                                    options.CaptureScopes = false;
+                                }
+                            })
+                        )
                         .UseStartup<Startup>()
                         .ConfigureLogging(loggerFactory =>
                         {
@@ -70,19 +83,6 @@ public static void Main(string[] args)
                                 loggerFactory.AddConsole().SetMinimumLevel(logLevel);
                             }
                         })
-                    .ConfigureServices(services => services
-                        .AddSingleton(new ConsoleArgs(args))
-                        .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
-                        .AddSingleton<Scenarios>()
-                        .Configure<LoggerFilterOptions>(options =>
-                        {
-                            if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
-                            {
-                                Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
-                                options.CaptureScopes = false;
-                            }
-                        })
-                    )
                     .UseDefaultServiceProvider(
                         (context, options) => options.ValidateScopes = context.HostingEnvironment.IsDevelopment());
 

From c257660713e8ddf60a8d0b2c0dc264d530b6c4cc Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Tue, 16 Dec 2025 14:22:55 -0800
Subject: [PATCH 3/5] Clean up warnings and give justification for the
 suppression.

---
 src/Benchmarks/Startup.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Benchmarks/Startup.cs b/src/Benchmarks/Startup.cs
index d132d17a6..bc963bfb8 100644
--- a/src/Benchmarks/Startup.cs
+++ b/src/Benchmarks/Startup.cs
@@ -18,6 +18,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Npgsql;
 using System.IO;
 using Microsoft.AspNetCore.WebUtilities;
@@ -27,7 +28,7 @@ namespace Benchmarks
 {
     public class Startup
     {
-        public Startup(IHostingEnvironment hostingEnv, Scenarios scenarios)
+        public Startup(IWebHostEnvironment hostingEnv)
         {
             // Set up configuration sources.
             var builder = new ConfigurationBuilder()
@@ -38,21 +39,27 @@ public Startup(IHostingEnvironment hostingEnv, Scenarios scenarios)
                 .AddCommandLine(Program.Args);
 
             Configuration = builder.Build();
-
-            Scenarios = scenarios;
         }
 
         public IConfigurationRoot Configuration { get; set; }
 
-        public Scenarios Scenarios { get; }
+        public Scenarios Scenarios { get; private set; }
 
         public void ConfigureServices(IServiceCollection services)
         {
             services.Configure<AppSettings>(Configuration);
 
-            // We re-register the Scenarios as an instance singleton here to avoid it being created again due to the
-            // registration done in Program.Main
-            services.AddSingleton(Scenarios);
+            // Retrieve Scenarios that was registered in Program.Main
+            // We need it throughout ConfigureServices, so we must call BuildServiceProvider here.
+            // Warning suppression justification:
+            // Duplicate Scenarios will not cause issues as it is a singleton and we re-register the same instance below.
+            // Moving to a different pattern would require significant refactoring.
+#pragma warning disable ASP0000 // Do not call 'BuildServiceProvider' in 'ConfigureServices'
+            using (var serviceProvider = services.BuildServiceProvider())
+            {
+                Scenarios = serviceProvider.GetRequiredService<Scenarios>();
+            }
+#pragma warning restore ASP0000
 
             // Common DB services
             services.AddSingleton<IRandom, DefaultRandom>();
@@ -230,7 +237,7 @@ INSERT INTO fortune (message)
             }
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {

From 2c7338122813ae0c583e362fc1daa094d0d64478 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Tue, 16 Dec 2025 15:55:38 -0800
Subject: [PATCH 4/5] Fix application started printout.

---
 src/Benchmarks/Program.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Benchmarks/Program.cs b/src/Benchmarks/Program.cs
index 86b831da1..9942db401 100644
--- a/src/Benchmarks/Program.cs
+++ b/src/Benchmarks/Program.cs
@@ -163,7 +163,9 @@ public static void Main(string[] args)
                 StartInteractiveConsoleThread();
             }
 
-            webHost.Run();
+            webHost.Start();
+            Console.WriteLine("Application started. Press Ctrl+C to shut down.");
+            webHost.WaitForShutdown();
         }
 
         private static void StartInteractiveConsoleThread()

From 25ccd157787cf08938093b2f33e3a073a8c72afd Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Wed, 17 Dec 2025 14:49:37 -0800
Subject: [PATCH 5/5] Revert to only updating the version files to support
 net11. Warning fixes will come in another pr.

---
 src/Benchmarks/Data/World.cs |   2 -
 src/Benchmarks/Program.cs    | 166 +++++++++++++++++------------------
 src/Benchmarks/Startup.cs    |  23 ++---
 3 files changed, 88 insertions(+), 103 deletions(-)

diff --git a/src/Benchmarks/Data/World.cs b/src/Benchmarks/Data/World.cs
index 396e9b4ff..a506cc640 100644
--- a/src/Benchmarks/Data/World.cs
+++ b/src/Benchmarks/Data/World.cs
@@ -10,7 +10,6 @@ namespace Benchmarks.Data
     [Table("world")]
     public class World
     {
-        [UseColumnAttribute] // Fixes DAP043 warning
         [Column("id")]
         public int Id { get; set; }
 
@@ -18,7 +17,6 @@ public class World
         [NotMapped, DbValue(Ignore = true)]
         public int _Id { get; set; }
 
-        [UseColumnAttribute] // Fixes DAP043 warning
         [Column("randomnumber")]
         public int RandomNumber { get; set; }
     }
diff --git a/src/Benchmarks/Program.cs b/src/Benchmarks/Program.cs
index 9942db401..98aaceb57 100644
--- a/src/Benchmarks/Program.cs
+++ b/src/Benchmarks/Program.cs
@@ -55,104 +55,100 @@ public static void Main(string[] args)
 
             Protocol = config["protocol"] ?? "";
 
-            var hostBuilder = new HostBuilder()
-                .ConfigureWebHost(webHostBuilder =>
+            var webHostBuilder = new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseConfiguration(config)
+                .UseStartup<Startup>()
+                .ConfigureLogging(loggerFactory =>
                 {
-                    webHostBuilder
-                        .UseContentRoot(Directory.GetCurrentDirectory())
-                        .UseConfiguration(config)
-                        .ConfigureServices(services => services
-                            .AddSingleton(new ConsoleArgs(args))
-                            .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
-                            .AddSingleton<Scenarios>()
-                            .Configure<LoggerFilterOptions>(options =>
-                            {
-                                if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
-                                {
-                                    Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
-                                    options.CaptureScopes = false;
-                                }
-                            })
-                        )
-                        .UseStartup<Startup>()
-                        .ConfigureLogging(loggerFactory =>
-                        {
-                            if (Enum.TryParse(config["LogLevel"], out LogLevel logLevel))
-                            {
-                                Console.WriteLine($"Console Logging enabled with level '{logLevel}'");
-                                loggerFactory.AddConsole().SetMinimumLevel(logLevel);
-                            }
-                        })
-                    .UseDefaultServiceProvider(
-                        (context, options) => options.ValidateScopes = context.HostingEnvironment.IsDevelopment());
-
-                    if (String.Equals(Server, "Kestrel", StringComparison.OrdinalIgnoreCase))
-                    {
-                        webHostBuilder.UseKestrel(options =>
-                        {
-                            var urls = config["urls"] ?? config["server.urls"];
-
-                            if (!string.IsNullOrEmpty(urls))
-                            {
-                                foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-                                {
-                                    Listen(options, config, value);
-                                }
-                            }
-                            else
-                            {
-                                Listen(options, config, "http://localhost:5000/");
-                            }
-                        });
-
-                        var threadCount = GetThreadCount(config);
-
-                        webHostBuilder.UseSockets(socketOptions =>
-                        {
-                            if (threadCount > 0)
-                            {
-                                socketOptions.IOQueueCount = threadCount;
-                            }
-
-                            Console.WriteLine($"Using Sockets with {socketOptions.IOQueueCount} threads");
-                        });
-
-                        webHostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
-                    }
-                    else if (String.Equals(Server, "HttpSys", StringComparison.OrdinalIgnoreCase))
+                    if (Enum.TryParse(config["LogLevel"], out LogLevel logLevel))
                     {
-                        // Disable cross-platform warning
-#pragma warning disable CA1416
-                        webHostBuilder.UseHttpSys();
-#pragma warning restore CA1416
+                        Console.WriteLine($"Console Logging enabled with level '{logLevel}'");
+                        loggerFactory.AddConsole().SetMinimumLevel(logLevel);
                     }
-                    else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
+                })
+                .ConfigureServices(services => services
+                    .AddSingleton(new ConsoleArgs(args))
+                    .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
+                    .AddSingleton<Scenarios>()
+                    .Configure<LoggerFilterOptions>(options =>
                     {
-#if NET9_0_OR_GREATER
-                        if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
+                        if (Boolean.TryParse(config["DisableScopes"], out var disableScopes) && disableScopes)
                         {
-                            throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
+                            Console.WriteLine($"LoggerFilterOptions.CaptureScopes = false");
+                            options.CaptureScopes = false;
                         }
-#endif
-                        webHostBuilder.UseKestrel().UseIIS();
-                    }
-                    else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
+                    })
+                )
+                .UseDefaultServiceProvider(
+                    (context, options) => options.ValidateScopes = context.HostingEnvironment.IsDevelopment());
+
+            if (String.Equals(Server, "Kestrel", StringComparison.OrdinalIgnoreCase))
+            {
+                webHostBuilder = webHostBuilder.UseKestrel(options =>
+                {
+                    var urls = config["urls"] ?? config["server.urls"];
+
+                    if (!string.IsNullOrEmpty(urls))
                     {
-#if NET9_0_OR_GREATER
-                        if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
+                        foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                         {
-                            throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
+                            Listen(options, config, value);
                         }
-#endif
-                        webHostBuilder.UseKestrel().UseIISIntegration();
                     }
                     else
                     {
-                        throw new InvalidOperationException($"Unknown server value: {Server}");
+                        Listen(options, config, "http://localhost:5000/");
                     }
                 });
 
-            var webHost = hostBuilder.Build();
+                var threadCount = GetThreadCount(config);
+
+                webHostBuilder.UseSockets(socketOptions =>
+                {
+                    if (threadCount > 0)
+                    {
+                        socketOptions.IOQueueCount = threadCount;
+                    }
+
+                    Console.WriteLine($"Using Sockets with {socketOptions.IOQueueCount} threads");
+                });
+
+                webHostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
+            }
+            else if (String.Equals(Server, "HttpSys", StringComparison.OrdinalIgnoreCase))
+            {
+                // Disable cross-platform warning
+#pragma warning disable CA1416
+                webHostBuilder = webHostBuilder.UseHttpSys();
+#pragma warning restore CA1416
+            }
+            else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
+            {
+#if NET9_0_OR_GREATER
+                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
+                {
+                    throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
+                }
+#endif
+                webHostBuilder = webHostBuilder.UseKestrel().UseIIS();
+            }
+            else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
+            {
+#if NET9_0_OR_GREATER
+                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_VERSION")))
+                {
+                    throw new InvalidOperationException("Benchmark wants to use IIS but app isn't running in IIS.");
+                }
+#endif
+                webHostBuilder = webHostBuilder.UseKestrel().UseIISIntegration();
+            }
+            else
+            {
+                throw new InvalidOperationException($"Unknown server value: {Server}");
+            }
+
+            var webHost = webHostBuilder.Build();
 
             Console.WriteLine($"Using server {Server}");
             Console.WriteLine($"Server GC is currently {(GCSettings.IsServerGC ? "ENABLED" : "DISABLED")}");
@@ -163,9 +159,7 @@ public static void Main(string[] args)
                 StartInteractiveConsoleThread();
             }
 
-            webHost.Start();
-            Console.WriteLine("Application started. Press Ctrl+C to shut down.");
-            webHost.WaitForShutdown();
+            webHost.Run();
         }
 
         private static void StartInteractiveConsoleThread()
diff --git a/src/Benchmarks/Startup.cs b/src/Benchmarks/Startup.cs
index bc963bfb8..d132d17a6 100644
--- a/src/Benchmarks/Startup.cs
+++ b/src/Benchmarks/Startup.cs
@@ -18,7 +18,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Npgsql;
 using System.IO;
 using Microsoft.AspNetCore.WebUtilities;
@@ -28,7 +27,7 @@ namespace Benchmarks
 {
     public class Startup
     {
-        public Startup(IWebHostEnvironment hostingEnv)
+        public Startup(IHostingEnvironment hostingEnv, Scenarios scenarios)
         {
             // Set up configuration sources.
             var builder = new ConfigurationBuilder()
@@ -39,27 +38,21 @@ public Startup(IWebHostEnvironment hostingEnv)
                 .AddCommandLine(Program.Args);
 
             Configuration = builder.Build();
+
+            Scenarios = scenarios;
         }
 
         public IConfigurationRoot Configuration { get; set; }
 
-        public Scenarios Scenarios { get; private set; }
+        public Scenarios Scenarios { get; }
 
         public void ConfigureServices(IServiceCollection services)
         {
             services.Configure<AppSettings>(Configuration);
 
-            // Retrieve Scenarios that was registered in Program.Main
-            // We need it throughout ConfigureServices, so we must call BuildServiceProvider here.
-            // Warning suppression justification:
-            // Duplicate Scenarios will not cause issues as it is a singleton and we re-register the same instance below.
-            // Moving to a different pattern would require significant refactoring.
-#pragma warning disable ASP0000 // Do not call 'BuildServiceProvider' in 'ConfigureServices'
-            using (var serviceProvider = services.BuildServiceProvider())
-            {
-                Scenarios = serviceProvider.GetRequiredService<Scenarios>();
-            }
-#pragma warning restore ASP0000
+            // We re-register the Scenarios as an instance singleton here to avoid it being created again due to the
+            // registration done in Program.Main
+            services.AddSingleton(Scenarios);
 
             // Common DB services
             services.AddSingleton<IRandom, DefaultRandom>();
@@ -237,7 +230,7 @@ INSERT INTO fortune (message)
             }
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             if (env.IsDevelopment())
             {