Update Aspire (dotnet#6858)

* Update Aspire

* Update Aspire template README

---------

Co-authored-by: Mackinnon Buck <[email protected]>

Author: 2 people

src/ProjectTemplates/GeneratedContent.targets

@@ -44,9 +44,9 @@
       <TemplatePackageVersion_MicrosoftExtensionsAI>9.9.1</TemplatePackageVersion_MicrosoftExtensionsAI>
       <TemplatePackageVersion_MicrosoftExtensionsAIOpenAI>9.9.1-preview.1.25474.6</TemplatePackageVersion_MicrosoftExtensionsAIOpenAI>
 
-      <TemplatePackageVersion_Aspire>9.4.0</TemplatePackageVersion_Aspire>
-      <TemplatePackageVersion_Aspire_Preview>9.4.0-preview.1.25378.8</TemplatePackageVersion_Aspire_Preview>
-      <TemplatePackageVersion_AzureAIOpenAI>2.3.0-beta.1</TemplatePackageVersion_AzureAIOpenAI>
+      <TemplatePackageVersion_Aspire>9.5.0</TemplatePackageVersion_Aspire>
+      <TemplatePackageVersion_Aspire_Preview>9.5.0-preview.1.25474.7</TemplatePackageVersion_Aspire_Preview>
+      <TemplatePackageVersion_AzureAIOpenAI>2.3.0-beta.2</TemplatePackageVersion_AzureAIOpenAI>
       <TemplatePackageVersion_AzureAIProjects>1.0.0-beta.9</TemplatePackageVersion_AzureAIProjects>
       <TemplatePackageVersion_AzureIdentity>1.14.0</TemplatePackageVersion_AzureIdentity>
       <TemplatePackageVersion_AzureSearchDocuments>11.6.1</TemplatePackageVersion_AzureSearchDocuments>

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/template.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/template",
   "author": "Microsoft",
-  "classifications": [ "Common", "AI", "Web", "Blazor", ".NET Aspire" ],
+  "classifications": [ "Common", "AI", "Web", "Blazor", "Aspire" ],
   "identity": "Microsoft.Extensions.AI.Templates.WebChat.CSharp",
   "name": "AI Chat Web App",
   "description": "A project template for creating an AI chat application, which uses retrieval-augmented generation (RAG) to chat with your own data.",
@@ -183,7 +183,7 @@
       "displayName": "Use Aspire orchestration",
       "datatype": "bool",
       "defaultValue": "false",
-      "description": "Create the project as a distributed application using .NET Aspire."
+      "description": "Create the project as a distributed application using Aspire."
     },
     "IsAspire": {
       "type": "computed",

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/Program.cs renamed to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/AppHost.cs

@@ -7,7 +7,6 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <IsAspireHost>true</IsAspireHost>
     <UserSecretsId>b2f4f5e9-1083-472c-8c3b-f055ac67ba54</UserSecretsId>
   </PropertyGroup>
 

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/ChatWithCustomData-CSharp.AppHost.csproj.in

@@ -9,8 +9,8 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21000",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22000"
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21000",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22000"
       }
     },
     "http": {
@@ -21,8 +21,8 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19000",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20000"
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19000",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20000"
       }
     }
   }

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/Properties/launchSettings.json

@@ -10,11 +10,14 @@
 
 namespace Microsoft.Extensions.Hosting;
 
-// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
+// Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
 // This project should be referenced by each service project in your solution.
 // To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults
 public static class Extensions
 {
+    private const string HealthEndpointPath = "/health";
+    private const string AlivenessEndpointPath = "/alive";
+
     public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
     {
         builder.ConfigureOpenTelemetry();
@@ -64,7 +67,12 @@ public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) w
             .WithTracing(tracing =>
             {
                 tracing.AddSource(builder.Environment.ApplicationName)
-                    .AddAspNetCoreInstrumentation()
+                    .AddAspNetCoreInstrumentation(tracing =>
+                        // Exclude health check requests from tracing
+                        tracing.Filter = context =>
+                            !context.Request.Path.StartsWithSegments(HealthEndpointPath)
+                            && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath)
+                    )
                     // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package)
                     //.AddGrpcClientInstrumentation()
                     .AddHttpClientInstrumentation()
@@ -111,10 +119,10 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
         if (app.Environment.IsDevelopment())
         {
             // All health checks must pass for app to be considered ready to accept traffic after starting
-            app.MapHealthChecks("/health");
+            app.MapHealthChecks(HealthEndpointPath);
 
             // Only health checks tagged with the "live" tag must pass for app to be considered alive
-            app.MapHealthChecks("/alive", new HealthCheckOptions
+            app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions
             {
                 Predicate = r => r.Tags.Contains("live")
             });

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.ServiceDefaults/Extensions.cs

@@ -31,15 +31,15 @@ public async Task IngestDataAsync(IIngestionSource source)
         var deletedDocuments = await source.GetDeletedDocumentsAsync(documentsForSource);
         foreach (var deletedDocument in deletedDocuments)
         {
-            logger.LogInformation("Removing ingested data for {documentId}", deletedDocument.DocumentId);
+            logger.LogInformation("Removing ingested data for {DocumentId}", deletedDocument.DocumentId);
             await DeleteChunksForDocumentAsync(deletedDocument);
             await documentsCollection.DeleteAsync(deletedDocument.Key);
         }
 
         var modifiedDocuments = await source.GetNewOrModifiedDocumentsAsync(documentsForSource);
         foreach (var modifiedDocument in modifiedDocuments)
         {
-            logger.LogInformation("Processing {documentId}", modifiedDocument.DocumentId);
+            logger.LogInformation("Processing {DocumentId}", modifiedDocument.DocumentId);
             await DeleteChunksForDocumentAsync(modifiedDocument);
 
             await documentsCollection.UpsertAsync(modifiedDocument);
@@ -54,7 +54,7 @@ async Task DeleteChunksForDocumentAsync(IngestedDocument document)
         {
             var documentId = document.DocumentId;
             var chunksToDelete = await chunksCollection.GetAsync(record => record.DocumentId == documentId, int.MaxValue).ToListAsync();
-            if (chunksToDelete.Any())
+            if (chunksToDelete.Count != 0)
             {
                 await chunksCollection.DeleteAsync(chunksToDelete.Select(r => r.Key));
             }

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DataIngestor.cs

@@ -84,38 +84,8 @@ Note: Ollama and Docker are excellent open source products, but are not maintain
 #### ---#if (IsAzureOpenAI || UseAzureAISearch)
 ## Using Azure Provisioning
 
-The project is set up to automatically provision Azure resources, but local configuration is configured. For detailed instructions, see the [Local Provisioning documentation](https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration).
+The project is set up to automatically provision Azure resources. When running the app for the first time, you will be prompted to provide Azure configuration values. For detailed instructions, see the [Local Provisioning documentation](https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration).
 
-#### ---#if (hostIdentifier == "vs")
-Configure local provisioning for this project using .NET User Secrets:
-
-1. In Visual Studio, right-click on the ChatWithCustomData-CSharp.AppHost project in the Solution Explorer and select "Manage User Secrets".
-2. This opens a `secrets.json` file where you can store your API keys without them being tracked in source control. Add the following configuration:
-
-   ```json
-   {
-     "Azure": {
-       "SubscriptionId": "<Your subscription id>",
-       "AllowResourceGroupCreation": true,
-       "ResourceGroup": "<Valid resource group name>",
-       "Location": "<Valid Azure location>"
-     }
-   }
-   ```
-
-#### ---#else
-From the command line, configure local provisioning for this project using .NET User Secrets by running the following commands:
-
-```sh
-cd ChatWithCustomData-CSharp.AppHost
-dotnet user-secrets set Azure:SubscriptionId "<Your subscription id>"
-dotnet user-secrets set Azure:AllowResourceGroupCreation "true"
-dotnet user-secrets set Azure:ResourceGroup "<Valid resource group name>"
-dotnet user-secrets set Azure:Location "<Valid Azure location>"
-```
-#### ---#endif
-
-Make sure to replace placeholder values with real configuration values.
 #### ---#endif
 #### ---#if (UseQdrant)
 
@@ -143,9 +113,9 @@ Note: Qdrant and Docker are excellent open source products, but are not maintain
 
 ## Trust the localhost certificate
 
-Several .NET Aspire templates include ASP.NET Core projects that are configured to use HTTPS by default. If this is the first time you're running the project, an exception might occur when loading the Aspire dashboard. This error can be resolved by trusting the self-signed development certificate with the .NET CLI.
+Several Aspire templates include ASP.NET Core projects that are configured to use HTTPS by default. If this is the first time you're running the project, an exception might occur when loading the Aspire dashboard. This error can be resolved by trusting the self-signed development certificate with the .NET CLI.
 
-See [Troubleshoot untrusted localhost certificate in .NET Aspire](https://learn.microsoft.com/dotnet/aspire/troubleshooting/untrusted-localhost-certificate) for more information.
+See [Troubleshoot untrusted localhost certificate in Aspire](https://learn.microsoft.com/dotnet/aspire/troubleshooting/untrusted-localhost-certificate) for more information.
 
 # Updating JavaScript dependencies
 

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md

@@ -17,19 +17,8 @@ This incompatibility can be addressed by upgrading to Docker Desktop 4.41.1. See
 
 ## Using Azure Provisioning
 
-The project is set up to automatically provision Azure resources, but local configuration is configured. For detailed instructions, see the [Local Provisioning documentation](https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration).
+The project is set up to automatically provision Azure resources. When running the app for the first time, you will be prompted to provide Azure configuration values. For detailed instructions, see the [Local Provisioning documentation](https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration).
 
-From the command line, configure local provisioning for this project using .NET User Secrets by running the following commands:
-
-```sh
-cd aichatweb.AppHost
-dotnet user-secrets set Azure:SubscriptionId "<Your subscription id>"
-dotnet user-secrets set Azure:AllowResourceGroupCreation "true"
-dotnet user-secrets set Azure:ResourceGroup "<Valid resource group name>"
-dotnet user-secrets set Azure:Location "<Valid Azure location>"
-```
-
-Make sure to replace placeholder values with real configuration values.
 
 # Running the application
 
@@ -47,9 +36,9 @@ Make sure to replace placeholder values with real configuration values.
 
 ## Trust the localhost certificate
 
-Several .NET Aspire templates include ASP.NET Core projects that are configured to use HTTPS by default. If this is the first time you're running the project, an exception might occur when loading the Aspire dashboard. This error can be resolved by trusting the self-signed development certificate with the .NET CLI.
+Several Aspire templates include ASP.NET Core projects that are configured to use HTTPS by default. If this is the first time you're running the project, an exception might occur when loading the Aspire dashboard. This error can be resolved by trusting the self-signed development certificate with the .NET CLI.
 
-See [Troubleshoot untrusted localhost certificate in .NET Aspire](https://learn.microsoft.com/dotnet/aspire/troubleshooting/untrusted-localhost-certificate) for more information.
+See [Troubleshoot untrusted localhost certificate in Aspire](https://learn.microsoft.com/dotnet/aspire/troubleshooting/untrusted-localhost-certificate) for more information.
 
 # Updating JavaScript dependencies