✅ Merge main into live

docfx.json

@@ -190,6 +190,7 @@
           "Visual Studio",
           "Vue",
           "WASM",
+          "Web PubSub",
           "Worker Service"
         ]
       }

docs/azureai/azureai-openai-integration.md

@@ -103,7 +103,7 @@ The preceding Bicep is a module that provisions an Azure Cognitive Services reso
     - `modelVersion`: The model version of the deployment resource, set to `2025-02-27`.
 - `connectionString`: The connection string, containing the endpoint of the Cognitive Services resource.
 
-The generated Bicep is a starting point and can be customized to meet your specific requirements.
+The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 ### Customize provisioning infrastructure
 

docs/azureai/azureai-search-document-integration.md

@@ -73,7 +73,7 @@ The preceding Bicep is a module that provisions an Azure AI Search service resou
 - `search_SearchServiceContributor`: The role assignment for the Azure AI Search service contributor role. For more information, see [Search Service Contributor](/azure/role-based-access-control/built-in-roles/ai-machine-learning#search-service-contributor).
 - `connectionString`: The connection string for the Azure AI Search service, which is used to connect to the service. The connection string is generated using the `Endpoint` property of the Azure AI Search service.
 
-The generated Bicep is a starting point and can be customized to meet your specific requirements.
+The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 #### Customize provisioning infrastructure
 

docs/caching/includes/azure-redis-app-host.md

@@ -64,7 +64,7 @@ The preceding Bicep is a module that provisions an Azure Cache for Redis with th
 - `redis_contributor`: The contributor of the Azure Cache for Redis resource, with an access policy name of `Data Contributor`.
 - `connectionString`: The connection string of the Azure Cache for Redis resource.
 
-In addition to the Azure Cache for Redis, it also provisions an access policy assignment to the application access to the cache. The generated Bicep is a starting point and can be customized to meet your specific requirements.
+In addition to the Azure Cache for Redis, it also provisions an access policy assignment to the application access to the cache. The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 #### Customize provisioning infrastructure
 

docs/database/includes/cosmos-app-host.md

@@ -55,7 +55,7 @@ The preceding Bicep is a module that provisions an Azure Cosmos DB account with
 - `consistencyPolicy`: The consistency policy of the Cosmos DB account. The default is `Session`.
 - `locations`: The locations for the Cosmos DB account. The default is the resource group's location.
 
-In addition to the Cosmos DB account, it also adds the current application to the `Data Contributor` role for the Cosmos DB account. The generated Bicep is a starting point and can be customized to meet your specific requirements.
+In addition to the Cosmos DB account, it also adds the current application to the `Data Contributor` role for the Cosmos DB account. The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 #### Customize provisioning infrastructure
 

docs/database/includes/postgresql-flexible-server.md

@@ -73,7 +73,7 @@ The preceding Bicep is a module that provisions an Azure PostgreSQL flexible ser
 - `sku`: The SKU of the PostgreSQL server. The default is `Standard_B1ms`.
 - `tags`: The tags of the PostgreSQL server. The default is `aspire-resource-name` set to the name of the Aspire resource, in this case `postgres-flexible`.
 
-In addition to the PostgreSQL flexible server, it also provisions an Azure Firewall rule to allow all Azure IP addresses. Finally, an administrator is created for the PostgreSQL server, and the connection string is outputted as an output variable. The generated Bicep is a starting point and can be customized to meet your specific requirements.
+In addition to the PostgreSQL flexible server, it also provisions an Azure Firewall rule to allow all Azure IP addresses. Finally, an administrator is created for the PostgreSQL server, and the connection string is outputted as an output variable. The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 #### Customize provisioning infrastructure
 

docs/database/sql-server-entity-framework-integration.md

@@ -90,7 +90,7 @@ builder.EnrichSqlServerDbContext<ExampleDbContext>(
     configureSettings: settings =>
     {
         settings.DisableRetry = false;
-        settings.CommandTimeout = 30 // seconds
+        settings.CommandTimeout = 30; // seconds
     });
 ```
 

docs/includes/vscode-file-new.md

@@ -4,3 +4,5 @@ Visual Studio Code provides .NET Aspire project templates that handle some initi
 1. Select the **.NET Aspire Starter App** template.
 
     :::image type="content" loc-scope="vs-code" source="media/vscode-create-starter-app.png" lightbox="media/vscode-create-starter-app.png" alt-text="A screenshot of the .NET Aspire Starter App template.":::
+
+1. Select a folder for the new project, and the enter a name for it.

docs/messaging/azure-event-hubs-integration.md

@@ -1,11 +1,13 @@
 ---
 title: .NET Aspire Azure Event Hubs integration
 description: This article describes the .NET Aspire Azure Event Hubs integration features and capabilities.
-ms.date: 02/25/2025
+ms.date: 03/10/2025
 ---
 
 # .NET Aspire Azure Event Hubs integration
 
+[!INCLUDE [includes-hosting-and-client](../includes/includes-hosting-and-client.md)]
+
 [Azure Event Hubs](/azure/event-hubs/event-hubs-about) is a native data-streaming service in the cloud that can stream millions of events per second, with low latency, from any source to any destination. The .NET Aspire Azure Event Hubs integration enables you to connect to Azure Event Hubs instances from your .NET applications.
 
 ## Hosting integration
@@ -74,7 +76,7 @@ The preceding Bicep is a module that provisions an Azure Event Hubs resource wit
 - `messages`: The Event Hub resource.
 - `eventHubsEndpoint`: The endpoint of the Event Hubs resource.
 
-The generated Bicep is a starting point and can be customized to meet your specific requirements.
+The generated Bicep is a starting point and is influenced by changes to the provisioning infrastructure in C#. Customizations to the Bicep file directly will be overwritten, so make changes through the C# provisioning APIs to ensure they are reflected in the generated files.
 
 #### Customize provisioning infrastructure
 
@@ -484,6 +486,8 @@ The .NET Aspire Azure Event Hubs library supports <xref:Microsoft.Extensions.Con
 }
 ```
 
+For the complete Azure Event Hubs client integration JSON schema, see [Aspire.Azure.Messaging.EventHubs/ConfigurationSchema.json](https://github.com/dotnet/aspire/blob/v9.1.0/src/Components/Aspire.Azure.Messaging.EventHubs/ConfigurationSchema.json).
+
 You can also setup the Options type using the optional `Action<IAzureClientBuilder<EventProcessorClient, EventProcessorClientOptions>> configureClientBuilder` parameter of the `AddAzureEventProcessorClient` method. For example, to set the processor's client ID for this client:
 
 ```csharp