Fix Build for Tests and Update Image Version

tests/Clean.Architecture.FunctionalTests/CustomWebApplicationFactory.cs

@@ -1,136 +1,135 @@
-using Clean.Architecture.Infrastructure.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Testcontainers.MsSql;
-
-namespace Clean.Architecture.FunctionalTests;
-
-public class CustomWebApplicationFactory<TProgram> : WebApplicationFactory<TProgram>, IAsyncLifetime where TProgram : class
-{
-  private MsSqlContainer? _dbContainer;
-
-  public async Task InitializeAsync()
-  {
-    try
-    {
-      _dbContainer = new MsSqlBuilder()
-        .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
-        .WithPassword("Your_password123!")
-        .Build();
-      await _dbContainer.StartAsync();
-    }
-    catch (ArgumentException)
-    {
-      // Docker is not available; fall back to SQLite (configured via appsettings.Testing.json)
-      _dbContainer = null;
-    }
-  }
-
-  public new async Task DisposeAsync()
-  {
-    // Clean up environment variable
-    Environment.SetEnvironmentVariable("USE_SQL_SERVER", null);
-    if (_dbContainer != null)
-    {
-      await _dbContainer.DisposeAsync();
-    }
-  }
-
-  /// <summary>
-  /// Overriding CreateHost to avoid creating a separate ServiceProvider per this thread:
-  /// https://github.com/dotnet-architecture/eShopOnWeb/issues/465
-  /// </summary>
-  /// <param name="builder"></param>
-  /// <returns></returns>
-  protected override IHost CreateHost(IHostBuilder builder)
-  {
-    builder.UseEnvironment("Testing"); // will not send real emails
-    var host = builder.Build();
-    host.Start();
-
-    // Get service provider.
-    var serviceProvider = host.Services;
-
-    // Create a scope to obtain a reference to the database
-    // context (AppDbContext).
-    using (var scope = serviceProvider.CreateScope())
-    {
-      var scopedServices = scope.ServiceProvider;
-      var db = scopedServices.GetRequiredService<AppDbContext>();
-
-      var logger = scopedServices
-          .GetRequiredService<ILogger<CustomWebApplicationFactory<TProgram>>>();
-
-      try
-      {
-        if (_dbContainer != null)
-        {
-          // SQL Server via Testcontainers: apply migrations to create the schema
-          db.Database.Migrate();
-        }
-        else
-        {
-          // SQLite fallback: EnsureCreated is used because the migrations use SQL Server syntax
-          db.Database.EnsureCreated();
-        }
-
-        // Seed the database with test data only if it has not been seeded yet.
-        // This is safe for container reuse across test runs and multiple fixture instances.
-        SeedData.InitializeAsync(db).Wait();
-      }
-      catch (Exception ex)
-      {
-        logger.LogError(ex, "An error occurred seeding the " +
-                            "database with test messages. Error: {exceptionMessage}", ex.Message);
-      }
-    }
-
-    return host;
-  }
-
-  protected override void ConfigureWebHost(IWebHostBuilder builder)
-  {
-    if (_dbContainer != null)
-    {
-      // Force SQL Server mode even on non-Windows platforms for functional tests
-      Environment.SetEnvironmentVariable("USE_SQL_SERVER", "true");
-    }
-
-    builder
-        .ConfigureAppConfiguration((context, config) =>
-        {
-          if (_dbContainer != null)
-          {
-            // Set the connection string to use the Testcontainer
-            config.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-              ["ConnectionStrings:DefaultConnection"] = _dbContainer.GetConnectionString()
-            });
-          }
-        })
-        .ConfigureServices(services =>
-        {
-          if (_dbContainer != null)
-          {
-            // Remove the app's ApplicationDbContext registration
-            var descriptors = services.Where(
-              d => d.ServiceType == typeof(AppDbContext) ||
-                   d.ServiceType == typeof(DbContextOptions<AppDbContext>))
-                  .ToList();
-
-            foreach (var descriptor in descriptors)
-            {
-              services.Remove(descriptor);
-            }
-
-            // Add ApplicationDbContext using the Testcontainers SQL Server instance
-            services.AddDbContext<AppDbContext>((provider, options) =>
-            {
-              options.UseSqlServer(_dbContainer.GetConnectionString());
-              var interceptor = provider.GetRequiredService<EventDispatchInterceptor>();
-              options.AddInterceptors(interceptor);
-            });
-          }
-        });
-  }
-}
+using Clean.Architecture.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Testcontainers.MsSql;
+
+namespace Clean.Architecture.FunctionalTests;
+
+public class CustomWebApplicationFactory<TProgram> : WebApplicationFactory<TProgram>, IAsyncLifetime where TProgram : class
+{
+  private MsSqlContainer? _dbContainer;
+
+  public async Task InitializeAsync()
+  {
+    try
+    {
+      _dbContainer = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2025-latest")
+        .WithPassword("Your_password123!")
+        .Build();
+      await _dbContainer.StartAsync();
+    }
+    catch (ArgumentException)
+    {
+      // Docker is not available; fall back to SQLite (configured via appsettings.Testing.json)
+      _dbContainer = null;
+    }
+  }
+
+  public new async Task DisposeAsync()
+  {
+    // Clean up environment variable
+    Environment.SetEnvironmentVariable("USE_SQL_SERVER", null);
+    if (_dbContainer != null)
+    {
+      await _dbContainer.DisposeAsync();
+    }
+  }
+
+  /// <summary>
+  /// Overriding CreateHost to avoid creating a separate ServiceProvider per this thread:
+  /// https://github.com/dotnet-architecture/eShopOnWeb/issues/465
+  /// </summary>
+  /// <param name="builder"></param>
+  /// <returns></returns>
+  protected override IHost CreateHost(IHostBuilder builder)
+  {
+    builder.UseEnvironment("Testing"); // will not send real emails
+    var host = builder.Build();
+    host.Start();
+
+    // Get service provider.
+    var serviceProvider = host.Services;
+
+    // Create a scope to obtain a reference to the database
+    // context (AppDbContext).
+    using (var scope = serviceProvider.CreateScope())
+    {
+      var scopedServices = scope.ServiceProvider;
+      var db = scopedServices.GetRequiredService<AppDbContext>();
+
+      var logger = scopedServices
+          .GetRequiredService<ILogger<CustomWebApplicationFactory<TProgram>>>();
+
+      try
+      {
+        if (_dbContainer != null)
+        {
+          // SQL Server via Testcontainers: apply migrations to create the schema
+          db.Database.Migrate();
+        }
+        else
+        {
+          // SQLite fallback: EnsureCreated is used because the migrations use SQL Server syntax
+          db.Database.EnsureCreated();
+        }
+
+        // Seed the database with test data only if it has not been seeded yet.
+        // This is safe for container reuse across test runs and multiple fixture instances.
+        SeedData.InitializeAsync(db).Wait();
+      }
+      catch (Exception ex)
+      {
+        logger.LogError(ex, "An error occurred seeding the " +
+                            "database with test messages. Error: {exceptionMessage}", ex.Message);
+      }
+    }
+
+    return host;
+  }
+
+  protected override void ConfigureWebHost(IWebHostBuilder builder)
+  {
+    if (_dbContainer != null)
+    {
+      // Force SQL Server mode even on non-Windows platforms for functional tests
+      Environment.SetEnvironmentVariable("USE_SQL_SERVER", "true");
+    }
+
+    builder
+        .ConfigureAppConfiguration((context, config) =>
+        {
+          if (_dbContainer != null)
+          {
+            // Set the connection string to use the Testcontainer
+            config.AddInMemoryCollection(new Dictionary<string, string?>
+            {
+              ["ConnectionStrings:DefaultConnection"] = _dbContainer.GetConnectionString()
+            });
+          }
+        })
+        .ConfigureServices(services =>
+        {
+          if (_dbContainer != null)
+          {
+            // Remove the app's ApplicationDbContext registration
+            var descriptors = services.Where(
+              d => d.ServiceType == typeof(AppDbContext) ||
+                   d.ServiceType == typeof(DbContextOptions<AppDbContext>))
+                  .ToList();
+
+            foreach (var descriptor in descriptors)
+            {
+              services.Remove(descriptor);
+            }
+
+            // Add ApplicationDbContext using the Testcontainers SQL Server instance
+            services.AddDbContext<AppDbContext>((provider, options) =>
+            {
+              options.UseSqlServer(_dbContainer.GetConnectionString());
+              var interceptor = provider.GetRequiredService<EventDispatchInterceptor>();
+              options.AddInterceptors(interceptor);
+            });
+          }
+        });
+  }
+}