Skip to content

Commit

Permalink
Prepare playground apps to allow testing (#5080)
Browse files Browse the repository at this point in the history 
This PR has changes to prepare the `playground/` apps to be run as part of future tests in `Aspire.Playground.Tests`. The changes follow these broad patterns:

- remove all the per-project `Directory.Build.{props,targets}`, and instead of these ..
    - .. add root `Directory.Build.{props,targets}` and use `Aspire.RepoTesting.*`
    - And update all the playground projects to use `AspireProjectOrPackageReference` instead of `ProjectReference`
- `Aspire.Hosting.Testing` expects to identify AppHost assemblies by a name ending in `.AppHost`.
    - rename some projects that don't follow that convention.

- Update the apps to use `Aspire.RepoTesting*` which allows building outside of repo.

- Address review feedbacks from @ eerhardt
  • Loading branch information
@radical
radical authored Jul 31, 2024
1 parent d8369e0 commit 232e434
Show file tree
Hide file tree
Showing 167 changed files with 350 additions and 874 deletions.
83 changes: 43 additions & 40 deletions Aspire.sln
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions playground/AWS/AWS.AppHost/AWS.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AWS\Aspire.Hosting.AWS.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />

<AspireProjectOrPackageReference Include="Aspire.Hosting.AWS" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />

<ProjectReference Include="..\Frontend\Frontend.csproj" />
</ItemGroup>

Expand Down
8 changes: 0 additions & 8 deletions playground/AWS/AWS.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/AWS/AWS.AppHost/Directory.Build.targets
View file

This file was deleted.

4 changes: 2 additions & 2 deletions playground/AWS/AWS.ServiceDefaults/AWS.ServiceDefaults.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Microsoft.Extensions.ServiceDiscovery.Dns\Microsoft.Extensions.ServiceDiscovery.Dns.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.Extensions.ServiceDiscovery\Microsoft.Extensions.ServiceDiscovery.csproj" />
<AspireProjectOrPackageReference Include="Microsoft.Extensions.ServiceDiscovery.Dns" />
<AspireProjectOrPackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
</ItemGroup>

</Project>
8 changes: 0 additions & 8 deletions playground/AspireEventHub/EventHubs.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/AspireEventHub/EventHubs.AppHost/Directory.Build.targets
View file

This file was deleted.

9 changes: 4 additions & 5 deletions playground/AspireEventHub/EventHubs.AppHost/EventHubs.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />

<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure.EventHubs\Aspire.Hosting.Azure.EventHubs.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure.Storage\Aspire.Hosting.Azure.Storage.csproj" IsAspireProjectResource="false" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.EventHubs" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.Storage" />

<ProjectReference Include="..\EventHubsApi\EventHubsApi.csproj" />
<ProjectReference Include="..\EventHubsConsumer\EventHubsConsumer.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion playground/AspireEventHub/EventHubsApi/EventHubsApi.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Azure.Messaging.EventHubs\Aspire.Azure.Messaging.EventHubs.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Azure.Messaging.EventHubs" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions playground/AspireEventHub/EventHubsConsumer/EventHubsConsumer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Azure.Messaging.EventHubs\Aspire.Azure.Messaging.EventHubs.csproj" />
<ProjectReference Include="..\..\..\src\Components\Aspire.Azure.Storage.Blobs\Aspire.Azure.Storage.Blobs.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Azure.Messaging.EventHubs" />
<AspireProjectOrPackageReference Include="Aspire.Azure.Storage.Blobs" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion playground/AzureSearchEndToEnd/AzureSearch.ApiService/AzureSearch.ApiService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Azure.Search.Documents\Aspire.Azure.Search.Documents.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Azure.Search.Documents" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>
</Project>
9 changes: 4 additions & 5 deletions playground/AzureSearchEndToEnd/AzureSearch.AppHost/AzureSearch.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure.Search\Aspire.Hosting.Azure.Search.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.Search" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
<ProjectReference Include="..\AzureSearch.ApiService\AzureSearch.ApiService.csproj" />
</ItemGroup>

Expand Down
8 changes: 0 additions & 8 deletions playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.targets
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...ureStorageEndToEnd/AzureStorageEndToEnd.ApiService/AzureStorageEndToEnd.ApiService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Azure.Storage.Blobs\Aspire.Azure.Storage.Blobs.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Azure.Storage.Blobs" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
9 changes: 4 additions & 5 deletions ...und/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/AzureStorageEndToEnd.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure.Storage\Aspire.Hosting.Azure.Storage.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.Storage" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />

<ProjectReference Include="..\AzureStorageEndToEnd.ApiService\AzureStorageEndToEnd.ApiService.csproj" />
</ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.targets
View file

This file was deleted.

4 changes: 2 additions & 2 deletions playground/CosmosEndToEnd/CosmosEndToEnd.ApiService/CosmosEndToEnd.ApiService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Microsoft.Azure.Cosmos\Aspire.Microsoft.Azure.Cosmos.csproj" />
<ProjectReference Include="..\..\..\src\Components\Aspire.Microsoft.EntityFrameworkCore.Cosmos\Aspire.Microsoft.EntityFrameworkCore.Cosmos.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.Azure.Cosmos" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
11 changes: 5 additions & 6 deletions playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.Azure.CosmosDB\Aspire.Hosting.Azure.CosmosDB.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />

<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.CosmosDB" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />

<ProjectReference Include="..\CosmosEndToEnd.ApiService\CosmosEndToEnd.ApiService.csproj" />
</ItemGroup>

Expand Down
8 changes: 0 additions & 8 deletions playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.targets
View file

This file was deleted.

5 changes: 2 additions & 3 deletions playground/CustomResources/CustomResources.AppHost/CustomResources.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

</Project>
8 changes: 0 additions & 8 deletions playground/CustomResources/CustomResources.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/CustomResources/CustomResources.AppHost/Directory.Build.targets
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...ground/DatabaseMigration/DatabaseMigration.ApiService/DatabaseMigration.ApiService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Microsoft.EntityFrameworkCore.SqlServer\Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
<ProjectReference Include="..\DatabaseMigration.ApiModel\DatabaseMigration.ApiModel.csproj" />
</ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions playground/DatabaseMigration/DatabaseMigration.AppHost/DatabaseMigration.AppHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\Aspire.Hosting.SqlServer\Aspire.Hosting.SqlServer.csproj" IsAspireProjectResource="false" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
<AspireProjectOrPackageReference Include="Aspire.Hosting.SqlServer" />

<ProjectReference Include="..\DatabaseMigration.ApiService\DatabaseMigration.ApiService.csproj" />
<ProjectReference Include="..\DatabaseMigration.MigrationService\DatabaseMigration.MigrationService.csproj" />
Expand Down
8 changes: 0 additions & 8 deletions playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.targets
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...aseMigration/DatabaseMigration.MigrationService/DatabaseMigration.MigrationService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Microsoft.EntityFrameworkCore.SqlServer\Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
<ProjectReference Include="..\DatabaseMigration.ApiModel\DatabaseMigration.ApiModel.csproj" />
</ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions playground/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<!-- When $(BuildForTest)==true, importing Aspire.RepoTesting.targets is needed. But import
only when in-repo. For out-of-repo a parent Directory.Build.props does the import -->
<Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.props" Condition="'$(RepoRoot)' != '' and '$(BuildForTest)' != 'true'" />

<PropertyGroup>
<!--
Playground projects don't need XML docs
Expand Down
11 changes: 11 additions & 0 deletions playground/Directory.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup Condition="'$(BuildForTest)' != 'true' and '$(IsAspireHost)' == 'true' and '$(SkipDashboardProjectReference)' != 'true'">
<ProjectReference Include="$(RepoRoot)src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
</ItemGroup>

<!-- When $(BuildForTest)==true, importing Aspire.RepoTesting.targets is needed. But import
only when in-repo. For the out-of-repo case a parent Directory.Build.targets does the import -->
<Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.targets" Condition="'$(RepoRoot)' != '' and '$(BuildForTest)' != 'true'" />
</Project>
2 changes: 1 addition & 1 deletion playground/Elasticsearch/Elasticsearch.ApiService/Elasticsearch.ApiService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Elastic.Clients.Elasticsearch\Aspire.Elastic.Clients.Elasticsearch.csproj" />
<AspireProjectOrPackageReference Include="Aspire.Elastic.Clients.Elasticsearch" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions playground/Elasticsearch/Elasticsearch.AppHost/Directory.Build.props
View file

This file was deleted.

9 changes: 0 additions & 9 deletions playground/Elasticsearch/Elasticsearch.AppHost/Directory.Build.targets
View file

This file was deleted.

Loading

0 comments on commit 232e434

Please sign in to comment.