fix ci

Author: berviantoleo

BervProject.WebApi.Boilerplate.AppHost/BervProject.WebApi.Boilerplate.AppHost.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.6" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

BervProject.WebApi.Boilerplate.AppHost/Program.cs

@@ -1,8 +1,7 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
-var cache = builder.AddRedis("cache").WithRedisInsight();
+var cache = builder.AddRedis("cache");
 var postgres = builder.AddPostgres("postgres")
-    .WithPgAdmin()
     .WithEnvironment("POSTGRES_DB", "postgresdb");
 var postgresdb = postgres.AddDatabase("postgresdb");
 var serviceBus = builder.AddAzureServiceBus("messaging").RunAsEmulator();

BervProject.WebApi.Integration.Test/BervProject.WebApi.Integration.Test.csproj

@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <IsPublishable>false</IsPublishable>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>

BervProject.WebApi.Integration.Test/Fixtures/WebAppFixture.cs

@@ -1,30 +1,39 @@
 namespace BervProject.WebApi.Integration.Test.Fixtures;
 
-using Aspire.Hosting;
-using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Testing;
-using Microsoft.Extensions.DependencyInjection;
 using Projects;
 
 public class WebAppFixture : IAsyncLifetime
 {
+    // CI environments are slower — use a longer timeout when running in CI
+    private static readonly TimeSpan DefaultTimeout =
+        Environment.GetEnvironmentVariable("CI") is not null
+            ? TimeSpan.FromMinutes(10)
+            : TimeSpan.FromMinutes(3);
+
     private DistributedApplication? _app;
 
     public async Task InitializeAsync()
     {
         var appHost = await DistributedApplicationTestingBuilder
             .CreateAsync<BervProject_WebApi_Boilerplate_AppHost>();
 
-        _app = await appHost.BuildAsync();
-        await _app.StartAsync();
+        _app = await appHost.BuildAsync()
+            .WaitAsync(DefaultTimeout);
+
+        await _app.StartAsync()
+            .WaitAsync(DefaultTimeout);
 
-        var rns = _app.Services.GetRequiredService<ResourceNotificationService>();
-        var rcs = _app.Services.GetRequiredService<ResourceCommandService>();
+        using var cts = new CancellationTokenSource(DefaultTimeout);
 
-        // migrations uses WithExplicitStart — trigger the "start" command manually
-        await rcs.ExecuteCommandAsync("migrations", "start");
-        await rns.WaitForResourceAsync("migrations", KnownResourceStates.Finished);
-        await rns.WaitForResourceHealthyAsync("apiservice");
+        // migrations has WithExplicitStart — trigger it via ResourceCommands then wait for
+        // it to finish. apiservice has .WaitForCompletion(migration), so it won't start until
+        // migrations is Finished.
+        await _app.ResourceCommands.ExecuteCommandAsync("migrations", "start", cts.Token);
+        await _app.ResourceNotifications
+            .WaitForResourceAsync("migrations", KnownResourceStates.Finished, cts.Token);
+        await _app.ResourceNotifications
+            .WaitForResourceHealthyAsync("apiservice", cts.Token);
     }
 
     public async Task DisposeAsync()

BervProject.WebApi.Integration.Test/Usings.cs

@@ -1 +1,6 @@
-global using Xunit;
+global using Xunit;
+global using System.Net;
+global using Microsoft.Extensions.DependencyInjection;
+global using Aspire.Hosting;
+global using Aspire.Hosting.ApplicationModel;
+global using Aspire.Hosting.Testing;