diff --git a/.github/workflows/dotnet-build-and-test.yml b/.github/workflows/dotnet-build-and-test.yml index 44743e6818..18e0176590 100644 --- a/.github/workflows/dotnet-build-and-test.yml +++ b/.github/workflows/dotnet-build-and-test.yml @@ -85,7 +85,7 @@ jobs: # Change to project directory to ensure local nuget.config is used cd consoleapp - dotnet add packcheck.csproj package Microsoft.Agents --prerelease + dotnet add packcheck.csproj package Microsoft.Extensions.AI.Agents --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 e2ded6765d..10e52edfa9 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.Agents.Abstractions' - 'Microsoft.Agents' + 'Microsoft.Extensions.AI.Agents.Abstractions' + 'Microsoft.Extensions.AI.Agents' ) foreach ($assembly in $assembliesCollection) { diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx index 630b939de0..05c181502c 100644 --- a/dotnet/agent-framework-dotnet.slnx +++ b/dotnet/agent-framework-dotnet.slnx @@ -108,13 +108,13 @@ - - - - + + + + - + diff --git a/dotnet/samples/GettingStarted/AgentSample.cs b/dotnet/samples/GettingStarted/AgentSample.cs index e73dd06a83..a8617cb759 100644 --- a/dotnet/samples/GettingStarted/AgentSample.cs +++ b/dotnet/samples/GettingStarted/AgentSample.cs @@ -4,8 +4,8 @@ using System.ClientModel; using Azure.AI.Agents.Persistent; using Azure.AI.OpenAI; using Azure.Identity; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; using OpenAI; using OpenAI.Responses; diff --git a/dotnet/samples/GettingStarted/GettingStarted.csproj b/dotnet/samples/GettingStarted/GettingStarted.csproj index 36f6bac7b5..7539526f82 100644 --- a/dotnet/samples/GettingStarted/GettingStarted.csproj +++ b/dotnet/samples/GettingStarted/GettingStarted.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureAIAgentsPersistent.cs b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureAIAgentsPersistent.cs index b950006075..5c685c36eb 100644 --- a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureAIAgentsPersistent.cs +++ b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureAIAgentsPersistent.cs @@ -2,8 +2,8 @@ using Azure.AI.Agents.Persistent; using Azure.Identity; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; namespace Providers; diff --git a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureOpenAIChatCompletion.cs b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureOpenAIChatCompletion.cs index c3da844e96..aca7d81c70 100644 --- a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureOpenAIChatCompletion.cs +++ b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_AzureOpenAIChatCompletion.cs @@ -3,8 +3,8 @@ using System.ClientModel; using Azure.AI.OpenAI; using Azure.Identity; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; namespace Providers; diff --git a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIAssistant.cs b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIAssistant.cs index 022fb567e2..f3c12a3ff8 100644 --- a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIAssistant.cs +++ b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIAssistant.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; using OpenAI; diff --git a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIChatCompletion.cs b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIChatCompletion.cs index 2bb07e20c5..ced1a2d493 100644 --- a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIChatCompletion.cs +++ b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIChatCompletion.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; using OpenAI; diff --git a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIResponseChatCompletion.cs b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIResponseChatCompletion.cs index e0d84ebedb..d454ab1a09 100644 --- a/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIResponseChatCompletion.cs +++ b/dotnet/samples/GettingStarted/Providers/ChatClientAgent_With_OpenAIResponseChatCompletion.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Microsoft.Shared.Samples; using OpenAI; using OpenAI.Responses; diff --git a/dotnet/samples/GettingStarted/Steps/Step01_ChatClientAgent_Running.cs b/dotnet/samples/GettingStarted/Steps/Step01_ChatClientAgent_Running.cs index bd51c2e807..95799fcd70 100644 --- a/dotnet/samples/GettingStarted/Steps/Step01_ChatClientAgent_Running.cs +++ b/dotnet/samples/GettingStarted/Steps/Step01_ChatClientAgent_Running.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. -using Microsoft.Agents; +using Microsoft.Extensions.AI.Agents; namespace Steps; diff --git a/dotnet/samples/GettingStarted/Steps/Step02_ChatClientAgent_UsingTools.cs b/dotnet/samples/GettingStarted/Steps/Step02_ChatClientAgent_UsingTools.cs index 8ce98d1124..88a2145ea3 100644 --- a/dotnet/samples/GettingStarted/Steps/Step02_ChatClientAgent_UsingTools.cs +++ b/dotnet/samples/GettingStarted/Steps/Step02_ChatClientAgent_UsingTools.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. using System.ComponentModel; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; namespace Steps; diff --git a/dotnet/src/Microsoft.Agents.Abstractions/Agent.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Agent.cs similarity index 99% rename from dotnet/src/Microsoft.Agents.Abstractions/Agent.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Agent.cs index 90c0c155db..aa675fd9f8 100644 --- a/dotnet/src/Microsoft.Agents.Abstractions/Agent.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Agent.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Base abstraction for all agents. An agent instance may participate in one or more conversations. diff --git a/dotnet/src/Microsoft.Agents.Abstractions/AgentRunOptions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs similarity index 96% rename from dotnet/src/Microsoft.Agents.Abstractions/AgentRunOptions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs index 7e0090f251..4658def3bf 100644 --- a/dotnet/src/Microsoft.Agents.Abstractions/AgentRunOptions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentRunOptions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Optional parameters when running an agent. diff --git a/dotnet/src/Microsoft.Agents.Abstractions/AgentThread.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs similarity index 97% rename from dotnet/src/Microsoft.Agents.Abstractions/AgentThread.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs index 7f0e4bec17..00e1300694 100644 --- a/dotnet/src/Microsoft.Agents.Abstractions/AgentThread.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/AgentThread.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Base abstraction for all agent threads. diff --git a/dotnet/src/Microsoft.Agents.Abstractions/IMessagesRetrievableThread.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/IMessagesRetrievableThread.cs similarity index 97% rename from dotnet/src/Microsoft.Agents.Abstractions/IMessagesRetrievableThread.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/IMessagesRetrievableThread.cs index ed0688794c..79a38a5458 100644 --- a/dotnet/src/Microsoft.Agents.Abstractions/IMessagesRetrievableThread.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/IMessagesRetrievableThread.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Threading; using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// An interface for agent threads that allow retrieval of messages in the thread for agent invocation. diff --git a/dotnet/src/Microsoft.Agents.Abstractions/Microsoft.Agents.Abstractions.csproj b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj similarity index 78% rename from dotnet/src/Microsoft.Agents.Abstractions/Microsoft.Agents.Abstractions.csproj rename to dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj index 9f8d8c231f..4bc963ea9c 100644 --- a/dotnet/src/Microsoft.Agents.Abstractions/Microsoft.Agents.Abstractions.csproj +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.Abstractions/Microsoft.Extensions.AI.Agents.Abstractions.csproj @@ -3,7 +3,7 @@ $(ProjectsTargetFrameworks) $(ProjectsDebugTargetFrameworks) - Microsoft.Agents + Microsoft.Extensions.AI.Agents alpha @@ -15,7 +15,7 @@ - Microsoft Agent Framework Abstractions + Microsoft Extensions AI Agent Framework Abstractions Contains the Microsoft Agent Framework interfaces and abstractions. @@ -25,7 +25,7 @@ - + diff --git a/dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/Microsoft.Extensions.AI.AzureAIAgentsPersistent.csproj b/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj similarity index 91% rename from dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/Microsoft.Extensions.AI.AzureAIAgentsPersistent.csproj rename to dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj index f9c2e8fcb3..caaf31da47 100644 --- a/dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/Microsoft.Extensions.AI.AzureAIAgentsPersistent.csproj +++ b/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/Microsoft.Extensions.AI.Agents.AzureAI.csproj @@ -15,7 +15,7 @@ - Microsoft.Extensions.AI.AzureAIAgentsPersistent + Microsoft.Extensions.AI.Agents.AzureAI Implementation of generative AI abstractions for Azure AI Persistent Agents. diff --git a/dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/PersistentAgentsChatClient.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsChatClient.cs similarity index 100% rename from dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/PersistentAgentsChatClient.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsChatClient.cs diff --git a/dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/PersistentAgentsClientExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsClientExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.Extensions.AI.AzureAIAgentsPersistent/PersistentAgentsClientExtensions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents.AzureAI/PersistentAgentsClientExtensions.cs diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs similarity index 96% rename from dotnet/src/Microsoft.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs index 97045e1759..88b1135993 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentChatClientBuilderExtensions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.AI; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// Provides extensions for configuring instances. public static class AgentChatClientBuilderExtensions diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/AgentInvokingChatClient.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokingChatClient.cs similarity index 93% rename from dotnet/src/Microsoft.Agents/ChatCompletion/AgentInvokingChatClient.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokingChatClient.cs index f1839bebbe..dbfb80c2b0 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/AgentInvokingChatClient.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/AgentInvokingChatClient.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Internal chat client that handle agent invocation details for the chat client pipeline. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgent.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs similarity index 99% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgent.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs index 81ef89490f..5b4f6326e8 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgent.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgent.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Represents an agent that can be invoked using a chat client. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentExtensions.cs similarity index 99% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentExtensions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentExtensions.cs index f0d9b66dcb..bad67aba7d 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentExtensions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Extensions for agent types. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentLogMessages.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs similarity index 98% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentLogMessages.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs index a54be742de..18bef1d687 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentLogMessages.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentLogMessages.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Logging; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; #pragma warning disable SYSLIB1006 // Multiple logging methods cannot use the same event id within a class /// diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentOptions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs similarity index 97% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentOptions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs index 7e283f0fa3..d6f502357a 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentOptions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentOptions.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Represents metadata for a chat client agent, including its identifier, name, instructions, and description. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentRunOptions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs similarity index 95% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentRunOptions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs index d38d209a21..5e4baa7111 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentRunOptions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentRunOptions.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Chat client agent run options. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThread.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs similarity index 98% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThread.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs index fd8853fbd2..d0f64fc6ad 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThread.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThread.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Chat client agent thread. diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThreadType.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThreadType.cs similarity index 92% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThreadType.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThreadType.cs index 5dcae1b33a..ba4d1c7f59 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientAgentThreadType.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientAgentThreadType.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; /// /// Defines the different supported storage locations for . diff --git a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientExtensions.cs b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs similarity index 93% rename from dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientExtensions.cs rename to dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs index 5c1aa1cd16..82bc3b72ed 100644 --- a/dotnet/src/Microsoft.Agents/ChatCompletion/ChatClientExtensions.cs +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/ChatCompletion/ChatClientExtensions.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.AI; -namespace Microsoft.Agents; +namespace Microsoft.Extensions.AI.Agents; internal static class ChatClientExtensions { diff --git a/dotnet/src/Microsoft.Agents/Microsoft.Agents.csproj b/dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj similarity index 75% rename from dotnet/src/Microsoft.Agents/Microsoft.Agents.csproj rename to dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj index 28dce96e44..3ec16397b2 100644 --- a/dotnet/src/Microsoft.Agents/Microsoft.Agents.csproj +++ b/dotnet/src/Microsoft.Extensions.AI.Agents/Microsoft.Extensions.AI.Agents.csproj @@ -14,18 +14,18 @@ - + - Microsoft Agent Framework + Microsoft Extensions AI Agent Framework Contains the Microsoft Agent Framework core functionality. - + diff --git a/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj b/dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj index 3d4a04f4a5..1ce72c3d8d 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 85d92cfef4..c71e17fea1 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; 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 4afc32c2ab..b454adbac0 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; 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 d88247623f..f80cc0c6f1 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; 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 e2c4e6eb8f..d83692c86f 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; 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 6a0ef7458f..c46ccb4b4d 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.Agents; +using Microsoft.Extensions.AI.Agents; namespace AgentConformance.IntegrationTests.Support; diff --git a/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs b/dotnet/tests/AgentConformance.IntegrationTests/Support/ThreadCleanup.cs index 17d70b46a8..690c4e0fed 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.Agents; +using Microsoft.Extensions.AI.Agents; namespace AgentConformance.IntegrationTests.Support; diff --git a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj index 4d383aa05d..02991f5a93 100644 --- a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj +++ b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj @@ -7,7 +7,7 @@ - + diff --git a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs index 3f9435ad47..64a67e5304 100644 --- a/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs +++ b/dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs @@ -8,8 +8,8 @@ using AgentConformance.IntegrationTests.Support; using Azure; using Azure.AI.Agents.Persistent; using Azure.Identity; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using Shared.IntegrationTests; namespace AzureAIAgentsPersistent.IntegrationTests; diff --git a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs similarity index 92% rename from dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs index d370b53bf4..a37d288ed6 100644 --- a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.Agents.Abstractions.UnitTests; +namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests; /// /// Unit tests for the class. diff --git a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentTests.cs similarity index 99% rename from dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentTests.cs index e2a9580591..f42d9ccb8c 100644 --- a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/AgentTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentTests.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.AI; using Moq; using Moq.Protected; -namespace Microsoft.Agents.Abstractions.UnitTests; +namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests; /// /// Unit tests for the class. diff --git a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/Microsoft.Agents.Abstractions.UnitTests.csproj b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj similarity index 68% rename from dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/Microsoft.Agents.Abstractions.UnitTests.csproj rename to dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj index 3d7a73f48f..c1ff571b03 100644 --- a/dotnet/tests/Microsoft.Agents.Abstractions.UnitTests/Microsoft.Agents.Abstractions.UnitTests.csproj +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs similarity index 99% rename from dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs index f1e4a3df77..0f851ca6a6 100644 --- a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentExtensionsTests.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Moq; -namespace Microsoft.Agents.UnitTests.ChatCompletion; +namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion; public class ChatClientAgentExtensionsTests { diff --git a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs similarity index 98% rename from dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs index 24e712487b..1fd33186b8 100644 --- a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentRunOptionsTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; -namespace Microsoft.Agents.UnitTests.ChatCompletion; +namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion; public class ChatClientAgentRunOptionsTests { diff --git a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs similarity index 99% rename from dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs index 4895985b20..fbf9eee58e 100644 --- a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentTests.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.AI; using Moq; -namespace Microsoft.Agents.UnitTests.ChatCompletion; +namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion; public class ChatClientAgentTests { diff --git a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs similarity index 99% rename from dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs rename to dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs index 510842a2a2..a1a06cd099 100644 --- a/dotnet/tests/Microsoft.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/ChatCompletion/ChatClientAgentThreadTests.cs @@ -10,7 +10,7 @@ using Moq; #pragma warning disable CS0162 // Unreachable code detected -namespace Microsoft.Agents.UnitTests.ChatCompletion; +namespace Microsoft.Extensions.AI.Agents.UnitTests.ChatCompletion; public class ChatClientAgentThreadTests { diff --git a/dotnet/tests/Microsoft.Agents.UnitTests/Microsoft.Agents.UnitTests.csproj b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj similarity index 72% rename from dotnet/tests/Microsoft.Agents.UnitTests/Microsoft.Agents.UnitTests.csproj rename to dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj index 5077e67861..7fe7649980 100644 --- a/dotnet/tests/Microsoft.Agents.UnitTests/Microsoft.Agents.UnitTests.csproj +++ b/dotnet/tests/Microsoft.Extensions.AI.Agents.UnitTests/Microsoft.Extensions.AI.Agents.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs b/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs index 24be267409..dfd7180372 100644 --- a/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs +++ b/dotnet/tests/OpenAIAssistant.IntegrationTests/OpenAIAssistantFixture.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using AgentConformance.IntegrationTests; using AgentConformance.IntegrationTests.Support; -using Microsoft.Agents; 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 0b68e2ecf7..7c54dc5b88 100644 --- a/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs +++ b/dotnet/tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletionFixture.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Threading.Tasks; using AgentConformance.IntegrationTests; using AgentConformance.IntegrationTests.Support; -using Microsoft.Agents; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using OpenAI; using Shared.IntegrationTests; diff --git a/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs b/dotnet/tests/OpenAIResponse.IntegrationTests/OpenAIResponseFixture.cs index 9c20496458..0bdfd9091a 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; using Microsoft.Extensions.AI; +using Microsoft.Extensions.AI.Agents; using OpenAI; using OpenAI.Responses; using Shared.IntegrationTests;