From 18d6778b632a18e97705d5e02e1a726c84f669e6 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Thu, 5 Mar 2026 16:01:27 -0800
Subject: [PATCH 1/6] =?UTF-8?q?Update=20Foundry=20integration=20naming:=20?=
 =?UTF-8?q?Azure=20AI=20Foundry=20=E2=86=92=20Microsoft=20Foundry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rename package references from Aspire.Hosting.Azure.AIFoundry to Aspire.Hosting.Foundry
- Update type references: AzureAIFoundryResource → FoundryResource
- Update method references: AddAzureAIFoundry → AddFoundry
- Update branding from 'Azure AI Foundry' to 'Microsoft Foundry' in all docs
- Keep 'Foundry Local' naming unchanged
- Update integration data files (names, docs links, integrations catalog)
- Update sidebar, integration grid, compatibility matrix
- Update whats-new release notes for 9.4 and 9.5

Related: dotnet/aspire#14149

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../config/sidebar/integrations.topics.ts     |  2 +-
 .../src/components/IntegrationGrid.astro      |  2 +-
 .../cloud/azure/ai-compatibility-matrix.mdx   | 16 +++---
 .../azure-ai-foundry-client.mdx               | 14 ++---
 .../azure-ai-foundry-get-started.mdx          | 26 +++++-----
 .../azure-ai-foundry-host.mdx                 | 52 +++++++++----------
 .../azure-ai-inference-client.mdx             | 12 ++---
 .../azure-ai-inference-get-started.mdx        |  4 +-
 .../azure-ai-inference-host.mdx               |  6 +--
 .../integrations/cloud/azure/overview.mdx     |  2 +-
 .../src/content/docs/whats-new/aspire-9-4.mdx | 22 ++++----
 .../src/content/docs/whats-new/aspire-9-5.mdx |  4 +-
 .../src/data/aspire-integration-names.json    |  2 +-
 .../src/data/aspire-integrations.json         |  7 ++-
 src/frontend/src/data/integration-docs.json   |  2 +-
 15 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/src/frontend/config/sidebar/integrations.topics.ts b/src/frontend/config/sidebar/integrations.topics.ts
index f6c2ad075..db06a94d4 100644
--- a/src/frontend/config/sidebar/integrations.topics.ts
+++ b/src/frontend/config/sidebar/integrations.topics.ts
@@ -325,7 +325,7 @@ export const integrationTopics: StarlightSidebarTopicsUserConfig = {
                   slug: 'integrations/cloud/azure/ai-compatibility-matrix',
                 },
                 {
-                  label: 'Azure AI Foundry',
+                  label: 'Microsoft Foundry',
                   collapsed: true,
                   items: [
                     {
diff --git a/src/frontend/src/components/IntegrationGrid.astro b/src/frontend/src/components/IntegrationGrid.astro
index 949a359a0..fc629e311 100644
--- a/src/frontend/src/components/IntegrationGrid.astro
+++ b/src/frontend/src/components/IntegrationGrid.astro
@@ -109,7 +109,7 @@ const icons = [
   },
   { meta: adminerIcon, alt: 'Adminer', search: 'adminer' },
   { meta: awsIcon, alt: 'AWS', search: 'aws', light: awsLightIcon },
-  { meta: azureAiFoundryIcon, alt: 'Azure AI Foundry', search: 'aifoundry' },
+  { meta: azureAiFoundryIcon, alt: 'Microsoft Foundry', search: 'foundry' },
   {
     meta: azureAppconfigIcon,
     alt: 'Azure App Configuration',
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
index 02d3811c8..bf9c27752 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
@@ -13,7 +13,7 @@ The following table shows the compatibility between Aspire AI hosting and client
 
 | **Hosting Integration** | **Aspire.OpenAI** | **Aspire.Azure.AI.OpenAI** | **Aspire.Azure.AI.Inference** |
 |--|--|--|--|
-| `Aspire.Hosting.Azure.AIFoundry` | ❌ No | ⚠️ Partial | ✅ Yes (preferred) |
+| `Aspire.Hosting.Foundry` | ❌ No | ⚠️ Partial | ✅ Yes (preferred) |
 | `Aspire.Hosting.Azure.CognitiveServices` | ❌ No | ✅ Yes (preferred) | ❌ No |
 | `Aspire.Hosting.OpenAI` | ✅ Yes (preferred) | ✅ Yes | ❌ No |
 | `Aspire.Hosting.GitHub.Models` | ⚠️ Partial | ❌ No | ✅ Yes (preferred) |
@@ -31,18 +31,18 @@ The following table shows the compatibility between Aspire AI hosting and client
 
 In general, use **Aspire.Azure.AI.Inference** to connect to Azure hosted models, or **Aspire.OpenAI** to connect directly to OpenAI.
 
-### Azure AI Foundry
+### Microsoft Foundry
 
-For Azure AI Foundry resources, use the **Aspire.Azure.AI.Inference** client integration. This provides the best compatibility with the diverse range of models available through Azure AI Foundry. For more information, see [Azure AI Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+For Microsoft Foundry resources, use the **Aspire.Azure.AI.Inference** client integration. This provides the best compatibility with the diverse range of models available through Microsoft Foundry. For more information, see [Microsoft Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
 #### Hosting integration
 
-The [Aspire.Hosting.Azure.AIFoundry](https://www.nuget.org/packages/Aspire.Hosting.Azure.AIFoundry) package provides the hosting integration. In your app host project:
+The [Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) package provides the hosting integration. In your app host project:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(foundry);
@@ -139,7 +139,7 @@ Each hosting integration generates connection strings in different formats that
 
 ### Hosting integration connection strings
 
-#### Aspire.Hosting.Azure.AIFoundry
+#### Aspire.Hosting.Foundry
 
 **Azure:**
 
@@ -147,7 +147,7 @@ Each hosting integration generates connection strings in different formats that
 Endpoint={Endpoint};EndpointAIInference={AIFoundryApiEndpoint}models
 ```
 
-**Foundry local:**
+**Foundry Local:**
 
 ```
 Endpoint={EmulatorServiceUri};Key={ApiKey}
@@ -219,6 +219,6 @@ Uses `EndpointAIInference` if available, otherwise `Endpoint`.
 
 - [Azure OpenAI integration](/integrations/cloud/azure/azure-openai/azure-openai-get-started/)
 - [Azure AI Inference integration](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/)
-- [Azure AI Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/)
+- [Microsoft Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/)
 - [Azure AI Search integration](/integrations/cloud/azure/azure-ai-search/azure-ai-search-get-started/)
 - [Microsoft.Extensions.AI documentation](https://learn.microsoft.com/dotnet/ai/ai-extensions)
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
index b167c6b2b..c151f6fce 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
@@ -1,6 +1,6 @@
 ---
-title: Azure AI Foundry client integration
-description: Learn how to use the Aspire Azure AI Foundry client integration to connect to Azure AI Foundry services.
+title: Microsoft Foundry client integration
+description: Learn how to use the Aspire Microsoft Foundry client integration to connect to Microsoft Foundry services.
 next: false
 ---
 
@@ -10,7 +10,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -21,11 +21,11 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 The client integration for Azure AI Foundry is provided through the [Azure AI Inference](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) integration.
 
-For an introduction to working with the Azure AI Foundry client integration, see [Get started with the Azure AI Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+For an introduction to working with the Microsoft Foundry client integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
-## Using Azure AI Foundry from client applications
+## Using Microsoft Foundry from client applications
 
-To use Azure AI Foundry services from your client applications, you'll use the Azure AI Inference client integration. This integration provides a consistent way to interact with various AI models deployed in Azure AI Foundry, including chat completions, embeddings, and other AI capabilities.
+To use Microsoft Foundry services from your client applications, you'll use the Azure AI Inference client integration. This integration provides a consistent way to interact with various AI models deployed in Microsoft Foundry, including chat completions, embeddings, and other AI capabilities.
 
 For detailed information on how to:
 
@@ -45,7 +45,7 @@ See the complete [Azure AI Inference integration documentation](/integrations/cl
         href="/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/"
     />
     <LinkCard
-        title="Azure AI Foundry Hosting integration"
+        title="Microsoft Foundry Hosting integration"
         description="Learn more about the hosting integration features and capabilities"
         href="/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/"
     />
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
index b7d59b21b..9137b78ba 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
@@ -1,6 +1,6 @@
 ---
-title: Get started with the Azure AI Foundry integrations
-description: Learn how to set up the Aspire Azure AI Foundry hosting and client integrations simply.
+title: Get started with the Microsoft Foundry integrations
+description: Learn how to set up the Aspire Microsoft Foundry hosting and client integrations simply.
 prev: false
 ---
 
@@ -11,7 +11,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -20,9 +20,9 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-[Azure AI Foundry](https://learn.microsoft.com/ai-studio) provides a unified platform for developing, testing, and deploying AI applications. The Aspire Azure AI Foundry integration enables you to connect to Azure AI Foundry services from your applications, providing access to various AI capabilities including model deployments, prompt flow, and more.
+[Microsoft Foundry](https://learn.microsoft.com/ai-studio) provides a unified platform for developing, testing, and deploying AI applications. The Aspire Microsoft Foundry integration enables you to connect to Microsoft Foundry services from your applications, providing access to various AI capabilities including model deployments, prompt flow, and more.
 
-In this introduction, you'll see how to install and use the Aspire Azure AI Foundry integrations in a simple configuration. If you already have this knowledge, see [Azure AI Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/) for full reference details.
+In this introduction, you'll see how to install and use the Aspire Microsoft Foundry integrations in a simple configuration. If you already have this knowledge, see [Microsoft Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/) for full reference details.
 
 <Aside type="note">
     To follow this guide, you must have created an Aspire solution to work with. To learn how to do that, see [Build your first Aspire app](/get-started/first-app/).
@@ -30,16 +30,16 @@ In this introduction, you'll see how to install and use the Aspire Azure AI Foun
 
 ## Set up hosting integration
 
-To begin, install the Aspire Azure AI Foundry Hosting integration in your Aspire AppHost project. This integration allows you to create and manage Azure AI Foundry resources from your Aspire hosting projects:
+To begin, install the Aspire Microsoft Foundry Hosting integration in your Aspire AppHost project. This integration allows you to create and manage Microsoft Foundry resources from your Aspire hosting projects:
 
-<InstallPackage packageName="Aspire.Hosting.Azure.AIFoundry" />
+<InstallPackage packageName="Aspire.Hosting.Foundry" />
 
-Next, in the AppHost project, create an Azure AI Foundry resource and pass it to the consuming client projects:
+Next, in the AppHost project, create an Microsoft Foundry resource and pass it to the consuming client projects:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
 
@@ -52,14 +52,14 @@ builder.AddProject<Projects.ExampleProject>()
 builder.Build().Run();
 ```
 
-The preceding code adds an Azure AI Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds an Microsoft Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 <Aside type="caution">
-  When you call `AddAzureAIFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
+  When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
 </Aside>
 
 <Aside type="tip">
-    This is the simplest implementation of Azure AI Foundry resources in the AppHost. There are many more options you can choose from to address your requirements. For full details, see [Azure AI Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/).
+    This is the simplest implementation of Microsoft Foundry resources in the AppHost. There are many more options you can choose from to address your requirements. For full details, see [Microsoft Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/).
 </Aside>
 
 ## Set up client integration
@@ -72,7 +72,7 @@ For more information on using the client integration, see the [Azure AI Inferenc
 
 <CardGrid>
     <LinkCard
-        title="Azure AI Foundry Hosting integration"
+        title="Microsoft Foundry Hosting integration"
         description="Learn more about the hosting integration features and capabilities"
         href="/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/"
     />
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index 36f08d7ea..30b0d9485 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -1,6 +1,6 @@
 ---
-title: Azure AI Foundry hosting integration
-description: Learn how to use the Aspire Azure AI Foundry hosting integration to create Azure AI Foundry resources.
+title: Microsoft Foundry hosting integration
+description: Learn how to use the Aspire Microsoft Foundry hosting integration to create Microsoft Foundry resources.
 ---
 
 import { Aside, Badge } from '@astrojs/starlight/components';
@@ -10,7 +10,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -19,20 +19,20 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-The Aspire Azure AI Foundry hosting integration models the AI Foundry project as the `AzureAIFoundryResource` type. To access this type and APIs for expressing them within your AppHost project, install the [📦 Aspire.Hosting.Azure.AIFoundry](https://www.nuget.org/packages/Aspire.Hosting.Azure.AIFoundry) NuGet package:
+The Aspire Microsoft Foundry hosting integration models the Microsoft Foundry project as the `FoundryResource` type. To access this type and APIs for expressing them within your AppHost project, install the [📦 Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) NuGet package:
 
-<InstallPackage packageName="Aspire.Hosting.Azure.AIFoundry" />
+<InstallPackage packageName="Aspire.Hosting.Foundry" />
 
-For an introduction to working with the Azure AI Foundry hosting integration, see [Get started with the Azure AI Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+For an introduction to working with the Microsoft Foundry hosting integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
-## Add an Azure AI Foundry resource
+## Add a Microsoft Foundry resource
 
-To add an Azure AI Foundry resource to your AppHost project, call the `AddAzureAIFoundry` method providing a name:
+To add a Microsoft Foundry resource to your AppHost project, call the `AddFoundry` method providing a name:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 builder.AddProject<Projects.ExampleProject>()
        .WithReference(foundry);
@@ -40,19 +40,19 @@ builder.AddProject<Projects.ExampleProject>()
 // After adding all resources, run the app...
 ```
 
-The preceding code adds an Azure AI Foundry resource named `foundry` to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds a Microsoft Foundry resource named `foundry` to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 > [!IMPORTANT]
-> When you call `AddAzureAIFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
+> When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
 
-## Add an Azure AI Foundry deployment resource
+## Add a Microsoft Foundry deployment resource
 
-To add an Azure AI Foundry deployment resource, call the `AddDeployment` method:
+To Add a Microsoft Foundry deployment resource, call the `AddDeployment` method:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
 
@@ -65,8 +65,8 @@ builder.AddProject<Projects.ExampleProject>()
 
 The preceding code:
 
-- Adds an Azure AI Foundry resource named `foundry`.
-- Adds an Azure AI Foundry deployment resource named `chat` with a model name of `Phi-4`. The model name must correspond to an [available model](https://learn.microsoft.com/azure/ai-foundry/foundry-models/concepts/models) in the Azure AI Foundry service.
+- Adds a Microsoft Foundry resource named `foundry`.
+- Adds a Microsoft Foundry deployment resource named `chat` with a model name of `Phi-4`. The model name must correspond to an [available model](https://learn.microsoft.com/azure/ai-foundry/foundry-models/concepts/models) in the Microsoft Foundry service.
 
 > [!NOTE]
 > The fourth parameter of the `AddDeployment(...)` method specifies the model publisher or provider. Common values include:
@@ -74,7 +74,7 @@ The preceding code:
 > - `"OpenAI"` for GPT models (e.g., GPT-4o, GPT-4, GPT-3.5 Turbo)
 > - `"Microsoft"` for Phi models (e.g., Phi-4, Phi-3.5)
 >
-> For more information, see the [AIFoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.azure.aifoundrymodel).
+> For more information, see the [AIFoundryModel API reference](https://learn.microsoft.com/dotnet/api/Aspire.Hosting.Foundrymodel).
 
 ## Configure deployment properties
 
@@ -91,9 +91,9 @@ var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft")
 
 The preceding code sets the SKU name to `Standard` and capacity to `10` for the deployment.
 
-## Connect to an existing Azure AI Foundry service
+## Connect to an existing Microsoft Foundry service
 
-You might have an existing Azure AI Foundry service that you want to connect to. You can chain a call to annotate that your `AzureAIFoundryResource` is an existing resource:
+You might have an existing Microsoft Foundry service that you want to connect to. You can chain a call to annotate that your `FoundryResource` is an existing resource:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
@@ -101,7 +101,7 @@ var builder = DistributedApplication.CreateBuilder(args);
 var existingFoundryName = builder.AddParameter("existingFoundryName");
 var existingFoundryResourceGroup = builder.AddParameter("existingFoundryResourceGroup");
 
-var foundry = builder.AddAzureAIFoundry("foundry")
+var foundry = builder.AddFoundry("foundry")
     .AsExisting(existingFoundryName, existingFoundryResourceGroup);
 
 builder.AddProject<Projects.ExampleProject>()
@@ -120,7 +120,7 @@ Aspire supports the usage of Foundry Local for local development. Add the follow
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry")
+var foundry = builder.AddFoundry("foundry")
     .RunAsFoundryLocal();
 
 var chat = foundry.AddDeployment("chat", "phi-3.5-mini", "1", "Microsoft");
@@ -138,21 +138,21 @@ The `RunAsFoundryLocal` method configures the resource to run as an emulator. It
 
 ## Assign roles to resources
 
-You can assign specific roles to resources that need to access the Azure AI Foundry service. Use the `WithRoleAssignments` method:
+You can assign specific roles to resources that need to access the Microsoft Foundry service. Use the `WithRoleAssignments` method:
 
 ```csharp title="C# — AppHost.cs"
-var foundry = builder.AddAzureAIFoundry("chat");
+var foundry = builder.AddFoundry("chat");
 
 builder.AddProject<Projects.Api>("api")
   .WithRoleAssignments(foundry, CognitiveServicesBuiltInRole.CognitiveServicesUser)
   .WithReference(foundry);
 ```
 
-The preceding code assigns the `CognitiveServicesUser` role to the `api` project, granting it the necessary permissions to access the Azure AI Foundry resource.
+The preceding code assigns the `CognitiveServicesUser` role to the `api` project, granting it the necessary permissions to access the Microsoft Foundry resource.
 
 ## Provisioning-generated Bicep
 
-If you're new to [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview), it's a domain-specific language for defining Azure resources. With Aspire, you don't need to write Bicep by-hand, instead the provisioning APIs generate Bicep for you. When you publish your app, the generated Bicep provisions an Azure AI Foundry resource with standard defaults.
+If you're new to [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview), it's a domain-specific language for defining Azure resources. With Aspire, you don't need to write Bicep by-hand, instead the provisioning APIs generate Bicep for you. When you publish your app, the generated Bicep provisions a Microsoft Foundry resource with standard defaults.
 
 ```bicep title="Generated Bicep — ai-foundry.bicep"
 @description('The location for the resource(s) to be deployed.')
@@ -245,7 +245,7 @@ The generated Bicep is a starting point and is influenced by changes to the prov
 All Aspire Azure resources are subclasses of the `AzureProvisioningResource` type. This enables customization of the generated Bicep by providing a fluent API to configure the Azure resources—using the `ConfigureInfrastructure` API:
 
 ```csharp title="C# — AppHost.cs"
-builder.AddAzureAIFoundry("foundry")
+builder.AddFoundry("foundry")
   .ConfigureInfrastructure(infra =>
   {
       var resources = infra.GetProvisionableResources();
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
index 90fc7be0a..2ccf56dae 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
@@ -45,7 +45,7 @@ builder.AddAzureChatCompletionsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Azure AI Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
 
 After adding the `ChatCompletionsClient`, you can retrieve the client instance using dependency injection:
 
@@ -60,7 +60,7 @@ For more information, see:
 
 - [What is Azure AI model inference?](https://learn.microsoft.com/azure/ai-foundry/foundry-models/supported-languages?view=foundry-classic) for details on Azure AI model inference.
 - [Dependency injection in .NET](https://learn.microsoft.com/dotnet/core/extensions/dependency-injection) for details on dependency injection.
-- [The Azure AI Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
+- [The Microsoft Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
 
 ### Add Azure AI Inference Chat Completions client with registered `IChatClient`
 
@@ -132,7 +132,7 @@ builder.AddAzureEmbeddingsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Azure AI Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
 
 After adding the `EmbeddingsClient`, you can retrieve the client instance using dependency injection:
 
@@ -147,7 +147,7 @@ For more information, see:
 
 - [What is Azure AI model inference?](https://learn.microsoft.com/azure/ai-foundry/foundry-models/supported-languages?view=foundry-classic) for details on Azure AI model inference.
 - [Dependency injection in .NET](https://learn.microsoft.com/dotnet/core/extensions/dependency-injection) for details on dependency injection.
-- [The Azure AI Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
+- [The Microsoft Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
 
 ### Add Azure AI Inference Embeddings client with registered `IEmbeddingGenerator`
 
@@ -211,7 +211,7 @@ For more information, see [Keyed services in .NET](https://learn.microsoft.com/d
 
 ### Configuration
 
-The Azure AI Inference library provides multiple options to configure the Azure AI Foundry Service based on the requirements and conventions of your project.
+The Azure AI Inference library provides multiple options to configure the Microsoft Foundry Service based on the requirements and conventions of your project.
 
 > [!NOTE]
 > Either an `Endpoint` and `DeploymentId`, or a `ConnectionString` is required to be supplied.
@@ -233,7 +233,7 @@ builder.AddAzureChatCompletionsClient(
 
 The connection string is retrieved from the `ConnectionStrings` configuration section. Two connection formats are supported:
 
-##### Azure AI Foundry endpoint
+##### Microsoft Foundry endpoint
 
 The recommended approach is to use an `Endpoint`, which works with the `ChatCompletionsClientSettings.Credential` property to establish a connection. If no credential is configured, `DefaultAzureCredential` is used.
 
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
index 117d8ed61..b6ab12872 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
@@ -30,9 +30,9 @@ In this introduction, you'll see how to install and use the Aspire Azure AI Infe
 
 ## Set up hosting integration
 
-Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Azure AI Foundry resource.
+Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Microsoft Foundry resource.
 
-If you already have an [Azure AI Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
+If you already have an [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
index 55a7dfc26..0e88fb10f 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
@@ -18,13 +18,13 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Azure AI Foundry resource.
+Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Microsoft Foundry resource.
 
 For an introduction to working with the Azure AI Inference hosting integration, see [Get started with the Azure AI Inference integrations](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/).
 
-## Connect to an existing Azure AI Foundry service
+## Connect to an existing Microsoft Foundry service
 
-If you already have an [Azure AI Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
+If you already have an [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
index f6db197a2..20a9e5514 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
@@ -48,7 +48,7 @@ Some Azure services can be emulated to run locally. Currently, Aspire supports t
 |--|--|
 | [Azure App Configuration](/integrations/cloud/azure/azure-app-configuration/azure-app-configuration-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureAppConfigurationResource>` to configure the Azure App Configuration resource to be [emulated with the Azure App Configuration Emulator](https://learn.microsoft.com/azure/azure-app-configuration/emulator-overview). |
 | [Azure Cosmos DB](/integrations/cloud/azure/azure-cosmos-db/azure-cosmos-db-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureCosmosDBResource>` to configure the Cosmos DB resource to be [emulated with the NoSQL API](https://learn.microsoft.com/azure/cosmos-db/how-to-develop-emulator). |
-| [Azure AI Foundry](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) | Call `RunAsFoundryLocal` on the `IResourceBuilder<AzureAIFoundryResource>` to configure the resource to be [emulated with Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started). |
+| [Microsoft Foundry](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) | Call `RunAsFoundryLocal` on the `IResourceBuilder<FoundryResource>` to configure the resource to be [emulated with Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started). |
 | [Azure Event Hubs](/integrations/cloud/azure/azure-event-hubs/azure-event-hubs-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureEventHubsResource>` to configure the Event Hubs resource to be [emulated](https://learn.microsoft.com/azure/event-hubs/overview-emulator). |
 | [Azure Service Bus](/integrations/cloud/azure/azure-service-bus/azure-service-bus-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureServiceBusResource>` to configure the Service Bus resource to be [emulated with Service Bus emulator](https://learn.microsoft.com/azure/service-bus-messaging/overview-emulator). |
 | [Azure SignalR Service](/integrations/cloud/azure/azure-signalr/azure-signalr-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureSignalRResource>` to configure the SignalR resource to be [emulated with Azure SignalR emulator](https://learn.microsoft.com/azure/azure-signalr/signalr-howto-emulator). |
diff --git a/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx b/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
index e06746463..51fa226c8 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
@@ -1036,17 +1036,17 @@ The [GitHub Models integration](https://aspire.dev/integrations/ai/github-models
 - **GITHUB_TOKEN fallback** when no explicit API key is provided
 - **Built-in health checks** for model availability
 
-### 🤖 Azure AI Foundry integration
+### 🤖 Microsoft Foundry integration
 
-Aspire 9.4 introduces comprehensive [Azure AI Foundry](https://ai.azure.com/) support, bringing enterprise AI capabilities directly into your distributed applications. This integration simplifies working with AI models and deployments through the Azure AI platform, supporting both Azure-hosted deployments and local development with [Foundry Local](https://github.com/microsoft/Foundry-Local).
+Aspire 9.4 introduces comprehensive [Microsoft Foundry](https://ai.azure.com/) support, bringing enterprise AI capabilities directly into your distributed applications. This integration simplifies working with AI models and deployments through the Azure AI platform, supporting both Azure-hosted deployments and local development with [Foundry Local](https://github.com/microsoft/Foundry-Local).
 
 #### Hosting configuration
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
-// Add Azure AI Foundry project
-var foundry = builder.AddAzureAIFoundry("foundry");
+// Add Microsoft Foundry project
+var foundry = builder.AddFoundry("foundry");
 
 // Add specific model deployments
 var chat = foundry.AddDeployment("chat", "qwen2.5-0.5b", "1", "Microsoft");
@@ -1060,15 +1060,15 @@ var webService = builder.AddProject<Projects.WebService>("webservice")
 builder.Build().Run();
 ```
 
-##### Azure AI Foundry Local support
+##### Foundry Local support
 
-[Azure AI Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/) is an on-device AI inference solution that runs models locally on your hardware, providing performance, privacy, and cost advantages without requiring an Azure subscription. It's ideal for scenarios requiring data privacy, offline operation, cost reduction, or low-latency responses.
+[Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/) is an on-device AI inference solution that runs models locally on your hardware, providing performance, privacy, and cost advantages without requiring an Azure subscription. It's ideal for scenarios requiring data privacy, offline operation, cost reduction, or low-latency responses.
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
 // For local development, run with Foundry Local
-var localFoundry = builder.AddAzureAIFoundry("foundry")
+var localFoundry = builder.AddFoundry("foundry")
     .RunAsFoundryLocal()
     .AddDeployment("chat", "phi-3.5-mini", "1", "Microsoft");
 
@@ -1081,7 +1081,7 @@ builder.Build().Run();
 
 #### Client integration
 
-Once you've configured the [Azure AI Foundry resource](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) in your AppHost, consume it in your services using the [Azure AI Inference SDK](https://aspire.dev/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) or [OpenAI SDK](https://aspire.dev/integrations/cloud/azure/azure-openai/azure-openai-get-started/) for compatible models:
+Once you've configured the [Microsoft Foundry resource](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) in your AppHost, consume it in your services using the [Azure AI Inference SDK](https://aspire.dev/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) or [OpenAI SDK](https://aspire.dev/integrations/cloud/azure/azure-openai/azure-openai-get-started/) for compatible models:
 
 **Using Azure AI Inference SDK:**
 
@@ -1124,12 +1124,12 @@ builder.AddOpenAIClient("chat")
 // Usage is identical to the Azure AI Inference SDK example above
 ```
 
-**Key differences between Azure AI Foundry and Foundry Local:**
+**Key differences between Microsoft Foundry and Foundry Local:**
 
-- **Azure AI Foundry** - Cloud-hosted models with enterprise-grade scaling, supports all Azure AI model deployments
+- **Microsoft Foundry** - Cloud-hosted models with enterprise-grade scaling, supports all Azure AI model deployments
 - **Foundry Local** - On-device inference with different model selection optimized for local hardware, no Azure subscription required
 
-The `RunAsFoundryLocal()` method enables local development scenarios using [Azure AI Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/), allowing you to test AI capabilities without requiring cloud resources during development. This supports automatic model downloading, loading, and management through the integrated Foundry Local runtime.
+The `RunAsFoundryLocal()` method enables local development scenarios using [Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/), allowing you to test AI capabilities without requiring cloud resources during development. This supports automatic model downloading, loading, and management through the integrated Foundry Local runtime.
 
 ### 🗄️ Database hosting improvements
 
diff --git a/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx b/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
index b8482a2e4..25786b2a5 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
@@ -323,7 +323,7 @@ var localOpenAI = builder.AddOpenAI("local-openai")
 var localModel = localOpenAI.AddModel("local-chat", "llama3.2");
 ```
 
-### GitHub Models and Azure AI Foundry typed catalogs
+### GitHub Models and Microsoft Foundry typed catalogs
 
 Aspire 9.5 introduces a typed catalog for GitHub and Azure-hosted models, providing IntelliSense support and refactoring safety when working with AI models. This brings type safety and IntelliSense support for the ever-increasing AI model catalog, and takes the guesswork out of version and "format" strings. The catalog is updated daily.
 
@@ -343,7 +343,7 @@ var embeddingModel = builder.AddGitHubModel("embeddings", GitHubModel.OpenAI.Ope
 For more information, see:
 
 - [Aspire GitHub Models integration (Preview)](https://aspire.dev/integrations/ai/github-models/).
-- [Aspire Azure AI Foundry integration (Preview)](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+- [Aspire Microsoft Foundry integration (Preview)](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
 ### Dev Tunnels hosting integration
 
diff --git a/src/frontend/src/data/aspire-integration-names.json b/src/frontend/src/data/aspire-integration-names.json
index 343d800c1..b9cbf3039 100644
--- a/src/frontend/src/data/aspire-integration-names.json
+++ b/src/frontend/src/data/aspire-integration-names.json
@@ -14,7 +14,7 @@
   "Aspire.Confluent.Kafka",
   "Aspire.Elastic.Clients.Elasticsearch",
   "Aspire.Hosting.AWS",
-  "Aspire.Hosting.Azure.AIFoundry",
+  "Aspire.Hosting.Foundry",
   "Aspire.Hosting.Azure.AppConfiguration",
   "Aspire.Hosting.Azure.AppContainers",
   "Aspire.Hosting.Azure.ApplicationInsights",
diff --git a/src/frontend/src/data/aspire-integrations.json b/src/frontend/src/data/aspire-integrations.json
index b2fc6b4d2..31c69944a 100644
--- a/src/frontend/src/data/aspire-integrations.json
+++ b/src/frontend/src/data/aspire-integrations.json
@@ -303,11 +303,10 @@
     "version": "9.4.1"
   },
   {
-    "title": "Aspire.Hosting.Azure.AIFoundry",
-    "description": "Azure AI Foundry resource types for Aspire.",
+    "title": "Aspire.Hosting.Foundry",
+    "description": "Microsoft Foundry resource types for Aspire.",
     "icon": "https://api.nuget.org/v3-flatcontainer/aspire.hosting.azure.aifoundry/13.1.1-preview.1.26105.8/icon",
-    "icon": "https://api.nuget.org/v3-flatcontainer/aspire.hosting.azure.aifoundry/13.1.1-preview.1.26105.8/icon",
-    "href": "https://www.nuget.org/packages/Aspire.Hosting.Azure.AIFoundry",
+    "href": "https://www.nuget.org/packages/Aspire.Hosting.Foundry",
     "tags": [
       "aspire",
       "integration",
diff --git a/src/frontend/src/data/integration-docs.json b/src/frontend/src/data/integration-docs.json
index 63a9c2e92..a1ba9a6a1 100644
--- a/src/frontend/src/data/integration-docs.json
+++ b/src/frontend/src/data/integration-docs.json
@@ -72,7 +72,7 @@
     "href": "/integrations/cloud/azure/overview/"
   },
   {
-    "match": "Aspire.Hosting.Azure.AIFoundry",
+    "match": "Aspire.Hosting.Foundry",
     "href": "/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/"
   },
   {

From 1adb92420fa6ef16c58cfe8ad11c402043a5e4cf Mon Sep 17 00:00:00 2001
From: David Pine <david.pine@microsoft.com>
Date: Mon, 16 Mar 2026 08:26:55 -0500
Subject: [PATCH 2/6] Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
---
 .../docs/integrations/cloud/azure/ai-compatibility-matrix.mdx | 2 +-
 .../cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx  | 2 +-
 .../azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx   | 4 ++--
 .../cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx    | 4 ++--
 .../azure/azure-ai-inference/azure-ai-inference-client.mdx    | 4 ++--
 .../azure-ai-inference/azure-ai-inference-get-started.mdx     | 2 +-
 .../azure/azure-ai-inference/azure-ai-inference-host.mdx      | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
index bf9c27752..20622c294 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
@@ -144,7 +144,7 @@ Each hosting integration generates connection strings in different formats that
 **Azure:**
 
 ```
-Endpoint={Endpoint};EndpointAIInference={AIFoundryApiEndpoint}models
+Endpoint={Endpoint};EndpointAIInference={EndpointAIInference}models
 ```
 
 **Foundry Local:**
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
index c151f6fce..68493bcc6 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
@@ -19,7 +19,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-The client integration for Azure AI Foundry is provided through the [Azure AI Inference](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) integration.
+The client integration for Microsoft Foundry is provided through the [Azure AI Inference](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) integration.
 
 For an introduction to working with the Microsoft Foundry client integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
index 9137b78ba..1118b0879 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
@@ -34,7 +34,7 @@ To begin, install the Aspire Microsoft Foundry Hosting integration in your Aspir
 
 <InstallPackage packageName="Aspire.Hosting.Foundry" />
 
-Next, in the AppHost project, create an Microsoft Foundry resource and pass it to the consuming client projects:
+Next, in the AppHost project, create a Microsoft Foundry resource and pass it to the consuming client projects:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
@@ -52,7 +52,7 @@ builder.AddProject<Projects.ExampleProject>()
 builder.Build().Run();
 ```
 
-The preceding code adds an Microsoft Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds a Microsoft Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 <Aside type="caution">
   When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index 30b0d9485..79c593194 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -47,7 +47,7 @@ The preceding code adds a Microsoft Foundry resource named `foundry` to the AppH
 
 ## Add a Microsoft Foundry deployment resource
 
-To Add a Microsoft Foundry deployment resource, call the `AddDeployment` method:
+To add a Microsoft Foundry deployment resource, call the `AddDeployment` method:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
@@ -74,7 +74,7 @@ The preceding code:
 > - `"OpenAI"` for GPT models (e.g., GPT-4o, GPT-4, GPT-3.5 Turbo)
 > - `"Microsoft"` for Phi models (e.g., Phi-4, Phi-3.5)
 >
-> For more information, see the [AIFoundryModel API reference](https://learn.microsoft.com/dotnet/api/Aspire.Hosting.Foundrymodel).
+> For more information, see the [FoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.foundrymodel).
 
 ## Configure deployment properties
 
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
index 2ccf56dae..5e86cba2a 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
@@ -45,7 +45,7 @@ builder.AddAzureChatCompletionsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-microsoft-foundry-service).
 
 After adding the `ChatCompletionsClient`, you can retrieve the client instance using dependency injection:
 
@@ -132,7 +132,7 @@ builder.AddAzureEmbeddingsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-microsoft-foundry-service).
 
 After adding the `EmbeddingsClient`, you can retrieve the client instance using dependency injection:
 
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
index b6ab12872..d49f852aa 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
@@ -32,7 +32,7 @@ In this introduction, you'll see how to install and use the Aspire Azure AI Infe
 
 Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Microsoft Foundry resource.
 
-If you already have an [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
+If you already have a [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
index 0e88fb10f..28c517866 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
@@ -24,7 +24,7 @@ For an introduction to working with the Azure AI Inference hosting integration,
 
 ## Connect to an existing Microsoft Foundry service
 
-If you already have an [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
+If you already have a [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);

From 3e0666ba6e1e569719062fe1290cad2a79072e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <sebastienros@gmail.com>
Date: Thu, 19 Mar 2026 12:29:10 -0700
Subject: [PATCH 3/6] Revert changes in whatsnew

---
 .../src/content/docs/whats-new/aspire-9-4.mdx | 22 +++++++++----------
 .../src/content/docs/whats-new/aspire-9-5.mdx |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx b/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
index 51fa226c8..e06746463 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-9-4.mdx
@@ -1036,17 +1036,17 @@ The [GitHub Models integration](https://aspire.dev/integrations/ai/github-models
 - **GITHUB_TOKEN fallback** when no explicit API key is provided
 - **Built-in health checks** for model availability
 
-### 🤖 Microsoft Foundry integration
+### 🤖 Azure AI Foundry integration
 
-Aspire 9.4 introduces comprehensive [Microsoft Foundry](https://ai.azure.com/) support, bringing enterprise AI capabilities directly into your distributed applications. This integration simplifies working with AI models and deployments through the Azure AI platform, supporting both Azure-hosted deployments and local development with [Foundry Local](https://github.com/microsoft/Foundry-Local).
+Aspire 9.4 introduces comprehensive [Azure AI Foundry](https://ai.azure.com/) support, bringing enterprise AI capabilities directly into your distributed applications. This integration simplifies working with AI models and deployments through the Azure AI platform, supporting both Azure-hosted deployments and local development with [Foundry Local](https://github.com/microsoft/Foundry-Local).
 
 #### Hosting configuration
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
-// Add Microsoft Foundry project
-var foundry = builder.AddFoundry("foundry");
+// Add Azure AI Foundry project
+var foundry = builder.AddAzureAIFoundry("foundry");
 
 // Add specific model deployments
 var chat = foundry.AddDeployment("chat", "qwen2.5-0.5b", "1", "Microsoft");
@@ -1060,15 +1060,15 @@ var webService = builder.AddProject<Projects.WebService>("webservice")
 builder.Build().Run();
 ```
 
-##### Foundry Local support
+##### Azure AI Foundry Local support
 
-[Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/) is an on-device AI inference solution that runs models locally on your hardware, providing performance, privacy, and cost advantages without requiring an Azure subscription. It's ideal for scenarios requiring data privacy, offline operation, cost reduction, or low-latency responses.
+[Azure AI Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/) is an on-device AI inference solution that runs models locally on your hardware, providing performance, privacy, and cost advantages without requiring an Azure subscription. It's ideal for scenarios requiring data privacy, offline operation, cost reduction, or low-latency responses.
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
 // For local development, run with Foundry Local
-var localFoundry = builder.AddFoundry("foundry")
+var localFoundry = builder.AddAzureAIFoundry("foundry")
     .RunAsFoundryLocal()
     .AddDeployment("chat", "phi-3.5-mini", "1", "Microsoft");
 
@@ -1081,7 +1081,7 @@ builder.Build().Run();
 
 #### Client integration
 
-Once you've configured the [Microsoft Foundry resource](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) in your AppHost, consume it in your services using the [Azure AI Inference SDK](https://aspire.dev/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) or [OpenAI SDK](https://aspire.dev/integrations/cloud/azure/azure-openai/azure-openai-get-started/) for compatible models:
+Once you've configured the [Azure AI Foundry resource](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) in your AppHost, consume it in your services using the [Azure AI Inference SDK](https://aspire.dev/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) or [OpenAI SDK](https://aspire.dev/integrations/cloud/azure/azure-openai/azure-openai-get-started/) for compatible models:
 
 **Using Azure AI Inference SDK:**
 
@@ -1124,12 +1124,12 @@ builder.AddOpenAIClient("chat")
 // Usage is identical to the Azure AI Inference SDK example above
 ```
 
-**Key differences between Microsoft Foundry and Foundry Local:**
+**Key differences between Azure AI Foundry and Foundry Local:**
 
-- **Microsoft Foundry** - Cloud-hosted models with enterprise-grade scaling, supports all Azure AI model deployments
+- **Azure AI Foundry** - Cloud-hosted models with enterprise-grade scaling, supports all Azure AI model deployments
 - **Foundry Local** - On-device inference with different model selection optimized for local hardware, no Azure subscription required
 
-The `RunAsFoundryLocal()` method enables local development scenarios using [Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/), allowing you to test AI capabilities without requiring cloud resources during development. This supports automatic model downloading, loading, and management through the integrated Foundry Local runtime.
+The `RunAsFoundryLocal()` method enables local development scenarios using [Azure AI Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/), allowing you to test AI capabilities without requiring cloud resources during development. This supports automatic model downloading, loading, and management through the integrated Foundry Local runtime.
 
 ### 🗄️ Database hosting improvements
 
diff --git a/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx b/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
index 25786b2a5..b8482a2e4 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-9-5.mdx
@@ -323,7 +323,7 @@ var localOpenAI = builder.AddOpenAI("local-openai")
 var localModel = localOpenAI.AddModel("local-chat", "llama3.2");
 ```
 
-### GitHub Models and Microsoft Foundry typed catalogs
+### GitHub Models and Azure AI Foundry typed catalogs
 
 Aspire 9.5 introduces a typed catalog for GitHub and Azure-hosted models, providing IntelliSense support and refactoring safety when working with AI models. This brings type safety and IntelliSense support for the ever-increasing AI model catalog, and takes the guesswork out of version and "format" strings. The catalog is updated daily.
 
@@ -343,7 +343,7 @@ var embeddingModel = builder.AddGitHubModel("embeddings", GitHubModel.OpenAI.Ope
 For more information, see:
 
 - [Aspire GitHub Models integration (Preview)](https://aspire.dev/integrations/ai/github-models/).
-- [Aspire Microsoft Foundry integration (Preview)](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+- [Aspire Azure AI Foundry integration (Preview)](https://aspire.dev/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
 ### Dev Tunnels hosting integration
 

From a298049ea1fada41be3bf7cedca5df824211e9d1 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Thu, 19 Mar 2026 12:44:44 -0700
Subject: [PATCH 4/6] Update articles with AddProject

---
 .../azure-ai-foundry-host.mdx                 | 117 +++++++++++++++++-
 .../content/docs/whats-new/aspire-13-2.mdx    |  36 ++++--
 2 files changed, 139 insertions(+), 14 deletions(-)

diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index 79c593194..bfc84a669 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -19,10 +19,15 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-The Aspire Microsoft Foundry hosting integration models the Microsoft Foundry project as the `FoundryResource` type. To access this type and APIs for expressing them within your AppHost project, install the [📦 Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) NuGet package:
+The Aspire Microsoft Foundry hosting integration models a Microsoft Foundry account as the `FoundryResource` type. To access this type and related APIs in your AppHost project, install the [📦 Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) NuGet package:
 
 <InstallPackage packageName="Aspire.Hosting.Foundry" />
 
+<Aside type="note">
+  If you're upgrading from earlier previews, replace the
+  `Aspire.Hosting.Azure.AIFoundry` package with `Aspire.Hosting.Foundry`.
+</Aside>
+
 For an introduction to working with the Microsoft Foundry hosting integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
 ## Add a Microsoft Foundry resource
@@ -35,7 +40,7 @@ var builder = DistributedApplication.CreateBuilder(args);
 var foundry = builder.AddFoundry("foundry");
 
 builder.AddProject<Projects.ExampleProject>()
-       .WithReference(foundry);
+    .WithReference(foundry);
 
 // After adding all resources, run the app...
 ```
@@ -76,6 +81,22 @@ The preceding code:
 >
 > For more information, see the [FoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.foundrymodel).
 
+You can also use the `FoundryModel` catalog instead of specifying the model name, version, and format explicitly:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+builder.AddProject<Projects.ExampleProject>()
+    .WithReference(chat)
+    .WaitFor(chat);
+
+builder.Build().Run();
+```
+
 ## Configure deployment properties
 
 You can customize deployment properties using the `WithProperties` method:
@@ -91,6 +112,92 @@ var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft")
 
 The preceding code sets the SKU name to `Standard` and capacity to `10` for the deployment.
 
+## Add a Microsoft Foundry project
+
+Use the `AddProject` method to create a Microsoft Foundry project for agents, project-scoped connections, and related Azure resources:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+builder.AddProject<Projects.ExampleProject>("api")
+    .WithReference(project)
+    .WithReference(chat)
+    .WaitFor(chat);
+
+builder.Build().Run();
+```
+
+The preceding code creates a Foundry project and adds a deployment through `AddModelDeployment`. When you call `WithReference(project)`, Aspire injects the standard connection string and project-specific connection properties such as the project endpoint and Application Insights connection string into the consuming resource.
+
+### Configure a Foundry project
+
+You can customize the Azure resources associated with a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var appInsights = builder.AddAzureApplicationInsights("appinsights");
+var keyVault = builder.AddAzureKeyVault("keyvault");
+var registry = builder.AddAzureContainerRegistry("agents");
+
+var project = foundry.AddProject("my-project")
+    .WithAppInsights(appInsights)
+    .WithKeyVault(keyVault)
+    .WithContainerRegistry(registry);
+```
+
+`AddProject` creates a default Azure Container Registry for hosted agents. Use `WithContainerRegistry` when you want to point the project at a different registry.
+
+## Publish a hosted agent to Microsoft Foundry
+
+Use `PublishAsHostedAgent` to publish an executable or containerized app as a hosted agent in a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+builder.AddPythonApp("agent", "..\\agent", "main:app")
+    .WithReference(project)
+    .WithReference(chat)
+    .PublishAsHostedAgent(project);
+
+builder.Build().Run();
+```
+
+In run mode, `PublishAsHostedAgent` configures local HTTP, liveness, and readiness endpoints and enables OpenTelemetry output for the agent. In publish mode, Aspire creates an `AzureHostedAgentResource` and publishes the container to the project-associated registry.
+
+If you omit the `project` argument, Aspire uses an existing Foundry project from the app model or creates one automatically.
+
+### Add and publish a prompt agent
+
+For prompt-only scenarios, use `AddAndPublishPromptAgent` on a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+project.AddAndPublishPromptAgent(
+    chat,
+    "support-agent",
+    instructions: "You are a helpful support assistant.");
+
+builder.Build().Run();
+```
+
+This creates an `AzurePromptAgentResource` that uses the specified model deployment in the target Foundry project.
+
 ## Connect to an existing Microsoft Foundry service
 
 You might have an existing Microsoft Foundry service that you want to connect to. You can chain a call to annotate that your `FoundryResource` is an existing resource:
@@ -136,6 +243,12 @@ When the AppHost starts up, the local foundry service is also started. This requ
 
 The `RunAsFoundryLocal` method configures the resource to run as an emulator. It downloads and loads the specified models locally. The method provides health checks for the local service and automatically manages the Foundry Local lifecycle.
 
+<Aside type="caution">
+  Foundry Projects aren't supported when the parent Foundry resource uses
+  `RunAsFoundryLocal()`. Use account-level deployments for local emulator
+  scenarios.
+</Aside>
+
 ## Assign roles to resources
 
 You can assign specific roles to resources that need to access the Microsoft Foundry service. Use the `WithRoleAssignments` method:
diff --git a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
index 999c3747c..9686320c0 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
@@ -589,25 +589,27 @@ This makes it easier to inspect your Aspire application state during debugging s
 
 ### Foundry and hosted agents
 
-Aspire 13.2 replaces the earlier AIFoundry-focused hosting surface with a broader Microsoft Foundry integration.
+Aspire 13.2 replaces the earlier AIFoundry-focused hosting surface with a broader Microsoft Foundry integration. The hosting package is now `Aspire.Hosting.Foundry`, replacing `Aspire.Hosting.Azure.AIFoundry`.
 
-You can now add Foundry resources, attach model deployments, and run against Foundry Local in development:
+You can now add Foundry accounts, create Foundry Projects, attach model deployments with either explicit model values or the `FoundryModel` catalog, and publish hosted agents from the regular Aspire app model:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddFoundry("ai")
-    .RunAsFoundryLocal();
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("agents");
 
-var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
-builder.AddProject<Projects.Api>("api")
-    .WithReference(chat);
+builder.AddPythonApp("agent", "..\\agent", "main:app")
+    .WithReference(project)
+    .WithReference(chat)
+    .PublishAsHostedAgent(project);
 
 builder.Build().Run();
 ```
 
-This release also adds hosted-agent support on top of Foundry, including APIs such as `PublishAsHostedAgent` and `AddAndPublishPromptAgent`, which start to bring agent-centric deployment scenarios into the regular Aspire app model.
+New APIs in this area include `AddProject`, `AddModelDeployment`, `WithAppInsights`, `WithKeyVault`, `WithContainerRegistry`, `PublishAsHostedAgent`, and `AddAndPublishPromptAgent`. `RunAsFoundryLocal` is still available for local model development, but Foundry Projects aren't supported when the parent resource is configured as Foundry Local.
 
 ### Azure Virtual Network and private endpoint support
 
@@ -874,7 +876,16 @@ A connection property suffix has been added which may require updates to code th
 
 `Aspire.Hosting.Azure.AIFoundry` was replaced by the broader `Aspire.Hosting.Foundry` surface.
 
-If you were using the older API, migrate from `AddAzureAIFoundry()` to `AddFoundry()` and then attach one or more deployments explicitly:
+When upgrading, make both of these changes:
+
+- Replace the `Aspire.Hosting.Azure.AIFoundry` package reference with `Aspire.Hosting.Foundry`.
+- Migrate from `AddAzureAIFoundry()` to `AddFoundry()`, then add deployments explicitly with `AddDeployment()` or `AddModelDeployment()`.
+
+```xml title="XML — AppHost project file"
+<ItemGroup>
+  <PackageReference Include="Aspire.Hosting.Foundry" Version="13.2.0" />
+</ItemGroup>
+```
 
 ```csharp title="C# — Migration example"
 // Before
@@ -882,10 +893,11 @@ var ai = builder.AddAzureAIFoundry("ai");
 
 // After
 var foundry = builder.AddFoundry("ai");
-var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+var project = foundry.AddProject("agents");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 ```
 
-This aligns the hosting API with the current Foundry branding and unlocks the new deployment and hosted-agent capabilities added in 13.2.
+This aligns the hosting API with the current Foundry branding and unlocks the new project, deployment, and hosted-agent capabilities added in 13.2.
 
 ### `WithSecretBuildArg` renamed to `WithBuildSecret`
 
@@ -917,4 +929,4 @@ Aspire Azure client integrations no longer use the parameterless `DefaultAzureCr
 
 Follow the directions in [Upgrade to Aspire 13.2](#upgrade-to-aspire-132) to move forward and start using the new CLI, TypeScript AppHost, dashboard, hosting, and integration capabilities in this release.
 
-For a complete list of issues addressed in this release, see the [Aspire 13.2 milestone on GitHub](https://github.com/dotnet/aspire/issues?q=is%3Aissue%20state%3Aclosed%20milestone%3A13.2).
\ No newline at end of file
+For a complete list of issues addressed in this release, see the [Aspire 13.2 milestone on GitHub](https://github.com/dotnet/aspire/issues?q=is%3Aissue%20state%3Aclosed%20milestone%3A13.2).

From 31334a8186c1b9742d502c3b027803a178b7abb2 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Thu, 19 Mar 2026 12:53:52 -0700
Subject: [PATCH 5/6] Use enumerations for models

---
 .../azure-ai-foundry-get-started.mdx          |  4 ++--
 .../azure-ai-foundry-host.mdx                 | 22 +++++++------------
 .../content/docs/whats-new/aspire-13-2.mdx    |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
index 1118b0879..91734b949 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
@@ -41,7 +41,7 @@ var builder = DistributedApplication.CreateBuilder(args);
 
 var foundry = builder.AddFoundry("foundry");
 
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -52,7 +52,7 @@ builder.AddProject<Projects.ExampleProject>()
 builder.Build().Run();
 ```
 
-The preceding code adds a Microsoft Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds a Microsoft Foundry resource named `foundry` with a deployment named `chat` using the generated `FoundryModel.OpenAI.Gpt5Mini` descriptor. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 <Aside type="caution">
   When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index bfc84a669..6c83ddb74 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -52,14 +52,14 @@ The preceding code adds a Microsoft Foundry resource named `foundry` to the AppH
 
 ## Add a Microsoft Foundry deployment resource
 
-To add a Microsoft Foundry deployment resource, call the `AddDeployment` method:
+To add a Microsoft Foundry deployment resource, call the `AddDeployment` method with one of the generated `FoundryModel` entries:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
 var foundry = builder.AddFoundry("foundry");
 
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -71,24 +71,18 @@ builder.AddProject<Projects.ExampleProject>()
 The preceding code:
 
 - Adds a Microsoft Foundry resource named `foundry`.
-- Adds a Microsoft Foundry deployment resource named `chat` with a model name of `Phi-4`. The model name must correspond to an [available model](https://learn.microsoft.com/azure/ai-foundry/foundry-models/concepts/models) in the Microsoft Foundry service.
+- Adds a Microsoft Foundry deployment resource named `chat` using the generated `FoundryModel.OpenAI.Gpt5Mini` descriptor.
 
-> [!NOTE]
-> The fourth parameter of the `AddDeployment(...)` method specifies the model publisher or provider. Common values include:
->
-> - `"OpenAI"` for GPT models (e.g., GPT-4o, GPT-4, GPT-3.5 Turbo)
-> - `"Microsoft"` for Phi models (e.g., Phi-4, Phi-3.5)
->
-> For more information, see the [FoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.foundrymodel).
+For more information about the generated model descriptors, see the [FoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.foundrymodel).
 
-You can also use the `FoundryModel` catalog instead of specifying the model name, version, and format explicitly:
+If you need a different generated model descriptor, use the corresponding nested type, such as `FoundryModel.Microsoft.Phi4Reasoning`:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
 var foundry = builder.AddFoundry("foundry");
 
-var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+var chat = foundry.AddDeployment("chat", FoundryModel.Microsoft.Phi4Reasoning);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -102,7 +96,7 @@ builder.Build().Run();
 You can customize deployment properties using the `WithProperties` method:
 
 ```csharp
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft")
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini)
     .WithProperties(deployment =>
     {
         deployment.SkuName = "Standard";
@@ -230,7 +224,7 @@ var builder = DistributedApplication.CreateBuilder(args);
 var foundry = builder.AddFoundry("foundry")
     .RunAsFoundryLocal();
 
-var chat = foundry.AddDeployment("chat", "phi-3.5-mini", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.Local.Phi4);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
diff --git a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
index 9686320c0..f7b542c9d 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
@@ -591,7 +591,7 @@ This makes it easier to inspect your Aspire application state during debugging s
 
 Aspire 13.2 replaces the earlier AIFoundry-focused hosting surface with a broader Microsoft Foundry integration. The hosting package is now `Aspire.Hosting.Foundry`, replacing `Aspire.Hosting.Azure.AIFoundry`.
 
-You can now add Foundry accounts, create Foundry Projects, attach model deployments with either explicit model values or the `FoundryModel` catalog, and publish hosted agents from the regular Aspire app model:
+You can now add Foundry accounts, create Foundry Projects, attach model deployments with the generated `FoundryModel` catalog, and publish hosted agents from the regular Aspire app model:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);

From 580a3aef2855e8dda7a29139d7daf4183b6c08b1 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Thu, 19 Mar 2026 12:56:04 -0700
Subject: [PATCH 6/6] Add note about new name

---
 .../cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index 6c83ddb74..e31d647d7 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -24,8 +24,11 @@ The Aspire Microsoft Foundry hosting integration models a Microsoft Foundry acco
 <InstallPackage packageName="Aspire.Hosting.Foundry" />
 
 <Aside type="note">
-  If you're upgrading from earlier previews, replace the
-  `Aspire.Hosting.Azure.AIFoundry` package with `Aspire.Hosting.Foundry`.
+  This integration was previously shipped as `Aspire.Hosting.Azure.AIFoundry`.
+  When upgrading from earlier previews, replace that package with
+  `Aspire.Hosting.Foundry`. If your code referenced package-specific Foundry
+  types such as the old `AIFoundryModel`, update those references to
+  `FoundryModel` and add `using Aspire.Hosting.Foundry;` where needed.
 </Aside>
 
 For an introduction to working with the Microsoft Foundry hosting integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).