microsoft · westey-m · Nov 10, 2025 · Nov 7, 2025 · Nov 7, 2025
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
@@ -58,20 +58,22 @@
     <Project Path="samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj" />
+    <Project Path="samples/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Agent_Step13_BackgroundResponsesWithToolsAndPersistence.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step14_Middleware/Agent_Step14_Middleware.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/Agent_Step17_BackgroundResponses.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step18_TextSearchRag/Agent_Step18_TextSearchRag.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step19_Mem0Provider/Agent_Step19_Mem0Provider.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step20_BackgroundResponsesWithToolsAndPersistence/Agent_Step20_BackgroundResponsesWithToolsAndPersistence.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step21_ChatHistoryMemoryProvider/Agent_Step21_ChatHistoryMemoryProvider.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/DevUI/">
     <File Path="samples/GettingStarted/DevUI/README.md" />
     <Project Path="samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj" />
   </Folder>
+  <Folder Name="/Samples/GettingStarted/AgentWithMemory/">
+    <File Path="samples/GettingStarted/AgentWithMemory/README.md" />
+    <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
+    <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj" />
+    <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj" />
+  </Folder>
   <Folder Name="/Samples/GettingStarted/AgentWithOpenAI/">
     <File Path="samples/GettingStarted/AgentWithOpenAI/README.md" />
     <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
@@ -80,7 +82,8 @@
   <Folder Name="/Samples/GettingStarted/AgentWithRAG/">
     <File Path="samples/GettingStarted/AgentWithRAG/README.md" />
     <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_ExternalDataSourceRAG/AgentWithRAG_Step02_ExternalDataSourceRAG.csproj" />
+    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj" />
+    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/ModelContextProtocol/">
     <File Path="samples/GettingStarted/ModelContextProtocol/README.md" />

diff --git a/...t_Step21_ChatHistoryMemoryProvider.csproj → ...ithMemory_Step01_ChatHistoryMemory.csproj b/...t_Step21_ChatHistoryMemoryProvider.csproj → ...ithMemory_Step01_ChatHistoryMemory.csproj
diff --git a/...ep21_ChatHistoryMemoryProvider/Program.cs → ...emory_Step01_ChatHistoryMemory/Program.cs b/...ep21_ChatHistoryMemoryProvider/Program.cs → ...emory_Step01_ChatHistoryMemory/Program.cs
diff --git a/...Provider/Agent_Step19_Mem0Provider.csproj → ...tWithMemory_Step02_MemoryUsingMem0.csproj b/...Provider/Agent_Step19_Mem0Provider.csproj → ...tWithMemory_Step02_MemoryUsingMem0.csproj
diff --git a/...ents/Agent_Step19_Mem0Provider/Program.cs → ...hMemory_Step02_MemoryUsingMem0/Program.cs b/...ents/Agent_Step19_Mem0Provider/Program.cs → ...hMemory_Step02_MemoryUsingMem0/Program.cs
diff --git a/..._Step13_Memory/Agent_Step13_Memory.csproj → ...gentWithMemory_Step03_CustomMemory.csproj b/..._Step13_Memory/Agent_Step13_Memory.csproj → ...gentWithMemory_Step03_CustomMemory.csproj
diff --git a/...ted/Agents/Agent_Step13_Memory/Program.cs → ...WithMemory_Step03_CustomMemory/Program.cs b/...ted/Agents/Agent_Step13_Memory/Program.cs → ...WithMemory_Step03_CustomMemory/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/README.md b/dotnet/samples/GettingStarted/AgentWithMemory/README.md
@@ -0,0 +1,9 @@
+# Agent Framework Retrieval Augmented Generation (RAG)
+
+These samples show how to create an agent with the Agent Framework that uses Memory to remember previous conversations or facts from previous conversations.
+
+|Sample|Description|
+|---|---|
+|[Chat History memory](./AgentWithMemory_Step01_ChatHistoryMemory/)|This sample demonstrates how to enable an agent to remember messages from previous conversations.|
+|[Memory with MemoryStore](./AgentWithMemory_Step02_MemoryUsingMem0/)|This sample demonstrates how to create and run an agent that uses the Mem0 service to extract and retrieve individual memories.|
+|[Custom Memory Implementation](./AgentWithMemory_Step03_CustomMemory/)|This sample demonstrates how to create a custom memory component and attach it to an agent.|
diff --git a/...thRAG_Step02_ExternalDataSourceRAG.csproj → ...ithRAG_Step02_CustomVectorStoreRAG.csproj b/...thRAG_Step02_ExternalDataSourceRAG.csproj → ...ithRAG_Step02_CustomVectorStoreRAG.csproj
diff --git a/...G_Step02_ExternalDataSourceRAG/Program.cs → ...AG_Step02_CustomVectorStoreRAG/Program.cs b/...G_Step02_ExternalDataSourceRAG/Program.cs → ...AG_Step02_CustomVectorStoreRAG/Program.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-// This sample shows how to use Qdrant to add retrieval augmented generation (RAG) capabilities to an AI agent.
+// This sample shows how to use Qdrant with a custom schema to add retrieval augmented generation (RAG) capabilities to an AI agent.
 // While the sample is using Qdrant, it can easily be replaced with any other vector store that implements the Microsoft.Extensions.VectorData abstractions.
 // The TextSearchProvider runs a search against the vector store before each model invocation and injects the results into the model context.
 

diff --git a/...AG_Step02_ExternalDataSourceRAG/README.md → ...RAG_Step02_CustomVectorStoreRAG/README.md b/...AG_Step02_ExternalDataSourceRAG/README.md → ...RAG_Step02_CustomVectorStoreRAG/README.md
diff --git a/...archRag/Agent_Step18_TextSearchRag.csproj → ...WithRAG_Step03_CustomRAGDataSource.csproj b/...archRag/Agent_Step18_TextSearchRag.csproj → ...WithRAG_Step03_CustomRAGDataSource.csproj
diff --git a/...nts/Agent_Step18_TextSearchRag/Program.cs → ...RAG_Step03_CustomRAGDataSource/Program.cs b/...nts/Agent_Step18_TextSearchRag/Program.cs → ...RAG_Step03_CustomRAGDataSource/Program.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 // This sample shows how to use TextSearchProvider to add retrieval augmented generation (RAG)
-// capabilities to an AI agent. The provider runs a search against an external knowledge base
+// capabilities to an AI agent. This shows a mock implementation of a search function,
+// which can be replaced with any custom search logic to query any external knowledge base.
+// The provider invokes the custom search function
 // before each model invocation and injects the results into the model context.
 
-// Also see the AgentWithRAG folder for more advanced RAG scenarios.
-
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;

diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/README.md b/dotnet/samples/GettingStarted/AgentWithRAG/README.md
@@ -5,4 +5,5 @@ These samples show how to create an agent with the Agent Framework that uses Ret
 |Sample|Description|
 |---|---|
 |[Basic Text RAG](./AgentWithRAG_Step01_BasicTextRAG/)|This sample demonstrates how to create and run a basic agent with simple text Retrieval Augmented Generation (RAG).|
-|[RAG with external Vector Store and custom schema](./AgentWithRAG_Step02_ExternalDataSourceRAG/)|This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with an external vector store. It also uses a custom schema for the documents stored in the vector store.|
+|[RAG with Vector Store and custom schema](./AgentWithRAG_Step02_CustomVectorStoreRAG/)|This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with a vector store. It also uses a custom schema for the documents stored in the vector store.|
+|[RAG with custom RAG data source](./AgentWithRAG_Step03_CustomRAGDataSource/)|This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with a custom RAG data source.|
diff --git a/...ndResponsesWithToolsAndPersistence.csproj → ...ndResponsesWithToolsAndPersistence.csproj b/...ndResponsesWithToolsAndPersistence.csproj → ...ndResponsesWithToolsAndPersistence.csproj
diff --git a/...sponsesWithToolsAndPersistence/Program.cs → ...sponsesWithToolsAndPersistence/Program.cs b/...sponsesWithToolsAndPersistence/Program.cs → ...sponsesWithToolsAndPersistence/Program.cs
diff --git a/...esponsesWithToolsAndPersistence/README.md → ...esponsesWithToolsAndPersistence/README.md b/...esponsesWithToolsAndPersistence/README.md → ...esponsesWithToolsAndPersistence/README.md
diff --git a/dotnet/samples/GettingStarted/Agents/README.md b/dotnet/samples/GettingStarted/Agents/README.md
@@ -39,14 +39,11 @@ Before you begin, ensure you have the following prerequisites:
 |[Exposing a simple agent as MCP tool](./Agent_Step10_AsMcpTool/)|This sample demonstrates how to expose an agent as an MCP tool|
 |[Using images with a simple agent](./Agent_Step11_UsingImages/)|This sample demonstrates how to use image multi-modality with an AI agent|
 |[Exposing a simple agent as a function tool](./Agent_Step12_AsFunctionTool/)|This sample demonstrates how to expose an agent as a function tool|
-|[Using memory with an agent](./Agent_Step13_Memory/)|This sample demonstrates how to create a simple memory component and use it with an agent|
+|[Background responses with tools and persistence](./Agent_Step13_BackgroundResponsesWithToolsAndPersistence/)|This sample demonstrates advanced background response scenarios including function calling during background operations and state persistence|
 |[Using middleware with an agent](./Agent_Step14_Middleware/)|This sample demonstrates how to use middleware with an agent|
 |[Using plugins with an agent](./Agent_Step15_Plugins/)|This sample demonstrates how to use plugins with an agent|
 |[Reducing chat history size](./Agent_Step16_ChatReduction/)|This sample demonstrates how to reduce the chat history to constrain its size, where chat history is maintained locally|
 |[Background responses](./Agent_Step17_BackgroundResponses/)|This sample demonstrates how to use background responses for long-running operations with polling and resumption support|
-|[Adding RAG with text search](./Agent_Step18_TextSearchRag/)|This sample demonstrates how to enrich agent responses with retrieval augmented generation using the text search provider|
-|[Using Mem0-backed memory](./Agent_Step19_Mem0Provider/)|This sample demonstrates how to use the Mem0Provider to persist and recall memories across conversations|
-|[Background responses with tools and persistence](./Agent_Step20_BackgroundResponsesWithToolsAndPersistence/)|This sample demonstrates advanced background response scenarios including function calling during background operations and state persistence|
 
 ## Running the samples from the console
 

diff --git a/dotnet/samples/GettingStarted/README.md b/dotnet/samples/GettingStarted/README.md
@@ -9,6 +9,8 @@ of the agent framework.
 |---|---|
 |[Agents](./Agents/README.md)|Step by step instructions for getting started with agents|
 |[Agent Providers](./AgentProviders/README.md)|Getting started with creating agents using various providers|
+|[Agents With Retrieval Augmented Generation (RAG)](./AgentWithRAG/README.md)|Adding Retrieval Augmented Generation (RAG) capabilities to your agents.|
+|[Agents With Memory](./AgentWithMemory/README.md)|Adding Memory capabilities to your agents.|
 |[A2A](./A2A/README.md)|Getting started with A2A (Agent-to-Agent) specific features|
 |[Agent Open Telemetry](./AgentOpenTelemetry/README.md)|Getting started with OpenTelemetry for agents|
 |[Agent With OpenAI exchange types](./AgentWithOpenAI/README.md)|Using OpenAI exchange types with agents|