Update to Aspire 9

ejsmith · ejsmith · commit 4892f5f5587a · 2024-11-12T20:11:49.000-06:00
diff --git a/src/Exceptionless.AppHost/Exceptionless.AppHost.csproj b/src/Exceptionless.AppHost/Exceptionless.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0-rc.1.24511.1" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0-rc.1.24511.1" />
-    <PackageReference Include="Aspire.Hosting.NodeJs" Version="9.0.0-rc.1.24511.1" />
-    <PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0-rc.1.24511.1" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.NodeJs" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/src/Exceptionless.AppHost/Program.cs b/src/Exceptionless.AppHost/Program.cs
@@ -20,7 +20,7 @@
     .WithEndpoint(8025, 8025, "http")
     .WithEndpoint(1025, 1025);
 
-var job = builder.AddProject<Projects.Exceptionless_Job>("Jobs", "AllJobs")
+builder.AddProject<Projects.Exceptionless_Job>("Jobs", "AllJobs")
     .WithReference(cache)
     .WithReference(elastic)
     .WithEnvironment("ConnectionStrings:Email", "smtp://localhost:1025")
@@ -39,12 +39,12 @@
     .WaitFor(mail)
     .WithHttpHealthCheck("/health");
 
-//builder.AddNpmApp("Web", "../../src/Exceptionless.Web/ClientApp", "dev")
-//    .WithReference(api)
-//    .WithEndpoint(scheme: "http", env: "PORT");
+builder.AddNpmApp("Web", "../../src/Exceptionless.Web/ClientApp", "dev")
+    .WithReference(api)
+    .WithEndpoint(scheme: "http", env: "PORT");
 
-//builder.AddNpmApp("AngularWeb", "../../src/Exceptionless.Web/ClientApp.angular", "serve")
-//    .WithReference(api)
-//    .WithEndpoint(scheme: "http", env: "PORT");
+builder.AddNpmApp("AngularWeb", "../../src/Exceptionless.Web/ClientApp.angular", "serve")
+    .WithReference(api)
+    .WithEndpoint(scheme: "http", env: "PORT");
 
 builder.Build().Run();
diff --git a/tests/Exceptionless.Tests/AspireWebHostFactory.cs b/tests/Exceptionless.Tests/AspireWebHostFactory.cs
@@ -1,4 +1,5 @@
 using Aspire.Hosting;
+using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Testing;
 using Exceptionless.Insulation.Configuration;
 using Exceptionless.Web;
@@ -8,26 +9,29 @@
 
 namespace Exceptionless.Tests;
 
-public class AppWebHostFactory : WebApplicationFactory<Startup>, IAsyncLifetime
+public class AspireWebHostFactory : WebApplicationFactory<Startup>, IAsyncLifetime
 {
     private DistributedApplication? _app;
 
     public DistributedApplication App => _app ?? throw new InvalidOperationException("The application is not initialized");
 
     public string? ElasticsearchConnectionString { get; private set; }
     public string? RedisConnectionString { get; private set; }
-    public string? MailConnectionString { get; private set; }
 
     public async Task InitializeAsync()
     {
         var options = new DistributedApplicationOptions { AssemblyName = typeof(ElasticsearchResource).Assembly.FullName, DisableDashboard = true };
         var builder = DistributedApplication.CreateBuilder(options);
 
-        var elastic = builder.AddElasticsearch("Elasticsearch")
-            .WithContainerName("Exceptionless-Elasticsearch-Test");
+        builder.AddElasticsearch("Elasticsearch")
+            .WithContainerName("Exceptionless-Elasticsearch-Test")
+            .WithImageTag("8.15.2")
+            .WithLifetime(ContainerLifetime.Persistent);
 
-        var cache = builder.AddRedis("Redis")
-            .WithContainerName("Exceptionless-Redis-Test");
+        builder.AddRedis("Redis")
+            .WithContainerName("Exceptionless-Redis-Test")
+            .WithImageTag("7.4")
+            .WithLifetime(ContainerLifetime.Persistent);;
 
         _app = builder.Build();
 
diff --git a/tests/Exceptionless.Tests/Controllers/AuthControllerTests.cs b/tests/Exceptionless.Tests/Controllers/AuthControllerTests.cs
@@ -27,7 +27,7 @@ public class AuthControllerTests : IntegrationTestsBase
     private readonly IOrganizationRepository _organizationRepository;
     private readonly ITokenRepository _tokenRepository;
 
-    public AuthControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public AuthControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _authOptions = GetService<AuthOptions>();
         _authOptions.EnableAccountCreation = true;
diff --git a/tests/Exceptionless.Tests/Controllers/EventControllerTests.cs b/tests/Exceptionless.Tests/Controllers/EventControllerTests.cs
@@ -43,7 +43,7 @@ public class EventControllerTests : IntegrationTestsBase
     private readonly IQueue<EventUserDescription> _eventUserDescriptionQueue;
     private readonly UserData _userData;
 
-    public EventControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _organizationRepository = GetService<IOrganizationRepository>();
         _stackData = GetService<StackData>();
diff --git a/tests/Exceptionless.Tests/Controllers/ProjectControllerTests.cs b/tests/Exceptionless.Tests/Controllers/ProjectControllerTests.cs
@@ -13,7 +13,7 @@ namespace Exceptionless.Tests.Controllers;
 
 public sealed class ProjectControllerTests : IntegrationTestsBase
 {
-    public ProjectControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public ProjectControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
     }
 
diff --git a/tests/Exceptionless.Tests/Controllers/StackControllerTests.cs b/tests/Exceptionless.Tests/Controllers/StackControllerTests.cs
@@ -21,7 +21,7 @@ public class StackControllerTests : IntegrationTestsBase
     private readonly IQueue<EventPost> _eventQueue;
     private readonly IQueue<WorkItemData> _workItemQueue;
 
-    public StackControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public StackControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _stackRepository = GetService<IStackRepository>();
         _eventRepository = GetService<IEventRepository>();
diff --git a/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs b/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs
@@ -10,7 +10,7 @@ namespace Exceptionless.Tests.Controllers;
 
 public class StatusControllerTests : IntegrationTestsBase
 {
-    public StatusControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public StatusControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
     }
 
diff --git a/tests/Exceptionless.Tests/Controllers/TokenControllerTests.cs b/tests/Exceptionless.Tests/Controllers/TokenControllerTests.cs
@@ -14,7 +14,7 @@ namespace Exceptionless.Tests.Controllers;
 
 public sealed class TokenControllerTests : IntegrationTestsBase
 {
-    public TokenControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory) { }
+    public TokenControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory) { }
 
     protected override async Task ResetDataAsync()
     {
diff --git a/tests/Exceptionless.Tests/Controllers/WebHookControllerTests.cs b/tests/Exceptionless.Tests/Controllers/WebHookControllerTests.cs
@@ -10,7 +10,7 @@ namespace Exceptionless.Tests.Controllers;
 
 public sealed class WebHookControllerTests : IntegrationTestsBase
 {
-    public WebHookControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory) { }
+    public WebHookControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory) { }
 
     protected override async Task ResetDataAsync()
     {
diff --git a/tests/Exceptionless.Tests/Exceptionless.Tests.csproj b/tests/Exceptionless.Tests/Exceptionless.Tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="FluentRest.NewtonsoftJson" Version="9.9.9" />
 
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24474.3" />
-    <PackageReference Include="Aspire.Hosting.Testing" Version="9.0.0-rc.1.24511.1" />
+    <PackageReference Include="Aspire.Hosting.Testing" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0-preview.9.24507.7" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.2" />
diff --git a/tests/Exceptionless.Tests/IntegrationTestsBase.cs b/tests/Exceptionless.Tests/IntegrationTestsBase.cs
@@ -31,17 +31,17 @@
 
 namespace Exceptionless.Tests;
 
-public abstract class IntegrationTestsBase : TestWithLoggingBase, Xunit.IAsyncLifetime, IClassFixture<AppWebHostFactory>
+public abstract class IntegrationTestsBase : TestWithLoggingBase, Xunit.IAsyncLifetime, IClassFixture<AspireWebHostFactory>
 {
     private static bool _indexesHaveBeenConfigured = false;
     private static readonly SemaphoreSlim _semaphoreSlim = new(1, 1);
     private ExceptionlessElasticConfiguration? _configuration;
     private ProxyTimeProvider? _timeProvider;
     protected readonly IList<IDisposable> _disposables = new List<IDisposable>();
-    protected readonly AppWebHostFactory _hostFixture;
+    protected readonly AspireWebHostFactory _hostFixture;
     protected TestServer? _server;
 
-    public IntegrationTestsBase(ITestOutputHelper output, AppWebHostFactory hostFixture) : base(output)
+    public IntegrationTestsBase(ITestOutputHelper output, AspireWebHostFactory hostFixture) : base(output)
     {
         Log.DefaultMinimumLevel = LogLevel.Information;
         Log.SetLogLevel<ScheduledTimer>(LogLevel.Warning);
diff --git a/tests/Exceptionless.Tests/Jobs/CleanupDataJobTests.cs b/tests/Exceptionless.Tests/Jobs/CleanupDataJobTests.cs
@@ -27,7 +27,7 @@ public class CleanupDataJobTests : IntegrationTestsBase
     private readonly BillingManager _billingManager;
     private readonly BillingPlans _plans;
 
-    public CleanupDataJobTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public CleanupDataJobTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _job = GetService<CleanupDataJob>();
         _organizationData = GetService<OrganizationData>();
diff --git a/tests/Exceptionless.Tests/Jobs/CloseInactiveSessionsJobTests.cs b/tests/Exceptionless.Tests/Jobs/CloseInactiveSessionsJobTests.cs
@@ -31,7 +31,7 @@ public class CloseInactiveSessionsJobTests : IntegrationTestsBase
     private readonly BillingManager _billingManager;
     private readonly BillingPlans _plans;
 
-    public CloseInactiveSessionsJobTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public CloseInactiveSessionsJobTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _job = GetService<CloseInactiveSessionsJob>();
         _cache = GetService<ICacheClient>();
diff --git a/tests/Exceptionless.Tests/Jobs/EventPostJobTests.cs b/tests/Exceptionless.Tests/Jobs/EventPostJobTests.cs
@@ -39,7 +39,7 @@ public class EventPostJobTests : IntegrationTestsBase
     private readonly BillingPlans _plans;
     private readonly AppOptions _options;
 
-    public EventPostJobTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventPostJobTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _job = GetService<EventPostsJob>();
         _eventQueue = GetService<IQueue<EventPost>>();
diff --git a/tests/Exceptionless.Tests/Migrations/FixDuplicateStacksMigrationTests.cs b/tests/Exceptionless.Tests/Migrations/FixDuplicateStacksMigrationTests.cs
@@ -21,7 +21,7 @@ public class FixDuplicateStacksMigrationTests : IntegrationTestsBase
     private readonly EventData _eventData;
     private readonly IEventRepository _eventRepository;
 
-    public FixDuplicateStacksMigrationTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public FixDuplicateStacksMigrationTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _stackData = GetService<StackData>();
         _stackRepository = GetService<IStackRepository>();
diff --git a/tests/Exceptionless.Tests/Migrations/UpdateEventUsageMigrationTests.cs b/tests/Exceptionless.Tests/Migrations/UpdateEventUsageMigrationTests.cs
@@ -24,7 +24,7 @@ public class UpdateEventUsageMigrationTests : IntegrationTestsBase
     private readonly EventData _eventData;
     private readonly IEventRepository _eventRepository;
 
-    public UpdateEventUsageMigrationTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public UpdateEventUsageMigrationTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _organizationData = GetService<OrganizationData>();
         _organizationRepository = GetService<IOrganizationRepository>();
diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs
@@ -40,7 +40,7 @@ public sealed class EventPipelineTests : IntegrationTestsBase
     private readonly BillingManager _billingManager;
     private readonly BillingPlans _plans;
 
-    public EventPipelineTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventPipelineTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _eventData = GetService<EventData>();
         _eventRepository = GetService<IEventRepository>();
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -22,7 +22,7 @@ public sealed class EventRepositoryTests : IntegrationTestsBase
     private readonly StackData _stackData;
     private readonly IStackRepository _stackRepository;
 
-    public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _randomEventGenerator = GetService<RandomEventGenerator>();
         _eventData = GetService<EventData>();
diff --git a/tests/Exceptionless.Tests/Repositories/OrganizationRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/OrganizationRepositoryTests.cs
@@ -15,7 +15,7 @@ public sealed class OrganizationRepositoryTests : IntegrationTestsBase
     private readonly IOrganizationRepository _repository;
     private readonly BillingPlans _plans;
 
-    public OrganizationRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public OrganizationRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         Log.SetLogLevel<OrganizationRepository>(LogLevel.Trace);
         _cache = GetService<ICacheClient>() as InMemoryCacheClient ?? throw new InvalidOperationException();
diff --git a/tests/Exceptionless.Tests/Repositories/ProjectRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/ProjectRepositoryTests.cs
@@ -19,7 +19,7 @@ public sealed class ProjectRepositoryTests : IntegrationTestsBase
     private readonly ProjectData _projectData;
     private readonly IProjectRepository _repository;
 
-    public ProjectRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public ProjectRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _organizationData = GetService<OrganizationData>();
         _projectData = GetService<ProjectData>();
diff --git a/tests/Exceptionless.Tests/Repositories/StackRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/StackRepositoryTests.cs
@@ -19,7 +19,7 @@ public sealed class StackRepositoryTests : IntegrationTestsBase
     private readonly StackData _stackData;
     private readonly IStackRepository _repository;
 
-    public StackRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public StackRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _cache = GetService<ICacheClient>() as InMemoryCacheClient ?? throw new InvalidOperationException();
         _stackData = GetService<StackData>();
diff --git a/tests/Exceptionless.Tests/Repositories/TokenRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/TokenRepositoryTests.cs
@@ -13,7 +13,7 @@ public sealed class TokenRepositoryTests : IntegrationTestsBase
 {
     private readonly ITokenRepository _repository;
 
-    public TokenRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public TokenRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _repository = GetService<ITokenRepository>();
     }
diff --git a/tests/Exceptionless.Tests/Repositories/WebHookRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/WebHookRepositoryTests.cs
@@ -11,7 +11,7 @@ public sealed class WebHookRepositoryTests : IntegrationTestsBase
 {
     private readonly IWebHookRepository _repository;
 
-    public WebHookRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public WebHookRepositoryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _repository = GetService<IWebHookRepository>();
     }
diff --git a/tests/Exceptionless.Tests/Search/EventIndexTests.cs b/tests/Exceptionless.Tests/Search/EventIndexTests.cs
@@ -16,7 +16,7 @@ public sealed class EventIndexTests : IntegrationTestsBase
     private readonly IEventRepository _repository;
     private readonly PersistentEventQueryValidator _validator;
 
-    public EventIndexTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventIndexTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         TimeProvider.SetUtcNow(new DateTime(2015, 2, 13, 0, 0, 0, DateTimeKind.Utc));
         _eventData = GetService<EventData>();
diff --git a/tests/Exceptionless.Tests/Search/EventStackFilterQueryTests.cs b/tests/Exceptionless.Tests/Search/EventStackFilterQueryTests.cs
@@ -16,7 +16,7 @@ public class EventStackFilterQueryTests : IntegrationTestsBase
     private readonly IEventRepository _eventRepository;
     private static bool _isTestDataGenerated;
 
-    public EventStackFilterQueryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventStackFilterQueryTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _stackRepository = GetService<IStackRepository>();
         _eventRepository = GetService<IEventRepository>();
diff --git a/tests/Exceptionless.Tests/Search/EventStackFilterTests.cs b/tests/Exceptionless.Tests/Search/EventStackFilterTests.cs
@@ -15,7 +15,7 @@ public sealed class EventStackFilterTests : IntegrationTestsBase
     private readonly EventData _eventData;
     private readonly IEventRepository _eventRepository;
 
-    public EventStackFilterTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public EventStackFilterTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         TimeProvider.SetUtcNow(new DateTime(2015, 2, 13, 0, 0, 0, DateTimeKind.Utc));
         _stackData = GetService<StackData>();
diff --git a/tests/Exceptionless.Tests/Search/MoreEventIndexTests.cs b/tests/Exceptionless.Tests/Search/MoreEventIndexTests.cs
@@ -15,7 +15,7 @@ public sealed class MoreEventIndexTests : IntegrationTestsBase
     private readonly IEventRepository _repository;
     private readonly PersistentEventQueryValidator _validator;
 
-    public MoreEventIndexTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public MoreEventIndexTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         TimeProvider.SetUtcNow(new DateTime(2015, 2, 13, 0, 0, 0, DateTimeKind.Utc));
         _repository = GetService<IEventRepository>();
diff --git a/tests/Exceptionless.Tests/Search/StackIndexTests.cs b/tests/Exceptionless.Tests/Search/StackIndexTests.cs
@@ -13,7 +13,7 @@ public sealed class StackIndexTests : IntegrationTestsBase
     private readonly StackData _stackData;
     private readonly IStackRepository _repository;
 
-    public StackIndexTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public StackIndexTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _stackData = GetService<StackData>();
         _repository = GetService<IStackRepository>();
diff --git a/tests/Exceptionless.Tests/Services/StackServiceTests.cs b/tests/Exceptionless.Tests/Services/StackServiceTests.cs
@@ -17,7 +17,7 @@ public class StackServiceTests : IntegrationTestsBase
     private readonly StackService _stackService;
     private readonly IStackRepository _stackRepository;
 
-    public StackServiceTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public StackServiceTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         Log.SetLogLevel<StackService>(LogLevel.Trace);
         _cache = GetService<ICacheClient>();
diff --git a/tests/Exceptionless.Tests/Services/UsageServiceTests.cs b/tests/Exceptionless.Tests/Services/UsageServiceTests.cs
@@ -21,7 +21,7 @@ public sealed class UsageServiceTests : IntegrationTestsBase
     private readonly UsageService _usageService;
     private readonly BillingPlans _plans;
 
-    public UsageServiceTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public UsageServiceTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         TimeProvider.SetUtcNow(new DateTime(2015, 2, 13, 0, 0, 0, DateTimeKind.Utc));
         Log.SetLogLevel<OrganizationRepository>(LogLevel.Information);
diff --git a/tests/Exceptionless.Tests/Stats/AggregationTests.cs b/tests/Exceptionless.Tests/Stats/AggregationTests.cs
@@ -28,7 +28,7 @@ public sealed class AggregationTests : IntegrationTestsBase
     private readonly BillingManager _billingManager;
     private readonly BillingPlans _plans;
 
-    public AggregationTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    public AggregationTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)
     {
         _pipeline = GetService<EventPipeline>();
         _eventData = GetService<EventData>();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class AuthControllerTests : IntegrationTestsBase`
`27`	`27`	`private readonly IOrganizationRepository _organizationRepository;`
`28`	`28`	`private readonly ITokenRepository _tokenRepository;`
`29`	`29`
`30`		`- public AuthControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)`
	`30`	`+ public AuthControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)`
`31`	`31`	`{`
`32`	`32`	`_authOptions = GetService<AuthOptions>();`
`33`	`33`	`_authOptions.EnableAccountCreation = true;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class EventControllerTests : IntegrationTestsBase`
`43`	`43`	`private readonly IQueue<EventUserDescription> _eventUserDescriptionQueue;`
`44`	`44`	`private readonly UserData _userData;`
`45`	`45`
`46`		`- public EventControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)`
	`46`	`+ public EventControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)`
`47`	`47`	`{`
`48`	`48`	`_organizationRepository = GetService<IOrganizationRepository>();`
`49`	`49`	`_stackData = GetService<StackData>();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Exceptionless.Tests.Controllers;`
`13`	`13`
`14`	`14`	`public sealed class ProjectControllerTests : IntegrationTestsBase`
`15`	`15`	`{`
`16`		`- public ProjectControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)`
	`16`	`+ public ProjectControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class StackControllerTests : IntegrationTestsBase`
`21`	`21`	`private readonly IQueue<EventPost> _eventQueue;`
`22`	`22`	`private readonly IQueue<WorkItemData> _workItemQueue;`
`23`	`23`
`24`		`- public StackControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)`
	`24`	`+ public StackControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)`
`25`	`25`	`{`
`26`	`26`	`_stackRepository = GetService<IStackRepository>();`
`27`	`27`	`_eventRepository = GetService<IEventRepository>();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Exceptionless.Tests.Controllers;`
`10`	`10`
`11`	`11`	`public class StatusControllerTests : IntegrationTestsBase`
`12`	`12`	`{`
`13`		`- public StatusControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)`
	`13`	`+ public StatusControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Exceptionless.Tests.Controllers;`
`14`	`14`
`15`	`15`	`public sealed class TokenControllerTests : IntegrationTestsBase`
`16`	`16`	`{`
`17`		`- public TokenControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory) { }`
	`17`	`+ public TokenControllerTests(ITestOutputHelper output, AspireWebHostFactory factory) : base(output, factory) { }`
`18`	`18`
`19`	`19`	`protected override async Task ResetDataAsync()`
`20`	`20`	`{`