diff --git a/.github/workflows/dotnet-build-and-test.yml b/.github/workflows/dotnet-build-and-test.yml
index db26cbe061..63ce12caab 100644
--- a/.github/workflows/dotnet-build-and-test.yml
+++ b/.github/workflows/dotnet-build-and-test.yml
@@ -92,7 +92,7 @@ jobs:
# Change to project directory to ensure local nuget.config is used
pushd consoleapp
- dotnet add packcheck.csproj package Microsoft.Extensions.AI.Agents --prerelease
+ dotnet add packcheck.csproj package Microsoft.Agents.AI --prerelease
dotnet build -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} packcheck.csproj
# Clean up
diff --git a/.github/workflows/dotnet-check-coverage.ps1 b/.github/workflows/dotnet-check-coverage.ps1
index 10e52edfa9..d2154f86fa 100644
--- a/.github/workflows/dotnet-check-coverage.ps1
+++ b/.github/workflows/dotnet-check-coverage.ps1
@@ -9,8 +9,8 @@ $coverageBelowThreshold = $false
$nonExperimentalAssemblies = [System.Collections.Generic.HashSet[string]]::new()
$assembliesCollection = @(
- 'Microsoft.Extensions.AI.Agents.Abstractions'
- 'Microsoft.Extensions.AI.Agents'
+ 'Microsoft.Agents.AI.Abstractions'
+ 'Microsoft.Agents.AI'
)
foreach ($assembly in $assembliesCollection) {
diff --git a/docs/FAQS.md b/docs/FAQS.md
index 944b8c09a0..8363fd40d1 100644
--- a/docs/FAQS.md
+++ b/docs/FAQS.md
@@ -47,8 +47,8 @@ To download nightly builds follow the following steps:
* If you place this file in your project folder make sure to have Git (or whatever source control you use) ignore it.
* For more information on where to store this file go [here](https://learn.microsoft.com/en-us/nuget/reference/nuget-config-file).
1. You can now add packages from the nightly build to your project.
- * E.g. use this command `dotnet add package Microsoft.Extensions.AI.Agents --version 0.0.1-nightly-250731.6-alpha`
+ * E.g. use this command `dotnet add package Microsoft.Agents.AI --version 0.0.1-nightly-250731.6-alpha`
1. And the latest package release can be referenced in the project like this:
- * ``
+ * ``
For more information see:
diff --git a/docs/docs-templates/getting-started/README.md b/docs/docs-templates/getting-started/README.md
index e3a5c65382..e7e6dae552 100644
--- a/docs/docs-templates/getting-started/README.md
+++ b/docs/docs-templates/getting-started/README.md
@@ -26,7 +26,7 @@ Make sure to replace `https://your-resource.openai.azure.com/` with the endpoint
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
AIAgent agent = new AzureOpenAIClient(
@@ -88,9 +88,9 @@ To download nightly builds follow the following steps:
* If you place this file in your project folder make sure to have Git (or whatever source control you use) ignore it.
* For more information on where to store this file go [here](https://learn.microsoft.com/en-us/nuget/reference/nuget-config-file).
1. You can now add packages from the nightly build to your project.
- * E.g. use this command `dotnet add package Microsoft.Extensions.AI.Agents --version 0.0.1-nightly-250731.6-alpha`
+ * E.g. use this command `dotnet add package Microsoft.Agents.AI --version 0.0.1-nightly-250731.6-alpha`
1. And the latest package release can be referenced in the project like this:
- * ``
+ * ``
For more information see:
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 5ef0fa290b..cfddeb0fd3 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -136,6 +136,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -252,21 +263,21 @@
+
+
+
+
+
+
-
-
-
-
-
-
@@ -283,14 +294,14 @@
+
+
+
-
-
-
diff --git a/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj b/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj
index b7699244d4..936ed1865f 100644
--- a/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj
+++ b/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs b/dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs
index 12f151b471..817e5084e6 100644
--- a/dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs
+++ b/dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs
@@ -1,8 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.ClientModel;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.A2A;
using Microsoft.Extensions.Logging;
using OpenAI;
diff --git a/dotnet/samples/A2AClientServer/A2AClient/Program.cs b/dotnet/samples/A2AClientServer/A2AClient/Program.cs
index e22a4d6a35..34c9ec4563 100644
--- a/dotnet/samples/A2AClientServer/A2AClient/Program.cs
+++ b/dotnet/samples/A2AClientServer/A2AClient/Program.cs
@@ -3,7 +3,7 @@
using System.CommandLine;
using System.CommandLine.Invocation;
using System.Reflection;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
diff --git a/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj b/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj
index 54b038d6b6..af2b1f72be 100644
--- a/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj
+++ b/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs b/dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs
index 4c912133e1..f83abdb236 100644
--- a/dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs
+++ b/dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs
@@ -3,9 +3,9 @@
using A2A;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.A2A;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.A2A;
using OpenAI;
namespace A2AServer;
diff --git a/dotnet/samples/A2AClientServer/A2AServer/Program.cs b/dotnet/samples/A2AClientServer/A2AServer/Program.cs
index 5c34361ced..a6a24bc65e 100644
--- a/dotnet/samples/A2AClientServer/A2AServer/Program.cs
+++ b/dotnet/samples/A2AClientServer/A2AServer/Program.cs
@@ -2,9 +2,9 @@
using A2A;
using A2A.AspNetCore;
using A2AServer;
+using Microsoft.Agents.AI.A2A;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents.A2A;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
index 24b9d93995..8b162dede3 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
@@ -9,11 +9,11 @@
-
+
-
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
index 240b5012ef..b4d31b5cc8 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
@@ -3,10 +3,10 @@
using System.Text.Json;
using AgentWebChat.AgentHost;
using AgentWebChat.AgentHost.Utilities;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Azure.Cosmos;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.AI.Agents.Hosting;
using Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore;
using Microsoft.Extensions.AI.Agents.Runtime.Storage.CosmosDB;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
index 2c2528c870..ea5ed2bea2 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
index bd75eab36a..8a11070742 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Net.ServerSentEvents;
using System.Runtime.CompilerServices;
using System.Text.Json;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Hosting;
using Microsoft.Extensions.AI.Agents.Runtime;
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj b/dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj
index a58fa132d2..9c063be86c 100644
--- a/dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj
+++ b/dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs b/dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs
index 10c6a058ff..65c26cb526 100644
--- a/dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs
@@ -5,8 +5,8 @@ using System.Diagnostics;
using System.Diagnostics.Metrics;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using OpenTelemetry;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/AgentOrchestration.csproj b/dotnet/samples/GettingStarted/AgentOrchestration/AgentOrchestration.csproj
index 43a254a910..8b1d05d73f 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/AgentOrchestration.csproj
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/AgentOrchestration.csproj
@@ -41,9 +41,9 @@
-
-
-
+
+
+
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/AgentSample.cs b/dotnet/samples/GettingStarted/AgentOrchestration/AgentSample.cs
index 33e8965375..b817a86a45 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/AgentSample.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/AgentSample.cs
@@ -4,8 +4,8 @@ using System.ClientModel;
using Azure.AI.Agents.Persistent;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
using Microsoft.Shared.Samples;
using OpenAI.Assistants;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_Intro.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_Intro.cs
index 26d7053d0f..923322a194 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_Intro.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_Intro.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_With_StructuredOutput.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_With_StructuredOutput.cs
index 3005db5236..c0f0060a6a 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_With_StructuredOutput.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/ConcurrentOrchestration_With_StructuredOutput.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text.Json;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Samples;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_Intro.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_Intro.cs
index 8f7e9e5f96..6893655706 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_Intro.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_Intro.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_AIManager.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_AIManager.cs
index ca5f27c1f2..ff37ca66db 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_AIManager.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_AIManager.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_HumanInTheLoop.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_HumanInTheLoop.cs
index 5e77aff593..655c992824 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_HumanInTheLoop.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/GroupChatOrchestration_With_HumanInTheLoop.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_Intro.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_Intro.cs
index e8a68d0dab..9ac572635c 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_Intro.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_Intro.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_With_StructuredInput.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_With_StructuredInput.cs
index 509df9df7f..239bda7a91 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_With_StructuredInput.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/HandoffOrchestration_With_StructuredInput.cs
@@ -2,9 +2,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Foundry_Agents.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Foundry_Agents.cs
index aa94f09ccc..926ae53d20 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Foundry_Agents.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Foundry_Agents.cs
@@ -2,8 +2,8 @@
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Samples;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Intro.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Intro.cs
index a2c05b7ad8..211055270d 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Intro.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Intro.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Multi_Agent.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Multi_Agent.cs
index 7edabed6f6..7c6760f4ce 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Multi_Agent.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_Multi_Agent.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Samples;
using OpenAI;
diff --git a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_With_Cancellation.cs b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_With_Cancellation.cs
index 6dcd685e0b..e19d7dce2c 100644
--- a/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_With_Cancellation.cs
+++ b/dotnet/samples/GettingStarted/AgentOrchestration/Orchestration/SequentialOrchestration_With_Cancellation.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Agents.Orchestration;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Orchestration;
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
index 1604ac6c73..933d578f75 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
@@ -15,7 +15,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs
index 726ee2cf58..854a2a7bd2 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs
@@ -4,8 +4,7 @@
using System;
using A2A;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.A2A;
+using Microsoft.Agents.AI;
var a2aAgentHost = Environment.GetEnvironmentVariable("A2A_AGENT_HOST") ?? throw new InvalidOperationException("A2A_AGENT_HOST is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md
index 7100a2d1e1..ce7a9174b0 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md
@@ -19,8 +19,8 @@ This method can be used to create AI agents for A2A agents whose hosts support t
```csharp
using A2A;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.A2A;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.A2A;
// Create an A2AClient pointing to your `echo` A2A agent endpoint
A2AClient a2aClient = new(new Uri("https://your-a2a-agent-host/echo"));
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Agent_With_AzureFoundry.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Agent_With_AzureFoundry.csproj
index d3e9e3314a..db4064a401 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Agent_With_AzureFoundry.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Agent_With_AzureFoundry.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Program.cs
index 86f3ea25db..d022d3c435 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundry/Program.cs
@@ -5,7 +5,7 @@
using System;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
var model = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_MODEL_ID") ?? "gpt-4o-mini";
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
index 27ab7dd865..b6b90df7ea 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
@@ -5,7 +5,7 @@
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
index 311b421cd8..bf69a9a0a1 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
@@ -7,7 +7,7 @@
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
index f46e9bd63c..a4554ba69c 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs
index ed5dfda403..295539d45b 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs
@@ -11,8 +11,8 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using SampleApp;
AIAgent agent = new UpperCaseParrotAgent();
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
index 6c4004765f..c3943c008d 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs
index 8a2579b1ff..085d4906e2 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs
@@ -4,7 +4,7 @@
// WARNING: ONNX doesn't support function calling, so any function tools passed to the agent will be ignored.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.ML.OnnxRuntimeGenAI;
// E.g. C:\repos\Phi-4-mini-instruct-onnx\cpu_and_mobile\cpu-int4-rtn-block-32-acc-level-4
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
index 5eee1d6e72..f4001ce7c6 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs
index 9a8b028f5f..28257fbe31 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs
@@ -3,7 +3,7 @@
// This sample shows how to create and use a simple AI agent with Ollama as the backend.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OllamaSharp;
var endpoint = Environment.GetEnvironmentVariable("OLLAMA_ENDPOINT") ?? throw new InvalidOperationException("OLLAMA_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
index e6c70c1a20..1186fc3b81 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
index 35689f2a92..484430cad7 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
@@ -8,7 +8,7 @@
#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var apiKey = Environment.GetEnvironmentVariable("OPENAI_APIKEY") ?? throw new InvalidOperationException("OPENAI_APIKEY is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
index e6c70c1a20..1186fc3b81 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
index 1427433d5c..6d042762df 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
@@ -3,7 +3,7 @@
// This sample shows how to create and use a simple AI agent with OpenAI Chat Completion as the backend.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var apiKey = Environment.GetEnvironmentVariable("OPENAI_APIKEY") ?? throw new InvalidOperationException("OPENAI_APIKEY is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
index e6c70c1a20..1186fc3b81 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs
index bd919ade8f..6fb09040c6 100644
--- a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs
@@ -5,7 +5,7 @@
#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var apiKey = Environment.GetEnvironmentVariable("OPENAI_APIKEY") ?? throw new InvalidOperationException("OPENAI_APIKEY is not set.");
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj b/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
index ab5e5d8589..9118c73a49 100644
--- a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
+++ b/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs b/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
index 13760a2c89..c3c10dc6f5 100644
--- a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
@@ -5,7 +5,7 @@
using System;
using System.ClientModel;
using System.Linq;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
using OpenAI.Chat;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs
index 942c0cd9b1..c27ba0b0cb 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs
@@ -5,7 +5,7 @@
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs
index e50dcbe9ca..3a38a38c7b 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs
@@ -5,7 +5,7 @@
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs
index 18b05ba6ae..fb7eec50f1 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs
@@ -7,8 +7,8 @@ using System;
using System.ComponentModel;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
index 45e60444e0..45f92dbad9 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs
index 8887f6cbf5..f7944f5cff 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs
@@ -10,8 +10,8 @@ using System.ComponentModel;
using System.Linq;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs
index 7c26c40012..4522e79be2 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs
@@ -7,8 +7,8 @@ using System.Text.Json;
using System.Text.Json.Serialization;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
using SampleApp;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs
index e2d3ae9459..7f1245a0e3 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs
@@ -7,7 +7,7 @@ using System.IO;
using System.Text.Json;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Agent_Step07_3rdPartyThreadStorage.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Agent_Step07_3rdPartyThreadStorage.csproj
index 701f2e63a0..3695048729 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Agent_Step07_3rdPartyThreadStorage.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Agent_Step07_3rdPartyThreadStorage.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Program.cs
index 6a57e8e7e7..a1dd2e7e35 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyThreadStorage/Program.cs
@@ -12,8 +12,8 @@ using System.Threading;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.VectorData;
using Microsoft.SemanticKernel.Connectors.InMemory;
using OpenAI;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj
index 1893c335f5..a9f2366acd 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Program.cs
index a5a29c6039..481ed63f9e 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Program.cs
@@ -5,7 +5,7 @@
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
using OpenTelemetry;
using OpenTelemetry.Trace;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj
index bc2bb6e9a9..46a2405288 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs
index ce98572bab..93608bb0ed 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs
@@ -9,8 +9,8 @@ using System.Threading;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/AIAgentExtensions.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/AIAgentExtensions.cs
index 98f2a9734f..9243764fcd 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/AIAgentExtensions.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/AIAgentExtensions.cs
@@ -3,7 +3,7 @@
using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using ModelContextProtocol.Server;
namespace Agent_Step10_AsMcpTool;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj
index a2f487a175..158f0f8341 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs
index 080462f1c6..c8da07b63a 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs
@@ -6,7 +6,7 @@ using System;
using Agent_Step10_AsMcpTool;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj
index 6c2c57f589..2c9ee1a6fa 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj
index f5639abd61..d1d3cfc8d1 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs
index 50feac82bd..e5a6c9f45c 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs
@@ -6,8 +6,8 @@ using System;
using System.ComponentModel;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj b/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj
index a7cf9e4688..8f7d672d81 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Program.cs b/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Program.cs
index c97da72c68..94a58e4e22 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Program.cs
+++ b/dotnet/samples/GettingStarted/Agents/Agent_Step13_Memory/Program.cs
@@ -14,8 +14,8 @@ using System.Threading;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
using OpenAI.Chat;
using SampleApp;
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
index 812a7b365f..e071402f25 100644
--- a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
+++ b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs
index 8faffd1339..0286b67542 100644
--- a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs
+++ b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs
@@ -6,8 +6,8 @@ using System;
using System.Linq;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using ModelContextProtocol.Client;
using OpenAI;
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
index 754ff3550a..e3719b087d 100644
--- a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
+++ b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
index 2a2f3e3c63..4b5dff62f7 100644
--- a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
+++ b/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
using System.Web;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.Logging;
using ModelContextProtocol.Client;
using OpenAI;
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
index 267e25180e..498d56f07f 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
@@ -16,8 +16,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs b/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs
index 53a7837229..14a21b61ff 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs
@@ -6,10 +6,10 @@ using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowCustomAgentExecutorsSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj
index eac3c76d93..5d75f319c6 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj
@@ -15,8 +15,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs b/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs
index 56dafd086f..8c108e3cfe 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs
@@ -4,9 +4,9 @@ using System;
using System.Threading.Tasks;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowFoundryAgentSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs
index 6da73134fe..3b396cc274 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowAsAnAgentsSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
index 267e25180e..498d56f07f 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
@@ -16,8 +16,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowHelper.cs b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowHelper.cs
index 19ad44a4a8..108dbea12a 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowHelper.cs
+++ b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowHelper.cs
@@ -3,10 +3,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowAsAnAgentsSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent.csproj b/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent.csproj
index 694e8a1ea8..98cfdb21cb 100644
--- a/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent.csproj
@@ -16,8 +16,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/Program.cs b/dotnet/samples/GettingStarted/Workflows/Concurrent/Program.cs
index 7f26ecd714..c84c36fef7 100644
--- a/dotnet/samples/GettingStarted/Workflows/Concurrent/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/Concurrent/Program.cs
@@ -6,10 +6,10 @@ using System.Linq;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowConcurrentSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
index 492fe95fa6..598ae02592 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs
index 2a28b83cef..f1b7df9d12 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs
@@ -6,10 +6,10 @@ using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowEdgeConditionSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
index 492fe95fa6..598ae02592 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs
index c29fb7ecf4..3de5c7aee2 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs
@@ -6,10 +6,10 @@ using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowSwitchCaseSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
index 492fe95fa6..598ae02592 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs
index 63efacdc7f..fcb503fdb3 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs
@@ -7,10 +7,10 @@ using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Agents.Workflows.Reflection;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowMultiSelectionSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj
index 267e25180e..498d56f07f 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj
@@ -16,8 +16,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs b/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs
index b5d30eff2d..7689d7bcfe 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs
@@ -4,9 +4,9 @@ using System;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowAgentsInWorkflowsSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj
index 267e25180e..498d56f07f 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj
@@ -16,8 +16,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs b/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs
index 1838aba48d..48e3571328 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs
@@ -7,9 +7,9 @@ using System.Text.Json;
using System.Threading.Tasks;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace WorkflowAgentsInWorkflowsSample;
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj
index 3ffee9f1d8..e85128e2aa 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs b/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs
index c6aef72e78..8ae390f403 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs
@@ -2,9 +2,9 @@
using System;
using Amazon.BedrockRuntime;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
// Define the topic discussion.
const string Topic = "Goldendoodles make the best pets.";
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/AzureAIFoundry_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/AzureAIFoundry_Step01_Basics.csproj
index f0655e396b..94bca0b896 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/AzureAIFoundry_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/AzureAIFoundry_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
true
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/Program.cs
index 9e9249a9e9..62e7134f59 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step01_Basics/Program.cs
@@ -2,7 +2,7 @@
using Azure.AI.Agents.Persistent;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.AzureAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/AzureAIFoundry_Step02_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/AzureAIFoundry_Step02_ToolCall.csproj
index 5fb1669c6d..c78f26ae9b 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/AzureAIFoundry_Step02_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/AzureAIFoundry_Step02_ToolCall.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/Program.cs
index 026ab9689e..4a84915aab 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step02_ToolCall/Program.cs
@@ -3,8 +3,8 @@
using System.ComponentModel;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.AzureAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/AzureAIFoundry_Step03_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/AzureAIFoundry_Step03_DependencyInjection.csproj
index 3e22c21d32..54b13a7e87 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/AzureAIFoundry_Step03_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/AzureAIFoundry_Step03_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/Program.cs
index 0cf6a564db..abddcdd11a 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step03_DependencyInjection/Program.cs
@@ -2,8 +2,8 @@
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.AzureAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/AzureAIFoundry_Step04_CodeInterpreter.csproj b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/AzureAIFoundry_Step04_CodeInterpreter.csproj
index a71ffa2f51..8e7116df22 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/AzureAIFoundry_Step04_CodeInterpreter.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/AzureAIFoundry_Step04_CodeInterpreter.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/Program.cs
index d1cef9ffea..263144eb1e 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureAIFoundry/Step04_CodeInterpreter/Program.cs
@@ -3,8 +3,8 @@
using System.Text;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
using Microsoft.SemanticKernel.Agents.AzureAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/AzureOpenAI_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/AzureOpenAI_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/AzureOpenAI_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/AzureOpenAI_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/Program.cs
index 941858b8dd..eb2df2c9e3 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step01_Basics/Program.cs
@@ -2,7 +2,7 @@
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
using Microsoft.SemanticKernel.Connectors.OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step02_ToolCall/AzureOpenAI_Step02_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step02_ToolCall/AzureOpenAI_Step02_ToolCall.csproj
index dcf6e25469..079fd6214d 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step02_ToolCall/AzureOpenAI_Step02_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step02_ToolCall/AzureOpenAI_Step02_ToolCall.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707;CA1050;CA1052
+ $(NoWarn);CA1812;RCS1102;CA1707;CA1050;CA1052;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/AzureOpenAI_Step03_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/AzureOpenAI_Step03_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/AzureOpenAI_Step03_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/AzureOpenAI_Step03_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/Program.cs
index f0f5b383c8..954ba1686a 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAI/Step03_DependencyInjection/Program.cs
@@ -2,8 +2,8 @@
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/AzureOpenAIAssistants_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/AzureOpenAIAssistants_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/AzureOpenAIAssistants_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/AzureOpenAIAssistants_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/Program.cs
index b245aa237e..6cba711010 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step01_Basics/Program.cs
@@ -4,7 +4,7 @@
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.Connectors.OpenAI;
@@ -23,8 +23,7 @@ await AFAgent();
async Task SKAgent()
{
Console.WriteLine("\n=== SK Agent ===\n");
-
- var builder = Kernel.CreateBuilder().AddAzureOpenAIChatClient(deploymentName, endpoint, new AzureCliCredential());
+ var _ = Kernel.CreateBuilder().AddAzureOpenAIChatClient(deploymentName, endpoint, new AzureCliCredential());
var assistantsClient = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential()).GetAssistantClient();
@@ -76,6 +75,9 @@ async Task AFAgent()
}
// Clean up
- await assistantClient.DeleteThreadAsync(thread.ConversationId);
+ if (thread is ChatClientAgentThread chatThread)
+ {
+ await assistantClient.DeleteThreadAsync(chatThread.ConversationId);
+ }
await assistantClient.DeleteAssistantAsync(agent.Id);
}
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/AzureOpenAIAssistants_Step02_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/AzureOpenAIAssistants_Step02_ToolCall.csproj
index dcf6e25469..079fd6214d 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/AzureOpenAIAssistants_Step02_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/AzureOpenAIAssistants_Step02_ToolCall.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707;CA1050;CA1052
+ $(NoWarn);CA1812;RCS1102;CA1707;CA1050;CA1052;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/Program.cs
index 279a96c0af..18de929c77 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step02_ToolCall/Program.cs
@@ -5,8 +5,8 @@
using System.ComponentModel;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.Connectors.OpenAI;
@@ -92,6 +92,9 @@ async Task AFAgent()
}
// Clean up
- await assistantClient.DeleteThreadAsync(thread.ConversationId);
+ if (thread is ChatClientAgentThread chatThread)
+ {
+ await assistantClient.DeleteThreadAsync(chatThread.ConversationId);
+ }
await assistantClient.DeleteAssistantAsync(agent.Id);
}
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/AzureOpenAIAssistants_Step03_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/AzureOpenAIAssistants_Step03_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/AzureOpenAIAssistants_Step03_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/AzureOpenAIAssistants_Step03_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/Program.cs
index add47b4954..a1c26db2aa 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step03_DependencyInjection/Program.cs
@@ -4,7 +4,7 @@
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
@@ -72,9 +72,7 @@ async Task AFAgent()
{
var assistantClient = sp.GetRequiredService();
- var agent = assistantClient.CreateAIAgent(deploymentName, name: "Joker", instructions: "You are good at telling jokes.");
-
- return agent;
+ return assistantClient.CreateAIAgent(deploymentName, name: "Joker", instructions: "You are good at telling jokes.");
});
await using ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
@@ -94,6 +92,9 @@ async Task AFAgent()
// Clean up
var assistantClient = serviceProvider.GetRequiredService();
- await assistantClient.DeleteThreadAsync(thread.ConversationId);
+ if (thread is ChatClientAgentThread chatThread)
+ {
+ await assistantClient.DeleteThreadAsync(chatThread.ConversationId);
+ }
await assistantClient.DeleteAssistantAsync(agent.Id);
}
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/AzureOpenAIAssistants_Step04_CodeInterpreter.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/AzureOpenAIAssistants_Step04_CodeInterpreter.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/AzureOpenAIAssistants_Step04_CodeInterpreter.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/AzureOpenAIAssistants_Step04_CodeInterpreter.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/Program.cs
index 8805a52e38..3615e392dd 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIAssistants/Step04_CodeInterpreter/Program.cs
@@ -3,6 +3,7 @@
using System.Text;
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
@@ -27,8 +28,7 @@ await AFAgent();
async Task SKAgent()
{
Console.WriteLine("\n=== SK Agent ===\n");
-
- var builder = Kernel.CreateBuilder().AddAzureOpenAIChatClient(deploymentName, endpoint, new AzureCliCredential());
+ var _ = Kernel.CreateBuilder().AddAzureOpenAIChatClient(deploymentName, endpoint, new AzureCliCredential());
// Define the assistant
Assistant assistant = await assistantsClient.CreateAssistantAsync(deploymentName, enableCodeInterpreter: true);
@@ -124,6 +124,9 @@ async Task AFAgent()
}
// Clean up
- await assistantsClient.DeleteThreadAsync(thread.ConversationId);
+ if (thread is ChatClientAgentThread chatThread)
+ {
+ await assistantsClient.DeleteThreadAsync(chatThread.ConversationId);
+ }
await assistantsClient.DeleteAssistantAsync(agent.Id);
}
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/AzureOpenAIResponses_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/AzureOpenAIResponses_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/AzureOpenAIResponses_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/AzureOpenAIResponses_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/Program.cs
index 51509f3294..a89b05905d 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step01_Basics/Program.cs
@@ -2,7 +2,7 @@
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel.Agents.OpenAI;
using OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/AzureOpenAIResponses_Step02_ReasoningModel.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/AzureOpenAIResponses_Step02_ReasoningModel.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/AzureOpenAIResponses_Step02_ReasoningModel.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/AzureOpenAIResponses_Step02_ReasoningModel.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/Program.cs
index 22415fb51c..ddfc95b7e9 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step02_ReasoningModel/Program.cs
@@ -2,8 +2,8 @@
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.ChatCompletion;
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step03_ToolCall/AzureOpenAIResponses_Step03_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step03_ToolCall/AzureOpenAIResponses_Step03_ToolCall.csproj
index dcf6e25469..714d7249f3 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step03_ToolCall/AzureOpenAIResponses_Step03_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step03_ToolCall/AzureOpenAIResponses_Step03_ToolCall.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/AzureOpenAIResponses_Step04_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/AzureOpenAIResponses_Step04_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/AzureOpenAIResponses_Step04_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/AzureOpenAIResponses_Step04_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/Program.cs
index acf8653fab..26e5611893 100644
--- a/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/Program.cs
@@ -2,8 +2,8 @@
using Azure.AI.OpenAI;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel.Agents.OpenAI;
using OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/OpenAI_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/OpenAI_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/OpenAI_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/OpenAI_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/Program.cs
index bd05155c15..f1f7506c6f 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAI/Step01_Basics/Program.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
using Microsoft.SemanticKernel.Connectors.OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAI/Step02_ToolCall/OpenAI_Step02_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/OpenAI/Step02_ToolCall/OpenAI_Step02_ToolCall.csproj
index dcf6e25469..714d7249f3 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAI/Step02_ToolCall/OpenAI_Step02_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAI/Step02_ToolCall/OpenAI_Step02_ToolCall.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/OpenAI_Step03_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/OpenAI_Step03_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/OpenAI_Step03_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/OpenAI_Step03_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/Program.cs
index e659443f6b..139a373633 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAI/Step03_DependencyInjection/Program.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/OpenAIAssistants_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/OpenAIAssistants_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/OpenAIAssistants_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/OpenAIAssistants_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/Program.cs
index dc896d89f2..1f0593e34d 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step01_Basics/Program.cs
@@ -2,7 +2,7 @@
#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.Connectors.OpenAI;
using OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/OpenAIAssistants_Step02_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/OpenAIAssistants_Step02_ToolCall.csproj
index dcf6e25469..714d7249f3 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/OpenAIAssistants_Step02_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/OpenAIAssistants_Step02_ToolCall.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/Program.cs
index 9b14f80bc2..cf33a2f8b9 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step02_ToolCall/Program.cs
@@ -3,8 +3,8 @@
#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
using System.ComponentModel;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.Connectors.OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/OpenAIAssistants_Step03_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/OpenAIAssistants_Step03_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/OpenAIAssistants_Step03_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/OpenAIAssistants_Step03_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/Program.cs
index 81dea6381d..76bf0ffbfc 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step03_DependencyInjection/Program.cs
@@ -2,7 +2,7 @@
#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/OpenAIAssistants_Step04_CodeInterpreter.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/OpenAIAssistants_Step04_CodeInterpreter.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/OpenAIAssistants_Step04_CodeInterpreter.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/OpenAIAssistants_Step04_CodeInterpreter.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/Program.cs
index 99213d52e4..9e0ec0dbf4 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIAssistants/Step04_CodeInterpreter/Program.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents;
using Microsoft.SemanticKernel.Agents.OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/OpenAIResponses_Step01_Basics.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/OpenAIResponses_Step01_Basics.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/OpenAIResponses_Step01_Basics.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/OpenAIResponses_Step01_Basics.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/Program.cs
index 8f821aa9b3..d4472eee53 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step01_Basics/Program.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.SemanticKernel.Agents.OpenAI;
using OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/OpenAIResponses_Step02_ReasoningModel.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/OpenAIResponses_Step02_ReasoningModel.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/OpenAIResponses_Step02_ReasoningModel.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/OpenAIResponses_Step02_ReasoningModel.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/Program.cs
index ade717184f..cab7d2d288 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step02_ReasoningModel/Program.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Agents.OpenAI;
using Microsoft.SemanticKernel.ChatCompletion;
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step03_ToolCall/OpenAIResponses_Step03_ToolCall.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step03_ToolCall/OpenAIResponses_Step03_ToolCall.csproj
index dcf6e25469..714d7249f3 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step03_ToolCall/OpenAIResponses_Step03_ToolCall.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step03_ToolCall/OpenAIResponses_Step03_ToolCall.csproj
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/OpenAIResponses_Step04_DependencyInjection.csproj b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/OpenAIResponses_Step04_DependencyInjection.csproj
index 3f455d079f..cff80235d1 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/OpenAIResponses_Step04_DependencyInjection.csproj
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/OpenAIResponses_Step04_DependencyInjection.csproj
@@ -5,7 +5,7 @@
net9.0
enable
enable
- $(NoWarn);CA1812;RCS1102;CA1707
+ $(NoWarn);CA1812;RCS1102;CA1707;VSTHRD200
@@ -17,8 +17,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/Program.cs b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/Program.cs
index 3882231b2e..d3eea54107 100644
--- a/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/Program.cs
+++ b/dotnet/samples/SemanticKernelMigration/OpenAIResponses/Step04_DependencyInjection/Program.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel.Agents.OpenAI;
using OpenAI;
diff --git a/dotnet/samples/SemanticKernelMigration/README.md b/dotnet/samples/SemanticKernelMigration/README.md
index 2f0bde2b3c..be27d6260b 100644
--- a/dotnet/samples/SemanticKernelMigration/README.md
+++ b/dotnet/samples/SemanticKernelMigration/README.md
@@ -36,7 +36,7 @@ OR just
```csharp
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
```
### 2. Agent Creation Simplification
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgent.cs b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgent.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/A2AAgent.cs
index ca7b5818d0..39009b725f 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgent.cs
@@ -8,11 +8,12 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using A2A;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Agents.AI.A2A;
///
/// Represents an that can interact with remote agents that are exposed via the A2A protocol
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentLogMessages.cs b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentLogMessages.cs
similarity index 96%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentLogMessages.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentLogMessages.cs
index c8f7934d3f..96d0ba0f9f 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentLogMessages.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentLogMessages.cs
@@ -3,7 +3,7 @@
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Agents.AI.A2A;
///
/// Extensions for logging invocations.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentThread.cs b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentThread.cs
similarity index 93%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentThread.cs
index c9696f2283..010df78a02 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/A2AAgentThread.cs
@@ -2,7 +2,7 @@
using System.Text.Json;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Agents.AI.A2A;
///
/// Thread for A2A based agents.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AHostAgent.cs b/dotnet/src/Microsoft.Agents.AI.A2A/A2AHostAgent.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AHostAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/A2AHostAgent.cs
index f694dbac97..718b027aec 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/A2AHostAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/A2AHostAgent.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using A2A;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Agents.AI.A2A;
///
/// Host which will attach an to a
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/AIContentExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAIContentExtensions.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/AIContentExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAIContentExtensions.cs
index 35c23e7b47..10d572db10 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/AIContentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAIContentExtensions.cs
@@ -4,12 +4,12 @@ using System;
using System.Collections.Generic;
using A2A;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Extensions.AI;
///
/// Extension methods for the class.
///
-internal static class AIContentExtensions
+internal static class A2AAIContentExtensions
{
///
/// Converts a collection of to a list of objects.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AAgentTaskExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAgentTaskExtensions.cs
similarity index 92%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AAgentTaskExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAgentTaskExtensions.cs
index 858be41753..236ecfb174 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AAgentTaskExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AAgentTaskExtensions.cs
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
-using A2A;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Extension methods for the class.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AArtifactExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AArtifactExtensions.cs
similarity index 92%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AArtifactExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AArtifactExtensions.cs
index 66f1b6e5a2..39c498b247 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AArtifactExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AArtifactExtensions.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
-using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Extension methods for the class.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2ACardResolverExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2ACardResolverExtensions.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2ACardResolverExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2ACardResolverExtensions.cs
index b326d0f1ef..4dd071de59 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2ACardResolverExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2ACardResolverExtensions.cs
@@ -4,10 +4,11 @@ using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
-using A2A;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.A2A;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Provides extension methods for
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AClientExtensions.cs
similarity index 96%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AClientExtensions.cs
index 37bd78d233..c13300b45f 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AClientExtensions.cs
@@ -1,9 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
-using A2A;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.A2A;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Provides extension methods for
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMessageExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMessageExtensions.cs
similarity index 92%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMessageExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMessageExtensions.cs
index 918235869e..e5550fcbf9 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMessageExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMessageExtensions.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
-using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Extension methods for the class.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMetadataExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMetadataExtensions.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMetadataExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMetadataExtensions.cs
index 05b1293c24..c0dedbd541 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2AMetadataExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2AMetadataExtensions.cs
@@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Text.Json;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Extension methods for A2A metadata dictionary.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2APartExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2APartExtensions.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2APartExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2APartExtensions.cs
index e209a6c6ea..8fa40a159d 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/A2APartExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/A2APartExtensions.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft. All rights reserved.
using System;
-using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace A2A;
///
/// Extension methods for the class.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/ChatMessageExtensions.cs b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/ChatMessageExtensions.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/ChatMessageExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.A2A/Extensions/ChatMessageExtensions.cs
index 9199106e65..cd1e0ef956 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Extensions/ChatMessageExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Extensions/ChatMessageExtensions.cs
@@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using A2A;
-namespace Microsoft.Extensions.AI.Agents.A2A;
+namespace Microsoft.Extensions.AI;
///
/// Extension methods for the class.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Microsoft.Extensions.AI.Agents.A2A.csproj b/dotnet/src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj
similarity index 78%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Microsoft.Extensions.AI.Agents.A2A.csproj
rename to dotnet/src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj
index c1a191e495..62019d4331 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.A2A/Microsoft.Extensions.AI.Agents.A2A.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj
@@ -20,16 +20,16 @@
- Microsoft.Extensions.AI.Agents.A2A
+ Microsoft.Agents.AI.A2A
Defines AIAgent for interacting with application-to-application (A2A) agents.
-
+
-
+
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgent.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgent.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgent.cs
index 0dacd4abdf..e866b148a1 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgent.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Base abstraction for all agents. An agent instance may participate in one or more conversations.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgentMetadata.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgentMetadata.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgentMetadata.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgentMetadata.cs
index 90e857814d..92a30ce864 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIAgentMetadata.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgentMetadata.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides metadata about an .
public class AIAgentMetadata
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContentExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContentExtensions.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContentExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AIContentExtensions.cs
index 22e0193e8b..29a813d9cd 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContentExtensions.cs
@@ -11,9 +11,8 @@ using System.Runtime.CompilerServices;
using System.Text;
#endif
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Extensions.AI;
-// TODO: Consolidate with same internal class in Microsoft.Extensions.AI.Abstractions when both are available in the same repository.
/// Internal extensions for working with .
internal static class AIContentExtensions
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContext.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContext.cs
similarity index 96%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContext.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AIContext.cs
index f0c8e64bff..7a7dc9090b 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContext.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContext.cs
@@ -1,8 +1,9 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// A class containing any context that should be provided to the AI model
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContextProvider.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContextProvider.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContextProvider.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AIContextProvider.cs
index af9243aba6..51446cbe43 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AIContextProvider.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AIContextProvider.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Base class for all AI context providers.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentAbstractionsJsonUtilities.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentAbstractionsJsonUtilities.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentAbstractionsJsonUtilities.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentAbstractionsJsonUtilities.cs
index 77d184dd02..09edd9261c 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentAbstractionsJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentAbstractionsJsonUtilities.cs
@@ -3,8 +3,9 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using System.Text.Json.Serialization;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides a collection of utility methods for working with JSON data in the context of agents.
public static partial class AgentAbstractionsJsonUtilities
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunOptions.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunOptions.cs
index 2b0784255c..4dfdc7c49d 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunOptions.cs
@@ -2,7 +2,7 @@
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Optional parameters when running an agent.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponse.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponse.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponse.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponse.cs
index f87af22389..9ca8dd0898 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponse.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponse.cs
@@ -15,11 +15,12 @@ using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using Microsoft.Shared.Diagnostics;
+using Microsoft.Extensions.AI;
#pragma warning disable S109 // Magic numbers should not be used
#pragma warning disable S1121 // Assignments should not be made from within sub-expressions
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Represents the response to an Agent run request.
///
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdate.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdate.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdate.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdate.cs
index 4f158c9e81..3087c78b92 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdate.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdate.cs
@@ -6,9 +6,10 @@ using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text.Json.Serialization;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Represents a single streaming response chunk from an .
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdateExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdateExtensions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdateExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdateExtensions.cs
index 665aa8c620..848bd5fd24 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunResponseUpdateExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentRunResponseUpdateExtensions.cs
@@ -5,12 +5,13 @@ using System.Collections.Generic;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
#pragma warning disable S109 // Magic numbers should not be used
#pragma warning disable S1121 // Assignments should not be made from within sub-expressions
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Provides extension methods for working with instances.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThread.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThread.cs
index eae957500d..30d9f96f19 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThread.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Base abstraction for all agent threads.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThreadMetadata.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThreadMetadata.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThreadMetadata.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThreadMetadata.cs
index 39b1bf7665..cf88c48625 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThreadMetadata.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/AgentThreadMetadata.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides metadata about an .
public class AgentThreadMetadata
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ChatMessageStore.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/ChatMessageStore.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ChatMessageStore.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/ChatMessageStore.cs
index 3ba7a75440..a63bd0f334 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ChatMessageStore.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/ChatMessageStore.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Defines methods for storing and retrieving chat messages associated with a specific thread.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/DelegatingAIAgent.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/DelegatingAIAgent.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/DelegatingAIAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/DelegatingAIAgent.cs
index c597530230..a83c523fce 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/DelegatingAIAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/DelegatingAIAgent.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Provides an optional base class for an that passes through calls to another instance.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryAgentThread.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryAgentThread.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryAgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryAgentThread.cs
index 48a39839cf..042a9a67c4 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryAgentThread.cs
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// A base class for agent threads that operate entirely in memory without external storage.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryChatMessageStore.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryChatMessageStore.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryChatMessageStore.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryChatMessageStore.cs
index 0a2d525308..726de61ac3 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/InMemoryChatMessageStore.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryChatMessageStore.cs
@@ -6,9 +6,10 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Represents an in-memory store for chat messages associated with a specific thread.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj b/dotnet/src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj
similarity index 93%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj
index c4f910dbec..198af75de2 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj
@@ -31,6 +31,6 @@
-
+
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ServiceIdAgentThread.cs b/dotnet/src/Microsoft.Agents.AI.Abstractions/ServiceIdAgentThread.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ServiceIdAgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI.Abstractions/ServiceIdAgentThread.cs
index 52ba25c48b..0da69debc4 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/ServiceIdAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Abstractions/ServiceIdAgentThread.cs
@@ -6,7 +6,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// A base class for agent threads that always store conversation state in the service, and only keep an ID reference in the .
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj b/dotnet/src/Microsoft.Agents.AI.AzureAI/Microsoft.Agents.AI.AzureAI.csproj
similarity index 84%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj
rename to dotnet/src/Microsoft.Agents.AI.AzureAI/Microsoft.Agents.AI.AzureAI.csproj
index 59ccb71e32..b0a09a0d56 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.AzureAI/Microsoft.Agents.AI.AzureAI.csproj
@@ -17,12 +17,12 @@
-
+
- Microsoft.Extensions.AI.Agents.AzureAI
+ Microsoft.Agents.AI.AzureAI
Implementation of generative AI abstractions for Azure AI Persistent Agents.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/NewPersistentAgentsChatClient.cs b/dotnet/src/Microsoft.Agents.AI.AzureAI/NewPersistentAgentsChatClient.cs
similarity index 100%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/NewPersistentAgentsChatClient.cs
rename to dotnet/src/Microsoft.Agents.AI.AzureAI/NewPersistentAgentsChatClient.cs
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentResponseExtensions.cs b/dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentResponseExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentResponseExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentResponseExtensions.cs
index b675ba81a0..d5bc4abf94 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentResponseExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentResponseExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Azure.AI.Agents.Persistent;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentsClientExtensions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentsClientExtensions.cs
index 3df6caf488..5e4192b2f2 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.AzureAI/PersistentAgentsClientExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Azure.AI.Agents.Persistent;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/ActivityProcessor.cs b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/ActivityProcessor.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/ActivityProcessor.cs
rename to dotnet/src/Microsoft.Agents.AI.CopilotStudio/ActivityProcessor.cs
index eb00d843ad..b4dfb59a28 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/ActivityProcessor.cs
+++ b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/ActivityProcessor.cs
@@ -3,9 +3,10 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Agents.Core.Models;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.CopilotStudio;
+namespace Microsoft.Agents.AI.CopilotStudio;
///
/// Contains code to process responses from the Copilot Studio agent and convert them to objects.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgent.cs b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgent.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgent.cs
index f9c047d019..6ca2f38d3d 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgent.cs
@@ -9,11 +9,12 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Agents.CopilotStudio.Client;
using Microsoft.Agents.Core.Models;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.CopilotStudio;
+namespace Microsoft.Agents.AI.CopilotStudio;
///
/// Represents a Copilot Studio agent in the cloud.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgentThread.cs b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgentThread.cs
similarity index 92%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgentThread.cs
index cdd63d9aba..c868d75851 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/CopilotStudioAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/CopilotStudioAgentThread.cs
@@ -2,7 +2,7 @@
using System.Text.Json;
-namespace Microsoft.Extensions.AI.Agents.CopilotStudio;
+namespace Microsoft.Agents.AI.CopilotStudio;
///
/// Thread for CopilotStudio based agents.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/Microsoft.Extensions.AI.Agents.CopilotStudio.csproj b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj
similarity index 87%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/Microsoft.Extensions.AI.Agents.CopilotStudio.csproj
rename to dotnet/src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj
index 333d7ed3c9..a2c41a63ac 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.CopilotStudio/Microsoft.Extensions.AI.Agents.CopilotStudio.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/AsyncStreamingUpdateCollectionResult.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/AsyncStreamingUpdateCollectionResult.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/AsyncStreamingUpdateCollectionResult.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/AsyncStreamingUpdateCollectionResult.cs
index 50717dd827..2c273b98ce 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/AsyncStreamingUpdateCollectionResult.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/AsyncStreamingUpdateCollectionResult.cs
@@ -3,7 +3,7 @@
using System.ClientModel;
using OpenAI.Chat;
-namespace Microsoft.Extensions.AI.Agents.OpenAI.ChatCompletion;
+namespace Microsoft.Agents.AI.OpenAI.ChatClient;
internal sealed class AsyncStreamingUpdateCollectionResult : AsyncCollectionResult
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/StreamingUpdatePipelineResponse.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/StreamingUpdatePipelineResponse.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/StreamingUpdatePipelineResponse.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/StreamingUpdatePipelineResponse.cs
index 1eaab794d9..1768d100ad 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/ChatCompletion/StreamingUpdatePipelineResponse.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/ChatClient/StreamingUpdatePipelineResponse.cs
@@ -2,7 +2,7 @@
using System.ClientModel.Primitives;
-namespace Microsoft.Extensions.AI.Agents.OpenAI.ChatCompletion;
+namespace Microsoft.Agents.AI.OpenAI.ChatClient;
internal sealed class StreamingUpdatePipelineResponse : PipelineResponse
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs
index 5d7f577d50..c51698c973 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AIAgentWithOpenAIExtensions.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.ClientModel;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.OpenAI.ChatCompletion;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.OpenAI.ChatClient;
using Microsoft.Shared.Diagnostics;
using OpenAI.Chat;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseExtensions.cs
index b3e5c5c930..5ae3eed03d 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
using OpenAI.Chat;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs
index 9120688cde..2f9d9dd842 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AgentRunResponseUpdateExtensions.cs
@@ -1,9 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
using OpenAI.Chat;
-namespace Microsoft.Extensions.AI.Agents.OpenAI;
+namespace Microsoft.Agents.AI;
///
/// Provides extension methods for to extract native OpenAI response objects
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AssistantClientResultExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AssistantClientResultExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AssistantClientResultExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AssistantClientResultExtensions.cs
index 00e826d863..70065d804a 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/AssistantClientResultExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/AssistantClientResultExtensions.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.ClientModel;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace OpenAI.Assistants;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs
index 8f43f82b5a..cbc28fb268 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
using OpenAI.Assistants;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIChatClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIChatClientExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIChatClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIChatClientExtensions.cs
index e3e85cadd8..f0484af02a 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIChatClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIChatClientExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
using OpenAI.Chat;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIResponseClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIResponseClientExtensions.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIResponseClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIResponseClientExtensions.cs
index fc2a6522fd..890326fc74 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Extensions/OpenAIResponseClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIResponseClientExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
using OpenAI.Responses;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Microsoft.Extensions.AI.Agents.OpenAI.csproj b/dotnet/src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj
similarity index 84%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Microsoft.Extensions.AI.Agents.OpenAI.csproj
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj
index 9446c6dd60..4b114d9fe9 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/Microsoft.Extensions.AI.Agents.OpenAI.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj
@@ -17,12 +17,12 @@
-
+
- Microsoft.Extensions.AI.Agents.OpenAI
+ Microsoft.Agents.AI.OpenAI
Implementation of generative AI abstractions for OpenAI Agents.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/OpenAIChatClientAgent.cs b/dotnet/src/Microsoft.Agents.AI.OpenAI/OpenAIChatClientAgent.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/OpenAIChatClientAgent.cs
rename to dotnet/src/Microsoft.Agents.AI.OpenAI/OpenAIChatClientAgent.cs
index 81ca766938..fbef8d10fa 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.OpenAI/OpenAIChatClientAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI.OpenAI/OpenAIChatClientAgent.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text.Json;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
using OpenAI.Chat;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/AgentExtensions.cs b/dotnet/src/Microsoft.Agents.AI/AgentExtensions.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/AgentExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI/AgentExtensions.cs
index 239d22b57c..a47ab1ce4a 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/AgentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/AgentExtensions.cs
@@ -3,10 +3,11 @@
using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Extension methods for .
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/AgentJsonUtilities.cs b/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/AgentJsonUtilities.cs
rename to dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
index 647ab1d6b4..439bf2852c 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/AgentJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides a collection of utility methods for working with JSON data in the context of agents.
public static partial class AgentJsonUtilities
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/AgentChatClientBuilderExtensions.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/AgentChatClientBuilderExtensions.cs
index 9c305b4922..ffa571f7cf 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/AgentChatClientBuilderExtensions.cs
@@ -1,9 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
using System;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides extensions for configuring instances.
public static class AgentChatClientBuilderExtensions
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokedChatClient.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/AgentInvokedChatClient.cs
similarity index 89%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokedChatClient.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/AgentInvokedChatClient.cs
index 67212c2143..713d1f72e6 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokedChatClient.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/AgentInvokedChatClient.cs
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents;
+using Microsoft.Extensions.AI;
+
+namespace Microsoft.Agents.AI;
///
/// Internal chat client that handle agent invocation details for the chat client pipeline.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgent.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgent.cs
index 44623cb6da..963e6affbe 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgent.cs
@@ -7,13 +7,14 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Shared.Diagnostics;
#pragma warning disable S3358 // Ternary operators should not be nested
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Represents an agent that can be invoked using a chat client.
@@ -490,7 +491,7 @@ public sealed class ChatClientAgent : AIAgent
{
throw new InvalidOperationException(
$"""
- The {nameof(chatOptions.ConversationId)} provided via {nameof(AI.ChatOptions)} is different to the id of the provided {nameof(AgentThread)}.
+ The {nameof(chatOptions.ConversationId)} provided via {nameof(Extensions.AI.ChatOptions)} is different to the id of the provided {nameof(AgentThread)}.
Only one id can be used for a run.
""");
}
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentLogMessages.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentLogMessages.cs
index ff94bd14d2..a1804a0383 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentLogMessages.cs
@@ -4,7 +4,7 @@ using System;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
#pragma warning disable SYSLIB1006 // Multiple logging methods cannot use the same event id within a class
///
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentOptions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentOptions.cs
index a831896396..b51b86c64e 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentOptions.cs
@@ -3,8 +3,9 @@
using System;
using System.Collections.Generic;
using System.Text.Json;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Represents metadata for a chat client agent, including its identifier, name, instructions, and description.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentRunOptions.cs
similarity index 91%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentRunOptions.cs
index 7148ea8199..7389ae3737 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentRunOptions.cs
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents;
+using Microsoft.Extensions.AI;
+
+namespace Microsoft.Agents.AI;
///
/// Chat client agent run options.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentThread.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentThread.cs
index ba6af1be5e..735391569f 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgentThread.cs
@@ -6,9 +6,10 @@ using System.Diagnostics;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Thread for ChatClient based agents.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientExtensions.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientExtensions.cs
index 34aa7369cf..a40cae4cb1 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientExtensions.cs
@@ -1,10 +1,12 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Diagnostics;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Extensions.AI;
internal static class ChatClientExtensions
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj b/dotnet/src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj
similarity index 83%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj
rename to dotnet/src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj
index 0548b595e2..d93119a7a0 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj
+++ b/dotnet/src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj
@@ -16,7 +16,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryAgent.cs b/dotnet/src/Microsoft.Agents.AI/OpenTelemetryAgent.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryAgent.cs
rename to dotnet/src/Microsoft.Agents.AI/OpenTelemetryAgent.cs
index beed8d7c21..bbbd4c1199 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryAgent.cs
+++ b/dotnet/src/Microsoft.Agents.AI/OpenTelemetryAgent.cs
@@ -11,11 +11,12 @@ using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
///
/// Represents a delegating agent that implements OpenTelemetry instrumentation for agent operations.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryConsts.cs b/dotnet/src/Microsoft.Agents.AI/OpenTelemetryConsts.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryConsts.cs
rename to dotnet/src/Microsoft.Agents.AI/OpenTelemetryConsts.cs
index c01f01b2b1..fa5d86f514 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents/OpenTelemetryConsts.cs
+++ b/dotnet/src/Microsoft.Agents.AI/OpenTelemetryConsts.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents;
+namespace Microsoft.Agents.AI;
/// Provides constants used by various telemetry services.
internal static class OpenTelemetryConsts
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/AIAgentExtensions.cs b/dotnet/src/Microsoft.Agents.Orchestration/AIAgentExtensions.cs
index e6ca47e595..2eeeaa5e52 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/AIAgentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/AIAgentExtensions.cs
@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/ConcurrentOrchestration.cs b/dotnet/src/Microsoft.Agents.Orchestration/ConcurrentOrchestration.cs
index 66062a686e..d53d8e46b0 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/ConcurrentOrchestration.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/ConcurrentOrchestration.cs
@@ -7,8 +7,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/GroupChat/GroupChatOrchestration.cs b/dotnet/src/Microsoft.Agents.Orchestration/GroupChat/GroupChatOrchestration.cs
index 282d4fb760..1dc1953db2 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/GroupChat/GroupChatOrchestration.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/GroupChat/GroupChatOrchestration.cs
@@ -6,8 +6,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/HandoffOrchestration.cs b/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/HandoffOrchestration.cs
index 9dfc48334d..aeb4b607dd 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/HandoffOrchestration.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/HandoffOrchestration.cs
@@ -8,8 +8,8 @@ using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/Handoffs.cs b/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/Handoffs.cs
index f49b655253..bc314ff9b4 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/Handoffs.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/Handoffs/Handoffs.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Shared.Diagnostics;
#pragma warning disable CA1710 // Identifiers should have correct suffix
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/Microsoft.Agents.Orchestration.csproj b/dotnet/src/Microsoft.Agents.Orchestration/Microsoft.Agents.Orchestration.csproj
index 9f92f7516a..d5edcfbad7 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/Microsoft.Agents.Orchestration.csproj
+++ b/dotnet/src/Microsoft.Agents.Orchestration/Microsoft.Agents.Orchestration.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgent.cs b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgent.cs
index 8dcaac3edb..8a00a27ef0 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgent.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgent.cs
@@ -7,8 +7,8 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentContext.cs b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentContext.cs
index 3e3a42b2d9..bd673b0812 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentContext.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentContext.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentResponse.cs b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentResponse.cs
index bf8ba48b9f..d50160de98 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentResponse.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentResponse.cs
@@ -5,7 +5,7 @@ using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.Logging;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentThread.cs b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentThread.cs
index 08c33e4fea..9518993a4f 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentThread.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/OrchestratingAgentThread.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text.Json;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Orchestration/SequentialOrchestration.cs b/dotnet/src/Microsoft.Agents.Orchestration/SequentialOrchestration.cs
index 851ab12aca..26c7a66346 100644
--- a/dotnet/src/Microsoft.Agents.Orchestration/SequentialOrchestration.cs
+++ b/dotnet/src/Microsoft.Agents.Orchestration/SequentialOrchestration.cs
@@ -7,8 +7,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Orchestration;
diff --git a/dotnet/src/Microsoft.Agents.Workflows.Declarative/AzureAgentProvider.cs b/dotnet/src/Microsoft.Agents.Workflows.Declarative/AzureAgentProvider.cs
index 09a9db35a8..5ad8bb9120 100644
--- a/dotnet/src/Microsoft.Agents.Workflows.Declarative/AzureAgentProvider.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows.Declarative/AzureAgentProvider.cs
@@ -8,8 +8,8 @@ using System.Threading.Tasks;
using Azure.AI.Agents.Persistent;
using Azure.Core;
using Azure.Core.Pipeline;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.Declarative;
diff --git a/dotnet/src/Microsoft.Agents.Workflows.Declarative/Microsoft.Agents.Workflows.Declarative.csproj b/dotnet/src/Microsoft.Agents.Workflows.Declarative/Microsoft.Agents.Workflows.Declarative.csproj
index f143816c5a..5ac3d65dd0 100644
--- a/dotnet/src/Microsoft.Agents.Workflows.Declarative/Microsoft.Agents.Workflows.Declarative.csproj
+++ b/dotnet/src/Microsoft.Agents.Workflows.Declarative/Microsoft.Agents.Workflows.Declarative.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/dotnet/src/Microsoft.Agents.Workflows.Declarative/ObjectModel/InvokeAzureAgentExecutor.cs b/dotnet/src/Microsoft.Agents.Workflows.Declarative/ObjectModel/InvokeAzureAgentExecutor.cs
index 9de6206d62..cc122f7cb6 100644
--- a/dotnet/src/Microsoft.Agents.Workflows.Declarative/ObjectModel/InvokeAzureAgentExecutor.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows.Declarative/ObjectModel/InvokeAzureAgentExecutor.cs
@@ -4,13 +4,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows.Declarative.Extensions;
using Microsoft.Agents.Workflows.Declarative.Interpreter;
using Microsoft.Agents.Workflows.Declarative.PowerFx;
using Microsoft.Bot.ObjectModel;
using Microsoft.Bot.ObjectModel.Abstractions;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows.Declarative.ObjectModel;
diff --git a/dotnet/src/Microsoft.Agents.Workflows.Declarative/WorkflowAgentProvider.cs b/dotnet/src/Microsoft.Agents.Workflows.Declarative/WorkflowAgentProvider.cs
index a452ee0643..2b6912ef33 100644
--- a/dotnet/src/Microsoft.Agents.Workflows.Declarative/WorkflowAgentProvider.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows.Declarative/WorkflowAgentProvider.cs
@@ -3,8 +3,8 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.Declarative;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/AIAgentsAbstractionsExtensions.cs b/dotnet/src/Microsoft.Agents.Workflows/AIAgentsAbstractionsExtensions.cs
index 4152a3c75b..0264ecaa2f 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/AIAgentsAbstractionsExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/AIAgentsAbstractionsExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/AgentRunResponseEvent.cs b/dotnet/src/Microsoft.Agents.Workflows/AgentRunResponseEvent.cs
index d4453ad8ae..77aef02912 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/AgentRunResponseEvent.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/AgentRunResponseEvent.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/AgentRunUpdateEvent.cs b/dotnet/src/Microsoft.Agents.Workflows/AgentRunUpdateEvent.cs
index e73e8fa29d..e86561b2f7 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/AgentRunUpdateEvent.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/AgentRunUpdateEvent.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/AgentWorkflowBuilder.cs b/dotnet/src/Microsoft.Agents.Workflows/AgentWorkflowBuilder.cs
index 4128c79330..85b9e1cef0 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/AgentWorkflowBuilder.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/AgentWorkflowBuilder.cs
@@ -10,8 +10,8 @@ using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/ExecutorIsh.cs b/dotnet/src/Microsoft.Agents.Workflows/ExecutorIsh.cs
index 0c1fc40547..d7faf59e6c 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/ExecutorIsh.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/ExecutorIsh.cs
@@ -3,8 +3,8 @@
using System;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows.Specialized;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/MessageMerger.cs b/dotnet/src/Microsoft.Agents.Workflows/MessageMerger.cs
index 1b9cfefbce..89a70c64ab 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/MessageMerger.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/MessageMerger.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/Microsoft.Agents.Workflows.csproj b/dotnet/src/Microsoft.Agents.Workflows/Microsoft.Agents.Workflows.csproj
index 3c0c8e1a47..089ca56099 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/Microsoft.Agents.Workflows.csproj
+++ b/dotnet/src/Microsoft.Agents.Workflows/Microsoft.Agents.Workflows.csproj
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs b/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
index 40bf8bf66d..7f98c8e7e0 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.Specialized;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/TurnToken.cs b/dotnet/src/Microsoft.Agents.Workflows/TurnToken.cs
index 2c8e494fe8..56ca3b31d8 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/TurnToken.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/TurnToken.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostAgent.cs b/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostAgent.cs
index 90f703fa03..a55a7ce124 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostAgent.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostAgent.cs
@@ -9,8 +9,8 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostingExtensions.cs b/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostingExtensions.cs
index 79ed8b392c..93c0a2b7d2 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostingExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/WorkflowHostingExtensions.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/WorkflowMessageStore.cs b/dotnet/src/Microsoft.Agents.Workflows/WorkflowMessageStore.cs
index debf77c70b..d8fbb8909c 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/WorkflowMessageStore.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/WorkflowMessageStore.cs
@@ -5,8 +5,8 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Agents.Workflows/WorkflowThread.cs b/dotnet/src/Microsoft.Agents.Workflows/WorkflowThread.cs
index ad1d192c16..d6fe919cdc 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/WorkflowThread.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/WorkflowThread.cs
@@ -4,8 +4,8 @@ using System;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Agents.Workflows;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
index 504d76037c..b4b445aedd 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
@@ -2,6 +2,7 @@
using A2A;
using A2A.AspNetCore;
+using Microsoft.Agents.AI;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.DependencyInjection;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs
index b7fec8550a..1a1ef66d46 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs
@@ -3,6 +3,7 @@
using System;
using System.Threading.Tasks;
using A2A;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Hosting.A2A.Internal;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs
index efbce3e81b..f705c10fe3 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs
@@ -3,6 +3,7 @@
using System;
using System.Text.Json;
using A2A;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs
index 9be1cb037a..e398216dbf 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs
@@ -5,6 +5,7 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using A2A;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj
index 4b0d9ae271..ab6a8161a6 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj
@@ -16,13 +16,13 @@
-
+
-
+
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs
index 778192be26..800cfae894 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs
index b62714daec..4b1b57bb15 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Threading;
+using Microsoft.Agents.AI;
namespace Microsoft.Extensions.AI.Agents.Hosting;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs
index dcc62c5d52..e55d0bd68c 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs
@@ -3,6 +3,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using System.Text.Json.Serialization;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
namespace Microsoft.Extensions.AI.Agents.Hosting;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs
index 5763edc2f3..86d1f61e91 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs
@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Shared.Diagnostics;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs
index 94ca780383..ab53d99d58 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs
@@ -3,6 +3,7 @@
using System;
using System.Text.Json;
using System.Text.RegularExpressions;
+using Microsoft.Agents.AI;
using Microsoft.Shared.Diagnostics;
namespace Microsoft.Extensions.AI.Agents.Hosting;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs
index cf356eb65f..391b6504fd 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs
@@ -2,6 +2,7 @@
using System;
using System.Linq;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.DependencyInjection;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs
index e578581d06..ae5fd86ba7 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.Extensions.AI.Agents.Hosting;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj
index b8fcdadd10..be779b5a9d 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj
+++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj
@@ -15,10 +15,10 @@
-
+
-
+
diff --git a/dotnet/src/Shared/Samples/BaseSample.cs b/dotnet/src/Shared/Samples/BaseSample.cs
index 420ba1920b..36c18f2db4 100644
--- a/dotnet/src/Shared/Samples/BaseSample.cs
+++ b/dotnet/src/Shared/Samples/BaseSample.cs
@@ -3,8 +3,8 @@
using System.Reflection;
using System.Text;
using System.Text.Json;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Samples;
diff --git a/dotnet/src/Shared/Samples/OrchestrationSample.cs b/dotnet/src/Shared/Samples/OrchestrationSample.cs
index b789629d87..55f372de47 100644
--- a/dotnet/src/Shared/Samples/OrchestrationSample.cs
+++ b/dotnet/src/Shared/Samples/OrchestrationSample.cs
@@ -2,8 +2,8 @@
using System.Text;
using System.Text.Json;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Shared.Samples;
using OpenAIClient = OpenAI.OpenAIClient;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj b/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj
index 5512f41645..6df6734202 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj
+++ b/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunStreamingTests.cs b/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunStreamingTests.cs
index b94977ecd7..834de0ea4e 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunStreamingTests.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunStreamingTests.cs
@@ -4,8 +4,8 @@ using System;
using System.Linq;
using System.Threading.Tasks;
using AgentConformance.IntegrationTests.Support;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace AgentConformance.IntegrationTests;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunTests.cs b/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunTests.cs
index 60d73fa1fd..339fadd4d9 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunTests.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/ChatClientAgentRunTests.cs
@@ -3,8 +3,8 @@
using System;
using System.Threading.Tasks;
using AgentConformance.IntegrationTests.Support;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace AgentConformance.IntegrationTests;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/IAgentFixture.cs b/dotnet/tests/AgentConformance.IntegrationTests/IAgentFixture.cs
index 5f79e8e405..7e1a637b1f 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/IAgentFixture.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/IAgentFixture.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace AgentConformance.IntegrationTests;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/IChatClientAgentFixture.cs b/dotnet/tests/AgentConformance.IntegrationTests/IChatClientAgentFixture.cs
index d83692c86f..2b26809d9f 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/IChatClientAgentFixture.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/IChatClientAgentFixture.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace AgentConformance.IntegrationTests;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/Support/AgentCleanup.cs b/dotnet/tests/AgentConformance.IntegrationTests/Support/AgentCleanup.cs
index adb5dafc5f..0f986c0a79 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/Support/AgentCleanup.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/Support/AgentCleanup.cs
@@ -2,7 +2,7 @@
using System;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace AgentConformance.IntegrationTests.Support;
diff --git a/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs b/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs
index 3458053456..f7443f73ca 100644
--- a/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs
+++ b/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs
@@ -2,7 +2,7 @@
using System;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace AgentConformance.IntegrationTests.Support;
diff --git a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs
index f398e8025a..0999a64da6 100644
--- a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs
+++ b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs
@@ -7,8 +7,8 @@ using AgentConformance.IntegrationTests.Support;
using Azure;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Shared.IntegrationTests;
namespace AzureAIAgentsPersistent.IntegrationTests;
diff --git a/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj b/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj
index 7a7cc67804..e47a4696df 100644
--- a/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj
+++ b/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudioFixture.cs b/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudioFixture.cs
index d88ff6bed7..bbe1e6548f 100644
--- a/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudioFixture.cs
+++ b/dotnet/tests/CopilotStudio.IntegrationTests/CopilotStudioFixture.cs
@@ -7,10 +7,10 @@ using System.Threading.Tasks;
using AgentConformance.IntegrationTests;
using AgentConformance.IntegrationTests.Support;
using CopilotStudio.IntegrationTests.Support;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.CopilotStudio;
using Microsoft.Agents.CopilotStudio.Client;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
-using Microsoft.Extensions.AI.Agents.CopilotStudio;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/A2AAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/A2AAgentTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/A2AAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/A2AAgentTests.cs
index 96ac774bec..1810bfa298 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/A2AAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/A2AAgentTests.cs
@@ -13,8 +13,9 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/AIContentExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AAIContentExtensionsTests.cs
similarity index 94%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/AIContentExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AAIContentExtensionsTests.cs
index 9c057a8133..b6ed70f4f0 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/AIContentExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AAIContentExtensionsTests.cs
@@ -3,13 +3,14 @@
using System;
using System.Collections.Generic;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
-/// Unit tests for the class.
+/// Unit tests for the class.
///
-public sealed class AIContentExtensionsTests
+public sealed class A2AAIContentExtensionsTests
{
[Fact]
public void ToA2APart_WithTextContent_ReturnsTextPart()
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs
index 9005d6cc11..d2245aec20 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2ACardResolverExtensionsTests.cs
@@ -11,7 +11,7 @@ using System.Threading;
using System.Threading.Tasks;
using A2A;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs
similarity index 94%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs
index ddd0701463..9d6ef01f2e 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AClientExtensionsTests.cs
@@ -3,7 +3,7 @@
using System;
using A2A;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs
similarity index 96%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs
index c91c6ccbcf..c4f43e5a6d 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMessageExtensionsTests.cs
@@ -3,8 +3,9 @@
using System.Collections.Generic;
using System.Text.Json;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs
similarity index 97%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs
index da4fd6090b..1307b9f4b6 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2AMetadataExtensionsTests.cs
@@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Text.Json;
+using A2A;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs
similarity index 97%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs
index 5f0600084c..e44e0f1177 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/A2APartExtensionsTests.cs
@@ -4,8 +4,9 @@ using System;
using System.Collections.Generic;
using System.Text.Json;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs
similarity index 97%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs
index d8a102e805..bee5762649 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Extensions/ChatMessageExtensionsTests.cs
@@ -2,8 +2,9 @@
using System.Collections.Generic;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.A2A.UnitTests;
+namespace Microsoft.Agents.AI.A2A.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Microsoft.Extensions.AI.Agents.A2A.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj
similarity index 78%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Microsoft.Extensions.AI.Agents.A2A.UnitTests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj
index 637cf0a5f7..7b7d530a58 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.A2A.UnitTests/Microsoft.Extensions.AI.Agents.A2A.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIAgentTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIAgentTests.cs
index 756c46759a..c2de14b05c 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIAgentTests.cs
@@ -8,10 +8,11 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
using Moq.Protected;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextProviderTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextProviderTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextProviderTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextProviderTests.cs
index 00ec74663f..1414a398a4 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextProviderTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextProviderTests.cs
@@ -5,8 +5,9 @@ using System.Collections.ObjectModel;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
public class AIContextProviderTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextTests.cs
similarity index 94%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextTests.cs
index 23a96974af..b1ba6060ea 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIContextTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AIContextTests.cs
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+using Microsoft.Extensions.AI;
+
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Unit tests for .
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunOptionsTests.cs
similarity index 90%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunOptionsTests.cs
index 8828f896e6..097d4bdab7 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunOptionsTests.cs
@@ -2,7 +2,7 @@
using System;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseTests.cs
index 31fae011e0..0273d78cba 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseTests.cs
@@ -4,9 +4,10 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
-using Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.Models;
+using Microsoft.Agents.AI.Abstractions.UnitTests.Models;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
public class AgentRunResponseTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs
index 3c2364ab58..95888bffb7 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateExtensionsTests.cs
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
public class AgentRunResponseUpdateExtensionsTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
index ae8fdb1da0..be382cac20 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
@@ -3,8 +3,9 @@
using System;
using System.Collections.Generic;
using System.Text.Json;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
public class AgentRunResponseUpdateTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentThreadTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentThreadTests.cs
similarity index 97%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentThreadTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentThreadTests.cs
index e0261bebb9..a1bf57201d 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentThreadTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/AgentThreadTests.cs
@@ -3,10 +3,11 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
#pragma warning disable CA1861 // Avoid constant arrays as arguments
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Tests for
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ChatMessageStoreTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ChatMessageStoreTests.cs
similarity index 96%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ChatMessageStoreTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ChatMessageStoreTests.cs
index 023790a8f3..e96d497c8c 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ChatMessageStoreTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ChatMessageStoreTests.cs
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Contains tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/DelegatingAIAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/DelegatingAIAgentTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/DelegatingAIAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/DelegatingAIAgentTests.cs
index b0beb71706..4dca99a77c 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/DelegatingAIAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/DelegatingAIAgentTests.cs
@@ -4,9 +4,10 @@ using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryAgentThreadTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryAgentThreadTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryAgentThreadTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryAgentThreadTests.cs
index 50b7578fa1..60947c8ebc 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryAgentThreadTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryAgentThreadTests.cs
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Contains tests for .
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs
index e1fec9bd19..5bb5071056 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs
@@ -6,9 +6,10 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Contains tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj
similarity index 72%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj
index ee3bc2d9fb..cbbd3f0504 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Animal.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Animal.cs
similarity index 79%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Animal.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Animal.cs
index 1c061c4720..35447a812d 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Animal.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Animal.cs
@@ -2,7 +2,7 @@
using System.ComponentModel;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.Models;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests.Models;
[Description("Some test description")]
internal sealed class Animal
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Species.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Species.cs
similarity index 61%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Species.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Species.cs
index 5c9a24ae8a..367a95d9a8 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Models/Species.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/Models/Species.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.Models;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests.Models;
internal enum Species
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs
similarity index 97%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs
index 6fa011a70d..169843d57c 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/ServiceIdAgentThreadTests.cs
@@ -4,7 +4,7 @@ using System;
using System.Text.Json;
using System.Threading.Tasks;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
///
/// Tests for .
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/TestJsonSerializerContext.cs b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/TestJsonSerializerContext.cs
similarity index 84%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/TestJsonSerializerContext.cs
rename to dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/TestJsonSerializerContext.cs
index f256ad311c..0c8703028f 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/TestJsonSerializerContext.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/TestJsonSerializerContext.cs
@@ -3,9 +3,9 @@
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.Models;
+using Microsoft.Agents.AI.Abstractions.UnitTests.Models;
-namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
+namespace Microsoft.Agents.AI.Abstractions.UnitTests;
[JsonSourceGenerationOptions(
PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/AgentExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/AgentExtensionsTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/AgentExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/AgentExtensionsTests.cs
index f0373a386a..b6559d30d9 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/AgentExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/AgentExtensionsTests.cs
@@ -6,9 +6,10 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.UnitTests;
+namespace Microsoft.Agents.AI.UnitTests;
///
/// Unit tests for the method.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentOptionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentOptionsTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentOptionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentOptionsTests.cs
index da60448711..71768d83d2 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentOptionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentOptionsTests.cs
@@ -1,9 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Collections.Generic;
+using Microsoft.Extensions.AI;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion;
+namespace Microsoft.Agents.AI.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentRunOptionsTests.cs
similarity index 94%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentRunOptionsTests.cs
index 2951cdae07..1dde05f78b 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentRunOptionsTests.cs
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion;
+using Microsoft.Extensions.AI;
+
+namespace Microsoft.Agents.AI.UnitTests;
public class ChatClientAgentRunOptionsTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentTests.cs
index 3f32a1fbe5..7986574214 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentTests.cs
@@ -4,9 +4,10 @@ using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion;
+namespace Microsoft.Agents.AI.UnitTests;
public class ChatClientAgentTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentThreadTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentThreadTests.cs
index c7c15fb81f..7906b3a096 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentThreadTests.cs
@@ -6,11 +6,12 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Moq;
#pragma warning disable CA1861 // Avoid constant arrays as arguments
-namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion;
+namespace Microsoft.Agents.AI.UnitTests;
public class ChatClientAgentThreadTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/CopilotStudioAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/CopilotStudioAgentTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/CopilotStudioAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/CopilotStudioAgentTests.cs
index e919e719a3..6bcb3dc443 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/CopilotStudioAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/CopilotStudioAgentTests.cs
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Net.Http;
+using Microsoft.Agents.AI.CopilotStudio;
using Microsoft.Agents.CopilotStudio.Client;
-using Microsoft.Extensions.AI.Agents.CopilotStudio;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.UnitTests;
+namespace Microsoft.Agents.AI.UnitTests;
///
/// Unit tests for the class.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj
similarity index 60%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj
index 9baeb43714..eb9051e276 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/OpenTelemetryAgentTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/OpenTelemetryAgentTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/OpenTelemetryAgentTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/OpenTelemetryAgentTests.cs
index f0a4a2b360..55bfcd74b5 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/OpenTelemetryAgentTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/OpenTelemetryAgentTests.cs
@@ -8,12 +8,13 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.Logging;
using Moq;
using OpenTelemetry.Metrics;
using OpenTelemetry.Trace;
-namespace Microsoft.Extensions.AI.Agents.UnitTests;
+namespace Microsoft.Agents.AI.UnitTests;
public class OpenTelemetryAgentTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/TestJsonSerializerContext.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/TestJsonSerializerContext.cs
similarity index 91%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/TestJsonSerializerContext.cs
rename to dotnet/tests/Microsoft.Agents.AI.UnitTests/TestJsonSerializerContext.cs
index 3aacda0c9a..b145991439 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/TestJsonSerializerContext.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/TestJsonSerializerContext.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.Extensions.AI.Agents.UnitTests;
+namespace Microsoft.Agents.AI.UnitTests;
[JsonSourceGenerationOptions(
PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/ConcurrentOrchestrationTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/ConcurrentOrchestrationTests.cs
index 481a623d7f..50b2665ff3 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/ConcurrentOrchestrationTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/ConcurrentOrchestrationTests.cs
@@ -2,7 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestration2Tests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestration2Tests.cs
index 2fa90149e3..30a66ca853 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestration2Tests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestration2Tests.cs
@@ -2,7 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestrationTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestrationTests.cs
index 00a2c4f041..e150cc3cc4 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestrationTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/GroupChatOrchestrationTests.cs
@@ -2,7 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffOrchestrationTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffOrchestrationTests.cs
index cae22832af..5eee2e0447 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffOrchestrationTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffOrchestrationTests.cs
@@ -7,8 +7,8 @@ using System.Collections.Generic;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffsTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffsTests.cs
index 8243736520..4c902dcd90 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/HandoffsTests.cs
@@ -4,8 +4,8 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Moq;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/Microsoft.Agents.Orchestration.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/Microsoft.Agents.Orchestration.UnitTests.csproj
index cd25d6c76f..aab126e7b9 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/Microsoft.Agents.Orchestration.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/Microsoft.Agents.Orchestration.UnitTests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/MockAgent.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/MockAgent.cs
index f8c7f74c38..2b2ecb7228 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/MockAgent.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/MockAgent.cs
@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Moq;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/OrchestrationResultTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/OrchestrationResultTests.cs
index b400cecd63..cf0ed92631 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/OrchestrationResultTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/OrchestrationResultTests.cs
@@ -5,8 +5,8 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Logging.Abstractions;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/SequentialOrchestrationTests.cs b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/SequentialOrchestrationTests.cs
index 99461340e5..668c15eaeb 100644
--- a/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/SequentialOrchestrationTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Orchestration.UnitTests/SequentialOrchestrationTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Threading.Tasks;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
namespace Microsoft.Agents.Orchestration.UnitTest;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/AzureAgentProviderTest.cs b/dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/AzureAgentProviderTest.cs
index 846e554be3..2412937e48 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/AzureAgentProviderTest.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/AzureAgentProviderTest.cs
@@ -5,9 +5,9 @@ using System.Linq;
using System.Threading.Tasks;
using Azure.AI.Agents.Persistent;
using Azure.Identity;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows.Declarative.IntegrationTests.Framework;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using Microsoft.Extensions.Configuration;
using Shared.IntegrationTests;
using Xunit.Abstractions;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/AgentWorkflowBuilderTests.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/AgentWorkflowBuilderTests.cs
index 0f43bfa512..9872decf0d 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/AgentWorkflowBuilderTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/AgentWorkflowBuilderTests.cs
@@ -8,8 +8,8 @@ using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
#pragma warning disable SYSLIB1045 // Use GeneratedRegex
#pragma warning disable RCS1186 // Use Regex instance instead of static method
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/ChatMessageBuilder.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/ChatMessageBuilder.cs
index 87974253f1..d7d3142ccc 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/ChatMessageBuilder.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/ChatMessageBuilder.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.UnitTests;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs
index 6654d42000..879240f6fe 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs
@@ -2,8 +2,8 @@
using System;
using FluentAssertions;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.UnitTests;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Microsoft.Agents.Workflows.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Microsoft.Agents.Workflows.UnitTests.csproj
index af316019ad..fe4c610305 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Microsoft.Agents.Workflows.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Microsoft.Agents.Workflows.UnitTests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/RepresentationTests.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/RepresentationTests.cs
index c0da6db172..c9b44113a6 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/RepresentationTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/RepresentationTests.cs
@@ -6,11 +6,11 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows.Checkpointing;
using Microsoft.Agents.Workflows.Sample;
using Microsoft.Agents.Workflows.Specialized;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.UnitTests;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/06_GroupChat_Workflow.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/06_GroupChat_Workflow.cs
index ed124363b7..577b159706 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/06_GroupChat_Workflow.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/06_GroupChat_Workflow.cs
@@ -10,8 +10,8 @@ using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.Sample;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/07_GroupChat_Workflow_HostAsAgent.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/07_GroupChat_Workflow_HostAsAgent.cs
index 3387d1cf07..d8282e84b0 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/07_GroupChat_Workflow_HostAsAgent.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/Sample/07_GroupChat_Workflow_HostAsAgent.cs
@@ -4,8 +4,8 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.Sample;
diff --git a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/SpecializedExecutorSmokeTests.cs b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/SpecializedExecutorSmokeTests.cs
index dc32bf8a81..0c1b97beaa 100644
--- a/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/SpecializedExecutorSmokeTests.cs
+++ b/dotnet/tests/Microsoft.Agents.Workflows.UnitTests/SpecializedExecutorSmokeTests.cs
@@ -8,9 +8,9 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
+using Microsoft.Agents.AI;
using Microsoft.Agents.Workflows.Specialized;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
namespace Microsoft.Agents.Workflows.UnitTests;
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs
index 82a654b9a4..84ce8564d9 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs
+++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs
index 4de95fa044..ea4ee97b4a 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs
+++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs
@@ -6,6 +6,7 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Moq;
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs
index d619f3703f..b32ec6fe47 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs
+++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs
@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using Microsoft.Agents.AI;
namespace Microsoft.Extensions.AI.Agents.Hosting.UnitTests;
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
index 73346f77af..d74cce5e67 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
@@ -2,6 +2,7 @@
using System;
using System.Linq;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Moq;
diff --git a/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs b/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs
index 27a257a555..e2d174c4c9 100644
--- a/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs
+++ b/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs
@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using AgentConformance.IntegrationTests;
using AgentConformance.IntegrationTests.Support;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
using OpenAI.Assistants;
using Shared.IntegrationTests;
diff --git a/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs b/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs
index d341b80a77..f98540d8cc 100644
--- a/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs
+++ b/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs
@@ -5,8 +5,8 @@ using System.Linq;
using System.Threading.Tasks;
using AgentConformance.IntegrationTests;
using AgentConformance.IntegrationTests.Support;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
using Shared.IntegrationTests;
diff --git a/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponse.IntegrationTests.csproj b/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponse.IntegrationTests.csproj
index 60377c88ec..da5fae35d9 100644
--- a/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponse.IntegrationTests.csproj
+++ b/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponse.IntegrationTests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs b/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs
index ed095bb8c1..d223a65e28 100644
--- a/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs
+++ b/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs
@@ -6,8 +6,8 @@ using System.Linq;
using System.Threading.Tasks;
using AgentConformance.IntegrationTests;
using AgentConformance.IntegrationTests.Support;
+using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents;
using OpenAI;
using OpenAI.Responses;
using Shared.IntegrationTests;
diff --git a/user-documentation-dotnet/getting-started/README.md b/user-documentation-dotnet/getting-started/README.md
index 09f8470ec9..aa0a0c1385 100644
--- a/user-documentation-dotnet/getting-started/README.md
+++ b/user-documentation-dotnet/getting-started/README.md
@@ -24,7 +24,7 @@ Make sure to replace `https://your-resource.openai.azure.com/` with the endpoint
using System;
using Azure.AI.OpenAI;
using Azure.Identity;
-using Microsoft.Extensions.AI.Agents;
+using Microsoft.Agents.AI;
using OpenAI;
AIAgent agent = new AzureOpenAIClient(