.NET: Feature foundry agent/update breaking v2.0 to v1.2 (#2212)

* Migration WIP Checkpoint 1 * Build + UT + Workflow passing * Address latest commits after break * Revert rename in unrelated files * Address PR comments * Class renames
2026-06-16 21:04:09 +08:00 · 2025-11-14 12:20:56 +00:00
parent 7c90690067
commit 0746d7751a
66 changed files with 652 additions and 669 deletions
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -2,7 +2,8 @@

 // This sample shows how to create and use a AI agents with Azure Foundry Agents as the backend.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;

@@ -13,13 +14,13 @@ const string JokerInstructions = "You are good at telling jokes.";
 const string JokerName = "JokerAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-var agentsClient = new AgentClient(new Uri(endpoint), new AzureCliCredential());
+var aiProjectClient = new AIProjectClient(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
 var agentVersionCreationOptions = new AgentVersionCreationOptions(new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions });
 // Azure.AI.Agents SDK creates and manages agent by name and versions.
 // You can create a server side agent version with the Azure.AI.Agents SDK client below.
-var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, options: agentVersionCreationOptions);
+var agentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: JokerName, options: agentVersionCreationOptions);

 // Note:
 //      agentVersion.Id = "<agentName>:<versionNumber>",
@@ -27,13 +28,13 @@ var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, options
 //      agentVersion.Name = <agentName>

 // You can retrieve an AIAgent for a already created server side agent version.
-AIAgent jokerAgentV1 = agentsClient.GetAIAgent(agentVersion);
+AIAgent jokerAgentV1 = aiProjectClient.GetAIAgent(agentVersion);

 // You can also create another AIAgent version (V2) by providing the same name with a different definition.
-AIAgent jokerAgentV2 = agentsClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions + "V2");
+AIAgent jokerAgentV2 = aiProjectClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions + "V2");

 // You can also get the AIAgent latest version just providing its name.
-AIAgent jokerAgentLatest = agentsClient.GetAIAgent(name: JokerName);
+AIAgent jokerAgentLatest = aiProjectClient.GetAIAgent(name: JokerName);
 var latestVersion = jokerAgentLatest.GetService<AgentVersion>()!;

 // The AIAgent version can be accessed via the GetService method.
@@ -47,7 +48,4 @@ Console.WriteLine(await jokerAgentLatest.RunAsync("Tell me a joke about a pirate
 Console.WriteLine(await jokerAgentLatest.RunAsync("Now tell me a joke about a cat and a dog using last joke as the anchor.", thread));

 // Cleanup by agent name removes both agent versions created (jokerAgentV1 + jokerAgentV2).
-agentsClient.DeleteAgent(jokerAgentV1.Name);
-
-// It is also possible delete just a specific agent version by the composition (name + version number).
-// agentsClient.DeleteAgentVersion(latestVersion.Name, latestVersion.Version);
+aiProjectClient.Agents.DeleteAgent(jokerAgentV1.Name);
@@ -15,7 +15,8 @@ See the README.md for each sample for the prerequisites for that sample.
 |Sample|Description|
 |---|---|
 |[Creating an AIAgent with A2A](./Agent_With_A2A/)|This sample demonstrates how to create AIAgent for an existing A2A agent.|
-|[Creating an AIAgent with AzureFoundry Agent](./Agent_With_AzureFoundryAgent/)|This sample demonstrates how to create an Azure Foundry agent and expose it as an AIAgent|
+|[Creating an AIAgent with Foundry Agents using Azure.AI.Agents.Persistent](./Agent_With_AzureAIAgentsPersistent/)|This sample demonstrates how to create a Foundry Persistent agent and expose it as an AIAgent using the Azure.AI.Agents.Persistent SDK|
+|[Creating an AIAgent with Foundry Agents using Azure.AI.Project](./Agent_With_AzureAIProject/)|This sample demonstrates how to create an Foundry Project agent and expose it as an AIAgent using the Azure.AI.Project SDK|
 |[Creating an AIAgent with AzureFoundry Model](./Agent_With_AzureFoundryModel/)|This sample demonstrates how to use any model deployed to Azure Foundry to create an AIAgent|
 |[Creating an AIAgent with Azure OpenAI ChatCompletion](./Agent_With_AzureOpenAIChatCompletion/)|This sample demonstrates how to create an AIAgent using Azure OpenAI ChatCompletion as the underlying inference service|
 |[Creating an AIAgent with Azure OpenAI Responses](./Agent_With_AzureOpenAIResponses/)|This sample demonstrates how to create an AIAgent using Azure OpenAI Responses as the underlying inference service|
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -2,7 +2,8 @@

 // This sample shows how to create and use AI agents with Azure Foundry Agents as the backend.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -14,14 +15,14 @@ const string JokerInstructions = "You are good at telling jokes.";
 const string JokerName = "JokerAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
 AgentVersionCreationOptions options = new(new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions });

 // Azure.AI.Agents SDK creates and manages agent by name and versions.
 // You can create a server side agent version with the Azure.AI.Agents SDK client below.
-AgentVersion agentVersion = agentClient.CreateAgentVersion(agentName: JokerName, options);
+AgentVersion agentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: JokerName, options);

 // Note:
 //      agentVersion.Id = "<agentName>:<versionNumber>",
@@ -29,13 +30,13 @@ AgentVersion agentVersion = agentClient.CreateAgentVersion(agentName: JokerName,
 //      agentVersion.Name = <agentName>

 // You can retrieve an AIAgent for an already created server side agent version.
-AIAgent jokerAgentV1 = agentClient.GetAIAgent(agentVersion);
+AIAgent jokerAgentV1 = aiProjectClient.GetAIAgent(agentVersion);

 // You can also create another AIAgent version (V2) by providing the same name with a different definition.
-AIAgent jokerAgentV2 = agentClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions + "V2");
+AIAgent jokerAgentV2 = aiProjectClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions + "V2");

 // You can also get the AIAgent latest version by just providing its name.
-AIAgent jokerAgentLatest = agentClient.GetAIAgent(name: JokerName);
+AIAgent jokerAgentLatest = aiProjectClient.GetAIAgent(name: JokerName);
 AgentVersion latestVersion = jokerAgentLatest.GetService<AgentVersion>()!;

 // The AIAgent version can be accessed via the GetService method.
@@ -49,7 +50,4 @@ Console.WriteLine(await jokerAgentLatest.RunAsync("Tell me a joke about a pirate
 Console.WriteLine(await jokerAgentLatest.RunAsync("Now tell me a joke about a cat and a dog using last joke as the anchor.", thread));

 // Cleanup by agent name removes both agent versions created (jokerAgentV1 + jokerAgentV2).
-await agentClient.DeleteAgentAsync(jokerAgentV1.Name);
-
-// It is also possible delete just a specific agent version by the composition (name + version number).
-// agentClient.DeleteAgentVersion(latestVersion.Name, latestVersion.Version);
+await aiProjectClient.Agents.DeleteAgentAsync(jokerAgentV1.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -2,7 +2,8 @@

 // This sample shows how to create and use a simple AI agent with Azure Foundry Agents as the backend.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;

@@ -13,17 +14,17 @@ const string JokerInstructions = "You are good at telling jokes.";
 const string JokerName = "JokerAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
 AgentVersionCreationOptions options = new(new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions });

 // Azure.AI.Agents SDK creates and manages agent by name and versions.
 // You can create a server side agent version with the Azure.AI.Agents SDK client below.
-AgentVersion agentVersion = agentClient.CreateAgentVersion(agentName: JokerName, options);
+AgentVersion agentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: JokerName, options);

 // You can retrieve an AIAgent for a already created server side agent version.
-AIAgent jokerAgent = agentClient.GetAIAgent(agentVersion);
+AIAgent jokerAgent = aiProjectClient.GetAIAgent(agentVersion);

 // Invoke the agent and output the text result.
 AgentThread thread = jokerAgent.GetNewThread();
@@ -37,4 +38,4 @@ await foreach (AgentRunResponseUpdate update in jokerAgent.RunStreamingAsync("Te
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(jokerAgent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(jokerAgent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -2,7 +2,8 @@

 // This sample shows how to create and use a simple AI agent with a multi-turn conversation.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;

@@ -13,16 +14,16 @@ const string JokerInstructions = "You are good at telling jokes.";
 const string JokerName = "JokerAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
 AgentVersionCreationOptions options = new(new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions });

 // Create a server side agent version with the Azure.AI.Agents SDK client.
-AgentVersion agentVersion = agentClient.CreateAgentVersion(agentName: JokerName, options);
+AgentVersion agentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: JokerName, options);

 // Retrieve an AIAgent for the created server side agent version.
-AIAgent jokerAgent = agentClient.GetAIAgent(agentVersion);
+AIAgent jokerAgent = aiProjectClient.GetAIAgent(agentVersion);

 // Invoke the agent with a multi-turn conversation, where the context is preserved in the thread object.
 AgentThread thread = jokerAgent.GetNewThread();
@@ -41,4 +42,4 @@ await foreach (AgentRunResponseUpdate update in jokerAgent.RunStreamingAsync("No
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(jokerAgent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(jokerAgent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -4,7 +4,7 @@
 // It shows both non-streaming and streaming agent interactions using weather-related tools.

 using System.ComponentModel;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -20,13 +20,13 @@ const string AssistantInstructions = "You are a helpful assistant that can get w
 const string AssistantName = "WeatherAssistant";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent with function tools.
 AITool tool = AIFunctionFactory.Create(GetWeather);

 // Create AIAgent directly
-AIAgent agent = await agentClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [tool]);
+AIAgent agent = await aiProjectClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [tool]);

 // Non-streaming agent interaction with function tools.
 AgentThread thread = agent.GetNewThread();
@@ -40,4 +40,4 @@ await foreach (AgentRunResponseUpdate update in agent.RunStreamingAsync("What is
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
    <PackageReference Include="Microsoft.SemanticKernel.Plugins.OpenApi" />
  </ItemGroup>
@@ -3,7 +3,7 @@
 // This sample demonstrates how to use an agent with function tools provided via an OpenAPI spec.
 // It uses functionality from Semantic Kernel to parse the OpenAPI spec and create function tools to use with the Agent Framework Agent.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -25,14 +25,14 @@ const string AssistantInstructions = "You are a helpful assistant that can query
 const string AssistantName = "GitHubAssistant";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Create AIAgent directly
-AIAgent agent = await agentClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: tools);
+AIAgent agent = await aiProjectClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: tools);

 // Run the agent with the OpenAPI function tools.
 AgentThread thread = agent.GetNewThread();
 Console.WriteLine(await agent.RunAsync("Please list the names, colors and descriptions of all the labels available in the microsoft/agent-framework repository on github.", thread));

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -6,7 +6,7 @@
 // while the agent is waiting for user input.

 using System.ComponentModel;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -23,12 +23,12 @@ const string AssistantInstructions = "You are a helpful assistant that can get w
 const string AssistantName = "WeatherAssistant";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 ApprovalRequiredAIFunction approvalTool = new(AIFunctionFactory.Create(GetWeather));

 // Create AIAgent directly
-AIAgent agent = await agentClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [approvalTool]);
+AIAgent agent = await aiProjectClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [approvalTool]);

 // Call the agent with approval-required function tools.
 // The agent will request approval before invoking the function.
@@ -61,4 +61,4 @@ while (userInputRequests.Count > 0)
 Console.WriteLine($"\nAgent: {response}");

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -5,7 +5,7 @@
 using System.ComponentModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using SampleApp;
@@ -19,10 +19,10 @@ const string AssistantInstructions = "You are a helpful assistant that extracts
 const string AssistantName = "StructuredOutputAssistant";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Create ChatClientAgent directly
-ChatClientAgent agent = await agentClient.CreateAIAgentAsync(
+ChatClientAgent agent = await aiProjectClient.CreateAIAgentAsync(
    model: deploymentName,
    new ChatClientAgentOptions(name: AssistantName, instructions: AssistantInstructions)
    {
@@ -42,7 +42,7 @@ Console.WriteLine($"Age: {response.Result.Age}");
 Console.WriteLine($"Occupation: {response.Result.Occupation}");

 // Create the ChatClientAgent with the specified name, instructions, and expected structured output the agent should produce.
-ChatClientAgent agentWithPersonInfo = agentClient.CreateAIAgent(
+ChatClientAgent agentWithPersonInfo = aiProjectClient.CreateAIAgent(
    model: deploymentName,
    new ChatClientAgentOptions(name: AssistantName, instructions: AssistantInstructions)
    {
@@ -65,7 +65,7 @@ Console.WriteLine($"Age: {personInfo.Age}");
 Console.WriteLine($"Occupation: {personInfo.Occupation}");

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);

 namespace SampleApp
 {
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -3,7 +3,7 @@
 // This sample shows how to create and use a simple AI agent with a conversation that can be persisted to disk.

 using System.Text.Json;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;

@@ -14,9 +14,9 @@ const string JokerInstructions = "You are good at telling jokes.";
 const string JokerName = "JokerAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

-AIAgent agent = await agentClient.CreateAIAgentAsync(name: JokerName, model: deploymentName, instructions: JokerInstructions);
+AIAgent agent = await aiProjectClient.CreateAIAgentAsync(name: JokerName, model: deploymentName, instructions: JokerInstructions);

 // Start a new thread for the agent conversation.
 AgentThread thread = agent.GetNewThread();
@@ -41,4 +41,4 @@ AgentThread resumedThread = agent.DeserializeThread(reloadedSerializedThread);
 Console.WriteLine(await agent.RunAsync("Now tell the same joke in the voice of a pirate, and add some emojis to the joke.", resumedThread));

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
    <PackageReference Include="OpenTelemetry" />
@@ -2,7 +2,7 @@

 // This sample shows how to create and use a simple AI agent with Azure Foundry Agents as the backend that logs telemetry using OpenTelemetry.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Azure.Monitor.OpenTelemetry.Exporter;
 using Microsoft.Agents.AI;
@@ -29,10 +29,10 @@ if (!string.IsNullOrWhiteSpace(applicationInsightsConnectionString))
 using var tracerProvider = tracerProviderBuilder.Build();

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
-AIAgent agent = agentClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions)
+AIAgent agent = aiProjectClient.CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions)
    .AsBuilder()
    .UseOpenTelemetry(sourceName: sourceName)
    .Build();
@@ -49,4 +49,4 @@ await foreach (AgentRunResponseUpdate update in agent.RunStreamingAsync("Tell me
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -11,7 +11,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
    <PackageReference Include="Microsoft.Extensions.Hosting" />
  </ItemGroup>
@@ -2,7 +2,7 @@

 // This sample shows how to use dependency injection to register an AIAgent and use it from a hosted service with a user input chat loop.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,11 +18,11 @@ const string JokerName = "JokerAgent";
 HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);

 // Add the agents client to the service collection.
-builder.Services.AddSingleton((sp) => new AgentClient(new Uri(endpoint), new AzureCliCredential()));
+builder.Services.AddSingleton((sp) => new AIProjectClient(new Uri(endpoint), new AzureCliCredential()));

 // Add the AI agent to the service collection.
 builder.Services.AddSingleton<AIAgent>((sp)
-    => sp.GetRequiredService<AgentClient>()
+    => sp.GetRequiredService<AIProjectClient>()
        .CreateAIAgent(name: JokerName, model: deploymentName, instructions: JokerInstructions));

 // Add a sample service that will use the agent to respond to user input.
@@ -35,7 +35,7 @@ await host.RunAsync().ConfigureAwait(false);
 /// <summary>
 /// A sample service that uses an AI agent to respond to user input.
 /// </summary>
-internal sealed class SampleService(AgentClient client, AIAgent agent, IHostApplicationLifetime appLifetime) : IHostedService
+internal sealed class SampleService(AIProjectClient client, AIAgent agent, IHostApplicationLifetime appLifetime) : IHostedService
 {
    private AgentThread? _thread;

@@ -77,6 +77,6 @@ internal sealed class SampleService(AgentClient client, AIAgent agent, IHostAppl
    public async Task StopAsync(CancellationToken cancellationToken)
    {
        Console.WriteLine("\nDeleting agent ...");
-        await client.DeleteAgentAsync(agent.Name, cancellationToken).ConfigureAwait(false);
+        await client.Agents.DeleteAgentAsync(agent.Name, cancellationToken).ConfigureAwait(false);
    }
 }
@@ -5,7 +5,7 @@ This sample demonstrates how to use dependency injection to register and manage
 ## What this sample demonstrates

 - Setting up dependency injection with HostApplicationBuilder
- Registering AgentClient as a singleton service
+- Registering AIProjectClient as a singleton service
 - Registering AIAgent as a singleton service
 - Using agents in hosted services
 - Interactive chat loop with streaming responses
@@ -42,7 +42,7 @@ dotnet run --project .\FoundryAgents_Step08_DependencyInjection
 The sample will:

 1. Create a host with dependency injection configured
-2. Register AgentClient and AIAgent as services
+2. Register AIProjectClient and AIAgent as services
 3. Create an agent named "JokerAgent" with instructions to tell jokes
 4. Start an interactive chat loop where you can ask the agent questions
 5. The agent will respond with streaming output
@@ -2,7 +2,7 @@

 // This sample shows how to expose an AI agent as an MCP tool.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -25,12 +25,12 @@ await using var mcpClient = await McpClient.CreateAsync(new StdioClientTransport
 IList<McpClientTool> mcpTools = await mcpClient.ListToolsAsync();
 string agentName = "AgentWithMCP";
 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 Console.WriteLine($"Creating the agent '{agentName}' ...");

 // Define the agent you want to create. (Prompt Agent in this case)
-AIAgent agent = agentClient.CreateAIAgent(
+AIAgent agent = aiProjectClient.CreateAIAgent(
    name: agentName,
    model: deploymentName,
    instructions: "You answer questions related to GitHub repositories only.",
@@ -44,4 +44,4 @@ Console.WriteLine($"Invoking agent '{agent.Name}' with prompt: {prompt} ...");
 Console.WriteLine(await agent.RunAsync(prompt));

 // Clean up the agent after use.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -2,7 +2,7 @@

 // This sample shows how to use Image Multi-Modality with an AI agent.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -14,10 +14,10 @@ const string VisionInstructions = "You are a helpful agent that can analyze imag
 const string VisionName = "VisionAgent";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent you want to create. (Prompt Agent in this case)
-AIAgent agent = agentClient.CreateAIAgent(name: VisionName, model: deploymentName, instructions: VisionInstructions);
+AIAgent agent = aiProjectClient.CreateAIAgent(name: VisionName, model: deploymentName, instructions: VisionInstructions);

 ChatMessage message = new(ChatRole.User, [
    new TextContent("What do you see in this image?"),
@@ -32,4 +32,4 @@ await foreach (AgentRunResponseUpdate update in agent.RunStreamingAsync(message,
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

@@ -3,7 +3,7 @@
 // This sample shows how to create and use an Azure Foundry Agents AI agent as a function tool.

 using System.ComponentModel;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -21,18 +21,18 @@ static string GetWeather([Description("The location to get the weather for.")] s
    => $"The weather in {location} is cloudy with a high of 15°C.";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Create the weather agent with function tools.
 AITool weatherTool = AIFunctionFactory.Create(GetWeather);
-AIAgent weatherAgent = agentClient.CreateAIAgent(
+AIAgent weatherAgent = aiProjectClient.CreateAIAgent(
    name: WeatherName,
    model: deploymentName,
    instructions: WeatherInstructions,
    tools: [weatherTool]);

 // Create the main agent, and provide the weather agent as a function tool.
-AIAgent agent = agentClient.CreateAIAgent(
+AIAgent agent = aiProjectClient.CreateAIAgent(
    name: MainName,
    model: deploymentName,
    instructions: MainInstructions,
@@ -43,5 +43,5 @@ AgentThread thread = agent.GetNewThread();
 Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?", thread));

 // Cleanup by agent name removes the agent versions created.
-await agentClient.DeleteAgentAsync(agent.Name);
-await agentClient.DeleteAgentAsync(weatherAgent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(weatherAgent.Name);
@@ -11,7 +11,7 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
  </ItemGroup>

  <ItemGroup>
@@ -7,7 +7,7 @@

 using System.ComponentModel;
 using System.Text.RegularExpressions;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -20,7 +20,7 @@ const string AssistantInstructions = "You are an AI assistant that helps people
 const string AssistantName = "InformationAssistant";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 [Description("Get the weather for a given location.")]
 static string GetWeather([Description("The location to get the weather for.")] string location)
@@ -34,7 +34,7 @@ AITool dateTimeTool = AIFunctionFactory.Create(GetDateTime, name: nameof(GetDate
 AITool getWeatherTool = AIFunctionFactory.Create(GetWeather, name: nameof(GetWeather));

 // Define the agent you want to create. (Prompt Agent in this case)
-AIAgent originalAgent = agentClient.CreateAIAgent(
+AIAgent originalAgent = aiProjectClient.CreateAIAgent(
    name: AssistantName,
    model: deploymentName,
    instructions: AssistantInstructions,
@@ -69,7 +69,7 @@ Console.WriteLine($"Function calling response: {functionCallResponse}");
 // Special per-request middleware agent.
 Console.WriteLine("\n\n=== Example 4: Middleware with human in the loop function approval ===");

-AIAgent humamInTheLoopAgent = agentClient.CreateAIAgent(
+AIAgent humanInTheLoopAgent = aiProjectClient.CreateAIAgent(
    name: "HumanInTheLoopAgent",
    model: deploymentName,
    instructions: "You are an Human in the loop testing AI assistant that helps people find information.",
@@ -78,13 +78,13 @@ AIAgent humamInTheLoopAgent = agentClient.CreateAIAgent(
    tools: [new ApprovalRequiredAIFunction(AIFunctionFactory.Create(GetWeather, name: nameof(GetWeather)))]);

 // Using the ConsolePromptingApprovalMiddleware for a specific request to handle user approval during function calls.
-AgentRunResponse response = await humamInTheLoopAgent
+AgentRunResponse response = await humanInTheLoopAgent
    .AsBuilder()
    .Use(ConsolePromptingApprovalMiddleware, null)
    .Build()
    .RunAsync("What's the current time and the weather in Seattle?");

-Console.WriteLine($"HumamInTheLoopAgent agent middleware response: {response}");
+Console.WriteLine($"HumanInTheLoopAgent agent middleware response: {response}");

 // Function invocation middleware that logs before and after function calls.
 async ValueTask<object?> FunctionCallMiddleware(AIAgent agent, FunctionInvocationContext context, Func<FunctionInvocationContext, CancellationToken, ValueTask<object?>> next, CancellationToken cancellationToken)
@@ -220,4 +220,4 @@ async Task<AgentRunResponse> ConsolePromptingApprovalMiddleware(IEnumerable<Chat
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(middlewareEnabledAgent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(middlewareEnabledAgent.Name);
@@ -4,7 +4,7 @@ This sample demonstrates how to add middleware to intercept agent runs and funct

 ## What This Sample Shows

-1. Azure Foundry Agents integration via `AgentClient` and `AzureCliCredential`
+1. Azure Foundry Agents integration via `AIProjectClient` and `AzureCliCredential`
 2. Agent run middleware (logging and monitoring)
 3. Function invocation middleware (logging and overriding tool results)
 4. Per-request agent run middleware
@@ -12,7 +12,7 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
  </ItemGroup>

  <ItemGroup>
@@ -9,7 +9,7 @@
 // as AI functions. The AsAITools method of the plugin class shows how to specify
 // which methods should be exposed to the AI agent.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -30,11 +30,11 @@ services.AddSingleton<AgentPlugin>(); // The plugin depends on WeatherProvider a
 IServiceProvider serviceProvider = services.BuildServiceProvider();

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Define the agent with plugin tools
 // Define the agent you want to create. (Prompt Agent in this case)
-AIAgent agent = agentClient.CreateAIAgent(
+AIAgent agent = aiProjectClient.CreateAIAgent(
    name: AssistantName,
    model: deploymentName,
    instructions: AssistantInstructions,
@@ -46,7 +46,7 @@ AgentThread thread = agent.GetNewThread();
 Console.WriteLine(await agent.RunAsync("Tell me current time and weather in Seattle.", thread));

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agent.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);

 /// <summary>
 /// The agent plugin that provides weather and current time information.
@@ -12,7 +12,7 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.AI.Projects" />
  </ItemGroup>

  <ItemGroup>
@@ -3,7 +3,8 @@
 // This sample shows how to use Code Interpreter Tool with AI Agents.

 using System.Text;
-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -18,11 +19,11 @@ const string AgentNameMEAI = "CoderAgent-MEAI";
 const string AgentNameNative = "CoderAgent-NATIVE";

 // Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
-AgentClient agentClient = new(new Uri(endpoint), new AzureCliCredential());
+AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

 // Option 1 - Using HostedCodeInterpreterTool + AgentOptions (MEAI + AgentFramework)
 // Create the server side agent version
-AIAgent agentOption1 = await agentClient.CreateAIAgentAsync(
+AIAgent agentOption1 = await aiProjectClient.CreateAIAgentAsync(
    model: deploymentName,
    name: AgentNameMEAI,
    instructions: AgentInstructions,
@@ -30,7 +31,7 @@ AIAgent agentOption1 = await agentClient.CreateAIAgentAsync(

 // Option 2 - Using PromptAgentDefinition SDK native type
 // Create the server side agent version
-AIAgent agentOption2 = await agentClient.CreateAIAgentAsync(
+AIAgent agentOption2 = await aiProjectClient.CreateAIAgentAsync(
    name: AgentNameNative,
    creationOptions: new AgentVersionCreationOptions(
        new PromptAgentDefinition(model: deploymentName)
@@ -85,5 +86,5 @@ foreach (AIAnnotation annotation in response.Messages.SelectMany(m => m.Contents
 }

 // Cleanup by agent name removes the agent version created.
-await agentClient.DeleteAgentAsync(agentOption1.Name);
-await agentClient.DeleteAgentAsync(agentOption2.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agentOption1.Name);
+await aiProjectClient.Agents.DeleteAgentAsync(agentOption2.Name);
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
@@ -60,34 +61,34 @@ internal sealed class Program

    private static async Task CreateAgentsAsync(Uri foundryEndpoint, IConfiguration configuration, TicketingPlugin plugin)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "SelfServiceAgent",
            agentDefinition: DefineSelfServiceAgent(configuration),
            agentDescription: "Service agent for CustomerSupport workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "TicketingAgent",
            agentDefinition: DefineTicketingAgent(configuration, plugin),
            agentDescription: "Ticketing agent for CustomerSupport workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "TicketRoutingAgent",
            agentDefinition: DefineTicketRoutingAgent(configuration, plugin),
            agentDescription: "Routing agent for CustomerSupport workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "WindowsSupportAgent",
            agentDefinition: DefineWindowsSupportAgent(configuration, plugin),
            agentDescription: "Windows support agent for CustomerSupport workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "TicketResolutionAgent",
            agentDefinition: DefineResolutionAgent(configuration, plugin),
            agentDescription: "Resolution agent for CustomerSupport workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "TicketEscalationAgent",
            agentDefinition: TicketEscalationAgent(configuration, plugin),
            agentDescription: "Escalate agent for human support");
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Responses;
@@ -46,39 +47,39 @@ internal sealed class Program

    private static async Task CreateAgentsAsync(Uri foundryEndpoint, IConfiguration configuration)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "ResearchAgent",
            agentDefinition: DefineResearchAgent(configuration),
            agentDescription: "Planner agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "PlannerAgent",
            agentDefinition: DefinePlannerAgent(configuration),
            agentDescription: "Planner agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "ManagerAgent",
            agentDefinition: DefineManagerAgent(configuration),
            agentDescription: "Manager agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "SummaryAgent",
            agentDefinition: DefineSummaryAgent(configuration),
            agentDescription: "Summary agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "KnowledgeAgent",
            agentDefinition: DefineKnowledgeAgent(configuration),
            agentDescription: "Research agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "CoderAgent",
            agentDefinition: DefineCoderAgent(configuration),
            agentDescription: "Coder agent for DeepResearch workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "WeatherAgent",
            agentDefinition: DefineWeatherAgent(configuration),
            agentDescription: "Weather agent for DeepResearch workflow");
@@ -271,10 +272,10 @@ internal sealed class Program
            Tools =
            {
                AgentTool.CreateOpenApiTool(
-                    new OpenApiFunctionDefinition(
+                    new OpenAPIFunctionDefinition(
                        "weather-forecast",
                        BinaryData.FromString(File.ReadAllText(Path.Combine(AppContext.BaseDirectory, "wttr.json"))),
-                        new OpenApiAnonymousAuthDetails()))
+                        new OpenAPIAnonymousAuthenticationDetails()))
            }
        };
 }
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
@@ -55,9 +56,9 @@ internal sealed class Program

    private static async Task CreateAgentAsync(Uri foundryEndpoint, IConfiguration configuration, AIFunction[] functions)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "MenuAgent",
            agentDefinition: DefineMenuAgent(configuration, functions),
            agentDescription: "Provides information about the restaurant menu");
@@ -3,7 +3,8 @@
 // Uncomment this to enable JSON checkpointing to the local file system.
 //#define CHECKPOINT_JSON

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -34,23 +35,26 @@ internal sealed class Program
        Uri foundryEndpoint = new(configuration.GetValue(Application.Settings.FoundryEndpoint));

        // Create the agent service client
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

        // Ensure sample agents exist in Foundry.
-        await CreateAgentsAsync(agentClient, configuration);
+        await CreateAgentsAsync(aiProjectClient, configuration);

        // Ensure workflow agent exists in Foundry.
-        AgentVersion agentVersion = await CreateWorkflowAsync(agentClient, configuration);
+        AgentVersion agentVersion = await CreateWorkflowAsync(aiProjectClient, configuration);

        string workflowInput = GetWorkflowInput(args);

-        AIAgent agent = agentClient.GetAIAgent(agentVersion);
+        AIAgent agent = aiProjectClient.GetAIAgent(agentVersion);

        AgentThread thread = agent.GetNewThread();

-        AgentConversation conversation =
-            await agentClient.GetConversationClient()
-                .CreateConversationAsync().ConfigureAwait(false);
+        ProjectConversation conversation =
+            await aiProjectClient
+                .GetProjectOpenAIClient()
+                .GetProjectConversationsClient()
+                .CreateProjectConversationAsync()
+                .ConfigureAwait(false);

        Console.WriteLine($"CONVERSATION: {conversation.Id}");

@@ -77,7 +81,7 @@ internal sealed class Program
        }
    }

-    private static async Task<AgentVersion> CreateWorkflowAsync(AgentClient agentClient, IConfiguration configuration)
+    private static async Task<AgentVersion> CreateWorkflowAsync(AIProjectClient agentClient, IConfiguration configuration)
    {
        string workflowYaml = File.ReadAllText("MathChat.yaml");

@@ -90,7 +94,7 @@ internal sealed class Program
                agentDescription: "The student attempts to solve the input problem and the teacher provides guidance.");
    }

-    private static async Task CreateAgentsAsync(AgentClient agentClient, IConfiguration configuration)
+    private static async Task CreateAgentsAsync(AIProjectClient agentClient, IConfiguration configuration)
    {
        await agentClient.CreateAgentAsync(
            agentName: "StudentAgent",
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Responses;
@@ -46,19 +47,19 @@ internal sealed class Program

    private static async Task CreateAgentAsync(Uri foundryEndpoint, IConfiguration configuration)
    {
-        AgentClient agentsClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentsClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "LocationTriageAgent",
            agentDefinition: DefineLocationTriageAgent(configuration),
            agentDescription: "Chats with the user to solicit a location of interest.");

-        await agentsClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "LocationCaptureAgent",
            agentDefinition: DefineLocationCaptureAgent(configuration),
            agentDescription: "Evaluate the status of soliciting the location.");

-        await agentsClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "LocationAwareAgent",
            agentDefinition: DefineLocationAwareAgent(configuration),
            agentDescription: "Chats with the user with location awareness.");
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 using Shared.Foundry;
@@ -45,19 +46,19 @@ internal sealed class Program

    private static async Task CreateAgentsAsync(Uri foundryEndpoint, IConfiguration configuration)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "AnalystAgent",
            agentDefinition: DefineAnalystAgent(configuration),
            agentDescription: "Analyst agent for Marketing workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "WriterAgent",
            agentDefinition: DefineWriterAgent(configuration),
            agentDescription: "Writer agent for Marketing workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "EditorAgent",
            agentDefinition: DefineEditorAgent(configuration),
            agentDescription: "Editor agent for Marketing workflow");
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 using Shared.Foundry;
@@ -45,14 +46,14 @@ internal sealed class Program

    private static async Task CreateAgentsAsync(Uri foundryEndpoint, IConfiguration configuration)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "StudentAgent",
            agentDefinition: DefineStudentAgent(configuration),
            agentDescription: "Student agent for MathChat workflow");

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "TeacherAgent",
            agentDefinition: DefineTeacherAgent(configuration),
            agentDescription: "Teacher agent for MathChat workflow");
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Azure.AI.Agents;
+using Azure.AI.Projects;
+using Azure.AI.Projects.OpenAI;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Responses;
@@ -46,9 +47,9 @@ internal sealed class Program

    private static async Task CreateAgentAsync(Uri foundryEndpoint, IConfiguration configuration)
    {
-        AgentClient agentClient = new(foundryEndpoint, new AzureCliCredential());
+        AIProjectClient aiProjectClient = new(foundryEndpoint, new AzureCliCredential());

-        await agentClient.CreateAgentAsync(
+        await aiProjectClient.CreateAgentAsync(
            agentName: "DocumentSearchAgent",
            agentDefinition: DefineSearchAgent(configuration),
            agentDescription: "Searches documents on Microsoft Learn");