From 591ef3700895dd2ab4d6c3f11a03943b7d092b66 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 17:42:10 +0000
Subject: [PATCH 1/6] Initial plan


From a51c9b7dfbdb9c98265fad92b0827a934eb256f6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:06:16 +0000
Subject: [PATCH 2/6] Move TextSearchProvider and TextSearchProviderOptions to
 Microsoft.Agents.AI namespace

Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
---
 dotnet/agent-framework-dotnet.slnx                              | 1 -
 .../AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs    | 1 -
 .../AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs         | 1 -
 .../AgentWithRAG_Step03_CustomRAGDataSource/Program.cs          | 1 -
 dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs   | 1 -
 dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs            | 1 -
 dotnet/src/Microsoft.Agents.AI/{Data => }/TextSearchProvider.cs | 2 +-
 .../Microsoft.Agents.AI/{Data => }/TextSearchProviderOptions.cs | 2 +-
 .../Data/TextSearchProviderTests.cs                             | 1 -
 9 files changed, 2 insertions(+), 9 deletions(-)
 rename dotnet/src/Microsoft.Agents.AI/{Data => }/TextSearchProvider.cs (99%)
 rename dotnet/src/Microsoft.Agents.AI/{Data => }/TextSearchProviderOptions.cs (99%)

diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 816ffdb678..341e6b2eb2 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -220,7 +220,6 @@
   <Folder Name="/Samples/HostedAgents/">
     <Project Path="samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj" />
     <Project Path="samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj" />
-    <Project Path="samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
   </Folder>
   <Folder Name="/Samples/M365Agent/">
     <Project Path="samples/M365Agent/M365Agent.csproj" />
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
index a30e0371a0..5470b1ed48 100644
--- a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
@@ -8,7 +8,6 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Agents.AI.Samples;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.VectorData;
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
index 89312f8597..eac14217d3 100644
--- a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
@@ -7,7 +7,6 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.VectorData;
 using Microsoft.SemanticKernel.Connectors.Qdrant;
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
index 5e7b2c4132..21f6643684 100644
--- a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
@@ -9,7 +9,6 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Extensions.AI;
 using OpenAI;
 
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs b/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
index d8be12c5b5..812b9f5118 100644
--- a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
+++ b/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
@@ -8,7 +8,6 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Extensions.AI;
 using OpenAI;
 
diff --git a/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs b/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
index c400a1cb6c..fe3f73b28b 100644
--- a/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Agents.AI/AgentJsonUtilities.cs
@@ -4,7 +4,6 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Agents.AI.Data;
 
 namespace Microsoft.Agents.AI;
 
diff --git a/dotnet/src/Microsoft.Agents.AI/Data/TextSearchProvider.cs b/dotnet/src/Microsoft.Agents.AI/TextSearchProvider.cs
similarity index 99%
rename from dotnet/src/Microsoft.Agents.AI/Data/TextSearchProvider.cs
rename to dotnet/src/Microsoft.Agents.AI/TextSearchProvider.cs
index f76629a577..9659fdb7b8 100644
--- a/dotnet/src/Microsoft.Agents.AI/Data/TextSearchProvider.cs
+++ b/dotnet/src/Microsoft.Agents.AI/TextSearchProvider.cs
@@ -11,7 +11,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Agents.AI.Data;
+namespace Microsoft.Agents.AI;
 
 /// <summary>
 /// A text search context provider that performs a search over external knowledge
diff --git a/dotnet/src/Microsoft.Agents.AI/Data/TextSearchProviderOptions.cs b/dotnet/src/Microsoft.Agents.AI/TextSearchProviderOptions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Agents.AI/Data/TextSearchProviderOptions.cs
rename to dotnet/src/Microsoft.Agents.AI/TextSearchProviderOptions.cs
index 6700634bcd..e90a6efa63 100644
--- a/dotnet/src/Microsoft.Agents.AI/Data/TextSearchProviderOptions.cs
+++ b/dotnet/src/Microsoft.Agents.AI/TextSearchProviderOptions.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.AI;
 
-namespace Microsoft.Agents.AI.Data;
+namespace Microsoft.Agents.AI;
 
 /// <summary>
 /// Options controlling the behavior of <see cref="TextSearchProvider"/>.
diff --git a/dotnet/tests/Microsoft.Agents.AI.UnitTests/Data/TextSearchProviderTests.cs b/dotnet/tests/Microsoft.Agents.AI.UnitTests/Data/TextSearchProviderTests.cs
index b32211e883..0e44eb8576 100644
--- a/dotnet/tests/Microsoft.Agents.AI.UnitTests/Data/TextSearchProviderTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.UnitTests/Data/TextSearchProviderTests.cs
@@ -6,7 +6,6 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
 using Moq;

From f2cf48b5fe603b64110f2b7fe3ef16c18a9fd923 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 19:15:50 +0000
Subject: [PATCH 3/6] Restore AgentWithTextSearchRag project in solution file

Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
---
 dotnet/agent-framework-dotnet.slnx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 341e6b2eb2..816ffdb678 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -220,6 +220,7 @@
   <Folder Name="/Samples/HostedAgents/">
     <Project Path="samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj" />
     <Project Path="samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj" />
+    <Project Path="samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
   </Folder>
   <Folder Name="/Samples/M365Agent/">
     <Project Path="samples/M365Agent/M365Agent.csproj" />

From a3f393c264e7edfec6f566996037e3c4e3345852 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 19:45:14 +0000
Subject: [PATCH 4/6] Revert using statement removal in
 AgentWithRAG_Step01_BasicTextRAG sample

Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
---
 .../AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
index 5470b1ed48..a30e0371a0 100644
--- a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
@@ -8,6 +8,7 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.Data;
 using Microsoft.Agents.AI.Samples;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.VectorData;

From 1fdde6d26d18669f36cead4b164559ecc4d20be4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 20:17:43 +0000
Subject: [PATCH 5/6] Revert the previous revert - remove using
 Microsoft.Agents.AI.Data from AgentWithRAG_Step01_BasicTextRAG

Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
---
 .../AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
index a30e0371a0..5470b1ed48 100644
--- a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
+++ b/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
@@ -8,7 +8,6 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Data;
 using Microsoft.Agents.AI.Samples;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.VectorData;

From 1b352af0ce6b0674636e98a6fdc567b45f599790 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 20:21:18 +0000
Subject: [PATCH 6/6] Revert using statement removal in AgentWithTextSearchRag
 sample

Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
---
 dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs b/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
index 812b9f5118..d8be12c5b5 100644
--- a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
+++ b/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
@@ -8,6 +8,7 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.Data;
 using Microsoft.Extensions.AI;
 using OpenAI;