Merge remote-tracking branch 'origin/main' into feature-text-search-linq

# Conflicts:
#	dotnet/src/IntegrationTests/Connectors/Memory/AzureAISearch/AzureAISearchTextSearchTests.cs
#	dotnet/src/IntegrationTests/Connectors/Memory/InMemory/InMemoryVectorStoreTextSearchTests.cs
#	dotnet/src/IntegrationTests/Connectors/Memory/Qdrant/QdrantTextSearchTests.cs

Author: markwallace-microsoft

.devcontainer/devcontainer.json

@@ -2,10 +2,23 @@
 	"image": "mcr.microsoft.com/devcontainers/universal:2",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {},
-		"ghcr.io/devcontainers/features/dotnet:1": {
-			"version": "8"
+		"ghcr.io/jlaundry/devcontainer-features/azure-functions-core-tools:1": {},
+		"ghcr.io/devcontainers/features/github-cli:1": {
+			"version": "2"
 		},
-		"ghcr.io/jlaundry/devcontainer-features/azure-functions-core-tools:1": {}
+		"ghcr.io/devcontainers/features/powershell:1": {
+			"version": "latest"
+		},
+		"ghcr.io/azure/azure-dev/azd:0": {
+			"version": "latest"
+		},
+		"ghcr.io/devcontainers/features/common-utils:2": {},
+		"ghcr.io/devcontainers/features/dotnet:2": {
+			"version": "none",
+			"dotnetRuntimeVersions": "10.0",
+			"aspNetCoreRuntimeVersions": "10.0"
+		},
+		"ghcr.io/devcontainers/features/copilot-cli:1": {}
 	},
 	"customizations": {
 		"vscode": {

.github/upgrades/prompts/SemanticKernelToAgentFramework.md

@@ -384,6 +384,73 @@ AIAgent agent = chatClient.CreateAIAgent(
 7. Pass tools directly to agent creation method
 </configuration_changes>
 
+### Runtime Tool Registration Transformation
+
+<configuration_changes>
+In Semantic Kernel, plugins/tools could be added to the kernel after it was already built using `kernel.Plugins.Add()`. Agent Framework provides a similar capability using the builder middleware API.
+
+**Replace this Semantic Kernel post-creation tool registration pattern:**
+```csharp
+// Define the tool function
+[Description("Get the weather for a location")]
+static string GetWeather(string location) => $"Weather in {location}";
+
+// Semantic Kernel - Tools added after kernel is already built
+Kernel kernel = kernelBuilder.Build();
+ChatCompletionAgent agent = new() { Kernel = kernel };
+
+// Later: Add tools to the existing kernel instance
+KernelFunction function = KernelFunctionFactory.CreateFromMethod(GetWeather);
+KernelPlugin plugin = KernelPluginFactory.CreateFromFunctions("WeatherPlugin", [function]);
+kernel.Plugins.Add(plugin);
+
+// Tools are now available on subsequent invocations
+await foreach (var item in agent.InvokeAsync(userInput, thread)) { ... }
+```
+
+**With this Agent Framework pattern using builder middleware:**
+```csharp
+// Define the tool function
+[Description("Get the weather for a location")]
+static string GetWeather(string location) => $"Weather in {location}";
+
+// Start with an existing agent
+AIAgent existingAgent = chatClient.CreateAIAgent(
+    instructions: "You are a helpful assistant");
+
+// Create an augmented agent with additional tools using builder middleware
+var augmentedAgent = existingAgent.AsBuilder()
+    .Use(async (chatMessages, agentThread, agentRunOptions, next, cancellationToken) =>
+    {
+        if (agentRunOptions is ChatClientAgentRunOptions chatClientAgentRunOptions)
+        {
+            chatClientAgentRunOptions.ChatOptions ??= new ChatOptions();
+            chatClientAgentRunOptions.ChatOptions.Tools ??= [];
+            chatClientAgentRunOptions.ChatOptions.Tools.Add(AIFunctionFactory.Create(GetWeather));
+        }
+
+        return await next(chatMessages, agentThread, agentRunOptions, cancellationToken);
+    })
+    .Build();
+
+// Use the augmented agent with the additional tools
+AgentRunResponse result = await augmentedAgent.RunAsync(userInput, thread);
+```
+
+**Required changes:**
+1. Call `AsBuilder()` on the existing agent to get a builder
+2. Use the `Use()` middleware method to intercept and modify run options
+3. Add tools to `ChatClientAgentRunOptions.ChatOptions.Tools` in the middleware
+4. Call `Build()` to create the augmented agent instance
+5. Use the new augmented agent for invocations that need the additional tools
+
+**Note:** This pattern is the preferred approach as it provides:
+- A controlled environment with a dedicated agent instance
+- No disruption to existing agent usages
+- Dynamic tool composition per user, tenant, or feature flags
+- Modular system composition without recreating agents
+</configuration_changes>
+
 ### Invocation Method Transformation
 
 <api_changes>

.github/workflows/dotnet-build-and-test.yml

@@ -74,7 +74,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v4.3.1
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
 

.github/workflows/dotnet-ci.yml

@@ -78,7 +78,7 @@ jobs:
         persist-credentials: false
 
     - name: Setup .NET SDK ${{ matrix.dotnet-version }}
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
       env:

.github/workflows/dotnet-integration-tests.yml

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         if: ${{ github.event_name != 'pull_request' }}
         with:
           dotnet-version: 10.0.x