Separate AppHost projects: move to respective solution directories

Copilot · kamilbaczek · kamilbaczek · commit 09299f8a10e7 · 2026-01-24T09:58:15.000+01:00
Co-authored-by: kamilbaczek &lt;74410956+kamilbaczek@users.noreply.github.com&gt;
diff --git a/Chapter-3-microservice-extraction/Directory.Build.props b/Chapter-3-microservice-extraction/Directory.Build.props
diff --git a/Chapter-3-microservice-extraction/Directory.Packages.props b/Chapter-3-microservice-extraction/Directory.Packages.props
diff --git a/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Directory.Packages.props b/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Directory.Packages.props
@@ -3,6 +3,9 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup Label="Production">
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.0.0" />
+    <PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="13.0.0" />
     <PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="3.2.5" />
     <PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="3.2.5" />
     <PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="3.2.5" />
diff --git a/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/Fitnet.Contracts.AppHost.csproj b/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/Fitnet.Contracts.AppHost.csproj
@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Fitnet.Contracts\Src\Fitnet.Contracts\Fitnet.Contracts.csproj" />
-    <ProjectReference Include="..\Fitnet\Src\Fitnet\Fitnet.csproj" />
+    <ProjectReference Include="..\Fitnet.Contracts\Fitnet.Contracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/Program.cs b/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/Program.cs
@@ -11,13 +11,6 @@
 var rabbitmq = builder.AddRabbitMQ("rabbitmq")
     .WithManagementPlugin();
 
-builder.AddProject<Fitnet>("fitnet-modular-monolith")
-    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
-    .WithReference(fitnetDatabase, "Database__ConnectionString")
-    .WithReference(rabbitmq, "EventBus__ConnectionString")
-    .WaitFor(postgres)
-    .WaitFor(rabbitmq);
-
 builder.AddProject<Fitnet_Contracts>("fitnet-contracts-microservice")
     .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
     .WithReference(fitnetDatabase, "Database__ConnectionString")
diff --git a/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/appsettings.json b/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.AppHost/appsettings.json
diff --git a/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.slnx b/Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.slnx
@@ -10,4 +10,5 @@
   <Project Path="Fitnet.Contracts.Infrastructure\Fitnet.Contracts.Infrastructure.csproj" Type="Classic C#" />
   <Project Path="Fitnet.Contracts.IntegrationEvents\Fitnet.Contracts.IntegrationEvents.csproj" Type="Classic C#" />
   <Project Path="Fitnet.Contracts\Fitnet.Contracts.csproj" Type="Classic C#" />
+  <Project Path="Fitnet.Contracts.AppHost\Fitnet.Contracts.AppHost.csproj" Type="Classic C#" />
 </Solution>
diff --git a/Chapter-3-microservice-extraction/Fitnet/Src/Directory.Packages.props b/Chapter-3-microservice-extraction/Fitnet/Src/Directory.Packages.props
@@ -3,6 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup Label="Production">
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.0.0" />
     <PackageVersion Include="Dapper" Version="2.1.66" />
     <PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="3.2.5" />
     <PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="3.2.5" />
diff --git a/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/Fitnet.AppHost.csproj b/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/Fitnet.AppHost.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <IsAspireHost>true</IsAspireHost>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Fitnet\Fitnet.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/Program.cs b/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/Program.cs
@@ -0,0 +1,16 @@
+using Projects;
+
+var builder = DistributedApplication.CreateBuilder(args);
+
+var postgres = builder.AddPostgres("postgres")
+    .WithImage("postgres", "14.3")
+    .WithPgAdmin();
+
+var fitnetDatabase = postgres.AddDatabase("fitnetsdb", "fitnet");
+
+builder.AddProject<Fitnet>("fitnet-modular-monolith")
+    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
+    .WithReference(fitnetDatabase, "Database__ConnectionString")
+    .WaitFor(postgres);
+
+await builder.Build().RunAsync();
diff --git a/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/appsettings.json b/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.DistributedApplication": "Information"
+    }
+  }
+}
diff --git a/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.slnx b/Chapter-3-microservice-extraction/Fitnet/Src/Fitnet.slnx
@@ -21,4 +21,5 @@
     <Project Path="Reports\Tests\Fitnet.Reports.IntegrationTests\Fitnet.Reports.IntegrationTests.csproj" Type="Classic C#" />
   </Folder>
   <Project Path="Fitnet\Fitnet.csproj" Type="Classic C#" />
+  <Project Path="Fitnet.AppHost\Fitnet.AppHost.csproj" Type="Classic C#" />
 </Solution>
