microsoft · radical · Jul 3, 2024 · Jul 3, 2024 · Jul 3, 2024 · Jul 3, 2024
diff --git a/Aspire.sln b/Aspire.sln
diff --git a/playground/AWS/AWS.AppHost/AWS.AppHost.csproj b/playground/AWS/AWS.AppHost/AWS.AppHost.csproj
@@ -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>
 

diff --git a/playground/AWS/AWS.AppHost/Directory.Build.props b/playground/AWS/AWS.AppHost/Directory.Build.props
diff --git a/playground/AWS/AWS.AppHost/Directory.Build.targets b/playground/AWS/AWS.AppHost/Directory.Build.targets
diff --git a/playground/AWS/AWS.ServiceDefaults/AWS.ServiceDefaults.csproj b/playground/AWS/AWS.ServiceDefaults/AWS.ServiceDefaults.csproj
@@ -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>
diff --git a/playground/AspireEventHub/EventHubs.AppHost/Directory.Build.props b/playground/AspireEventHub/EventHubs.AppHost/Directory.Build.props
diff --git a/playground/AspireEventHub/EventHubs.AppHost/Directory.Build.targets b/playground/AspireEventHub/EventHubs.AppHost/Directory.Build.targets
diff --git a/playground/AspireEventHub/EventHubs.AppHost/EventHubs.AppHost.csproj b/playground/AspireEventHub/EventHubs.AppHost/EventHubs.AppHost.csproj
@@ -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" />

diff --git a/playground/AspireEventHub/EventHubsApi/EventHubsApi.csproj b/playground/AspireEventHub/EventHubsApi/EventHubsApi.csproj
@@ -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>
 

diff --git a/playground/AspireEventHub/EventHubsConsumer/EventHubsConsumer.csproj b/playground/AspireEventHub/EventHubsConsumer/EventHubsConsumer.csproj
@@ -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>
 

diff --git a/playground/AzureSearchEndToEnd/AzureSearch.ApiService/AzureSearch.ApiService.csproj b/playground/AzureSearchEndToEnd/AzureSearch.ApiService/AzureSearch.ApiService.csproj
@@ -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>
diff --git a/playground/AzureSearchEndToEnd/AzureSearch.AppHost/AzureSearch.AppHost.csproj b/playground/AzureSearchEndToEnd/AzureSearch.AppHost/AzureSearch.AppHost.csproj
@@ -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>
 

diff --git a/playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.props b/playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.props
diff --git a/playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.targets b/playground/AzureSearchEndToEnd/AzureSearch.AppHost/Directory.Build.targets
diff --git a/...ureStorageEndToEnd/AzureStorageEndToEnd.ApiService/AzureStorageEndToEnd.ApiService.csproj b/...ureStorageEndToEnd/AzureStorageEndToEnd.ApiService/AzureStorageEndToEnd.ApiService.csproj
@@ -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>
 

diff --git a/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.ApiService/Program.cs b/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.ApiService/Program.cs
@@ -11,6 +11,7 @@
 
 var app = builder.Build();
 
+app.MapDefaultEndpoints();
 app.MapGet("/", async (BlobServiceClient bsc) =>
 {
     var container = bsc.GetBlobContainerClient("mycontainer");

diff --git a/...und/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/AzureStorageEndToEnd.AppHost.csproj b/...und/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/AzureStorageEndToEnd.AppHost.csproj
@@ -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>

diff --git a/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.props b/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.props
diff --git a/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.targets b/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Directory.Build.targets
diff --git a/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Program.cs b/playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Program.cs
@@ -13,12 +13,14 @@
        .WithExternalHttpEndpoints()
        .WithReference(blobs);
 
+#if !BUILD_FOR_TEST
 // This project is only added in playground projects to support development/debugging
 // of the dashboard. It is not required in end developer code. Comment out this code
 // to test end developer dashboard launch experience. Refer to Directory.Build.props
 // for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
 // in the artifacts dir).
 builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
+#endif
 
 builder.Build().Run();
 
diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.ApiService/CosmosEndToEnd.ApiService.csproj b/playground/CosmosEndToEnd/CosmosEndToEnd.ApiService/CosmosEndToEnd.ApiService.csproj
@@ -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>
 

diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.ApiService/Program.cs b/playground/CosmosEndToEnd/CosmosEndToEnd.ApiService/Program.cs
@@ -13,6 +13,7 @@
 
 var app = builder.Build();
 
+app.MapDefaultEndpoints();
 app.MapGet("/", async (CosmosClient cosmosClient) =>
 {
     var db = (await cosmosClient.CreateDatabaseIfNotExistsAsync("db")).Database;

diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj
@@ -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>
 

diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.props b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.props
diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.targets b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Directory.Build.targets
diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Program.cs b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Program.cs
@@ -11,11 +11,13 @@
        .WithExternalHttpEndpoints()
        .WithReference(db);
 
+#if !BUILD_FOR_TEST
 // This project is only added in playground projects to support development/debugging
 // of the dashboard. It is not required in end developer code. Comment out this code
 // to test end developer dashboard launch experience. Refer to Directory.Build.props
 // for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
 // in the artifacts dir).
 builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
+#endif
 
 builder.Build().Run();
diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Properties/launchSettings.json b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Properties/launchSettings.json
@@ -11,7 +11,7 @@
         "DOTNET_ENVIRONMENT": "Development",
         "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:16175",
         "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:17037",
-        "DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true",
+        "DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true"
       }
     },
     "http": {

diff --git a/playground/CustomResources/CustomResources.AppHost/CustomResources.AppHost.csproj b/playground/CustomResources/CustomResources.AppHost/CustomResources.AppHost.csproj
@@ -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>
diff --git a/playground/CustomResources/CustomResources.AppHost/Directory.Build.props b/playground/CustomResources/CustomResources.AppHost/Directory.Build.props
diff --git a/playground/CustomResources/CustomResources.AppHost/Directory.Build.targets b/playground/CustomResources/CustomResources.AppHost/Directory.Build.targets
diff --git a/playground/CustomResources/CustomResources.AppHost/Program.cs b/playground/CustomResources/CustomResources.AppHost/Program.cs
@@ -7,11 +7,13 @@
 
 builder.AddParameter("p0");
 
+#if !BUILD_FOR_TEST
 // This project is only added in playground projects to support development/debugging
 // of the dashboard. It is not required in end developer code. Comment out this code
 // to test end developer dashboard launch experience. Refer to Directory.Build.props
 // for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
 // in the artifacts dir).
 builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
+#endif
 
 builder.Build().Run();
diff --git a/...ground/DatabaseMigration/DatabaseMigration.ApiService/DatabaseMigration.ApiService.csproj b/...ground/DatabaseMigration/DatabaseMigration.ApiService/DatabaseMigration.ApiService.csproj
@@ -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>

diff --git a/playground/DatabaseMigration/DatabaseMigration.AppHost/DatabaseMigration.AppHost.csproj b/playground/DatabaseMigration/DatabaseMigration.AppHost/DatabaseMigration.AppHost.csproj
@@ -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" />

diff --git a/playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.props b/playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.props
diff --git a/playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.targets b/playground/DatabaseMigration/DatabaseMigration.AppHost/Directory.Build.targets